From a8909ed194ee2897125db083d8f4eb7ac310eb9f Mon Sep 17 00:00:00 2001 From: Prashant Cholachagudda Date: Tue, 15 Nov 2022 16:54:35 +0530 Subject: [PATCH 1/4] change sessionId with machineId for extension search telemetry --- src/vs/platform/externalServices/common/marketplace.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vs/platform/externalServices/common/marketplace.ts b/src/vs/platform/externalServices/common/marketplace.ts index 01ba175308c..6de6178418e 100644 --- a/src/vs/platform/externalServices/common/marketplace.ts +++ b/src/vs/platform/externalServices/common/marketplace.ts @@ -28,9 +28,9 @@ 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; + headers['VSCode-SessionId'] = machineId; } return headers; From 7ca7a7f01f0d0df2bfb4be398445af210cc356ff Mon Sep 17 00:00:00 2001 From: Isidor Nikolic Date: Tue, 15 Nov 2022 15:56:29 +0100 Subject: [PATCH 2/4] add comment --- src/vs/platform/externalServices/common/marketplace.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/vs/platform/externalServices/common/marketplace.ts b/src/vs/platform/externalServices/common/marketplace.ts index 6de6178418e..4678191fa64 100644 --- a/src/vs/platform/externalServices/common/marketplace.ts +++ b/src/vs/platform/externalServices/common/marketplace.ts @@ -30,6 +30,7 @@ export async function resolveMarketplaceHeaders(version: string, const uuid = await getServiceMachineId(environmentService, fileService, storageService); const { machineId } = await telemetryService.getTelemetryInfo(); headers['X-Market-User-Id'] = uuid; + // Send machineId as VSCode-SessionId so we can correlate telemetry events across different services headers['VSCode-SessionId'] = machineId; } From 52e04424d1c6bf8b9b71b1b2e4125788c1c21984 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 16 Nov 2022 11:29:37 +0100 Subject: [PATCH 3/4] Bump loader-utils from 1.4.1 to 1.4.2 (#166406) Bumps [loader-utils](https://github.com/webpack/loader-utils) from 1.4.1 to 1.4.2. - [Release notes](https://github.com/webpack/loader-utils/releases) - [Changelog](https://github.com/webpack/loader-utils/blob/v1.4.2/CHANGELOG.md) - [Commits](https://github.com/webpack/loader-utils/compare/v1.4.1...v1.4.2) --- updated-dependencies: - dependency-name: loader-utils dependency-type: indirect ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 0eef274f3c3..2a27d9f27ac 100644 --- a/yarn.lock +++ b/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" From f65123fd11097276b55c3ee5765fdce897e1c5eb Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Wed, 16 Nov 2022 11:48:47 +0100 Subject: [PATCH 4/4] fix compilation @hediet (#166448) --- src/vs/editor/test/node/diffing/diffing.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/editor/test/node/diffing/diffing.test.ts b/src/vs/editor/test/node/diffing/diffing.test.ts index fdccaf91fc2..0010462b647 100644 --- a/src/vs/editor/test/node/diffing/diffing.test.ts +++ b/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}`,