Skip to content

Commit 86bd356

Browse files
authored
ExP telemetry fixes (#12358)
* Use extension channel instead of VS Code channel * Use publisher.name extension id (not just name) * Update vscode-tas-client
1 parent e121d5a commit 86bd356

File tree

4 files changed

+12
-11
lines changed

4 files changed

+12
-11
lines changed

package-lock.json

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3118,7 +3118,7 @@
31183118
"vscode-languageclient": "^6.2.0-next.2",
31193119
"vscode-languageserver": "^6.2.0-next.2",
31203120
"vscode-languageserver-protocol": "^3.16.0-next.2",
3121-
"vscode-tas-client": "^0.0.757",
3121+
"vscode-tas-client": "^0.0.864",
31223122
"vsls": "^0.3.1291",
31233123
"winreg": "^1.2.4",
31243124
"winston": "^3.2.1",

src/client/common/experiments/service.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import { getExperimentationService, IExperimentationService, TargetPopulation }
99
import { sendTelemetryEvent } from '../../telemetry';
1010
import { EventName } from '../../telemetry/constants';
1111
import { IApplicationEnvironment } from '../application/types';
12+
import { PVSC_EXTENSION_ID } from '../constants';
1213
import { GLOBAL_MEMENTO, IConfigurationService, IExperimentService, IMemento, IPythonSettings } from '../types';
1314
import { ExperimentationTelemetry } from './telemetry';
1415

@@ -47,7 +48,7 @@ export class ExperimentService implements IExperimentService {
4748

4849
let targetPopulation: TargetPopulation;
4950

50-
if (this.appEnvironment.channel === 'insiders') {
51+
if (this.appEnvironment.extensionChannel === 'insiders') {
5152
targetPopulation = TargetPopulation.Insiders;
5253
} else {
5354
targetPopulation = TargetPopulation.Public;
@@ -56,7 +57,7 @@ export class ExperimentService implements IExperimentService {
5657
const telemetryReporter = new ExperimentationTelemetry();
5758

5859
this.experimentationService = getExperimentationService(
59-
this.appEnvironment.extensionName,
60+
PVSC_EXTENSION_ID,
6061
this.appEnvironment.packageJson.version!,
6162
targetPopulation,
6263
telemetryReporter,

src/test/common/experiments/service.unit.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ suite('Experimentation service', () => {
4646
}
4747

4848
function configureApplicationEnvironment(channel: Channel, version: string) {
49-
when(appEnvironment.channel).thenReturn(channel);
49+
when(appEnvironment.extensionChannel).thenReturn(channel);
5050
when(appEnvironment.extensionName).thenReturn(PVSC_EXTENSION_ID_FOR_TESTS);
5151
when(appEnvironment.packageJson).thenReturn({ version });
5252
}

0 commit comments

Comments
 (0)