From 3f9bc826a447843e656442f7600cd49df6771a18 Mon Sep 17 00:00:00 2001
From: Don Jayamanne <don.jayamanne@outlook.com>
Date: Thu, 27 Jun 2024 10:24:00 +1000
Subject: [PATCH 1/2] Exclude other workspace envs when comparing envs

---
 .../base/locators/composite/envsCollectionService.ts | 12 ++++++++++--
 src/client/telemetry/index.ts                        |  7 ++++++-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/client/pythonEnvironments/base/locators/composite/envsCollectionService.ts b/src/client/pythonEnvironments/base/locators/composite/envsCollectionService.ts
index 5469e58d94e5..7815be1fda0c 100644
--- a/src/client/pythonEnvironments/base/locators/composite/envsCollectionService.ts
+++ b/src/client/pythonEnvironments/base/locators/composite/envsCollectionService.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-import { Event, EventEmitter } from 'vscode';
+import { Event, EventEmitter, workspace } from 'vscode';
 import '../../../../common/extensions';
 import { createDeferred, Deferred } from '../../../../common/utils/async';
 import { StopWatch } from '../../../../common/utils/stopWatch';
@@ -277,7 +277,14 @@ export class EnvsCollectionService extends PythonEnvsWatcher<PythonEnvCollection
         }
         this.telemetrySentOnce = true;
         const { elapsedTime } = stopWatch;
-        const envs = this.cache.getAllEnvs();
+        const workspaceFolders = workspace.workspaceFolders || [];
+        const query: PythonLocatorQuery = {
+            searchLocations: {
+                roots: workspaceFolders.map((w) => w.uri),
+            },
+        };
+        // 
+        const envs = this.getEnvs(workspaceFolders.length ? query : undefined);
 
         const nativeEnvs = [];
         const executablesFoundByNativeLocator = new Set<string>();
@@ -485,6 +492,7 @@ export class EnvsCollectionService extends PythonEnvsWatcher<PythonEnvCollection
         // Intent is to capture time taken for discovery of all envs to complete the first time.
         sendTelemetryEvent(EventName.PYTHON_INTERPRETER_DISCOVERY, elapsedTime, {
             nativeDuration,
+            workspaceFolderCount: (workspace.workspaceFolders || []).length,
             interpreters: this.cache.getAllEnvs().length,
             environmentsWithoutPython,
             activeStateEnvs,
diff --git a/src/client/telemetry/index.ts b/src/client/telemetry/index.ts
index 66882e706a5c..f9d9997c3fe6 100644
--- a/src/client/telemetry/index.ts
+++ b/src/client/telemetry/index.ts
@@ -1141,6 +1141,7 @@ export interface IEventNamePropertyMapping {
      */
     /* __GDPR__
        "python_interpreter_discovery" : {
+        "workspaceFolderCount" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true, "owner": "donjayamanne" },
         "duration" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true, "owner": "donjayamanne" },
         "nativeDuration" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true, "owner": "donjayamanne" },
         "interpreters" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true , "owner": "donjayamanne"},
@@ -1195,7 +1196,11 @@ export interface IEventNamePropertyMapping {
      */
     [EventName.PYTHON_INTERPRETER_DISCOVERY]: {
         /**
-         * Time taken to discover using native lcoator.
+         * Number of workspaces.
+         */
+        workspaceFolderCount?: number;
+        /**
+         * Time taken to discover using native locator.
          */
         nativeDuration?: number;
         /**

From a7be4e39215defeb4f8d22254afc7276a9f43edd Mon Sep 17 00:00:00 2001
From: Don Jayamanne <don.jayamanne@outlook.com>
Date: Thu, 27 Jun 2024 10:37:54 +1000
Subject: [PATCH 2/2] Fix formatting

---
 .../base/locators/composite/envsCollectionService.ts            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/client/pythonEnvironments/base/locators/composite/envsCollectionService.ts b/src/client/pythonEnvironments/base/locators/composite/envsCollectionService.ts
index 7815be1fda0c..8ede842828a3 100644
--- a/src/client/pythonEnvironments/base/locators/composite/envsCollectionService.ts
+++ b/src/client/pythonEnvironments/base/locators/composite/envsCollectionService.ts
@@ -283,7 +283,7 @@ export class EnvsCollectionService extends PythonEnvsWatcher<PythonEnvCollection
                 roots: workspaceFolders.map((w) => w.uri),
             },
         };
-        // 
+
         const envs = this.getEnvs(workspaceFolders.length ? query : undefined);
 
         const nativeEnvs = [];