First draft

Author: allison-grady

packages/b2c-dx-mcp/.gitignore

@@ -15,5 +15,6 @@ yarn.lock
 package-lock.json
 
 dw.json
+config.json
 
 export/

packages/b2c-dx-mcp/package.json

@@ -85,6 +85,8 @@
     "@modelcontextprotocol/sdk": "^1.18.0",
     "@oclif/core": "^4",
     "@salesforce/b2c-tooling-sdk": "workspace:*",
+    "@salesforce/telemetry": "^6.1.0",
+    "applicationinsights": "^3.13.0",
     "zod": "^3.25.76"
   },
   "devDependencies": {

packages/b2c-dx-mcp/src/commands/mcp.ts

@@ -19,6 +19,7 @@
  * | `--toolsets` | `SFCC_TOOLSETS` | Comma-separated toolsets to enable (case-insensitive) |
  * | `--tools` | `SFCC_TOOLS` | Comma-separated individual tools to enable (case-insensitive) |
  * | `--allow-non-ga-tools` | `SFCC_ALLOW_NON_GA_TOOLS` | Enable experimental/non-GA tools |
+ * | `--no-telemetry` | `SFCC_NO_TELEMETRY` | Disable telemetry collection |
  *
  * ### MRT Flags (from MrtCommand.baseFlags)
  * | Flag | Env Variable | Description |
@@ -134,6 +135,7 @@ import {B2CDxMcpServer} from '../server.js';
 import {Services} from '../services.js';
 import {registerToolsets} from '../registry.js';
 import {TOOLSETS, type StartupFlags} from '../utils/index.js';
+import {Telemetry} from '../utils/telemetry.js';
 
 /**
  * oclif Command that starts the B2C DX MCP server.
@@ -200,6 +202,11 @@ export default class McpServerCommand extends BaseCommand<typeof McpServerComman
       env: 'SFCC_ALLOW_NON_GA_TOOLS',
       default: false,
     }),
+    'no-telemetry': Flags.boolean({
+      description: 'Disable telemetry collection',
+      env: 'SFCC_NO_TELEMETRY',
+      default: false,
+    }),
   };
 
   /**
@@ -240,21 +247,35 @@ export default class McpServerCommand extends BaseCommand<typeof McpServerComman
       workingDirectory: this.flags['working-directory'],
     };
 
-    // TODO: Telemetry - Initialize telemetry unless disabled
-    // if (!flags["no-telemetry"]) {
-    //   telemetry = new Telemetry({
-    //     toolsets: (startupFlags.toolsets ?? []).join(", "),
-    //     configDir,
-    //     version: this.config.version,
-    //   });
-    //   await telemetry.start();
-    //   process.stdin.on("close", (err) => {
-    //     telemetry?.sendEvent(err ? "SERVER_STOPPED_ERROR" : "SERVER_STOPPED_SUCCESS");
-    //     telemetry?.stop();
-    //   });
-    // }
+    // Initialize telemetry unless disabled
+    let telemetry: Telemetry | undefined;
+    if (!this.flags['no-telemetry']) {
+      telemetry = new Telemetry({
+        toolsets: (startupFlags.toolsets ?? []).join(','),
+        version: this.config.version,
+      });
+      await telemetry.start();
+
+      // Set up process exit handlers to send SERVER_STATUS stopped events
+      const sendStop = (signal: string): void => {
+        telemetry?.sendEvent('SERVER_STATUS', {status: 'stopped', signal});
+        telemetry?.stop();
+      };
+
+      process.on('exit', () => sendStop('exit'));
+      process.on('SIGINT', () => {
+        sendStop('SIGINT');
+        // eslint-disable-next-line n/no-process-exit
+        process.exit(0);
+      });
+      process.on('SIGTERM', () => {
+        sendStop('SIGTERM');
+        // eslint-disable-next-line n/no-process-exit
+        process.exit(0);
+      });
+    }
 
-    // Create MCP server
+    // Create MCP server with telemetry
     const server = new B2CDxMcpServer(
       {
         name: this.config.name,
@@ -265,6 +286,7 @@ export default class McpServerCommand extends BaseCommand<typeof McpServerComman
           resources: {},
           tools: {},
         },
+        telemetry,
       },
     );
 

packages/b2c-dx-mcp/src/server.ts

@@ -15,19 +15,27 @@ import type {ServerOptions} from '@modelcontextprotocol/sdk/server/index.js';
 import type {RequestHandlerExtra} from '@modelcontextprotocol/sdk/shared/protocol.js';
 import type {Transport} from '@modelcontextprotocol/sdk/shared/transport.js';
 import type {ZodRawShape} from 'zod';
+import type {Telemetry} from './utils/telemetry.js';
 
 /**
  * Extended server options.
  */
-export type B2CDxMcpServerOptions = ServerOptions;
+export interface B2CDxMcpServerOptions extends ServerOptions {
+  /**
+   * Telemetry instance for tracking server and tool events.
+   * If not provided, telemetry is disabled.
+   */
+  telemetry?: Telemetry;
+}
 
 /**
  * A server implementation that extends the base MCP server.
  *
- *
  * @augments {McpServer}
  */
 export class B2CDxMcpServer extends McpServer {
+  private telemetry?: Telemetry;
+
   /**
    * Creates a new B2CDxMcpServer instance
    *
@@ -36,15 +44,17 @@ export class B2CDxMcpServer extends McpServer {
    */
   public constructor(serverInfo: Implementation, options?: B2CDxMcpServerOptions) {
     super(serverInfo, options);
+    this.telemetry = options?.telemetry;
 
     // Set up oninitialized handler
     this.server.oninitialized = (): void => {
       const clientInfo = this.server.getClientVersion();
       if (clientInfo) {
-        // TODO: Telemetry - Add client info attributes
-        // telemetry.addAttributes({ clientName: clientInfo.name, clientVersion: clientInfo.version });
+        this.telemetry?.addAttributes({
+          clientName: clientInfo.name,
+          clientVersion: clientInfo.version,
+        });
       }
-      // TODO: Telemetry - Send SERVER_START_SUCCESS event
     };
   }
 
@@ -68,13 +78,29 @@ export class B2CDxMcpServer extends McpServer {
       args: Record<string, unknown>,
       _extra: RequestHandlerExtra<ServerRequest, ServerNotification>,
     ): Promise<CallToolResult> => {
-      // TODO: Telemetry - Track timing and send TOOL_CALLED event
-      // const startTime = Date.now();
-      const result = await handler(args);
-      // const runtimeMs = Date.now() - startTime;
-      // telemetry.sendEvent('TOOL_CALLED', { name, runtimeMs, isError: result.isError });
+      const startTime = Date.now();
+      try {
+        const result = await handler(args);
+        const runTimeMs = Date.now() - startTime;
 
-      return result;
+        this.telemetry?.sendEvent('TOOL_CALLED', {
+          toolName: name,
+          runTimeMs,
+          isError: result.isError ?? false,
+        });
+
+        return result;
+      } catch (error) {
+        const runTimeMs = Date.now() - startTime;
+
+        this.telemetry?.sendEvent('TOOL_CALLED', {
+          toolName: name,
+          runTimeMs,
+          isError: true,
+        });
+
+        throw error;
+      }
     };
 
     // Use the new registerTool API (tool() is deprecated)
@@ -85,10 +111,22 @@ export class B2CDxMcpServer extends McpServer {
    * Connect to a transport.
    */
   public override async connect(transport: Transport): Promise<void> {
-    await super.connect(transport);
-    if (!this.isConnected()) {
-      // TODO: Telemetry - Send SERVER_START_ERROR event with "Server not connected"
+    try {
+      await super.connect(transport);
+      if (this.isConnected()) {
+        this.telemetry?.sendEvent('SERVER_STATUS', {status: 'started'});
+      } else {
+        this.telemetry?.sendEvent('SERVER_STATUS', {
+          status: 'error',
+          errorMessage: 'Server not connected after connect() call',
+        });
+      }
+    } catch (error) {
+      this.telemetry?.sendEvent('SERVER_STATUS', {
+        status: 'error',
+        errorMessage: error instanceof Error ? error.message : String(error),
+      });
+      throw error;
     }
-    // TODO: Telemetry - wrap with try/catch to send SERVER_START_ERROR event with error details
   }
 }