address comment: move tool emission to tool.ts

Author: blva

src/telemetry/telemetry.ts

@@ -52,44 +52,27 @@ export class Telemetry {
     }
 
     /**
-     * Emits a tool event with timing and error information
-     * @param command - The command being executed
-     * @param category - Category of the command
-     * @param startTime - Start time in milliseconds
-     * @param result - Whether the command succeeded or failed
-     * @param error - Optional error if the command failed
+     * Emits events through the telemetry pipeline
+     * @param events - The events to emit
      */
-    public async emitToolEvent(
-        command: string,
-        category: string,
-        startTime: number,
-        result: "success" | "failure",
-        error?: Error
-    ): Promise<void> {
+    public async emitEvents(events: BaseEvent[]): Promise<void> {
         if (!TELEMETRY_ENABLED) {
-            logger.debug(mongoLogId(1_000_000), "telemetry", "Telemetry is disabled, skipping event.");
+            logger.debug(mongoLogId(1_000_000), "telemetry", "Telemetry is disabled, skipping events.");
             return;
         }
 
-        const duration = Date.now() - startTime;
-        const event: ToolEvent = {
-            timestamp: new Date().toISOString(),
-            source: "mdbmcp",
-            properties: {
-                ...this.commonProperties,
-                command,
-                category,
-                duration_ms: duration,
-                session_id: this.session.sessionId,
-                result,
-                ...(error && {
-                    error_type: error.name,
-                    error_code: error.message,
-                }),
-            },
-        };
+        await this.emit(events);
+    }
 
-        await this.emit([event]);
+    /**
+     * Gets the common properties for events
+     * @returns Object containing common properties for all events
+     */
+    public getCommonProperties(): CommonProperties {
+        return {
+            ...this.commonProperties,
+            session_id: this.session.sessionId,
+        };
     }
 
     /**

src/telemetry/types.ts

@@ -1,3 +1,13 @@
+/**
+ * Result type constants for telemetry events
+ */
+export const TELEMETRY_RESULT = {
+    SUCCESS: "success" as const,
+    FAILURE: "failure" as const,
+};
+
+export type TelemetryResult = (typeof TELEMETRY_RESULT)[keyof typeof TELEMETRY_RESULT];
+
 /**
  * Base interface for all events
  */
@@ -30,7 +40,7 @@ export interface ToolEvent extends BaseEvent {
         command: string;
         category: string;
         duration_ms: number;
-        result: "success" | "failure";
+        result: TelemetryResult;
         error_code?: string;
         error_type?: string;
         project_id?: string;

src/tools/tool.ts

@@ -6,6 +6,7 @@ import logger from "../logger.js";
 import { mongoLogId } from "mongodb-log-writer";
 import config from "../config.js";
 import { Telemetry } from "../telemetry/telemetry.js";
+import { type ToolEvent, TELEMETRY_RESULT, type TelemetryResult } from "../telemetry/types.js";
 
 export type ToolArgs<Args extends ZodRawShape> = z.objectOutputType<Args, ZodNever>;
 
@@ -31,6 +32,33 @@ export abstract class ToolBase {
         this.telemetry = new Telemetry(session);
     }
 
+    /**
+     * Creates and emits a tool telemetry event
+     * @param startTime - Start time in milliseconds
+     * @param result - Whether the command succeeded or failed
+     * @param error - Optional error if the command failed
+     */
+    private async emitToolEvent(startTime: number, result: TelemetryResult, error?: Error): Promise<void> {
+        const duration = Date.now() - startTime;
+        const event: ToolEvent = {
+            timestamp: new Date().toISOString(),
+            source: "mdbmcp",
+            properties: {
+                ...this.telemetry.getCommonProperties(),
+                command: this.name,
+                category: this.category,
+                duration_ms: duration,
+                result,
+                ...(error && {
+                    error_type: error.name,
+                    error_code: error.message,
+                }),
+            },
+        };
+
+        await this.telemetry.emitEvents([event]);
+    }
+
     public register(server: McpServer): void {
         if (!this.verifyAllowed()) {
             return;
@@ -46,16 +74,14 @@ export abstract class ToolBase {
                 );
 
                 const result = await this.execute(...args);
-                await this.telemetry.emitToolEvent(this.name, this.category, startTime, "success");
+                await this.emitToolEvent(startTime, TELEMETRY_RESULT.SUCCESS);
                 return result;
             } catch (error: unknown) {
                 logger.error(mongoLogId(1_000_000), "tool", `Error executing ${this.name}: ${error as string}`);
 
-                await this.telemetry.emitToolEvent(
-                    this.name,
-                    this.category,
+                await this.emitToolEvent(
                     startTime,
-                    "failure",
+                    TELEMETRY_RESULT.FAILURE,
                     error instanceof Error ? error : new Error(String(error))
                 );