Move telemetry to tooling sdk

Author: allison-grady

packages/b2c-dx-mcp/package.json

@@ -85,8 +85,6 @@
     "@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

@@ -130,12 +130,12 @@
 
 import {Flags} from '@oclif/core';
 import {BaseCommand, MrtCommand, InstanceCommand} from '@salesforce/b2c-tooling-sdk/cli';
+import {createTelemetry, type Telemetry} from '@salesforce/b2c-tooling-sdk/telemetry';
 import {StdioServerTransport} from '@modelcontextprotocol/sdk/server/stdio.js';
 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';
+import {TOOLSETS, type StartupFlags, loadAppInsightsKey} from '../utils/index.js';
 
 /**
  * oclif Command that starts the B2C DX MCP server.
@@ -250,28 +250,18 @@ export default class McpServerCommand extends BaseCommand<typeof McpServerComman
     // Initialize telemetry unless disabled
     let telemetry: Telemetry | undefined;
     if (!this.flags['no-telemetry']) {
-      telemetry = new Telemetry({
-        toolsets: (startupFlags.toolsets ?? []).join(','),
+      telemetry = createTelemetry({
+        project: 'b2c-dx-mcp',
+        appInsightsKey: loadAppInsightsKey(),
         version: this.config.version,
+        initialAttributes: {
+          toolsets: (startupFlags.toolsets ?? []).join(', '),
+        },
       });
       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});
+      process.stdin.on('close', (err) => {
+        telemetry?.sendEvent(err ? 'SERVER_STOPPED_ERROR' : 'SERVER_STOPPED_SUCCESS');
         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);
       });
     }
 

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

@@ -15,7 +15,7 @@ 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';
+import type {Telemetry} from '@salesforce/b2c-tooling-sdk/telemetry';
 
 /**
  * Extended server options.

packages/b2c-dx-mcp/src/utils/index.ts

@@ -4,6 +4,10 @@
  * For full license text, see the license.txt file in the repo root or http://www.apache.org/licenses/LICENSE-2.0
  */
 
+import fs from 'node:fs';
+import path from 'node:path';
+import {fileURLToPath} from 'node:url';
+
 /**
  * Utility modules for the B2C DX MCP server.
  *
@@ -15,3 +19,31 @@
 // output needs .js extensions to work at runtime with Node.js ESM.
 export * from './constants.js';
 export * from './types.js';
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+
+/**
+ * Load a value from the config.json file.
+ * @param key - The key to load from the config file
+ * @returns The value or undefined if not found
+ */
+function loadConfigValue(key: string): string | undefined {
+  try {
+    const cfgPath = path.resolve(__dirname, './config.json');
+    if (!fs.existsSync(cfgPath)) return undefined;
+    const raw = fs.readFileSync(cfgPath, 'utf8');
+    const cfg = JSON.parse(raw) as Record<string, unknown>;
+    const v = cfg?.[key];
+    return typeof v === 'string' && v.trim() ? v.trim() : undefined;
+  } catch {
+    return undefined;
+  }
+}
+
+/**
+ * Load the Application Insights connection string from the config.json file.
+ * @returns The connection string or undefined if not configured
+ */
+export function loadAppInsightsKey(): string | undefined {
+  return loadConfigValue('applicationInsightsConnectionString');
+}

packages/b2c-tooling-sdk/package.json

@@ -221,6 +221,17 @@
         "types": "./dist/cjs/test-utils/index.d.ts",
         "default": "./dist/cjs/test-utils/index.js"
       }
+    },
+    "./telemetry": {
+      "development": "./src/telemetry/index.ts",
+      "import": {
+        "types": "./dist/esm/telemetry/index.d.ts",
+        "default": "./dist/esm/telemetry/index.js"
+      },
+      "require": {
+        "types": "./dist/cjs/telemetry/index.d.ts",
+        "default": "./dist/cjs/telemetry/index.js"
+      }
     }
   },
   "main": "./dist/cjs/index.js",
@@ -289,6 +300,7 @@
     "node": ">=22.16.0"
   },
   "dependencies": {
+    "@salesforce/telemetry": "^6.1.0",
     "archiver": "^7.0.1",
     "chokidar": "^5.0.0",
     "cliui": "^9.0.1",

packages/b2c-tooling-sdk/src/telemetry/index.ts

@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2025, Salesforce, Inc.
+ * SPDX-License-Identifier: Apache-2
+ * For full license text, see the license.txt file in the repo root or http://www.apache.org/licenses/LICENSE-2.0
+ */
+
+export type {TelemetryAttributes, TelemetryOptions} from './types.js';
+export {Telemetry} from './telemetry.js';
+
+import {Telemetry} from './telemetry.js';
+import type {TelemetryOptions} from './types.js';
+
+/**
+ * Factory function to create a Telemetry instance.
+ *
+ * @param options - Telemetry configuration options
+ * @returns A new Telemetry instance
+ *
+ * @example
+ * ```typescript
+ * import { createTelemetry } from '@salesforce/b2c-tooling-sdk/telemetry';
+ *
+ * const telemetry = createTelemetry({
+ *   project: 'my-mcp-server',
+ *   appInsightsKey: process.env.APP_INSIGHTS_KEY,
+ *   version: '1.0.0',
+ *   initialAttributes: { environment: 'production' },
+ * });
+ *
+ * await telemetry.start();
+ * telemetry.sendEvent('SERVER_STATUS', { status: 'started' });
+ * ```
+ */
+export function createTelemetry(options: TelemetryOptions): Telemetry {
+  return new Telemetry(options);
+}