add telemetry for developer environment use (#3975)

microsoft · Aug 13, 2024 · b77a853 · b77a853
1 parent 2aeab8d
commit b77a853
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/src/drivers/cmakeDriver.ts b/src/drivers/cmakeDriver.ts
@@ -1562,8 +1562,16 @@ export abstract class CMakeDriver implements vscode.Disposable {
                 telemetryProperties.CppCompilerName = 'cl';
             }
 
-            if (this._kit?.visualStudioArchitecture) {
-                telemetryProperties.VisualStudioArchitecture = this._kit?.visualStudioArchitecture;
+            if (this.useCMakePresets) {
+                const arch = presetOverride ? presetOverride.__developerEnvironmentArchitecture : this._configurePreset ? this._configurePreset.__developerEnvironmentArchitecture : undefined;
+                if (arch) {
+                    telemetryProperties.VisualStudioArchitecture = arch;
+                }
+            } else {
+                if (this._kit?.visualStudioArchitecture) {
+                    telemetryProperties.VisualStudioArchitecture =
+                        this._kit?.visualStudioArchitecture;
+                }
             }
 
             const telemetryMeasures: telemetry.Measures = {

diff --git a/src/preset.ts b/src/preset.ts
@@ -262,6 +262,9 @@ export interface ConfigurePreset extends Preset {
     vendor?: VendorVsSettings | VendorType;
     toolchainFile?: string;
     installDir?: string;
+
+    // Private fields
+    __developerEnvironmentArchitecture?: string; // Private field to indicate which VS Dev Env architecture we're using, if VS Dev Env is used.
 }
 
 export interface InheritsConfigurePreset extends Preset {
@@ -1088,7 +1091,11 @@ async function tryApplyVsDevEnv(preset: ConfigurePreset, workspaceFolder: string
         }
     }
 
-    preset.__parentEnvironment = EnvironmentUtils.mergePreserveNull([process.env, developerEnvironment]);
+    if (developerEnvironment) {
+        preset.__developerEnvironmentArchitecture = getArchitecture(preset);
+    }
+
+    preset.__parentEnvironment = EnvironmentUtils.mergePreserveNull([process.env, preset.__parentEnvironment, developerEnvironment]);
 }
 /**
  * Expands the configure preset variables.