add traces to dotnet new instantiation

baronfel · baronfel · commit f342f22acb14 · 2025-07-16T23:34:34.000-05:00
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -161,4 +161,4 @@
     <PackageVersion Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildMinimumVersion)" />
     <PackageVersion Include="Microsoft.NET.StringTools" Version="$(MicrosoftBuildMinimumVersion)" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/Activities.cs b/src/Cli/Microsoft.DotNet.Cli.Utils/Activities.cs
@@ -17,4 +17,17 @@ public static class Activities
     /// consumers to easily filter and trace CLI activities.
     /// </summary>
     public static ActivitySource Source { get; } = new("dotnet-cli", Product.Version);
+
+    /// <summary>
+    /// The environment variable used to transfer the chain of parent activity IDs.
+    /// This should be used when constructing new sub-processes in order to 
+    /// track spans across calls.
+    /// </summary>
+    public const string DOTNET_CLI_TRACEPARENT = nameof(DOTNET_CLI_TRACEPARENT);
+    /// <summary>
+    /// The environment variable used to transfer the trace state of the parent activities.
+    /// This should be used when constructing new sub-processes in order to 
+    /// track spans across calls.
+    /// </summary>
+    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
@@ -199,7 +199,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.TemplateEngine.Cli/Commands/create/InstantiateCommand.cs b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/create/InstantiateCommand.cs
@@ -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))
             {
@@ -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
@@ -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())
                 {
diff --git 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
@@ -30,6 +30,7 @@ internal TemplateListCoordinator(
             _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);
         }
 
diff --git a/src/Cli/dotnet/Activities.cs b/src/Cli/dotnet/Activities.cs
diff --git a/src/Cli/dotnet/Commands/New/BuiltInTemplatePackageProvider.cs b/src/Cli/dotnet/Commands/New/BuiltInTemplatePackageProvider.cs
@@ -3,6 +3,7 @@
 
 #nullable disable
 
+using Microsoft.DotNet.Cli.Utils;
 using Microsoft.TemplateEngine.Abstractions;
 using Microsoft.TemplateEngine.Abstractions.TemplatePackage;
 using NuGet.Versioning;
