WIP

Author: blva

package-lock.json

@@ -58,7 +58,6 @@
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.8.0",
     "@mongodb-js/devtools-connect": "^3.7.2",
-    "@mongodb-js/get-os-info": "^0.4.1",
     "@mongosh/service-provider-node-driver": "^3.6.0",
     "bson": "^6.10.3",
     "mongodb": "^6.15.0",

package.json

@@ -1,5 +1,6 @@
 import config from "../../config.js";
-import createClient, { Client, FetchOptions, Middleware } from "openapi-fetch";
+import createClient, { Client, Middleware } from "openapi-fetch";
+import type { FetchOptions } from "openapi-fetch";
 import { AccessToken, ClientCredentials } from "simple-oauth2";
 import { ApiClientError } from "./apiClientError.js";
 import { paths, operations } from "./openapi.js";
@@ -65,7 +66,7 @@ export class ApiClient {
             baseUrl: options?.baseUrl || "https://cloud.mongodb.com/",
             userAgent:
                 options?.userAgent ||
-                `AtlasMCP/${config.version} (${process.platform}; ${process.arch}; ${process.env.HOSTNAME || "unknown"})`,
+                `${config.mcp_server_name}/${config.version} (${process.platform}; ${process.arch}; ${process.env.HOSTNAME || "unknown"})`,
         };
 
         this.client = createClient<paths>({

src/common/atlas/apiClient.ts

@@ -39,9 +39,20 @@ const mergedUserConfig = {
     ...getCliConfig(),
 };
 
+
+const machineMetadata = {
+    device_id: "id", // TODO: use @mongodb-js/machine-id
+    platform: process.platform,
+    arch: process.arch,
+    os_type: process.platform,
+    os_version: process.version,
+}
+
 const config = {
     ...mergedUserConfig,
+    ...machineMetadata,
     version: packageJson.version,
+    mcp_server_name: "MdbMcpServer"
 };
 
 export default config;

src/config.ts

@@ -8,36 +8,6 @@ import config from "./config.js";
 import { Session } from "./session.js";
 import { Server } from "./server.js";
 
-const POLL_INTERVAL_MS = 2000; // 2 seconds
-const MAX_RETRIES = 15; // 30 seconds total
-const CLIENT_VERSION_TIMEOUT = new Error('Timeout waiting for client version');
-
-async function pollClientVersion(mcpServer: McpServer): Promise<void> {
-    let attempts = 0;
-    
-    return new Promise((resolve, reject) => {
-        const interval = setInterval(async () => {
-            try {
-                const client = await mcpServer.server.getClientVersion();
-                if (client?.name && client?.version) {
-                    clearInterval(interval);
-                    logger.info(
-                        mongoLogId(1_000_003),
-                        "server",
-                        `Connected to client: ${client.name} v${client.version}`
-                    );
-                    resolve();
-                } else if (++attempts >= MAX_RETRIES) {
-                    clearInterval(interval);
-                    reject(CLIENT_VERSION_TIMEOUT);
-                }
-            } catch (error: unknown) {
-                clearInterval(interval);
-                reject(error);
-            }
-        }, POLL_INTERVAL_MS);
-    });
-}
 
 async function main() {
     const session = new Session();
@@ -54,16 +24,6 @@ async function main() {
     const transport = new StdioServerTransport();
 
     await server.connect(transport);
-    try {
-        await pollClientVersion(mcpServer);
-    } catch (error) {
-        logger.warning(
-            mongoLogId(1_000_006),
-            "server",
-            "Client version information unavailable after 30 seconds"
-        );
-        
-    }
 }
 
 // Start the server

src/index.ts

@@ -5,7 +5,7 @@ import { AtlasTools } from "./tools/atlas/tools.js";
 import { MongoDbTools } from "./tools/mongodb/tools.js";
 import logger, { initializeLogger } from "./logger.js";
 import { mongoLogId } from "mongodb-log-writer";
-import { getOsInfo } from '@mongodb-js/get-os-info';
+
 
 export class Server {
     public readonly session: Session;
@@ -18,19 +18,19 @@ export class Server {
 
     async connect(transport: Transport) {
         this.mcpServer.server.registerCapabilities({ logging: {} });
-
-
-        // log telemetry
-        const osInfo = await getOsInfo();
-        logger.info(mongoLogId(1_000_005), "server", `Server started with osInfo ${JSON.stringify(osInfo)}`);
-
         this.registerTools();
 
         await initializeLogger(this.mcpServer);
 
         await this.mcpServer.connect(transport);
 
-        logger.info(mongoLogId(1_000_004), "server", `Server started with transport ${transport.constructor.name}`);
+        this.mcpServer.server.oninitialized = () =>  {
+            const client = this.mcpServer.server.getClientVersion();
+            this.session.clientName = client?.name;
+            this.session.clientVersion = client?.version;
+
+            logger.info(mongoLogId(1_000_004), "server", `Server started with transport ${transport.constructor.name}`);        
+        };
     }
 
     async close(): Promise<void> {

src/server.ts

@@ -1,10 +1,15 @@
 import { NodeDriverServiceProvider } from "@mongosh/service-provider-node-driver";
 import { ApiClient } from "./common/atlas/apiClient.js";
 import config from "./config.js";
+import logger from "./logger.js";
+import { mongoLogId } from "mongodb-log-writer";
 
 export class Session {
+    sessionId?: string;
     serviceProvider?: NodeDriverServiceProvider;
     apiClient?: ApiClient;
+    clientName?: string;
+    clientVersion?: string;  
 
     ensureAuthenticated(): asserts this is { apiClient: ApiClient } {
         if (!this.apiClient) {
@@ -34,4 +39,12 @@ export class Session {
             this.serviceProvider = undefined;
         }
     }
+
+    async emitTelemetry(todo: unknown): Promise<void> {
+        logger.info(
+            mongoLogId(1_000_001),
+            "telemetry",
+            `Telemetry event: ${JSON.stringify(todo)}`
+        );
+    }
 }

src/session.ts

@@ -2,6 +2,7 @@ import { ToolBase, ToolCategory } from "../tool.js";
 import { Session } from "../../session.js";
 
 export abstract class AtlasToolBase extends ToolBase {
+    protected category = "atlas";
     constructor(protected readonly session: Session) {
         super(session);
     }

src/tools/atlas/atlasTool.ts

@@ -22,6 +22,8 @@ export abstract class ToolBase {
 
     protected abstract argsShape: ZodRawShape;
 
+    protected abstract category: string;
+
     protected abstract execute(...args: Parameters<ToolCallback<typeof this.argsShape>>): Promise<CallToolResult>;
 
     protected constructor(protected session: Session) {}
@@ -33,7 +35,6 @@ export abstract class ToolBase {
 
         const callback: ToolCallback<typeof this.argsShape> = async (...args) => {
             try {
-                // TODO: add telemetry here
                 logger.debug(
                     mongoLogId(1_000_006),
                     "tool",