fix: update to latest structure

Author: gagik

packages/logging/src/logging-and-telemetry.spec.ts

@@ -289,6 +289,50 @@ describe('MongoshLoggingAndTelemetry', function () {
       ]);
     });
 
+    it('resolves device ID setup when flushed', async function () {
+      const loggingAndTelemetry = setupLoggingAndTelemetry({
+        ...testLoggingArguments,
+        bus,
+        deviceId: undefined,
+      });
+      sinon
+        // eslint-disable-next-line @typescript-eslint/no-var-requires
+        .stub(require('native-machine-id'), 'getMachineId')
+        .resolves(
+          new Promise((resolve) => setTimeout(resolve, 10_000).unref())
+        );
+
+      loggingAndTelemetry.attachLogger(logger);
+
+      // Start the device ID setup
+      const setupPromise = (loggingAndTelemetry as LoggingAndTelemetry)
+        .setupTelemetryPromise;
+
+      // Flush before it completes
+      loggingAndTelemetry.flush();
+
+      // Emit an event that would trigger analytics
+      bus.emit('mongosh:new-user', { userId, anonymousId: userId });
+
+      await setupPromise;
+
+      // Should still identify but with unknown device ID
+      expect(analyticsOutput).deep.equal([
+        [
+          'identify',
+          {
+            deviceId: 'unknown',
+            anonymousId: userId,
+            traits: {
+              platform: process.platform,
+              arch: process.arch,
+              session_id: logId,
+            },
+          },
+        ],
+      ]);
+    });
+
     it('only delays analytic outputs, not logging', async function () {
       // eslint-disable-next-line @typescript-eslint/no-empty-function
       let resolveTelemetry: (value: unknown) => void = () => {};

packages/logging/src/logging-and-telemetry.ts

@@ -92,10 +92,11 @@ export class LoggingAndTelemetry implements MongoshLoggingAndTelemetry {
   private isBufferingTelemetryEvents = false;
 
   private deviceId: string | undefined;
-  /** @internal */
+
+  /** @internal Used for awaiting the telemetry setup in tests. */
   public setupTelemetryPromise: Promise<void> = Promise.resolve();
 
-  private readonly abortController: AbortController = new AbortController();
+  private readonly telemetrySetup: AbortController = new AbortController();
 
   constructor({
     bus,
@@ -126,13 +127,12 @@ export class LoggingAndTelemetry implements MongoshLoggingAndTelemetry {
   }
 
   public flush(): void {
-    // Run any telemetry events even if device ID hasn't been resolved yet
-    this.runAndClearPendingTelemetryEvents();
-
     // Run any other pending events with the set or dummy log for telemetry purposes.
     this.runAndClearPendingBusEvents();
 
-    this.abortController.abort();
+    // Abort setup, which will cause the device ID to be set to 'unknown'
+    // and run any remaining telemetry events
+    this.telemetrySetup.abort();
   }
 
   private async setupTelemetry(): Promise<void> {
@@ -143,7 +143,7 @@ export class LoggingAndTelemetry implements MongoshLoggingAndTelemetry {
         getMachineId: () => getMachineId({ raw: true }),
         onError: (_, error) =>
           this.bus.emit('mongosh:error', error, 'telemetry'),
-        abortSignal: this.abortController.signal,
+        abortSignal: this.telemetrySetup.signal,
       });
     }