diff --git a/.editorconfig b/.editorconfig
index 840178621fdb..c29683ebdfa6 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -280,6 +280,10 @@ dotnet_diagnostic.IDE0200.severity = none
 dotnet_diagnostic.IDE0240.severity = warning
 
 # Additional rules for template engine source code
+
+# Default severity for analyzer diagnostics with category 'StyleCop.CSharp.SpacingRules'
+dotnet_analyzer_diagnostic.category-StyleCop.CSharp.SpacingRules.severity = none
+
 [{src,test}/**{Microsoft.TemplateEngine.*,dotnet-new?*}/**.cs]
 # Default analyzed API surface = 'public' (public APIs)
 dotnet_code_quality.api_surface = public
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 104dedfd9eaf..112cd265489d 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -5,6 +5,7 @@
     <NoWarn>$(NoWarn);NU1507</NoWarn>
   </PropertyGroup>
   <ItemGroup>
+    <PackageVersion Include="Azure.Monitor.OpenTelemetry.Exporter" Version="1.4.0" />
     <PackageVersion Include="Basic.CompilerLog.Util" Version="0.9.9" />
     <PackageVersion Include="AwesomeAssertions" Version="$(AwesomeAssertionsVersion)" />
     <PackageVersion Include="BenchmarkDotNet" Version="$(BenchmarkDotNetPackageVersion)" />
@@ -95,6 +96,9 @@
     <PackageVersion Include="NuGet.ProjectModel" Version="$(NuGetProjectModelPackageVersion)" />
     <PackageVersion Include="NuGet.Protocol" Version="$(NuGetBuildTasksPackageVersion)" />
     <PackageVersion Include="NuGet.Versioning" Version="$(NuGetVersioningPackageVersion)" />
+    <PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.12.0" />
+    <PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.12.0" />
+    <PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.12.0" />
     <PackageVersion Include="runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver" Version="$(MicrosoftNETCoreDotNetHostResolverPackageVersion)" />
     <PackageVersion Include="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="$(MicrosoftNETCoreDotNetHostResolverPackageVersion)" />
     <PackageVersion Include="runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver" Version="$(MicrosoftNETCoreDotNetHostResolverPackageVersion)" />
@@ -108,6 +112,7 @@
     <PackageVersion Include="System.Composition.Runtime" Version="$(SystemCompositionRuntimePackageVersion)" />
     <PackageVersion Include="System.Composition.TypedParts" Version="$(SystemCompositionTypedPartsPackageVersion)" />
     <PackageVersion Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerPackageVersion)" />
+    <PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourcePackageVersion)" />
     <PackageVersion Include="System.Formats.Asn1" Version="$(SystemFormatsAsn1Version)" />
     <PackageVersion Include="System.IO.Hashing" Version="$(SystemIOHashingPackageVersion)" />
     <!-- System.Reflection.Metadata and System.Collections.Immutable cannot be pinned here because of hard dependencies within Roslyn on specific versions that have to work both here and in VS -->
@@ -126,7 +131,6 @@
     <PackageVersion Include="Xunit.Combinatorial" Version="$(XunitCombinatorialVersion)" />
     <PackageVersion Include="xunit.console" Version="$(XUnitVersion)" />
   </ItemGroup>
-
   <!-- Use different versions of Microsoft.Build.* depending on whether the output will be used in
        .NET Framework (VS) or only in the .NET SDK.
 
@@ -158,4 +162,4 @@
     <PackageVersion Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildMinimumVersion)" />
     <PackageVersion Include="Microsoft.NET.StringTools" Version="$(MicrosoftBuildMinimumVersion)" />
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/eng/Versions.props b/eng/Versions.props
index c2704798caa6..251a083ce158 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -124,6 +124,7 @@
     <SystemCompositionRuntimePackageVersion>10.0.0-preview.6.25316.103</SystemCompositionRuntimePackageVersion>
     <SystemCompositionTypedPartsPackageVersion>10.0.0-preview.6.25316.103</SystemCompositionTypedPartsPackageVersion>
     <SystemConfigurationConfigurationManagerPackageVersion>10.0.0-preview.6.25316.103</SystemConfigurationConfigurationManagerPackageVersion>
+    <SystemDiagnosticsDiagnosticSourcePackageVersion>10.0.0-preview.6.25316.103</SystemDiagnosticsDiagnosticSourcePackageVersion>
     <SystemReflectionMetadataLoadContextVersion>10.0.0-preview.6.25316.103</SystemReflectionMetadataLoadContextVersion>
     <SystemResourcesExtensionsPackageVersion>10.0.0-preview.6.25316.103</SystemResourcesExtensionsPackageVersion>
     <SystemSecurityCryptographyPkcsPackageVersion>10.0.0-preview.6.25316.103</SystemSecurityCryptographyPkcsPackageVersion>
diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/Activities.cs b/src/Cli/Microsoft.DotNet.Cli.Utils/Activities.cs
new file mode 100644
index 000000000000..57fa577d4a81
--- /dev/null
+++ b/src/Cli/Microsoft.DotNet.Cli.Utils/Activities.cs
@@ -0,0 +1,14 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Diagnostics;
+
+namespace Microsoft.DotNet.Cli.Utils;
+
+public static class Activities
+{
+    public static ActivitySource Source { get; } = new("dotnet-cli", Product.Version);
+
+    public const string DOTNET_CLI_TRACEPARENT = nameof(DOTNET_CLI_TRACEPARENT);
+    public const string DOTNET_CLI_TRACESTATE = nameof(DOTNET_CLI_TRACESTATE);
+}
diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/MSBuildForwardingAppWithoutLogging.cs b/src/Cli/Microsoft.DotNet.Cli.Utils/MSBuildForwardingAppWithoutLogging.cs
index 7daa545eb35c..3bf107d05120 100644
--- a/src/Cli/Microsoft.DotNet.Cli.Utils/MSBuildForwardingAppWithoutLogging.cs
+++ b/src/Cli/Microsoft.DotNet.Cli.Utils/MSBuildForwardingAppWithoutLogging.cs
@@ -171,7 +171,7 @@ private static string GetMSBuildExePath()
             MSBuildExeName);
     }
 
-    private static string GetMSBuildSDKsPath()
+    public static string GetMSBuildSDKsPath()
     {
         var envMSBuildSDKsPath = Environment.GetEnvironmentVariable("MSBuildSDKsPath");
 
diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj b/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj
index 7ec4f221145b..0e872862395d 100644
--- a/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj
+++ b/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj
@@ -42,6 +42,7 @@
         Condition="'$([MSBuild]::GetTargetFrameworkIdentifier($(TargetFramework)))' == '.NETCoreApp'"
         GeneratePathProperty="true" />
     <PackageReference Include="Microsoft.Extensions.DependencyModel" />
+    <PackageReference Include="System.Diagnostics.DiagnosticSource"/>
     <PackageReference Include="NuGet.Versioning" />
     <PackageReference Include="NuGet.Packaging" />
     <PackageReference Include="NuGet.Frameworks" />
diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/TelemetryEventEntry.cs b/src/Cli/Microsoft.DotNet.Cli.Utils/TelemetryEventEntry.cs
index 772e9845b678..8e85359775e6 100644
--- 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,10 +47,11 @@ 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)
         {
@@ -58,13 +59,12 @@ public PerformanceMeasurement(Dictionary<string, double>? data, string name)
         }
 
         _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/Microsoft.DotNet.InternalAbstractions/FilePath.cs b/src/Cli/Microsoft.DotNet.InternalAbstractions/FilePath.cs
index d9ad822f9517..f08c1f1a759a 100644
--- a/src/Cli/Microsoft.DotNet.InternalAbstractions/FilePath.cs
+++ b/src/Cli/Microsoft.DotNet.InternalAbstractions/FilePath.cs
@@ -1,34 +1,33 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-namespace Microsoft.Extensions.EnvironmentAbstractions
+namespace Microsoft.Extensions.EnvironmentAbstractions;
+
+public readonly struct FilePath
 {
-    public struct FilePath
-    {
-        public string Value { get; }
+    public string Value { get; }
 
-        /// <summary>
-        /// Create FilePath to represent an absolute file path. Note it may not exist.
-        /// </summary>
-        /// <param name="value">If the value is not rooted. Path.GetFullPath will be called during the constructor.</param>
-        public FilePath(string value)
+    /// <summary>
+    /// Create FilePath to represent an absolute file path. Note: It may not exist.
+    /// </summary>
+    /// <param name="value">If the value is not rooted. Path.GetFullPath will be called during the constructor.</param>
+    public FilePath(string value)
+    {
+        if (!Path.IsPathRooted(value))
         {
-            if (!Path.IsPathRooted(value))
-            {
-                value = Path.GetFullPath(value);
-            }
-
-            Value = value;
+            value = Path.GetFullPath(value);
         }
 
-        public override string ToString()
-        {
-            return Value;
-        }
+        Value = value;
+    }
 
-        public DirectoryPath GetDirectoryPath()
-        {
-            return new DirectoryPath(Path.GetDirectoryName(Value)!);
-        }
+    public override string ToString()
+    {
+        return Value;
+    }
+
+    public DirectoryPath GetDirectoryPath()
+    {
+        return new DirectoryPath(Path.GetDirectoryName(Value)!);
     }
 }
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/create/InstantiateCommand.cs b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/create/InstantiateCommand.cs
index c8af9158f0ef..2ce42d5657b1 100644
--- a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/create/InstantiateCommand.cs
+++ b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/create/InstantiateCommand.cs
@@ -51,13 +51,13 @@ internal InstantiateCommand(
             Arity = new ArgumentArity(0, 999)
         };
 
-        internal IReadOnlyList<Option> PassByOptions { get; } = new Option[]
-        {
+        internal IReadOnlyList<Option> PassByOptions { get; } =
+        [
             SharedOptions.ForceOption,
             SharedOptions.NameOption,
             SharedOptions.DryRunOption,
             SharedOptions.NoUpdateCheckOption
-        };
+        ];
 
         internal static Task<NewCommandStatus> ExecuteAsync(
             NewCommandArgs newCommandArgs,
@@ -74,6 +74,7 @@ internal static async Task<IEnumerable<TemplateGroup>> GetTemplateGroupsAsync(
             HostSpecificDataLoader hostSpecificDataLoader,
             CancellationToken cancellationToken)
         {
+            using var createTemplateGroupsActivity = Activities.Source.StartActivity("create-template-groups");
             IReadOnlyList<ITemplateInfo> templates = await templatePackageManager.GetTemplatesAsync(cancellationToken).ConfigureAwait(false);
             return TemplateGroup.FromTemplateList(CliTemplateInfo.FromTemplateInfo(templates, hostSpecificDataLoader));
         }
@@ -84,6 +85,7 @@ internal static HashSet<TemplateCommand> GetTemplateCommand(
                 TemplatePackageManager templatePackageManager,
                 TemplateGroup templateGroup)
         {
+            using var getTemplateActivity = Activities.Source.StartActivity("get-template-command");
             //groups templates in the group by precedence
             foreach (IGrouping<int, CliTemplateInfo> templateGrouping in templateGroup.Templates.GroupBy(g => g.Precedence).OrderByDescending(g => g.Key))
             {
@@ -114,7 +116,7 @@ internal static HashSet<TemplateCommand> GetTemplateCommand(
                     templateGroup,
                     candidates);
             }
-            return new HashSet<TemplateCommand>();
+            return [];
         }
 
         internal static void HandleNoMatchingTemplateGroup(InstantiateCommandArgs instantiateArgs, IEnumerable<TemplateGroup> templateGroups, IReporter reporter)
@@ -204,6 +206,8 @@ private static async Task<NewCommandStatus> ExecuteIntAsync(
 
                 return await templateListCoordinator.DisplayCommandDescriptionAsync(instantiateArgs, cancellationToken).ConfigureAwait(false);
             }
+            using var createActivity = Activities.Source.StartActivity("instantiate-command");
+            createActivity?.DisplayName = $"Invoke '{instantiateArgs.ShortName}'";
 
             IEnumerable<TemplateGroup> allTemplateGroups = await GetTemplateGroupsAsync(
                 templatePackageManager,
@@ -273,10 +277,11 @@ private static async Task<NewCommandStatus> HandleTemplateInstantiationAsync(
             {
                 TemplateCommand templateCommandToRun = candidates.Single();
                 args.Command.Subcommands.Add(templateCommandToRun);
-
+                var templateParseActivity = Activities.Source.StartActivity("reparse-for-template");
                 ParseResult updatedParseResult = args.ParseResult.RootCommandResult.Command.Parse(
                     args.ParseResult.Tokens.Select(t => t.Value).ToArray(),
                     args.ParseResult.Configuration);
+                templateParseActivity?.Stop();
                 return await candidates.Single().InvokeAsync(updatedParseResult, cancellationToken).ConfigureAwait(false);
             }
             else if (candidates.Any())
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/create/TemplateCommand.cs b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/create/TemplateCommand.cs
index f078574630c2..50ba229fd8a4 100644
--- a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/create/TemplateCommand.cs
+++ b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/create/TemplateCommand.cs
@@ -17,7 +17,7 @@ namespace Microsoft.TemplateEngine.Cli.Commands
     internal class TemplateCommand : Command
     {
         private static readonly TimeSpan ConstraintEvaluationTimeout = TimeSpan.FromMilliseconds(1000);
-        private static readonly string[] _helpAliases = new[] { "-h", "/h", "--help", "-?", "/?" };
+        private static readonly string[] _helpAliases = ["-h", "/h", "--help", "-?", "/?"];
         private readonly TemplatePackageManager _templatePackageManager;
         private readonly IEngineEnvironmentSettings _environmentSettings;
         private readonly BaseCommand _instantiateCommand;
@@ -146,19 +146,23 @@ internal static async Task<IReadOnlyList<TemplateConstraintResult>> ValidateCons
 
         internal async Task<NewCommandStatus> InvokeAsync(ParseResult parseResult, CancellationToken cancellationToken)
         {
+            using var templateInvocationActivity = Activities.Source.StartActivity("invoke-template");
             TemplateCommandArgs args = new(this, _instantiateCommand, parseResult);
             TemplateInvoker invoker = new(_environmentSettings, () => Console.ReadLine() ?? string.Empty);
             TemplatePackageCoordinator packageCoordinator = new(_environmentSettings, _templatePackageManager);
-            TemplateConstraintManager constraintManager = new(_environmentSettings);
+            using TemplateConstraintManager constraintManager = new(_environmentSettings);
             TemplatePackageDisplay templatePackageDisplay = new(Reporter.Output, Reporter.Error);
 
             CancellationTokenSource cancellationTokenSource = new();
             cancellationTokenSource.CancelAfter(ConstraintEvaluationTimeout);
 
+#pragma warning disable CA2025 // Do not pass 'IDisposable' instances into unawaited tasks
             Task<IReadOnlyList<TemplateConstraintResult>> constraintsEvaluation = ValidateConstraintsAsync(constraintManager, args.Template, args.IsForceFlagSpecified ? cancellationTokenSource.Token : cancellationToken);
+#pragma warning restore CA2025 // Do not pass 'IDisposable' instances into unawaited tasks
 
             if (!args.IsForceFlagSpecified)
             {
+                using var constraintResultsActivity = Activities.Source.StartActivity("validate-constraints");
                 var constraintResults = await constraintsEvaluation.ConfigureAwait(false);
                 if (constraintResults.Any())
                 {
@@ -173,7 +177,7 @@ internal async Task<NewCommandStatus> InvokeAsync(ParseResult parseResult, Cance
             Task<(string Id, string Version, string Provider)> builtInPackageCheck = packageCoordinator.ValidateBuiltInPackageAvailabilityAsync(args.Template, cancellationToken);
             Task<CheckUpdateResult?> checkForUpdateTask = packageCoordinator.CheckUpdateForTemplate(args, cancellationToken);
 
-            Task[] tasksToWait = new Task[] { instantiateTask, builtInPackageCheck, checkForUpdateTask };
+            Task[] tasksToWait = [instantiateTask, builtInPackageCheck, checkForUpdateTask];
 
             await Task.WhenAll(tasksToWait).ConfigureAwait(false);
             Reporter.Output.WriteLine();
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/TemplateInvoker.cs b/src/Cli/Microsoft.TemplateEngine.Cli/TemplateInvoker.cs
index 581ba2892234..52179d3c1550 100644
--- a/src/Cli/Microsoft.TemplateEngine.Cli/TemplateInvoker.cs
+++ b/src/Cli/Microsoft.TemplateEngine.Cli/TemplateInvoker.cs
@@ -37,6 +37,7 @@ internal TemplateInvoker(
 
         internal async Task<NewCommandStatus> InvokeTemplateAsync(TemplateCommandArgs templateArgs, CancellationToken cancellationToken)
         {
+            using var invokerActivity = Activities.Source.StartActivity("invoker-invoking");
             cancellationToken.ThrowIfCancellationRequested();
 
             CliTemplateInfo templateToRun = templateArgs.Template;
@@ -158,6 +159,7 @@ private async Task<NewCommandStatus> CreateTemplateAsync(TemplateCommandArgs tem
 
             try
             {
+                using var templateCreationActivity = Activities.Source.StartActivity("actual-instantiate-template");
                 instantiateResult = await _templateCreator.InstantiateAsync(
                     templateArgs.Template,
                     templateArgs.Name,
@@ -306,6 +308,7 @@ private async Task<NewCommandStatus> CreateTemplateAsync(TemplateCommandArgs tem
 
         private NewCommandStatus HandlePostActions(ITemplateCreationResult creationResult, TemplateCommandArgs args)
         {
+            using var postActionActivity = Activities.Source.StartActivity("post-actions");
             PostActionExecutionStatus result = _postActionDispatcher.Process(creationResult, args.IsDryRun, args.AllowScripts ?? AllowRunScripts.Prompt);
 
             return result switch
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/TemplateListCoordinator.cs b/src/Cli/Microsoft.TemplateEngine.Cli/TemplateListCoordinator.cs
index 4f725fb268ff..0a78b36dd923 100644
--- a/src/Cli/Microsoft.TemplateEngine.Cli/TemplateListCoordinator.cs
+++ b/src/Cli/Microsoft.TemplateEngine.Cli/TemplateListCoordinator.cs
@@ -24,12 +24,12 @@ internal TemplateListCoordinator(
             IEngineEnvironmentSettings engineEnvironmentSettings,
             TemplatePackageManager templatePackageManager,
             IHostSpecificDataLoader hostSpecificDataLoader)
-
         {
             _engineEnvironmentSettings = engineEnvironmentSettings ?? throw new ArgumentNullException(nameof(engineEnvironmentSettings));
             _templatePackageManager = templatePackageManager ?? throw new ArgumentNullException(nameof(templatePackageManager));
             _hostSpecificDataLoader = hostSpecificDataLoader ?? throw new ArgumentNullException(nameof(hostSpecificDataLoader));
             _defaultLanguage = engineEnvironmentSettings.GetDefaultLanguage();
+            using var constraintManagerActivity = Activities.Source.StartActivity("create-constraints");
             _constraintManager = new TemplateConstraintManager(_engineEnvironmentSettings);
         }
 
@@ -48,7 +48,6 @@ internal async Task<NewCommandStatus> DisplayTemplateGroupListAsync(
             ListTemplateResolver resolver = new(_constraintManager, _templatePackageManager, _hostSpecificDataLoader);
             TemplateResolutionResult resolutionResult = await resolver.ResolveTemplatesAsync(args, _defaultLanguage, cancellationToken).ConfigureAwait(false);
 
-            //IReadOnlyDictionary<string, string?>? appliedParameterMatches = resolutionResult.GetAllMatchedParametersList();
             if (resolutionResult.TemplateGroupsWithMatchingTemplateInfoAndParameters.Any())
             {
                 Reporter.Output.WriteLine(LocalizableStrings.TemplatesFoundMatchingInputParameters, GetInputParametersString(args));
@@ -66,10 +65,10 @@ internal async Task<NewCommandStatus> DisplayTemplateGroupListAsync(
             }
             else
             {
-                //if there is no criteria and filters it means that dotnet new list was run but there is no templates installed.
+                // If there is no criteria and filters, it means that dotnet new list was run but there are no templates installed.
                 if (args.ListNameCriteria == null && !args.AppliedFilters.Any())
                 {
-                    //No templates installed.
+                    // No templates installed.
                     Reporter.Output.WriteLine(LocalizableStrings.NoTemplatesFound);
                     Reporter.Output.WriteLine();
                     // To search for the templates on NuGet.org, run:
@@ -83,7 +82,7 @@ internal async Task<NewCommandStatus> DisplayTemplateGroupListAsync(
                     return NewCommandStatus.Success;
                 }
 
-                // at least one criteria was specified.
+                // At least one criteria was specified.
                 // No templates found matching the following input parameter(s): {0}.
                 Reporter.Error.WriteLine(
                     string.Format(
@@ -195,33 +194,30 @@ internal async Task<NewCommandStatus> DisplayCommandDescriptionAsync(
             return NewCommandStatus.Success;
         }
 
-        private static string GetInputParametersString(ListCommandArgs args/*, IReadOnlyDictionary<string, string?>? templateParameters = null*/)
+        private static string GetInputParametersString(ListCommandArgs args)
         {
             string separator = ", ";
             IEnumerable<string> appliedFilters = args.AppliedFilters
                     .Select(filter => $"{args.GetFilterToken(filter)}='{args.GetFilterValue(filter)}'");
 
-            //IEnumerable<string> appliedTemplateParameters = templateParameters?
-            //       .Select(param => string.IsNullOrWhiteSpace(param.Value) ? param.Key : $"{param.Key}='{param.Value}'") ?? Array.Empty<string>();
-
             StringBuilder inputParameters = new();
             string? mainCriteria = args.ListNameCriteria;
             if (!string.IsNullOrWhiteSpace(mainCriteria))
             {
                 inputParameters.Append($"'{mainCriteria}'");
-                if (appliedFilters.Any()/* || appliedTemplateParameters.Any()*/)
+                if (appliedFilters.Any())
                 {
                     inputParameters.Append(separator);
                 }
             }
-            if (appliedFilters/*.Concat(appliedTemplateParameters)*/.Any())
+            if (appliedFilters.Any())
             {
-                inputParameters.Append(string.Join(separator, appliedFilters/*.Concat(appliedTemplateParameters)*/));
+                inputParameters.Append(string.Join(separator, appliedFilters));
             }
             return inputParameters.ToString();
         }
 
-        private static string GetPartialMatchReason(TemplateResolutionResult templateResolutionResult, ListCommandArgs args/*, IReadOnlyDictionary<string, string?>? templateParameters = null*/)
+        private static string GetPartialMatchReason(TemplateResolutionResult templateResolutionResult, ListCommandArgs args)
         {
             string separator = ", ";
 
@@ -230,15 +226,10 @@ private static string GetPartialMatchReason(TemplateResolutionResult templateRes
                     .Where(filter => filter.MismatchCriteria(templateResolutionResult))
                     .Select(filter => $"{args.GetFilterToken(filter)}='{args.GetFilterValue(filter)}'");
 
-            //IEnumerable<string> appliedTemplateParameters = templateParameters?
-            //       .Where(parameter =>
-            //            templateResolutionResult.IsParameterMismatchReason(parameter.Key))
-            //       .Select(param => string.IsNullOrWhiteSpace(param.Value) ? param.Key : $"{param.Key}='{param.Value}'") ?? Array.Empty<string>();
-
             StringBuilder inputParameters = new();
-            if (appliedFilters/*.Concat(appliedTemplateParameters)*/.Any())
+            if (appliedFilters.Any())
             {
-                inputParameters.Append(string.Join(separator, appliedFilters/*.Concat(appliedTemplateParameters)*/));
+                inputParameters.Append(string.Join(separator, appliedFilters));
             }
             return inputParameters.ToString();
         }
diff --git a/src/Cli/dotnet/CliSchema.cs b/src/Cli/dotnet/CliSchema.cs
index 0496977bbd73..69f679cbdc66 100644
--- a/src/Cli/dotnet/CliSchema.cs
+++ b/src/Cli/dotnet/CliSchema.cs
@@ -33,8 +33,20 @@ internal static class CliSchema
         TypeInfoResolver = new DefaultJsonTypeInfoResolver()
     };
 
