Git rebase

microsoft · Apr 8, 2020 · 83d8e66 · 83d8e66
1 parent 237cbcb
commit 83d8e66
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/client/common/configSettings.ts b/src/client/common/configSettings.ts
@@ -17,6 +17,7 @@ import '../common/extensions';
 import { IInterpreterAutoSeletionProxyService, IInterpreterSecurityService } from '../interpreter/autoSelection/types';
 import { sendTelemetryEvent } from '../telemetry';
 import { EventName } from '../telemetry/constants';
+import { sendSettingTelemetry } from '../telemetry/envFileTelemetry';
 import { IWorkspaceService } from './application/types';
 import { WorkspaceService } from './application/workspace';
 import { DEFAULT_INTERPRETER_SETTING, isTestExecution } from './constants';
@@ -242,8 +243,10 @@ export class PythonSettings implements IPythonSettings {
         }
         this.languageServer = systemVariables.resolveAny(ls)!;
 
-        // tslint:disable-next-line:no-backbone-get-set-outside-model no-non-null-assertion
-        this.envFile = systemVariables.resolveAny(pythonSettings.get<string>('envFile'))!;
+        const envFileSetting = pythonSettings.get<string>('envFile');
+        this.envFile = systemVariables.resolveAny(envFileSetting)!;
+        sendSettingTelemetry(this.workspace, envFileSetting);
+
         // tslint:disable-next-line:no-any
         // tslint:disable-next-line:no-backbone-get-set-outside-model no-non-null-assertion no-any
         this.devOptions = systemVariables.resolveAny(pythonSettings.get<any[]>('devOptions'))!;

diff --git a/src/test/common/configSettings/configSettings.pythonPath.unit.test.ts b/src/test/common/configSettings/configSettings.pythonPath.unit.test.ts
@@ -16,8 +16,8 @@ import { PythonSettings } from '../../../client/common/configSettings';
 import { DeprecatePythonPath } from '../../../client/common/experimentGroups';
 import { IExperimentsManager, IInterpreterPathService } from '../../../client/common/types';
 import { noop } from '../../../client/common/utils/misc';
-import * as EnvFileTelemetry from '../../../client/telemetry/envFileTelemetry';
 import { IInterpreterSecurityService } from '../../../client/interpreter/autoSelection/types';
+import * as EnvFileTelemetry from '../../../client/telemetry/envFileTelemetry';
 import { MockAutoSelectionService } from '../../mocks/autoSelector';
 const untildify = require('untildify');