chore: minor improvements

Author: blva

src/session.ts

@@ -26,6 +26,7 @@ export class Session extends EventEmitter<{
         username: string;
         projectId: string;
         clusterName: string;
+        organizationId?: string;
         expiryDate: Date;
     };
 

src/telemetry/telemetry.ts

@@ -11,41 +11,41 @@ type EventResult = {
     error?: Error;
 };
 
-export class Telemetry {
-    private readonly commonProperties: CommonProperties;
-
-    constructor(
-        private readonly session: Session,
-        private readonly eventCache: EventCache = EventCache.getInstance()
-    ) {
-        this.commonProperties = {
-            ...MACHINE_METADATA,
-        };
-    }
-
-    /**
+/**
      * Checks if telemetry is currently enabled
      * This is a method rather than a constant to capture runtime config changes
      *
      * Follows the Console Do Not Track standard (https://consoledonottrack.com/)
      * by respecting the DO_NOT_TRACK environment variable
      */
-    private static isTelemetryEnabled(): boolean {
-        // Check if telemetry is explicitly disabled in config
-        if (config.telemetry === "disabled") {
+export function isTelemetryEnabled(): boolean {
+    // Check if telemetry is explicitly disabled in config
+    if (config.telemetry === "disabled") {
+        return false;
+    }
+
+    const doNotTrack = process.env.DO_NOT_TRACK;
+    if (doNotTrack) {
+        const value = doNotTrack.toLowerCase();
+        // Telemetry should be disabled if DO_NOT_TRACK is "1", "true", or "yes"
+        if (value === "1" || value === "true" || value === "yes") {
             return false;
         }
+    }
 
-        const doNotTrack = process.env.DO_NOT_TRACK;
-        if (doNotTrack) {
-            const value = doNotTrack.toLowerCase();
-            // Telemetry should be disabled if DO_NOT_TRACK is "1", "true", or "yes"
-            if (value === "1" || value === "true" || value === "yes") {
-                return false;
-            }
-        }
+    return true;
+}
+
+export class Telemetry {
+    private readonly commonProperties: CommonProperties;
 
-        return true;
+    constructor(
+        private readonly session: Session,
+        private readonly eventCache: EventCache = EventCache.getInstance()
+    ) {
+        this.commonProperties = {
+            ...MACHINE_METADATA,
+        };
     }
 
     /**
@@ -54,7 +54,8 @@ export class Telemetry {
      */
     public async emitEvents(events: BaseEvent[]): Promise<void> {
         try {
-            if (!Telemetry.isTelemetryEnabled()) {
+            if (!isTelemetryEnabled()) {
+                logger.info(LogId.telemetryEmitFailure, "telemetry", `Telemetry is disabled.`);
                 return;
             }
 

src/tools/tool.ts

@@ -3,7 +3,7 @@ import type { McpServer, RegisteredTool, ToolCallback } from "@modelcontextproto
 import type { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
 import { Session } from "../session.js";
 import logger, { LogId } from "../logger.js";
-import { Telemetry } from "../telemetry/telemetry.js";
+import { Telemetry, isTelemetryEnabled  } from "../telemetry/telemetry.js";
 import { type ToolEvent } from "../telemetry/types.js";
 import { UserConfig } from "../config.js";
 
@@ -38,6 +38,9 @@ export abstract class ToolBase {
      * @param error - Optional error if the command failed
      */
     private async emitToolEvent(startTime: number, result: CallToolResult): Promise<void> {
+        if (!isTelemetryEnabled()) {
+            return;
+        }
         const duration = Date.now() - startTime;
         const event: ToolEvent = {
             timestamp: new Date().toISOString(),