wip

Author: blva

src/telemetry/types.ts

@@ -141,11 +141,7 @@ export type CommonProperties = {
  * For MongoDB tools, this is typically empty, while for Atlas tools, this should include
  * the project and organization IDs if available.
  */
-export type TelemetryToolMetadata = AtlasLocalToolMetadata | AtlasMetadata | PerfAdvisorToolMetadata;
-
-export type AtlasLocalToolMetadata = {
-    atlas_local_deployment_id?: string;
-};
+export type TelemetryToolMetadata = AtlasMetadata | PerfAdvisorToolMetadata | ConnectionMetadata;
 
 export type AtlasMetadata = {
     project_id?: string;
@@ -155,3 +151,12 @@ export type AtlasMetadata = {
 export type PerfAdvisorToolMetadata = AtlasMetadata & {
     operations: string[];
 };
+
+export type ConnectionMetadata = AtlasMetadata &
+    AtlasLocalToolMetadata & {
+        connection_auth_type?: string;
+    };
+
+type AtlasLocalToolMetadata = {
+    atlas_local_deployment_id?: string;
+};

src/tools/atlas/connect/connectCluster.ts

@@ -8,6 +8,7 @@ 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 { AtlasLocalToolMetadata } from "../../../telemetry/types.js";
 
 const addedIpAccessListMessage =
     "Note: Your current IP address has been added to the Atlas project's IP access list to enable secure connection.";
@@ -303,4 +304,19 @@ export class ConnectClusterTool extends AtlasToolBase {
 
         return { content };
     }
+
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    protected override resolveTelemetryMetadata(_args: ToolArgs<typeof this.argsShape>): AtlasLocalToolMetadata {
+        const metadata: AtlasLocalToolMetadata = {};
+        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;
+    }
 }

src/tools/atlasLocal/atlasLocalTool.ts

@@ -4,9 +4,9 @@ import { ToolBase } from "../tool.js";
 import type { ToolCallback } from "@modelcontextprotocol/sdk/server/mcp.js";
 import type { Client } from "@mongodb-js/atlas-local";
 import { LogId } from "../../common/logger.js";
-import type { AtlasLocalToolMetadata } from "../../telemetry/types.js";
+import type { ConnectionMetadata } from "../../telemetry/types.js";
 
-export const AtlasLocalToolMetadataDeploymentIdKey = "deploymentId";
+export const ConnectionMetadataDeploymentIdKey = "deploymentId";
 
 export abstract class AtlasLocalToolBase extends ToolBase {
     public category: ToolCategory = "atlas-local";
@@ -67,7 +67,7 @@ please log a ticket here: https://github.com/mongodb-js/mongodb-mcp-server/issue
         }
 
         return {
-            [AtlasLocalToolMetadataDeploymentIdKey]: deploymentId,
+            [ConnectionMetadataDeploymentIdKey]: deploymentId,
         };
     }
 
@@ -119,12 +119,12 @@ please log a ticket here: https://github.com/mongodb-js/mongodb-mcp-server/issue
         return super.handleError(error, args);
     }
 
-    protected resolveTelemetryMetadata(result: CallToolResult): AtlasLocalToolMetadata {
-        const toolMetadata: AtlasLocalToolMetadata = {};
+    protected resolveTelemetryMetadata(result: CallToolResult): ConnectionMetadata {
+        const toolMetadata: ConnectionMetadata = {};
 
         // Atlas Local tools set the deployment ID in the result metadata for telemetry
         // If the deployment ID is set, we use it for telemetry
-        const resultDeploymentId = result._meta?.[AtlasLocalToolMetadataDeploymentIdKey];
+        const resultDeploymentId = result._meta?.[ConnectionMetadataDeploymentIdKey];
         if (resultDeploymentId !== undefined && typeof resultDeploymentId === "string") {
             toolMetadata.atlas_local_deployment_id = resultDeploymentId;
         }

src/tools/mongodb/connect/connect.ts

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

src/tools/mongodb/mongodbTool.ts

@@ -6,7 +6,8 @@ import type { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
 import { ErrorCodes, MongoDBError } from "../../common/errors.js";
 import { LogId } from "../../common/logger.js";
 import type { Server } from "../../server.js";
-import type { AtlasMetadata } from "../../telemetry/types.js";
+import type { ConnectionMetadata } from "../../telemetry/types.js";
+import type { ToolCallback } from "@modelcontextprotocol/sdk/server/mcp.js";
 
 export const DbOperationArgs = {
     database: z.string().describe("Database name"),
@@ -111,19 +112,21 @@ export abstract class MongoDBToolBase extends ToolBase {
         return this.session.connectToMongoDB({ connectionString });
     }
 
+    /**
+     * Resolves the tool metadata from the arguments passed to the mongoDB tools.
+     *
+     * Since MongoDB tools are executed against a MongoDB instance, the tool calls will always have the connection information.
+     *
+     * @param result - The result of the tool call.
+     * @param args - The arguments passed to the tool
+     * @returns The tool metadata
+     */
     protected resolveTelemetryMetadata(
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        result: CallToolResult,
+        _result: CallToolResult,
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        args: ToolArgs<typeof this.argsShape>
-    ): AtlasMetadata {
-        const metadata: AtlasMetadata = {};
-
-        // Add projectId to the metadata if running a MongoDB operation to an Atlas cluster
-        if (this.session.connectedAtlasCluster?.projectId) {
-            metadata.project_id = this.session.connectedAtlasCluster.projectId;
-        }
-
-        return metadata;
+        _args: Parameters<ToolCallback<typeof this.argsShape>>
+    ): ConnectionMetadata {
+        return this.getConnectionInfoMetadata();
     }
 }

src/tools/tool.ts

@@ -5,7 +5,7 @@ import type { CallToolResult, ToolAnnotations } from "@modelcontextprotocol/sdk/
 import type { Session } from "../common/session.js";
 import { LogId } from "../common/logger.js";
 import type { Telemetry } from "../telemetry/telemetry.js";
-import type { TelemetryToolMetadata, ToolEvent } from "../telemetry/types.js";
+import type { ConnectionMetadata, TelemetryToolMetadata, ToolEvent } from "../telemetry/types.js";
 import type { UserConfig } from "../common/config.js";
 import type { Server } from "../server.js";
 import type { Elicitation } from "../elicitation.js";
@@ -303,6 +303,20 @@ export abstract class ToolBase {
     protected isFeatureEnabled(feature: PreviewFeature): boolean {
         return this.config.previewFeatures.includes(feature);
     }
+
+    protected getConnectionInfoMetadata(): 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;
+    }
 }
 
 /**