Remove API telemetry containing extensionId

Author: Kartik Raj

src/client/deprecatedProposedApi.ts

@@ -3,7 +3,7 @@
 
 import { ConfigurationTarget, EventEmitter } from 'vscode';
 import { arePathsSame } from './common/platform/fs-paths';
-import { IExtensions, IInterpreterPathService, Resource } from './common/types';
+import { IInterpreterPathService, Resource } from './common/types';
 import {
     EnvironmentsChangedParams,
     ActiveEnvironmentChangedParams,
@@ -61,21 +61,13 @@ export function buildDeprecatedProposedApi(
 ): DeprecatedProposedAPI {
     const interpreterPathService = serviceContainer.get<IInterpreterPathService>(IInterpreterPathService);
     const interpreterService = serviceContainer.get<IInterpreterService>(IInterpreterService);
-    const extensions = serviceContainer.get<IExtensions>(IExtensions);
     function sendApiTelemetry(apiName: string, warnLog = true) {
         if (warnLog) {
             console.warn('Extension is using deprecated python APIs which will be removed soon');
         }
-        extensions
-            .determineExtensionFromCallStack()
-            .then((info) =>
-                sendTelemetryEvent(EventName.PYTHON_ENVIRONMENTS_API, undefined, {
-                    apiName,
-                    extensionId: info.extensionId,
-                    displayName: info.displayName,
-                }),
-            )
-            .ignoreErrors();
+        sendTelemetryEvent(EventName.PYTHON_ENVIRONMENTS_API, undefined, {
+            apiName,
+        });
     }
 
     const proposed: DeprecatedProposedAPI = {

src/client/proposedApi.ts

@@ -4,7 +4,7 @@
 
 import { ConfigurationTarget, EventEmitter, Uri, WorkspaceFolder } from 'vscode';
 import * as pathUtils from 'path';
-import { IConfigurationService, IDisposableRegistry, IExtensions, IInterpreterPathService } from './common/types';
+import { IConfigurationService, IDisposableRegistry, IInterpreterPathService } from './common/types';
 import { Architecture } from './common/utils/platform';
 import { IServiceContainer } from './ioc/types';
 import {
@@ -104,18 +104,10 @@ export function buildProposedApi(
     const interpreterPathService = serviceContainer.get<IInterpreterPathService>(IInterpreterPathService);
     const configService = serviceContainer.get<IConfigurationService>(IConfigurationService);
     const disposables = serviceContainer.get<IDisposableRegistry>(IDisposableRegistry);
-    const extensions = serviceContainer.get<IExtensions>(IExtensions);
     function sendApiTelemetry(apiName: string) {
-        extensions
-            .determineExtensionFromCallStack()
-            .then((info) =>
-                sendTelemetryEvent(EventName.PYTHON_ENVIRONMENTS_API, undefined, {
-                    apiName,
-                    extensionId: info.extensionId,
-                    displayName: info.displayName,
-                }),
-            )
-            .ignoreErrors();
+        sendTelemetryEvent(EventName.PYTHON_ENVIRONMENTS_API, undefined, {
+            apiName,
+        });
     }
     disposables.push(
         discoveryApi.onChanged((e) => {

src/client/telemetry/index.ts

@@ -1114,19 +1114,10 @@ export interface IEventNamePropertyMapping {
      */
     /* __GDPR__
        "python_environments_api" : {
-          "extensionId" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": false , "owner": "karrtikr"},
-          "displayName" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": false, "owner": "karrtikr" }
+          "apiName" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": false, "owner": "karrtikr" }
        }
      */
     [EventName.PYTHON_ENVIRONMENTS_API]: {
-        /**
-         * The ID of the extension calling the API.
-         */
-        extensionId: string;
-        /**
-         * The name of the extension as displayed in marketplace.
-         */
-        displayName: string;
         /**
          * The name of the API called.
          */

src/test/proposedApi.unit.test.ts

@@ -8,7 +8,6 @@ import { cloneDeep } from 'lodash';
 import {
     IConfigurationService,
     IDisposableRegistry,
-    IExtensions,
     IInterpreterPathService,
     IPythonSettings,
 } from '../client/common/types';
@@ -39,7 +38,6 @@ suite('Proposed Extension API', () => {
     let discoverAPI: typemoq.IMock<IDiscoveryAPI>;
     let interpreterPathService: typemoq.IMock<IInterpreterPathService>;
     let configService: typemoq.IMock<IConfigurationService>;
-    let extensions: typemoq.IMock<IExtensions>;
     let onDidChangeRefreshState: EventEmitter<ProgressNotificationEvent>;
     let onDidChangeEnvironments: EventEmitter<PythonEnvCollectionChangedEvent>;
 
@@ -48,17 +46,11 @@ suite('Proposed Extension API', () => {
     setup(() => {
         serviceContainer = typemoq.Mock.ofType<IServiceContainer>();
         discoverAPI = typemoq.Mock.ofType<IDiscoveryAPI>();
-        extensions = typemoq.Mock.ofType<IExtensions>();
-        extensions
-            .setup((e) => e.determineExtensionFromCallStack())
-            .returns(() => Promise.resolve({ extensionId: 'id', displayName: 'displayName', apiName: 'apiName' }))
-            .verifiable(typemoq.Times.atLeastOnce());
         interpreterPathService = typemoq.Mock.ofType<IInterpreterPathService>();
         configService = typemoq.Mock.ofType<IConfigurationService>();
         onDidChangeRefreshState = new EventEmitter();
         onDidChangeEnvironments = new EventEmitter();
 
-        serviceContainer.setup((s) => s.get(IExtensions)).returns(() => extensions.object);
         serviceContainer.setup((s) => s.get(IInterpreterPathService)).returns(() => interpreterPathService.object);
         serviceContainer.setup((s) => s.get(IConfigurationService)).returns(() => configService.object);
         serviceContainer.setup((s) => s.get(IDisposableRegistry)).returns(() => []);
@@ -69,11 +61,6 @@ suite('Proposed Extension API', () => {
         proposed = buildProposedApi(discoverAPI.object, serviceContainer.object);
     });
 
-    teardown(() => {
-        // Verify each API method sends telemetry regarding who called the API.
-        extensions.verifyAll();
-    });
-
     test('Provide an event to track when active environment details change', async () => {
         const events: ActiveEnvironmentPathChangeEvent[] = [];
         proposed.environment.onDidChangeActiveEnvironmentPath((e) => {