fixes #14280

src/vs/platform/extensionManagement/node/extensionGalleryService.ts

@@ -23,6 +23,7 @@ import pkg from 'vs/platform/package';
 import product from 'vs/platform/product';
 import { isVersionValid } from 'vs/platform/extensions/node/extensionValidator';
 import * as url from 'url';
+import { getMachineId } from 'vs/base/node/id';
 
 interface IRawGalleryExtensionFile {
 	assetType: string;
@@ -262,18 +263,11 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
 
 	@memoize
 	private get commonHeaders(): TPromise<{ [key: string]: string; }> {
-		return this.telemetryService.getTelemetryInfo().then(({ machineId }) => {
-			const result: { [key: string]: string; } = {
-				'X-Market-Client-Id': `VSCode ${pkg.version}`,
-				'User-Agent': `VSCode ${pkg.version}`
-			};
-
-			if (machineId) {
-				result['X-Market-User-Id'] = machineId;
-			}
-
-			return result;
-		});
+		return getMachineId().then(machineId => ({
+			'X-Market-Client-Id': `VSCode ${pkg.version}`,
+			'User-Agent': `VSCode ${pkg.version}`,
+			'X-Market-User-Id': machineId
+		}));
 	}
 
 	constructor(

src/vs/platform/telemetry/node/workbenchCommonProperties.ts

@@ -9,7 +9,7 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import * as errors from 'vs/base/common/errors';
 import * as uuid from 'vs/base/common/uuid';
 import { IStorageService } from 'vs/platform/storage/common/storage';
-import { getMachineId } from '../node/machineId';
+import { getMachineId } from 'vs/base/node/id';
 import { resolveCommonProperties } from '../node/commonProperties';
 
 const SQM_KEY: string = '\\Software\\Microsoft\\SQMClient';