@mongosh/logging 3.7.2 → 3.8.0

package/lib/analytics-helpers.d.ts

@@ -1,18 +1,12 @@
-export type MongoshAnalyticsIdentity = {
-    deviceId?: string;
-    userId: string;
-    anonymousId?: never;
-} | {
-    deviceId?: string;
-    userId?: never;
-    anonymousId: string;
-};
+import type { IdentifyParams as SegmentIdentifyParams, TrackParams as SegmentTrackParams } from '@segment/analytics-node';
+type Timestamp = SegmentTrackParams['timestamp'];
+export type MongoshAnalyticsIdentity = SegmentIdentifyParams;
 export type AnalyticsIdentifyMessage = MongoshAnalyticsIdentity & {
     traits: {
         platform: string;
         session_id: string;
-    };
-    timestamp?: Date;
+        device_id: string;
+    } & SegmentIdentifyParams['traits'];
 };
 export type AnalyticsTrackMessage = MongoshAnalyticsIdentity & {
     event: string;
@@ -21,7 +15,7 @@ export type AnalyticsTrackMessage = MongoshAnalyticsIdentity & {
         session_id: string;
         [key: string]: any;
     };
-    timestamp?: Date;
+    timestamp?: Timestamp;
 };
 export interface MongoshAnalytics {
     identify(message: AnalyticsIdentifyMessage): void;

package/lib/analytics-helpers.js

@@ -53,8 +53,10 @@ class NoopAnalytics {
 }
 exports.NoopAnalytics = NoopAnalytics;
 function addTimestamp(message) {
-    var _a;
-    return { ...message, timestamp: (_a = message.timestamp) !== null && _a !== void 0 ? _a : new Date() };
+    const timestampDate = message.timestamp instanceof Date || message.timestamp === undefined
+        ? message.timestamp
+        : new Date(message.timestamp);
+    return { ...message, timestamp: timestampDate };
 }
 class ToggleableAnalytics {
     constructor(target = new NoopAnalytics()) {

package/lib/analytics-helpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"analytics-helpers.js","sourceRoot":"","sources":["../src/analytics-helpers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"analytics-helpers.js","sourceRoot":"","sources":["../src/analytics-helpers.ts"],"names":[],"mappings":"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"}

package/lib/helpers.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toSnakeCase = exports.MultiSet = void 0;
+exports.MultiSet = void 0;
+exports.toSnakeCase = toSnakeCase;
 class MultiSet {
     constructor() {
         this._entries = new Map();
@@ -27,5 +28,4 @@ function toSnakeCase(str) {
     }
     return matches.map((x) => x.toLowerCase()).join('_');
 }
-exports.toSnakeCase = toSnakeCase;
 //# sourceMappingURL=helpers.js.map

package/lib/helpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../src/helpers.ts"],"names":[],"mappings":";;;AAGA,MAAa,QAAQ;IAArB;QACE,aAAQ,GAAwB,IAAI,GAAG,EAAE,CAAC;IAiB5C,CAAC;IAfC,GAAG,CAAC,KAAQ;;QACV,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;QACzD,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,MAAA,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,mCAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IAC5D,CAAC;IAED,KAAK;QACH,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;IACxB,CAAC;IAED,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC;QAChB,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAEzC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAM,EAAE,KAAK,CAAC,CAAC;QAC1D,CAAC;IACH,CAAC;CACF;AAlBD,4BAkBC;AAkBD,SAAgB,WAAW,CAAC,GAAW;IACrC,MAAM,OAAO,GAAG,GAAG,CAAC,KAAK,CACvB,oEAAoE,CACrE,CAAC;IACF,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,GAAG,CAAC;IACb,CAAC;IAED,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACvD,CAAC;AATD,kCASC"}
+{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../src/helpers.ts"],"names":[],"mappings":";;;AAuCA,kCASC;AA7CD,MAAa,QAAQ;IAArB;QACE,aAAQ,GAAwB,IAAI,GAAG,EAAE,CAAC;IAiB5C,CAAC;IAfC,GAAG,CAAC,KAAQ;;QACV,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;QACzD,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,MAAA,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,mCAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IAC5D,CAAC;IAED,KAAK;QACH,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;IACxB,CAAC;IAED,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC;QAChB,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAEzC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAM,EAAE,KAAK,CAAC,CAAC;QAC1D,CAAC;IACH,CAAC;CACF;AAlBD,4BAkBC;AAkBD,SAAgB,WAAW,CAAC,GAAW;IACrC,MAAM,OAAO,GAAG,GAAG,CAAC,KAAK,CACvB,oEAAoE,CACrE,CAAC;IACF,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,GAAG,CAAC;IACb,CAAC;IAED,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACvD,CAAC"}

package/lib/logging-and-telemetry.d.ts

@@ -1,8 +1,5 @@
 import { MongoLogWriter } from 'mongodb-log-writer';
 import type { MongoshLoggingAndTelemetry, MongoshLoggingAndTelemetryArguments } from './types';
-export declare function getDeviceId({ onError, }?: {
-    onError?: (error: Error) => void;
-}): Promise<string | 'unknown'>;
 export declare function setupLoggingAndTelemetry(props: MongoshLoggingAndTelemetryArguments): MongoshLoggingAndTelemetry;
 export declare class LoggingAndTelemetry implements MongoshLoggingAndTelemetry {
     private static dummyLogger;
@@ -18,7 +15,7 @@ export declare class LoggingAndTelemetry implements MongoshLoggingAndTelemetry {
     private isBufferingTelemetryEvents;
     private deviceId;
     setupTelemetryPromise: Promise<void>;
-    private resolveDeviceId;
+    private readonly telemetrySetupAbort;
     constructor({ bus, analytics, userTraits, mongoshVersion, deviceId, }: MongoshLoggingAndTelemetryArguments);
     setup(): void;
     flush(): void;

package/lib/logging-and-telemetry.js

@@ -3,7 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LoggingAndTelemetry = exports.setupLoggingAndTelemetry = exports.getDeviceId = void 0;
+exports.LoggingAndTelemetry = void 0;
+exports.setupLoggingAndTelemetry = setupLoggingAndTelemetry;
 const mongodb_redact_1 = __importDefault(require("mongodb-redact"));
 const history_1 = require("@mongosh/history");
 const util_1 = require("util");
@@ -12,32 +13,12 @@ const mongodb_log_writer_2 = require("mongodb-log-writer");
 const devtools_connect_1 = require("@mongodb-js/devtools-connect");
 const helpers_1 = require("./helpers");
 const stream_1 = require("stream");
-const crypto_1 = require("crypto");
-async function getDeviceId({ onError, } = {}) {
-    try {
-        const originalId = await require('native-machine-id').getMachineId({
-            raw: true,
-        });
-        if (!originalId) {
-            return 'unknown';
-        }
-        const hmac = (0, crypto_1.createHmac)('sha256', originalId);
-        const DEVICE_ID_HASH_MESSAGE = 'atlascli';
-        hmac.update(DEVICE_ID_HASH_MESSAGE);
-        return hmac.digest('hex');
-    }
-    catch (error) {
-        onError === null || onError === void 0 ? void 0 : onError(error);
-        return 'unknown';
-    }
-}
-exports.getDeviceId = getDeviceId;
+const device_id_1 = require("@mongodb-js/device-id");
 function setupLoggingAndTelemetry(props) {
     const loggingAndTelemetry = new LoggingAndTelemetry(props);
     loggingAndTelemetry.setup();
     return loggingAndTelemetry;
 }
-exports.setupLoggingAndTelemetry = setupLoggingAndTelemetry;
 class LoggingAndTelemetry {
     constructor({ bus, analytics, userTraits, mongoshVersion, deviceId, }) {
         this.pendingBusEvents = [];
@@ -46,7 +27,7 @@ class LoggingAndTelemetry {
         this.isBufferingBusEvents = false;
         this.isBufferingTelemetryEvents = false;
         this.setupTelemetryPromise = Promise.resolve();
-        this.resolveDeviceId = () => { };
+        this.telemetrySetupAbort = new AbortController();
         this.busEventState = {
             hasStartedMongoshRepl: false,
             apiCallTracking: {
@@ -76,20 +57,28 @@ class LoggingAndTelemetry {
         this.isSetup = true;
     }
     flush() {
-        this.runAndClearPendingTelemetryEvents();
         this.runAndClearPendingBusEvents();
-        this.resolveDeviceId('unknown');
+        this.telemetrySetupAbort.abort();
     }
     async setupTelemetry() {
         if (!this.deviceId) {
-            this.deviceId = await Promise.race([
-                getDeviceId({
-                    onError: (error) => this.bus.emit('mongosh:error', error, 'telemetry'),
-                }),
-                new Promise((resolve) => {
-                    this.resolveDeviceId = resolve;
-                }),
-            ]);
+            try {
+                const getMachineId = require('native-machine-id').getMachineId;
+                this.deviceId = await (0, device_id_1.getDeviceId)({
+                    getMachineId: () => getMachineId({ raw: true }),
+                    onError: (reason, error) => {
+                        if (reason === 'abort') {
+                            return;
+                        }
+                        this.bus.emit('mongosh:error', error, 'telemetry');
+                    },
+                    abortSignal: this.telemetrySetupAbort.signal,
+                });
+            }
+            catch (error) {
+                this.deviceId = 'unknown';
+                this.bus.emit('mongosh:error', error, 'telemetry');
+            }
         }
         this.runAndClearPendingTelemetryEvents();
     }
@@ -133,10 +122,14 @@ class LoggingAndTelemetry {
             }));
             return this.bus;
         };
-        const getUserTraits = () => ({
-            ...this.userTraits,
-            session_id: this.log.logId,
-        });
+        const getUserTraits = () => {
+            var _a;
+            return ({
+                ...this.userTraits,
+                device_id: (_a = this.deviceId) !== null && _a !== void 0 ? _a : 'unknown',
+                session_id: this.log.logId,
+            });
+        };
         const getTrackingProperties = () => ({
             mongosh_version: this.mongoshVersion,
             session_id: this.log.logId,
@@ -144,7 +137,6 @@ class LoggingAndTelemetry {
         const getTelemetryUserIdentity = () => {
             var _a;
             return {
-                deviceId: this.deviceId,
                 anonymousId: (_a = this.busEventState.telemetryAnonymousId) !== null && _a !== void 0 ? _a : this.busEventState.userId,
             };
         };

package/lib/logging-and-telemetry.js.map

@@ -1 +1 @@
-{"version":3,"file":"logging-and-telemetry.js","sourceRoot":"","sources":["../src/logging-and-telemetry.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"logging-and-telemetry.js","sourceRoot":"","sources":["../src/logging-and-telemetry.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mongosh/logging",
-  "version": "3.7.2",
+  "version": "3.8.0",
   "description": "MongoDB Shell Logging Utilities Package",
   "homepage": "https://github.com/mongodb-js/mongosh",
   "license": "Apache-2.0",
@@ -17,10 +17,11 @@
     "node": ">=14.15.1"
   },
   "dependencies": {
+    "@mongodb-js/device-id": "^0.2.1",
     "@mongodb-js/devtools-connect": "^3.4.1",
     "@mongosh/errors": "2.4.0",
     "@mongosh/history": "2.4.6",
-    "@mongosh/types": "3.6.2",
+    "@mongosh/types": "3.7.0",
     "mongodb-log-writer": "^2.3.1",
     "mongodb-redact": "^1.1.5",
     "native-machine-id": "^0.1.1"
@@ -29,6 +30,7 @@
     "@mongodb-js/eslint-config-mongosh": "^1.0.0",
     "@mongodb-js/prettier-config-devtools": "^1.0.1",
     "@mongodb-js/tsconfig-mongosh": "^1.0.0",
+    "@segment/analytics-node": "^1.3.0",
     "depcheck": "^1.4.7",
     "eslint": "^7.25.0",
     "prettier": "^2.8.8",
@@ -51,5 +53,5 @@
   "mongosh": {
     "unitTestsOnly": true
   },
-  "gitHead": "e4eedf3110a5e230da706a356851763ddbf6fc48"
+  "gitHead": "2660bc11f444db11c6511afdc90f6b96df99afc9"
 }

package/src/analytics-helpers.spec.ts

@@ -40,7 +40,11 @@ describe('analytics helpers', function () {
 
       toggleable.identify({
         userId: 'me',
-        traits: { platform: '1234', session_id: 'abc' },
+        traits: {
+          platform: '1234',
+          session_id: 'abc',
+          device_id: 'test-device-id',
+        },
         timestamp,
       });
       toggleable.track({
@@ -80,7 +84,11 @@ describe('analytics helpers', function () {
           'identify',
           {
             userId: 'me',
-            traits: { platform: '1234', session_id: 'abc' },
+            traits: {
+              platform: '1234',
+              session_id: 'abc',
+              device_id: 'test-device-id',
+            },
             timestamp,
           },
         ],
@@ -124,7 +132,14 @@ describe('analytics helpers', function () {
   describe('ThrottledAnalytics', function () {
     const metadataPath = os.tmpdir();
     const userId = 'u-' + Date.now();
-    const iEvt = { userId, traits: { platform: 'what', session_id: 'abc' } };
+    const iEvt = {
+      userId,
+      traits: {
+        platform: 'what',
+        session_id: 'abc',
+        device_id: 'test-device-id',
+      },
+    };
     const tEvt = {
       userId,
       event: 'hi',
@@ -252,7 +267,14 @@ describe('analytics helpers', function () {
 
   describe('SampledAnalytics', function () {
     const userId = `u-${Date.now()}`;
-    const iEvt = { userId, traits: { platform: 'what', session_id: 'abc' } };
+    const iEvt = {
+      userId,
+      traits: {
+        platform: 'what',
+        session_id: 'abc',
+        device_id: 'test-device-id',
+      },
+    };
     const tEvt = {
       userId,
       event: 'hi',

package/src/analytics-helpers.ts

@@ -1,21 +1,20 @@
 import fs from 'fs';
 import path from 'path';
+import type {
+  IdentifyParams as SegmentIdentifyParams,
+  TrackParams as SegmentTrackParams,
+} from '@segment/analytics-node';
 
-export type MongoshAnalyticsIdentity =
-  | {
-      deviceId?: string;
-      userId: string;
-      anonymousId?: never;
-    }
-  | {
-      deviceId?: string;
-      userId?: never;
-      anonymousId: string;
-    };
+type Timestamp = SegmentTrackParams['timestamp'];
+
+export type MongoshAnalyticsIdentity = SegmentIdentifyParams;
 
 export type AnalyticsIdentifyMessage = MongoshAnalyticsIdentity & {
-  traits: { platform: string; session_id: string };
-  timestamp?: Date;
+  traits: {
+    platform: string;
+    session_id: string;
+    device_id: string;
+  } & SegmentIdentifyParams['traits'];
 };
 
 export type AnalyticsTrackMessage = MongoshAnalyticsIdentity & {
@@ -25,7 +24,7 @@ export type AnalyticsTrackMessage = MongoshAnalyticsIdentity & {
     session_id: string;
     [key: string]: any;
   };
-  timestamp?: Date;
+  timestamp?: Timestamp;
 };
 
 /**
@@ -93,10 +92,14 @@ type AnalyticsEventsQueueItem =
   | ['identify', Parameters<MongoshAnalytics['identify']>]
   | ['track', Parameters<MongoshAnalytics['track']>];
 
-function addTimestamp<T extends { timestamp?: Date }>(
+function addTimestamp<T extends { timestamp?: Timestamp }>(
   message: T
-): T & { timestamp: Date } {
-  return { ...message, timestamp: message.timestamp ?? new Date() };
+): T & { timestamp: Timestamp } {
+  const timestampDate =
+    message.timestamp instanceof Date || message.timestamp === undefined
+      ? message.timestamp
+      : new Date(message.timestamp);
+  return { ...message, timestamp: timestampDate };
 }
 
 /**
@@ -275,7 +278,10 @@ export class ThrottledAnalytics implements MongoshAnalytics {
     if (this.currentUserId) {
       throw new Error('Identify can only be called once per user session');
     }
-    this.currentUserId = message.userId ?? message.anonymousId;
+
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    this.currentUserId = message.userId ?? message.anonymousId!;
+
     this.restorePromise = this.restoreThrottleState().then((enabled) => {
       if (!enabled) {
         this.trackQueue.disable();

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

@@ -8,9 +8,10 @@ import type { Writable } from 'stream';
 import type { MongoshLoggingAndTelemetry } from '.';
 import { setupLoggingAndTelemetry } from '.';
 import type { LoggingAndTelemetry } from './logging-and-telemetry';
-import { getDeviceId } from './logging-and-telemetry';
 import sinon from 'sinon';
 import type { MongoshLoggingAndTelemetryArguments } from './types';
+import { getDeviceId } from '@mongodb-js/device-id';
+import { getMachineId } from 'native-machine-id';
 
 describe('MongoshLoggingAndTelemetry', function () {
   let logOutput: any[];
@@ -19,6 +20,7 @@ describe('MongoshLoggingAndTelemetry', function () {
 
   const userId = '53defe995fa47e6c13102d9d';
   const logId = '5fb3c20ee1507e894e5340f3';
+  const deviceId = 'test-device';
 
   let logger: MongoLogWriter;
 
@@ -39,7 +41,6 @@ describe('MongoshLoggingAndTelemetry', function () {
   const testLoggingArguments: Omit<MongoshLoggingAndTelemetryArguments, 'bus'> =
     {
       analytics,
-      deviceId: 'test-device',
       userTraits: {
         platform: process.platform,
         arch: process.arch,
@@ -54,6 +55,7 @@ describe('MongoshLoggingAndTelemetry', function () {
 
     loggingAndTelemetry = setupLoggingAndTelemetry({
       ...testLoggingArguments,
+      deviceId,
       bus,
     });
 
@@ -117,8 +119,8 @@ describe('MongoshLoggingAndTelemetry', function () {
         'identify',
         {
           anonymousId: userId,
-          deviceId: 'test-device',
           traits: {
+            device_id: deviceId,
             arch: process.arch,
             platform: process.platform,
             session_id: logId,
@@ -129,7 +131,6 @@ describe('MongoshLoggingAndTelemetry', function () {
         'track',
         {
           anonymousId: userId,
-          deviceId: 'test-device',
           event: 'New Connection',
           properties: {
             mongosh_version: '1.0.0',
@@ -178,8 +179,8 @@ describe('MongoshLoggingAndTelemetry', function () {
         'identify',
         {
           anonymousId: userId,
-          deviceId: 'test-device',
           traits: {
+            device_id: deviceId,
             arch: process.arch,
             platform: process.platform,
             session_id: logId,
@@ -190,7 +191,6 @@ describe('MongoshLoggingAndTelemetry', function () {
         'track',
         {
           anonymousId: userId,
-          deviceId: 'test-device',
           event: 'New Connection',
           properties: {
             mongosh_version: '1.0.0',
@@ -235,9 +235,9 @@ describe('MongoshLoggingAndTelemetry', function () {
         [
           'identify',
           {
-            deviceId: 'unknown',
             anonymousId: userId,
             traits: {
+              device_id: 'unknown',
               platform: process.platform,
               arch: process.arch,
               session_id: logId,
@@ -254,6 +254,7 @@ describe('MongoshLoggingAndTelemetry', function () {
     });
 
     it('automatically sets up device ID for telemetry', async function () {
+      const abortController = new AbortController();
       const loggingAndTelemetry = setupLoggingAndTelemetry({
         ...testLoggingArguments,
         bus,
@@ -264,7 +265,10 @@ describe('MongoshLoggingAndTelemetry', function () {
 
       bus.emit('mongosh:new-user', { userId, anonymousId: userId });
 
-      const deviceId = await getDeviceId();
+      const deviceId = await getDeviceId({
+        getMachineId: () => getMachineId({ raw: true }),
+        abortSignal: abortController.signal,
+      });
 
       await (loggingAndTelemetry as LoggingAndTelemetry).setupTelemetryPromise;
 
@@ -272,9 +276,53 @@ describe('MongoshLoggingAndTelemetry', function () {
         [
           'identify',
           {
-            deviceId,
             anonymousId: userId,
             traits: {
+              device_id: deviceId,
+              platform: process.platform,
+              arch: process.arch,
+              session_id: logId,
+            },
+          },
+        ],
+      ]);
+    });
+
+    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',
+          {
+            anonymousId: userId,
+            traits: {
+              device_id: 'unknown',
               platform: process.platform,
               arch: process.arch,
               session_id: logId,
@@ -299,7 +347,7 @@ describe('MongoshLoggingAndTelemetry', function () {
         ...testLoggingArguments,
         bus,
         deviceId: undefined,
-      });
+      }) as LoggingAndTelemetry;
 
       loggingAndTelemetry.attachLogger(logger);
 
@@ -310,13 +358,13 @@ describe('MongoshLoggingAndTelemetry', function () {
       expect(analyticsOutput).to.have.lengthOf(0);
 
       resolveTelemetry('1234');
-      await (loggingAndTelemetry as LoggingAndTelemetry).setupTelemetryPromise;
+      await loggingAndTelemetry.setupTelemetryPromise;
 
       expect(logOutput).to.have.lengthOf(1);
       expect(analyticsOutput).to.have.lengthOf(1);
 
       // Hash created from machine ID 1234
-      expect(analyticsOutput[0][1].deviceId).equals(
+      expect(loggingAndTelemetry['deviceId']).equals(
         '8c9f929608f0ef13bfd5a290e0233f283e2cc25ffefc2ad8d9ef0650eb224a52'
       );
     });
@@ -719,8 +767,8 @@ describe('MongoshLoggingAndTelemetry', function () {
         'identify',
         {
           anonymousId: userId,
-          deviceId: 'test-device',
           traits: {
+            device_id: deviceId,
             platform: process.platform,
             arch: process.arch,
             session_id: logId,
@@ -731,8 +779,8 @@ describe('MongoshLoggingAndTelemetry', function () {
         'identify',
         {
           anonymousId: userId,
-          deviceId: 'test-device',
           traits: {
+            device_id: deviceId,
             platform: process.platform,
             arch: process.arch,
             session_id: logId,
@@ -743,7 +791,6 @@ describe('MongoshLoggingAndTelemetry', function () {
         'track',
         {
           anonymousId: userId,
-          deviceId: 'test-device',
           event: 'Startup Time',
           properties: {
             is_interactive: true,
@@ -759,7 +806,6 @@ describe('MongoshLoggingAndTelemetry', function () {
         'track',
         {
           anonymousId: '53defe995fa47e6c13102d9d',
-          deviceId: 'test-device',
           event: 'Error',
           properties: {
             mongosh_version: '1.0.0',
@@ -775,7 +821,6 @@ describe('MongoshLoggingAndTelemetry', function () {
         'track',
         {
           anonymousId: '53defe995fa47e6c13102d9d',
-          deviceId: 'test-device',
           event: 'Error',
           properties: {
             mongosh_version: '1.0.0',
@@ -791,7 +836,6 @@ describe('MongoshLoggingAndTelemetry', function () {
         'track',
         {
           anonymousId: '53defe995fa47e6c13102d9d',
-          deviceId: 'test-device',
           event: 'Use',
           properties: {
             mongosh_version: '1.0.0',
@@ -803,7 +847,6 @@ describe('MongoshLoggingAndTelemetry', function () {
         'track',
         {
           anonymousId: '53defe995fa47e6c13102d9d',
-          deviceId: 'test-device',
           event: 'Show',
           properties: {
             mongosh_version: '1.0.0',
@@ -823,7 +866,6 @@ describe('MongoshLoggingAndTelemetry', function () {
             shell: true,
           },
           anonymousId: '53defe995fa47e6c13102d9d',
-          deviceId: 'test-device',
         },
       ],
       [
@@ -836,7 +878,6 @@ describe('MongoshLoggingAndTelemetry', function () {
             nested: false,
           },
           anonymousId: '53defe995fa47e6c13102d9d',
-          deviceId: 'test-device',
         },
       ],
       [
@@ -848,7 +889,6 @@ describe('MongoshLoggingAndTelemetry', function () {
             session_id: logId,
           },
           anonymousId: '53defe995fa47e6c13102d9d',
-          deviceId: 'test-device',
         },
       ],
       [
@@ -860,7 +900,6 @@ describe('MongoshLoggingAndTelemetry', function () {
             session_id: logId,
           },
           anonymousId: '53defe995fa47e6c13102d9d',
-          deviceId: 'test-device',
         },
       ],
       [
@@ -873,14 +912,12 @@ describe('MongoshLoggingAndTelemetry', function () {
             shell: true,
           },
           anonymousId: '53defe995fa47e6c13102d9d',
-          deviceId: 'test-device',
         },
       ],
       [
         'track',
         {
           anonymousId: '53defe995fa47e6c13102d9d',
-          deviceId: 'test-device',
           event: 'Snippet Install',
           properties: {
             mongosh_version: '1.0.0',
@@ -976,7 +1013,6 @@ describe('MongoshLoggingAndTelemetry', function () {
         'track',
         {
           anonymousId: '53defe995fa47e6c13102d9d',
-          deviceId: 'test-device',
           event: 'Deprecated Method',
           properties: {
             mongosh_version: '1.0.0',
@@ -990,7 +1026,6 @@ describe('MongoshLoggingAndTelemetry', function () {
         'track',
         {
           anonymousId: '53defe995fa47e6c13102d9d',
-          deviceId: 'test-device',
           event: 'Deprecated Method',
           properties: {
             mongosh_version: '1.0.0',
@@ -1004,7 +1039,6 @@ describe('MongoshLoggingAndTelemetry', function () {
         'track',
         {
           anonymousId: '53defe995fa47e6c13102d9d',
-          deviceId: 'test-device',
           event: 'Deprecated Method',
           properties: {
             mongosh_version: '1.0.0',
@@ -1018,7 +1052,6 @@ describe('MongoshLoggingAndTelemetry', function () {
         'track',
         {
           anonymousId: '53defe995fa47e6c13102d9d',
-          deviceId: 'test-device',
           event: 'API Call',
           properties: {
             mongosh_version: '1.0.0',
@@ -1033,7 +1066,6 @@ describe('MongoshLoggingAndTelemetry', function () {
         'track',
         {
           anonymousId: '53defe995fa47e6c13102d9d',
-          deviceId: 'test-device',
           event: 'API Call',
           properties: {
             mongosh_version: '1.0.0',
@@ -1188,7 +1220,6 @@ describe('MongoshLoggingAndTelemetry', function () {
         'track',
         {
           anonymousId: undefined,
-          deviceId: 'test-device',
           event: 'New Connection',
           properties: {
             mongosh_version: '1.0.0',
@@ -1202,13 +1233,4 @@ describe('MongoshLoggingAndTelemetry', function () {
       ],
     ]);
   });
-
-  describe('getDeviceId()', function () {
-    it('is consistent on the same machine', async function () {
-      const idA = await getDeviceId();
-      const idB = await getDeviceId();
-
-      expect(idA).equals(idB);
-    });
-  });
 });

package/src/logging-and-telemetry.ts

@@ -53,40 +53,7 @@ import type {
   MongoshLoggingAndTelemetryArguments,
   MongoshTrackingProperties,
 } from './types';
-import { createHmac } from 'crypto';
-
-/**
- * @returns A hashed, unique identifier for the running device or `"unknown"` if not known.
- */
-export async function getDeviceId({
-  onError,
-}: {
-  onError?: (error: Error) => void;
-} = {}): Promise<string | 'unknown'> {
-  try {
-    // Create a hashed format from the all uppercase version of the machine ID
-    // to match it exactly with the denisbrodbeck/machineid library that Atlas CLI uses.
-    const originalId: string =
-      // eslint-disable-next-line @typescript-eslint/no-var-requires
-      await require('native-machine-id').getMachineId({
-        raw: true,
-      });
-
-    if (!originalId) {
-      return 'unknown';
-    }
-    const hmac = createHmac('sha256', originalId);
-
-    /** This matches the message used to create the hashes in Atlas CLI */
-    const DEVICE_ID_HASH_MESSAGE = 'atlascli';
-
-    hmac.update(DEVICE_ID_HASH_MESSAGE);
-    return hmac.digest('hex');
-  } catch (error) {
-    onError?.(error as Error);
-    return 'unknown';
-  }
-}
+import { getDeviceId } from '@mongodb-js/device-id';
 
 export function setupLoggingAndTelemetry(
   props: MongoshLoggingAndTelemetryArguments
@@ -125,11 +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();
 
-  // eslint-disable-next-line @typescript-eslint/no-empty-function
-  private resolveDeviceId: (value: string) => void = () => {};
+  private readonly telemetrySetupAbort: AbortController = new AbortController();
 
   constructor({
     bus,
@@ -160,26 +127,34 @@ 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.resolveDeviceId('unknown');
+    // Abort setup, which will cause the device ID to be set to 'unknown'
+    // and run any remaining telemetry events
+    this.telemetrySetupAbort.abort();
   }
 
   private async setupTelemetry(): Promise<void> {
     if (!this.deviceId) {
-      this.deviceId = await Promise.race([
-        getDeviceId({
-          onError: (error) =>
-            this.bus.emit('mongosh:error', error, 'telemetry'),
-        }),
-        new Promise<string>((resolve) => {
-          this.resolveDeviceId = resolve;
-        }),
-      ]);
+      try {
+        // eslint-disable-next-line @typescript-eslint/no-var-requires
+        const getMachineId = require('native-machine-id').getMachineId;
+        this.deviceId = await getDeviceId({
+          getMachineId: () => getMachineId({ raw: true }),
+          onError: (reason, error) => {
+            if (reason === 'abort') {
+              return;
+            }
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+            this.bus.emit('mongosh:error', error, 'telemetry');
+          },
+          abortSignal: this.telemetrySetupAbort.signal,
+        });
+      } catch (error) {
+        this.deviceId = 'unknown';
+        this.bus.emit('mongosh:error', error as Error, 'telemetry');
+      }
     }
 
     this.runAndClearPendingTelemetryEvents();
@@ -267,6 +242,7 @@ export class LoggingAndTelemetry implements MongoshLoggingAndTelemetry {
 
     const getUserTraits = (): AnalyticsIdentifyMessage['traits'] => ({
       ...this.userTraits,
+      device_id: this.deviceId ?? 'unknown',
       session_id: this.log.logId,
     });
 
@@ -277,7 +253,6 @@ export class LoggingAndTelemetry implements MongoshLoggingAndTelemetry {
 
     const getTelemetryUserIdentity = (): MongoshAnalyticsIdentity => {
       return {
-        deviceId: this.deviceId,
         anonymousId:
           this.busEventState.telemetryAnonymousId ??
           (this.busEventState.userId as string),