@@ -44,7 +45,7 @@ private static IEnumerable<string> GetTemplateFolders(IEngineEnvironmentSettings
     {
         var templateFoldersToInstall = new List<string>();
 
-        var sdksDirectory = new DirectoryInfo(environmentSettings.Environment.GetEnvironmentVariable("MSBuildSDKsPath"));
+        var sdksDirectory = new DirectoryInfo(MSBuildForwardingAppWithoutLogging.GetMSBuildSDKsPath());
         var sdkDirectory = sdksDirectory.Parent!;
         var sdkVersion = sdkDirectory.Name;
         var dotnetRootPath = sdkDirectory.Parent!.Parent!;
diff --git a/src/Cli/dotnet/Commands/New/OptionalWorkloadProvider.cs b/src/Cli/dotnet/Commands/New/OptionalWorkloadProvider.cs
@@ -3,6 +3,7 @@
 
 #nullable disable
 
+using Microsoft.DotNet.Cli.Commands.MSBuild;
 using Microsoft.DotNet.Cli.Utils;
 using Microsoft.DotNet.Configurer;
 using Microsoft.TemplateEngine.Abstractions;
@@ -33,7 +34,7 @@ public Task<IReadOnlyList<ITemplatePackage>> GetAllTemplatePackagesAsync(Cancell
     {
         var list = new List<TemplatePackage>();
         var optionalWorkloadLocator = new TemplateLocator.TemplateLocator();
-        var sdksDirectory = new DirectoryInfo(_environmentSettings.Environment.GetEnvironmentVariable("MSBuildSDKsPath"));
+        var sdksDirectory = new DirectoryInfo(MSBuildForwardingAppWithoutLogging.GetMSBuildSDKsPath());
         var sdkDirectory = sdksDirectory.Parent!;
         var sdkVersion = sdkDirectory.Name;
         var dotnetRootPath = sdkDirectory.Parent!.Parent!;
diff --git a/src/Cli/dotnet/Commands/Tool/Install/ToolInstallGlobalOrToolPathCommand.cs b/src/Cli/dotnet/Commands/Tool/Install/ToolInstallGlobalOrToolPathCommand.cs
@@ -144,7 +144,7 @@ public override int Execute()
 
     private int ExecuteInstallCommand(PackageId packageId)
     {
-        using var _activity = Activities.s_source.StartActivity("install-tool");
+        using var _activity = Activities.Source.StartActivity("install-tool");
         _activity?.DisplayName = $"Install {packageId}";
         _activity?.SetTag("toolId", packageId);
         ValidateArguments();
@@ -193,7 +193,7 @@ private int ExecuteInstallCommand(PackageId packageId)
 
             RunWithHandlingInstallError(() =>
             {
-                var toolPackageDownloaderActivity = Activities.s_source.StartActivity("download-tool-package");
+                var toolPackageDownloaderActivity = Activities.Source.StartActivity("download-tool-package");
                 IToolPackage newInstalledPackage = toolPackageDownloader.InstallPackage(
                 new PackageLocation(nugetConfig: GetConfigFile(), sourceFeedOverrides: _source, additionalFeeds: _addSource),
                     packageId: packageId,
@@ -222,7 +222,7 @@ private int ExecuteInstallCommand(PackageId packageId)
                         null :
                         NuGetFramework.Parse(_framework);
                 }
-                var shimActivity = Activities.s_source.StartActivity("create-shell-shim");
+                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();
diff --git a/src/Cli/dotnet/Program.cs b/src/Cli/dotnet/Program.cs
@@ -55,7 +55,7 @@ static Program()
             {
                 r.AddService("dotnet-cli", serviceVersion: Product.Version);
             })
-            .AddMeter(Activities.s_source.Name)
+            .AddMeter(Activities.Source.Name)
             .AddHttpClientInstrumentation()
             .AddRuntimeInstrumentation()
             .AddOtlpExporter()
@@ -65,13 +65,13 @@ static Program()
             {
                 r.AddService("dotnet-cli", serviceVersion: Product.Version);
             })
-            .AddSource(Activities.s_source.Name)
+            .AddSource(Activities.Source.Name)
             .AddHttpClientInstrumentation()
             .AddOtlpExporter()
             .SetSampler(new AlwaysOnSampler())
             .Build();
         (var s_parentActivityContext, var s_activityKind) = DeriveParentActivityContextFromEnv();
-        s_mainActivity = Activities.s_source.CreateActivity("main", s_activityKind, s_parentActivityContext);
+        s_mainActivity = Activities.Source.CreateActivity("main", s_activityKind, s_parentActivityContext);
         s_mainActivity?.Start();
         s_mainActivity?.SetStartTime(Process.GetCurrentProcess().StartTime);
         TrackHostStartup(s_mainTimeStamp);
@@ -134,7 +134,7 @@ public static void Shutdown(PosixSignalContext context)
         s_mainActivity?.Stop();
         tracerProvider?.ForceFlush();
         metricsProvider?.ForceFlush();
-        Activities.s_source.Dispose();
+        Activities.Source.Dispose();
     }
 
     /// <summary>
@@ -177,7 +177,7 @@ private static (ActivityContext parentActivityContext, ActivityKind kind) Derive
 
     private static void TrackHostStartup(DateTime mainTimeStamp)
     {
-        var hostStartupActivity = Activities.s_source.StartActivity("host-startup");
+        var hostStartupActivity = Activities.Source.StartActivity("host-startup");
         hostStartupActivity?.SetStartTime(Process.GetCurrentProcess().StartTime);
         hostStartupActivity?.SetEndTime(mainTimeStamp);
         hostStartupActivity?.SetStatus(ActivityStatusCode.Ok);
@@ -251,7 +251,7 @@ internal static int ProcessArgs(string[] args)
 
     private static int LookupAndExecuteCommand(string[] args, ParseResult parseResult)
     {
-        var _lookupExternalCommandActivity = Activities.s_source.StartActivity("lookup-external-command");
+        var _lookupExternalCommandActivity = Activities.Source.StartActivity("lookup-external-command");
         string commandName = "dotnet-" + parseResult.GetValue(Parser.DotnetSubCommand);
         var resolvedCommandSpec = CommandResolver.TryResolveCommandSpec(
             new DefaultCommandResolverPolicy(),
@@ -270,7 +270,7 @@ private static int LookupAndExecuteCommand(string[] args, ParseResult parseResul
             var resolvedCommand = CommandFactoryUsingResolver.CreateOrThrow(commandName, resolvedCommandSpec);
             _lookupExternalCommandActivity?.Dispose();
             
-            using var _executionActivity = Activities.s_source.StartActivity("execute-extensible-command");
+            using var _executionActivity = Activities.Source.StartActivity("execute-extensible-command");
             var result = resolvedCommand.Execute();
             return result.ExitCode;
         }
@@ -279,7 +279,7 @@ private static int LookupAndExecuteCommand(string[] args, ParseResult parseResul
     static void InvokeBuiltInCommand(ParseResult parseResult, out int exitCode)
     {
         Debug.Assert(parseResult.CanBeInvoked());
-        using var _invocationActivity = Activities.s_source.StartActivity("invocation");
+        using var _invocationActivity = Activities.Source.StartActivity("invocation");
         try
         {
             exitCode = parseResult.Invoke();
@@ -333,7 +333,7 @@ private static ITelemetry InitializeTelemetry()
     private static ParseResult ParseArgs(string[] args)
     {
         ParseResult parseResult;
-        using (var _parseActivity = Activities.s_source.StartActivity("parse"))
+        using (var _parseActivity = Activities.Source.StartActivity("parse"))
         {
             parseResult = Parser.Instance.Parse(args);
 
@@ -350,7 +350,7 @@ private static ParseResult ParseArgs(string[] args)
 
     private static void SetupDotnetFirstRun(ParseResult parseResult)
     {
-        using (var _firstTimeUseActivity = Activities.s_source.StartActivity("first-time-use"))
+        using (var _firstTimeUseActivity = Activities.Source.StartActivity("first-time-use"))
         {
             IFirstTimeUseNoticeSentinel firstTimeUseNoticeSentinel = new FirstTimeUseNoticeSentinel();
 
diff --git a/src/Cli/dotnet/ToolPackage/ToolPackageDownloader.cs b/src/Cli/dotnet/ToolPackage/ToolPackageDownloader.cs
@@ -66,7 +66,7 @@ protected override NuGetVersion DownloadAndExtractPackage(
         string? folderToDeleteOnFailure = null;
         return TransactionalAction.Run(() =>
         {
-            var _downloadActivity = Activities.s_source.StartActivity("download-tool");
+            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();
@@ -93,7 +93,7 @@ protected override NuGetVersion DownloadAndExtractPackage(
                 Reporter.Output.WriteLine($"Extracting package {packageId}@{packageVersion} to {packagePath}");
             }
             // Extract the package
-            var _extractActivity = Activities.s_source.StartActivity("extract-tool");
+            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();
diff --git a/src/Cli/dotnet/ToolPackage/ToolPackageDownloaderBase.cs b/src/Cli/dotnet/ToolPackage/ToolPackageDownloaderBase.cs
@@ -187,7 +187,7 @@ 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.s_source.StartActivity("move-global-tool-content");
+                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();
@@ -376,7 +376,7 @@ protected void UpdateRuntimeConfig(
         ToolPackageInstance toolPackageInstance
         )
     {
-        using var _updateRuntimeConfigActivity = Activities.s_source.StartActivity("update-runtimeconfig");
+        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/test/dotnet.Tests/ConfigurerTests/GivenADotnetFirstTimeUseConfigurerWIthStateSetup.cs b/test/dotnet.Tests/ConfigurerTests/GivenADotnetFirstTimeUseConfigurerWIthStateSetup.cs
@@ -252,9 +252,7 @@ private Telemetry RunConfigUsingMocks(bool isInstallerRun)
 
             configurer.Configure();
 
-            return new Telemetry("test",
-                environmentProvider: _environmentProviderObject,
-                senderCount: 0);
+            return new Telemetry("test", environmentProvider: _environmentProviderObject);
         }
 
         private class MockBasicSentinel : IFileSentinel, IFirstTimeUseNoticeSentinel, IAspNetCertificateSentinel
diff --git a/test/dotnet.Tests/TelemetryCommonPropertiesTests.cs b/test/dotnet.Tests/TelemetryCommonPropertiesTests.cs

Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,7 @@ private static string GetMSBuildExePath()`
`199`	`199`	`MSBuildExeName);`
`200`	`200`	`}`
`201`	`201`
`202`		`- private static string GetMSBuildSDKsPath()`
	`202`	`+ public static string GetMSBuildSDKsPath()`
`203`	`203`	`{`
`204`	`204`	`var envMSBuildSDKsPath = Environment.GetEnvironmentVariable("MSBuildSDKsPath");`
`205`	`205`
Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,7 @@ internal static async Task<IEnumerable<TemplateGroup>> GetTemplateGroupsAsync(`
`74`	`74`	`HostSpecificDataLoader hostSpecificDataLoader,`
`75`	`75`	`CancellationToken cancellationToken)`
`76`	`76`	`{`
	`77`	`+ using var createTemplateGroupsActivity = Activities.Source.StartActivity("create-template-groups");`
`77`	`78`	`IReadOnlyList<ITemplateInfo> templates = await templatePackageManager.GetTemplatesAsync(cancellationToken).ConfigureAwait(false);`
`78`	`79`	`return TemplateGroup.FromTemplateList(CliTemplateInfo.FromTemplateInfo(templates, hostSpecificDataLoader));`
`79`	`80`	`}`
`@@ -84,6 +85,7 @@ internal static HashSet<TemplateCommand> GetTemplateCommand(`
`84`	`85`	`TemplatePackageManager templatePackageManager,`
`85`	`86`	`TemplateGroup templateGroup)`
`86`	`87`	`{`
	`88`	`+ using var getTemplateActivity = Activities.Source.StartActivity("get-template-command");`
`87`	`89`	`//groups templates in the group by precedence`
`88`	`90`	`foreach (IGrouping<int, CliTemplateInfo> templateGrouping in templateGroup.Templates.GroupBy(g => g.Precedence).OrderByDescending(g => g.Key))`
`89`	`91`	`{`
`@@ -204,6 +206,8 @@ private static async Task<NewCommandStatus> ExecuteIntAsync(`
`204`	`206`
`205`	`207`	`return await templateListCoordinator.DisplayCommandDescriptionAsync(instantiateArgs, cancellationToken).ConfigureAwait(false);`
`206`	`208`	`}`
	`209`	`+ using var createActivity = Activities.Source.StartActivity("instantiate-command");`
	`210`	`+ createActivity?.DisplayName = $"Invoke '{instantiateArgs.ShortName}'";`
`207`	`211`
`208`	`212`	`IEnumerable<TemplateGroup> allTemplateGroups = await GetTemplateGroupsAsync(`
`209`	`213`	`templatePackageManager,`
`@@ -273,10 +277,11 @@ private static async Task<NewCommandStatus> HandleTemplateInstantiationAsync(`
`273`	`277`	`{`
`274`	`278`	`TemplateCommand templateCommandToRun = candidates.Single();`
`275`	`279`	`args.Command.Subcommands.Add(templateCommandToRun);`
`276`		`-`
	`280`	`+ var templateParseActivity = Activities.Source.StartActivity("reparse-for-template");`
`277`	`281`	`ParseResult updatedParseResult = args.ParseResult.RootCommandResult.Command.Parse(`
`278`	`282`	`args.ParseResult.Tokens.Select(t => t.Value).ToArray(),`
`279`	`283`	`args.ParseResult.Configuration);`
	`284`	`+ templateParseActivity?.Stop();`
`280`	`285`	`return await candidates.Single().InvokeAsync(updatedParseResult, cancellationToken).ConfigureAwait(false);`
`281`	`286`	`}`
`282`	`287`	`else if (candidates.Any())`
Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,7 @@ internal TemplateInvoker(`
`37`	`37`
`38`	`38`	`internal async Task<NewCommandStatus> InvokeTemplateAsync(TemplateCommandArgs templateArgs, CancellationToken cancellationToken)`
`39`	`39`	`{`
	`40`	`+ using var invokerActivity = Activities.Source.StartActivity("invoker-invoking");`
`40`	`41`	`cancellationToken.ThrowIfCancellationRequested();`
`41`	`42`
`42`	`43`	`CliTemplateInfo templateToRun = templateArgs.Template;`
`@@ -158,6 +159,7 @@ private async Task<NewCommandStatus> CreateTemplateAsync(TemplateCommandArgs tem`
`158`	`159`
`159`	`160`	`try`
`160`	`161`	`{`
	`162`	`+ using var templateCreationActivity = Activities.Source.StartActivity("actual-instantiate-template");`
`161`	`163`	`instantiateResult = await _templateCreator.InstantiateAsync(`
`162`	`164`	`templateArgs.Template,`
`163`	`165`	`templateArgs.Name,`
`@@ -306,6 +308,7 @@ private async Task<NewCommandStatus> CreateTemplateAsync(TemplateCommandArgs tem`
`306`	`308`
`307`	`309`	`private NewCommandStatus HandlePostActions(ITemplateCreationResult creationResult, TemplateCommandArgs args)`
`308`	`310`	`{`
	`311`	`+ using var postActionActivity = Activities.Source.StartActivity("post-actions");`
`309`	`312`	`PostActionExecutionStatus result = _postActionDispatcher.Process(creationResult, args.IsDryRun, args.AllowScripts ?? AllowRunScripts.Prompt);`
`310`	`313`
`311`	`314`	`return result switch`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@ internal TemplateListCoordinator(`
`30`	`30`	`_templatePackageManager = templatePackageManager ?? throw new ArgumentNullException(nameof(templatePackageManager));`
`31`	`31`	`_hostSpecificDataLoader = hostSpecificDataLoader ?? throw new ArgumentNullException(nameof(hostSpecificDataLoader));`
`32`	`32`	`_defaultLanguage = engineEnvironmentSettings.GetDefaultLanguage();`
	`33`	`+ using var constraintManagerActivity = Activities.Source.StartActivity("create-constraints");`
`33`	`34`	`_constraintManager = new TemplateConstraintManager(_engineEnvironmentSettings);`
`34`	`35`	`}`
`35`	`36`