address comment for category and update emit tool to get tool result object

Author: blva

src/telemetry/types.ts

@@ -22,6 +22,10 @@ export interface BaseEvent extends Event {
         platform: string;
         arch: string;
         os_type: string;
+        component: string;
+        duration_ms: number;
+        result: TelemetryResult;
+        category: string;
         os_version?: string;
         session_id?: string;
     } & Event["properties"];
@@ -33,9 +37,6 @@ export interface BaseEvent extends Event {
 export interface ToolEvent extends BaseEvent {
     properties: {
         command: string;
-        category: string;
-        duration_ms: number;
-        result: TelemetryResult;
         error_code?: string;
         error_type?: string;
         project_id?: string;

src/tools/tool.ts

@@ -1,6 +1,6 @@
 import { z, type ZodRawShape, type ZodNever } from "zod";
 import type { McpServer, ToolCallback } from "@modelcontextprotocol/sdk/server/mcp.js";
-import type { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
+import type { CallToolResult, Tool } from "@modelcontextprotocol/sdk/types.js";
 import { Session } from "../session.js";
 import logger from "../logger.js";
 import { mongoLogId } from "mongodb-log-writer";
@@ -38,24 +38,25 @@ export abstract class ToolBase {
      * @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> {
+    private async emitToolEvent(startTime: number, result: CallToolResult): Promise<void> {
         const duration = Date.now() - startTime;
+        logger.info(
+            mongoLogId(1_000_007),
+            "tool",
+            `Tool ${this.name} executed in ${duration}ms with result: ${result}`
+        );
         const event: ToolEvent = {
             timestamp: new Date().toISOString(),
             source: "mdbmcp",
             properties: {
                 ...this.telemetry.getCommonProperties(),
                 command: this.name,
                 category: this.category,
+                component: "tool",
                 duration_ms: duration,
-                result,
-                ...(error && {
-                    error_type: error.name,
-                    error_code: error.message,
-                }),
+                result: result.isError ? "failure" : "success",
             },
         };
-
         await this.telemetry.emitEvents([event]);
     }
 
@@ -74,17 +75,21 @@ export abstract class ToolBase {
                 );
 
                 const result = await this.execute(...args);
-                await this.emitToolEvent(startTime, "success");
+                await this.emitToolEvent(startTime, result);
                 return result;
             } catch (error: unknown) {
                 logger.error(mongoLogId(1_000_000), "tool", `Error executing ${this.name}: ${error as string}`);
 
-                await this.emitToolEvent(
-                    startTime,
-                    "failure",
-                    error instanceof Error ? error : new Error(String(error))
-                );
-
+                const toolResult: CallToolResult = {
+                    isError: true,
+                    content: [
+                        {
+                            type: "text",
+                            text: `Error running ${this.name}: ${error instanceof Error ? error.message : String(error)}`,
+                        },
+                    ],
+                };
+                await this.emitToolEvent(startTime, toolResult);
                 return await this.handleError(error, args[0] as ToolArgs<typeof this.argsShape>);
             }
         };