a bit more polishing

Author: YuliiaKovalova

src/Build/BackEnd/BuildManager/BuildManager.cs

@@ -463,9 +463,6 @@ private void UpdatePriority(Process p, ProcessPriorityClass priority)
         /// <exception cref="InvalidOperationException">Thrown if a build is already in progress.</exception>
         public void BeginBuild(BuildParameters parameters)
         {
-#if NETFRAMEWORK
-            TelemetryManager.Instance.Initialize(isStandalone: false);
-#endif
             if (_previousLowPriority != null)
             {
                 if (parameters.LowPriority != _previousLowPriority)
@@ -3010,6 +3007,8 @@ private ILoggingService CreateLoggingService(
 
             if (_buildParameters.IsTelemetryEnabled)
             {
+                TelemetryManager.Instance.Initialize(isStandalone: false);
+
                 // We do want to dictate our own forwarding logger (otherwise CentralForwardingLogger with minimum transferred importance MessageImportance.Low is used)
                 // In the future we might optimize for single, in-node build scenario - where forwarding logger is not needed (but it's just quick pass-through)
                 LoggerDescription forwardingLoggerDescription = new LoggerDescription(
@@ -3242,6 +3241,8 @@ private void Dispose(bool disposing)
                         s_singletonInstance = null;
                     }
 
+                    TelemetryManager.Instance?.Dispose();
+
                     _disposed = true;
                 }
             }

src/Framework/Telemetry/TelemetryItem.cs src/Framework/Telemetry/BuildInsights.cssrc/Framework/Telemetry/TelemetryItem.cs renamed to src/Framework/Telemetry/BuildInsights.cs

@@ -106,7 +106,7 @@ internal class BuildTelemetry : TelemetryBase, IActivityTelemetryDataHolder
         public string? BuildEngineFrameworkName { get; set; }
 
         /// <summary>
-        /// Create a list of properties sent to VS telemetry with the information whether they should be hashed.
+        /// Create a list of properties sent to VS telemetry.
         /// </summary>
         public Dictionary<string, object> GetActivityProperties()
         {

src/Framework/Telemetry/BuildTelemetry.cs

@@ -19,6 +19,7 @@ namespace Microsoft.Build.Framework.Telemetry
     internal class TelemetryManager
     {
 #if NETFRAMEWORK
+        // Telemetry API key for Visual Studio telemetry service.
         private const string CollectorApiKey = "f3e86b4023cc43f0be495508d51f588a-f70d0e59-0fb0-4473-9f19-b4024cc340be-7296";
 
         private static TelemetrySession? _telemetrySession;

src/Framework/Telemetry/TelemetryManager.cs

@@ -9,6 +9,11 @@
 
 namespace Microsoft.Build.Framework.Telemetry
 {
+    /// <summary>
+    /// Represents a Visual Studio telemetry activity that wraps a <see cref="TelemetryScope{T}"/>.
+    /// This class provides an implementation of <see cref="IActivity"/> for the VS Telemetry system,
+    /// allowing telemetry data to be collected and sent when running on .NET Framework.
+    /// </summary>
     internal class VsTelemetryActivity : IActivity
     {
         private readonly TelemetryScope<OperationEvent> _scope;

src/Framework/Telemetry/VSTelemetryActivity.cs

@@ -251,9 +251,7 @@ string[] args
             KnownTelemetry.PartialBuildTelemetry = new BuildTelemetry { StartAt = DateTime.UtcNow, IsStandaloneExecution = true};
 
             // Initialize VSTelemetry
-#if NETFRAMEWORK
-            TelemetryManager.Instance.Initialize(isStandalone: true);
-#endif
+            TelemetryManager.Instance?.Initialize(isStandalone: true);
 
             using PerformanceLogEventListener eventListener = PerformanceLogEventListener.Create();
 
@@ -302,9 +300,8 @@ string[] args
                 DumpCounters(false /* log to console */);
             }
 
-#if NETFRAMEWORK
-            TelemetryManager.Instance.Dispose();
-#endif
+            TelemetryManager.Instance?.Dispose();
+
             return exitCode;
         }