address comments: update tools

Author: blva

src/tools/atlas/atlasTool.ts

@@ -1,4 +1,7 @@
-import { ToolBase, ToolCategory } from "../tool.js";
+import { ToolBase, ToolCategory, TelemetryToolMetadata } from "../tool.js";
+import { ToolCallback } from "@modelcontextprotocol/sdk/server/mcp.js";
+import logger, { LogId } from "../../logger.js";
+import { z } from "zod";
 
 export abstract class AtlasToolBase extends ToolBase {
     protected category: ToolCategory = "atlas";
@@ -9,4 +12,46 @@ export abstract class AtlasToolBase extends ToolBase {
         }
         return super.verifyAllowed();
     }
+
+    /**
+     *
+     * Resolves the tool metadata from the arguments passed to the tool
+     *
+     * @param args - The arguments passed to the tool
+     * @returns The tool metadata
+     */
+    protected resolveTelemetryMetadata(
+        ...args: Parameters<ToolCallback<typeof this.argsShape>>
+    ): TelemetryToolMetadata {
+        const toolMetadata: TelemetryToolMetadata = {};
+        if (!args.length) {
+            return toolMetadata;
+        }
+
+        // Create a typed parser for the exact shape we expect
+        const argsShape = z.object(this.argsShape);
+        const parsedResult = argsShape.safeParse(args[0]);
+
+        if (!parsedResult.success) {
+            logger.debug(
+                LogId.telemetryMetadataError,
+                "tool",
+                `Error parsing tool arguments: ${parsedResult.error.message}`
+            );
+            return toolMetadata;
+        }
+
+        const data = parsedResult.data;
+
+        // Extract projectId using type guard
+        if ("projectId" in data && typeof data.projectId === "string" && data.projectId.trim() !== "") {
+            toolMetadata.projectId = data.projectId;
+        }
+
+        // Extract orgId using type guard
+        if ("orgId" in data && typeof data.orgId === "string" && data.orgId.trim() !== "") {
+            toolMetadata.orgId = data.orgId;
+        }
+        return toolMetadata;
+    }
 }

src/tools/mongodb/mongodbTool.ts

@@ -1,10 +1,9 @@
 import { z } from "zod";
 import { ToolArgs, ToolBase, ToolCategory, TelemetryToolMetadata } from "../tool.js";
 import { NodeDriverServiceProvider } from "@mongosh/service-provider-node-driver";
-import { CallToolResult, ServerNotification, ServerRequest } from "@modelcontextprotocol/sdk/types.js";
+import { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
 import { ErrorCodes, MongoDBError } from "../../errors.js";
 import logger, { LogId } from "../../logger.js";
-import { RequestHandlerExtra } from "@modelcontextprotocol/sdk/shared/protocol.js";
 
 export const DbOperationArgs = {
     database: z.string().describe("Database name"),
@@ -76,10 +75,10 @@ export abstract class MongoDBToolBase extends ToolBase {
     }
 
     protected resolveTelemetryMetadata(
-        args: ToolArgs<typeof this.argsShape>,
-        extra: RequestHandlerExtra<ServerRequest, ServerNotification>
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        args: ToolArgs<typeof this.argsShape>
     ): TelemetryToolMetadata {
-        const metadata = super.resolveTelemetryMetadata(args, extra);
+        const metadata: TelemetryToolMetadata = {};
 
         // Add projectId to the metadata if running a MongoDB operation to an Atlas cluster
         if (this.session.connectedAtlasCluster?.projectId) {

src/tools/tool.ts

@@ -132,47 +132,9 @@ export abstract class ToolBase {
         };
     }
 
-    /**
-     *
-     * Resolves the tool metadata from the arguments passed to the tool
-     *
-     * @param args - The arguments passed to the tool
-     * @returns The tool metadata
-     */
-    protected resolveTelemetryMetadata(
+    protected abstract resolveTelemetryMetadata(
         ...args: Parameters<ToolCallback<typeof this.argsShape>>
-    ): TelemetryToolMetadata {
-        const toolMetadata: TelemetryToolMetadata = {};
-        if (!args.length) {
-            return toolMetadata;
-        }
-
-        // Create a typed parser for the exact shape we expect
-        const argsShape = z.object(this.argsShape);
-        const parsedResult = argsShape.safeParse(args[0]);
-
-        if (!parsedResult.success) {
-            logger.debug(
-                LogId.telemetryMetadataError,
-                "tool",
-                `Error parsing tool arguments: ${parsedResult.error.message}`
-            );
-            return toolMetadata;
-        }
-
-        const data = parsedResult.data;
-
-        // Extract projectId using type guard
-        if ("projectId" in data && typeof data.projectId === "string" && data.projectId.trim() !== "") {
-            toolMetadata.projectId = data.projectId;
-        }
-
-        // Extract orgId using type guard
-        if ("orgId" in data && typeof data.orgId === "string" && data.orgId.trim() !== "") {
-            toolMetadata.orgId = data.orgId;
-        }
-        return toolMetadata;
-    }
+    ): TelemetryToolMetadata;
 
     /**
      * Creates and emits a tool telemetry event