get events tracked as otel activity events!

baronfel · baronfel · commit cd3ac3fe0756 · 2025-06-15T15:33:17.000-05:00
diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/TelemetryEventEntry.cs b/src/Cli/Microsoft.DotNet.Cli.Utils/TelemetryEventEntry.cs
@@ -11,7 +11,7 @@ public static class TelemetryEventEntry
     public static ITelemetryFilter TelemetryFilter { get; set; } = new BlockFilter();
 
     public static void TrackEvent(
-        string? eventName = null,
+        string eventName,
         IDictionary<string, string?>? properties = null,
         IDictionary<string, double>? measurements = null)
     {
@@ -32,7 +32,7 @@ public static void SendFiltered(object? o = null)
         }
     }
 
-    public static void Subscribe(Action<string?, IDictionary<string, string?>?, IDictionary<string, double>?> subscriber)
+    public static void Subscribe(Action<string, IDictionary<string, string?>?, IDictionary<string, double>?> subscriber)
     {
         void Handler(object? sender, InstrumentationEventArgs eventArgs)
         {
@@ -47,24 +47,24 @@ public sealed class PerformanceMeasurement : IDisposable
 {
     private readonly Stopwatch? _timer;
     private readonly Dictionary<string, double>? _data;
-    private readonly string? _name;
+    private readonly string _name;
 
     public PerformanceMeasurement(Dictionary<string, double>? data, string name)
     {
+        _name = name;
         // Measurement is a no-op if we don't have a dictionary to store the entry.
         if (data == null)
         {
             return;
         }
 
         _data = data;
-        _name = name;
         _timer = Stopwatch.StartNew();
     }
 
     public void Dispose()
     {
-        if (_name is not null && _timer is not null)
+        if (_timer is not null)
         {
             _data?.Add(_name, _timer.Elapsed.TotalMilliseconds);
         }
@@ -82,7 +82,7 @@ public IEnumerable<ApplicationInsightsEntryFormat> Filter(object o)
 public class InstrumentationEventArgs : EventArgs
 {
     internal InstrumentationEventArgs(
-        string? eventName,
+        string eventName,
         IDictionary<string, string?>? properties,
         IDictionary<string, double>? measurements)
     {
@@ -91,17 +91,17 @@ internal InstrumentationEventArgs(
         Measurements = measurements;
     }
 
-    public string? EventName { get; }
+    public string EventName { get; }
     public IDictionary<string, string?>? Properties { get; }
     public IDictionary<string, double>? Measurements { get; }
 }
 
 public class ApplicationInsightsEntryFormat(
-    string? eventName = null,
+    string eventName,
     IDictionary<string, string?>? properties = null,
     IDictionary<string, double>? measurements = null)
 {
-    public string? EventName { get; } = eventName;
+    public string EventName { get; } = eventName;
     public IDictionary<string, string?>? Properties { get; } = properties;
     public IDictionary<string, double>? Measurements { get; } = measurements;
 
diff --git a/src/Cli/dotnet/Commands/Hidden/InternalReportInstallSuccess/InternalReportInstallSuccessCommand.cs b/src/Cli/dotnet/Commands/Hidden/InternalReportInstallSuccess/InternalReportInstallSuccessCommand.cs
@@ -1,13 +1,10 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-#nullable disable
-
 using System.CommandLine;
 using Microsoft.DotNet.Cli.Extensions;
 using Microsoft.DotNet.Cli.Telemetry;
 using Microsoft.DotNet.Cli.Utils;
-using Microsoft.DotNet.Configurer;
 
 namespace Microsoft.DotNet.Cli.Commands.Hidden.InternalReportInstallSuccess;
 
@@ -19,7 +16,6 @@ public static int Run(ParseResult parseResult)
     {
         var telemetry = new ThreadBlockingTelemetry();
         ProcessInputAndSendTelemetry(parseResult, telemetry);
-        telemetry.Dispose();
         return 0;
     }
 
@@ -47,29 +43,19 @@ internal class ThreadBlockingTelemetry : ITelemetry
 
         internal ThreadBlockingTelemetry()
         {
-            var sessionId =
-            Environment.GetEnvironmentVariable(TelemetrySessionIdEnvironmentVariableName);
-            telemetry = new Telemetry.Telemetry(sessionId, blockThreadInitialization: true);
+            var sessionId = Environment.GetEnvironmentVariable(TelemetrySessionIdEnvironmentVariableName);
+            telemetry = new Telemetry.Telemetry(sessionId);
         }
         public bool Enabled => telemetry.Enabled;
 
-        public void Flush()
-        {
-        }
-
-        public void Dispose()
-        {
-            telemetry.Dispose();
-        }
-
-        public void TrackEvent(string eventName, IDictionary<string, string> properties, IDictionary<string, double> measurements)
+        public void TrackEvent(string eventName, IDictionary<string, string?>? properties, IDictionary<string, double>? measurements)
         {
             telemetry.ThreadBlockingTrackEvent(eventName, properties, measurements);
         }
     }
 }
 
-internal class InstallerSuccessReport(string exeName)
+internal class InstallerSuccessReport(string? exeName)
 {
     public string ExeName { get; } = exeName ?? throw new ArgumentNullException(nameof(exeName));
 }
diff --git a/src/Cli/dotnet/Commands/MSBuild/MSBuildLogger.cs b/src/Cli/dotnet/Commands/MSBuild/MSBuildLogger.cs
@@ -57,13 +57,7 @@ public MSBuildLogger()
 
             if (sessionId != null)
             {
-                // senderCount: 0 to disable sender.
-                // When senders in different process running at the same
-                // time they will read from the same global queue and cause
-                // sending duplicated events. Disable sender to reduce it.
-                _telemetry = new Telemetry.Telemetry(
-                    sessionId,
-                    senderCount: 0);
+                _telemetry = new Telemetry.Telemetry(sessionId);
             }
         }
         catch (Exception)
diff --git a/src/Cli/dotnet/Commands/New/BuiltInTemplatePackageProvider.cs b/src/Cli/dotnet/Commands/New/BuiltInTemplatePackageProvider.cs
@@ -44,11 +44,12 @@ private static IEnumerable<string> GetTemplateFolders(IEngineEnvironmentSettings
     {
         var templateFoldersToInstall = new List<string>();
 
-        var sdkDirectory = Path.GetDirectoryName(typeof(Utils.DotnetFiles).Assembly.Location);
-        var dotnetRootPath = Path.GetDirectoryName(Path.GetDirectoryName(sdkDirectory));
-
+        var sdksDirectory = new DirectoryInfo(environmentSettings.Environment.GetEnvironmentVariable("MSBuildSDKsPath"));
+        var sdkDirectory = sdksDirectory.Parent!;
+        var sdkVersion = sdkDirectory.Name;
+        var dotnetRootPath = sdkDirectory.Parent!.Parent!;
         // First grab templates from dotnet\templates\M.m folders, in ascending order, up to our version
-        string templatesRootFolder = Path.GetFullPath(Path.Combine(dotnetRootPath, "templates"));
+        string templatesRootFolder = Path.Combine(dotnetRootPath.FullName, "templates");
         if (Directory.Exists(templatesRootFolder))
         {
             IReadOnlyDictionary<string, SemanticVersion> parsedNames = GetVersionDirectoriesInDirectory(templatesRootFolder);
@@ -59,7 +60,7 @@ private static IEnumerable<string> GetTemplateFolders(IEngineEnvironmentSettings
         }
 
         // Now grab templates from our base folder, if present.
-        string templatesDir = Path.Combine(sdkDirectory, "Templates");
+        string templatesDir = Path.Combine(sdkDirectory.FullName, "Templates");
         if (Directory.Exists(templatesDir))
         {
             templateFoldersToInstall.Add(templatesDir);
diff --git a/src/Cli/dotnet/Commands/New/OptionalWorkloadProvider.cs b/src/Cli/dotnet/Commands/New/OptionalWorkloadProvider.cs
@@ -33,12 +33,13 @@ public Task<IReadOnlyList<ITemplatePackage>> GetAllTemplatePackagesAsync(Cancell
     {
         var list = new List<TemplatePackage>();
         var optionalWorkloadLocator = new TemplateLocator.TemplateLocator();
-        var sdkDirectory = Path.GetDirectoryName(typeof(DotnetFiles).Assembly.Location);
-        var sdkVersion = Path.GetFileName(sdkDirectory);
-        var dotnetRootPath = Path.GetDirectoryName(Path.GetDirectoryName(sdkDirectory));
+        var sdksDirectory = new DirectoryInfo(_environmentSettings.Environment.GetEnvironmentVariable("MSBuildSDKsPath"));
+        var sdkDirectory = sdksDirectory.Parent!;
+        var sdkVersion = sdkDirectory.Name;
+        var dotnetRootPath = sdkDirectory.Parent!.Parent!;
         string userProfileDir = CliFolderPathCalculator.DotnetUserProfileFolderPath;
 
-        var packages = optionalWorkloadLocator.GetDotnetSdkTemplatePackages(sdkVersion, dotnetRootPath, userProfileDir);
+        var packages = optionalWorkloadLocator.GetDotnetSdkTemplatePackages(sdkVersion, dotnetRootPath.FullName, userProfileDir);
         var fileSystem = _environmentSettings.Host.FileSystem;
         foreach (var packageInfo in packages)
         {
diff --git a/src/Cli/dotnet/Telemetry/ITelemetry.cs b/src/Cli/dotnet/Telemetry/ITelemetry.cs
@@ -1,15 +1,11 @@
 ﻿// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-#nullable disable
-
 namespace Microsoft.DotNet.Cli.Telemetry;
 
-public interface ITelemetry : IDisposable
+public interface ITelemetry
 {
     bool Enabled { get; }
 
-    void TrackEvent(string eventName, IDictionary<string, string> properties, IDictionary<string, double> measurements);
-
-    void Flush();
+    void TrackEvent(string eventName, IDictionary<string, string?>? properties, IDictionary<string, double>? measurements);
 }
diff --git a/src/Cli/dotnet/Telemetry/Telemetry.cs b/src/Cli/dotnet/Telemetry/Telemetry.cs
diff --git a/src/Cli/dotnet/Telemetry/TelemetryCommonProperties.cs b/src/Cli/dotnet/Telemetry/TelemetryCommonProperties.cs

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ public static class TelemetryEventEntry`
`11`	`11`	`public static ITelemetryFilter TelemetryFilter { get; set; } = new BlockFilter();`
`12`	`12`
`13`	`13`	`public static void TrackEvent(`
`14`		`- string? eventName = null,`
	`14`	`+ string eventName,`
`15`	`15`	`IDictionary<string, string?>? properties = null,`
`16`	`16`	`IDictionary<string, double>? measurements = null)`
`17`	`17`	`{`
`@@ -32,7 +32,7 @@ public static void SendFiltered(object? o = null)`
`32`	`32`	`}`
`33`	`33`	`}`
`34`	`34`
`35`		`- public static void Subscribe(Action<string?, IDictionary<string, string?>?, IDictionary<string, double>?> subscriber)`
	`35`	`+ public static void Subscribe(Action<string, IDictionary<string, string?>?, IDictionary<string, double>?> subscriber)`
`36`	`36`	`{`
`37`	`37`	`void Handler(object? sender, InstrumentationEventArgs eventArgs)`
`38`	`38`	`{`
`@@ -47,24 +47,24 @@ public sealed class PerformanceMeasurement : IDisposable`
`47`	`47`	`{`
`48`	`48`	`private readonly Stopwatch? _timer;`
`49`	`49`	`private readonly Dictionary<string, double>? _data;`
`50`		`- private readonly string? _name;`
	`50`	`+ private readonly string _name;`
`51`	`51`
`52`	`52`	`public PerformanceMeasurement(Dictionary<string, double>? data, string name)`
`53`	`53`	`{`
	`54`	`+ _name = name;`
`54`	`55`	`// Measurement is a no-op if we don't have a dictionary to store the entry.`
`55`	`56`	`if (data == null)`
`56`	`57`	`{`
`57`	`58`	`return;`
`58`	`59`	`}`
`59`	`60`
`60`	`61`	`_data = data;`
`61`		`- _name = name;`
`62`	`62`	`_timer = Stopwatch.StartNew();`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`public void Dispose()`
`66`	`66`	`{`
`67`		`- if (_name is not null && _timer is not null)`
	`67`	`+ if (_timer is not null)`
`68`	`68`	`{`
`69`	`69`	`_data?.Add(_name, _timer.Elapsed.TotalMilliseconds);`
`70`	`70`	`}`
`@@ -82,7 +82,7 @@ public IEnumerable<ApplicationInsightsEntryFormat> Filter(object o)`
`82`	`82`	`public class InstrumentationEventArgs : EventArgs`
`83`	`83`	`{`
`84`	`84`	`internal InstrumentationEventArgs(`
`85`		`- string? eventName,`
	`85`	`+ string eventName,`
`86`	`86`	`IDictionary<string, string?>? properties,`
`87`	`87`	`IDictionary<string, double>? measurements)`
`88`	`88`	`{`
`@@ -91,17 +91,17 @@ internal InstrumentationEventArgs(`
`91`	`91`	`Measurements = measurements;`
`92`	`92`	`}`
`93`	`93`
`94`		`- public string? EventName { get; }`
	`94`	`+ public string EventName { get; }`
`95`	`95`	`public IDictionary<string, string?>? Properties { get; }`
`96`	`96`	`public IDictionary<string, double>? Measurements { get; }`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`public class ApplicationInsightsEntryFormat(`
`100`		`- string? eventName = null,`
	`100`	`+ string eventName,`
`101`	`101`	`IDictionary<string, string?>? properties = null,`
`102`	`102`	`IDictionary<string, double>? measurements = null)`
`103`	`103`	`{`
`104`		`- public string? EventName { get; } = eventName;`
	`104`	`+ public string EventName { get; } = eventName;`
`105`	`105`	`public IDictionary<string, string?>? Properties { get; } = properties;`
`106`	`106`	`public IDictionary<string, double>? Measurements { get; } = measurements;`
`107`	`107`
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,10 @@`
`1`	`1`	`// Licensed to the .NET Foundation under one or more agreements.`
`2`	`2`	`// The .NET Foundation licenses this file to you under the MIT license.`
`3`	`3`
`4`		`-#nullable disable`
`5`		`-`
`6`	`4`	`using System.CommandLine;`
`7`	`5`	`using Microsoft.DotNet.Cli.Extensions;`
`8`	`6`	`using Microsoft.DotNet.Cli.Telemetry;`
`9`	`7`	`using Microsoft.DotNet.Cli.Utils;`
`10`		`-using Microsoft.DotNet.Configurer;`
`11`	`8`
`12`	`9`	`namespace Microsoft.DotNet.Cli.Commands.Hidden.InternalReportInstallSuccess;`
`13`	`10`
`@@ -19,7 +16,6 @@ public static int Run(ParseResult parseResult)`
`19`	`16`	`{`
`20`	`17`	`var telemetry = new ThreadBlockingTelemetry();`
`21`	`18`	`ProcessInputAndSendTelemetry(parseResult, telemetry);`
`22`		`- telemetry.Dispose();`
`23`	`19`	`return 0;`
`24`	`20`	`}`
`25`	`21`
`@@ -47,29 +43,19 @@ internal class ThreadBlockingTelemetry : ITelemetry`
`47`	`43`
`48`	`44`	`internal ThreadBlockingTelemetry()`
`49`	`45`	`{`
`50`		`- var sessionId =`
`51`		`- Environment.GetEnvironmentVariable(TelemetrySessionIdEnvironmentVariableName);`
`52`		`- telemetry = new Telemetry.Telemetry(sessionId, blockThreadInitialization: true);`
	`46`	`+ var sessionId = Environment.GetEnvironmentVariable(TelemetrySessionIdEnvironmentVariableName);`
	`47`	`+ telemetry = new Telemetry.Telemetry(sessionId);`
`53`	`48`	`}`
`54`	`49`	`public bool Enabled => telemetry.Enabled;`
`55`	`50`
`56`		`- public void Flush()`
`57`		`- {`
`58`		`- }`
`59`		`-`
`60`		`- public void Dispose()`
`61`		`- {`
`62`		`- telemetry.Dispose();`
`63`		`- }`
`64`		`-`
`65`		`- public void TrackEvent(string eventName, IDictionary<string, string> properties, IDictionary<string, double> measurements)`
	`51`	`+ public void TrackEvent(string eventName, IDictionary<string, string?>? properties, IDictionary<string, double>? measurements)`
`66`	`52`	`{`
`67`	`53`	`telemetry.ThreadBlockingTrackEvent(eventName, properties, measurements);`
`68`	`54`	`}`
`69`	`55`	`}`
`70`	`56`	`}`
`71`	`57`
`72`		`-internal class InstallerSuccessReport(string exeName)`
	`58`	`+internal class InstallerSuccessReport(string? exeName)`
`73`	`59`	`{`
`74`	`60`	`public string ExeName { get; } = exeName ?? throw new ArgumentNullException(nameof(exeName));`
`75`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,13 +57,7 @@ public MSBuildLogger()`
`57`	`57`
`58`	`58`	`if (sessionId != null)`
`59`	`59`	`{`
`60`		`- // senderCount: 0 to disable sender.`
`61`		`- // When senders in different process running at the same`
`62`		`- // time they will read from the same global queue and cause`
`63`		`- // sending duplicated events. Disable sender to reduce it.`
`64`		`- _telemetry = new Telemetry.Telemetry(`
`65`		`- sessionId,`
`66`		`- senderCount: 0);`
	`60`	`+ _telemetry = new Telemetry.Telemetry(sessionId);`
`67`	`61`	`}`
`68`	`62`	`}`
`69`	`63`	`catch (Exception)`
Original file line number	Diff line number	Diff line change
`@@ -44,11 +44,12 @@ private static IEnumerable<string> GetTemplateFolders(IEngineEnvironmentSettings`
`44`	`44`	`{`
`45`	`45`	`var templateFoldersToInstall = new List<string>();`
`46`	`46`
`47`		`- var sdkDirectory = Path.GetDirectoryName(typeof(Utils.DotnetFiles).Assembly.Location);`
`48`		`- var dotnetRootPath = Path.GetDirectoryName(Path.GetDirectoryName(sdkDirectory));`
`49`		`-`
	`47`	`+ var sdksDirectory = new DirectoryInfo(environmentSettings.Environment.GetEnvironmentVariable("MSBuildSDKsPath"));`
	`48`	`+ var sdkDirectory = sdksDirectory.Parent!;`
	`49`	`+ var sdkVersion = sdkDirectory.Name;`
	`50`	`+ var dotnetRootPath = sdkDirectory.Parent!.Parent!;`
`50`	`51`	`// First grab templates from dotnet\templates\M.m folders, in ascending order, up to our version`
`51`		`- string templatesRootFolder = Path.GetFullPath(Path.Combine(dotnetRootPath, "templates"));`
	`52`	`+ string templatesRootFolder = Path.Combine(dotnetRootPath.FullName, "templates");`
`52`	`53`	`if (Directory.Exists(templatesRootFolder))`
`53`	`54`	`{`
`54`	`55`	`IReadOnlyDictionary<string, SemanticVersion> parsedNames = GetVersionDirectoriesInDirectory(templatesRootFolder);`
`@@ -59,7 +60,7 @@ private static IEnumerable<string> GetTemplateFolders(IEngineEnvironmentSettings`
`59`	`60`	`}`
`60`	`61`
`61`	`62`	`// Now grab templates from our base folder, if present.`
`62`		`- string templatesDir = Path.Combine(sdkDirectory, "Templates");`
	`63`	`+ string templatesDir = Path.Combine(sdkDirectory.FullName, "Templates");`
`63`	`64`	`if (Directory.Exists(templatesDir))`
`64`	`65`	`{`
`65`	`66`	`templateFoldersToInstall.Add(templatesDir);`