fix: address comments

Author: fmenezes

src/index.ts

@@ -20,7 +20,7 @@ try {
         version: packageInfo.version,
     });
 
-    const telemetry = Telemetry.create(session, config);
+    const telemetry = await Telemetry.create(session, config);
 
     const server = new Server({
         mcpServer,

src/telemetry/telemetry.ts

@@ -39,8 +39,8 @@ async function isContainerized(): Promise<boolean> {
 }
 
 export class Telemetry {
-    private deviceIdPromise: Promise<string> | undefined;
-    private containerEnvPromise: Promise<boolean> | undefined;
+    private deviceId: string | undefined;
+    private containerEnv: boolean | undefined;
     private deviceIdAbortController = new AbortController();
     private eventCache: EventCache;
     private getRawMachineId: () => Promise<string>;
@@ -64,7 +64,7 @@ export class Telemetry {
         this.getContainerEnv = getContainerEnv;
     }
 
-    static create(
+    static async create(
         session: Session,
         userConfig: UserConfig,
         {
@@ -76,23 +76,23 @@ export class Telemetry {
             getRawMachineId?: () => Promise<string>;
             getContainerEnv?: () => Promise<boolean>;
         } = {}
-    ): Telemetry {
+    ): Promise<Telemetry> {
         const instance = new Telemetry(session, userConfig, {
             eventCache,
             getRawMachineId,
             getContainerEnv,
         });
 
-        instance.start();
+        await instance.start();
         return instance;
     }
 
-    private start(): void {
+    private async start(): Promise<void> {
         if (!this.isTelemetryEnabled()) {
             return;
         }
 
-        this.deviceIdPromise = getDeviceId({
+        const deviceIdPromise = getDeviceId({
             getMachineId: () => this.getRawMachineId(),
             onError: (reason, error) => {
                 switch (reason) {
@@ -109,7 +109,9 @@ export class Telemetry {
             },
             abortSignal: this.deviceIdAbortController.signal,
         });
-        this.containerEnvPromise = this.getContainerEnv();
+        const containerEnvPromise = this.getContainerEnv();
+
+        [this.deviceId, this.containerEnv] = await Promise.all([deviceIdPromise, containerEnvPromise]);
     }
 
     public async close(): Promise<void> {
@@ -138,16 +140,16 @@ export class Telemetry {
      * Gets the common properties for events
      * @returns Object containing common properties for all events
      */
-    private async getCommonProperties(): Promise<CommonProperties> {
+    private getCommonProperties(): CommonProperties {
         return {
             ...MACHINE_METADATA,
             mcp_client_version: this.session.agentRunner?.version,
             mcp_client_name: this.session.agentRunner?.name,
             session_id: this.session.sessionId,
             config_atlas_auth: this.session.apiClient.hasCredentials() ? "true" : "false",
             config_connection_string: this.userConfig.connectionString ? "true" : "false",
-            is_container_env: (await this.containerEnvPromise) ? "true" : "false",
-            device_id: await this.deviceIdPromise,
+            is_container_env: this.containerEnv ? "true" : "false",
+            device_id: this.deviceId,
         };
     }
 
@@ -204,11 +206,10 @@ export class Telemetry {
      * Attempts to send events through the provided API client
      */
     private async sendEvents(client: ApiClient, events: BaseEvent[]): Promise<void> {
-        const commonProperties = await this.getCommonProperties();
         await client.sendEvents(
             events.map((event) => ({
                 ...event,
-                properties: { ...commonProperties, ...event.properties },
+                properties: { ...this.getCommonProperties(), ...event.properties },
             }))
         );
     }

tests/integration/helpers.ts

@@ -67,7 +67,7 @@ export function setupIntegrationTest(getUserConfig: () => UserConfig): Integrati
 
         userConfig.telemetry = "disabled";
 
-        const telemetry = Telemetry.create(session, userConfig);
+        const telemetry = await Telemetry.create(session, userConfig);
 
         mcpServer = new Server({
             session,

tests/unit/telemetry.test.ts

@@ -99,7 +99,7 @@ describe("Telemetry", () => {
         }
     }
 
-    beforeEach(() => {
+    beforeEach(async () => {
         // Reset mocks before each test
         jest.clearAllMocks();
 
@@ -137,7 +137,7 @@ describe("Telemetry", () => {
             getContainerEnv: () => Promise.resolve(false),
         };
 
-        telemetry = Telemetry.create(session, config, telemetryConfig);
+        telemetry = await Telemetry.create(session, config, telemetryConfig);
 
         config.telemetry = "enabled";
     });
@@ -247,7 +247,7 @@ describe("Telemetry", () => {
                 it("should handle machine ID resolution failure", async () => {
                     const loggerSpy = jest.spyOn(logger, "debug");
 
-                    telemetry = Telemetry.create(session, config, {
+                    telemetry = await Telemetry.create(session, config, {
                         ...telemetryConfig,
                         getRawMachineId: () => Promise.reject(new Error("Failed to get device ID")),
                     });
@@ -266,7 +266,7 @@ describe("Telemetry", () => {
                 it("should timeout if machine ID resolution takes too long", async () => {
                     const loggerSpy = jest.spyOn(logger, "debug");
 
-                    telemetry = Telemetry.create(session, config, {
+                    telemetry = await Telemetry.create(session, config, {
                         ...telemetryConfig,
                         getRawMachineId: () => new Promise(() => {}), // Never resolves
                     });