Leverage ComponentAdapter.getInterpreterInformation in PythonPathUpdaterService (#15134)

kimadeline · web-flow · commit a06f21b6c656 · 2021-01-14T15:30:23.000-08:00
* Fix linting
* Use new discovery code, remove bitness from props
* Remove pipVersion from PYTHON_INTERPRETER
diff --git a/.eslintignore b/.eslintignore
@@ -340,7 +340,6 @@ src/client/interpreter/configuration/interpreterSelector/commands/setInterpreter
 src/client/interpreter/configuration/interpreterSelector/commands/resetInterpreter.ts
 src/client/interpreter/configuration/interpreterSelector/commands/setShebangInterpreter.ts
 src/client/interpreter/configuration/interpreterSelector/interpreterSelector.ts
-src/client/interpreter/configuration/pythonPathUpdaterService.ts
 src/client/interpreter/configuration/pythonPathUpdaterServiceFactory.ts
 src/client/interpreter/configuration/services/globalUpdaterService.ts
 src/client/interpreter/configuration/services/workspaceUpdaterService.ts
diff --git a/src/client/interpreter/configuration/pythonPathUpdaterService.ts b/src/client/interpreter/configuration/pythonPathUpdaterService.ts
@@ -9,21 +9,25 @@ import { InterpreterInformation } from '../../pythonEnvironments/info';
 import { sendTelemetryEvent } from '../../telemetry';
 import { EventName } from '../../telemetry/constants';
 import { PythonInterpreterTelemetry } from '../../telemetry/types';
-import { IInterpreterVersionService } from '../contracts';
+import { IComponentAdapter } from '../contracts';
 import { IPythonPathUpdaterServiceFactory, IPythonPathUpdaterServiceManager } from './types';
 
 @injectable()
 export class PythonPathUpdaterService implements IPythonPathUpdaterServiceManager {
     private readonly pythonPathSettingsUpdaterFactory: IPythonPathUpdaterServiceFactory;
-    private readonly interpreterVersionService: IInterpreterVersionService;
+
     private readonly executionFactory: IPythonExecutionFactory;
+
+    private readonly componentAdapter: IComponentAdapter;
+
     constructor(@inject(IServiceContainer) serviceContainer: IServiceContainer) {
         this.pythonPathSettingsUpdaterFactory = serviceContainer.get<IPythonPathUpdaterServiceFactory>(
             IPythonPathUpdaterServiceFactory,
         );
-        this.interpreterVersionService = serviceContainer.get<IInterpreterVersionService>(IInterpreterVersionService);
         this.executionFactory = serviceContainer.get<IPythonExecutionFactory>(IPythonExecutionFactory);
+        this.componentAdapter = serviceContainer.get<IComponentAdapter>(IComponentAdapter);
     }
+
     public async updatePythonPath(
         pythonPath: string | undefined,
         configTarget: ConfigurationTarget,
@@ -47,6 +51,7 @@ export class PythonPathUpdaterService implements IPythonPathUpdaterServiceManage
             traceError('Python Extension: sendTelemetry', ex),
         );
     }
+
     private async sendTelemetry(
         duration: number,
         failed: boolean,
@@ -58,27 +63,26 @@ export class PythonPathUpdaterService implements IPythonPathUpdaterServiceManage
             trigger,
         };
         if (!failed && pythonPath) {
-            const processService = await this.executionFactory.create({ pythonPath });
-            const infoPromise = processService
-                .getInterpreterInformation()
-                .catch<InterpreterInformation | undefined>(() => undefined);
-            const pipVersionPromise = this.interpreterVersionService
-                .getPipVersion(pythonPath)
-                .then((value) => (value.length === 0 ? undefined : value))
-                .catch<string>(() => '');
-            const [info, pipVersion] = await Promise.all([infoPromise, pipVersionPromise]);
-            if (info) {
-                telemetryProperties.architecture = info.architecture;
-                if (info.version) {
+            // Ask for info using the new discovery code first.
+            // If it returns undefined, fallback on the old code.
+            const interpreterInfo = await this.componentAdapter.getInterpreterInformation(pythonPath);
+            if (interpreterInfo && interpreterInfo.version) {
+                telemetryProperties.pythonVersion = interpreterInfo.version.raw;
+            } else {
+                const processService = await this.executionFactory.create({ pythonPath });
+                const info = await processService
+                    .getInterpreterInformation()
+                    .catch<InterpreterInformation | undefined>(() => undefined);
+
+                if (info && info.version) {
                     telemetryProperties.pythonVersion = info.version.raw;
                 }
             }
-            if (pipVersion) {
-                telemetryProperties.pipVersion = pipVersion;
-            }
         }
+
         sendTelemetryEvent(EventName.PYTHON_INTERPRETER, duration, telemetryProperties);
     }
+
     private getPythonUpdaterService(configTarget: ConfigurationTarget, wkspace?: Uri) {
         switch (configTarget) {
             case ConfigurationTarget.Global: {
diff --git a/src/client/telemetry/index.ts b/src/client/telemetry/index.ts
@@ -11,7 +11,6 @@ import { AppinsightsKey, isTestExecution, isUnitTestExecution, PVSC_EXTENSION_ID
 import { traceError, traceInfo } from '../common/logger';
 import { Telemetry } from '../common/startPage/constants';
 import type { TerminalShellType } from '../common/terminal/types';
-import { Architecture } from '../common/utils/platform';
 import { StopWatch } from '../common/utils/stopWatch';
 import { DebugConfigurationType } from '../debugger/extension/types';
 import { ConsoleType, TriggerType } from '../debugger/types';
@@ -933,18 +932,6 @@ export interface IEventNamePropertyMapping {
          * @type {string}
          */
         pythonVersion?: string;
-        /**
-         * The version of pip module installed in the python interpreter
-         *
-         * @type {string}
-         */
-        pipVersion?: string;
-        /**
-         * The bit-ness of the python interpreter represented using architecture.
-         *
-         * @type {Architecture}
-         */
-        architecture?: Architecture;
     };
     [EventName.PYTHON_INTERPRETER_ACTIVATION_ENVIRONMENT_VARIABLES]: {
         /**
