From 2a6608cf26073f993a0e483427299696c8c74b82 Mon Sep 17 00:00:00 2001
From: Don Jayamanne <don.jayamanne@outlook.com>
Date: Mon, 15 Jul 2024 17:12:43 +1000
Subject: [PATCH] Capture additional telemetry for conda (#23810)

---
 .../base/locators/common/nativePythonFinder.ts            | 1 +
 .../base/locators/composite/envsCollectionService.ts      | 2 ++
 src/client/telemetry/index.ts                             | 8 +++++++-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/client/pythonEnvironments/base/locators/common/nativePythonFinder.ts b/src/client/pythonEnvironments/base/locators/common/nativePythonFinder.ts
index 3478f2d4cd0e..1392886da7cc 100644
--- a/src/client/pythonEnvironments/base/locators/common/nativePythonFinder.ts
+++ b/src/client/pythonEnvironments/base/locators/common/nativePythonFinder.ts
@@ -49,6 +49,7 @@ export interface NativeEnvManagerInfo {
 
 export type NativeCondaInfo = {
     canSpawnConda: boolean;
+    userProvidedEnvFound?: boolean;
     condaRcs: string[];
     envDirs: string[];
     environmentsTxt?: string;
diff --git a/src/client/pythonEnvironments/base/locators/composite/envsCollectionService.ts b/src/client/pythonEnvironments/base/locators/composite/envsCollectionService.ts
index f1a3e98b7467..85b852cc32d0 100644
--- a/src/client/pythonEnvironments/base/locators/composite/envsCollectionService.ts
+++ b/src/client/pythonEnvironments/base/locators/composite/envsCollectionService.ts
@@ -344,6 +344,7 @@ export class EnvsCollectionService extends PythonEnvsWatcher<PythonEnvCollection
             condaDefaultPrefixInCondaExePath?: boolean;
             canSpawnConda?: boolean;
             nativeCanSpawnConda?: boolean;
+            userProvidedEnvFound?: boolean;
             userProvidedCondaExe?: boolean;
             condaInfoEnvsInvalid: number;
             invalidCondaEnvs: number;
@@ -418,6 +419,7 @@ export class EnvsCollectionService extends PythonEnvsWatcher<PythonEnvCollection
                 condaTelemetry.nativeCanSpawnConda = nativeCondaInfo.canSpawnConda;
                 condaTelemetry.nativeCondaInfoEnvsDirs = new Set(nativeCondaInfo.envDirs).size;
                 condaTelemetry.nativeCondaRcs = new Set(nativeCondaInfo.condaRcs).size;
+                condaTelemetry.userProvidedEnvFound = nativeCondaInfo.userProvidedEnvFound;
 
                 const nativeEnvTxt = fsPath.normalize(nativeCondaInfo.environmentsTxt || '').toLowerCase();
                 condaTelemetry.nativeCondaEnvTxtExists = nativeCondaInfo.environmentsTxtExists === true;
diff --git a/src/client/telemetry/index.ts b/src/client/telemetry/index.ts
index a1aaa4b02bfd..f4c108d7385d 100644
--- a/src/client/telemetry/index.ts
+++ b/src/client/telemetry/index.ts
@@ -1165,7 +1165,8 @@ export interface IEventNamePropertyMapping {
         "environmentsWithoutPython" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true, "owner": "donjayamanne" },
         "usingNativeLocator" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "owner": "donjayamanne" },
         "canSpawnConda" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "owner": "donjayamanne" },
-        "nativeCanSpawnConda" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true , "owner": "donjayamanne"},
+        "nativeCanSpawnConda" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "owner": "donjayamanne"},
+        "userProvidedEnvFound" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "owner": "donjayamanne" },
         "condaRootPrefixFoundInInfoNotInNative" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "owner": "donjayamanne" },
         "condaRootPrefixInCondaExePath" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "owner": "donjayamanne" },
         "condaDefaultPrefixFoundInInfoNotInNative" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "owner": "donjayamanne" },
@@ -1350,6 +1351,11 @@ export interface IEventNamePropertyMapping {
          * Conda exe can be spawned by native locator.
          */
         nativeCanSpawnConda?: boolean;
+        /**
+         * Conda env belonging to the conda exe provided by the user is found by native locator.
+         * I.e. even if the user didn't provide the path to the conda exe, the conda env is found by native locator.
+         */
+        userProvidedEnvFound?: boolean;
         /**
          * The number of the interpreters not found in disc.
          */