fix: merge getCommonProperties and getAsyncCommonProperties

Author: fmenezes

src/telemetry/telemetry.ts

@@ -50,8 +50,8 @@ async function isContainerized(): Promise<boolean> {
 export class Telemetry {
     /** Resolves when the device ID is retrieved or timeout occurs */
     private pendingPromises: number = 2;
-    public deviceIdPromise: Promise<string> | undefined;
-    public containerEnvPromise: Promise<boolean> | undefined;
+    private deviceIdPromise: Promise<string> | undefined;
+    private containerEnvPromise: Promise<boolean> | undefined;
     private deviceIdAbortController = new AbortController();
     private eventCache: EventCache;
     private getRawMachineId: () => Promise<string>;
@@ -156,20 +156,14 @@ export class Telemetry {
      * Gets the common properties for events
      * @returns Object containing common properties for all events
      */
-    public getCommonProperties(): CommonProperties {
+    public async getCommonProperties(): Promise<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",
-        };
-    }
-
-    public async getAsyncCommonProperties(): Promise<CommonProperties> {
-        return {
-            ...this.getCommonProperties(),
             is_container_env: (await this.containerEnvPromise) ? "true" : "false",
             device_id: await this.deviceIdPromise,
         };
@@ -239,7 +233,7 @@ export class Telemetry {
      */
     private async sendEvents(client: ApiClient, events: BaseEvent[]): Promise<EventResult> {
         try {
-            const commonProperties = await this.getAsyncCommonProperties();
+            const commonProperties = await this.getCommonProperties();
             await client.sendEvents(
                 events.map((event) => ({
                     ...event,

tests/integration/telemetry.test.ts

@@ -14,7 +14,7 @@ describe("Telemetry", () => {
         });
 
         expect(telemetry.hasPendingPromises()).toBe(true);
-        const commonProps = await telemetry.getAsyncCommonProperties();
+        const commonProps = await telemetry.getCommonProperties();
 
         expect(commonProps.device_id).toBe(actualHashedId);
         expect(telemetry.hasPendingPromises()).toBe(false);

tests/unit/telemetry.test.ts

@@ -77,7 +77,7 @@ describe("Telemetry", () => {
         expect(appendEvents.length).toBe(appendEventsCalls);
 
         if (sendEventsCalledWith) {
-            const commonProps = await telemetry.getAsyncCommonProperties();
+            const commonProps = await telemetry.getCommonProperties();
 
             expect(sendEvents[0]?.[0]).toEqual(
                 sendEventsCalledWith.map((event) => ({
@@ -198,7 +198,7 @@ describe("Telemetry", () => {
                     device_id: hashedMachineId,
                 };
 
-                const commonProps = await telemetry.getAsyncCommonProperties();
+                const commonProps = await telemetry.getCommonProperties();
 
                 expect(commonProps).toMatchObject(expectedProps);
             });
@@ -221,7 +221,7 @@ describe("Telemetry", () => {
                     });
 
                     expect(telemetry.hasPendingPromises()).toBe(true);
-                    const commonProps = await telemetry.getAsyncCommonProperties();
+                    const commonProps = await telemetry.getCommonProperties();
                     expect(telemetry.hasPendingPromises()).toBe(false);
                     expect(commonProps.device_id).toBe(hashedMachineId);
                 });
@@ -235,7 +235,7 @@ describe("Telemetry", () => {
                     });
 
                     expect(telemetry.hasPendingPromises()).toBe(true);
-                    const commonProps = await telemetry.getAsyncCommonProperties();
+                    const commonProps = await telemetry.getCommonProperties();
                     expect(telemetry.hasPendingPromises()).toBe(false);
                     expect(commonProps.device_id).toBe("unknown");
 
@@ -256,7 +256,7 @@ describe("Telemetry", () => {
                     });
                     expect(telemetry.hasPendingPromises()).toBe(true);
                     jest.advanceTimersByTime(DEVICE_ID_TIMEOUT);
-                    const commonProps = await telemetry.getAsyncCommonProperties();
+                    const commonProps = await telemetry.getCommonProperties();
                     expect(commonProps.device_id).toBe("unknown");
                     expect(loggerSpy).toHaveBeenCalledWith(
                         LogId.telemetryDeviceIdTimeout,