Merge from vscode ec07311dab2556c9d66a4cb3eecdc21c524202e1 (#6739)

src/vs/platform/markers/common/markers.ts

@@ -129,6 +129,10 @@ export interface MarkerStatistics {
 export namespace IMarkerData {
 	const emptyString = '';
 	export function makeKey(markerData: IMarkerData): string {
+		return makeKeyOptionalMessage(markerData, true);
+	}
+
+	export function makeKeyOptionalMessage(markerData: IMarkerData, useMessage: boolean): string {
 		let result: string[] = [emptyString];
 		if (markerData.source) {
 			result.push(markerData.source.replace('¦', '\¦'));
@@ -145,7 +149,10 @@ export namespace IMarkerData {
 		} else {
 			result.push(emptyString);
 		}
-		if (markerData.message) {
+
+		// Modifed to not include the message as part of the marker key to work around
+		// https://github.com/microsoft/vscode/issues/77475
+		if (markerData.message && useMessage) {
 			result.push(markerData.message.replace('¦', '\¦'));
 		} else {
 			result.push(emptyString);

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

@@ -12,6 +12,7 @@ export const lastSessionDateStorageKey = 'telemetry.lastSessionDate';
 
 import * as Platform from 'vs/base/common/platform';
 import * as uuid from 'vs/base/common/uuid';
+import { cleanRemoteAuthority } from 'vs/platform/telemetry/common/telemetryUtils';
 
 export async function resolveWorkbenchCommonProperties(storageService: IStorageService, commit: string | undefined, version: string | undefined, machineId: string, remoteAuthority?: string): Promise<{ [name: string]: string | undefined }> {
 	const result: { [name: string]: string | undefined; } = Object.create(null);
@@ -69,18 +70,3 @@ export async function resolveWorkbenchCommonProperties(storageService: IStorageS
 	return result;
 }
 
-function cleanRemoteAuthority(remoteAuthority?: string): string {
-	if (!remoteAuthority) {
-		return 'none';
-	}
-
-	let ret = 'other';
-	// Whitelisted remote authorities
-	['ssh-remote', 'dev-container', 'wsl'].forEach((res: string) => {
-		if (remoteAuthority!.indexOf(`${res}+`) === 0) {
-			ret = res;
-		}
-	});
-
-	return ret;
-}

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

@@ -288,6 +288,22 @@ export function validateTelemetryData(data?: any): { properties: Properties, mea
 	};
 }
 
+export function cleanRemoteAuthority(remoteAuthority?: string): string {
+	if (!remoteAuthority) {
+		return 'none';
+	}
+
+	let ret = 'other';
+	// Whitelisted remote authorities
+	['ssh-remote', 'dev-container', 'attached-container', 'wsl'].forEach((res: string) => {
+		if (remoteAuthority!.indexOf(`${res}+`) === 0) {
+			ret = res;
+		}
+	});
+
+	return ret;
+}
+
 function flatten(obj: any, result: { [key: string]: any }, order: number = 0, prefix?: string): void {
 	if (!obj) {
 		return;

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

@@ -6,6 +6,7 @@
 import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
 import { resolveCommonProperties } from 'vs/platform/telemetry/node/commonProperties';
 import { instanceStorageKey, firstSessionDateStorageKey, lastSessionDateStorageKey } from 'vs/platform/telemetry/common/telemetry';
+import { cleanRemoteAuthority } from 'vs/platform/telemetry/common/telemetryUtils';
 
 // {{ SQL CARBON EDIT }}
 import product from 'vs/platform/product/node/product';
@@ -57,19 +58,3 @@ function setUsageDates(storageService: IStorageService): void {
 	const monthlyLastUseDate = storageService.get('telemetry.monthlyLastUseDate', StorageScope.GLOBAL, appStartDate.toUTCString());
 	storageService.store('telemetry.monthlyLastUseDate', monthlyLastUseDate, StorageScope.GLOBAL);
 }
-
-function cleanRemoteAuthority(remoteAuthority?: string): string {
-	if (!remoteAuthority) {
-		return 'none';
-	}
-
-	let ret = 'other';
-	// Whitelisted remote authorities
-	['ssh-remote', 'dev-container', 'wsl'].forEach((res: string) => {
-		if (remoteAuthority!.indexOf(`${res}+`) === 0) {
-			ret = res;
-		}
-	});
-
-	return ret;
-}