Move insights connection to .js, minor organization changes

Author: allison-grady

packages/b2c-dx-mcp/package.json

@@ -51,6 +51,13 @@
         "default": "./dist/commands/mcp.js"
       }
     },
+    "./config": {
+      "development": "./src/config.ts",
+      "import": {
+        "types": "./dist/config.d.ts",
+        "default": "./dist/config.js"
+      }
+    },
     "./tools": {
       "development": "./src/tools/index.ts",
       "import": {

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

@@ -0,0 +1,21 @@
+/*
+ * 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
+ */
+/**
+ * Configuration constants.
+ *
+ * @module config
+ */
+
+const DEFAULT_APPLICATION_INSIGHTS_CONNECTION_STRING =
+  'InstrumentationKey=acf013a7-d3b9-49e3-9d26-03fd87dbec0b;IngestionEndpoint=https://eastus-8.in.applicationinsights.azure.com/;LiveEndpoint=https://eastus.livediagnostics.monitor.azure.com/;ApplicationId=efe01240-2e8f-40c1-938a-534cca8a270b';
+
+/**
+ * Application Insights connection string for telemetry.
+ *
+ * Can be overridden via the `B2C_DX_MCP_APP_INSIGHTS_CONNECTION_STRING` environment variable for testing.
+ */
+export const APPLICATION_INSIGHTS_CONNECTION_STRING =
+  process.env.B2C_DX_MCP_APP_INSIGHTS_CONNECTION_STRING ?? DEFAULT_APPLICATION_INSIGHTS_CONNECTION_STRING;

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

@@ -4,9 +4,7 @@
  * 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';
+import {APPLICATION_INSIGHTS_CONNECTION_STRING} from '../config.js';
 
 /**
  * Utility modules for the B2C DX MCP server.
@@ -20,30 +18,10 @@ import {fileURLToPath} from 'node:url';
 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.
+ * Load the Application Insights connection string.
  * @returns The connection string or undefined if not configured
  */
 export function loadAppInsightsKey(): string | undefined {
-  return loadConfigValue('applicationInsightsConnectionString');
+  return APPLICATION_INSIGHTS_CONNECTION_STRING;
 }

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

@@ -4,7 +4,7 @@
  * 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 type {TelemetryAttributes, TelemetryEventProperties, TelemetryOptions} from './types.js';
 export {Telemetry} from './telemetry.js';
 
 import {Telemetry} from './telemetry.js';

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

@@ -9,7 +9,7 @@ import fs from 'node:fs';
 import path from 'node:path';
 import os from 'node:os';
 import {TelemetryReporter} from '@salesforce/telemetry';
-import type {TelemetryAttributes, TelemetryOptions} from './types.js';
+import type {TelemetryAttributes, TelemetryEventProperties, TelemetryOptions} from './types.js';
 
 const generateRandomId = (): string => randomBytes(20).toString('hex');
 
@@ -118,25 +118,22 @@ export class Telemetry {
    */
   sendEvent(eventName: string, attributes: TelemetryAttributes = {}): void {
     try {
-      this.reporter?.sendTelemetryEvent(eventName, {
-        // TODO create interface for clarity
+      const eventProperties: TelemetryEventProperties = {
         ...this.attributes,
         ...attributes,
-        // Identifiers
         sessionId: this.sessionId,
         cliId: this.cliId,
-        // System information
         version: this.version,
         platform: process.platform,
         arch: process.arch,
         nodeVersion: process.version,
         nodeEnv: process.env.NODE_ENV,
         origin: this.project,
-        // Timestamps
         date: new Date().toUTCString(),
         timestamp: String(Date.now()),
         processUptime: process.uptime() * 1000,
-      });
+      };
+      this.reporter?.sendTelemetryEvent(eventName, eventProperties);
     } catch {
       // ignore send errors
     }

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

@@ -11,6 +11,34 @@ export interface TelemetryAttributes {
   [key: string]: boolean | number | string | undefined;
 }
 
+/**
+ * Core properties automatically included with every telemetry event.
+ */
+export interface TelemetryEventProperties extends TelemetryAttributes {
+  /** Unique session identifier (generated per Telemetry instance) */
+  sessionId: string;
+  /** Persistent CLI identifier (stored in ~/.{project}/cliid) */
+  cliId: string;
+  /** Package version */
+  version: string;
+  /** Operating system platform (e.g., 'darwin', 'linux', 'win32') */
+  platform: string;
+  /** CPU architecture (e.g., 'x64', 'arm64') */
+  arch: string;
+  /** Node.js version */
+  nodeVersion: string;
+  /** NODE_ENV environment variable value */
+  nodeEnv: string | undefined;
+  /** Project name / origin of the event */
+  origin: string;
+  /** Human-readable UTC date string */
+  date: string;
+  /** Unix timestamp in milliseconds */
+  timestamp: string;
+  /** Process uptime in milliseconds */
+  processUptime: number;
+}
+
 /**
  * Options for creating a Telemetry instance.
  */