Skip to content

Commit 227cae2

Browse files
committed
chore: switch to @mongodb-js/device-id
1 parent 3e21143 commit 227cae2

File tree

4 files changed

+19
-37
lines changed

4 files changed

+19
-37
lines changed

package-lock.json

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/compass/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,7 @@
180180
"email": "[email protected]"
181181
},
182182
"dependencies": {
183+
"@mongodb-js/device-id": "^0.2.0",
183184
"@mongosh/node-runtime-worker-thread": "^3.3.6",
184185
"clipboard": "^2.0.6",
185186
"kerberos": "^2.2.1",

packages/compass/src/main/device-id.ts

Lines changed: 0 additions & 35 deletions
This file was deleted.

packages/compass/src/main/telemetry.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ import type { CompassApplication } from './application';
66
import type { EventEmitter } from 'events';
77
import { getOsInfo } from '@mongodb-js/get-os-info';
88
import type { IdentifyTraits } from '@mongodb-js/compass-telemetry';
9-
import { getDeviceId } from './device-id';
9+
import { getDeviceId } from '@mongodb-js/device-id';
10+
import { getMachineId } from 'native-machine-id';
1011

1112
const { log, mongoLogId } = createLogger('COMPASS-TELEMETRY');
1213

@@ -143,14 +144,16 @@ class CompassTelemetry {
143144
this.telemetryAnonymousId = telemetryAnonymousId ?? '';
144145
this.telemetryAtlasUserId = telemetryAtlasUserId;
145146
this.telemetryDeviceId = await getDeviceId({
147+
getMachineId: () => getMachineId({ raw: true }),
148+
isNodeMachineId: false,
146149
onError: (err) =>
147150
log.error(
148151
mongoLogId(1_001_000_348),
149152
'Telemetry',
150153
'Failed to get device ID',
151154
{ err: err.message }
152155
),
153-
});
156+
}).value;
154157

155158
try {
156159
this.osInfo = await getOsInfo();

0 commit comments

Comments
 (0)