update connection tools

Author: blva

src/tools/atlas/connect/connectCluster.ts

@@ -8,7 +8,8 @@ import { ensureCurrentIpInAccessList } from "../../../common/atlas/accessListUti
 import type { AtlasClusterConnectionInfo } from "../../../common/connectionManager.js";
 import { getDefaultRoleFromConfig } from "../../../common/atlas/roles.js";
 import { AtlasArgs } from "../../args.js";
-import { ConnectionMetadata } from "../../../telemetry/types.js";
+import type { ConnectionMetadata } from "../../../telemetry/types.js";
+import type { ToolCallback } from "@modelcontextprotocol/sdk/server/mcp.js";
 
 const addedIpAccessListMessage =
     "Note: Your current IP address has been added to the Atlas project's IP access list to enable secure connection.";
@@ -305,18 +306,13 @@ export class ConnectClusterTool extends AtlasToolBase {
         return { content };
     }
 
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    protected override resolveTelemetryMetadata(_args: ToolArgs<typeof this.argsShape>): ConnectionMetadata {
-        const metadata: ConnectionMetadata = {};
-        const connectionStringAuthType = this.session.connectionManager.currentConnectionState.connectionStringAuthType;
-        if (connectionStringAuthType) {
-            metadata.connection_auth_type = connectionStringAuthType;
-        }
-
-        if (this.session.connectedAtlasCluster?.projectId) {
-            metadata.project_id = this.session.connectedAtlasCluster.projectId;
-        }
-
-        return metadata;
+    protected override resolveTelemetryMetadata(
+        result: CallToolResult,
+        args: Parameters<ToolCallback<typeof this.argsShape>>
+    ): ConnectionMetadata {
+        return {
+            ...super.resolveTelemetryMetadata(result, ...args),
+            ...this.getConnectionInfoMetadata(),
+        };
     }
 }

src/tools/atlasLocal/connect/connectDeployment.ts

@@ -3,6 +3,7 @@ import { AtlasLocalToolBase } from "../atlasLocalTool.js";
 import type { OperationType, ToolArgs } from "../../tool.js";
 import type { Client } from "@mongodb-js/atlas-local";
 import { CommonArgs } from "../../args.js";
+import type { ConnectionMetadata } from "../../../telemetry/types.js";
 
 export class ConnectDeploymentTool extends AtlasLocalToolBase {
     public name = "atlas-local-connect-deployment";
@@ -34,4 +35,11 @@ export class ConnectDeploymentTool extends AtlasLocalToolBase {
             },
         };
     }
+
+    protected override resolveTelemetryMetadata(result: CallToolResult): ConnectionMetadata {
+        return {
+            ...super.resolveTelemetryMetadata(result),
+            ...this.getConnectionInfoMetadata(),
+        };
+    }
 }

src/tools/mongodb/connect/connect.ts

@@ -5,7 +5,6 @@ import type { ToolArgs, OperationType, ToolConstructorParams } from "../../tool.
 import assert from "assert";
 import type { Server } from "../../../server.js";
 import { LogId } from "../../../common/logger.js";
-import { ConnectionMetadata } from "../../../telemetry/types.js";
 
 const disconnectedSchema = z
     .object({