Merge branch 'main' into joh/rewrite-privates

Author: jrieken

src/vs/editor/test/node/diffing/diffing.test.ts

@@ -31,7 +31,7 @@ suite('diff fixtures', () => {
 
 				const diffingAlgo = diffingAlgoName === 'smart' ? new SmartLinesDiffComputer() : new StandardLinesDiffComputer();
 
-				const diff = diffingAlgo.computeDiff(firstContentLines, secondContentLines, { ignoreTrimWhitespace: false, maxComputationTime: Number.MAX_SAFE_INTEGER });
+				const diff = diffingAlgo.computeDiff(firstContentLines, secondContentLines, { ignoreTrimWhitespace: false, maxComputationTimeMs: Number.MAX_SAFE_INTEGER });
 
 				const actualDiffingResult: DiffingResult = {
 					originalFileName: `./${firstFileName}`,

src/vs/platform/externalServices/common/marketplace.ts

@@ -28,9 +28,10 @@ export async function resolveMarketplaceHeaders(version: string,
 
 	if (supportsTelemetry(productService, environmentService) && getTelemetryLevel(configurationService) === TelemetryLevel.USAGE) {
 		const uuid = await getServiceMachineId(environmentService, fileService, storageService);
-		const { sessionId } = await telemetryService.getTelemetryInfo();
+		const { machineId } = await telemetryService.getTelemetryInfo();
 		headers['X-Market-User-Id'] = uuid;
-		headers['VSCode-SessionId'] = sessionId;
+		// Send machineId as VSCode-SessionId so we can correlate telemetry events across different services
+		headers['VSCode-SessionId'] = machineId;
 	}
 
 	return headers;

yarn.lock

@@ -6910,9 +6910,9 @@ loader-runner@^4.2.0:
   integrity sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==
 
 loader-utils@^1.2.3, loader-utils@^1.4.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.1.tgz#278ad7006660bccc4d2c0c1578e17c5c78d5c0e0"
-  integrity sha512-1Qo97Y2oKaU+Ro2xnDMR26g1BwMT29jNbem1EvcujW2jqt+j5COXyscjM7bLQkM9HaxI7pkWeW7gnI072yMI9Q==
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.2.tgz#29a957f3a63973883eb684f10ffd3d151fec01a3"
+  integrity sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==
   dependencies:
     big.js "^5.2.2"
     emojis-list "^3.0.0"