Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions news/2 Fixes/17447.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix `Python extension loading...` issue for users who have disabled telemetry.
6 changes: 6 additions & 0 deletions src/client/common/experiments/service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import { IApplicationEnvironment, IWorkspaceService } from '../application/types
import { PVSC_EXTENSION_ID, STANDARD_OUTPUT_CHANNEL } from '../constants';
import { GLOBAL_MEMENTO, IExperimentService, IMemento, IOutputChannel } from '../types';
import { Experiments } from '../utils/localize';
import { DiscoveryVariants } from './groups';
import { ExperimentationTelemetry } from './telemetry';

const EXP_MEMENTO_KEY = 'VSCode.ABExp.FeatureData';
Expand Down Expand Up @@ -126,6 +127,11 @@ export class ExperimentService implements IExperimentService {
return true;
}

if (experiment === DiscoveryVariants.discoveryWithoutFileWatching) {
// Enable discovery experiment for all users.
return true;
}

// If getTreatmentVariable returns undefined,
// it means that the value for this experiment was not found on the server.
const treatmentVariable = this.experimentationService.getTreatmentVariable(EXP_CONFIG_ID, experiment);
Expand Down
23 changes: 19 additions & 4 deletions src/test/common/experiments/service.unit.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import { ApplicationEnvironment } from '../../../client/common/application/appli
import { IApplicationEnvironment, IWorkspaceService } from '../../../client/common/application/types';
import { WorkspaceService } from '../../../client/common/application/workspace';
import { Channel } from '../../../client/common/constants';
import { DiscoveryVariants } from '../../../client/common/experiments/groups';
import { ExperimentService } from '../../../client/common/experiments/service';
import { Experiments } from '../../../client/common/utils/localize';
import * as Telemetry from '../../../client/telemetry';
Expand Down Expand Up @@ -157,14 +158,14 @@ suite('Experimentation service', () => {

suite('In-experiment-sync check', () => {
const experiment = 'Test Experiment - experiment';
let telemetryEvents: { eventName: string; properties: Record<string, unknown> }[] = [];
let telemetryEvents: { eventName: string; properties: unknown }[] = [];
let getTreatmentVariable: sinon.SinonStub;
let sendTelemetryEventStub: sinon.SinonStub;

setup(() => {
sendTelemetryEventStub = sinon
.stub(Telemetry, 'sendTelemetryEvent')
.callsFake((eventName: string, _, properties: Record<string, unknown>) => {
.callsFake((eventName: string, _, properties: unknown) => {
const telemetry = { eventName, properties };
telemetryEvents.push(telemetry);
});
Expand All @@ -182,6 +183,20 @@ suite('Experimentation service', () => {
sinon.restore();
});

test('Enable discovery experiment without file watching for all users', async () => {
configureSettings(true, [], []);

const experimentService = new ExperimentService(
instance(workspaceService),
instance(appEnvironment),
globalMemento,
outputChannel,
);
const result = experimentService.inExperimentSync(DiscoveryVariants.discoveryWithoutFileWatching);

assert.isTrue(result);
});

test('If the opt-in and opt-out arrays are empty, return the value from the experimentation framework for a given experiment', async () => {
configureSettings(true, [], []);

Expand Down Expand Up @@ -401,13 +416,13 @@ suite('Experimentation service', () => {
});

suite('Opt-in/out telemetry', () => {
let telemetryEvents: { eventName: string; properties: Record<string, unknown> }[] = [];
let telemetryEvents: { eventName: string; properties: unknown }[] = [];
let sendTelemetryEventStub: sinon.SinonStub;

setup(() => {
sendTelemetryEventStub = sinon
.stub(Telemetry, 'sendTelemetryEvent')
.callsFake((eventName: string, _, properties: Record<string, unknown>) => {
.callsFake((eventName: string, _, properties: unknown) => {
const telemetry = { eventName, properties };
telemetryEvents.push(telemetry);
});
Expand Down