Allow debugging specific projects (#163)

docs/commandline/tye-run.md

@@ -47,9 +47,9 @@ If a directory path is specified, `tye run` will default to using these files, i
 
     Write distributed traces to the specified providers. Supported providers are zipkin.
 
-- `--debug`
+- `--debug <service>`
 
-    Waits for debugger attach in all services.
+    Waits for debugger attach to service. Specify `*` to wait to attach to all services.
 
 ## Examples
 
@@ -68,5 +68,5 @@ If a directory path is specified, `tye run` will default to using these files, i
 - Run an application and wait for all projects to debug attach:
 
     ```text
-    tye run --debug
+    tye run --debug *
     ```

src/Microsoft.Tye.Hosting/ProcessRunner.cs

@@ -18,14 +18,12 @@ namespace Microsoft.Tye.Hosting
     public class ProcessRunner : IApplicationProcessor
     {
         private readonly ILogger _logger;
-        private readonly bool _debugMode;
+        private readonly ProcessRunnerOptions _options;
-        private readonly bool _buildProjects;
 
         public ProcessRunner(ILogger logger, ProcessRunnerOptions options)
         {
             _logger = logger;
-            _debugMode = options.DebugMode;
+            _options = options;
-            _buildProjects = options.BuildProjects;
         }
 
         public Task StartAsync(Tye.Hosting.Model.Application application)
@@ -103,7 +101,7 @@ namespace Microsoft.Tye.Hosting
             if (service.Status.ProjectFilePath != null &&
                 service.Description.RunInfo is ProjectRunInfo project2 &&
                 project2.Build &&
-                _buildProjects)
+                _options.BuildProjects)
             {
                 // Sometimes building can fail because of file locking (like files being open in VS)
                 _logger.LogInformation("Building project {ProjectFile}", service.Status.ProjectFilePath);
@@ -146,7 +144,7 @@ namespace Microsoft.Tye.Hosting
 
                 application.PopulateEnvironment(service, (k, v) => environment[k] = v);
 
-                if (_debugMode)
+                if (_options.DebugMode && (_options.DebugAllServices || _options.ServicesToDebug.Contains(serviceName, StringComparer.OrdinalIgnoreCase)))
                 {
                     environment["DOTNET_STARTUP_HOOKS"] = typeof(Hosting.Runtime.HostingRuntimeHelpers).Assembly.Location;
                 }

src/Microsoft.Tye.Hosting/ProcessRunnerOptions.cs

@@ -11,13 +11,17 @@ namespace Microsoft.Tye.Hosting
     {
         public bool DebugMode { get; set; }
         public bool BuildProjects { get; set; }
+        public string[]? ServicesToDebug { get; set; }
+        public bool DebugAllServices { get; set; }
 
-        public static ProcessRunnerOptions FromArgs(string[] args)
+        public static ProcessRunnerOptions FromArgs(string[] args, string[] servicesToDebug)
         {
             return new ProcessRunnerOptions
             {
                 BuildProjects = !args.Contains("--no-build"),
-                DebugMode = args.Contains("--debug")
+                DebugMode = args.Contains("--debug"),
+                ServicesToDebug = servicesToDebug,
+                DebugAllServices = servicesToDebug.Contains("*", StringComparer.OrdinalIgnoreCase)
             };
         }
     }

src/Microsoft.Tye.Hosting/TyeHost.cs

@@ -34,11 +34,18 @@ namespace Microsoft.Tye.Hosting
 
         private readonly Tye.Hosting.Model.Application _application;
         private readonly string[] _args;
+        private readonly string[] _servicesToDebug;
 
         public TyeHost(Tye.Hosting.Model.Application application, string[] args)
+            : this(application, args, new string[0])
+        {
+        }
+
+        public TyeHost(Tye.Hosting.Model.Application application, string[] args, string[] servicesToDebug)
         {
             _application = application;
             _args = args;
+            _servicesToDebug = servicesToDebug;
         }
 
         public Tye.Hosting.Model.Application Application => _application;
@@ -73,7 +80,7 @@ namespace Microsoft.Tye.Hosting
 
             var configuration = app.Configuration;
 
-            _processor = CreateApplicationProcessor(_args, _logger, configuration);
+            _processor = CreateApplicationProcessor(_args, _servicesToDebug, _logger, configuration);
 
             await app.StartAsync();
 
@@ -238,7 +245,7 @@ namespace Microsoft.Tye.Hosting
             return false;
         }
 
-        private static AggregateApplicationProcessor CreateApplicationProcessor(string[] args, Microsoft.Extensions.Logging.ILogger logger, IConfiguration configuration)
+        private static AggregateApplicationProcessor CreateApplicationProcessor(string[] args, string[] _servicesToDebug, Microsoft.Extensions.Logging.ILogger logger, IConfiguration configuration)
         {
             var diagnosticOptions = DiagnosticOptions.FromConfiguration(configuration);
             var diagnosticsCollector = new DiagnosticsCollector(logger, diagnosticOptions);
@@ -251,7 +258,7 @@ namespace Microsoft.Tye.Hosting
                 new EventPipeDiagnosticsRunner(logger, diagnosticsCollector),
                 new ProxyService(logger),
                 new DockerRunner(logger),
-                new ProcessRunner(logger, ProcessRunnerOptions.FromArgs(args)),
+                new ProcessRunner(logger, ProcessRunnerOptions.FromArgs(args, _servicesToDebug)),
             };
 
             // If the docker command is specified then transform the ProjectRunInfo into DockerRunInfo

src/tye/Program.RunCommand.cs

@@ -51,7 +51,8 @@ namespace Microsoft.Tye
 
             command.AddOption(new Option("--debug")
             {
-                Description = "Wait for debugger attach in all services.",
+                Argument = new Argument<string[]>("service"),
+                Description = "Wait for debugger attach to specific service. Specify \"*\" to wait for all services.",
                 Required = false
             });
 
@@ -61,7 +62,7 @@ namespace Microsoft.Tye
                 Required = false
             });
 
-            command.Handler = CommandHandler.Create<IConsole, FileInfo>(async (console, path) =>
+            command.Handler = CommandHandler.Create<IConsole, FileInfo, string[]>(async (console, path, debug) =>
             {
                 // Workaround for https://github.com/dotnet/command-line-api/issues/723#issuecomment-593062654
                 if (path is null)
@@ -74,7 +75,7 @@ namespace Microsoft.Tye
 
                 InitializeThreadPoolSettings(serviceCount);
 
-                using var host = new TyeHost(application.ToHostingApplication(), args);
+                using var host = new TyeHost(application.ToHostingApplication(), args, debug);
                 await host.RunAsync();
             });