chore: include tool args for perf advisor telemetry

Author: nirinchev

src/telemetry/types.ts

@@ -16,7 +16,7 @@ export type TelemetryEvent<T> = {
         duration_ms: number;
         result: TelemetryResult;
         category: string;
-    };
+    } & Record<string, string | number | string[]>;
 };
 
 export type BaseEvent = TelemetryEvent<unknown>;

src/tools/atlas/atlasTool.ts

@@ -107,12 +107,12 @@ For more information on Atlas API access roles, visit: https://www.mongodb.com/d
 
         // Extract projectId using type guard
         if ("projectId" in data && typeof data.projectId === "string" && data.projectId.trim() !== "") {
-            toolMetadata.projectId = data.projectId;
+            toolMetadata.project_id = data.projectId;
         }
 
         // Extract orgId using type guard
         if ("orgId" in data && typeof data.orgId === "string" && data.orgId.trim() !== "") {
-            toolMetadata.orgId = data.orgId;
+            toolMetadata.org_id = data.orgId;
         }
         return toolMetadata;
     }

src/tools/atlas/read/getPerformanceAdvisor.ts

@@ -1,7 +1,7 @@
 import { z } from "zod";
 import { AtlasToolBase } from "../atlasTool.js";
-import type { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
-import type { OperationType, ToolArgs } from "../../tool.js";
+import type { CallToolResult, ServerNotification, ServerRequest } from "@modelcontextprotocol/sdk/types.js";
+import type { OperationType, TelemetryToolMetadata, ToolArgs } from "../../tool.js";
 import { formatUntrustedData } from "../../tool.js";
 import {
     getSuggestedIndexes,
@@ -13,6 +13,7 @@ import {
     SLOW_QUERY_LOGS_COPY,
 } from "../../../common/atlas/performanceAdvisorUtils.js";
 import { AtlasArgs } from "../../args.js";
+import type { RequestHandlerExtra } from "@modelcontextprotocol/sdk/shared/protocol.js";
 
 const PerformanceAdvisorOperationType = z.enum([
     "suggestedIndexes",
@@ -130,4 +131,14 @@ export class GetPerformanceAdvisorTool extends AtlasToolBase {
             };
         }
     }
+
+    protected override resolveTelemetryMetadata(
+        result: CallToolResult,
+        args: ToolArgs<typeof this.argsShape>,
+        extra: RequestHandlerExtra<ServerRequest, ServerNotification>
+    ): TelemetryToolMetadata {
+        const baseMetadata = super.resolveTelemetryMetadata(result, args, extra);
+        baseMetadata.operations = args.operations;
+        return baseMetadata;
+    }
 }

src/tools/atlasLocal/atlasLocalTool.ts

@@ -125,7 +125,7 @@ please log a ticket here: https://github.com/mongodb-js/mongodb-mcp-server/issue
         // If the deployment ID is set, we use it for telemetry
         const resultDeploymentId = result._meta?.[AtlasLocalToolMetadataDeploymentIdKey];
         if (resultDeploymentId !== undefined && typeof resultDeploymentId === "string") {
-            toolMetadata.atlasLocaldeploymentId = resultDeploymentId;
+            toolMetadata.atlas_local_deployment_id = resultDeploymentId;
         }
 
         return toolMetadata;

src/tools/mongodb/mongodbTool.ts

@@ -120,7 +120,7 @@ export abstract class MongoDBToolBase extends ToolBase {
 
         // Add projectId to the metadata if running a MongoDB operation to an Atlas cluster
         if (this.session.connectedAtlasCluster?.projectId) {
-            metadata.projectId = this.session.connectedAtlasCluster.projectId;
+            metadata.project_id = this.session.connectedAtlasCluster.projectId;
         }
 
         return metadata;

src/tools/tool.ts

@@ -44,10 +44,10 @@ export type ToolCategory = "mongodb" | "atlas" | "atlas-local";
  * the project and organization IDs if available.
  */
 export type TelemetryToolMetadata = {
-    projectId?: string;
-    orgId?: string;
-    atlasLocaldeploymentId?: string;
-};
+    project_id?: string;
+    org_id?: string;
+    atlas_local_deployment_id?: string;
+} & Record<string, string | number | string[]>;
 
 export type ToolConstructorParams = {
     session: Session;
@@ -303,21 +303,10 @@ export abstract class ToolBase {
                 component: "tool",
                 duration_ms: duration,
                 result: result.isError ? "failure" : "success",
+                ...metadata,
             },
         };
 
-        if (metadata?.orgId) {
-            event.properties.org_id = metadata.orgId;
-        }
-
-        if (metadata?.projectId) {
-            event.properties.project_id = metadata.projectId;
-        }
-
-        if (metadata?.atlasLocaldeploymentId) {
-            event.properties.atlas_local_deployment_id = metadata.atlasLocaldeploymentId;
-        }
-
         this.telemetry.emitEvents([event]);
     }