Skip to content

Commit cd93de1

Browse files
lramos15lramos15
authored
Rename vsDeviceId (#213261)
1 parent eccc474 commit cd93de1

File tree

30 files changed

+76
-67
lines changed

30 files changed

+76
-67
lines changed

‎build/.moduleignore

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,15 @@ fsevents/test/**
2020
@vscode/spdlog/*.yml
2121
!@vscode/spdlog/build/Release/*.node
2222

23+
@vscode/deviceid/binding.gyp
24+
@vscode/deviceid/build/**
25+
@vscode/deviceid/deps/**
26+
@vscode/deviceid/src/**
27+
@vscode/deviceid/test/**
28+
@vscode/deviceid/*.yml
29+
!@vscode/deviceid/build/Release/*.node
30+
31+
2332
@vscode/sqlite3/binding.gyp
2433
@vscode/sqlite3/benchmark/**
2534
@vscode/sqlite3/cloudformation/**

‎src/vs/base/node/id.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ export async function getSqmMachineId(errorLogger: (error: any) => void): Promis
115115
return '';
116116
}
117117

118-
export async function getVSDeviceId(errorLogger: (error: any) => void): Promise<string> {
118+
export async function getdevDeviceId(errorLogger: (error: any) => void): Promise<string> {
119119
try {
120120
const deviceIdPackage = await import('@vscode/deviceid');
121121
const id = await deviceIdPackage.getDeviceId();

‎src/vs/base/test/node/id.test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*--------------------------------------------------------------------------------------------*/
55

66
import * as assert from 'assert';
7-
import { getMachineId, getSqmMachineId, getVSDeviceId } from 'vs/base/node/id';
7+
import { getMachineId, getSqmMachineId, getdevDeviceId } from 'vs/base/node/id';
88
import { getMac } from 'vs/base/node/macAddress';
99
import { flakySuite } from 'vs/base/test/node/testUtils';
1010
import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
@@ -26,9 +26,9 @@ flakySuite('ID', () => {
2626
assert.strictEqual(errors.length, 0);
2727
});
2828

29-
test('getVSDeviceId', async function () {
29+
test('getdevDeviceId', async function () {
3030
const errors = [];
31-
const id = await getVSDeviceId(err => errors.push(err));
31+
const id = await getdevDeviceId(err => errors.push(err));
3232
assert.ok(typeof id === 'string');
3333
assert.strictEqual(errors.length, 0);
3434
});

‎src/vs/code/electron-main/app.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ import { ExtensionsScannerService } from 'vs/platform/extensionManagement/node/e
105105
import { UserDataProfilesHandler } from 'vs/platform/userDataProfile/electron-main/userDataProfilesHandler';
106106
import { ProfileStorageChangesListenerChannel } from 'vs/platform/userDataProfile/electron-main/userDataProfileStorageIpc';
107107
import { Promises, RunOnceScheduler, runWhenGlobalIdle } from 'vs/base/common/async';
108-
import { resolveMachineId, resolveSqmId, resolveVSDeviceId } from 'vs/platform/telemetry/electron-main/telemetryUtils';
108+
import { resolveMachineId, resolveSqmId, resolvedevDeviceId } from 'vs/platform/telemetry/electron-main/telemetryUtils';
109109
import { ExtensionsProfileScannerService } from 'vs/platform/extensionManagement/node/extensionsProfileScannerService';
110110
import { LoggerChannel } from 'vs/platform/log/electron-main/logIpc';
111111
import { ILoggerMainService } from 'vs/platform/log/electron-main/loggerService';
@@ -611,18 +611,18 @@ export class CodeApplication extends Disposable {
611611

612612
// Resolve unique machine ID
613613
this.logService.trace('Resolving machine identifier...');
614-
const [machineId, sqmId, vsDeviceId] = await Promise.all([
614+
const [machineId, sqmId, devDeviceId] = await Promise.all([
615615
resolveMachineId(this.stateService, this.logService),
616616
resolveSqmId(this.stateService, this.logService),
617-
resolveVSDeviceId(this.stateService, this.logService)
617+
resolvedevDeviceId(this.stateService, this.logService)
618618
]);
619619
this.logService.trace(`Resolved machine identifier: ${machineId}`);
620620

621621
// Shared process
622-
const { sharedProcessReady, sharedProcessClient } = this.setupSharedProcess(machineId, sqmId, vsDeviceId);
622+
const { sharedProcessReady, sharedProcessClient } = this.setupSharedProcess(machineId, sqmId, devDeviceId);
623623

624624
// Services
625-
const appInstantiationService = await this.initServices(machineId, sqmId, vsDeviceId, sharedProcessReady);
625+
const appInstantiationService = await this.initServices(machineId, sqmId, devDeviceId, sharedProcessReady);
626626

627627
// Auth Handler
628628
this._register(appInstantiationService.createInstance(ProxyAuthHandler));
@@ -987,8 +987,8 @@ export class CodeApplication extends Disposable {
987987
return false;
988988
}
989989

990-
private setupSharedProcess(machineId: string, sqmId: string, vsDeviceId: string): { sharedProcessReady: Promise<MessagePortClient>; sharedProcessClient: Promise<MessagePortClient> } {
991-
const sharedProcess = this._register(this.mainInstantiationService.createInstance(SharedProcess, machineId, sqmId, vsDeviceId));
990+
private setupSharedProcess(machineId: string, sqmId: string, devDeviceId: string): { sharedProcessReady: Promise<MessagePortClient>; sharedProcessClient: Promise<MessagePortClient> } {
991+
const sharedProcess = this._register(this.mainInstantiationService.createInstance(SharedProcess, machineId, sqmId, devDeviceId));
992992

993993
this._register(sharedProcess.onDidCrash(() => this.windowsMainService?.sendToFocused('vscode:reportSharedProcessCrash')));
994994

@@ -1011,7 +1011,7 @@ export class CodeApplication extends Disposable {
10111011
return { sharedProcessReady, sharedProcessClient };
10121012
}
10131013

1014-
private async initServices(machineId: string, sqmId: string, vsDeviceId: string, sharedProcessReady: Promise<MessagePortClient>): Promise<IInstantiationService> {
1014+
private async initServices(machineId: string, sqmId: string, devDeviceId: string, sharedProcessReady: Promise<MessagePortClient>): Promise<IInstantiationService> {
10151015
const services = new ServiceCollection();
10161016

10171017
// Update
@@ -1034,7 +1034,7 @@ export class CodeApplication extends Disposable {
10341034
}
10351035

10361036
// Windows
1037-
services.set(IWindowsMainService, new SyncDescriptor(WindowsMainService, [machineId, sqmId, vsDeviceId, this.userEnv], false));
1037+
services.set(IWindowsMainService, new SyncDescriptor(WindowsMainService, [machineId, sqmId, devDeviceId, this.userEnv], false));
10381038
services.set(IAuxiliaryWindowsMainService, new SyncDescriptor(AuxiliaryWindowsMainService, undefined, false));
10391039

10401040
// Dialogs
@@ -1114,7 +1114,7 @@ export class CodeApplication extends Disposable {
11141114
const isInternal = isInternalTelemetry(this.productService, this.configurationService);
11151115
const channel = getDelayedChannel(sharedProcessReady.then(client => client.getChannel('telemetryAppender')));
11161116
const appender = new TelemetryAppenderClient(channel);
1117-
const commonProperties = resolveCommonProperties(release(), hostname(), process.arch, this.productService.commit, this.productService.version, machineId, sqmId, vsDeviceId, isInternal);
1117+
const commonProperties = resolveCommonProperties(release(), hostname(), process.arch, this.productService.commit, this.productService.version, machineId, sqmId, devDeviceId, isInternal);
11181118
const piiPaths = getPiiPathsFromEnvironment(this.environmentMainService);
11191119
const config: ITelemetryServiceConfig = { appenders: [appender], commonProperties, piiPaths, sendErrorTelemetry: true };
11201120

‎src/vs/code/node/cliProcessMain.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity'
5757
import { UriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentityService';
5858
import { IUserDataProfile, IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
5959
import { UserDataProfilesReadonlyService } from 'vs/platform/userDataProfile/node/userDataProfile';
60-
import { resolveMachineId, resolveSqmId, resolveVSDeviceId } from 'vs/platform/telemetry/node/telemetryUtils';
60+
import { resolveMachineId, resolveSqmId, resolvedevDeviceId } from 'vs/platform/telemetry/node/telemetryUtils';
6161
import { ExtensionsProfileScannerService } from 'vs/platform/extensionManagement/node/extensionsProfileScannerService';
6262
import { LogService } from 'vs/platform/log/common/logService';
6363
import { LoggerService } from 'vs/platform/log/node/loggerService';
@@ -186,7 +186,7 @@ class CliMain extends Disposable {
186186
}
187187
}
188188
const sqmId = await resolveSqmId(stateService, logService);
189-
const vsDeviceId = await resolveVSDeviceId(stateService, logService);
189+
const devDeviceId = await resolvedevDeviceId(stateService, logService);
190190

191191
// Initialize user data profiles after initializing the state
192192
userDataProfilesService.init();
@@ -222,7 +222,7 @@ class CliMain extends Disposable {
222222
const config: ITelemetryServiceConfig = {
223223
appenders,
224224
sendErrorTelemetry: false,
225-
commonProperties: resolveCommonProperties(release(), hostname(), process.arch, productService.commit, productService.version, machineId, sqmId, vsDeviceId, isInternal),
225+
commonProperties: resolveCommonProperties(release(), hostname(), process.arch, productService.commit, productService.version, machineId, sqmId, devDeviceId, isInternal),
226226
piiPaths: getPiiPathsFromEnvironment(environmentService)
227227
};
228228

‎src/vs/code/node/sharedProcess/sharedProcessMain.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ class SharedProcessMain extends Disposable implements IClientConnectionFilter {
307307

308308
telemetryService = new TelemetryService({
309309
appenders,
310-
commonProperties: resolveCommonProperties(release(), hostname(), process.arch, productService.commit, productService.version, this.configuration.machineId, this.configuration.sqmId, this.configuration.vsDeviceId, internalTelemetry),
310+
commonProperties: resolveCommonProperties(release(), hostname(), process.arch, productService.commit, productService.version, this.configuration.machineId, this.configuration.sqmId, this.configuration.devDeviceId, internalTelemetry),
311311
sendErrorTelemetry: true,
312312
piiPaths: getPiiPathsFromEnvironment(environmentService),
313313
}, configurationService, productService);

‎src/vs/editor/standalone/browser/standaloneServices.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -792,7 +792,7 @@ class StandaloneTelemetryService implements ITelemetryService {
792792
readonly sessionId = 'someValue.sessionId';
793793
readonly machineId = 'someValue.machineId';
794794
readonly sqmId = 'someValue.sqmId';
795-
readonly vsDeviceId = 'someValue.vsDeviceId';
795+
readonly devDeviceId = 'someValue.devDeviceId';
796796
readonly firstSessionDate = 'someValue.firstSessionDate';
797797
readonly sendErrorTelemetry = false;
798798
setEnabled(): void { }

‎src/vs/platform/sharedProcess/electron-main/sharedProcess.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ export class SharedProcess extends Disposable {
3434
constructor(
3535
private readonly machineId: string,
3636
private readonly sqmId: string,
37-
private readonly vsDeviceId: string,
37+
private readonly devDeviceId: string,
3838
@IEnvironmentMainService private readonly environmentMainService: IEnvironmentMainService,
3939
@IUserDataProfilesService private readonly userDataProfilesService: IUserDataProfilesService,
4040
@ILifecycleMainService private readonly lifecycleMainService: ILifecycleMainService,
@@ -181,7 +181,7 @@ export class SharedProcess extends Disposable {
181181
return {
182182
machineId: this.machineId,
183183
sqmId: this.sqmId,
184-
vsDeviceId: this.vsDeviceId,
184+
devDeviceId: this.devDeviceId,
185185
codeCachePath: this.environmentMainService.codeCachePath,
186186
profiles: {
187187
home: this.userDataProfilesService.profilesHome,

‎src/vs/platform/sharedProcess/node/sharedProcess.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export interface ISharedProcessConfiguration {
1515

1616
readonly sqmId: string;
1717

18-
readonly vsDeviceId: string;
18+
readonly devDeviceId: string;
1919

2020
readonly codeCachePath: string | undefined;
2121

‎src/vs/platform/telemetry/common/commonProperties.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export function resolveCommonProperties(
2424
version: string | undefined,
2525
machineId: string | undefined,
2626
sqmId: string | undefined,
27-
vsDeviceId: string | undefined,
27+
devDeviceId: string | undefined,
2828
isInternalTelemetry: boolean,
2929
product?: string
3030
): ICommonProperties {
@@ -34,8 +34,8 @@ export function resolveCommonProperties(
3434
result['common.machineId'] = machineId;
3535
// __GDPR__COMMON__ "common.sqmId" : { "endPoint": "SqmMachineId", "classification": "EndUserPseudonymizedInformation", "purpose": "BusinessInsight" }
3636
result['common.sqmId'] = sqmId;
37-
// __GDPR__COMMON__ "common.vsDeviceId" : { "endPoint": "SqmMachineId", "classification": "EndUserPseudonymizedInformation", "purpose": "BusinessInsight" }
38-
result['common.vsDeviceId'] = vsDeviceId;
37+
// __GDPR__COMMON__ "common.devDeviceId" : { "endPoint": "SqmMachineId", "classification": "EndUserPseudonymizedInformation", "purpose": "BusinessInsight" }
38+
result['common.devDeviceId'] = devDeviceId;
3939
// __GDPR__COMMON__ "sessionID" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
4040
result['sessionID'] = generateUuid() + Date.now();
4141
// __GDPR__COMMON__ "commitHash" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }

‎src/vs/platform/telemetry/common/telemetry.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export interface ITelemetryService {
2323
readonly sessionId: string;
2424
readonly machineId: string;
2525
readonly sqmId: string;
26-
readonly vsDeviceId: string;
26+
readonly devDeviceId: string;
2727
readonly firstSessionDate: string;
2828
readonly msftInternal?: boolean;
2929

@@ -74,7 +74,7 @@ export const firstSessionDateStorageKey = 'telemetry.firstSessionDate';
7474
export const lastSessionDateStorageKey = 'telemetry.lastSessionDate';
7575
export const machineIdKey = 'telemetry.machineId';
7676
export const sqmIdKey = 'telemetry.sqmId';
77-
export const vsDeviceIdKey = 'telemetry.vsDeviceId';
77+
export const devDeviceIdKey = 'telemetry.devDeviceId';
7878

7979
// Configuration Keys
8080
export const TELEMETRY_SECTION_ID = 'telemetry';

‎src/vs/platform/telemetry/common/telemetryService.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ export class TelemetryService implements ITelemetryService {
3434
readonly sessionId: string;
3535
readonly machineId: string;
3636
readonly sqmId: string;
37-
readonly vsDeviceId: string;
37+
readonly devDeviceId: string;
3838
readonly firstSessionDate: string;
3939
readonly msftInternal: boolean | undefined;
4040

@@ -59,7 +59,7 @@ export class TelemetryService implements ITelemetryService {
5959
this.sessionId = this._commonProperties['sessionID'] as string;
6060
this.machineId = this._commonProperties['common.machineId'] as string;
6161
this.sqmId = this._commonProperties['common.sqmId'] as string;
62-
this.vsDeviceId = this._commonProperties['common.vsDeviceId'] as string;
62+
this.devDeviceId = this._commonProperties['common.devDeviceId'] as string;
6363
this.firstSessionDate = this._commonProperties['common.firstSessionDate'] as string;
6464
this.msftInternal = this._commonProperties['common.msftInternal'] as boolean | undefined;
6565

‎src/vs/platform/telemetry/common/telemetryUtils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export class NullTelemetryServiceShape implements ITelemetryService {
3030
readonly sessionId = 'someValue.sessionId';
3131
readonly machineId = 'someValue.machineId';
3232
readonly sqmId = 'someValue.sqmId';
33-
readonly vsDeviceId = 'someValue.vsDeviceId';
33+
readonly devDeviceId = 'someValue.devDeviceId';
3434
readonly firstSessionDate = 'someValue.firstSessionDate';
3535
readonly sendErrorTelemetry = false;
3636
publicLog() { }

‎src/vs/platform/telemetry/electron-main/telemetryUtils.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
import { ILogService } from 'vs/platform/log/common/log';
77
import { IStateService } from 'vs/platform/state/node/state';
8-
import { machineIdKey, sqmIdKey, vsDeviceIdKey } from 'vs/platform/telemetry/common/telemetry';
9-
import { resolveMachineId as resolveNodeMachineId, resolveSqmId as resolveNodeSqmId, resolveVSDeviceId as resolveNodeVSDeviceId } from 'vs/platform/telemetry/node/telemetryUtils';
8+
import { machineIdKey, sqmIdKey, devDeviceIdKey } from 'vs/platform/telemetry/common/telemetry';
9+
import { resolveMachineId as resolveNodeMachineId, resolveSqmId as resolveNodeSqmId, resolvedevDeviceId as resolveNodedevDeviceId } from 'vs/platform/telemetry/node/telemetryUtils';
1010

1111
export async function resolveMachineId(stateService: IStateService, logService: ILogService): Promise<string> {
1212
// Call the node layers implementation to avoid code duplication
@@ -21,8 +21,8 @@ export async function resolveSqmId(stateService: IStateService, logService: ILog
2121
return sqmId;
2222
}
2323

24-
export async function resolveVSDeviceId(stateService: IStateService, logService: ILogService): Promise<string> {
25-
const vsDeviceId = await resolveNodeVSDeviceId(stateService, logService);
26-
stateService.setItem(vsDeviceIdKey, vsDeviceId);
27-
return vsDeviceId;
24+
export async function resolvedevDeviceId(stateService: IStateService, logService: ILogService): Promise<string> {
25+
const devDeviceId = await resolveNodedevDeviceId(stateService, logService);
26+
stateService.setItem(devDeviceIdKey, devDeviceId);
27+
return devDeviceId;
2828
}

‎src/vs/platform/telemetry/node/telemetryUtils.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
*--------------------------------------------------------------------------------------------*/
55

66
import { isMacintosh } from 'vs/base/common/platform';
7-
import { getMachineId, getSqmMachineId, getVSDeviceId } from 'vs/base/node/id';
7+
import { getMachineId, getSqmMachineId, getdevDeviceId } from 'vs/base/node/id';
88
import { ILogService } from 'vs/platform/log/common/log';
99
import { IStateReadService } from 'vs/platform/state/node/state';
10-
import { machineIdKey, sqmIdKey, vsDeviceIdKey } from 'vs/platform/telemetry/common/telemetry';
10+
import { machineIdKey, sqmIdKey, devDeviceIdKey } from 'vs/platform/telemetry/common/telemetry';
1111

1212

1313
export async function resolveMachineId(stateService: IStateReadService, logService: ILogService): Promise<string> {
@@ -30,11 +30,11 @@ export async function resolveSqmId(stateService: IStateReadService, logService:
3030
return sqmId;
3131
}
3232

33-
export async function resolveVSDeviceId(stateService: IStateReadService, logService: ILogService): Promise<string> {
34-
let vsDeviceId = stateService.getItem<string>(vsDeviceIdKey);
35-
if (typeof vsDeviceId !== 'string') {
36-
vsDeviceId = await getVSDeviceId(logService.error.bind(logService));
33+
export async function resolvedevDeviceId(stateService: IStateReadService, logService: ILogService): Promise<string> {
34+
let devDeviceId = stateService.getItem<string>(devDeviceIdKey);
35+
if (typeof devDeviceId !== 'string') {
36+
devDeviceId = await getdevDeviceId(logService.error.bind(logService));
3737
}
3838

39-
return vsDeviceId;
39+
return devDeviceId;
4040
}

‎src/vs/platform/window/common/window.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ export interface INativeWindowConfiguration extends IWindowConfiguration, Native
348348

349349
machineId: string;
350350
sqmId: string;
351-
vsDeviceId: string;
351+
devDeviceId: string;
352352

353353
execPath: string;
354354
backupPath?: string;

‎src/vs/platform/windows/electron-main/windowsMainService.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
211211
constructor(
212212
private readonly machineId: string,
213213
private readonly sqmId: string,
214-
private readonly vsDeviceId: string,
214+
private readonly devDeviceId: string,
215215
private readonly initialUserEnv: IProcessEnvironment,
216216
@ILogService private readonly logService: ILogService,
217217
@ILoggerMainService private readonly loggerService: ILoggerMainService,
@@ -1410,7 +1410,7 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
14101410

14111411
machineId: this.machineId,
14121412
sqmId: this.sqmId,
1413-
vsDeviceId: this.vsDeviceId,
1413+
devDeviceId: this.devDeviceId,
14141414

14151415
windowId: -1, // Will be filled in by the window once loaded later
14161416

‎src/vs/server/node/serverServices.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
99
import { Schemas } from 'vs/base/common/network';
1010
import * as path from 'vs/base/common/path';
1111
import { IURITransformer } from 'vs/base/common/uriIpc';
12-
import { getMachineId, getSqmMachineId, getVSDeviceId } from 'vs/base/node/id';
12+
import { getMachineId, getSqmMachineId, getdevDeviceId } from 'vs/base/node/id';
1313
import { Promises } from 'vs/base/node/pfs';
1414
import { ClientConnectionEvent, IMessagePassingProtocol, IPCServer, StaticRouter } from 'vs/base/parts/ipc/common/ipc';
1515
import { ProtocolConstants } from 'vs/base/parts/ipc/common/ipc.net';
@@ -132,12 +132,12 @@ export async function setupServerServices(connectionToken: ServerConnectionToken
132132
socketServer.registerChannel('userDataProfiles', new RemoteUserDataProfilesServiceChannel(userDataProfilesService, (ctx: RemoteAgentConnectionContext) => getUriTransformer(ctx.remoteAuthority)));
133133

134134
// Initialize
135-
const [, , machineId, sqmId, vsDeviceId] = await Promise.all([
135+
const [, , machineId, sqmId, devDeviceId] = await Promise.all([
136136
configurationService.initialize(),
137137
userDataProfilesService.init(),
138138
getMachineId(logService.error.bind(logService)),
139139
getSqmMachineId(logService.error.bind(logService)),
140-
getVSDeviceId(logService.error.bind(logService))
140+
getdevDeviceId(logService.error.bind(logService))
141141
]);
142142

143143
const extensionHostStatusService = new ExtensionHostStatusService();
@@ -157,7 +157,7 @@ export async function setupServerServices(connectionToken: ServerConnectionToken
157157

158158
const config: ITelemetryServiceConfig = {
159159
appenders: [oneDsAppender],
160-
commonProperties: resolveCommonProperties(release(), hostname(), process.arch, productService.commit, productService.version + '-remote', machineId, sqmId, vsDeviceId, isInternal, 'remoteAgent'),
160+
commonProperties: resolveCommonProperties(release(), hostname(), process.arch, productService.commit, productService.version + '-remote', machineId, sqmId, devDeviceId, isInternal, 'remoteAgent'),
161161
piiPaths: getPiiPathsFromEnvironment(environmentService)
162162
};
163163
const initialTelemetryLevelArg = environmentService.args['telemetry-level'];

0 commit comments

Comments
 (0)