fix: tests

Author: fmenezes

src/telemetry/telemetry.ts

@@ -74,6 +74,7 @@ export class Telemetry {
         });
 
         this.commonProperties.device_id = await this.deviceIdPromise;
+        this.commonProperties.is_container_env = (await this.isContainerized()) ? "true" : "false";
 
         this.isBufferingEvents = false;
     }
@@ -105,15 +106,14 @@ export class Telemetry {
      * Gets the common properties for events
      * @returns Object containing common properties for all events
      */
-    public async getCommonProperties(): Promise<CommonProperties> {
+    public getCommonProperties(): CommonProperties {
         return {
             ...this.commonProperties,
             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.isContainerized()) ? "true" : "false",
         };
     }
 
@@ -206,11 +206,10 @@ export class Telemetry {
      */
     private async sendEvents(client: ApiClient, events: BaseEvent[]): Promise<EventResult> {
         try {
-            const commonProperties = await this.getCommonProperties();
             await client.sendEvents(
                 events.map((event) => ({
                     ...event,
-                    properties: { ...commonProperties, ...event.properties },
+                    properties: { ...this.getCommonProperties(), ...event.properties },
                 }))
             );
             return { success: true };

tests/integration/telemetry.test.ts

@@ -17,14 +17,12 @@ describe("Telemetry", () => {
             userConfig: config,
         });
 
-        const commonProperties = await telemetry.getCommonProperties();
-
-        expect(commonProperties.device_id).toBe(undefined);
+        expect(telemetry.getCommonProperties().device_id).toBe(undefined);
         expect(telemetry["isBufferingEvents"]).toBe(true);
 
         await telemetry.deviceIdPromise;
 
-        expect(commonProperties.device_id).toBe(actualHashedId);
+        expect(telemetry.getCommonProperties().device_id).toBe(actualHashedId);
         expect(telemetry["isBufferingEvents"]).toBe(false);
     });
 });

tests/unit/telemetry.test.ts

@@ -55,7 +55,7 @@ describe("Telemetry", () => {
     }
 
     // Helper function to verify mock calls to reduce duplication
-    async function verifyMockCalls({
+    function verifyMockCalls({
         sendEventsCalls = 0,
         clearEventsCalls = 0,
         appendEventsCalls = 0,
@@ -77,13 +77,11 @@ describe("Telemetry", () => {
         expect(appendEvents.length).toBe(appendEventsCalls);
 
         if (sendEventsCalledWith) {
-            const commonProperties = await telemetry.getCommonProperties();
-
             expect(sendEvents[0]?.[0]).toEqual(
                 sendEventsCalledWith.map((event) => ({
                     ...event,
                     properties: {
-                        ...commonProperties,
+                        ...telemetry.getCommonProperties(),
                         ...event.properties,
                     },
                 }))
@@ -144,7 +142,7 @@ describe("Telemetry", () => {
 
                 await telemetry.emitEvents([testEvent]);
 
-                await verifyMockCalls({
+                verifyMockCalls({
                     sendEventsCalls: 1,
                     clearEventsCalls: 1,
                     sendEventsCalledWith: [testEvent],
@@ -158,7 +156,7 @@ describe("Telemetry", () => {
 
                 await telemetry.emitEvents([testEvent]);
 
-                await verifyMockCalls({
+                verifyMockCalls({
                     sendEventsCalls: 1,
                     appendEventsCalls: 1,
                     appendEventsCalledWith: [testEvent],
@@ -181,16 +179,14 @@ describe("Telemetry", () => {
 
                 await telemetry.emitEvents([newEvent]);
 
-                await verifyMockCalls({
+                verifyMockCalls({
                     sendEventsCalls: 1,
                     clearEventsCalls: 1,
                     sendEventsCalledWith: [cachedEvent, newEvent],
                 });
             });
 
             it("should correctly add common properties to events", () => {
-                const commonProps = await telemetry.getCommonProperties();
-
                 // Use explicit type assertion
                 const expectedProps: Record<string, string> = {
                     mcp_client_version: "1.0.0",
@@ -201,7 +197,7 @@ describe("Telemetry", () => {
                     device_id: hashedMachineId,
                 };
 
-                expect(commonProps).toMatchObject(expectedProps);
+                expect(telemetry.getCommonProperties()).toMatchObject(expectedProps);
             });
 
             describe("machine ID resolution", () => {
@@ -302,7 +298,7 @@ describe("Telemetry", () => {
 
                 await telemetry.emitEvents([testEvent]);
 
-                await verifyMockCalls();
+                verifyMockCalls();
             });
         });
 
@@ -327,7 +323,7 @@ describe("Telemetry", () => {
 
                 await telemetry.emitEvents([testEvent]);
 
-                await verifyMockCalls();
+                verifyMockCalls();
             });
         });
     });