From 2e14a1827de9d31a593e2b861a5257b1f8e4ce5e Mon Sep 17 00:00:00 2001 From: Kim-Adeline Miguel Date: Mon, 15 Jun 2020 10:16:33 -0700 Subject: [PATCH 1/3] Use extension channel instead of VS Code channel --- src/client/common/experiments/service.ts | 2 +- src/test/common/experiments/service.unit.test.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/client/common/experiments/service.ts b/src/client/common/experiments/service.ts index 093f3bc65b21..82d1f1840cfe 100644 --- a/src/client/common/experiments/service.ts +++ b/src/client/common/experiments/service.ts @@ -47,7 +47,7 @@ export class ExperimentService implements IExperimentService { let targetPopulation: TargetPopulation; - if (this.appEnvironment.channel === 'insiders') { + if (this.appEnvironment.extensionChannel === 'insiders') { targetPopulation = TargetPopulation.Insiders; } else { targetPopulation = TargetPopulation.Public; diff --git a/src/test/common/experiments/service.unit.test.ts b/src/test/common/experiments/service.unit.test.ts index 7cc26dcd0fc7..f3e5f0316907 100644 --- a/src/test/common/experiments/service.unit.test.ts +++ b/src/test/common/experiments/service.unit.test.ts @@ -46,7 +46,7 @@ suite('Experimentation service', () => { } function configureApplicationEnvironment(channel: Channel, version: string) { - when(appEnvironment.channel).thenReturn(channel); + when(appEnvironment.extensionChannel).thenReturn(channel); when(appEnvironment.extensionName).thenReturn(PVSC_EXTENSION_ID_FOR_TESTS); when(appEnvironment.packageJson).thenReturn({ version }); } From fd273820aff3bb7b7095169b83ef6e722aa623ad Mon Sep 17 00:00:00 2001 From: Kim-Adeline Miguel Date: Mon, 15 Jun 2020 10:21:51 -0700 Subject: [PATCH 2/3] Use publisher.name extension id (not just name) --- src/client/common/experiments/service.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/client/common/experiments/service.ts b/src/client/common/experiments/service.ts index 82d1f1840cfe..0e9781c3e750 100644 --- a/src/client/common/experiments/service.ts +++ b/src/client/common/experiments/service.ts @@ -9,6 +9,7 @@ import { getExperimentationService, IExperimentationService, TargetPopulation } import { sendTelemetryEvent } from '../../telemetry'; import { EventName } from '../../telemetry/constants'; import { IApplicationEnvironment } from '../application/types'; +import { PVSC_EXTENSION_ID } from '../constants'; import { GLOBAL_MEMENTO, IConfigurationService, IExperimentService, IMemento, IPythonSettings } from '../types'; import { ExperimentationTelemetry } from './telemetry'; @@ -56,7 +57,7 @@ export class ExperimentService implements IExperimentService { const telemetryReporter = new ExperimentationTelemetry(); this.experimentationService = getExperimentationService( - this.appEnvironment.extensionName, + PVSC_EXTENSION_ID, this.appEnvironment.packageJson.version!, targetPopulation, telemetryReporter, From 7d6f2f3850ba22eb40d0ba2ee07d6721269af3bf Mon Sep 17 00:00:00 2001 From: Kim-Adeline Miguel Date: Mon, 15 Jun 2020 11:37:16 -0700 Subject: [PATCH 3/3] Update vscode-tas-client --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 18aa0c23b6af..7347bf6f154b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22090,9 +22090,9 @@ } }, "tas-client": { - "version": "0.0.762", - "resolved": "https://registry.npmjs.org/tas-client/-/tas-client-0.0.762.tgz", - "integrity": "sha512-i4dcYHkk2rnmBHr8RC1IoZVHU9wQT+OmDDnUeRW/vbpjDSCqgL5Qh8KeHs3DizJgqP9MWjLK/Kmqfm8VbD6g3g==", + "version": "0.0.875", + "resolved": "https://registry.npmjs.org/tas-client/-/tas-client-0.0.875.tgz", + "integrity": "sha512-Y375pAWdOAFKAs2gZHVC3SAxGp8vHNRTpl7W6rBaB8YgZbAX0h0NHUubqHtyuNwH6VF9qy2ckagsuXZP0JignQ==", "requires": { "axios": "^0.19.0" } @@ -24713,11 +24713,11 @@ "integrity": "sha512-tZFUSbyjUcrh+qQf13ALX4QDdOfDX0cVaBFgy7ktJ0VwS7AW/yRKgGPSxVqqP9OCMNPdqP57O5q47w2pEwfaUg==" }, "vscode-tas-client": { - "version": "0.0.757", - "resolved": "https://registry.npmjs.org/vscode-tas-client/-/vscode-tas-client-0.0.757.tgz", - "integrity": "sha512-IXP+vFTIE1HpvYxqm7SuFe/K5N3cPoF4TTH6uYGAeuuYxV586tjYFtK9UmF00ajzcqvLGvsPgxmfgLeX6vUUtA==", + "version": "0.0.864", + "resolved": "https://registry.npmjs.org/vscode-tas-client/-/vscode-tas-client-0.0.864.tgz", + "integrity": "sha512-mRMpeTVQ8Rx3p4yF9y8AABanzbqtLRdJA99dzeQ9MdIHsSEdp0kEwxqayzDhNHDdp8vNbQkHN8zMxSvm/ZWdpg==", "requires": { - "tas-client": "0.0.762" + "tas-client": "0.0.875" } }, "vscode-test": { diff --git a/package.json b/package.json index 8acc8b387133..5e067804445b 100644 --- a/package.json +++ b/package.json @@ -3071,7 +3071,7 @@ "vscode-languageclient": "^6.2.0-next.2", "vscode-languageserver": "^6.2.0-next.2", "vscode-languageserver-protocol": "^3.16.0-next.2", - "vscode-tas-client": "^0.0.757", + "vscode-tas-client": "^0.0.864", "vsls": "^0.3.1291", "winreg": "^1.2.4", "winston": "^3.2.1",