address comment: isolate machine data

Author: blva

src/config.ts

@@ -40,7 +40,8 @@ const mergedUserConfig = {
     ...getCliConfig(),
 };
 
-const machineMetadata = {
+// Machine-specific metadata that isn't configurable
+export const machineMetadata = {
     device_id: "id", // TODO: use @mongodb-js/machine-id
     platform: process.platform,
     arch: process.arch,
@@ -50,7 +51,6 @@ const machineMetadata = {
 
 const config = {
     ...mergedUserConfig,
-    ...machineMetadata,
     version: packageJson.version,
     mcpServerName: "MdbMcpServer",
     isTelemetryEnabled: true,

src/telemetry/telemetry.ts

@@ -1,14 +1,13 @@
 import { Session } from "../session.js";
 import { BaseEvent, type ToolEvent } from "./types.js";
-import pkg from "../../package.json" with { type: "json" };
 import config from "../config.js";
 import logger from "../logger.js";
 import { mongoLogId } from "mongodb-log-writer";
 import { ApiClient } from "../common/atlas/apiClient.js";
 import fs from "fs/promises";
 import path from "path";
+import { MACHINE_METADATA } from "./constants.js";
 
-const TELEMETRY_ENABLED = config.telemetry !== "disabled";
 const CACHE_FILE = path.join(process.cwd(), ".telemetry-cache.json");
 
 interface TelemetryError extends Error {
@@ -39,24 +38,26 @@ export class Telemetry {
     constructor(private readonly session: Session) {
         // Ensure all required properties are present
         this.commonProperties = Object.freeze({
-            device_id: config.device_id,
-            mcp_server_version: pkg.version,
-            mcp_server_name: config.mcpServerName,
+            ...MACHINE_METADATA,
             mcp_client_version: this.session.agentRunner?.version,
             mcp_client_name: this.session.agentRunner?.name,
-            platform: config.platform,
-            arch: config.arch,
-            os_type: config.os_type,
-            os_version: config.os_version,
         });
     }
 
+    /**
+     * Checks if telemetry is currently enabled
+     * This is a method rather than a constant to capture runtime config changes
+     */
+    private static isTelemetryEnabled(): boolean {
+        return config.telemetry !== "disabled";
+    }
+
     /**
      * Emits events through the telemetry pipeline
      * @param events - The events to emit
      */
     public async emitEvents(events: BaseEvent[]): Promise<void> {
-        if (!TELEMETRY_ENABLED) {
+        if (!Telemetry.isTelemetryEnabled()) {
             logger.debug(mongoLogId(1_000_000), "telemetry", "Telemetry is disabled, skipping events.");
             return;
         }