Set machineId in shared process (fixes microsoft#20349)

chrmarti · chrmarti · commit 4f89ece6fb9e · 2017-02-09T11:42:34.000-08:00
diff --git a/src/vs/base/node/id.ts b/src/vs/base/node/id.ts
@@ -97,8 +97,9 @@ export function _futureMachineIdExperiment(): string {
 	return mac.value;
 }
 
+let machineId: TPromise<string>;
 export function getMachineId(): TPromise<string> {
-	return new TPromise<string>(resolve => {
+	return machineId || (machineId = new TPromise<string>(resolve => {
 		try {
 			getmac.getMac((error, macAddress) => {
 				if (!error) {
@@ -111,5 +112,5 @@ export function getMachineId(): TPromise<string> {
 			errors.onUnexpectedError(err);
 			resolve(uuid.generateUuid()); // fallback, generate a UUID
 		}
-	});
+	}));
 }
diff --git a/src/vs/platform/telemetry/node/commonProperties.ts b/src/vs/platform/telemetry/node/commonProperties.ts
@@ -7,6 +7,7 @@ import * as Platform from 'vs/base/common/platform';
 import * as os from 'os';
 import { TPromise } from 'vs/base/common/winjs.base';
 import * as uuid from 'vs/base/common/uuid';
+import { getMachineId } from 'vs/base/node/id';
 
 export function resolveCommonProperties(commit: string, version: string): TPromise<{ [name: string]: string; }> {
 	const result: { [name: string]: string; } = Object.create(null);
@@ -16,6 +17,7 @@ export function resolveCommonProperties(commit: string, version: string): TPromi
 	result['version'] = version;
 	result['common.osVersion'] = os.release();
 	result['common.platform'] = Platform.Platform[Platform.platform];
+	const promise = getMachineId().then(value => result['common.machineId'] = value);
 
 	// dynamic properties which value differs on each call
 	let seq = 0;
@@ -35,5 +37,5 @@ export function resolveCommonProperties(commit: string, version: string): TPromi
 		}
 	});
 
-	return TPromise.as(result);
+	return promise.then(() => result);
 }

Original file line number	Diff line number	Diff line change
`@@ -97,8 +97,9 @@ export function _futureMachineIdExperiment(): string {`
`97`	`97`	`return mac.value;`
`98`	`98`	`}`
`99`	`99`
	`100`	`+let machineId: TPromise<string>;`
`100`	`101`	`export function getMachineId(): TPromise<string> {`
`101`		`- return new TPromise<string>(resolve => {`
	`102`	`+ return machineId \|\| (machineId = new TPromise<string>(resolve => {`
`102`	`103`	`try {`
`103`	`104`	`getmac.getMac((error, macAddress) => {`
`104`	`105`	`if (!error) {`
`@@ -111,5 +112,5 @@ export function getMachineId(): TPromise<string> {`
`111`	`112`	`errors.onUnexpectedError(err);`
`112`	`113`	`resolve(uuid.generateUuid()); // fallback, generate a UUID`
`113`	`114`	`}`
`114`		`- });`
	`115`	`+ }));`
`115`	`116`	`}`