fix: create new guid for crash reporter

This id should never be sent to telemetry for
GDPR reasons, hence we don't reuse any of existing
persistent ids like instanceId etc.

src/vs/platform/electron/electron-main/electronMainService.ts

@@ -18,8 +18,9 @@ import { AddFirstParameterToFunctions } from 'vs/base/common/types';
 import { IDialogMainService } from 'vs/platform/dialogs/electron-main/dialogs';
 import { dirExists } from 'vs/base/node/pfs';
 import { URI } from 'vs/base/common/uri';
-import { ITelemetryData, ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { ITelemetryData, ITelemetryService, crashReporterIdStorageKey } from 'vs/platform/telemetry/common/telemetry';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { IStorageMainService } from 'vs/platform/storage/node/storageMainService';
 import { ILogService } from 'vs/platform/log/common/log';
 
 export interface IElectronMainService extends AddFirstParameterToFunctions<IElectronService, Promise<any> /* only methods, not events */, number | undefined /* window ID */> { }
@@ -36,7 +37,8 @@ export class ElectronMainService implements IElectronMainService {
 		@ILifecycleMainService private readonly lifecycleMainService: ILifecycleMainService,
 		@IEnvironmentService private readonly environmentService: IEnvironmentService,
 		@ITelemetryService private readonly telemetryService: ITelemetryService,
-		@ILogService private readonly logService: ILogService
+		@ILogService private readonly logService: ILogService,
+		private storageMainService: IStorageMainService
 	) {
 	}
 
@@ -397,6 +399,10 @@ export class ElectronMainService implements IElectronMainService {
 		this.logService.trace('ElectronMainService#crashReporter', JSON.stringify(options));
 	}
 
+	async getCrashReporterId(): Promise<string> {
+		return this.storageMainService.get(crashReporterIdStorageKey)!;
+	}
+
 	//#endregion
 
 	private windowById(windowId: number | undefined): ICodeWindow | undefined {

src/vs/platform/electron/node/electron.ts

@@ -80,6 +80,7 @@ export interface IElectronService {
 	openDevTools(options?: OpenDevToolsOptions): Promise<void>;
 	toggleDevTools(): Promise<void>;
 	startCrashReporter(options: CrashReporterStartOptions): Promise<void>;
+	getCrashReporterId(): Promise<string>;
 
 	// Connectivity
 	resolveProxy(url: string): Promise<string | undefined>;

src/vs/platform/storage/node/storageIpc.ts

@@ -12,7 +12,7 @@ import { Disposable, IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { onUnexpectedError } from 'vs/base/common/errors';
 import { ILogService } from 'vs/platform/log/common/log';
 import { generateUuid } from 'vs/base/common/uuid';
-import { instanceStorageKey, firstSessionDateStorageKey, lastSessionDateStorageKey, currentSessionDateStorageKey } from 'vs/platform/telemetry/common/telemetry';
+import { instanceStorageKey, firstSessionDateStorageKey, lastSessionDateStorageKey, currentSessionDateStorageKey, crashReporterIdStorageKey } from 'vs/platform/telemetry/common/telemetry';
 
 type Key = string;
 type Value = string;
@@ -54,6 +54,16 @@ export class GlobalStorageDatabaseChannel extends Disposable implements IServerC
 			this.logService.error(error);
 		}
 
+		// This is unique to the application instance and thereby
+		// should be written from the main process once.
+		//
+		// THIS SHOULD NEVER BE SENT TO TELEMETRY.
+		//
+		const crashReporterId = this.storageMainService.get(crashReporterIdStorageKey, undefined);
+		if (crashReporterId === undefined) {
+			this.storageMainService.store(crashReporterIdStorageKey, generateUuid());
+		}
+
 		// Apply global telemetry values as part of the initialization
 		// These are global across all windows and thereby should be
 		// written from the main process once.

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

@@ -45,3 +45,4 @@ export const instanceStorageKey = 'telemetry.instanceId';
 export const currentSessionDateStorageKey = 'telemetry.currentSessionDate';
 export const firstSessionDateStorageKey = 'telemetry.firstSessionDate';
 export const lastSessionDateStorageKey = 'telemetry.lastSessionDate';
+export const crashReporterIdStorageKey = 'crashReporter.guid';

src/vs/workbench/electron-browser/window.ts

@@ -544,12 +544,13 @@ export class ElectronWindow extends Disposable {
 		const appCenterURL = isWindows ? appCenterConfig[process.arch === 'ia32' ? 'win32-ia32' : 'win32-x64']
 			: isLinux ? appCenterConfig[`linux-x64`] : appCenterConfig.darwin;
 		const info = await this.telemetryService.getTelemetryInfo();
+		const crashReporterId = await this.electronService.getCrashReporterId();
 
 		// base options with product info
 		const options: CrashReporterStartOptions = {
 			companyName,
 			productName,
-			submitURL: appCenterURL.concat('&uid=', info.machineId, '&iid=', info.instanceId),
+			submitURL: appCenterURL.concat('&uid=', crashReporterId, '&iid=', crashReporterId, '&sid=', info.sessionId),
 			extra: {
 				vscode_version: product.version,
 				vscode_commit: product.commit || ''

src/vs/workbench/test/electron-browser/workbenchTestServices.ts

@@ -207,6 +207,7 @@ export class TestElectronService implements IElectronService {
 	async openDevTools(options?: Electron.OpenDevToolsOptions | undefined): Promise<void> { }
 	async toggleDevTools(): Promise<void> { }
 	async startCrashReporter(options: Electron.CrashReporterStartOptions): Promise<void> { }
+	async getCrashReporterId(): Promise<string> { return ''; }
 	async resolveProxy(url: string): Promise<string | undefined> { return undefined; }
 }