Skip to content

ExP telemetry fixes #12358

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 15, 2020
Merged

ExP telemetry fixes #12358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2e14a18
Use extension channel instead of VS Code channel
kimadeline Jun 15, 2020
fd27382
Use publisher.name extension id (not just name)
kimadeline Jun 15, 2020
7d6f2f3
Update vscode-tas-client
kimadeline Jun 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
5 changes: 3 additions & 2 deletions src/client/common/experiments/service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down Expand Up @@ -47,7 +48,7 @@ export class ExperimentService implements IExperimentService {

let targetPopulation: TargetPopulation;

if (this.appEnvironment.channel === 'insiders') {
if (this.appEnvironment.extensionChannel === 'insiders') {
Copy link
Author

@kimadeline kimadeline Jun 15, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Check against the stable/insiders channel of the extension, not VS Code 🙈

Copy link

@karrtikr karrtikr Jun 15, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops

targetPopulation = TargetPopulation.Insiders;
} else {
targetPopulation = TargetPopulation.Public;
Expand All @@ -56,7 +57,7 @@ export class ExperimentService implements IExperimentService {
const telemetryReporter = new ExperimentationTelemetry();

this.experimentationService = getExperimentationService(
this.appEnvironment.extensionName,
PVSC_EXTENSION_ID,
Copy link
Author

@kimadeline kimadeline Jun 15, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this.appEnvironment.extensionName returns Python, we want ms-python.python.
/cc @luabud

this.appEnvironment.packageJson.version!,
targetPopulation,
telemetryReporter,
Expand Down
2 changes: 1 addition & 1 deletion src/test/common/experiments/service.unit.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 });
}
Expand Down