Fix in how to get the installation id in AzTrace

Author: daxian-dbw

shell/agents/Microsoft.Azure.Agent/DataRetriever.cs

@@ -598,7 +598,7 @@ private AzCLICommand QueryForMetadata(string azCommand)
                 Dictionary<string, string> details = new()
                 {
                     ["Command"] = azCommand,
-                    ["Message"] = $"AzCLI metadata query and process raised an exception"
+                    ["Message"] = "AzCLI metadata query and process raised an exception."
                 };
                 Telemetry.Trace(AzTrace.Exception(response: null, details), e);
             }

shell/agents/Microsoft.Azure.Agent/Telemetry.cs

@@ -8,49 +8,42 @@ namespace Microsoft.Azure.Agent;
 
 public class AzTrace
 {
-    private static readonly string s_installationId;
-    static AzTrace()
+    /// <summary>
+    /// Installation id from the Azure CLI installation.
+    /// </summary>
+    internal static string InstallationId { get; private set; }
+
+    internal static void Initialize()
     {
-        string azureConfigDir = Environment.GetEnvironmentVariable("AZURE_CONFIG_DIR");
-        string userProfile = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
-        string userProfilePath = string.IsNullOrEmpty(azureConfigDir) ? Path.Combine(userProfile, ".Azure", "azureProfile.json") : azureConfigDir;
+        InstallationId = null;
 
-        JsonElement array;
-        s_installationId = null;
+        string azureConfigDir = Environment.GetEnvironmentVariable("AZURE_CONFIG_DIR")
+            ?? Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".azure");
+        string azCLIProfilePath = Path.Combine(azureConfigDir, "azureProfile.json");
+        string azPSHProfilePath = Path.Combine(azureConfigDir, "AzureRmContextSettings.json");
 
-        if (File.Exists(userProfilePath))
+        try
         {
-            using var jsonStream = new FileStream(userProfilePath, FileMode.Open, FileAccess.Read);
-            array = JsonSerializer.Deserialize<JsonElement>(jsonStream);
-            s_installationId = array.GetProperty("installationId").GetString();
-        }
-        else
-        {
-            try
+            if (File.Exists(azCLIProfilePath))
             {
-                userProfilePath = string.IsNullOrEmpty(azureConfigDir) ? Path.Combine(userProfile, ".Azure", "AzureRmContextSettings.json") : azureConfigDir;
-                using var jsonStream = new FileStream(userProfilePath, FileMode.Open, FileAccess.Read);
-                array = JsonSerializer.Deserialize<JsonElement>(jsonStream);
-                s_installationId = array.GetProperty("Settings").GetProperty("InstallationId").GetString();
+                using var stream = File.OpenRead(azCLIProfilePath);
+                var jsonElement = JsonSerializer.Deserialize<JsonElement>(stream);
+                InstallationId = jsonElement.GetProperty("installationId").GetString();
             }
-            catch
+            else if (File.Exists(azPSHProfilePath))
             {
-                // If finally no installation id found, just return null.
-                s_installationId = null;
+                using var stream = File.OpenRead(azPSHProfilePath);
+                var jsonElement = JsonSerializer.Deserialize<JsonElement>(stream);
+                InstallationId = jsonElement.GetProperty("Settings").GetProperty(nameof(InstallationId)).GetString();
             }
         }
+        catch
+        {
+            // Something wrong when reading the config file.
+            InstallationId = null;
+        }
     }
 
-    internal AzTrace()
-    {
-        InstallationId = s_installationId;
-    }
-
-    /// <summary>
-    /// Installation id from the Azure CLI installation.
-    /// </summary>
-    internal string InstallationId { get; }
-
     /// <summary>
     /// Topic name of the response from Azure Copilot.
     /// </summary>
@@ -174,7 +167,7 @@ private void LogTelemetry(AzTrace trace, Exception e = null)
         {
             ["QueryId"] = trace.QueryId,
             ["ConversationId"] = trace.ConversationId,
-            ["InstallationId"] = trace.InstallationId,
+            ["InstallationId"] = AzTrace.InstallationId,
             ["TopicName"] = trace.TopicName,
             ["EventType"] = trace.EventType,
             ["ShellCommand"] = trace.ShellCommand,
@@ -209,7 +202,11 @@ private static string GetDetailedMessage(object details)
     /// <summary>
     /// Initialize telemetry client.
     /// </summary>
-    internal static void Initialize() => s_singleton ??= new Telemetry();
+    internal static void Initialize()
+    {
+        s_singleton ??= new Telemetry();
+        AzTrace.Initialize();
+    }
 
     /// <summary>
     /// Trace a telemetry metric.