activities for dnx

Author: baronfel

src/Cli/dotnet/Commands/Tool/Execute/ToolExecuteCommand.cs

@@ -44,13 +44,20 @@ public override int Execute()
         VersionRange versionRange = _parseResult.GetVersionRange();
         PackageId packageId = new PackageId(_packageToolIdentityArgument.Id);
 
+        var toolLocationActivity = Activities.Source.StartActivity("find-tool");
+        toolLocationActivity?.SetTag("packageId", packageId.ToString());
+        toolLocationActivity?.SetTag("versionRange", versionRange?.ToString() ?? "latest");
+
         //  Look in local tools manifest first, but only if version is not specified
         if (versionRange == null)
         {
             var localToolsResolverCache = new LocalToolsResolverCache();
 
             if (_toolManifestFinder.TryFindPackageId(packageId, out var toolManifestPackage))
             {
+                toolLocationActivity?.SetTag("kind", "local");
+                toolLocationActivity?.Stop();
+
                 var toolPackageRestorer = new ToolPackageRestorer(
                     _toolPackageDownloader,
                     _sources,
@@ -82,10 +89,12 @@ public override int Execute()
                 additionalFeeds: _addSource);
 
         (var bestVersion, var packageSource) = _toolPackageDownloader.GetNuGetVersion(packageLocation, packageId, _verbosity, versionRange, _restoreActionConfig);
+        toolLocationActivity?.SetTag("kind", "one-shot");
+        toolLocationActivity?.Stop();
 
         //  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,  verbosity: _verbosity, out var toolPackage))
+        if (!_toolPackageDownloader.TryGetDownloadedTool(packageId, bestVersion, targetFramework: null, verbosity: _verbosity, out var toolPackage))
         {
             if (!UserAgreedToRunFromSource(packageId, bestVersion, packageSource))
             {
@@ -119,9 +128,12 @@ public override int Execute()
                 restoreActionConfig: _restoreActionConfig);
         }
 
+        using var toolExecuteActivity = Activities.Source.StartActivity("execute-tool");
+        toolExecuteActivity?.SetTag("packageId", packageId.ToString());
+        toolExecuteActivity?.SetTag("version", toolPackage.Version.ToString());
+        toolExecuteActivity?.SetTag("source", toolPackage.Command.Runner);
         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;
     }

src/Cli/dotnet/InteractiveConsole.cs

@@ -4,6 +4,7 @@
 using System.CommandLine;
 using System.Diagnostics.CodeAnalysis;
 using Microsoft.DotNet.Cli.Commands;
+using Microsoft.DotNet.Cli.Utils;
 
 namespace Microsoft.DotNet.Cli;
 
@@ -30,6 +31,8 @@ public static class InteractiveConsole
             return null;
         }
 
+        using var _ = Activities.Source.StartActivity("confirm-run-from-source");
+
         Console.Write(AddPromptOptions(message));
 
         while (true)