-    public record ArgumentDetails(string? description, int order, bool hidden, string? helpName, string valueType, bool hasDefaultValue, object? defaultValue, ArityDetails arity);
-    public record ArityDetails(int minimum, int? maximum);
+    public record ArgumentDetails(
+        string? description,
+        int order,
+        bool hidden,
+        string? helpName,
+        string valueType,
+        bool hasDefaultValue,
+        object? defaultValue,
+        ArityDetails arity);
+
+    public record ArityDetails(
+        int minimum,
+        int? maximum);
+
     public record OptionDetails(
         string? description,
         bool hidden,
@@ -45,8 +57,8 @@ public record OptionDetails(
         object? defaultValue,
         ArityDetails arity,
         bool required,
-        bool recursive
-    );
+        bool recursive);
+
     public record CommandDetails(
         string? description,
         bool hidden,
@@ -54,6 +66,7 @@ public record CommandDetails(
         Dictionary<string, ArgumentDetails>? arguments,
         Dictionary<string, OptionDetails>? options,
         Dictionary<string, CommandDetails>? subcommands);
+
     public record RootCommandDetails(
         string name,
         string version,
@@ -65,7 +78,6 @@ public record RootCommandDetails(
         Dictionary<string, CommandDetails>? subcommands
     ) : CommandDetails(description, hidden, aliases, arguments, options, subcommands);
 
-
     public static void PrintCliSchema(CommandResult commandResult, TextWriter outputWriter, ITelemetry? telemetryClient)
     {
         var command = commandResult.Command;
@@ -74,7 +86,7 @@ public static void PrintCliSchema(CommandResult commandResult, TextWriter output
         outputWriter.Write(result.AsSpan());
         outputWriter.Flush();
         var commandString = CommandHierarchyAsString(commandResult);
-        var telemetryProperties = new Dictionary<string, string> { { "command", commandString } };
+        var telemetryProperties = new Dictionary<string, string?> { { "command", commandString } };
         telemetryClient?.TrackEvent("schema", telemetryProperties, null);
     }
 
diff --git a/src/Cli/dotnet/CommandDirectoryContext.cs b/src/Cli/dotnet/CommandDirectoryContext.cs
index c6ee09033687..c778a3bfd1a1 100644
--- a/src/Cli/dotnet/CommandDirectoryContext.cs
+++ b/src/Cli/dotnet/CommandDirectoryContext.cs
@@ -35,7 +35,7 @@ public static void PerformActionWithBasePath(string basePath, Action action)
                 $"Calls to {nameof(CommandDirectoryContext)}.{nameof(PerformActionWithBasePath)} cannot be nested.");
         }
         _basePath = basePath;
-        Telemetry.Telemetry.CurrentSessionId = null;
+        Telemetry.Telemetry.s_currentSessionId = null;
         try
         {
             action();
diff --git a/src/Cli/dotnet/CommandFactory/CommandResolution/MuxerCommandResolver.cs b/src/Cli/dotnet/CommandFactory/CommandResolution/MuxerCommandResolver.cs
index 1998ae144809..f3d5a16766de 100644
--- a/src/Cli/dotnet/CommandFactory/CommandResolution/MuxerCommandResolver.cs
+++ b/src/Cli/dotnet/CommandFactory/CommandResolution/MuxerCommandResolver.cs
@@ -1,24 +1,54 @@
 // 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.Diagnostics;
 using Microsoft.DotNet.Cli.Utils;
 using Microsoft.DotNet.Cli.Utils.Extensions;
+using OpenTelemetry;
+using OpenTelemetry.Context.Propagation;
 
 namespace Microsoft.DotNet.Cli.CommandFactory.CommandResolution;
 
 public class MuxerCommandResolver : ICommandResolver
 {
-    public CommandSpec Resolve(CommandResolverArguments commandResolverArguments)
+    public CommandSpec? Resolve(CommandResolverArguments commandResolverArguments)
     {
         if (commandResolverArguments.CommandName == Muxer.MuxerName)
         {
             var muxer = new Muxer();
             var escapedArgs = ArgumentEscaper.EscapeAndConcatenateArgArrayForProcessStart(
                 commandResolverArguments.CommandArguments.OrEmptyIfNull());
-            return new CommandSpec(muxer.MuxerPath, escapedArgs);
+            var env = MakeActivityContextEnvironment();
+            return new CommandSpec(muxer.MuxerPath, escapedArgs, env);
         }
         return null;
     }
+
+    private Dictionary<string, string>? MakeActivityContextEnvironment()
+    {
+        var currentActivity = Activity.Current;
+        var currentBaggage = Baggage.Current;
+        if (currentActivity == null)
+        {
+            return null;
+        }
+        var contextToInject = currentActivity.Context;
+        var propagationContext = new PropagationContext(contextToInject, currentBaggage);
+        var envDict = new Dictionary<string, string>();
+        Propagators.DefaultTextMapPropagator.Inject(propagationContext, envDict, WriteTraceStateIntoEnv);
+        return envDict;
+    }
+
+    private void WriteTraceStateIntoEnv(Dictionary<string, string> dictionary, string key, string value)
+    {
+        switch (key)
+        {
+            case "traceparent":
+                dictionary[Activities.DOTNET_CLI_TRACEPARENT] = value;
+                break;
+            case "tracestate":
+                dictionary[Activities.DOTNET_CLI_TRACESTATE] = value;
+                break;
+        }
+    }
 }
diff --git a/src/Cli/dotnet/Commands/CliCommandStrings.resx b/src/Cli/dotnet/Commands/CliCommandStrings.resx
index b3423acaa6ac..79c56130714b 100644
--- a/src/Cli/dotnet/Commands/CliCommandStrings.resx
+++ b/src/Cli/dotnet/Commands/CliCommandStrings.resx
@@ -2522,4 +2522,7 @@ Proceed?</value>
     <value>Tool package download needs confirmation. Run in interactive mode or use the "--yes" command-line option to confirm.</value>
     <comment>{Locked="--yes"}</comment>
   </data>
-</root>
+  <data name="ToolInstallPackageIdMissing" xml:space="preserve">
+    <value>A package ID was not specified for tool installation.</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/src/Cli/dotnet/Commands/Hidden/InternalReportInstallSuccess/InternalReportInstallSuccessCommand.cs b/src/Cli/dotnet/Commands/Hidden/InternalReportInstallSuccess/InternalReportInstallSuccessCommand.cs
index f7465642ef34..0e4e905a54df 100644
--- 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;
     }
 
@@ -43,33 +39,24 @@ public static void ProcessInputAndSendTelemetry(ParseResult result, ITelemetry t
 
     internal class ThreadBlockingTelemetry : ITelemetry
     {
-        private readonly Telemetry.Telemetry telemetry;
+        private readonly Telemetry.Telemetry _telemetry;
 
         internal ThreadBlockingTelemetry()
         {
-            var sessionId =
-            Environment.GetEnvironmentVariable(TelemetrySessionIdEnvironmentVariableName);
-            telemetry = new Telemetry.Telemetry(new NoOpFirstTimeUseNoticeSentinel(), sessionId, blockThreadInitialization: true);
-        }
-        public bool Enabled => telemetry.Enabled;
-
-        public void Flush()
-        {
+            var sessionId = Environment.GetEnvironmentVariable(TelemetrySessionIdEnvironmentVariableName);
+            _telemetry = new Telemetry.Telemetry(sessionId);
         }
 
-        public void Dispose()
-        {
-            telemetry.Dispose();
-        }
+        public bool Enabled => _telemetry.Enabled;
 
-        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);
+            _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/MSBuildForwardingApp.cs b/src/Cli/dotnet/Commands/MSBuild/MSBuildForwardingApp.cs
index 47662c9d17d2..a7d8cf278c8a 100644
--- a/src/Cli/dotnet/Commands/MSBuild/MSBuildForwardingApp.cs
+++ b/src/Cli/dotnet/Commands/MSBuild/MSBuildForwardingApp.cs
@@ -18,7 +18,7 @@ public class MSBuildForwardingApp : CommandBase
 
     private static IEnumerable<string> ConcatTelemetryLogger(IEnumerable<string> argsToForward)
     {
-        if (Telemetry.Telemetry.CurrentSessionId != null)
+        if (Telemetry.Telemetry.s_currentSessionId != null)
         {
             try
             {
@@ -30,7 +30,7 @@ private static IEnumerable<string> ConcatTelemetryLogger(IEnumerable<string> arg
             }
             catch (Exception)
             {
-                // Exceptions during telemetry shouldn't cause anything else to fail
+                // Exceptions during _telemetry shouldn't cause anything else to fail
             }
         }
         return argsToForward;
@@ -66,7 +66,7 @@ public ProcessStartInfo GetProcessStartInfo()
 
     private void InitializeRequiredEnvironmentVariables()
     {
-        EnvironmentVariable(TelemetrySessionIdEnvironmentVariableName, Telemetry.Telemetry.CurrentSessionId);
+        EnvironmentVariable(TelemetrySessionIdEnvironmentVariableName, Telemetry.Telemetry.s_currentSessionId);
     }
 
     /// <summary>
diff --git a/src/Cli/dotnet/Commands/MSBuild/MSBuildForwardingLogger.cs b/src/Cli/dotnet/Commands/MSBuild/MSBuildForwardingLogger.cs
index fc7c6488b910..7b9d87a7052f 100644
--- a/src/Cli/dotnet/Commands/MSBuild/MSBuildForwardingLogger.cs
+++ b/src/Cli/dotnet/Commands/MSBuild/MSBuildForwardingLogger.cs
@@ -26,7 +26,7 @@ public void Initialize(IEventSource eventSource)
             eventSource4.IncludeEvaluationPropertiesAndItems();
         }
 
-        // Only forward telemetry events
+        // Only forward _telemetry events
         if (eventSource is IEventSource2 eventSource2)
         {
             eventSource2.TelemetryLogged += (sender, args) => BuildEventRedirector.ForwardEvent(args);
diff --git a/src/Cli/dotnet/Commands/MSBuild/MSBuildLogger.cs b/src/Cli/dotnet/Commands/MSBuild/MSBuildLogger.cs
index 8e10b9393474..1ffcbab92ee0 100644
--- a/src/Cli/dotnet/Commands/MSBuild/MSBuildLogger.cs
+++ b/src/Cli/dotnet/Commands/MSBuild/MSBuildLogger.cs
@@ -1,21 +1,16 @@
 // 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.Globalization;
 using Microsoft.Build.Framework;
 using Microsoft.DotNet.Cli.Telemetry;
 using Microsoft.DotNet.Cli.Utils;
-using Microsoft.DotNet.Configurer;
 
 namespace Microsoft.DotNet.Cli.Commands.MSBuild;
 
 public sealed class MSBuildLogger : INodeLogger
 {
-    private readonly IFirstTimeUseNoticeSentinel _sentinel =
-        new FirstTimeUseNoticeSentinel();
-    private readonly ITelemetry _telemetry;
+    private readonly ITelemetry? _telemetry;
 
     internal const string TargetFrameworkTelemetryEventName = "targetframeworkeval";
     internal const string BuildTelemetryEventName = "build";
@@ -54,24 +49,16 @@ public MSBuildLogger()
     {
         try
         {
-            string sessionId =
-                Environment.GetEnvironmentVariable(MSBuildForwardingApp.TelemetrySessionIdEnvironmentVariableName);
+            string? sessionId = Environment.GetEnvironmentVariable(MSBuildForwardingApp.TelemetrySessionIdEnvironmentVariableName);
 
             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(
-                    _sentinel,
-                    sessionId,
-                    senderCount: 0);
+                _telemetry = new Telemetry.Telemetry(sessionId);
             }
         }
         catch (Exception)
         {
-            // Exceptions during telemetry shouldn't cause anything else to fail
+            // Exceptions during _telemetry shouldn't cause anything else to fail
         }
     }
 
@@ -101,18 +88,18 @@ public void Initialize(IEventSource eventSource)
         }
         catch (Exception)
         {
-            // Exceptions during telemetry shouldn't cause anything else to fail
+            // Exceptions during _telemetry shouldn't cause anything else to fail
         }
     }
 
-    internal static void FormatAndSend(ITelemetry telemetry, TelemetryEventArgs args)
+    internal static void FormatAndSend(ITelemetry? telemetry, TelemetryEventArgs args)
     {
         switch (args.EventName)
         {
             case TargetFrameworkTelemetryEventName:
                 {
                     var newEventName = $"msbuild/{TargetFrameworkTelemetryEventName}";
-                    Dictionary<string, string> maskedProperties = [];
+                    Dictionary<string, string?> maskedProperties = [];
 
                     foreach (var key in new[] {
                         TargetFrameworkVersionTelemetryPropertyKey,
@@ -124,13 +111,13 @@ internal static void FormatAndSend(ITelemetry telemetry, TelemetryEventArgs args
                         ArtifactsPathLocationTypeTelemetryPropertyKey
                     })
                     {
-                        if (args.Properties.TryGetValue(key, out string value))
+                        if (args.Properties.TryGetValue(key, out string? value) && value is not null)
                         {
                             maskedProperties.Add(key, Sha256Hasher.HashWithNormalizedCasing(value));
                         }
                     }
 
-                    telemetry.TrackEvent(newEventName, maskedProperties, measurements: null);
+                    telemetry?.TrackEvent(newEventName, maskedProperties, measurements: null);
                     break;
                 }
             case BuildTelemetryEventName:
@@ -174,38 +161,38 @@ internal static void FormatAndSend(ITelemetry telemetry, TelemetryEventArgs args
         }
     }
 
-    private static void TrackEvent(ITelemetry telemetry, string eventName, IDictionary<string, string> eventProperties, string[] toBeHashed, string[] toBeMeasured)
+    private static void TrackEvent(ITelemetry? telemetry, string eventName, IDictionary<string, string?> eventProperties, string[] toBeHashed, string[] toBeMeasured)
     {
-        Dictionary<string, string> properties = null;
-        Dictionary<string, double> measurements = null;
+        Dictionary<string, string?>? properties = null;
+        Dictionary<string, double>? measurements = null;
 
         foreach (var propertyToBeHashed in toBeHashed)
         {
-            if (eventProperties.TryGetValue(propertyToBeHashed, out string value))
+            if (eventProperties.TryGetValue(propertyToBeHashed, out string? value) && value is not null)
             {
-                // Lets lazy allocate in case there is tons of telemetry
-                properties ??= new Dictionary<string, string>(eventProperties);
+                // Lets lazy allocate in case there is tons of _telemetry
+                properties ??= new Dictionary<string, string?>(eventProperties);
                 properties[propertyToBeHashed] = Sha256Hasher.HashWithNormalizedCasing(value);
             }
         }
 
         foreach (var propertyToBeMeasured in toBeMeasured)
         {
-            if (eventProperties.TryGetValue(propertyToBeMeasured, out string value))
+            if (eventProperties.TryGetValue(propertyToBeMeasured, out string? value))
             {
-                // Lets lazy allocate in case there is tons of telemetry
-                properties ??= new Dictionary<string, string>(eventProperties);
+                // Lets lazy allocate in case there is tons of _telemetry
+                properties ??= new Dictionary<string, string?>(eventProperties);
                 properties.Remove(propertyToBeMeasured);
                 if (double.TryParse(value, CultureInfo.InvariantCulture, out double realValue))
                 {
-                    // Lets lazy allocate in case there is tons of telemetry
+                    // Lets lazy allocate in case there is tons of _telemetry
                     measurements ??= [];
                     measurements[propertyToBeMeasured] = realValue;
                 }
             }
         }
 
-        telemetry.TrackEvent(eventName, properties ?? eventProperties, measurements);
+        telemetry?.TrackEvent(eventName, properties ?? eventProperties, measurements);
     }
 
     private void OnTelemetryLogged(object sender, TelemetryEventArgs args)
@@ -215,17 +202,9 @@ private void OnTelemetryLogged(object sender, TelemetryEventArgs args)
 
     public void Shutdown()
     {
-        try
-        {
-            _sentinel?.Dispose();
-        }
-        catch (Exception)
-        {
-            // Exceptions during telemetry shouldn't cause anything else to fail
-        }
     }
 
     public LoggerVerbosity Verbosity { get; set; }
 
-    public string Parameters { get; set; }
+    public string? Parameters { get; set; }
 }
diff --git a/src/Cli/dotnet/Commands/New/BuiltInTemplatePackageProvider.cs b/src/Cli/dotnet/Commands/New/BuiltInTemplatePackageProvider.cs
index ceb8471b820c..0979199a5668 100644
--- a/src/Cli/dotnet/Commands/New/BuiltInTemplatePackageProvider.cs
+++ b/src/Cli/dotnet/Commands/New/BuiltInTemplatePackageProvider.cs
@@ -1,8 +1,7 @@
 // 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 Microsoft.DotNet.Cli.Utils;
 using Microsoft.TemplateEngine.Abstractions;
 using Microsoft.TemplateEngine.Abstractions.TemplatePackage;
 using NuGet.Versioning;
@@ -18,14 +17,16 @@ internal sealed class BuiltInTemplatePackageProvider(BuiltInTemplatePackageProvi
 
     public ITemplatePackageProviderFactory Factory { get; } = factory;
 
-#pragma warning disable CS0067
     /// <summary>
     /// We don't trigger this event, we could complicate our life with FileSystemWatcher.
-    /// But since "dotnet new" is short lived process is not worth it, plus it would cause
-    /// some perf hit...
+    /// But since "dotnet new" is short lived process is not worth it, plus it would cause some perf hit...
+    /// To avoid warnings about being unused, implement empty add/remove accessors.
     /// </summary>
-    public event Action TemplatePackagesChanged;
-#pragma warning restore CS0067
+    public event Action? TemplatePackagesChanged
+    {
+        add { }
+        remove { }
+    }
 
     public Task<IReadOnlyList<ITemplatePackage>> GetAllTemplatePackagesAsync(CancellationToken cancellationToken)
     {
@@ -44,11 +45,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(MSBuildForwardingAppWithoutLogging.GetMSBuildSDKsPath());
+        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 +61,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);
@@ -76,7 +78,7 @@ private static IReadOnlyDictionary<string, SemanticVersion> GetVersionDirectorie
 
         foreach (string directory in Directory.EnumerateDirectories(fullPath, "*.*", SearchOption.TopDirectoryOnly))
         {
-            if (SemanticVersion.TryParse(Path.GetFileName(directory), out SemanticVersion versionInfo))
+            if (SemanticVersion.TryParse(Path.GetFileName(directory), out SemanticVersion? versionInfo) && versionInfo is not null)
             {
                 versionFileInfo.Add(directory, versionInfo);
             }
@@ -89,7 +91,7 @@ private static IList<string> GetBestVersionsByMajorMinor(IReadOnlyDictionary<str
     {
         IDictionary<string, (string path, SemanticVersion version)> bestVersionsByBucket = new Dictionary<string, (string path, SemanticVersion version)>();
 
-        Version sdkVersion = typeof(NewCommandParser).Assembly.GetName().Version;
+        Version? sdkVersion = typeof(NewCommandParser).Assembly.GetName().Version;
         foreach (KeyValuePair<string, SemanticVersion> dirInfo in versionDirInfo)
         {
             var majorMinorDirVersion = new Version(dirInfo.Value.Major, dirInfo.Value.Minor);
diff --git a/src/Cli/dotnet/Commands/New/OptionalWorkloadProvider.cs b/src/Cli/dotnet/Commands/New/OptionalWorkloadProvider.cs
index a2a14b6033e2..77e48fe7b32a 100644
--- a/src/Cli/dotnet/Commands/New/OptionalWorkloadProvider.cs
+++ b/src/Cli/dotnet/Commands/New/OptionalWorkloadProvider.cs
@@ -1,8 +1,6 @@
 // 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 Microsoft.DotNet.Cli.Utils;
 using Microsoft.DotNet.Configurer;
 using Microsoft.TemplateEngine.Abstractions;
@@ -22,8 +20,8 @@ internal OptionalWorkloadProvider(ITemplatePackageProviderFactory factory, IEngi
 
     public ITemplatePackageProviderFactory Factory { get; }
 
-    // To avoid warnings about unused, its implemented via add/remove
-    event Action ITemplatePackageProvider.TemplatePackagesChanged
+    // To avoid warnings about being unused, implement empty add/remove accessors.
+    event Action? ITemplatePackageProvider.TemplatePackagesChanged
     {
         add { }
         remove { }
@@ -33,12 +31,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(MSBuildForwardingAppWithoutLogging.GetMSBuildSDKsPath());
+        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/Commands/NuGet/NuGetCommandParser.cs b/src/Cli/dotnet/Commands/NuGet/NuGetCommandParser.cs
index ee013c9faf6b..bad3c6806019 100644
--- a/src/Cli/dotnet/Commands/NuGet/NuGetCommandParser.cs
+++ b/src/Cli/dotnet/Commands/NuGet/NuGetCommandParser.cs
@@ -9,7 +9,7 @@
 
 namespace Microsoft.DotNet.Cli.Commands.NuGet;
 
-// This parser is used for completion and telemetry.
+// This parser is used for completion and _telemetry.
 // See https://github.com/NuGet/NuGet.Client for the actual implementation.
 internal static class NuGetCommandParser
 {
diff --git a/src/Cli/dotnet/Commands/Test/TestCommand.cs b/src/Cli/dotnet/Commands/Test/TestCommand.cs
index 4879f7a62fe3..165cd329eb05 100644
--- a/src/Cli/dotnet/Commands/Test/TestCommand.cs
+++ b/src/Cli/dotnet/Commands/Test/TestCommand.cs
@@ -405,7 +405,7 @@ static bool CheckIfTerminalIsSupportedAndTryEnableAnsiColorCodes()
 
         string FindDefaultValue(IReadOnlyList<string> unmatchedTokens)
         {
-            // Find default configuration so it is part of telemetry even when default is not used.
+            // Find default configuration so it is part of _telemetry even when default is not used.
             // Default can be stored in /tlp:default=true|false|on|off|auto
             Switch terminalLoggerDefault = Find(unmatchedTokens, "tlp", "terminalloggerparameters");
             if (terminalLoggerDefault == null)
diff --git a/src/Cli/dotnet/Commands/Test/TestingPlatformCommand.cs b/src/Cli/dotnet/Commands/Test/TestingPlatformCommand.cs
index d5b138339951..9c06a36a0be2 100644
--- a/src/Cli/dotnet/Commands/Test/TestingPlatformCommand.cs
+++ b/src/Cli/dotnet/Commands/Test/TestingPlatformCommand.cs
@@ -129,7 +129,7 @@ private void InitializeOutput(int degreeOfParallelism, ParseResult parseResult,
         var noProgress = parseResult.HasOption(TestingPlatformOptions.NoProgressOption);
         var noAnsi = parseResult.HasOption(TestingPlatformOptions.NoAnsiOption);
 
-        // TODO: Replace this with proper CI detection that we already have in telemetry. https://github.com/microsoft/testfx/issues/5533#issuecomment-2838893327
+        // TODO: Replace this with proper CI detection that we already have in _telemetry. https://github.com/microsoft/testfx/issues/5533#issuecomment-2838893327
         bool inCI = string.Equals(Environment.GetEnvironmentVariable("TF_BUILD"), "true", StringComparison.OrdinalIgnoreCase) || string.Equals(Environment.GetEnvironmentVariable("GITHUB_ACTIONS"), "true", StringComparison.OrdinalIgnoreCase);
 
         _output = new TerminalTestReporter(console, new TerminalTestReporterOptions()
diff --git a/src/Cli/dotnet/Commands/Tool/Execute/ToolExecuteCommand.cs b/src/Cli/dotnet/Commands/Tool/Execute/ToolExecuteCommand.cs
index 909947f2316d..a540f3ad5991 100644
--- a/src/Cli/dotnet/Commands/Tool/Execute/ToolExecuteCommand.cs
+++ b/src/Cli/dotnet/Commands/Tool/Execute/ToolExecuteCommand.cs
@@ -7,20 +7,16 @@
 using Microsoft.DotNet.Cli.Commands.Tool.Install;
 using Microsoft.DotNet.Cli.Commands.Tool.Restore;
 using Microsoft.DotNet.Cli.Commands.Tool.Run;
-using Microsoft.DotNet.Cli.Extensions;
 using Microsoft.DotNet.Cli.NuGetPackageDownloader;
 using Microsoft.DotNet.Cli.ToolManifest;
 using Microsoft.DotNet.Cli.ToolPackage;
 using Microsoft.DotNet.Cli.Utils;
 using Microsoft.DotNet.Cli.Utils.Extensions;
-
 using Microsoft.Extensions.EnvironmentAbstractions;
-using NuGet.Common;
 using NuGet.Configuration;
 using NuGet.Packaging.Core;
 using NuGet.Versioning;
 
-
 namespace Microsoft.DotNet.Cli.Commands.Tool.Execute;
 
 internal class ToolExecuteCommand(ParseResult result, ToolManifestFinder? toolManifestFinder = null, string? currentWorkingDirectory = null) : CommandBase(result)
@@ -89,11 +85,9 @@ public override int Execute()
 
         (var bestVersion, var packageSource) = _toolPackageDownloader.GetNuGetVersion(packageLocation, packageId, _verbosity, versionRange, _restoreActionConfig);
 
-        IToolPackage toolPackage;
-
         //  TargetFramework is null, which means to use the current framework.  Global tools can override the target framework to use (or select assets for),
         //  but we don't support this for local or one-shot tools.
-        if (!_toolPackageDownloader.TryGetDownloadedTool(packageId, bestVersion, targetFramework: null, out toolPackage))
+        if (!_toolPackageDownloader.TryGetDownloadedTool(packageId, bestVersion, targetFramework: null, out IToolPackage toolPackage))
         {
             if (!UserAgreedToRunFromSource(packageId, bestVersion, packageSource))
             {
@@ -129,6 +123,7 @@ public override int Execute()
 
         var commandSpec = ToolCommandSpecCreator.CreateToolCommandSpec(toolPackage.Command.Name.Value, toolPackage.Command.Executable.Value, toolPackage.Command.Runner, _allowRollForward, _forwardArguments);
         var command = CommandFactoryUsingResolver.Create(commandSpec);
+        using var _ = Activities.Source.StartActivity("execute-inline-tool");
         var result = command.Execute();
         return result.ExitCode;
     }
diff --git a/src/Cli/dotnet/Commands/Tool/Install/ToolInstallGlobalOrToolPathCommand.cs b/src/Cli/dotnet/Commands/Tool/Install/ToolInstallGlobalOrToolPathCommand.cs
index 429eea05069a..2d7b4ff86568 100644
--- a/src/Cli/dotnet/Commands/Tool/Install/ToolInstallGlobalOrToolPathCommand.cs
+++ b/src/Cli/dotnet/Commands/Tool/Install/ToolInstallGlobalOrToolPathCommand.cs
@@ -1,10 +1,7 @@
 // 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 System.Transactions;
 using Microsoft.DotNet.Cli.NuGetPackageDownloader;
 using Microsoft.DotNet.Cli.ToolPackage;
 using Microsoft.DotNet.Cli.Utils;
@@ -16,7 +13,6 @@
 using Microsoft.DotNet.Cli.Extensions;
 using Microsoft.DotNet.Cli.ShellShim;
 using Microsoft.DotNet.Cli.Commands.Tool.Update;
-using Microsoft.DotNet.Cli.Commands.Tool.Common;
 using Microsoft.DotNet.Cli.Commands.Tool.Uninstall;
 using Microsoft.DotNet.Cli.Commands.Tool.List;
 
@@ -26,7 +22,7 @@ namespace Microsoft.DotNet.Cli.Commands.Tool.Install;
 
 internal delegate (IToolPackageStore, IToolPackageStoreQuery, IToolPackageDownloader) CreateToolPackageStoresAndDownloader(
     DirectoryPath? nonGlobalLocation = null,
-    IEnumerable<string> forwardRestoreArguments = null);
+    IEnumerable<string>? forwardRestoreArguments = null);
 
 internal class ToolInstallGlobalOrToolPathCommand : CommandBase
 {
@@ -35,36 +31,36 @@ internal class ToolInstallGlobalOrToolPathCommand : CommandBase
     private readonly CreateShellShimRepository _createShellShimRepository;
     private readonly CreateToolPackageStoresAndDownloaderAndUninstaller _createToolPackageStoreDownloaderUninstaller;
     private readonly ShellShimTemplateFinder _shellShimTemplateFinder;
-    private readonly IToolPackageStoreQuery _store;
+    private readonly IToolPackageStoreQuery? _store;
 
     private readonly PackageId? _packageId;
-    private readonly string _configFilePath;
-    private readonly string _framework;
-    private readonly string[] _source;
-    private readonly string[] _addSource;
+    private readonly string? _configFilePath;
+    private readonly string? _framework;
+    private readonly string[]? _source;
+    private readonly string[]? _addSource;
     private readonly bool _global;
     private readonly VerbosityOptions _verbosity;
-    private readonly string _toolPath;
-    private readonly string _architectureOption;
+    private readonly string? _toolPath;
+    private readonly string? _architectureOption;
     private readonly IEnumerable<string> _forwardRestoreArguments;
     private readonly bool _allowRollForward;
     private readonly bool _allowPackageDowngrade;
     private readonly bool _updateAll;
-    private readonly string _currentWorkingDirectory;
+    private readonly string? _currentWorkingDirectory;
     private readonly bool? _verifySignatures;
 
-    internal readonly RestoreActionConfig restoreActionConfig;
+    internal readonly RestoreActionConfig _restoreActionConfig;
 
     public ToolInstallGlobalOrToolPathCommand(
         ParseResult parseResult,
         PackageId? packageId = null,
-        CreateToolPackageStoresAndDownloaderAndUninstaller createToolPackageStoreDownloaderUninstaller = null,
-        CreateShellShimRepository createShellShimRepository = null,
-        IEnvironmentPathInstruction environmentPathInstruction = null,
-        IReporter reporter = null,
-        INuGetPackageDownloader nugetPackageDownloader = null,
-        IToolPackageStoreQuery store = null,
-        string currentWorkingDirectory = null,
+        CreateToolPackageStoresAndDownloaderAndUninstaller? createToolPackageStoreDownloaderUninstaller = null,
+        CreateShellShimRepository? createShellShimRepository = null,
+        IEnvironmentPathInstruction? environmentPathInstruction = null,
+        IReporter? reporter = null,
+        INuGetPackageDownloader? nugetPackageDownloader = null,
+        IToolPackageStoreQuery? store = null,
+        string? currentWorkingDirectory = null,
         bool? verifySignatures = null)
         : base(parseResult)
     {
@@ -92,11 +88,11 @@ public ToolInstallGlobalOrToolPathCommand(
         var configOption = parseResult.GetValue(ToolInstallCommandParser.ConfigOption);
         var sourceOption = parseResult.GetValue(ToolInstallCommandParser.AddSourceOption);
         var packageSourceLocation = new PackageSourceLocation(string.IsNullOrEmpty(configOption) ? null : new FilePath(configOption), additionalSourceFeeds: sourceOption, basePath: _currentWorkingDirectory);
-        restoreActionConfig = new RestoreActionConfig(DisableParallel: parseResult.GetValue(ToolCommandRestorePassThroughOptions.DisableParallelOption),
+        _restoreActionConfig = new RestoreActionConfig(DisableParallel: parseResult.GetValue(ToolCommandRestorePassThroughOptions.DisableParallelOption),
             NoCache: parseResult.GetValue(ToolCommandRestorePassThroughOptions.NoCacheOption) || parseResult.GetValue(ToolCommandRestorePassThroughOptions.NoHttpCacheOption),
             IgnoreFailedSources: parseResult.GetValue(ToolCommandRestorePassThroughOptions.IgnoreFailedSourcesOption),
             Interactive: parseResult.GetValue(ToolCommandRestorePassThroughOptions.InteractiveRestoreOption));
-        nugetPackageDownloader ??= new NuGetPackageDownloader.NuGetPackageDownloader(tempDir, verboseLogger: new NullLogger(), restoreActionConfig: restoreActionConfig, verbosityOptions: _verbosity, verifySignatures: verifySignatures ?? true);
+        nugetPackageDownloader ??= new NuGetPackageDownloader.NuGetPackageDownloader(tempDir, verboseLogger: new NullLogger(), restoreActionConfig: _restoreActionConfig, verbosityOptions: _verbosity, verifySignatures: verifySignatures ?? true);
         _shellShimTemplateFinder = new ShellShimTemplateFinder(nugetPackageDownloader, tempDir, packageSourceLocation);
         _store = store;
 
@@ -125,10 +121,7 @@ public override int Execute()
     {
         if (_updateAll)
         {
-            var toolListCommand = new ToolListGlobalOrToolPathCommand(
-                _parseResult
-                , toolPath => { return _store; }
-                );
+            var toolListCommand = new ToolListGlobalOrToolPathCommand(_parseResult, toolPath => { return _store; });
             var toolIds = toolListCommand.GetPackages(null, null);
             foreach (var toolId in toolIds)
             {
@@ -136,15 +129,25 @@ public override int Execute()
             }
             return 0;
         }
-        else
+
+        if (_packageId is null)
         {
-            return ExecuteInstallCommand((PackageId)_packageId);
+            throw new GracefulException(CliCommandStrings.ToolInstallPackageIdMissing);
         }
+
+        return ExecuteInstallCommand((PackageId)_packageId);
     }
 
     private int ExecuteInstallCommand(PackageId packageId)
     {
-        ValidateArguments();
+        using var _activity = Activities.Source.StartActivity("install-tool");
+        _activity?.DisplayName = $"Install {packageId}";
+        _activity?.SetTag("toolId", packageId);
+
+        if (!string.IsNullOrEmpty(_configFilePath) && !File.Exists(_configFilePath))
+        {
+            throw new GracefulException(string.Format(CliCommandStrings.ToolInstallNuGetConfigurationFileDoesNotExist, Path.GetFullPath(_configFilePath)));
+        }
 
         DirectoryPath? toolPath = null;
         if (!string.IsNullOrEmpty(_toolPath))
@@ -162,22 +165,24 @@ private int ExecuteInstallCommand(PackageId packageId)
         var appHostSourceDirectory = ShellShimTemplateFinder.GetDefaultAppHostSourceDirectory();
         IShellShimRepository shellShimRepository = _createShellShimRepository(appHostSourceDirectory, toolPath);
 
-        IToolPackage oldPackageNullable = GetOldPackage(toolPackageStoreQuery, packageId);
+        IToolPackage? oldPackageNullable = GetOldPackage(toolPackageStoreQuery, packageId);
 
-        if (oldPackageNullable != null)
+        if (oldPackageNullable is not null)
         {
             NuGetVersion nugetVersion = GetBestMatchNugetVersion(packageId, versionRange, toolPackageDownloader);
+            _activity?.DisplayName = $"Install {packageId}@{nugetVersion}";
+            _activity?.SetTag("toolVersion", nugetVersion);
 
             if (ToolVersionAlreadyInstalled(oldPackageNullable, nugetVersion))
             {
                 _reporter.WriteLine(string.Format(CliCommandStrings.ToolAlreadyInstalled, oldPackageNullable.Id, oldPackageNullable.Version.ToNormalizedString()).Green());
                 return 0;
-            }   
+            }
         }
 
         TransactionalAction.Run(() =>
         {
-            if (oldPackageNullable != null)
+            if (oldPackageNullable is not null)
             {
                 RunWithHandlingUninstallError(() =>
                 {
@@ -188,8 +193,9 @@ private int ExecuteInstallCommand(PackageId packageId)
 
             RunWithHandlingInstallError(() =>
             {
+                var toolPackageDownloaderActivity = Activities.Source.StartActivity("download-tool-package");
                 IToolPackage newInstalledPackage = toolPackageDownloader.InstallPackage(
-                new PackageLocation(nugetConfig: GetConfigFile(), sourceFeedOverrides: _source, additionalFeeds: _addSource),
+                    new PackageLocation(nugetConfig: GetConfigFile(), sourceFeedOverrides: _source, additionalFeeds: _addSource),
                     packageId: packageId,
                     versionRange: versionRange,
                     targetFramework: _framework,
@@ -197,12 +203,13 @@ private int ExecuteInstallCommand(PackageId packageId)
                     isGlobalTool: true,
                     isGlobalToolRollForward: _allowRollForward,
                     verifySignatures: _verifySignatures ?? true,
-                    restoreActionConfig: restoreActionConfig
+                    restoreActionConfig: _restoreActionConfig
                 );
+                toolPackageDownloaderActivity?.Dispose();
 
                 EnsureVersionIsHigher(oldPackageNullable, newInstalledPackage, _allowPackageDowngrade);
 
-                NuGetFramework framework;
+                NuGetFramework? framework;
                 if (string.IsNullOrEmpty(_framework) && newInstalledPackage.Frameworks.Count() > 0)
                 {
                     framework = newInstalledPackage.Frameworks
@@ -211,13 +218,12 @@ private int ExecuteInstallCommand(PackageId packageId)
                 }
                 else
                 {
-                    framework = string.IsNullOrEmpty(_framework) ?
-                        null :
-                        NuGetFramework.Parse(_framework);
+                    framework = string.IsNullOrEmpty(_framework) ? null : NuGetFramework.Parse(_framework);
                 }
+                var shimActivity = Activities.Source.StartActivity("create-shell-shim");
                 string appHostSourceDirectory = _shellShimTemplateFinder.ResolveAppHostSourceDirectoryAsync(_architectureOption, framework, RuntimeInformation.ProcessArchitecture).Result;
-
                 shellShimRepository.CreateShim(newInstalledPackage.Command, newInstalledPackage.PackagedShims);
+                shimActivity?.Dispose();
 
                 foreach (string w in newInstalledPackage.Warnings)
                 {
@@ -231,6 +237,7 @@ private int ExecuteInstallCommand(PackageId packageId)
                 PrintSuccessMessage(oldPackageNullable, newInstalledPackage);
             }, packageId);
         });
+
         return 0;
     }
 
@@ -241,37 +248,25 @@ private NuGetVersion GetBestMatchNugetVersion(PackageId packageId, VersionRange
             packageId: packageId,
             versionRange: versionRange,
             verbosity: _verbosity,
-            restoreActionConfig: restoreActionConfig
+            restoreActionConfig: _restoreActionConfig
         ).version;
     }
 
-    private static bool ToolVersionAlreadyInstalled(IToolPackage oldPackageNullable, NuGetVersion nuGetVersion)
+    private static bool ToolVersionAlreadyInstalled(IToolPackage? oldPackageNullable, NuGetVersion nuGetVersion)
     {
         return oldPackageNullable != null && oldPackageNullable.Version == nuGetVersion;
     }
 
-    private static void EnsureVersionIsHigher(IToolPackage oldPackageNullable, IToolPackage newInstalledPackage, bool allowDowngrade)
+    private static void EnsureVersionIsHigher(IToolPackage? oldPackageNullable, IToolPackage newInstalledPackage, bool allowDowngrade)
     {
         if (oldPackageNullable != null && newInstalledPackage.Version < oldPackageNullable.Version && !allowDowngrade)
         {
             throw new GracefulException(
-                [
-                    string.Format(CliCommandStrings.UpdateToLowerVersion,
-                        newInstalledPackage.Version.ToNormalizedString(),
-                        oldPackageNullable.Version.ToNormalizedString())
-                ],
-                isUserError: false);
-        }
-    }
-
-    private void ValidateArguments()
-    {
-        if (!string.IsNullOrEmpty(_configFilePath) && !File.Exists(_configFilePath))
-        {
-            throw new GracefulException(
-                string.Format(
-                    CliCommandStrings.ToolInstallNuGetConfigurationFileDoesNotExist,
-                    Path.GetFullPath(_configFilePath)));
+            [
+                string.Format(CliCommandStrings.UpdateToLowerVersion,
+                    newInstalledPackage.Version.ToNormalizedString(),
+                    oldPackageNullable.Version.ToNormalizedString())
+            ], isUserError: false);
         }
     }
 
@@ -288,9 +283,7 @@ private static void RunWithHandlingInstallError(Action installAction, PackageId
             {
                 string.Format(CliCommandStrings.UpdateToolFailed, packageId)
             };
-            message.AddRange(
-                InstallToolCommandLowLevelErrorConverter.GetUserFacingMessages(ex, packageId));
-
+            message.AddRange(InstallToolCommandLowLevelErrorConverter.GetUserFacingMessages(ex, packageId));
 
             throw new GracefulException(
                 messages: message,
@@ -303,7 +296,7 @@ private static void RunWithHandlingUninstallError(Action uninstallAction, Packag
     {
         try
         {
-            uninstallAction();           
+            uninstallAction();
         }
         catch (Exception ex)
             when (ToolUninstallCommandLowLevelErrorConverter.ShouldConvertToUserFacingError(ex))
@@ -312,8 +305,7 @@ private static void RunWithHandlingUninstallError(Action uninstallAction, Packag
             {
                 string.Format(CliCommandStrings.UpdateToolFailed, packageId)
             };
-            message.AddRange(
-                ToolUninstallCommandLowLevelErrorConverter.GetUserFacingMessages(ex, packageId));
+            message.AddRange(ToolUninstallCommandLowLevelErrorConverter.GetUserFacingMessages(ex, packageId));
 
             throw new GracefulException(
                 messages: message,
@@ -333,29 +325,25 @@ private static void RunWithHandlingUninstallError(Action uninstallAction, Packag
         return configFile;
     }
 
-    private static IToolPackage GetOldPackage(IToolPackageStoreQuery toolPackageStoreQuery, PackageId packageId)
+    private static IToolPackage? GetOldPackage(IToolPackageStoreQuery toolPackageStoreQuery, PackageId packageId)
     {
-        IToolPackage oldPackageNullable;
+        IToolPackage? oldPackageNullable;
         try
         {
             oldPackageNullable = toolPackageStoreQuery.EnumeratePackageVersions(packageId).SingleOrDefault();
         }
         catch (InvalidOperationException)
         {
-            throw new GracefulException(
-                messages:
-                [
-                    string.Format(
-                        CliCommandStrings.ToolUpdateToolHasMultipleVersionsInstalled,
-                        packageId),
-                ],
-                isUserError: false);
+            throw new GracefulException(messages:
+            [
+                string.Format(CliCommandStrings.ToolUpdateToolHasMultipleVersionsInstalled, packageId)
+            ], isUserError: false);
         }
 
         return oldPackageNullable;
     }
 
-    private void PrintSuccessMessage(IToolPackage oldPackage, IToolPackage newInstalledPackage)
+    private void PrintSuccessMessage(IToolPackage? oldPackage, IToolPackage newInstalledPackage)
     {
         if (!_verbosity.IsQuiet())
         {
@@ -381,7 +369,6 @@ private void PrintSuccessMessage(IToolPackage oldPackage, IToolPackage newInstal
             {
                 _reporter.WriteLine(
                     string.Format(
-                        
                         newInstalledPackage.Version.IsPrerelease ?
                         CliCommandStrings.UpdateSucceededPreVersionNoChange : CliCommandStrings.UpdateSucceededStableVersionNoChange,
                         newInstalledPackage.Id, newInstalledPackage.Version).Green());
diff --git a/src/Cli/dotnet/Commands/Tool/Run/ToolRunCommand.cs b/src/Cli/dotnet/Commands/Tool/Run/ToolRunCommand.cs
index ee0e2aa63f46..3f8f97aa68d6 100644
--- a/src/Cli/dotnet/Commands/Tool/Run/ToolRunCommand.cs
+++ b/src/Cli/dotnet/Commands/Tool/Run/ToolRunCommand.cs
@@ -1,27 +1,21 @@
 // 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.CommandFactory;
 using Microsoft.DotNet.Cli.CommandFactory.CommandResolution;
-using Microsoft.DotNet.Cli.Commands.Tool.Install;
-using Microsoft.DotNet.Cli.NuGetPackageDownloader;
 using Microsoft.DotNet.Cli.ToolManifest;
-using Microsoft.DotNet.Cli.ToolPackage;
 using Microsoft.DotNet.Cli.Utils;
-using Microsoft.Extensions.EnvironmentAbstractions;
 
 namespace Microsoft.DotNet.Cli.Commands.Tool.Run;
 
 internal class ToolRunCommand(
     ParseResult result,
-    LocalToolsCommandResolver localToolsCommandResolver = null,
-    ToolManifestFinder toolManifest = null) : CommandBase(result)
+    LocalToolsCommandResolver? localToolsCommandResolver = null,
+    ToolManifestFinder? toolManifest = null) : CommandBase(result)
 {
-    private readonly string _toolCommandName = result.GetValue(ToolRunCommandParser.CommandNameArgument);
-    private readonly IEnumerable<string> _forwardArgument = result.GetValue(ToolRunCommandParser.CommandArgument);
+    private readonly string? _toolCommandName = result.GetValue(ToolRunCommandParser.CommandNameArgument);
+    private readonly IEnumerable<string>? _forwardArgument = result.GetValue(ToolRunCommandParser.CommandArgument);
 
     private readonly LocalToolsCommandResolver _localToolsCommandResolver = localToolsCommandResolver ?? new LocalToolsCommandResolver(toolManifest);
     public bool _allowRollForward = result.GetValue(ToolRunCommandParser.RollForwardOption);
@@ -30,14 +24,15 @@ public override int Execute()
     {
         return ExecuteCommand(_localToolsCommandResolver, _toolCommandName, _forwardArgument, _allowRollForward);
     }
-    public static int ExecuteCommand(LocalToolsCommandResolver commandResolver, string toolCommandName, IEnumerable<string> argumentsToForward, bool allowRollForward)
+
+    public static int ExecuteCommand(LocalToolsCommandResolver commandResolver, string? toolCommandName, IEnumerable<string>? argumentsToForward, bool allowRollForward)
     {
+        using var _ = Activities.Source.StartActivity("execute-local-tool");
         CommandSpec commandSpec = commandResolver.ResolveStrict(new CommandResolverArguments()
         {
             // since LocalToolsCommandResolver is a resolver, and all resolver input have dotnet-
             CommandName = $"dotnet-{toolCommandName}",
             CommandArguments = argumentsToForward,
-
         }, allowRollForward);
 
         if (commandSpec == null)
diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.cs.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.cs.xlf
index d46d1fc1cee3..3c935262b334 100644
--- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.cs.xlf
+++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.cs.xlf
@@ -3075,6 +3075,11 @@ Nástroj {1} (verze {2}) byl úspěšně nainstalován.</target>
         <target state="translated">PACKAGE_ID</target>
         <note />
       </trans-unit>
+      <trans-unit id="ToolInstallPackageIdMissing">
+        <source>A package ID was not specified for tool installation.</source>
+        <target state="new">A package ID was not specified for tool installation.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ToolInstallSourceOptionDescription">
         <source>Replace all NuGet package sources to use during installation with these.</source>
         <target state="translated">Nahradit všechny zdroje balíčků NuGet, které se mají použít při instalaci, těmito zdroji.</target>
diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.de.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.de.xlf
index 00ddef248d97..35f262613563 100644
--- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.de.xlf
+++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.de.xlf
@@ -3075,6 +3075,11 @@ Das Tool "{1}" (Version {2}) wurde erfolgreich installiert.</target>
         <target state="translated">PACKAGE_ID</target>
         <note />
       </trans-unit>
+      <trans-unit id="ToolInstallPackageIdMissing">
+        <source>A package ID was not specified for tool installation.</source>
+        <target state="new">A package ID was not specified for tool installation.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ToolInstallSourceOptionDescription">
         <source>Replace all NuGet package sources to use during installation with these.</source>
         <target state="translated">Ersetzen alle NuGet-Paketquellen für die Nutzung während der Installation durch diese.</target>
diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.es.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.es.xlf
index cb384a68916a..124651b908b6 100644
--- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.es.xlf
+++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.es.xlf
@@ -3075,6 +3075,11 @@ La herramienta "{1}" (versión '{2}') se instaló correctamente.</target>
         <target state="translated">PACKAGE_ID</target>
         <note />
       </trans-unit>
+      <trans-unit id="ToolInstallPackageIdMissing">
+        <source>A package ID was not specified for tool installation.</source>
+        <target state="new">A package ID was not specified for tool installation.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ToolInstallSourceOptionDescription">
         <source>Replace all NuGet package sources to use during installation with these.</source>
         <target state="translated">Reemplazar todos los orígenes de paquetes NuGet que se usarán durante la instalación por estos.</target>
diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.fr.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.fr.xlf
index 3bb1cb4261da..e6f64f281513 100644
--- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.fr.xlf
+++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.fr.xlf
@@ -3075,6 +3075,11 @@ L'outil '{1}' (version '{2}') a été installé correctement.</target>
         <target state="translated">PACKAGE_ID</target>
         <note />
       </trans-unit>
+      <trans-unit id="ToolInstallPackageIdMissing">
+        <source>A package ID was not specified for tool installation.</source>
+        <target state="new">A package ID was not specified for tool installation.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ToolInstallSourceOptionDescription">
         <source>Replace all NuGet package sources to use during installation with these.</source>
         <target state="translated">Remplacer toutes les sources de package NuGet à utiliser pendant l’installation par celles-ci.</target>
diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.it.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.it.xlf
index 28f0e836eb15..43190ea4c1e0 100644
--- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.it.xlf
+++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.it.xlf
@@ -3075,6 +3075,11 @@ Lo strumento '{1}' (versione '{2}') è stato installato.</target>
         <target state="translated">PACKAGE_ID</target>
         <note />
       </trans-unit>
+      <trans-unit id="ToolInstallPackageIdMissing">
+        <source>A package ID was not specified for tool installation.</source>
+        <target state="new">A package ID was not specified for tool installation.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ToolInstallSourceOptionDescription">
         <source>Replace all NuGet package sources to use during installation with these.</source>
         <target state="translated">Sostituire tutte le origini del pacchetto NuGet da usare durante l'installazione con queste.</target>
diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ja.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ja.xlf
index ef38ba10508f..323f07be65b9 100644
--- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ja.xlf
+++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ja.xlf
@@ -3075,6 +3075,11 @@ Tool '{1}' (version '{2}') was successfully installed.</source>
         <target state="translated">PACKAGE_ID</target>
         <note />
       </trans-unit>
+      <trans-unit id="ToolInstallPackageIdMissing">
+        <source>A package ID was not specified for tool installation.</source>
+        <target state="new">A package ID was not specified for tool installation.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ToolInstallSourceOptionDescription">
         <source>Replace all NuGet package sources to use during installation with these.</source>
         <target state="translated">インストール中に使用するすべての NuGet パッケージ ソースをこれらに置き換えます。</target>
diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ko.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ko.xlf
index f580983c20fc..3e5949c944f8 100644
--- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ko.xlf
+++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ko.xlf
@@ -3075,6 +3075,11 @@ Tool '{1}' (version '{2}') was successfully installed.</source>
         <target state="translated">PACKAGE_ID</target>
         <note />
       </trans-unit>
+      <trans-unit id="ToolInstallPackageIdMissing">
+        <source>A package ID was not specified for tool installation.</source>
+        <target state="new">A package ID was not specified for tool installation.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ToolInstallSourceOptionDescription">
         <source>Replace all NuGet package sources to use during installation with these.</source>
         <target state="translated">설치 중에 사용할 모든 NuGet 패키지 원본을 이러한 패키지 원본으로 바꿉니다.</target>
diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pl.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pl.xlf
index cd7c4ff8b71c..6fcdab94b9f9 100644
--- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pl.xlf
+++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pl.xlf
@@ -3075,6 +3075,11 @@ Pomyślnie zainstalowano narzędzie „{1}” (wersja: „{2}”).</target>
         <target state="translated">PACKAGE_ID</target>
         <note />
       </trans-unit>
+      <trans-unit id="ToolInstallPackageIdMissing">
+        <source>A package ID was not specified for tool installation.</source>
+        <target state="new">A package ID was not specified for tool installation.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ToolInstallSourceOptionDescription">
         <source>Replace all NuGet package sources to use during installation with these.</source>
         <target state="translated">Zastąp je wszystkimi źródłami pakietów NuGet, które mają być używane podczas instalacji.</target>
diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pt-BR.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pt-BR.xlf
index 7cb8f96ca5f3..6456769c7e66 100644
--- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pt-BR.xlf
+++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pt-BR.xlf
@@ -3075,6 +3075,11 @@ A ferramenta '{1}' (versão '{2}') foi instalada com êxito.</target>
         <target state="translated">PACKAGE_ID</target>
         <note />
       </trans-unit>
+      <trans-unit id="ToolInstallPackageIdMissing">
+        <source>A package ID was not specified for tool installation.</source>
+        <target state="new">A package ID was not specified for tool installation.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ToolInstallSourceOptionDescription">
         <source>Replace all NuGet package sources to use during installation with these.</source>
         <target state="translated">Substitua todas as fontes de pacote NuGet a serem usadas durante a instalação por estas.</target>
diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ru.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ru.xlf
index d1400d5582aa..d86b37b0698c 100644
--- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ru.xlf
+++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ru.xlf
@@ -3075,6 +3075,11 @@ Tool '{1}' (version '{2}') was successfully installed.</source>
         <target state="translated">PACKAGE_ID</target>
         <note />
       </trans-unit>
+      <trans-unit id="ToolInstallPackageIdMissing">
+        <source>A package ID was not specified for tool installation.</source>
+        <target state="new">A package ID was not specified for tool installation.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ToolInstallSourceOptionDescription">
         <source>Replace all NuGet package sources to use during installation with these.</source>
         <target state="translated">Замените ими все источники пакетов NuGet, которые будут использоваться при установке.</target>
diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.tr.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.tr.xlf
index 39a1d1fd6ae4..48aa4858f958 100644
--- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.tr.xlf
+++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.tr.xlf
@@ -3075,6 +3075,11 @@ Tool '{1}' (version '{2}') was successfully installed.</source>
         <target state="translated">PACKAGE_ID</target>
         <note />
       </trans-unit>
+      <trans-unit id="ToolInstallPackageIdMissing">
+        <source>A package ID was not specified for tool installation.</source>
+        <target state="new">A package ID was not specified for tool installation.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ToolInstallSourceOptionDescription">
         <source>Replace all NuGet package sources to use during installation with these.</source>
         <target state="translated">Yükleme sırasında kullanılacak tüm NuGet paket kaynaklarını bu kaynaklarla değiştirin.</target>
diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hans.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hans.xlf
index 68dfd5055ce9..3019213932c2 100644
--- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hans.xlf
+++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hans.xlf
@@ -3075,6 +3075,11 @@ Tool '{1}' (version '{2}') was successfully installed.</source>
         <target state="translated">PACKAGE_ID</target>
         <note />
       </trans-unit>
+      <trans-unit id="ToolInstallPackageIdMissing">
+        <source>A package ID was not specified for tool installation.</source>
+        <target state="new">A package ID was not specified for tool installation.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ToolInstallSourceOptionDescription">
         <source>Replace all NuGet package sources to use during installation with these.</source>
         <target state="translated">将安装期间要使用的所有 NuGet 包源替换为这些源。</target>
diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hant.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hant.xlf
index 8ee9a0ada902..851b13f9e2ad 100644
--- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hant.xlf
+++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hant.xlf
@@ -3075,6 +3075,11 @@ Tool '{1}' (version '{2}') was successfully installed.</source>
         <target state="translated">PACKAGE_ID</target>
         <note />
       </trans-unit>
+      <trans-unit id="ToolInstallPackageIdMissing">
+        <source>A package ID was not specified for tool installation.</source>
+        <target state="new">A package ID was not specified for tool installation.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ToolInstallSourceOptionDescription">
         <source>Replace all NuGet package sources to use during installation with these.</source>
         <target state="translated">以這些套件取代安裝期間使用的所有 NuGet 套件來源。</target>
diff --git a/src/Cli/dotnet/CommonOptionsFactory.cs b/src/Cli/dotnet/CommonOptionsFactory.cs
index f776cd47712a..c5902ece275f 100644
--- a/src/Cli/dotnet/CommonOptionsFactory.cs
+++ b/src/Cli/dotnet/CommonOptionsFactory.cs
@@ -1,9 +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
-
 using System.CommandLine;
+using System.CommandLine.Invocation;
+using System.CommandLine.Parsing;
+using Microsoft.DotNet.Cli.Extensions;
+using Microsoft.DotNet.Cli.Utils;
 
 namespace Microsoft.DotNet.Cli;
 
@@ -21,4 +23,26 @@ internal static class CommonOptionsFactory
         Recursive = recursive,
         Arity = ArgumentArity.Zero
     };
+
+    internal class SetDiagnosticModeAction(Option<bool> diagnosticOption) : SynchronousCommandLineAction
+    {
+        public override int Invoke(ParseResult parseResult)
+        {
+            if (parseResult.IsDotnetBuiltInCommand())
+            {
+                var diagIsChildOfRoot = parseResult.RootCommandResult.Children.FirstOrDefault((s) => s is OptionResult opt && opt.Option == diagnosticOption) is not null;
+
+                // We found --diagnostic or -d, but we still need to determine whether the option should
+                // be attached to the dotnet command or the subcommand.
+                if (diagIsChildOfRoot)
+                {
+                    Environment.SetEnvironmentVariable(CommandLoggingContext.Variables.Verbose, bool.TrueString);
+                    CommandLoggingContext.SetVerbose(true);
+                    Reporter.Reset();
+                }
+            }
+
+            return 0;
+        }
+    }
 }
diff --git a/src/Cli/dotnet/Extensions/ParseResultExtensions.cs b/src/Cli/dotnet/Extensions/ParseResultExtensions.cs
index cab013fb6267..39235857e7a1 100644
--- a/src/Cli/dotnet/Extensions/ParseResultExtensions.cs
+++ b/src/Cli/dotnet/Extensions/ParseResultExtensions.cs
@@ -1,8 +1,6 @@
 // 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 System.CommandLine.Parsing;
 using System.Diagnostics;
@@ -17,21 +15,21 @@ namespace Microsoft.DotNet.Cli.Extensions;
 
 public static class ParseResultExtensions
 {
-    ///<summary>
+    /// <summary>
     /// Finds the command of the parse result and invokes help for that command.
     /// If no command is specified, invokes help for the application.
-    ///<summary>
-    ///<remarks>
+    /// <summary>
+    /// <remarks>
     /// This is accomplished by finding a set of tokens that should be valid and appending a help token
     /// to that list, then re-parsing the list of tokens. This is not ideal - either we should have a direct way
     /// of invoking help for a ParseResult, or we should eliminate this custom, ad-hoc help invocation by moving
     /// more situations that want to show help into Parsing Errors (which trigger help in the default System.CommandLine pipeline)
     /// or custom Invocation Middleware, so we can more easily create our version of a HelpResult type.
-    ///</remarks>
+    /// </remarks>
     public static void ShowHelp(this ParseResult parseResult)
     {
-        // take from the start of the list until we hit an option/--/unparsed token
-        // since commands can have arguments, we must take those as well in order to get accurate help
+        // Take from the start of the list until we hit an option/--/unparsed token.
+        // Since commands can have arguments, we must take those as well in order to get accurate help.
         var tokenList = parseResult.Tokens.TakeWhile(token => token.Type == TokenType.Argument || token.Type == TokenType.Command || token.Type == TokenType.Directive).Select(t => t.Value).ToList();
         tokenList.Add("-h");
         Instance.Parse(tokenList).Invoke();
@@ -57,14 +55,17 @@ public static void ShowHelpOrErrorIfAppropriate(this ParseResult parseResult)
             }
         }
 
-        ///<summary>Splits a .NET format string by the format placeholders (the {N} parts) to get an array of the literal parts, to be used in message-checking</summary>
+        /// <summary>
+        /// Splits a .NET format string by the format placeholders (the {N} parts) to get an array of the literal parts, to be used in message-checking.
+        /// </summary>
         static string[] DistinctFormatStringParts(string formatString)
         {
             return Regex.Split(formatString, @"{[0-9]+}"); // match the literal '{', followed by any of 0-9 one or more times, followed by the literal '}'
         }
 
-
-        /// <summary>given a string and a series of parts, ensures that all parts are present in the string in sequential order</summary>
+        /// <summary>
+        /// Given a string and a series of parts, ensures that all parts are present in the string in sequential order.
+        /// </summary>
         static bool ErrorContainsAllParts(ReadOnlySpan<char> error, string[] parts)
         {
             foreach (var part in parts)
@@ -86,9 +87,12 @@ static bool ErrorContainsAllParts(ReadOnlySpan<char> error, string[] parts)
 
     public static string RootSubCommandResult(this ParseResult parseResult)
     {
-        return parseResult.RootCommandResult.Children?
-            .Select(child => GetSymbolResultValue(parseResult, child))
-            .FirstOrDefault(subcommand => !string.IsNullOrEmpty(subcommand)) ?? string.Empty;
+        CommandResult commandResult = parseResult.CommandResult;
+        while (commandResult != parseResult.RootCommandResult && commandResult.Parent is CommandResult parentCommand)
+        {
+            commandResult = parentCommand;
+        }
+        return commandResult.Command.Name;
     }
 
     public static bool IsDotnetBuiltInCommand(this ParseResult parseResult)
@@ -102,12 +106,7 @@ public static bool IsTopLevelDotnetCommand(this ParseResult parseResult)
         return parseResult.CommandResult.Command.Equals(Parser.RootCommand) && string.IsNullOrEmpty(parseResult.RootSubCommandResult());
     }
 
-    public static bool CanBeInvoked(this ParseResult parseResult)
-    {
-        return GetBuiltInCommand(parseResult.RootSubCommandResult()) != null ||
-            parseResult.Tokens.Any(token => token.Type == TokenType.Directive) ||
-            (parseResult.IsTopLevelDotnetCommand() && string.IsNullOrEmpty(parseResult.GetValue(DotnetSubCommand)));
-    }
+    public static bool CanBeInvoked(this ParseResult parseResult) => parseResult.Action is not null;
 
     public static int HandleMissingCommand(this ParseResult parseResult)
     {
@@ -164,19 +163,12 @@ public static bool DiagOptionPrecedesSubcommand(this string[] args, string subCo
         return false;
     }
 
-    private static string GetSymbolResultValue(ParseResult parseResult, SymbolResult symbolResult) => symbolResult switch
-    {
-        CommandResult commandResult => commandResult.Command.Name,
-        ArgumentResult argResult => argResult.Tokens.FirstOrDefault()?.Value ?? string.Empty,
-        _ => parseResult.GetResult(DotnetSubCommand)?.GetValueOrDefault<string>()
-    };
-
     public static bool BothArchAndOsOptionsSpecified(this ParseResult parseResult) =>
         (parseResult.HasOption(CommonOptions.ArchitectureOption) ||
         parseResult.HasOption(CommonOptions.LongFormArchitectureOption)) &&
         parseResult.HasOption(CommonOptions.OperatingSystemOption);
 
-    internal static string GetCommandLineRuntimeIdentifier(this ParseResult parseResult)
+    internal static string? GetCommandLineRuntimeIdentifier(this ParseResult parseResult)
     {
         return parseResult.HasOption(CommonOptions.RuntimeOptionName) ?
             parseResult.GetValue<string>(CommonOptions.RuntimeOptionName) :
@@ -191,7 +183,7 @@ internal static string GetCommandLineRuntimeIdentifier(this ParseResult parseRes
 
     public static bool UsingRunCommandShorthandProjectOption(this ParseResult parseResult)
     {
-        if (parseResult.HasOption(RunCommandParser.PropertyOption) && parseResult.GetValue(RunCommandParser.PropertyOption).Any())
+        if (parseResult.HasOption(RunCommandParser.PropertyOption) && (parseResult.GetValue(RunCommandParser.PropertyOption)?.Any() ?? false))
         {
             var projVals = parseResult.GetRunCommandShorthandProjectValues();
             if (projVals.Any())
@@ -227,7 +219,7 @@ private static IEnumerable<string> GetRunPropertyOptions(ParseResult parseResult
         var propertyValues = propertyOptions.SelectMany(o => o.Tokens.Select(t => t.Value)).ToArray();
         return propertyValues;
 
-        static Token GetOptionTokenOrDefault(SymbolResult symbolResult)
+        static Token? GetOptionTokenOrDefault(SymbolResult symbolResult)
         {
             if (symbolResult is not OptionResult optionResult)
             {
@@ -249,11 +241,11 @@ public static void HandleDebugSwitch(this ParseResult parseResult)
 
     /// <summary>
     /// Only returns the value for this option if the option is present and there are no parse errors for that option.
-    /// This allows cross-cutting code like the telemetry filters to safely get the value without throwing on null-ref errors.
+    /// This allows cross-cutting code like the _telemetry filters to safely get the value without throwing on null-ref errors.
     /// If you are inside a command handler or 'normal' System.CommandLine code then you don't need this - the parse error handling
     /// will have covered these cases.
     /// </summary>
-    public static T SafelyGetValueForOption<T>(this ParseResult parseResult, Option<T> optionToGet)
+    public static T? SafelyGetValueForOption<T>(this ParseResult parseResult, Option<T> optionToGet)
     {
         if (parseResult.GetResult(optionToGet) is OptionResult optionResult &&
             !parseResult.Errors.Any(e => e.SymbolResult == optionResult))
diff --git a/src/Cli/dotnet/Parser.cs b/src/Cli/dotnet/Parser.cs
index ec6bff87d7e9..1352b2b03833 100644
--- a/src/Cli/dotnet/Parser.cs
+++ b/src/Cli/dotnet/Parser.cs
@@ -1,8 +1,6 @@
 // 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 System.CommandLine.Completions;
 using System.CommandLine.Invocation;
@@ -101,14 +99,44 @@ public static class Parser
 
     public static readonly Option<bool> VersionOption = new("--version")
     {
-        Arity = ArgumentArity.Zero
+        Arity = ArgumentArity.Zero,
+        Action = new PrintVersionAction()
     };
 
+    internal class PrintVersionAction : SynchronousCommandLineAction
+    {
+        public PrintVersionAction()
+        {
+            Terminating = true;
+        }
+
+        public override int Invoke(ParseResult parseResult)
+        {
+            CommandLineInfo.PrintVersion();
+            return 0;
+        }
+    }
+
     public static readonly Option<bool> InfoOption = new("--info")
     {
-        Arity = ArgumentArity.Zero
+        Arity = ArgumentArity.Zero,
+        Action = new PrintInfoAction()
     };
 
+    internal class PrintInfoAction : SynchronousCommandLineAction
+    {
+        public PrintInfoAction()
+        {
+            Terminating = true;
+        }
+
+        public override int Invoke(ParseResult parseResult)
+        {
+            CommandLineInfo.PrintInfo();
+            return 0;
+        }
+    }
+
     public static readonly Option<bool> ListSdksOption = new("--list-sdks")
     {
         Arity = ArgumentArity.Zero
@@ -191,14 +219,14 @@ private static Command ConfigureCommandLine(RootCommand rootCommand)
         return rootCommand;
     }
 
-    public static Command GetBuiltInCommand(string commandName) =>
+    public static Command? GetBuiltInCommand(string commandName) =>
         Subcommands.FirstOrDefault(c => c.Name.Equals(commandName, StringComparison.OrdinalIgnoreCase));
 
     /// <summary>
     /// Implements token-per-line response file handling for the CLI. We use this instead of the built-in S.CL handling
     /// to ensure backwards-compatibility with MSBuild.
     /// </summary>
-    public static bool TokenPerLine(string tokenToReplace, out IReadOnlyList<string> replacementTokens, out string errorMessage)
+    public static bool TokenPerLine(string tokenToReplace, out IReadOnlyList<string>? replacementTokens, out string? errorMessage)
     {
         var filePath = Path.GetFullPath(tokenToReplace);
         if (File.Exists(filePath))
@@ -231,7 +259,7 @@ public static bool TokenPerLine(string tokenToReplace, out IReadOnlyList<string>
         ResponseFileTokenReplacer = TokenPerLine
     };
 
-    internal static int ExceptionHandler(Exception exception, ParseResult parseResult)
+    internal static int ExceptionHandler(Exception? exception, ParseResult parseResult)
     {
         if (exception is TargetInvocationException)
         {
@@ -251,13 +279,13 @@ internal static int ExceptionHandler(Exception exception, ParseResult parseResul
                 exception.Message.Red().Bold());
             parseResult.ShowHelp();
         }
-        else if (exception.GetType().Name.Equals("WorkloadManifestCompositionException"))
+        else if (exception is not null && exception.GetType().Name.Equals("WorkloadManifestCompositionException"))
         {
             Reporter.Error.WriteLine(CommandLoggingContext.IsVerbose ?
                 exception.ToString().Red().Bold() :
                 exception.Message.Red().Bold());
         }
-        else
+        else if (exception is not null)
         {
             Reporter.Error.Write("Unhandled exception: ".Red().Bold());
             Reporter.Error.WriteLine(CommandLoggingContext.IsVerbose ?
@@ -345,7 +373,7 @@ public override void Write(HelpContext context)
             }
             else if (command.Name.Equals(FormatCommandParser.GetCommand().Name))
             {
-                var arguments = context.ParseResult.GetValue(FormatCommandParser.Arguments);
+                var arguments = context.ParseResult.GetValue(FormatCommandParser.Arguments) ?? [];
                 new FormatForwardingApp([.. arguments, .. helpArgs]).Execute();
             }
             else if (command.Name.Equals(FsiCommandParser.GetCommand().Name))
@@ -372,9 +400,9 @@ public override void Write(HelpContext context)
             {
                 if (command.Name.Equals(ListReferenceCommandParser.GetCommand().Name))
                 {
-                    Command listCommand = command.Parents.Single() as Command;
+                    Command? listCommand = command.Parents.Single() as Command;
 
-                    for (int i = 0; i < listCommand.Arguments.Count; i++)
+                    for (int i = 0; i < listCommand?.Arguments.Count; i++)
                     {
                         if (listCommand.Arguments[i].Name == CliStrings.SolutionOrProjectArgumentName)
                         {
@@ -405,6 +433,7 @@ internal PrintCliSchemaAction()
         {
             Terminating = true;
         }
+
         public override int Invoke(ParseResult parseResult)
         {
             CliSchema.PrintCliSchema(parseResult.CommandResult, parseResult.Configuration.Output, Program.TelemetryClient);
diff --git a/src/Cli/dotnet/Program.cs b/src/Cli/dotnet/Program.cs
index fa3fc09973f0..5637aa22421e 100644
--- a/src/Cli/dotnet/Program.cs
+++ b/src/Cli/dotnet/Program.cs
@@ -1,8 +1,7 @@
 // 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 Azure.Monitor.OpenTelemetry.Exporter;
 using System.CommandLine;
 using System.CommandLine.Parsing;
 using System.Diagnostics;
@@ -18,18 +17,81 @@
 using Microsoft.DotNet.Configurer;
 using Microsoft.Extensions.EnvironmentAbstractions;
 using NuGet.Frameworks;
+using OpenTelemetry;
+using OpenTelemetry.Context.Propagation;
+using OpenTelemetry.Metrics;
+using OpenTelemetry.Resources;
+using OpenTelemetry.Trace;
 using CommandResult = System.CommandLine.Parsing.CommandResult;
 
 namespace Microsoft.DotNet.Cli;
 
 public class Program
 {
-    private static readonly string ToolPathSentinelFileName = $"{Product.Version}.toolpath.sentinel";
+    private static readonly string s_toolPathSentinelFileName = $"{Product.Version}.toolpath.sentinel";
+
+    public static ITelemetry TelemetryClient { get; }
+
+    // Create a new OpenTelemetry tracer provider and add the Azure Monitor trace exporter and the OTLP trace exporter.
+    // It is important to keep the TracerProvider instance active throughout the process lifetime.
+    private static readonly TracerProvider s_tracerProvider;
+
+    // Create a new OpenTelemetry meter provider and add the Azure Monitor metric exporter and the OTLP metric exporter.
+    // It is important to keep the MetricsProvider instance active throughout the process lifetime.
+    private static readonly MeterProvider s_metricsProvider;
+
+    private static readonly Activity? s_mainActivity;
+    private static readonly DateTime s_mainTimeStamp;
+    private static readonly PosixSignalRegistration s_sigIntRegistration;
+    private static readonly PosixSignalRegistration s_sigQuitRegistration;
+    private static readonly PosixSignalRegistration s_sigTermRegistration;
+
+    static Program()
+    {
+        s_mainTimeStamp = DateTime.Now;
+        s_sigIntRegistration = PosixSignalRegistration.Create(PosixSignal.SIGINT, Shutdown);
+        s_sigQuitRegistration = PosixSignalRegistration.Create(PosixSignal.SIGQUIT, Shutdown);
+        s_sigTermRegistration = PosixSignalRegistration.Create(PosixSignal.SIGTERM, Shutdown);
+        s_metricsProvider = Sdk.CreateMeterProviderBuilder()
+            .ConfigureResource(r =>
+            {
+                r.AddService("dotnet-cli", serviceVersion: Product.Version);
+            })
+            .AddMeter(Activities.Source.Name)
+            .AddHttpClientInstrumentation()
+            .AddRuntimeInstrumentation()
+            .AddOtlpExporter()
+            .Build();
+
+        s_tracerProvider = Sdk.CreateTracerProviderBuilder()
+            .ConfigureResource(r =>
+            {
+                r.AddService("dotnet-cli", serviceVersion: Product.Version);
+            })
+            .AddSource(Activities.Source.Name)
+            .AddHttpClientInstrumentation()
+            .AddOtlpExporter()
+            .AddAzureMonitorTraceExporter(o =>
+            {
+                o.ConnectionString = Telemetry.Telemetry.ConnectionString;
+                o.EnableLiveMetrics = false;
+                o.StorageDirectory = Path.Combine(CliFolderPathCalculator.DotnetUserProfileFolderPath, Telemetry.Telemetry.DefaultStorageFolderName);
+            })
+            .SetSampler(new AlwaysOnSampler())
+            .Build();
+
+        (var s_parentActivityContext, var s_activityKind) = DeriveParentActivityContextFromEnv();
+        s_mainActivity = Activities.Source.CreateActivity("main", s_activityKind, s_parentActivityContext);
+        s_mainActivity?.Start();
+        s_mainActivity?.SetStartTime(Process.GetCurrentProcess().StartTime);
+        TrackHostStartup(s_mainTimeStamp);
+        SetupMSBuildEnvironmentInvariants();
+        TelemetryClient = InitializeTelemetry();
+    }
 
-    public static ITelemetry TelemetryClient;
     public static int Main(string[] args)
     {
-        using AutomaticEncodingRestorer _ = new();
+        using AutomaticEncodingRestorer _encodingRestorer = new();
 
         // Setting output encoding is not available on those platforms
         if (UILanguageOverride.OperatingSystemSupportsUtf8())
@@ -39,292 +101,320 @@ public static int Main(string[] args)
 
         DebugHelper.HandleDebugSwitch(ref args);
 
-        // Capture the current timestamp to calculate the host overhead.
-        DateTime mainTimeStamp = DateTime.Now;
-        TimeSpan startupTime = mainTimeStamp - Process.GetCurrentProcess().StartTime;
-
-        bool perfLogEnabled = Env.GetEnvironmentVariableAsBool("DOTNET_CLI_PERF_LOG", false);
-
-        if (string.IsNullOrEmpty(Env.GetEnvironmentVariable("MSBUILDFAILONDRIVEENUMERATINGWILDCARD")))
-        {
-            Environment.SetEnvironmentVariable("MSBUILDFAILONDRIVEENUMERATINGWILDCARD", "1");
-        }
-
-        // Avoid create temp directory with root permission and later prevent access in non sudo
-        if (SudoEnvironmentDirectoryOverride.IsRunningUnderSudo())
-        {
-            perfLogEnabled = false;
-        }
+        InitializeProcess();
 
-        PerformanceLogStartupInformation startupInfo = null;
-        if (perfLogEnabled)
+        try
         {
-            startupInfo = new PerformanceLogStartupInformation(mainTimeStamp);
-            PerformanceLogManager.InitializeAndStartCleanup(FileSystemWrapper.Default);
+            return ProcessArgs(args);
         }
-
-        PerformanceLogEventListener perLogEventListener = null;
-        try
+        catch (Exception e) when (e.ShouldBeDisplayedAsError())
         {
-            if (perfLogEnabled)
-            {
-                perLogEventListener = PerformanceLogEventListener.Create(FileSystemWrapper.Default, PerformanceLogManager.Instance.CurrentLogDirectory);
-            }
+            Reporter.Error.WriteLine(CommandLoggingContext.IsVerbose
+                ? e.ToString().Red().Bold()
+                : e.Message.Red().Bold());
 
-            PerformanceLogEventSource.Log.LogStartUpInformation(startupInfo);
-            PerformanceLogEventSource.Log.CLIStart();
-
-            InitializeProcess();
-
-            try
+            if (e is CommandParsingException commandParsingException && commandParsingException.ParseResult != null)
             {
-                return ProcessArgs(args, startupTime);
+                commandParsingException.ParseResult.ShowHelp();
             }
-            catch (Exception e) when (e.ShouldBeDisplayedAsError())
-            {
-                Reporter.Error.WriteLine(CommandLoggingContext.IsVerbose
-                    ? e.ToString().Red().Bold()
-                    : e.Message.Red().Bold());
 
-                var commandParsingException = e as CommandParsingException;
-                if (commandParsingException != null && commandParsingException.ParseResult != null)
-                {
-                    commandParsingException.ParseResult.ShowHelp();
-                }
-
-                return 1;
-            }
-            catch (Exception e) when (!e.ShouldBeDisplayedAsError())
-            {
-                // If telemetry object has not been initialized yet. It cannot be collected
-                TelemetryEventEntry.SendFiltered(e);
-                Reporter.Error.WriteLine(e.ToString().Red().Bold());
+            return 1;
+        }
+        catch (Exception e) when (!e.ShouldBeDisplayedAsError())
+        {
+            // If _telemetry object has not been initialized yet. It cannot be collected
+            TelemetryEventEntry.SendFiltered(e);
+            Reporter.Error.WriteLine(e.ToString().Red().Bold());
 
-                return 1;
-            }
-            finally
-            {
-                PerformanceLogEventSource.Log.CLIStop();
-            }
+            return 1;
         }
         finally
         {
-            if (perLogEventListener != null)
-            {
-                perLogEventListener.Dispose();
-            }
+            Shutdown(default!);
         }
     }
 
-    internal static int ProcessArgs(string[] args)
+    public static void Shutdown(PosixSignalContext context)
     {
-        return ProcessArgs(args, new TimeSpan(0));
+        s_sigIntRegistration.Dispose();
+        s_sigQuitRegistration.Dispose();
+        s_sigTermRegistration.Dispose();
+        s_mainActivity?.Stop();
+        s_tracerProvider?.ForceFlush();
+        s_metricsProvider?.ForceFlush();
+        Activities.Source.Dispose();
     }
 
-    internal static int ProcessArgs(string[] args, TimeSpan startupTime)
+    /// <summary>
+    /// Uses the OpenTelemetrySDK's Propagation API to derive the parent activity context and kind
+    /// from the DOTNET_CLI_TRACEPARENT and DOTNET_CLI_TRACESTATE environment variables.
+    /// </summary>
+    private static (ActivityContext parentActivityContext, ActivityKind kind) DeriveParentActivityContextFromEnv()
     {
-        Dictionary<string, double> performanceData = [];
+        var traceParent = Env.GetEnvironmentVariable(Activities.DOTNET_CLI_TRACEPARENT);
+        var traceState = Env.GetEnvironmentVariable(Activities.DOTNET_CLI_TRACESTATE);
 
-        PerformanceLogEventSource.Log.BuiltInCommandParserStart();
-        ParseResult parseResult;
-        using (new PerformanceMeasurement(performanceData, "Parse Time"))
+        if (string.IsNullOrEmpty(traceParent))
         {
-            parseResult = Parser.Instance.Parse(args);
-
-            // Avoid create temp directory with root permission and later prevent access in non sudo
-            // This method need to be run very early before temp folder get created
-            // https://github.com/dotnet/sdk/issues/20195
-            SudoEnvironmentDirectoryOverride.OverrideEnvironmentVariableToTmp(parseResult);
+            return (default, ActivityKind.Internal);
         }
-        PerformanceLogEventSource.Log.BuiltInCommandParserStop();
 
-        using (IFirstTimeUseNoticeSentinel disposableFirstTimeUseNoticeSentinel = new FirstTimeUseNoticeSentinel())
+        var carrierMap = new Dictionary<string, IEnumerable<string>?> { { "traceparent", [traceParent] } };
+        if (!string.IsNullOrEmpty(traceState))
         {
-            IFirstTimeUseNoticeSentinel firstTimeUseNoticeSentinel = disposableFirstTimeUseNoticeSentinel;
-            IAspNetCertificateSentinel aspNetCertificateSentinel = new AspNetCertificateSentinel();
-            IFileSentinel toolPathSentinel = new FileSentinel(new FilePath(Path.Combine(CliFolderPathCalculator.DotnetUserProfileFolderPath, ToolPathSentinelFileName)));
-
-            PerformanceLogEventSource.Log.TelemetryRegistrationStart();
-
-            TelemetryClient ??= new Telemetry.Telemetry(firstTimeUseNoticeSentinel);
-            TelemetryEventEntry.Subscribe(TelemetryClient.TrackEvent);
-            TelemetryEventEntry.TelemetryFilter = new TelemetryFilter(Sha256Hasher.HashWithNormalizedCasing);
+            carrierMap.Add("tracestate", [traceState]);
+        }
 
-            PerformanceLogEventSource.Log.TelemetryRegistrationStop();
+        // Use the OpenTelemetry Propagator to extract the parent activity context and kind. For some reason this isn't set by the OTel SDK like docs say it should be.
+        Sdk.SetDefaultTextMapPropagator(new CompositeTextMapPropagator([
+            new TraceContextPropagator(),
+            new BaggagePropagator()
+        ]));
+        var parentActivityContext = Propagators.DefaultTextMapPropagator.Extract(default, carrierMap, GetValueFromCarrier);
+        var kind = parentActivityContext.ActivityContext.IsRemote ? ActivityKind.Server : ActivityKind.Internal;
 
-            if (parseResult.GetValue(Parser.DiagOption) && parseResult.IsDotnetBuiltInCommand())
-            {
-                // We found --diagnostic or -d, but we still need to determine whether the option should
-                // be attached to the dotnet command or the subcommand.
-                if (args.DiagOptionPrecedesSubcommand(parseResult.RootSubCommandResult()))
-                {
-                    Environment.SetEnvironmentVariable(CommandLoggingContext.Variables.Verbose, bool.TrueString);
-                    CommandLoggingContext.SetVerbose(true);
-                    Reporter.Reset();
-                }
-            }
-            if (parseResult.HasOption(Parser.VersionOption) && parseResult.IsTopLevelDotnetCommand())
-            {
-                CommandLineInfo.PrintVersion();
-                return 0;
-            }
-            else if (parseResult.HasOption(Parser.InfoOption) && parseResult.IsTopLevelDotnetCommand())
-            {
-                CommandLineInfo.PrintInfo();
-                return 0;
-            }
-            else
-            {
-                PerformanceLogEventSource.Log.FirstTimeConfigurationStart();
+        return (parentActivityContext.ActivityContext, kind);
 
-                var environmentProvider = new EnvironmentProvider();
+        static IEnumerable<string>? GetValueFromCarrier(Dictionary<string, IEnumerable<string>?> carrier, string key)
+        {
+            return carrier.TryGetValue(key, out var value) ? value : null;
+        }
+    }
 
-                bool generateAspNetCertificate = environmentProvider.GetEnvironmentVariableAsBool(EnvironmentVariableNames.DOTNET_GENERATE_ASPNET_CERTIFICATE, defaultValue: true);
-                bool telemetryOptout = environmentProvider.GetEnvironmentVariableAsBool(EnvironmentVariableNames.TELEMETRY_OPTOUT, defaultValue: CompileOptions.TelemetryOptOutDefault);
-                bool addGlobalToolsToPath = environmentProvider.GetEnvironmentVariableAsBool(EnvironmentVariableNames.DOTNET_ADD_GLOBAL_TOOLS_TO_PATH, defaultValue: true);
-                bool nologo = environmentProvider.GetEnvironmentVariableAsBool(EnvironmentVariableNames.DOTNET_NOLOGO, defaultValue: false);
-                bool skipWorkloadIntegrityCheck = environmentProvider.GetEnvironmentVariableAsBool(EnvironmentVariableNames.DOTNET_SKIP_WORKLOAD_INTEGRITY_CHECK,
-                    // Default the workload integrity check skip to true if the command is being ran in CI. Otherwise, false.
-                    defaultValue: new CIEnvironmentDetectorForTelemetry().IsCIEnvironment());
+    private static void TrackHostStartup(DateTime mainTimeStamp)
+    {
+        var hostStartupActivity = Activities.Source.StartActivity("host-startup");
+        hostStartupActivity?.SetStartTime(Process.GetCurrentProcess().StartTime);
+        hostStartupActivity?.SetEndTime(mainTimeStamp);
+        hostStartupActivity?.SetStatus(ActivityStatusCode.Ok);
+        hostStartupActivity?.Dispose();
+    }
 
-                ReportDotnetHomeUsage(environmentProvider);
+    /// <summary>
+    /// We have some behaviors in MSBuild that we want to enforce (either when using MSBuild API or by shelling out to it),
+    /// so we set those ASAP as globally as possible.
+    /// </summary>
+    private static void SetupMSBuildEnvironmentInvariants()
+    {
+        if (string.IsNullOrEmpty(Env.GetEnvironmentVariable("MSBUILDFAILONDRIVEENUMERATINGWILDCARD")))
+        {
+            Environment.SetEnvironmentVariable("MSBUILDFAILONDRIVEENUMERATINGWILDCARD", "1");
+        }
+    }
 
-                var isDotnetBeingInvokedFromNativeInstaller = false;
-                if (parseResult.CommandResult.Command.Name.Equals(Parser.InstallSuccessCommand.Name))
-                {
-                    aspNetCertificateSentinel = new NoOpAspNetCertificateSentinel();
-                    firstTimeUseNoticeSentinel = new NoOpFirstTimeUseNoticeSentinel();
-                    toolPathSentinel = new NoOpFileSentinel(exists: false);
-                    isDotnetBeingInvokedFromNativeInstaller = true;
-                }
+    private static string GetCommandName(ParseResult r)
+    {
+        if (r.Action is Parser.PrintVersionAction)
+        {
+            // If the action is PrintVersionAction, we return the command name as "dotnet --version"
+            return "dotnet --version";
+        }
+        else if (r.Action is Parser.PrintInfoAction)
+        {
+            // If the action is PrintHelpAction, we return the command name as "dotnet --help"
+            return "dotnet --info";
+        }
 
-                var dotnetFirstRunConfiguration = new DotnetFirstRunConfiguration(
-                    generateAspNetCertificate: generateAspNetCertificate,
-                    telemetryOptout: telemetryOptout,
-                    addGlobalToolsToPath: addGlobalToolsToPath,
-                    nologo: nologo,
-                    skipWorkloadIntegrityCheck: skipWorkloadIntegrityCheck);
-
-                string[] getStarOperators = ["getProperty", "getItem", "getTargetResult"];
-                char[] switchIndicators = ['-', '/'];
-                var getStarOptionPassed = parseResult.CommandResult.Tokens.Any(t =>
-                    getStarOperators.Any(o =>
-                    switchIndicators.Any(i => t.Value.StartsWith(i + o, StringComparison.OrdinalIgnoreCase))));
-
-                ConfigureDotNetForFirstTimeUse(
-                    firstTimeUseNoticeSentinel,
-                    aspNetCertificateSentinel,
-                    toolPathSentinel,
-                    isDotnetBeingInvokedFromNativeInstaller,
-                    dotnetFirstRunConfiguration,
-                    environmentProvider,
-                    performanceData,
-                    skipFirstTimeUseCheck: getStarOptionPassed);
-                PerformanceLogEventSource.Log.FirstTimeConfigurationStop();
-            }
+        // Walk the parent command tree to find the top-level command name and get the full command name for this parseresult.
+        List<string> parentNames = [r.CommandResult.Command.Name];
+        var current = r.CommandResult.Parent;
+        while (current is CommandResult parentCommandResult)
+        {
+            parentNames.Add(parentCommandResult.Command.Name);
+            current = parentCommandResult.Parent;
         }
+        parentNames.Reverse();
+        return string.Join(' ', parentNames);
+    }
 
-        if (CommandLoggingContext.IsVerbose)
+    private static void SetDisplayName(Activity? activity, ParseResult parseResult)
+    {
+        if (activity == null)
         {
-            Console.WriteLine($"Telemetry is: {(TelemetryClient.Enabled ? "Enabled" : "Disabled")}");
+            return;
         }
-        PerformanceLogEventSource.Log.TelemetrySaveIfEnabledStart();
-        performanceData.Add("Startup Time", startupTime.TotalMilliseconds);
-        TelemetryEventEntry.SendFiltered(Tuple.Create(parseResult, performanceData));
-        PerformanceLogEventSource.Log.TelemetrySaveIfEnabledStop();
+        var name = GetCommandName(parseResult);
+
+        // Set the display name to the full command name
+        activity.DisplayName = name;
+
+        // Set the command name as an attribute for better filtering in _telemetry
+        activity.SetTag("command.name", name);
+    }
+
+    internal static int ProcessArgs(string[] args)
+    {
+        ParseResult parseResult = ParseArgs(args);
+        SetupDotnetFirstRun(parseResult);
 
-        int exitCode;
         if (parseResult.CanBeInvoked())
         {
-            InvokeBuiltInCommand(parseResult, out exitCode);
+            InvokeBuiltInCommand(parseResult, out var exitCode);
+            return exitCode;
         }
         else
         {
-            PerformanceLogEventSource.Log.ExtensibleCommandResolverStart();
             try
             {
-                string commandName = "dotnet-" + parseResult.GetValue(Parser.DotnetSubCommand);
-                var resolvedCommandSpec = CommandResolver.TryResolveCommandSpec(
-                    new DefaultCommandResolverPolicy(),
-                    commandName,
-                    args.GetSubArguments(),
-                    FrameworkConstants.CommonFrameworks.NetStandardApp15);
-
-                if (resolvedCommandSpec is null && TryRunFileBasedApp(parseResult) is { } fileBasedAppExitCode)
-                {
-                    exitCode = fileBasedAppExitCode;
-                }
-                else
-                {
-                    var resolvedCommand = CommandFactoryUsingResolver.CreateOrThrow(commandName, resolvedCommandSpec);
-                    PerformanceLogEventSource.Log.ExtensibleCommandResolverStop();
-
-                    PerformanceLogEventSource.Log.ExtensibleCommandStart();
-                    var result = resolvedCommand.Execute();
-                    PerformanceLogEventSource.Log.ExtensibleCommandStop();
-
-                    exitCode = result.ExitCode;
-                }
+                return LookupAndExecuteCommand(args, parseResult);
             }
             catch (CommandUnknownException e)
             {
                 Reporter.Error.WriteLine(e.Message.Red());
                 Reporter.Output.WriteLine(e.InstructionMessage);
-                exitCode = 1;
+                return 1;
             }
         }
+    }
 
-        PerformanceLogEventSource.Log.TelemetryClientFlushStart();
-        TelemetryClient.Flush();
-        PerformanceLogEventSource.Log.TelemetryClientFlushStop();
-
-        TelemetryClient.Dispose();
+    private static int LookupAndExecuteCommand(string[] args, ParseResult parseResult)
+    {
+        var lookupExternalCommandActivity = Activities.Source.StartActivity("lookup-external-command");
+        string commandName = "dotnet-" + parseResult.GetValue(Parser.DotnetSubCommand);
+        var resolvedCommandSpec = CommandResolver.TryResolveCommandSpec(
+            new DefaultCommandResolverPolicy(),
+            commandName,
+            args.GetSubArguments(),
+            FrameworkConstants.CommonFrameworks.NetStandardApp15);
+        lookupExternalCommandActivity?.Dispose();
+        
+        if (resolvedCommandSpec is null && TryRunFileBasedApp(parseResult) is { } fileBasedAppExitCode)
+        {
+            lookupExternalCommandActivity?.Dispose();
+            return fileBasedAppExitCode;
+        }
+        else
+        {
+            var resolvedCommand = CommandFactoryUsingResolver.CreateOrThrow(commandName, resolvedCommandSpec);
+            lookupExternalCommandActivity?.Dispose();
+            
+            using var _executionActivity = Activities.Source.StartActivity("execute-extensible-command");
+            var result = resolvedCommand.Execute();
+            return result.ExitCode;
+        }
+    }
 
-        return exitCode;
+    private static void InvokeBuiltInCommand(ParseResult parseResult, out int exitCode)
+    {
+        Debug.Assert(parseResult.CanBeInvoked());
+        using var _invocationActivity = Activities.Source.StartActivity("invocation");
+        try
+        {
+            exitCode = parseResult.Invoke();
+            exitCode = AdjustExitCode(parseResult, exitCode);
+        }
+        catch (Exception exception)
+        {
+            exitCode = Parser.ExceptionHandler(exception, parseResult);
+        }
+    }
 
-        static int? TryRunFileBasedApp(ParseResult parseResult)
+    private static int? TryRunFileBasedApp(ParseResult parseResult)
+    {
+        // If we didn't match any built-in commands, and a C# file path is the first argument,
+        // parse as `dotnet run file.cs ..rest_of_args` instead.
+        if (parseResult.CommandResult.Command is RootCommand
+            && parseResult.GetValue(Parser.DotnetSubCommand) is { } unmatchedCommandOrFile
+            && VirtualProjectBuildingCommand.IsValidEntryPointPath(unmatchedCommandOrFile))
         {
-            // If we didn't match any built-in commands, and a C# file path is the first argument,
-            // parse as `dotnet run file.cs ..rest_of_args` instead.
-            if (parseResult.CommandResult.Command is RootCommand
-                && parseResult.GetValue(Parser.DotnetSubCommand) is { } unmatchedCommandOrFile
-                && VirtualProjectBuildingCommand.IsValidEntryPointPath(unmatchedCommandOrFile))
+            List<string> otherTokens = new(parseResult.Tokens.Count - 1);
+            foreach (var token in parseResult.Tokens)
             {
-                List<string> otherTokens = new(parseResult.Tokens.Count - 1);
-                foreach (var token in parseResult.Tokens)
+                if (token.Type != TokenType.Argument || token.Value != unmatchedCommandOrFile)
                 {
-                    if (token.Type != TokenType.Argument || token.Value != unmatchedCommandOrFile)
-                    {
-                        otherTokens.Add(token.Value);
-                    }
+                    otherTokens.Add(token.Value);
                 }
-                parseResult = Parser.Instance.Parse(["run", unmatchedCommandOrFile, .. otherTokens]);
-
-                InvokeBuiltInCommand(parseResult, out var exitCode);
-                return exitCode;
             }
+            parseResult = Parser.Instance.Parse(["run", unmatchedCommandOrFile, .. otherTokens]);
 
-            return null;
+            InvokeBuiltInCommand(parseResult, out var exitCode);
+            return exitCode;
         }
 
-        static void InvokeBuiltInCommand(ParseResult parseResult, out int exitCode)
+        return null;
+    }
+
+    private static ITelemetry InitializeTelemetry()
+    {
+        var telemetryClient = new Telemetry.Telemetry();
+        TelemetryEventEntry.Subscribe(telemetryClient.TrackEvent);
+        TelemetryEventEntry.TelemetryFilter = new TelemetryFilter(Sha256Hasher.HashWithNormalizedCasing);
+
+        if (CommandLoggingContext.IsVerbose)
         {
-            Debug.Assert(parseResult.CanBeInvoked());
+            Console.WriteLine($"Telemetry is: {(telemetryClient.Enabled ? "Enabled" : "Disabled")}");
+        }
 
-            PerformanceLogEventSource.Log.BuiltInCommandStart();
+        return telemetryClient;
+    }
 
-            try
-            {
-                exitCode = parseResult.Invoke();
-                exitCode = AdjustExitCode(parseResult, exitCode);
-            }
-            catch (Exception exception)
-            {
-                exitCode = Parser.ExceptionHandler(exception, parseResult);
-            }
+    private static ParseResult ParseArgs(string[] args)
+    {
+        ParseResult parseResult;
+        using (var _parseActivity = Activities.Source.StartActivity("parse"))
+        {
+            parseResult = Parser.Instance.Parse(args);
 
-            PerformanceLogEventSource.Log.BuiltInCommandStop();
+            // Avoid create temp directory with root permission and later prevent access in non sudo
+            // This method need to be run very early before temp folder get created
+            // https://github.com/dotnet/sdk/issues/20195
+            SudoEnvironmentDirectoryOverride.OverrideEnvironmentVariableToTmp(parseResult);
         }
+
+        SetDisplayName(s_mainActivity, parseResult);
+
+        return parseResult;
+    }
+
+    private static void SetupDotnetFirstRun(ParseResult parseResult)
+    {
+        using var _ = Activities.Source.StartActivity("first-time-use");
+        IFirstTimeUseNoticeSentinel firstTimeUseNoticeSentinel = new FirstTimeUseNoticeSentinel();
+        IAspNetCertificateSentinel aspNetCertificateSentinel = new AspNetCertificateSentinel();
+        string toolPath = Path.Combine(CliFolderPathCalculator.DotnetUserProfileFolderPath, s_toolPathSentinelFileName);
+        IFileSentinel toolPathSentinel = new FileSentinel(new FilePath(toolPath));
+
+        var environmentProvider = new EnvironmentProvider();
+        bool generateAspNetCertificate = environmentProvider.GetEnvironmentVariableAsBool(EnvironmentVariableNames.DOTNET_GENERATE_ASPNET_CERTIFICATE, defaultValue: true);
+        bool telemetryOptout = environmentProvider.GetEnvironmentVariableAsBool(EnvironmentVariableNames.TELEMETRY_OPTOUT, defaultValue: CompileOptions.TelemetryOptOutDefault);
+        bool addGlobalToolsToPath = environmentProvider.GetEnvironmentVariableAsBool(EnvironmentVariableNames.DOTNET_ADD_GLOBAL_TOOLS_TO_PATH, defaultValue: true);
+        bool nologo = environmentProvider.GetEnvironmentVariableAsBool(EnvironmentVariableNames.DOTNET_NOLOGO, defaultValue: false);
+        bool skipWorkloadIntegrityCheck = environmentProvider.GetEnvironmentVariableAsBool(EnvironmentVariableNames.DOTNET_SKIP_WORKLOAD_INTEGRITY_CHECK,
+            // Default the workload integrity check skip to true if the command is being ran in CI. Otherwise, false.
+            defaultValue: new CIEnvironmentDetectorForTelemetry().IsCIEnvironment());
+
+        ReportDotnetHomeUsage(environmentProvider);
+
+        var isDotnetBeingInvokedFromNativeInstaller = false;
+        if (parseResult.CommandResult.Command.Name.Equals(Parser.InstallSuccessCommand.Name))
+        {
+            aspNetCertificateSentinel = new NoOpAspNetCertificateSentinel();
+            firstTimeUseNoticeSentinel = new NoOpFirstTimeUseNoticeSentinel();
+            toolPathSentinel = new NoOpFileSentinel(exists: false);
+            isDotnetBeingInvokedFromNativeInstaller = true;
+        }
+
+        var dotnetFirstRunConfiguration = new DotnetFirstRunConfiguration(
+            generateAspNetCertificate: generateAspNetCertificate,
+            telemetryOptout: telemetryOptout,
+            addGlobalToolsToPath: addGlobalToolsToPath,
+            nologo: nologo,
+            skipWorkloadIntegrityCheck: skipWorkloadIntegrityCheck);
+
+        string[] getStarOperators = ["getProperty", "getItem", "getTargetResult"];
+        char[] switchIndicators = ['-', '/'];
+        var getStarOptionPassed = parseResult.CommandResult.Tokens.Any(t =>
+            getStarOperators.Any(o =>
+            switchIndicators.Any(i => t.Value.StartsWith(i + o, StringComparison.OrdinalIgnoreCase))));
+
+        ConfigureDotNetForFirstTimeUse(
+            firstTimeUseNoticeSentinel,
+            aspNetCertificateSentinel,
+            toolPathSentinel,
+            isDotnetBeingInvokedFromNativeInstaller,
+            dotnetFirstRunConfiguration,
+            environmentProvider,
+            skipFirstTimeUseCheck: getStarOptionPassed);
     }
 
     private static int AdjustExitCode(ParseResult parseResult, int exitCode)
@@ -357,11 +447,7 @@ private static void ReportDotnetHomeUsage(IEnvironmentProvider provider)
             return;
         }
 
-        Reporter.Verbose.WriteLine(
-            string.Format(
-                LocalizableStrings.DotnetCliHomeUsed,
-                home,
-                CliFolderPathCalculator.DotnetHomeVariableName));
+        Reporter.Verbose.WriteLine(string.Format(LocalizableStrings.DotnetCliHomeUsed, home, CliFolderPathCalculator.DotnetHomeVariableName));
     }
 
     private static void ConfigureDotNetForFirstTimeUse(
@@ -371,7 +457,6 @@ private static void ConfigureDotNetForFirstTimeUse(
        bool isDotnetBeingInvokedFromNativeInstaller,
        DotnetFirstRunConfiguration dotnetFirstRunConfiguration,
        IEnvironmentProvider environmentProvider,
-       Dictionary<string, double> performanceMeasurements,
        bool skipFirstTimeUseCheck)
     {
         var isFirstTimeUse = !firstTimeUseNoticeSentinel.Exists() && !skipFirstTimeUseCheck;
@@ -387,7 +472,6 @@ private static void ConfigureDotNetForFirstTimeUse(
             dotnetFirstRunConfiguration,
             reporter,
             environmentPath,
-            performanceMeasurements,
             skipFirstTimeUseCheck: skipFirstTimeUseCheck);
 
         dotnetConfigurer.Configure();
diff --git a/src/Cli/dotnet/Telemetry/ExternalTelemetryProperties.cs b/src/Cli/dotnet/Telemetry/ExternalTelemetryProperties.cs
index a333f4127416..106e0e7facd0 100644
--- a/src/Cli/dotnet/Telemetry/ExternalTelemetryProperties.cs
+++ b/src/Cli/dotnet/Telemetry/ExternalTelemetryProperties.cs
@@ -10,7 +10,7 @@
 
 namespace Microsoft.DotNet.Cli.Telemetry;
 
-// Some properties we need for telemetry, that don't yet have suitable
+// Some properties we need for _telemetry, that don't yet have suitable
 // public API
 internal static class ExternalTelemetryProperties
 {
@@ -32,7 +32,7 @@ internal static string GetInstallationType()
         {
             return (string)Registry.GetValue(Key, ValueName, defaultValue: "");
         }
-        // Catch everything: this is for telemetry only.
+        // Catch everything: this is for _telemetry only.
         catch (Exception e)
         {
             Debug.Assert(e is ArgumentException | e is SecurityException | e is InvalidCastException);
@@ -64,7 +64,7 @@ internal static string GetProductType()
                 return productType.ToString("D", CultureInfo.InvariantCulture);
             }
         }
-        // Catch everything: this is for telemetry only
+        // Catch everything: this is for _telemetry only
         catch (Exception e)
         {
             Debug.Assert(false, $"Unexpected exception from GetProductInfo: ${e.GetType().Name}: ${e.Message}");
@@ -95,7 +95,7 @@ internal static string GetLibcRelease()
         {
             return Marshal.PtrToStringUTF8(gnu_get_libc_release());
         }
-        // Catch everything: this is for telemetry only
+        // Catch everything: this is for _telemetry only
         catch (Exception e)
         {
             Debug.Assert(e is DllNotFoundException || e is EntryPointNotFoundException);
@@ -119,7 +119,7 @@ internal static string GetLibcVersion()
         {
             return Marshal.PtrToStringUTF8(gnu_get_libc_version());
         }
-        // Catch everything: this is for telemetry only
+        // Catch everything: this is for _telemetry only
         catch (Exception e)
         {
             Debug.Assert(e is DllNotFoundException || e is EntryPointNotFoundException);
diff --git a/src/Cli/dotnet/Telemetry/ITelemetry.cs b/src/Cli/dotnet/Telemetry/ITelemetry.cs
index b8ee7c98e118..b85b3f7ccdd7 100644
--- a/src/Cli/dotnet/Telemetry/ITelemetry.cs
+++ b/src/Cli/dotnet/Telemetry/ITelemetry.cs
@@ -1,17 +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
 {
     bool Enabled { get; }
 
-    void TrackEvent(string eventName, IDictionary<string, string> properties, IDictionary<string, double> measurements);
-
-    void Flush();
-
-    void Dispose();
+    void TrackEvent(string eventName, IDictionary<string, string?>? properties, IDictionary<string, double>? measurements);
 }
diff --git a/src/Cli/dotnet/Telemetry/PersistenceChannel/BaseStorageService.cs b/src/Cli/dotnet/Telemetry/PersistenceChannel/BaseStorageService.cs
deleted file mode 100644
index 2966dfc205a8..000000000000
--- a/src/Cli/dotnet/Telemetry/PersistenceChannel/BaseStorageService.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-// 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 Microsoft.ApplicationInsights.Channel;
-
-namespace Microsoft.DotNet.Cli.Telemetry.PersistenceChannel;
-
-internal abstract class BaseStorageService
-{
-    /// <summary>
-    ///     Peeked transmissions dictionary (maps file name to its full path). Holds all the transmissions that were peeked.
-    /// </summary>
-    /// <remarks>
-    ///     Note: The value (=file's full path) is not required in the Storage implementation.
-    ///     If there was a concurrent Abstract Data Type Set it would have been used instead.
-    ///     However, since there is no concurrent Set, dictionary is used and the second value is ignored.
-    /// </remarks>
-    protected IDictionary<string, string> PeekedTransmissions;
-
-    /// <summary>
-    ///     Gets or sets the maximum size of the storage in bytes. When limit is reached, the Enqueue method will drop new
-    ///     transmissions.
-    /// </summary>
-    internal ulong CapacityInBytes { get; set; }
-
-    /// <summary>
-    ///     Gets or sets the maximum number of files. When limit is reached, the Enqueue method will drop new transmissions.
-    /// </summary>
-    internal uint MaxFiles { get; set; }
-
-    internal abstract string StorageDirectoryPath { get; }
-
-    /// <summary>
-    ///     Initializes the <see cref="BaseStorageService" />
-    /// </summary>
-    /// <param name="desireStorageDirectoryPath">A folder name. Under this folder all the transmissions will be saved.</param>
-    internal abstract void Init(string desireStorageDirectoryPath);
-
-    internal abstract StorageTransmission Peek();
-
-    internal abstract void Delete(StorageTransmission transmission);
-
-    internal abstract Task EnqueueAsync(Transmission transmission);
-
-    protected void OnPeekedItemDisposed(string fileName)
-    {
-        try
-        {
-            if (PeekedTransmissions.ContainsKey(fileName))
-            {
-                PeekedTransmissions.Remove(fileName);
-            }
-        }
-        catch (Exception e)
-        {
-            PersistenceChannelDebugLog.WriteException(e, "Failed to remove the item from storage items.");
-        }
-    }
-}
diff --git a/src/Cli/dotnet/Telemetry/PersistenceChannel/FixedSizeQueue.cs b/src/Cli/dotnet/Telemetry/PersistenceChannel/FixedSizeQueue.cs
deleted file mode 100644
index 4a80be224e9c..000000000000
--- a/src/Cli/dotnet/Telemetry/PersistenceChannel/FixedSizeQueue.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-// 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.PersistenceChannel;
-
-/// <summary>
-///     A light fixed size queue. If Enqueue is called and queue's limit has reached the last item will be removed.
-///     This data structure is thread safe.
-/// </summary>
-internal class FixedSizeQueue<T>
-{
-    private readonly int _maxSize;
-    private readonly Queue<T> _queue = new();
-    private readonly object _queueLockObj = new();
-
-    internal FixedSizeQueue(int maxSize)
-    {
-        _maxSize = maxSize;
-    }
-
-    internal void Enqueue(T item)
-    {
-        lock (_queueLockObj)
-        {
-            if (_queue.Count == _maxSize)
-            {
-                _queue.Dequeue();
-            }
-
-            _queue.Enqueue(item);
-        }
-    }
-
-    internal bool Contains(T item)
-    {
-        lock (_queueLockObj)
-        {
-            return _queue.Contains(item);
-        }
-    }
-}
diff --git a/src/Cli/dotnet/Telemetry/PersistenceChannel/FlushManager.cs b/src/Cli/dotnet/Telemetry/PersistenceChannel/FlushManager.cs
deleted file mode 100644
index 8d14b740cca0..000000000000
--- a/src/Cli/dotnet/Telemetry/PersistenceChannel/FlushManager.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-// 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 Microsoft.ApplicationInsights.Channel;
-using Microsoft.ApplicationInsights.Extensibility.Implementation;
-using IChannelTelemetry = Microsoft.ApplicationInsights.Channel.ITelemetry;
-
-namespace Microsoft.DotNet.Cli.Telemetry.PersistenceChannel;
-
-/// <summary>
-///     This class handles all the logic for flushing the In Memory buffer to the persistent storage.
-/// </summary>
-internal class FlushManager
-{
-    /// <summary>
-    ///     The storage that is used to persist all the transmissions.
-    /// </summary>
-    private readonly BaseStorageService _storage;
-
-    /// <summary>
-    ///     Initializes a new instance of the <see cref="FlushManager" /> class.
-    /// </summary>
-    /// <param name="storage">The storage that persists the telemetries.</param>
-    internal FlushManager(BaseStorageService storage)
-    {
-        _storage = storage;
-    }
-
-    /// <summary>
-    ///     Gets or sets the service endpoint.
-    /// </summary>
-    /// <remarks>
-    ///     Q: Why flushManager knows about the endpoint?
-    ///     A: Storage stores Transmission objects and Transmission objects contain the endpoint address.
-    /// </remarks>
-    internal Uri EndpointAddress { get; set; }
-
-    /// <summary>
-    ///     Persist the in-memory telemetry items.
-    /// </summary>
-    internal void Flush(IChannelTelemetry telemetryItem)
-    {
-        if (telemetryItem != null)
-        {
-            byte[] data = JsonSerializer.Serialize([telemetryItem]);
-            Transmission transmission = new(
-                EndpointAddress,
-                data,
-                "application/x-json-stream",
-                JsonSerializer.CompressionType);
-
-            _storage.EnqueueAsync(transmission).ConfigureAwait(false).GetAwaiter().GetResult();
-        }
-    }
-}
diff --git a/src/Cli/dotnet/Telemetry/PersistenceChannel/PersistenceChannel.cs b/src/Cli/dotnet/Telemetry/PersistenceChannel/PersistenceChannel.cs
deleted file mode 100644
index 69affdc523a8..000000000000
--- a/src/Cli/dotnet/Telemetry/PersistenceChannel/PersistenceChannel.cs
+++ /dev/null
@@ -1,114 +0,0 @@
-// 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 Microsoft.ApplicationInsights.Channel;
-using IChannelTelemetry = Microsoft.ApplicationInsights.Channel.ITelemetry;
-
-namespace Microsoft.DotNet.Cli.Telemetry.PersistenceChannel;
-
-/// <summary>
-///     Represents a communication channel for sending telemetry to Application Insights via HTTPS.
-/// </summary>
-internal sealed class PersistenceChannel : ITelemetryChannel
-{
-    internal const string TelemetryServiceEndpoint = "https://dc.services.visualstudio.com/v2/track";
-
-    private readonly FlushManager _flushManager;
-
-    private int _disposeCount;
-    private readonly BaseStorageService _storage;
-    private readonly PersistenceTransmitter _transmitter;
-
-    /// <summary>
-    ///     Initializes a new instance of the <see cref="PersistenceChannel" /> class.
-    /// </summary>
-    /// <param name="storageDirectoryPath">
-    ///     Full path of a directory name. Under this folder all the transmissions will be saved.
-    ///     Setting this value groups channels, even from different processes.
-    ///     If 2 (or more) channels has the same <c>storageFolderName</c> only one channel will perform the sending even if the
-    ///     channel is in a different process/AppDomain/Thread.
-    /// </param>
-    /// <param name="sendersCount">
-    ///     Defines the number of senders. A sender is a long-running thread that sends telemetry batches in intervals defined
-    ///     by <see cref="SendingInterval" />.
-    ///     So the amount of senders also defined the maximum amount of http channels opened at the same time.
-    /// </param>
-    public PersistenceChannel(string storageDirectoryPath = null, int sendersCount = 1)
-    {
-        _storage = new StorageService();
-        _storage.Init(storageDirectoryPath);
-        _transmitter = new PersistenceTransmitter(_storage, sendersCount);
-        _flushManager = new FlushManager(_storage);
-        EndpointAddress = TelemetryServiceEndpoint;
-    }
-
-    /// <summary>
-    ///     Gets or sets an interval between each successful sending.
-    /// </summary>
-    /// <remarks>
-    ///     On error scenario this value is ignored and the interval will be defined using an exponential back-off
-    ///     algorithm.
-    /// </remarks>
-    public TimeSpan? SendingInterval
-    {
-        get => _transmitter.SendingInterval;
-        set => _transmitter.SendingInterval = value;
-    }
-
-
-    /// <summary>
-    ///     Gets or sets the maximum amount of files allowed in storage. When the limit is reached telemetries will be dropped.
-    /// </summary>
-    public uint MaxTransmissionStorageFilesCapacity
-    {
-        get => _storage.MaxFiles;
-        set => _storage.MaxFiles = value;
-    }
-
-    /// <summary>
-    ///     This flag has no effect. But it is required by base class
-    /// </summary>
-    public bool? DeveloperMode { get; set; }
-
-    /// <summary>
-    ///     Gets or sets the HTTP address where the telemetry is sent.
-    /// </summary>
-    public string EndpointAddress
-    {
-        get => _flushManager.EndpointAddress.ToString();
-
-        set
-        {
-            string address = value ?? TelemetryServiceEndpoint;
-            _flushManager.EndpointAddress = new Uri(address);
-        }
-    }
-
-    /// <summary>
-    ///     Releases unmanaged and - optionally - managed resources.
-    /// </summary>
-    public void Dispose()
-    {
-        if (Interlocked.Increment(ref _disposeCount) == 1)
-        {
-            _transmitter?.Dispose();
-        }
-    }
-
-    /// <summary>
-    ///     Sends an instance of ITelemetry through the channel.
-    /// </summary>
-    public void Send(IChannelTelemetry item)
-    {
-        _flushManager.Flush(item);
-    }
-
-    /// <summary>
-    ///     No operation, send will always flush. So nothing will be in memory
-    /// </summary>
-    public void Flush()
-    {
-    }
-}
diff --git a/src/Cli/dotnet/Telemetry/PersistenceChannel/PersistenceChannelDebugLog.cs b/src/Cli/dotnet/Telemetry/PersistenceChannel/PersistenceChannelDebugLog.cs
deleted file mode 100644
index ff695b79e6c3..000000000000
--- a/src/Cli/dotnet/Telemetry/PersistenceChannel/PersistenceChannelDebugLog.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-// 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.Globalization;
-using Microsoft.DotNet.Cli.Utils;
-
-namespace Microsoft.DotNet.Cli.Telemetry.PersistenceChannel;
-
-internal static class PersistenceChannelDebugLog
-{
-    private static readonly bool _isEnabled = IsEnabledByEnvironment();
-
-    private static bool IsEnabledByEnvironment()
-    {
-        var environmentProvider = new EnvironmentProvider();
-        return environmentProvider.GetEnvironmentVariableAsBool("DOTNET_ENABLE_PERSISTENCE_CHANNEL_DEBUG_OUTPUT", false);
-    }
-
-    public static void WriteLine(string message)
-    {
-        if (_isEnabled)
-        {
-            Reporter.Output.WriteLine(message);
-        }
-    }
-
-    internal static void WriteException(Exception exception, string format, params string[] args)
-    {
-        var message = string.Format(CultureInfo.InvariantCulture, format, args);
-        WriteLine(string.Format(CultureInfo.InvariantCulture, "{0} Exception: {1}", message, exception.ToString()));
-    }
-}
diff --git a/src/Cli/dotnet/Telemetry/PersistenceChannel/PersistenceTransmitter.cs b/src/Cli/dotnet/Telemetry/PersistenceChannel/PersistenceTransmitter.cs
deleted file mode 100644
index 0cede405eb04..000000000000
--- a/src/Cli/dotnet/Telemetry/PersistenceChannel/PersistenceTransmitter.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-// 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.PersistenceChannel;
-
-/// <summary>
-///     Implements throttled and persisted transmission of telemetry to Application Insights.
-/// </summary>
-internal class PersistenceTransmitter : IDisposable
-{
-    /// <summary>
-    ///     The number of times this object was disposed.
-    /// </summary>
-    private int _disposeCount;
-
-    /// <summary>
-    ///     A list of senders that sends transmissions.
-    /// </summary>
-    private readonly List<Sender> _senders = [];
-
-    /// <summary>
-    ///     The storage that is used to persist all the transmissions.
-    /// </summary>
-    private readonly BaseStorageService _storage;
-
-    /// <summary>
-    ///     Initializes a new instance of the <see cref="PersistenceTransmitter" /> class.
-    /// </summary>
-    /// <param name="storage">The transmissions storage.</param>
-    /// <param name="sendersCount">The number of senders to create.</param>
-    /// <param name="createSenders">
-    ///     A boolean value that indicates if this class should try and create senders. This is a
-    ///     workaround for unit tests purposes only.
-    /// </param>
-    internal PersistenceTransmitter(BaseStorageService storage, int sendersCount, bool createSenders = true)
-    {
-        _storage = storage;
-        if (createSenders)
-        {
-            for (int i = 0; i < sendersCount; i++)
-            {
-                _senders.Add(new Sender(_storage, this));
-            }
-        }
-    }
-
-    /// <summary>
-    ///     Gets or sets the interval between each successful sending.
-    /// </summary>
-    internal TimeSpan? SendingInterval { get; set; }
-
-    /// <summary>
-    ///     Disposes the object.
-    /// </summary>
-    public void Dispose()
-    {
-        if (Interlocked.Increment(ref _disposeCount) == 1)
-        {
-            StopSenders();
-        }
-    }
-
-    /// <summary>
-    ///     Stops the senders.
-    /// </summary>
-    /// <remarks>As long as there is no Start implementation, this method should only be called from Dispose.</remarks>
-    private void StopSenders()
-    {
-        if (_senders == null)
-        {
-            return;
-        }
-
-        List<Task> stoppedTasks = [];
-        foreach (Sender sender in _senders)
-        {
-            stoppedTasks.Add(sender.StopAsync());
-        }
-
-        Task.WaitAll([.. stoppedTasks]);
-    }
-}
diff --git a/src/Cli/dotnet/Telemetry/PersistenceChannel/Sender.cs b/src/Cli/dotnet/Telemetry/PersistenceChannel/Sender.cs
deleted file mode 100644
index 6e0f7ceceaa9..000000000000
--- a/src/Cli/dotnet/Telemetry/PersistenceChannel/Sender.cs
+++ /dev/null
@@ -1,336 +0,0 @@
-// 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.Net;
-using System.Net.NetworkInformation;
-
-namespace Microsoft.DotNet.Cli.Telemetry.PersistenceChannel;
-
-/// <summary>
-///     Fetch transmissions from the storage and sends it.
-/// </summary>
-internal class Sender : IDisposable
-{
-    /// <summary>
-    ///     The default sending interval.
-    /// </summary>
-    private readonly TimeSpan _defaultSendingInterval;
-
-    /// <summary>
-    ///     A wait handle that flags the sender when to start sending again. The type is protected for unit test.
-    /// </summary>
-    protected readonly AutoResetEvent DelayHandler;
-
-    /// <summary>
-    ///     Holds the maximum time for the exponential back-off algorithm. The sending interval will grow on every HTTP
-    ///     Exception until this max value.
-    /// </summary>
-    private readonly TimeSpan _maxIntervalBetweenRetries = TimeSpan.FromHours(1);
-
-    /// <summary>
-    ///     When storage is empty it will be queried again after this interval.
-    ///     Decreasing to 5 sec to send first data (users and sessions).
-    /// </summary>
-    private readonly TimeSpan _sendingIntervalOnNoData = TimeSpan.FromSeconds(5);
-
-    /// <summary>
-    ///     A wait handle that is being set when Sender is no longer sending.
-    /// </summary>
-    private readonly AutoResetEvent _stoppedHandler;
-
-    /// <summary>
-    ///     The number of times this object was disposed.
-    /// </summary>
-    private int _disposeCount;
-
-    /// <summary>
-    ///     The amount of time to wait, in the stop method, until the last transmission is sent.
-    ///     If time expires, the stop method will return even if the transmission hasn't been sent.
-    /// </summary>
-    private readonly TimeSpan _drainingTimeout;
-
-    /// <summary>
-    ///     A boolean value that indicates if the sender should be stopped. The sender's while loop is checking this boolean
-    ///     value.
-    /// </summary>
-    private bool _stopped;
-
-    /// <summary>
-    ///     The transmissions storage.
-    /// </summary>
-    private readonly BaseStorageService _storage;
-
-    /// <summary>
-    ///     Holds the transmitter.
-    /// </summary>
-    private readonly PersistenceTransmitter _transmitter;
-
-    /// <summary>
-    ///     Initializes a new instance of the <see cref="Sender" /> class.
-    /// </summary>
-    /// <param name="storage">The storage that holds the transmissions to send.</param>
-    /// <param name="transmitter">
-    ///     The persistence transmitter that manages this Sender.
-    ///     The transmitter will be used as a configuration class, it exposes properties like SendingInterval that will be read
-    ///     by Sender.
-    /// </param>
-    /// <param name="startSending">
-    ///     A boolean value that determines if Sender should start sending immediately. This is only
-    ///     used for unit tests.
-    /// </param>
-    internal Sender(BaseStorageService storage, PersistenceTransmitter transmitter, bool startSending = true)
-    {
-        _stopped = false;
-        DelayHandler = new AutoResetEvent(false);
-        _stoppedHandler = new AutoResetEvent(false);
-        _drainingTimeout = TimeSpan.FromSeconds(100);
-        _defaultSendingInterval = TimeSpan.FromSeconds(5);
-
-        _transmitter = transmitter;
-        _storage = storage;
-
-        if (startSending)
-        {
-            // It is currently possible for the long - running task to be executed(and thereby block during WaitOne) on the UI thread when
-            // called by a task scheduled on the UI thread. Explicitly specifying TaskScheduler.Default 
-            // when calling StartNew guarantees that Sender never blocks the main thread.
-            Task.Factory.StartNew(SendLoop, CancellationToken.None, TaskCreationOptions.LongRunning,
-                    TaskScheduler.Default)
-                .ContinueWith(
-                    t => PersistenceChannelDebugLog.WriteException(t.Exception, "Sender: Failure in SendLoop"),
-                    TaskContinuationOptions.OnlyOnFaulted);
-        }
-    }
-
-    /// <summary>
-    ///     Gets the interval between each successful sending.
-    /// </summary>
-    private TimeSpan SendingInterval
-    {
-        get
-        {
-            if (_transmitter.SendingInterval != null)
-            {
-                return _transmitter.SendingInterval.Value;
-            }
-
-            return _defaultSendingInterval;
-        }
-    }
-
-    /// <summary>
-    ///     Disposes the managed objects.
-    /// </summary>
-    public void Dispose()
-    {
-        if (Interlocked.Increment(ref _disposeCount) == 1)
-        {
-            StopAsync().ConfigureAwait(false).GetAwaiter().GetResult();
-
-            DelayHandler.Dispose();
-            _stoppedHandler.Dispose();
-        }
-    }
-
-    /// <summary>
-    ///     Stops the sender.
-    /// </summary>
-    internal Task StopAsync()
-    {
-        // After delayHandler is set, a sending iteration will immediately start. 
-        // Setting <c>stopped</c> to true, will cause the iteration to skip the actual sending and stop immediately. 
-        _stopped = true;
-        DelayHandler.Set();
-
-        // if delayHandler was set while a transmission was being sent, the return task will wait for it to finish, for an additional second,
-        // before it will mark the task as completed. 
-        return Task.Run(() =>
-        {
-            try
-            {
-                _stoppedHandler.WaitOne(_drainingTimeout);
-            }
-            catch (ObjectDisposedException)
-            {
-            }
-        });
-    }
-
-    /// <summary>
-    ///     Send transmissions in a loop.
-    /// </summary>
-    protected void SendLoop()
-    {
-        TimeSpan prevSendingInterval = TimeSpan.Zero;
-        TimeSpan sendingInterval = _sendingIntervalOnNoData;
-        try
-        {
-            while (!_stopped)
-            {
-                using (StorageTransmission transmission = _storage.Peek())
-                {
-                    if (_stopped)
-                    {
-                        // This second verification is required for cases where 'stopped' was set while peek was happening. 
-                        // Once the actual sending starts the design is to wait until it finishes and deletes the transmission. 
-                        // So no extra validation is required.
-                        break;
-                    }
-
-                    // If there is a transmission to send - send it. 
-                    if (transmission != null)
-                    {
-                        bool shouldRetry = Send(transmission, ref sendingInterval);
-                        if (!shouldRetry)
-                        {
-                            // If retry is not required - delete the transmission.
-                            _storage.Delete(transmission);
-                        }
-                    }
-                    else
-                    {
-                        sendingInterval = _sendingIntervalOnNoData;
-                    }
-                }
-
-                LogInterval(prevSendingInterval, sendingInterval);
-                DelayHandler.WaitOne(sendingInterval);
-                prevSendingInterval = sendingInterval;
-            }
-
-            _stoppedHandler.Set();
-        }
-        catch (ObjectDisposedException)
-        {
-        }
-    }
-
-    /// <summary>
-    ///     Sends a transmission and handle errors.
-    /// </summary>
-    /// <param name="transmission">The transmission to send.</param>
-    /// <param name="nextSendInterval">
-    ///     When this value returns it will hold a recommendation for when to start the next sending
-    ///     iteration.
-    /// </param>
-    /// <returns>True, if there was sent error and we need to retry sending, otherwise false.</returns>
-    protected virtual bool Send(StorageTransmission transmission, ref TimeSpan nextSendInterval)
-    {
-        try
-        {
-            if (transmission != null)
-            {
-                bool isConnected = NetworkInterface.GetIsNetworkAvailable();
-
-                // there is no internet connection available, return than.
-                if (!isConnected)
-                {
-                    PersistenceChannelDebugLog.WriteLine(
-                        "Cannot send data to the server. Internet connection is not available");
-                    return true;
-                }
-
-                transmission.SendAsync().ConfigureAwait(false).GetAwaiter().GetResult();
-
-                // After a successful sending, try immediately to send another transmission. 
-                nextSendInterval = SendingInterval;
-            }
-        }
-        catch (WebException e)
-        {
-            int? statusCode = GetStatusCode(e);
-            nextSendInterval = CalculateNextInterval(statusCode, nextSendInterval, _maxIntervalBetweenRetries);
-            return IsRetryable(statusCode, e.Status);
-        }
-        catch (Exception e)
-        {
-            nextSendInterval = CalculateNextInterval(null, nextSendInterval, _maxIntervalBetweenRetries);
-            PersistenceChannelDebugLog.WriteException(e, "Unknown exception during sending");
-        }
-
-        return false;
-    }
-
-    /// <summary>
-    ///     Log next interval. Only log the interval when it changes by more then a minute. So if interval grow by 1 minute or
-    ///     decreased by 1 minute it will be logged.
-    ///     Logging every interval will just make the log noisy.
-    /// </summary>
-    private static void LogInterval(TimeSpan prevSendInterval, TimeSpan nextSendInterval)
-    {
-        if (Math.Abs(nextSendInterval.TotalSeconds - prevSendInterval.TotalSeconds) > 60)
-        {
-            PersistenceChannelDebugLog.WriteLine("next sending interval: " + nextSendInterval);
-        }
-    }
-
-    /// <summary>
-    ///     Return the status code from the web exception or null if no such code exists.
-    /// </summary>
-    private static int? GetStatusCode(WebException e)
-    {
-        if (e.Response is HttpWebResponse httpWebResponse)
-        {
-            return (int)httpWebResponse.StatusCode;
-        }
-
-        return null;
-    }
-
-    /// <summary>
-    ///     Returns true if <paramref name="httpStatusCode" /> or <paramref name="webExceptionStatus" /> are retryable.
-    /// </summary>
-    private static bool IsRetryable(int? httpStatusCode, WebExceptionStatus webExceptionStatus)
-    {
-        switch (webExceptionStatus)
-        {
-            case WebExceptionStatus.ProxyNameResolutionFailure:
-            case WebExceptionStatus.NameResolutionFailure:
-            case WebExceptionStatus.Timeout:
-            case WebExceptionStatus.ConnectFailure:
-                return true;
-        }
-
-        if (httpStatusCode == null)
-        {
-            return false;
-        }
-
-        switch (httpStatusCode.Value)
-        {
-            case 503: // Server in maintenance. 
-            case 408: // invalid request
-            case 500: // Internal Server Error                                                
-            case 502: // Bad Gateway, can be common when there is no network. 
-            case 511: // Network Authentication Required
-                return true;
-        }
-
-        return false;
-    }
-
-    /// <summary>
-    ///     Calculates the next interval using exponential back-off algorithm (with the exceptions of few error codes that
-    ///     reset the interval to <see cref="SendingInterval" />.
-    /// </summary>
-    private TimeSpan CalculateNextInterval(int? httpStatusCode, TimeSpan currentSendInterval, TimeSpan maxInterval)
-    {
-        // if item is expired, no need for exponential back-off
-        if (httpStatusCode != null && httpStatusCode.Value == 400 /* expired */)
-        {
-            return SendingInterval;
-        }
-
-        // exponential back-off.
-        if (Math.Abs(currentSendInterval.TotalSeconds) < 1)
-        {
-            return TimeSpan.FromSeconds(1);
-        }
-
-        double nextIntervalInSeconds = Math.Min(currentSendInterval.TotalSeconds * 2, maxInterval.TotalSeconds);
-
-        return TimeSpan.FromSeconds(nextIntervalInSeconds);
-    }
-}
diff --git a/src/Cli/dotnet/Telemetry/PersistenceChannel/SnapshottingCollection.cs b/src/Cli/dotnet/Telemetry/PersistenceChannel/SnapshottingCollection.cs
deleted file mode 100644
index 3e98a0d598a8..000000000000
--- a/src/Cli/dotnet/Telemetry/PersistenceChannel/SnapshottingCollection.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-// 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.Collections;
-using System.Diagnostics;
-
-namespace Microsoft.DotNet.Cli.Telemetry.PersistenceChannel;
-
-internal abstract class SnapshottingCollection<TItem, TCollection> : ICollection<TItem>
-    where TCollection : class, ICollection<TItem>
-{
-    protected readonly TCollection Collection;
-    protected TCollection snapshot;
-
-    protected SnapshottingCollection(TCollection collection)
-    {
-        Debug.Assert(collection != null, "collection");
-        Collection = collection;
-    }
-
-    public int Count => GetSnapshot().Count;
-
-    public bool IsReadOnly => false;
-
-    public void Add(TItem item)
-    {
-        lock (Collection)
-        {
-            Collection.Add(item);
-            snapshot = default;
-        }
-    }
-
-    public void Clear()
-    {
-        lock (Collection)
-        {
-            Collection.Clear();
-            snapshot = default;
-        }
-    }
-
-    public bool Contains(TItem item)
-    {
-        return GetSnapshot().Contains(item);
-    }
-
-    public void CopyTo(TItem[] array, int arrayIndex)
-    {
-        GetSnapshot().CopyTo(array, arrayIndex);
-    }
-
-    public bool Remove(TItem item)
-    {
-        lock (Collection)
-        {
-            bool removed = Collection.Remove(item);
-            if (removed)
-            {
-                snapshot = default;
-            }
-
-            return removed;
-        }
-    }
-
-    public IEnumerator<TItem> GetEnumerator()
-    {
-        return GetSnapshot().GetEnumerator();
-    }
-
-    IEnumerator IEnumerable.GetEnumerator()
-    {
-        return GetEnumerator();
-    }
-
-    protected abstract TCollection CreateSnapshot(TCollection collection);
-
-    protected TCollection GetSnapshot()
-    {
-        TCollection localSnapshot = snapshot;
-        if (localSnapshot == null)
-        {
-            lock (Collection)
-            {
-                snapshot = CreateSnapshot(Collection);
-                localSnapshot = snapshot;
-            }
-        }
-
-        return localSnapshot;
-    }
-}
diff --git a/src/Cli/dotnet/Telemetry/PersistenceChannel/SnapshottingDictionary.cs b/src/Cli/dotnet/Telemetry/PersistenceChannel/SnapshottingDictionary.cs
deleted file mode 100644
index cc6cc51a1f57..000000000000
--- a/src/Cli/dotnet/Telemetry/PersistenceChannel/SnapshottingDictionary.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-// 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.PersistenceChannel;
-
-internal class SnapshottingDictionary<TKey, TValue> :
-    SnapshottingCollection<KeyValuePair<TKey, TValue>, IDictionary<TKey, TValue>>, IDictionary<TKey, TValue>
-{
-    public SnapshottingDictionary()
-        : base(new Dictionary<TKey, TValue>())
-    {
-    }
-
-    public ICollection<TKey> Keys => GetSnapshot().Keys;
-
-    public ICollection<TValue> Values => GetSnapshot().Values;
-
-    public TValue this[TKey key]
-    {
-        get => GetSnapshot()[key];
-
-        set
-        {
-            lock (Collection)
-            {
-                Collection[key] = value;
-                snapshot = null;
-            }
-        }
-    }
-
-    public void Add(TKey key, TValue value)
-    {
-        lock (Collection)
-        {
-            Collection.Add(key, value);
-            snapshot = null;
-        }
-    }
-
-    public bool ContainsKey(TKey key)
-    {
-        return GetSnapshot().ContainsKey(key);
-    }
-
-    public bool Remove(TKey key)
-    {
-        lock (Collection)
-        {
-            bool removed = Collection.Remove(key);
-            if (removed)
-            {
-                snapshot = null;
-            }
-
-            return removed;
-        }
-    }
-
-    public bool TryGetValue(TKey key, out TValue value)
-    {
-        return GetSnapshot().TryGetValue(key, out value);
-    }
-
-    protected sealed override IDictionary<TKey, TValue> CreateSnapshot(IDictionary<TKey, TValue> collection)
-    {
-        return new Dictionary<TKey, TValue>(collection);
-    }
-}
diff --git a/src/Cli/dotnet/Telemetry/PersistenceChannel/StorageService.cs b/src/Cli/dotnet/Telemetry/PersistenceChannel/StorageService.cs
deleted file mode 100644
index dc44a0bf3cbb..000000000000
--- a/src/Cli/dotnet/Telemetry/PersistenceChannel/StorageService.cs
+++ /dev/null
@@ -1,352 +0,0 @@
-// 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.Globalization;
-using Microsoft.ApplicationInsights.Channel;
-using Microsoft.DotNet.Configurer;
-
-namespace Microsoft.DotNet.Cli.Telemetry.PersistenceChannel;
-
-internal sealed class StorageService : BaseStorageService
-{
-    private const string DefaultStorageFolderName = "TelemetryStorageService";
-    private readonly FixedSizeQueue<string> _deletedFilesQueue = new(10);
-
-    private readonly object _peekLockObj = new();
-    private readonly object _storageFolderLock = new();
-    private string _storageDirectoryPath;
-    private string _storageDirectoryPathUsed;
-    private long _storageCountFiles;
-    private bool _storageFolderInitialized;
-    private long _storageSize;
-    private uint _transmissionsDropped;
-
-    /// <summary>
-    ///     Gets the storage's folder name.
-    /// </summary>
-    internal override string StorageDirectoryPath => _storageDirectoryPath;
-
-    /// <summary>
-    ///     Gets the storage folder. If storage folder couldn't be created, null will be returned.
-    /// </summary>
-    private string StorageFolder
-    {
-        get
-        {
-            if (!_storageFolderInitialized)
-            {
-                lock (_storageFolderLock)
-                {
-                    if (!_storageFolderInitialized)
-                    {
-                        try
-                        {
-                            _storageDirectoryPathUsed = _storageDirectoryPath;
-
-                            if (!Directory.Exists(_storageDirectoryPathUsed))
-                            {
-                                Directory.CreateDirectory(_storageDirectoryPathUsed);
-                            }
-                        }
-                        catch (Exception e)
-                        {
-                            _storageDirectoryPathUsed = null;
-                            PersistenceChannelDebugLog.WriteException(e, "Failed to create storage folder");
-                        }
-
-                        _storageFolderInitialized = true;
-                    }
-                }
-            }
-
-            return _storageDirectoryPathUsed;
-        }
-    }
-
-    internal override void Init(string storageDirectoryPath)
-    {
-        PeekedTransmissions = new SnapshottingDictionary<string, string>();
-
-        VerifyOrSetDefaultStorageDirectoryPath(storageDirectoryPath);
-
-        CapacityInBytes = 10 * 1024 * 1024; // 10 MB
-        MaxFiles = 100;
-
-        Task.Run(DeleteObsoleteFiles)
-            .ContinueWith(
-                task =>
-                {
-                    PersistenceChannelDebugLog.WriteException(
-                        task.Exception,
-                        "Storage: Unhandled exception in DeleteObsoleteFiles");
-                },
-                TaskContinuationOptions.OnlyOnFaulted);
-    }
-
-    private void VerifyOrSetDefaultStorageDirectoryPath(string desireStorageDirectoryPath)
-    {
-        if (string.IsNullOrEmpty(desireStorageDirectoryPath))
-        {
-            _storageDirectoryPath = Path.Combine(CliFolderPathCalculator.DotnetUserProfileFolderPath,
-                DefaultStorageFolderName);
-        }
-        else
-        {
-            if (!Path.IsPathRooted(desireStorageDirectoryPath))
-            {
-                throw new ArgumentException($"{nameof(desireStorageDirectoryPath)} need to be rooted (full path)");
-            }
-
-            _storageDirectoryPath = desireStorageDirectoryPath;
-        }
-    }
-
-    /// <summary>
-    ///     Reads an item from the storage. Order is Last-In-First-Out.
-    ///     When the Transmission is no longer needed (it was either sent or failed with a non-retryable error) it should be
-    ///     disposed.
-    /// </summary>
-    internal override StorageTransmission Peek()
-    {
-        IEnumerable<string> files = GetFiles("*.trn", 50);
-
-        lock (_peekLockObj)
-        {
-            foreach (string file in files)
-            {
-                try
-                {
-                    // if a file was peeked before, skip it (wait until it is disposed).  
-                    if (PeekedTransmissions.ContainsKey(file) == false &&
-                        _deletedFilesQueue.Contains(file) == false)
-                    {
-                        // Load the transmission from disk.
-                        StorageTransmission storageTransmissionItem = LoadTransmissionFromFileAsync(file)
-                            .ConfigureAwait(false).GetAwaiter().GetResult();
-
-                        // when item is disposed it should be removed from the peeked list.
-                        storageTransmissionItem.Disposing = item => OnPeekedItemDisposed(file);
-
-                        // add the transmission to the list.
-                        PeekedTransmissions.Add(file, storageTransmissionItem.FullFilePath);
-                        return storageTransmissionItem;
-                    }
-                }
-                catch (Exception e)
-                {
-                    PersistenceChannelDebugLog.WriteException(
-                        e,
-                        "Failed to load an item from the storage. file: {0}",
-                        file);
-                }
-            }
-        }
-
-        return null;
-    }
-
-    internal override void Delete(StorageTransmission item)
-    {
-        try
-        {
-            if (StorageFolder == null)
-            {
-                return;
-            }
-
-            // Initial storage size calculation. 
-            CalculateSize();
-
-            long fileSize = GetSize(item.FileName);
-            File.Delete(Path.Combine(StorageFolder, item.FileName));
-
-            _deletedFilesQueue.Enqueue(item.FileName);
-
-            // calculate size                
-            Interlocked.Add(ref _storageSize, -fileSize);
-            Interlocked.Decrement(ref _storageCountFiles);
-        }
-        catch (IOException e)
-        {
-            PersistenceChannelDebugLog.WriteException(e, "Failed to delete a file. file: {0}", item == null ? "null" : item.FullFilePath);
-        }
-    }
-
-    internal override async Task EnqueueAsync(Transmission transmission)
-    {
-        try
-        {
-            if (transmission == null || StorageFolder == null)
-            {
-                return;
-            }
-
-            // Initial storage size calculation. 
-            CalculateSize();
-
-            if ((ulong)_storageSize >= CapacityInBytes || _storageCountFiles >= MaxFiles)
-            {
-                // if max storage capacity has reached, drop the transmission (but log every 100 lost transmissions). 
-                if (_transmissionsDropped++ % 100 == 0)
-                {
-                    PersistenceChannelDebugLog.WriteLine("Total transmissions dropped: " + _transmissionsDropped);
-                }
-
-                return;
-            }
-
-            // Writes content to a temporary file and only then rename to avoid the Peek from reading the file before it is being written.
-            // Creates the temp file name
-            string tempFileName = Guid.NewGuid().ToString("N");
-
-            // Now that the file got created we can increase the files count
-            Interlocked.Increment(ref _storageCountFiles);
-
-            // Saves transmission to the temp file
-            await SaveTransmissionToFileAsync(transmission, tempFileName).ConfigureAwait(false);
-
-            // Now that the file is written increase storage size. 
-            long temporaryFileSize = GetSize(tempFileName);
-            Interlocked.Add(ref _storageSize, temporaryFileSize);
-
-            // Creates a new file name
-            string now = DateTime.UtcNow.ToString("yyyyMMddHHmmss");
-            string newFileName = string.Format(CultureInfo.InvariantCulture, "{0}_{1}.trn", now, tempFileName);
-
-            // Renames the file
-            File.Move(Path.Combine(StorageFolder, tempFileName), Path.Combine(StorageFolder, newFileName));
-        }
-        catch (Exception e)
-        {
-            PersistenceChannelDebugLog.WriteException(e, "EnqueueAsync");
-        }
-    }
-
-    private async Task SaveTransmissionToFileAsync(Transmission transmission, string file)
-    {
-        try
-        {
-            using (Stream stream = File.OpenWrite(Path.Combine(StorageFolder, file)))
-            {
-                await StorageTransmission.SaveAsync(transmission, stream).ConfigureAwait(false);
-            }
-        }
-        catch (UnauthorizedAccessException)
-        {
-            string message =
-                string.Format(
-                    "Failed to save transmission to file. UnauthorizedAccessException. File path: {0}, FileName: {1}",
-                    StorageFolder, file);
-            PersistenceChannelDebugLog.WriteLine(message);
-            throw;
-        }
-    }
-
-    private async Task<StorageTransmission> LoadTransmissionFromFileAsync(string file)
-    {
-        try
-        {
-            using (Stream stream = File.OpenRead(Path.Combine(StorageFolder, file)))
-            {
-                StorageTransmission storageTransmissionItem =
-                    await StorageTransmission.CreateFromStreamAsync(stream, file).ConfigureAwait(false);
-                return storageTransmissionItem;
-            }
-        }
-        catch (Exception e)
-        {
-            string message =
-                string.Format(
-                    "Failed to load transmission from file. File path: {0}, FileName: {1}, Exception: {2}",
-                    "storageFolderName", file, e);
-            PersistenceChannelDebugLog.WriteLine(message);
-            throw;
-        }
-    }
-
-    /// <summary>
-    ///     Get files from <see cref="storageFolder" />.
-    /// </summary>
-    /// <param name="fileQuery">Define the logic for sorting the files.</param>
-    /// <param name="filterByExtension">Defines a file extension. This method will return only files with this extension.</param>
-    /// <param name="top">
-    ///     Define how many files to return. This can be useful when the directory has a lot of files, in that case
-    ///     GetFilesAsync will have a performance hit.
-    /// </param>
-    private IEnumerable<string> GetFiles(string filterByExtension, int top)
-    {
-        try
-        {
-            if (StorageFolder != null)
-            {
-                return Directory.GetFiles(StorageFolder, filterByExtension).Take(top);
-            }
-        }
-        catch (Exception e)
-        {
-            PersistenceChannelDebugLog.WriteException(e, "Peek failed while get files from storage.");
-        }
-
-        return [];
-    }
-
-    /// <summary>
-    ///     Gets a file's size.
-    /// </summary>
-    private long GetSize(string file)
-    {
-        using (FileStream stream = File.OpenRead(Path.Combine(StorageFolder, file)))
-        {
-            return stream.Length;
-        }
-    }
-
-    /// <summary>
-    ///     Check the storage limits and return true if they reached.
-    ///     Storage limits are defined by the number of files and the total size on disk.
-    /// </summary>
-    private void CalculateSize()
-    {
-        string[] storageFiles = Directory.GetFiles(StorageFolder, "*.*");
-
-        _storageCountFiles = storageFiles.Count();
-
-        long storageSizeInBytes = 0;
-        foreach (string file in storageFiles)
-        {
-            storageSizeInBytes += GetSize(file);
-        }
-
-        _storageSize = storageSizeInBytes;
-    }
-
-    /// <summary>
-    ///     Enqueue is saving a transmission to a file with a guid, and after a successful write operation it renames it to a
-    ///     <c>trn</c> file.
-    ///     A file without a <c>trn</c> extension is ignored by Storage.Peek(), so if a process is taken down before rename
-    ///     happens it will stay on the disk forever.
-    ///     This thread deletes files with the <c>trn</c> extension that exists on disk for more than 5 minutes.
-    /// </summary>
-    private void DeleteObsoleteFiles()
-    {
-        try
-        {
-            IEnumerable<string> files = GetFiles("*.trn", 50);
-            foreach (string file in files)
-            {
-                DateTime creationTime = File.GetCreationTimeUtc(Path.Combine(StorageFolder, file));
-                // if the file is older then 5 minutes - delete it.
-                if (DateTime.UtcNow - creationTime >= TimeSpan.FromMinutes(5))
-                {
-                    File.Delete(Path.Combine(StorageFolder, file));
-                }
-            }
-        }
-        catch (Exception e)
-        {
-            PersistenceChannelDebugLog.WriteException(e, "Failed to delete tmp files.");
-        }
-    }
-}
diff --git a/src/Cli/dotnet/Telemetry/PersistenceChannel/StorageTransmission.cs b/src/Cli/dotnet/Telemetry/PersistenceChannel/StorageTransmission.cs
deleted file mode 100644
index 69b6132f1b9f..000000000000
--- a/src/Cli/dotnet/Telemetry/PersistenceChannel/StorageTransmission.cs
+++ /dev/null
@@ -1,127 +0,0 @@
-// 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.Globalization;
-using Microsoft.ApplicationInsights.Channel;
-
-namespace Microsoft.DotNet.Cli.Telemetry.PersistenceChannel;
-
-internal class StorageTransmission : Transmission, IDisposable
-{
-    internal Action<StorageTransmission> Disposing;
-
-    protected StorageTransmission(string fullPath, Uri address, byte[] content, string contentType,
-        string contentEncoding)
-        : base(address, content, contentType, contentEncoding)
-    {
-        FullFilePath = fullPath;
-        FileName = Path.GetFileName(fullPath);
-    }
-
-    internal string FileName { get; }
-
-    internal string FullFilePath { get; }
-
-    /// <summary>
-    ///     Disposing the storage transmission.
-    /// </summary>
-    public void Dispose()
-    {
-        Dispose(true);
-        GC.SuppressFinalize(this);
-    }
-
-    /// <summary>
-    ///     Creates a new transmission from the specified <paramref name="stream" />.
-    /// </summary>
-    /// <returns>Return transmission loaded from file; return null if the file is corrupted.</returns>
-    internal static async Task<StorageTransmission> CreateFromStreamAsync(Stream stream, string fileName)
-    {
-        StreamReader reader = new(stream);
-        Uri address = await ReadAddressAsync(reader).ConfigureAwait(false);
-        string contentType = await ReadHeaderAsync(reader, "Content-Type").ConfigureAwait(false);
-        string contentEncoding = await ReadHeaderAsync(reader, "Content-Encoding").ConfigureAwait(false);
-        byte[] content = await ReadContentAsync(reader).ConfigureAwait(false);
-        return new StorageTransmission(fileName, address, content, contentType, contentEncoding);
-    }
-
-    /// <summary>
-    ///     Saves the transmission to the specified <paramref name="stream" />.
-    /// </summary>
-    internal static async Task SaveAsync(Transmission transmission, Stream stream)
-    {
-        StreamWriter writer = new(stream);
-        try
-        {
-            await writer.WriteLineAsync(transmission.EndpointAddress.ToString()).ConfigureAwait(false);
-            await writer.WriteLineAsync("Content-Type" + ":" + transmission.ContentType).ConfigureAwait(false);
-            await writer.WriteLineAsync("Content-Encoding" + ":" + transmission.ContentEncoding)
-                .ConfigureAwait(false);
-            await writer.WriteLineAsync(string.Empty).ConfigureAwait(false);
-            await writer.WriteAsync(Convert.ToBase64String(transmission.Content)).ConfigureAwait(false);
-        }
-        finally
-        {
-            writer.Flush();
-        }
-    }
-
-    private static async Task<string> ReadHeaderAsync(TextReader reader, string headerName)
-    {
-        string line = await reader.ReadLineAsync().ConfigureAwait(false);
-        if (string.IsNullOrEmpty(line))
-        {
-            throw new FormatException(string.Format(CultureInfo.InvariantCulture, "{0} header is expected.",
-                headerName));
-        }
-
-        string[] parts = line.Split(':');
-        if (parts.Length != 2)
-        {
-            throw new FormatException(string.Format(CultureInfo.InvariantCulture,
-                "Unexpected header format. {0} header is expected. Actual header: {1}", headerName, line));
-        }
-
-        if (parts[0] != headerName)
-        {
-            throw new FormatException(string.Format(CultureInfo.InvariantCulture,
-                "{0} header is expected. Actual header: {1}", headerName, line));
-        }
-
-        return parts[1].Trim();
-    }
-
-    private static async Task<Uri> ReadAddressAsync(TextReader reader)
-    {
-        string addressLine = await reader.ReadLineAsync().ConfigureAwait(false);
-        if (string.IsNullOrEmpty(addressLine))
-        {
-            throw new FormatException("Transmission address is expected.");
-        }
-
-        Uri address = new(addressLine);
-        return address;
-    }
-
-    private static async Task<byte[]> ReadContentAsync(TextReader reader)
-    {
-        string content = await reader.ReadToEndAsync().ConfigureAwait(false);
-        if (string.IsNullOrEmpty(content) || content == Environment.NewLine)
-        {
-            throw new FormatException("Content is expected.");
-        }
-
-        return Convert.FromBase64String(content);
-    }
-
-    private void Dispose(bool disposing)
-    {
-        if (disposing)
-        {
-            Action<StorageTransmission> disposingDelegate = Disposing;
-            disposingDelegate?.Invoke(this);
-        }
-    }
-}
diff --git a/src/Cli/dotnet/Telemetry/Telemetry.cs b/src/Cli/dotnet/Telemetry/Telemetry.cs
index 28851da921b1..a23c220317d7 100644
--- a/src/Cli/dotnet/Telemetry/Telemetry.cs
+++ b/src/Cli/dotnet/Telemetry/Telemetry.cs
@@ -1,105 +1,78 @@
 // 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.Collections.Frozen;
 using System.Diagnostics;
-using Microsoft.ApplicationInsights;
-using Microsoft.ApplicationInsights.Extensibility;
 using Microsoft.DotNet.Cli.Utils;
-using Microsoft.DotNet.Configurer;
-using CLIRuntimeEnvironment = Microsoft.DotNet.Cli.Utils.RuntimeEnvironment;
 
 namespace Microsoft.DotNet.Cli.Telemetry;
 
 public class Telemetry : ITelemetry
 {
-    internal static string CurrentSessionId = null;
-    internal static bool DisabledForTests = false;
-    private readonly int _senderCount;
-    private TelemetryClient _client = null;
-    private Dictionary<string, string> _commonProperties = null;
-    private Dictionary<string, double> _commonMeasurements = null;
-    private Task _trackEventTask = null;
-
-    private const string ConnectionString = "InstrumentationKey=74cc1c9e-3e6e-4d05-b3fc-dde9101d0254";
+    internal static string? s_currentSessionId = null;
+    internal static bool s_disabledForTests = false;
+    private static readonly FrozenDictionary<string, object?> s_commonProperties = new TelemetryCommonProperties().GetTelemetryCommonProperties();
+    private Task? _trackEventTask;
 
+    public static string ConnectionString { get; } = "InstrumentationKey=74cc1c9e-3e6e-4d05-b3fc-dde9101d0254";
+    public static string DefaultStorageFolderName { get; } = "TelemetryStorageService";
     public bool Enabled { get; }
 
     public Telemetry() : this(null) { }
 
-    public Telemetry(IFirstTimeUseNoticeSentinel sentinel) : this(sentinel, null) { }
-
-    public Telemetry(
-        IFirstTimeUseNoticeSentinel sentinel,
-        string sessionId,
-        bool blockThreadInitialization = false,
-        IEnvironmentProvider environmentProvider = null,
-        int senderCount = 3)
+    public Telemetry(string? sessionId, IEnvironmentProvider? environmentProvider = null)
     {
-
-        if (DisabledForTests)
+        if (s_disabledForTests)
         {
             return;
         }
 
         environmentProvider ??= new EnvironmentProvider();
-
-        Enabled = !environmentProvider.GetEnvironmentVariableAsBool(EnvironmentVariableNames.TELEMETRY_OPTOUT, defaultValue: CompileOptions.TelemetryOptOutDefault)
-                    && PermissionExists(sentinel);
-
+        Enabled = !environmentProvider.GetEnvironmentVariableAsBool(EnvironmentVariableNames.TELEMETRY_OPTOUT, defaultValue: CompileOptions.TelemetryOptOutDefault);
         if (!Enabled)
         {
             return;
         }
 
         // Store the session ID in a static field so that it can be reused
-        CurrentSessionId = sessionId ?? Guid.NewGuid().ToString();
-        _senderCount = senderCount;
-        if (blockThreadInitialization)
+        if (!string.IsNullOrEmpty(sessionId))
         {
-            InitializeTelemetry();
+            s_currentSessionId = sessionId;
         }
         else
         {
-            //initialize in task to offload to parallel thread
-            _trackEventTask = Task.Run(() => InitializeTelemetry());
+            // Generate a new session ID if not provided
+            s_currentSessionId ??= Guid.NewGuid().ToString();
         }
     }
 
     internal static void DisableForTests()
     {
-        DisabledForTests = true;
-        CurrentSessionId = null;
+        s_disabledForTests = true;
+        s_currentSessionId = null;
     }
 
     internal static void EnableForTests()
     {
-        DisabledForTests = false;
-    }
-
-    private static bool PermissionExists(IFirstTimeUseNoticeSentinel sentinel)
-    {
-        if (sentinel == null)
-        {
-            return false;
-        }
-
-        return sentinel.Exists();
+        s_disabledForTests = false;
     }
 
-    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)
     {
         if (!Enabled)
         {
             return;
         }
 
-        //continue the task in different threads
-        _trackEventTask = _trackEventTask.ContinueWith(
-            x => TrackEventTask(eventName, properties, measurements)
-        );
+        // Continue the task in different threads.
+        if (_trackEventTask == null)
+        {
+            _trackEventTask = Task.Run(() => TrackEventTask(eventName, properties, measurements));
+        }
+        else
+        {
+            _trackEventTask = _trackEventTask.ContinueWith(_ => TrackEventTask(eventName, properties, measurements));
+        }
     }
 
     public void Flush()
@@ -112,17 +85,7 @@ public void Flush()
         _trackEventTask.Wait();
     }
 
-    // Adding dispose on graceful shutdown per https://github.com/microsoft/ApplicationInsights-dotnet/issues/1152#issuecomment-518742922
-    public void Dispose()
-    {
-        if (_client != null)
-        {
-            _client.TelemetryConfiguration.Dispose();
-            _client = null;
-        }
-    }
-
-    public void ThreadBlockingTrackEvent(string eventName, IDictionary<string, string> properties, IDictionary<string, double> measurements)
+    public void ThreadBlockingTrackEvent(string eventName, IDictionary<string, string?>? properties, IDictionary<string, double>? measurements)
     {
         if (!Enabled)
         {
@@ -131,87 +94,56 @@ public void ThreadBlockingTrackEvent(string eventName, IDictionary<string, strin
         TrackEventTask(eventName, properties, measurements);
     }
 
-    private void InitializeTelemetry()
+    private static void TrackEventTask(string eventName, IDictionary<string, string?>? properties, IDictionary<string, double>? measurements)
     {
         try
         {
-            var persistenceChannel = new PersistenceChannel.PersistenceChannel(sendersCount: _senderCount)
-            {
-                SendingInterval = TimeSpan.FromMilliseconds(1)
-            };
-
-            var config = TelemetryConfiguration.CreateDefault();
-            config.TelemetryChannel = persistenceChannel;
-            config.ConnectionString = ConnectionString;
-            _client = new TelemetryClient(config);
-            _client.Context.Session.Id = CurrentSessionId;
-            _client.Context.Device.OperatingSystem = CLIRuntimeEnvironment.OperatingSystem;
-
-            _commonProperties = new TelemetryCommonProperties().GetTelemetryCommonProperties();
-            _commonMeasurements = [];
+            var activity = new ActivityEvent($"dotnet/cli/{eventName}", tags: MakeTags(properties, measurements));
+            Activity.Current?.AddEvent(activity);
         }
         catch (Exception e)
         {
-            _client = null;
-            // we dont want to fail the tool if telemetry fails.
             Debug.Fail(e.ToString());
         }
     }
 
-    private void TrackEventTask(
-        string eventName,
-        IDictionary<string, string> properties,
-        IDictionary<string, double> measurements)
+    private static ActivityTagsCollection MakeTags(IDictionary<string, string?>? eventProperties, IDictionary<string, double>? eventMeasurements)
     {
-        if (_client == null)
+        var tags = new ActivityTagsCollection(s_commonProperties);
+        if (s_currentSessionId is not null)
         {
-            return;
+            tags.Add("sessionId", s_currentSessionId);
         }
 
-        try
-        {
-            Dictionary<string, string> eventProperties = GetEventProperties(properties);
-            Dictionary<string, double> eventMeasurements = GetEventMeasures(measurements);
-
-            eventProperties.Add("event id", Guid.NewGuid().ToString());
-
-            _client.TrackEvent(PrependProducerNamespace(eventName), eventProperties, eventMeasurements);
-        }
-        catch (Exception e)
+        foreach (var property in s_commonProperties)
         {
-            Debug.Fail(e.ToString());
+            if (property.Value is null)
+            {
+                continue; // Skip null properties
+            }
+            tags.TryAdd(property.Key, property.Value);
         }
-    }
-
-    private static string PrependProducerNamespace(string eventName)
-    {
-        return "dotnet/cli/" + eventName;
-    }
 
-    private Dictionary<string, double> GetEventMeasures(IDictionary<string, double> measurements)
-    {
-        Dictionary<string, double> eventMeasurements = new(_commonMeasurements);
-        if (measurements != null)
+        if (eventProperties is not null)
         {
-            foreach (KeyValuePair<string, double> measurement in measurements)
+            foreach (var property in eventProperties)
             {
-                eventMeasurements[measurement.Key] = measurement.Value;
+                if (property.Value is null)
+                {
+                    continue; // Skip null properties
+                }
+                tags.TryAdd(property.Key, property.Value);
             }
         }
-        return eventMeasurements;
-    }
 
-    private Dictionary<string, string> GetEventProperties(IDictionary<string, string> properties)
-    {
-        var eventProperties = new Dictionary<string, string>(_commonProperties);
-        if (properties != null)
+        if (eventMeasurements is not null)
         {
-            foreach (KeyValuePair<string, string> property in properties)
+            foreach (var measurement in eventMeasurements)
             {
-                eventProperties[property.Key] = property.Value;
+                tags.TryAdd(measurement.Key, measurement.Value);
             }
         }
 
-        return eventProperties;
+        return tags;
     }
 }
diff --git a/src/Cli/dotnet/Telemetry/TelemetryCommonProperties.cs b/src/Cli/dotnet/Telemetry/TelemetryCommonProperties.cs
index 88b2c2152100..4c59a352538f 100644
--- a/src/Cli/dotnet/Telemetry/TelemetryCommonProperties.cs
+++ b/src/Cli/dotnet/Telemetry/TelemetryCommonProperties.cs
@@ -1,8 +1,7 @@
 // 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.Collections.Frozen;
 using Microsoft.DotNet.Cli.Utils;
 using Microsoft.DotNet.Configurer;
 using RuntimeEnvironment = Microsoft.DotNet.Cli.Utils.RuntimeEnvironment;
@@ -11,13 +10,13 @@
 namespace Microsoft.DotNet.Cli.Telemetry;
 
 internal class TelemetryCommonProperties(
-    Func<string> getCurrentDirectory = null,
-    Func<string, string> hasher = null,
-    Func<string> getMACAddress = null,
-    Func<string> getDeviceId = null,
-    IDockerContainerDetector dockerContainerDetector = null,
-    IUserLevelCacheWriter userLevelCacheWriter = null,
-    ICIEnvironmentDetector ciEnvironmentDetector = null)
+    Func<string>? getCurrentDirectory = null,
+    Func<string, string>? hasher = null,
+    Func<string>? getMACAddress = null,
+    Func<string>? getDeviceId = null,
+    IDockerContainerDetector? dockerContainerDetector = null,
+    IUserLevelCacheWriter? userLevelCacheWriter = null,
+    ICIEnvironmentDetector? ciEnvironmentDetector = null)
 {
     private readonly IDockerContainerDetector _dockerContainerDetector = dockerContainerDetector ?? new DockerContainerDetectorForTelemetry();
     private readonly ICIEnvironmentDetector _ciEnvironmentDetector = ciEnvironmentDetector ?? new CIEnvironmentDetectorForTelemetry();
@@ -43,18 +42,14 @@ internal class TelemetryCommonProperties(
     private const string ProductType = "Product Type";
     private const string LibcRelease = "Libc Release";
     private const string LibcVersion = "Libc Version";
-
     private const string CI = "Continuous Integration";
-
     private const string TelemetryProfileEnvironmentVariable = "DOTNET_CLI_TELEMETRY_PROFILE";
-    private const string CannotFindMacAddress = "Unknown";
-
     private const string MachineIdCacheKey = "MachineId";
     private const string IsDockerContainerCacheKey = "IsDockerContainer";
 
-    public Dictionary<string, string> GetTelemetryCommonProperties()
+    public FrozenDictionary<string, object?> GetTelemetryCommonProperties()
     {
-        return new Dictionary<string, string>
+        return new Dictionary<string, object?>
         {
             {OSVersion, RuntimeEnvironment.OperatingSystemVersion},
             {OSPlatform, RuntimeEnvironment.OperatingSystemPlatform.ToString()},
@@ -68,8 +63,7 @@ public Dictionary<string, string> GetTelemetryCommonProperties()
             {CurrentPathHash, _hasher(_getCurrentDirectory())},
             {MachineIdOld, _userLevelCacheWriter.RunWithCache(MachineIdCacheKey, GetMachineId)},
             // we don't want to recalcuate a new id for every new SDK version. Reuse the same path across versions.
-            // If we change the format of the cache later.
-            // We need to rename the cache from v1 to v2
+            // If we change the format of the cache later, we need to rename the cache from v1 to v2.
             {MachineId,
                 _userLevelCacheWriter.RunWithCacheInFilePath(
                     Path.Combine(
@@ -82,20 +76,17 @@ public Dictionary<string, string> GetTelemetryCommonProperties()
             {ProductType, ExternalTelemetryProperties.GetProductType()},
             {LibcRelease, ExternalTelemetryProperties.GetLibcRelease()},
             {LibcVersion, ExternalTelemetryProperties.GetLibcVersion()}
-        };
+        }.ToFrozenDictionary();
     }
 
     private string GetMachineId()
     {
-        var macAddress = _getMACAddress();
-        if (macAddress != null)
+        if (_getMACAddress() is { } macAddress)
         {
             return _hasher(macAddress);
         }
-        else
-        {
-            return Guid.NewGuid().ToString();
-        }
+
+        return Guid.NewGuid().ToString();
     }
 
     /// <summary>
@@ -132,8 +123,5 @@ private string GetMachineId()
     ///     Windows.7        Microsoft Windows 6.1.7601 S
     ///     Windows.81       Microsoft Windows 6.3.9600
     /// </summary>
-    private static string GetKernelVersion()
-    {
-        return RuntimeInformation.OSDescription;
-    }
+    private static string GetKernelVersion() => RuntimeInformation.OSDescription;
 }
diff --git a/src/Cli/dotnet/ToolPackage/ToolPackageDownloader.cs b/src/Cli/dotnet/ToolPackage/ToolPackageDownloader.cs
index 31b4b528af35..ff4385c2ffbf 100644
--- a/src/Cli/dotnet/ToolPackage/ToolPackageDownloader.cs
+++ b/src/Cli/dotnet/ToolPackage/ToolPackageDownloader.cs
@@ -46,7 +46,7 @@ protected override INuGetPackageDownloader CreateNuGetPackageDownloader(
         {
             verboseLogger = new NuGetConsoleLogger();
         }
-        
+
         return new NuGetPackageDownloader.NuGetPackageDownloader(
             new DirectoryPath(),
             verboseLogger: verboseLogger,
@@ -71,9 +71,11 @@ protected override NuGetVersion DownloadAndExtractPackage(
         string folderToDeleteOnFailure = null;
         return TransactionalAction.Run<NuGetVersion>(() =>
         {
+            var _downloadActivity = Activities.Source.StartActivity("download-tool");
+            _downloadActivity?.DisplayName = $"Downloading tool {packageId}@{packageVersion}";
             var packagePath = nugetPackageDownloader.DownloadPackageAsync(packageId, packageVersion, packageSourceLocation,
                         includeUnlisted: includeUnlisted, downloadFolder: new DirectoryPath(packagesRootPath)).ConfigureAwait(false).GetAwaiter().GetResult();
-
+            _downloadActivity?.Stop();
             folderToDeleteOnFailure = Path.GetDirectoryName(packagePath);
 
             // look for package on disk and read the version
@@ -92,8 +94,10 @@ protected override NuGetVersion DownloadAndExtractPackage(
             }
 
             // Extract the package
+            var _extractActivity = Activities.Source.StartActivity("extract-tool");
             var nupkgDir = versionFolderPathResolver.GetInstallPath(packageId.ToString(), version);
             nugetPackageDownloader.ExtractPackageAsync(packagePath, new DirectoryPath(nupkgDir)).ConfigureAwait(false).GetAwaiter().GetResult();
+            _extractActivity?.Stop();
 
             return version;
         }, rollback: () =>
diff --git a/src/Cli/dotnet/ToolPackage/ToolPackageDownloaderBase.cs b/src/Cli/dotnet/ToolPackage/ToolPackageDownloaderBase.cs
index 9add8ff15505..e8f5fc57f40b 100644
--- a/src/Cli/dotnet/ToolPackage/ToolPackageDownloaderBase.cs
+++ b/src/Cli/dotnet/ToolPackage/ToolPackageDownloaderBase.cs
@@ -191,8 +191,10 @@ protected IToolPackage InstallGlobalToolPackageInternal(
                 //  Create parent directory in global tool store, for example dotnet\tools\.store\powershell
                 _fileSystem.Directory.CreateDirectory(toolStoreTargetDirectory.GetParentPath().Value);
 
+                var _moveContentActivity = Activities.Source.StartActivity("move-global-tool-content");
                 //  Move tool files from stage to final location
                 FileAccessRetrier.RetryOnMoveAccessFailure(() => _fileSystem.Directory.Move(_globalToolStageDir.Value, toolStoreTargetDirectory.Value));
+                _moveContentActivity?.Dispose();
 
                 rollbackDirectory = toolStoreTargetDirectory.Value;
 
@@ -353,6 +355,7 @@ protected void UpdateRuntimeConfig(
         ToolPackageInstance toolPackageInstance
         )
     {
+        using var _updateRuntimeConfigActivity = Activities.Source.StartActivity("update-runtimeconfig");
         var runtimeConfigFilePath = Path.ChangeExtension(toolPackageInstance.Command.Executable.Value, ".runtimeconfig.json");
 
         // Update the runtimeconfig.json file
diff --git a/src/Cli/dotnet/dotnet.csproj b/src/Cli/dotnet/dotnet.csproj
index 295df7753ff3..40f0e266cf7d 100644
--- a/src/Cli/dotnet/dotnet.csproj
+++ b/src/Cli/dotnet/dotnet.csproj
@@ -50,6 +50,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Azure.Monitor.OpenTelemetry.Exporter" />
     <PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" />
     <PackageReference Include="Microsoft.VisualStudio.SolutionPersistence" />
     <PackageReference Include="Newtonsoft.Json" />
@@ -58,6 +59,9 @@
     <PackageReference Include="Microsoft.Build" />
     <PackageReference Include="Microsoft.NET.HostModel" />
     <PackageReference Include="Microsoft.TemplateEngine.Orchestrator.RunnableProjects" />
+    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.Http" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" />
     <PackageReference Include="System.CommandLine" />
     <PackageReference Include="Microsoft.Deployment.DotNet.Releases" />
     <PackageReference Include="System.ServiceProcess.ServiceController" />
diff --git a/src/Microsoft.DotNet.TemplateLocator/TemplateLocator.cs b/src/Microsoft.DotNet.TemplateLocator/TemplateLocator.cs
index 7ff2785a7b79..653b5608bafd 100644
--- a/src/Microsoft.DotNet.TemplateLocator/TemplateLocator.cs
+++ b/src/Microsoft.DotNet.TemplateLocator/TemplateLocator.cs
@@ -36,8 +36,8 @@ public TemplateLocator(Func<string, string?> getEnvironmentVariable, Func<string
         }
 
         public IReadOnlyCollection<IOptionalSdkTemplatePackageInfo> GetDotnetSdkTemplatePackages(
-            string sdkVersion,
-            string dotnetRootPath,
+            string? sdkVersion,
+            string? dotnetRootPath,
             string? userProfileDir)
         {
             if (string.IsNullOrWhiteSpace(sdkVersion))
@@ -47,8 +47,7 @@ public IReadOnlyCollection<IOptionalSdkTemplatePackageInfo> GetDotnetSdkTemplate
 
             if (string.IsNullOrWhiteSpace(dotnetRootPath))
             {
-                throw new ArgumentException($"'{nameof(dotnetRootPath)}' cannot be null or whitespace",
-                    nameof(dotnetRootPath));
+                throw new ArgumentException($"'{nameof(dotnetRootPath)}' cannot be null or whitespace", nameof(dotnetRootPath));
             }
 
             //  Will the current directory correspond to the folder we are creating a project in?  If we need
diff --git a/test/dotnet.Tests/CommandTests/MSBuild/DotnetMsbuildInProcTests.cs b/test/dotnet.Tests/CommandTests/MSBuild/DotnetMsbuildInProcTests.cs
index a2a26316e3d8..1ea353b3443b 100644
--- a/test/dotnet.Tests/CommandTests/MSBuild/DotnetMsbuildInProcTests.cs
+++ b/test/dotnet.Tests/CommandTests/MSBuild/DotnetMsbuildInProcTests.cs
@@ -54,7 +54,7 @@ private string[] GetArgsForMSBuild(Func<bool> sentinelExists, out Telemetry.Tele
         {
 
             Telemetry.Telemetry.DisableForTests(); // reset static session id modified by telemetry constructor
-            telemetry = new Telemetry.Telemetry(new MockFirstTimeUseNoticeSentinel(sentinelExists));
+            telemetry = new Telemetry.Telemetry();
 
             MSBuildForwardingApp msBuildForwardingApp = new(Enumerable.Empty<string>());
 
diff --git a/test/dotnet.Tests/CommandTests/Tool/Install/ToolInstallGlobalOrToolPathCommandTests.cs b/test/dotnet.Tests/CommandTests/Tool/Install/ToolInstallGlobalOrToolPathCommandTests.cs
index 43184db6b930..4351228c2769 100644
--- a/test/dotnet.Tests/CommandTests/Tool/Install/ToolInstallGlobalOrToolPathCommandTests.cs
+++ b/test/dotnet.Tests/CommandTests/Tool/Install/ToolInstallGlobalOrToolPathCommandTests.cs
@@ -89,7 +89,7 @@ public void WhenPassingRestoreActionConfigOptions()
         {
             var parseResult = Parser.Instance.Parse($"dotnet tool install -g {PackageId} --ignore-failed-sources");
             var toolInstallCommand = new ToolInstallGlobalOrToolPathCommand(parseResult);
-            toolInstallCommand.restoreActionConfig.IgnoreFailedSources.Should().BeTrue();
+            toolInstallCommand._restoreActionConfig.IgnoreFailedSources.Should().BeTrue();
         }
 
         [Fact]
diff --git a/test/dotnet.Tests/CommandTests/Tool/Update/ToolUpdateGlobalOrToolPathCommandTests.cs b/test/dotnet.Tests/CommandTests/Tool/Update/ToolUpdateGlobalOrToolPathCommandTests.cs
index cab679766e46..bf292f08b403 100644
--- a/test/dotnet.Tests/CommandTests/Tool/Update/ToolUpdateGlobalOrToolPathCommandTests.cs
+++ b/test/dotnet.Tests/CommandTests/Tool/Update/ToolUpdateGlobalOrToolPathCommandTests.cs
@@ -108,7 +108,7 @@ public void WhenPassingRestoreActionConfigOptions()
         {
             var parseResult = Parser.Instance.Parse($"dotnet tool update -g {_packageId} --ignore-failed-sources");
             var toolUpdateCommand = new ToolUpdateGlobalOrToolPathCommand(parseResult);
-            toolUpdateCommand._toolInstallGlobalOrToolPathCommand.restoreActionConfig.IgnoreFailedSources.Should().BeTrue();
+            toolUpdateCommand._toolInstallGlobalOrToolPathCommand._restoreActionConfig.IgnoreFailedSources.Should().BeTrue();
         }
 
         [Fact]
diff --git a/test/dotnet.Tests/ConfigurerTests/GivenADotnetFirstTimeUseConfigurerWIthStateSetup.cs b/test/dotnet.Tests/ConfigurerTests/GivenADotnetFirstTimeUseConfigurerWIthStateSetup.cs
index d694240d865b..2acbea846d53 100644
--- a/test/dotnet.Tests/ConfigurerTests/GivenADotnetFirstTimeUseConfigurerWIthStateSetup.cs
+++ b/test/dotnet.Tests/ConfigurerTests/GivenADotnetFirstTimeUseConfigurerWIthStateSetup.cs
@@ -252,10 +252,7 @@ private Telemetry RunConfigUsingMocks(bool isInstallerRun)
 
             configurer.Configure();
 
-            return new Telemetry(firstTimeUseNoticeSentinel,
-                "test",
-                environmentProvider: _environmentProviderObject,
-                senderCount: 0);
+            return new Telemetry("test", environmentProvider: _environmentProviderObject);
         }
 
         private class MockBasicSentinel : IFileSentinel, IFirstTimeUseNoticeSentinel, IAspNetCertificateSentinel
diff --git a/test/dotnet.Tests/TelemetryCommandTest.cs b/test/dotnet.Tests/TelemetryCommandTest.cs
index bda1eaf6e3b2..7414c235a6dd 100644
--- a/test/dotnet.Tests/TelemetryCommandTest.cs
+++ b/test/dotnet.Tests/TelemetryCommandTest.cs
@@ -56,7 +56,7 @@ public void TopLevelCommandNameShouldBeSentToTelemetry()
         public void TopLevelCommandNameShouldBeSentToTelemetryWithPerformanceData()
         {
             string[] args = { "help" };
-            Cli.Program.ProcessArgs(args, new TimeSpan(12345));
+            Cli.Program.ProcessArgs(args);
 
             _fakeTelemetry.LogEntries.Should().Contain(e => e.EventName == "toplevelparser/command" &&
                               e.Properties.ContainsKey("verb") &&
@@ -85,7 +85,7 @@ public void TopLevelCommandNameShouldBeSentToTelemetryWithoutStartupTime()
         public void TopLevelCommandNameShouldBeSentToTelemetryZeroStartupTime()
         {
             string[] args = { "help" };
-            Cli.Program.ProcessArgs(args, new TimeSpan(0));
+            Cli.Program.ProcessArgs(args);
 
             _fakeTelemetry.LogEntries.Should().Contain(e => e.EventName == "toplevelparser/command" &&
                               e.Properties.ContainsKey("verb") &&
@@ -115,7 +115,7 @@ public void DotnetNewCommandFirstArgumentShouldBeSentToTelemetryWithPerformanceD
         {
             const string argumentToSend = "console";
             string[] args = { "new", argumentToSend };
-            Cli.Program.ProcessArgs(args, new TimeSpan(23456));
+            Cli.Program.ProcessArgs(args);
             _fakeTelemetry
                 .LogEntries.Should()
                 .Contain(e => e.EventName == "sublevelparser/command" &&
@@ -272,7 +272,7 @@ public void AnyDotnetCommandVerbosityOpinionShouldBeSentToTelemetryWithPerforman
             const string optionKey = "verbosity";
             const string optionValueToSend = "minimal";
             string[] args = { "restore", "--" + optionKey, optionValueToSend };
-            Cli.Program.ProcessArgs(args, new TimeSpan(34567));
+            Cli.Program.ProcessArgs(args);
             _fakeTelemetry
                 .LogEntries.Should()
                 .Contain(e => e.EventName == "sublevelparser/command" &&
diff --git a/test/dotnet.Tests/TelemetryCommonPropertiesTests.cs b/test/dotnet.Tests/TelemetryCommonPropertiesTests.cs
index 9b35cf3ee457..b85e6b161950 100644
--- a/test/dotnet.Tests/TelemetryCommonPropertiesTests.cs
+++ b/test/dotnet.Tests/TelemetryCommonPropertiesTests.cs
@@ -41,26 +41,24 @@ public void TelemetryCommonPropertiesShouldReturnDevDeviceId()
             var unitUnderTest = new TelemetryCommonProperties(getDeviceId: () => "plaintext", userLevelCacheWriter: new NothingCache());
             unitUnderTest.GetTelemetryCommonProperties()["devdeviceid"].Should().Be("plaintext");
         }
-
         [Fact]
         public void TelemetryCommonPropertiesShouldReturnNewGuidWhenCannotGetMacAddress()
         {
             var unitUnderTest = new TelemetryCommonProperties(getMACAddress: () => null, userLevelCacheWriter: new NothingCache());
             var assignedMachineId = unitUnderTest.GetTelemetryCommonProperties()["Machine ID"];
 
-            Guid.TryParse(assignedMachineId, out var _).Should().BeTrue("it should be a guid");
+            Guid.TryParse((string)assignedMachineId, out var _).Should().BeTrue("it should be a guid");
         }
-
         [Fact]
         public void TelemetryCommonPropertiesShouldEnsureDevDeviceIDIsCached()
         {
             var unitUnderTest = new TelemetryCommonProperties(userLevelCacheWriter: new NothingCache());
             var assignedMachineId = unitUnderTest.GetTelemetryCommonProperties()["devdeviceid"];
 
-            Guid.TryParse(assignedMachineId, out var _).Should().BeTrue("it should be a guid");
+            Guid.TryParse((string)assignedMachineId, out var _).Should().BeTrue("it should be a guid");
             var secondAssignedMachineId = unitUnderTest.GetTelemetryCommonProperties()["devdeviceid"];
 
-            Guid.TryParse(secondAssignedMachineId, out var _).Should().BeTrue("it should be a guid");
+            Guid.TryParse((string)secondAssignedMachineId, out var _).Should().BeTrue("it should be a guid");
             secondAssignedMachineId.Should().Be(assignedMachineId, "it should match the previously assigned guid");
         }
 
@@ -70,14 +68,13 @@ public void TelemetryCommonPropertiesShouldReturnHashedMachineIdOld()
             var unitUnderTest = new TelemetryCommonProperties(getMACAddress: () => "plaintext", userLevelCacheWriter: new NothingCache());
             unitUnderTest.GetTelemetryCommonProperties()["Machine ID Old"].Should().NotBe("plaintext");
         }
-
         [Fact]
         public void TelemetryCommonPropertiesShouldReturnNewGuidWhenCannotGetMacAddressOld()
         {
             var unitUnderTest = new TelemetryCommonProperties(getMACAddress: () => null, userLevelCacheWriter: new NothingCache());
             var assignedMachineId = unitUnderTest.GetTelemetryCommonProperties()["Machine ID Old"];
 
-            Guid.TryParse(assignedMachineId, out var _).Should().BeTrue("it should be a guid");
+            Guid.TryParse((string)assignedMachineId, out var _).Should().BeTrue("it should be a guid");
         }
 
         [Fact]
@@ -107,59 +104,52 @@ public void TelemetryCommonPropertiesShouldContainArchitectureInformation()
             var unitUnderTest = new TelemetryCommonProperties(getMACAddress: () => null, userLevelCacheWriter: new NothingCache());
             unitUnderTest.GetTelemetryCommonProperties()["OS Architecture"].Should().Be(RuntimeInformation.OSArchitecture.ToString());
         }
-
         [WindowsOnlyFact]
         public void TelemetryCommonPropertiesShouldContainWindowsInstallType()
         {
             var unitUnderTest = new TelemetryCommonProperties(getMACAddress: () => null, userLevelCacheWriter: new NothingCache());
-            unitUnderTest.GetTelemetryCommonProperties()["Installation Type"].Should().NotBeEmpty();
+            ((string)unitUnderTest.GetTelemetryCommonProperties()["Installation Type"]).Should().NotBeEmpty();
         }
-
         [UnixOnlyFact]
         public void TelemetryCommonPropertiesShouldContainEmptyWindowsInstallType()
         {
             var unitUnderTest = new TelemetryCommonProperties(getMACAddress: () => null, userLevelCacheWriter: new NothingCache());
-            unitUnderTest.GetTelemetryCommonProperties()["Installation Type"].Should().BeEmpty();
+            ((string)unitUnderTest.GetTelemetryCommonProperties()["Installation Type"]).Should().BeEmpty();
         }
-
         [WindowsOnlyFact]
         public void TelemetryCommonPropertiesShouldContainWindowsProductType()
         {
             var unitUnderTest = new TelemetryCommonProperties(getMACAddress: () => null, userLevelCacheWriter: new NothingCache());
-            unitUnderTest.GetTelemetryCommonProperties()["Product Type"].Should().NotBeEmpty();
+            ((string)unitUnderTest.GetTelemetryCommonProperties()["Product Type"]).Should().NotBeEmpty();
         }
-
         [UnixOnlyFact]
         public void TelemetryCommonPropertiesShouldContainEmptyWindowsProductType()
         {
             var unitUnderTest = new TelemetryCommonProperties(getMACAddress: () => null, userLevelCacheWriter: new NothingCache());
-            unitUnderTest.GetTelemetryCommonProperties()["Product Type"].Should().BeEmpty();
+            ((string)unitUnderTest.GetTelemetryCommonProperties()["Product Type"]).Should().BeEmpty();
         }
-
         [WindowsOnlyFact]
         public void TelemetryCommonPropertiesShouldContainEmptyLibcReleaseAndVersion()
         {
             var unitUnderTest = new TelemetryCommonProperties(getMACAddress: () => null, userLevelCacheWriter: new NothingCache());
-            unitUnderTest.GetTelemetryCommonProperties()["Libc Release"].Should().BeEmpty();
-            unitUnderTest.GetTelemetryCommonProperties()["Libc Version"].Should().BeEmpty();
+            ((string)unitUnderTest.GetTelemetryCommonProperties()["Libc Release"]).Should().BeEmpty();
+            ((string)unitUnderTest.GetTelemetryCommonProperties()["Libc Version"]).Should().BeEmpty();
         }
-
         [MacOsOnlyFact]
         public void TelemetryCommonPropertiesShouldContainEmptyLibcReleaseAndVersion2()
         {
             var unitUnderTest = new TelemetryCommonProperties(getMACAddress: () => null, userLevelCacheWriter: new NothingCache());
-            unitUnderTest.GetTelemetryCommonProperties()["Libc Release"].Should().BeEmpty();
-            unitUnderTest.GetTelemetryCommonProperties()["Libc Version"].Should().BeEmpty();
+            ((string)unitUnderTest.GetTelemetryCommonProperties()["Libc Release"]).Should().BeEmpty();
+            ((string)unitUnderTest.GetTelemetryCommonProperties()["Libc Version"]).Should().BeEmpty();
         }
-
         [LinuxOnlyFact]
         public void TelemetryCommonPropertiesShouldContainLibcReleaseAndVersion()
         {
             if (!RuntimeInformation.RuntimeIdentifier.Contains("alpine", StringComparison.OrdinalIgnoreCase))
             {
                 var unitUnderTest = new TelemetryCommonProperties(getMACAddress: () => null, userLevelCacheWriter: new NothingCache());
-                unitUnderTest.GetTelemetryCommonProperties()["Libc Release"].Should().NotBeEmpty();
-                unitUnderTest.GetTelemetryCommonProperties()["Libc Version"].Should().NotBeEmpty();
+                ((string)unitUnderTest.GetTelemetryCommonProperties()["Libc Release"]).Should().NotBeEmpty();
+                ((string)unitUnderTest.GetTelemetryCommonProperties()["Libc Version"]).Should().NotBeEmpty();
             }
         }
 
diff --git a/test/dotnet.Tests/TelemetryTests/SenderTests.cs b/test/dotnet.Tests/TelemetryTests/SenderTests.cs
deleted file mode 100644
index 98badac85d21..000000000000
--- a/test/dotnet.Tests/TelemetryTests/SenderTests.cs
+++ /dev/null
@@ -1,184 +0,0 @@
-// 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.Net;
-using System.Runtime.CompilerServices;
-using Moq;
-
-namespace Microsoft.DotNet.Cli.Telemetry.PersistenceChannel.Tests
-{
-    public class SenderTests : SdkTest
-    {
-        private int _deleteCount;
-
-        private Mock<StorageTransmission> TransmissionMock { get; }
-
-        private Mock<BaseStorageService> StorageBaseMock { get; }
-
-        public SenderTests(ITestOutputHelper log) : base(log)
-        {
-            StorageBaseMock = new Mock<BaseStorageService>();
-            TransmissionMock = new Mock<StorageTransmission>(string.Empty, new Uri("http://some/url"), new byte[] { },
-                string.Empty, string.Empty);
-            _deleteCount = 0;
-            StorageBaseMock.Setup(storage => storage.Delete(It.IsAny<StorageTransmission>()))
-                .Callback(() => _deleteCount++);
-        }
-
-        [Fact]
-        public void WhenServerReturn503TransmissionWillBeRetried()
-        {
-            var Sender = GetSenderUnderTest();
-            int peekCounts = 0;
-
-            // Setup transmission.SendAsync() to throw WebException that has 503 status Code
-            TransmissionMock.Setup(transmission => transmission.SendAsync())
-                .Throws(GenerateWebException((HttpStatusCode)503));
-
-            // Setup Storage.Peek() to return the mocked transmission, and stop the loop after 10 peeks.
-            StorageBaseMock.Setup(storage => storage.Peek())
-                .Returns(TransmissionMock.Object)
-                .Callback(() =>
-                {
-                    if (peekCounts++ == 10)
-                    {
-                        Sender.StopAsync();
-                    }
-                });
-
-            // Act 
-            Sender.SendLoop();
-            _deleteCount.Should().Be(0,
-                "delete is not expected to be called on 503, request is expected to be send forever.");
-        }
-
-        [Fact]
-        public void WhenServerReturn400IntervalWillBe10Seconds()
-        {
-            var Sender = GetSenderUnderTest();
-            int peekCounts = 0;
-
-            // Setup transmission.SendAsync() to throw WebException that has 400 status Code
-            TransmissionMock.Setup(transmission => transmission.SendAsync())
-                .Throws(GenerateWebException((HttpStatusCode)400));
-
-            // Setup Storage.Peek() to return the mocked transmission, and stop the loop after 10 peeks.
-            StorageBaseMock.Setup(storage => storage.Peek())
-                .Returns(TransmissionMock.Object)
-                .Callback(() =>
-                {
-                    if (peekCounts++ == 10)
-                    {
-                        Sender.StopAsync();
-                    }
-                });
-
-            // Cache the interval (it is a parameter passed to the Send method).
-            TimeSpan intervalOnSixIteration = TimeSpan.Zero;
-            Sender.OnSend = interval => intervalOnSixIteration = interval;
-
-            // Act 
-            Sender.SendLoop();
-
-            intervalOnSixIteration.TotalSeconds.Should().Be(5);
-            _deleteCount.Should().Be(10, "400 should not be retried so delete should always be called.");
-        }
-
-        [Fact]
-        public void DisposeDoesNotThrow()
-        {
-            new Sender(StorageBaseMock.Object,
-                    new PersistenceTransmitter(
-                        CreateStorageService(),
-                        3))
-                .Dispose();
-        }
-
-        [Fact]
-        public void WhenServerReturnDnsErrorRequestWillBeRetried()
-        {
-            var Sender = GetSenderUnderTest();
-            int peekCounts = 0;
-
-            // Setup transmission.SendAsync() to throw WebException with ProxyNameResolutionFailure failure
-            WebException webException = new(
-                string.Empty,
-                new Exception(),
-                WebExceptionStatus.ProxyNameResolutionFailure,
-                null);
-            TransmissionMock.Setup(transmission => transmission.SendAsync()).Throws(webException);
-
-            // Setup Storage.Peek() to return the mocked transmission, and stop the loop after 10 peeks.
-            StorageBaseMock.Setup(storage => storage.Peek())
-                .Returns(TransmissionMock.Object)
-                .Callback(() =>
-                {
-                    if (peekCounts++ == 10)
-                    {
-                        Sender.StopAsync();
-                    }
-                });
-
-            // Act 
-            Sender.SendLoop();
-
-            _deleteCount.Should().Be(0,
-                "delete is not expected to be called on Dns errors since it , request is expected to be retried forever.");
-        }
-
-        private WebException GenerateWebException(HttpStatusCode httpStatusCode)
-        {
-            Mock<HttpWebResponse> httpWebResponse = new();
-            httpWebResponse.SetupGet(webResponse => webResponse.StatusCode).Returns(httpStatusCode);
-
-            WebException webException = new(string.Empty, new Exception(), WebExceptionStatus.SendFailure,
-                httpWebResponse.Object);
-
-            return webException;
-        }
-
-        /// <summary>
-        ///     A class that inherits from Sender, to expose its protected methods.
-        /// </summary>
-        internal class SenderUnderTest : Sender
-        {
-            internal Action<TimeSpan> OnSend = nextSendInterval => { };
-
-            internal SenderUnderTest(BaseStorageService storage, PersistenceTransmitter transmitter)
-                : base(storage, transmitter, false)
-            {
-            }
-
-            internal AutoResetEvent IntervalAutoResetEvent => DelayHandler;
-
-            internal new void SendLoop()
-            {
-                base.SendLoop();
-            }
-
-            protected override bool Send(StorageTransmission transmission, ref TimeSpan nextSendInterval)
-            {
-                OnSend(nextSendInterval);
-                DelayHandler.Set();
-                return base.Send(transmission, ref nextSendInterval);
-            }
-        }
-
-        private StorageService CreateStorageService([CallerMemberName] string testName = null)
-        {
-            string tempPath = Path.Combine(_testAssetsManager.CreateTestDirectory("TestStorageService", identifier: testName).Path, Path.GetTempFileName());
-            StorageService storageService = new();
-            storageService.Init(tempPath);
-            return storageService;
-        }
-
-        private SenderUnderTest GetSenderUnderTest([CallerMemberName] string testName = null)
-        {
-            StorageService storageService = CreateStorageService(testName);
-            PersistenceTransmitter transmitter = new(storageService, 0);
-            return new SenderUnderTest(StorageBaseMock.Object, transmitter);
-        }
-    }
-}
diff --git a/test/dotnet.Tests/TelemetryTests/StorageTests.cs b/test/dotnet.Tests/TelemetryTests/StorageTests.cs
deleted file mode 100644
index b5f63831d491..000000000000
--- a/test/dotnet.Tests/TelemetryTests/StorageTests.cs
+++ /dev/null
@@ -1,202 +0,0 @@
-// 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.Runtime.CompilerServices;
-using Microsoft.ApplicationInsights.Channel;
-using Microsoft.ApplicationInsights.DataContracts;
-using Microsoft.ApplicationInsights.Extensibility.Implementation;
-using IChannelTelemetry = Microsoft.ApplicationInsights.Channel.ITelemetry;
-
-namespace Microsoft.DotNet.Cli.Telemetry.PersistenceChannel.Tests
-{
-    /// <summary>
-    ///     Tests for Storage.
-    /// </summary>
-    /// <remarks>
-    ///     To reduce complexity, there was a design decision to make Storage the file system abstraction layer.
-    ///     That means that Storage knows about the file system types (e.g. IStorageFile or FileInfo).
-    ///     Those types are not easy to mock (even IStorageFile is using extension methods that makes it very hard to mock).
-    ///     Therefore those UnitTests just doesn't mock the file system. Every unit test in <see cref="StorageTests" />
-    ///     reads and writes files to/from the disk.
-    /// </remarks>
-    public class StorageTests : SdkTest
-    {
-        public StorageTests(ITestOutputHelper log) : base(log)
-        {
-        }
-
-        [Fact]
-        public async Task EnqueuedContentIsEqualToPeekedContent()
-        {
-            // Setup
-            StorageService storage = new();
-            storage.Init(GetTemporaryPath());
-            Transmission transmissionToEnqueue = CreateTransmission(new TraceTelemetry("mock_item"));
-
-            // Act
-            await storage.EnqueueAsync(transmissionToEnqueue);
-            StorageTransmission peekedTransmission = storage.Peek();
-
-            // Asserts
-            string enqueuedContent =
-                Encoding.UTF8.GetString(transmissionToEnqueue.Content, 0, transmissionToEnqueue.Content.Length);
-            string peekedContent =
-                Encoding.UTF8.GetString(peekedTransmission.Content, 0, peekedTransmission.Content.Length);
-            enqueuedContent.Should().Be(peekedContent);
-        }
-
-        [Fact]
-        public void DeletedItemIsNotReturnedInCallsToPeek()
-        {
-            // Setup - create a storage with one item
-            StorageService storage = new();
-            storage.Init(GetTemporaryPath());
-            Transmission transmissionToEnqueue = CreateTransmissionAndEnqueueIt(storage);
-
-            // Act
-            StorageTransmission firstPeekedTransmission;
-
-            // if item is not disposed,peek will not return it (regardless of the call to delete). 
-            // So for this test to actually test something, using 'using' is required.  
-            using (firstPeekedTransmission = storage.Peek())
-            {
-                storage.Delete(firstPeekedTransmission);
-            }
-
-            StorageTransmission secondPeekedTransmission = storage.Peek();
-
-            // Asserts            
-            firstPeekedTransmission.Should().NotBeNull();
-            secondPeekedTransmission.Should().BeNull();
-        }
-
-        [Fact]
-        public void PeekedItemIsOnlyReturnedOnce()
-        {
-            // Setup - create a storage with one item
-            StorageService storage = new();
-            storage.Init(GetTemporaryPath());
-
-            Transmission transmissionToEnqueue = CreateTransmissionAndEnqueueIt(storage);
-
-            // Act
-            StorageTransmission firstPeekedTransmission = storage.Peek();
-            StorageTransmission secondPeekedTransmission = storage.Peek();
-
-            // Asserts            
-            firstPeekedTransmission.Should().NotBeNull();
-            secondPeekedTransmission.Should().BeNull();
-        }
-
-        [Fact]
-        public async Task PeekedItemIsReturnedAgainAfterTheItemInTheFirstCallToPeekIsDisposed()
-        {
-            // Setup - create a storage with one item
-            StorageService storage = new();
-            storage.Init(GetTemporaryPath());
-
-            Transmission transmissionToEnqueue = CreateTransmission(new TraceTelemetry("mock_item"));
-            await storage.EnqueueAsync(transmissionToEnqueue);
-
-            // Act
-            StorageTransmission firstPeekedTransmission;
-            using (firstPeekedTransmission = storage.Peek())
-            {
-            }
-
-            StorageTransmission secondPeekedTransmission = storage.Peek();
-
-            // Asserts            
-            firstPeekedTransmission.Should().NotBeNull();
-            secondPeekedTransmission.Should().NotBeNull();
-        }
-
-        [Fact]
-        public void WhenStorageHasTwoItemsThenTwoCallsToPeekReturns2DifferentItems()
-        {
-            // Setup - create a storage with 2 items
-            StorageService storage = new();
-            storage.Init(GetTemporaryPath());
-
-            Transmission firstTransmission = CreateTransmissionAndEnqueueIt(storage);
-            Transmission secondTransmission = CreateTransmissionAndEnqueueIt(storage);
-
-            // Act
-            StorageTransmission firstPeekedTransmission = storage.Peek();
-            StorageTransmission secondPeekedTransmission = storage.Peek();
-
-            // Asserts            
-            firstPeekedTransmission.Should().NotBeNull();
-            secondPeekedTransmission.Should().NotBeNull();
-
-            string first = Encoding.UTF8.GetString(firstPeekedTransmission.Content, 0,
-                firstPeekedTransmission.Content.Length);
-            string second = Encoding.UTF8.GetString(secondPeekedTransmission.Content, 0,
-                secondPeekedTransmission.Content.Length);
-            first.Should().NotBe(second);
-        }
-
-        [Fact]
-        public void WhenMaxFilesIsOneThenSecondTransmissionIsDropped()
-        {
-            // Setup
-            StorageService storage = new();
-            storage.Init(GetTemporaryPath());
-
-            storage.MaxFiles = 1;
-
-            // Act - Enqueue twice
-            CreateTransmissionAndEnqueueIt(storage);
-            CreateTransmissionAndEnqueueIt(storage);
-
-            // Asserts - Second Peek should be null 
-            storage.Peek().Should().NotBeNull();
-            storage.Peek().Should().BeNull();
-        }
-
-        [Fact]
-        public void WhenMaxSizeIsReachedThenEnqueuedTransmissionsAreDropped()
-        {
-            // Setup - create a storage with 2 items
-            StorageService storage = new();
-            storage.Init(GetTemporaryPath());
-
-            storage.CapacityInBytes = 200; // Each file enqueued in CreateTransmissionAndEnqueueIt is ~300 bytes.
-
-            // Act - Enqueue twice
-            CreateTransmissionAndEnqueueIt(storage);
-            CreateTransmissionAndEnqueueIt(storage);
-
-            // Asserts - Second Peek should be null 
-            storage.Peek().Should().NotBeNull();
-            storage.Peek().Should().BeNull();
-        }
-
-        private static Transmission CreateTransmission(IChannelTelemetry telemetry)
-        {
-            byte[] data = JsonSerializer.Serialize(new[] { telemetry });
-            Transmission transmission = new(
-                new Uri(@"http://some.url"),
-                data,
-                "application/x-json-stream",
-                JsonSerializer.CompressionType);
-
-            return transmission;
-        }
-
-        private static Transmission CreateTransmissionAndEnqueueIt(StorageService storage)
-        {
-            Transmission firstTransmission = CreateTransmission(new TraceTelemetry(Guid.NewGuid().ToString()));
-            storage.EnqueueAsync(firstTransmission).ConfigureAwait(false).GetAwaiter().GetResult();
-
-            return firstTransmission;
-        }
-
-        private string GetTemporaryPath([CallerMemberName] string callingMethod = null)
-        {
-            return _testAssetsManager.CreateTestDirectory(callingMethod).Path;
-        }
-    }
-}