Fix other telemetry call points

Author: edvilme

src/common/telemetry/helpers.ts

@@ -69,11 +69,15 @@ export function sendManagerSelectionTelemetry(pm: PythonProjectManager) {
     });
 
     ems.forEach((em) => {
-        sendTelemetryEvent(EventNames.ENVIRONMENT_MANAGER_SELECTED, undefined, { managerId: em });
+        sendTelemetryEvent(EventNames.ENVIRONMENT_MANAGER_SELECTED, undefined, {
+            managerId: getKnownManagerId(em),
+        });
     });
 
     ps.forEach((pkg) => {
-        sendTelemetryEvent(EventNames.PACKAGE_MANAGER_SELECTED, undefined, { managerId: pkg });
+        sendTelemetryEvent(EventNames.PACKAGE_MANAGER_SELECTED, undefined, {
+            managerId: getKnownManagerId(pkg),
+        });
     });
 }
 

src/extension.ts

@@ -21,6 +21,7 @@ import { EventNames } from './common/telemetry/constants';
 import { classifyError } from './common/telemetry/errorClassifier';
 import {
     logDiscoverySummary,
+    getKnownManagerId,
     sendEnvironmentToolUsageTelemetry,
     sendManagerSelectionTelemetry,
     sendProjectStructureTelemetry,
@@ -297,7 +298,7 @@ export async function activate(context: ExtensionContext): Promise<PythonEnviron
                 managerId = item.manager.id;
             }
             sendTelemetryEvent(EventNames.CREATE_ENVIRONMENT, undefined, {
-                manager: managerId,
+                manager: getKnownManagerId(managerId),
                 triggeredLocation: 'createSpecifiedCommand',
             });
             return await withProgress(

src/features/common/managerReady.ts

@@ -3,6 +3,7 @@ import { getExtension } from '../../common/extension.apis';
 import { WorkbenchStrings } from '../../common/localize';
 import { traceError, traceInfo, traceWarn } from '../../common/logging';
 import { EventNames } from '../../common/telemetry/constants';
+import { getKnownManagerId } from '../../common/telemetry/helpers';
 import { sendTelemetryEvent } from '../../common/telemetry/sender';
 import { createDeferred, Deferred } from '../../common/utils/deferred';
 import { showErrorMessage } from '../../common/window.apis';
@@ -52,7 +53,7 @@ export function withManagerTimeout(
                         `To prevent this, check your "python-envs.defaultEnvManager" and "python-envs.pythonProjects" settings.`,
                 );
                 sendTelemetryEvent(EventNames.MANAGER_READY_TIMEOUT, undefined, {
-                    managerId,
+                    managerId: getKnownManagerId(managerId),
                     managerKind: kind,
                 });
                 deferred.resolve();

src/features/envManagers.ts

@@ -26,6 +26,7 @@ import {
 import { traceError, traceVerbose } from '../common/logging';
 import { StopWatch } from '../common/stopWatch';
 import { EventNames } from '../common/telemetry/constants';
+import { getKnownManagerId } from '../common/telemetry/helpers';
 import { sendTelemetryEvent } from '../common/telemetry/sender';
 import { getCallingExtension } from '../common/utils/frameUtils';
 import { normalizePath } from '../common/utils/pathUtils';
@@ -307,7 +308,7 @@ export class PythonEnvironmentManagers implements EnvironmentManagers {
 
         if (!managerId.toLowerCase().startsWith('undefined_publisher.')) {
             sendTelemetryEvent(EventNames.ENVIRONMENT_MANAGER_REGISTERED, registrationStopWatch.elapsedTime, {
-                managerId,
+                managerId: getKnownManagerId(managerId),
             });
         }
 
@@ -336,7 +337,7 @@ export class PythonEnvironmentManagers implements EnvironmentManagers {
 
         if (!managerId.toLowerCase().startsWith('undefined_publisher.')) {
             sendTelemetryEvent(EventNames.PACKAGE_MANAGER_REGISTERED, undefined, {
-                managerId,
+                managerId: getKnownManagerId(managerId),
             });
         }
 

src/features/interpreterSelection.ts

@@ -9,6 +9,7 @@ import { SYSTEM_MANAGER_ID, VENV_MANAGER_ID } from '../common/constants';
 import { traceError, traceInfo, traceVerbose, traceWarn } from '../common/logging';
 import { StopWatch } from '../common/stopWatch';
 import { EventNames } from '../common/telemetry/constants';
+import { getKnownManagerId } from '../common/telemetry/helpers';
 import { sendTelemetryEvent } from '../common/telemetry/sender';
 import { resolveVariables } from '../common/utils/internalVariables';
 import { normalizePath } from '../common/utils/pathUtils';
@@ -318,7 +319,7 @@ export async function applyInitialEnvironmentSelection(
             sendTelemetryEvent(EventNames.ENV_SELECTION_RESULT, scopeStopWatch.elapsedTime, {
                 scope: 'workspace',
                 prioritySource: result.source,
-                managerId: result.manager.id,
+                managerId: getKnownManagerId(result.manager.id),
                 resolutionPath: result.environment ? 'envPreResolved' : 'managerDiscovery',
                 hasPersistedSelection: env !== undefined,
             });
@@ -357,7 +358,7 @@ export async function applyInitialEnvironmentSelection(
             sendTelemetryEvent(EventNames.ENV_SELECTION_RESULT, globalStopWatch.elapsedTime, {
                 scope: 'global',
                 prioritySource: result.source,
-                managerId: result.manager.id,
+                managerId: getKnownManagerId(result.manager.id),
                 resolutionPath: result.environment ? 'envPreResolved' : 'managerDiscovery',
                 hasPersistedSelection: env !== undefined,
             });

src/managers/common/registeredManagers.ts

@@ -15,6 +15,7 @@ import { traceWarn } from '../../common/logging';
 import { StopWatch } from '../../common/stopWatch';
 import { EventNames } from '../../common/telemetry/constants';
 import { classifyError, isTimeoutErrorType } from '../../common/telemetry/errorClassifier';
+import { getKnownManagerId } from '../../common/telemetry/helpers';
 import { sendTelemetryEvent } from '../../common/telemetry/sender';
 import {
     EnvironmentToolSupport,
@@ -143,7 +144,7 @@ export class InternalEnvironmentManager implements EnvironmentManager {
             const envs = await this.manager.getEnvironments('all').catch(() => []);
             const duration = sw.elapsedTime;
             sendTelemetryEvent(EventNames.ENVIRONMENT_DISCOVERY, duration, {
-                managerId: this.id,
+                managerId: getKnownManagerId(this.id),
                 result: 'success',
                 envCount: envs.length,
             });
@@ -162,7 +163,7 @@ export class InternalEnvironmentManager implements EnvironmentManager {
                 EventNames.ENVIRONMENT_DISCOVERY,
                 duration,
                 {
-                    managerId: this.id,
+                    managerId: getKnownManagerId(this.id),
                     result: errorType === 'canceled' || isTimeoutErrorType(errorType) ? 'timeout' : 'error',
                     errorType,
                 },
@@ -323,21 +324,21 @@ export class InternalPackageManager implements PackageManager {
         try {
             await this.manager.manage(environment, options);
             sendTelemetryEvent(EventNames.PACKAGE_MANAGEMENT, stopWatch.elapsedTime, {
-                managerId: this.id,
+                managerId: getKnownManagerId(this.id),
                 result: 'success',
                 triggerSource,
             });
         } catch (error) {
             if (error instanceof CancellationError) {
                 sendTelemetryEvent(EventNames.PACKAGE_MANAGEMENT, stopWatch.elapsedTime, {
-                    managerId: this.id,
+                    managerId: getKnownManagerId(this.id),
                     result: 'cancelled',
                     triggerSource,
                 });
                 throw error;
             }
             sendTelemetryEvent(EventNames.PACKAGE_MANAGEMENT, stopWatch.elapsedTime, {
-                managerId: this.id,
+                managerId: getKnownManagerId(this.id),
                 result: 'error',
                 errorType: error instanceof Error ? error.name : 'unknown',
                 triggerSource,