[Telemetry] Use dependency injection for WatchdogClient in ClearcutLogger

Author: ergunsh

src/telemetry/clearcut-logger.ts

@@ -23,14 +23,17 @@ export class ClearcutLogger {
     persistence?: Persistence;
     logFile?: string;
     appVersion: string;
+    watchdogClient?: WatchdogClient;
   }) {
     this.#persistence = options.persistence ?? new FilePersistence();
-    this.#watchdog = new WatchdogClient({
-      parentPid: process.pid,
-      appVersion: options.appVersion,
-      osType: this.#detectOsType(),
-      logFile: options.logFile,
-    });
+    this.#watchdog =
+      options.watchdogClient ??
+      new WatchdogClient({
+        parentPid: process.pid,
+        appVersion: options.appVersion,
+        osType: this.#detectOsType(),
+        logFile: options.logFile,
+      });
   }
 
   #detectOsType(): OsType {

tests/telemetry/clearcut-logger.test.ts

@@ -17,16 +17,15 @@ import {IpcMessageType} from '../../src/telemetry/types.js';
 
 describe('ClearcutLogger', () => {
   let mockPersistence: sinon.SinonStubbedInstance<Persistence>;
-  let sendStub: sinon.SinonStub;
+  let mockWatchdogClient: sinon.SinonStubbedInstance<WatchdogClient>;
 
   beforeEach(() => {
     mockPersistence = sinon.createStubInstance(FilePersistence, {
       loadState: Promise.resolve({
         lastActive: '',
       }),
     });
-    // Stub the prototype of WatchdogClient so newly created instances use it
-    sendStub = sinon.stub(WatchdogClient.prototype, 'send');
+    mockWatchdogClient = sinon.createStubInstance(WatchdogClient);
   });
 
   afterEach(() => {
@@ -38,15 +37,16 @@ describe('ClearcutLogger', () => {
       const logger = new ClearcutLogger({
         persistence: mockPersistence,
         appVersion: '1.0.0',
+        watchdogClient: mockWatchdogClient,
       });
       await logger.logToolInvocation({
         toolName: 'test_tool',
         success: true,
         latencyMs: 123,
       });
 
-      assert(sendStub.calledOnce);
-      const msg = sendStub.firstCall.args[0];
+      assert(mockWatchdogClient.send.calledOnce);
+      const msg = mockWatchdogClient.send.firstCall.args[0];
       assert.strictEqual(msg.type, IpcMessageType.EVENT);
       assert.strictEqual(msg.payload.tool_invocation?.tool_name, 'test_tool');
       assert.strictEqual(msg.payload.tool_invocation?.success, true);
@@ -59,13 +59,14 @@ describe('ClearcutLogger', () => {
       const logger = new ClearcutLogger({
         persistence: mockPersistence,
         appVersion: '1.0.0',
+        watchdogClient: mockWatchdogClient,
       });
 
       await logger.logServerStart({headless: true});
 
       // Should have logged server start
-      assert(sendStub.calledOnce);
-      const msg = sendStub.firstCall.args[0];
+      assert(mockWatchdogClient.send.calledOnce);
+      const msg = mockWatchdogClient.send.firstCall.args[0];
       assert.strictEqual(msg.type, IpcMessageType.EVENT);
       assert.strictEqual(
         msg.payload.server_start?.flag_usage?.headless,
@@ -86,12 +87,13 @@ describe('ClearcutLogger', () => {
       const logger = new ClearcutLogger({
         persistence: mockPersistence,
         appVersion: '1.0.0',
+        watchdogClient: mockWatchdogClient,
       });
 
       await logger.logDailyActiveIfNeeded();
 
-      assert(sendStub.calledOnce);
-      const msg = sendStub.firstCall.args[0];
+      assert(mockWatchdogClient.send.calledOnce);
+      const msg = mockWatchdogClient.send.firstCall.args[0];
       assert.strictEqual(msg.type, IpcMessageType.EVENT);
       assert.ok(msg.payload.daily_active);
 
@@ -106,11 +108,12 @@ describe('ClearcutLogger', () => {
       const logger = new ClearcutLogger({
         persistence: mockPersistence,
         appVersion: '1.0.0',
+        watchdogClient: mockWatchdogClient,
       });
 
       await logger.logDailyActiveIfNeeded();
 
-      assert(sendStub.notCalled);
+      assert(mockWatchdogClient.send.notCalled);
       assert(mockPersistence.saveState.notCalled);
     });
 
@@ -122,12 +125,13 @@ describe('ClearcutLogger', () => {
       const logger = new ClearcutLogger({
         persistence: mockPersistence,
         appVersion: '1.0.0',
+        watchdogClient: mockWatchdogClient,
       });
 
       await logger.logDailyActiveIfNeeded();
 
-      assert(sendStub.calledOnce);
-      const msg = sendStub.firstCall.args[0];
+      assert(mockWatchdogClient.send.calledOnce);
+      const msg = mockWatchdogClient.send.firstCall.args[0];
       assert.strictEqual(msg.type, IpcMessageType.EVENT);
       assert.strictEqual(
         msg.payload.daily_active?.days_since_last_active,