Fix dotnet-gcdump to use wildcard process id for dotnet-dsrouter.

Author: lateralusX

src/Microsoft.Diagnostics.NETCore.Client/DiagnosticsIpc/IpcTransport.cs

@@ -262,25 +262,7 @@ public override async Task WaitForConnectionAsync(CancellationToken token)
 
         private string GetDefaultAddress()
         {
-            try
-            {
-                Process process = Process.GetProcessById(_pid);
-            }
-            catch (ArgumentException)
-            {
-                throw new ServerNotAvailableException($"Process {_pid} is not running.");
-            }
-            catch (InvalidOperationException)
-            {
-                throw new ServerNotAvailableException($"Process {_pid} seems to be elevated.");
-            }
-
-            if (!TryGetDefaultAddress(_pid, out string transportName))
-            {
-                throw new ServerNotAvailableException($"Process {_pid} not running compatible .NET runtime.");
-            }
-
-            return transportName;
+            return GetDefaultAddress(_pid);
         }
 
         private static bool TryGetDefaultAddress(int pid, out string defaultAddress)
@@ -330,6 +312,40 @@ private static bool TryGetDefaultAddress(int pid, out string defaultAddress)
             return !string.IsNullOrEmpty(defaultAddress);
         }
 
+        public static string GetDefaultAddress(int pid)
+        {
+            try
+            {
+                Process process = Process.GetProcessById(pid);
+            }
+            catch (ArgumentException)
+            {
+                throw new ServerNotAvailableException($"Process {pid} is not running.");
+            }
+            catch (InvalidOperationException)
+            {
+                throw new ServerNotAvailableException($"Process {pid} seems to be elevated.");
+            }
+
+            if (!TryGetDefaultAddress(pid, out string defaultAddress))
+            {
+                throw new ServerNotAvailableException($"Process {pid} not running compatible .NET runtime.");
+            }
+
+            return defaultAddress;
+        }
+
+        public static bool IsDefaultAddressDSRouter(int pid, string address)
+        {
+            if (address.StartsWith(IpcRootPath, StringComparison.OrdinalIgnoreCase))
+            {
+                address = address.Substring(IpcRootPath.Length);
+            }
+
+            string dsrouterAddress = $"dotnet-diagnostic-dsrouter-{pid}";
+            return address.StartsWith(dsrouterAddress, StringComparison.OrdinalIgnoreCase);
+        }
+
         public override bool Equals(object obj)
         {
             return Equals(obj as PidIpcEndpoint);

src/Tools/dotnet-dsrouter/DiagnosticsServerRouterCommands.cs

@@ -369,7 +369,7 @@ private static string GetDefaultIpcServerPath(ILogger logger)
             }
 
             logger?.LogDebug($"Using default IPC server path, {path}.");
-            logger?.LogDebug($"Attach to default dotnet-dsrouter IPC server using -p {processId} diagnostic tooling argument.");
+            logger?.LogDebug($"Attach to default dotnet-dsrouter IPC server using --process-id {processId} diagnostic tooling argument.");
 
             return path;
         }

src/Tools/dotnet-gcdump/CommandLine/CollectCommandHandler.cs

@@ -32,7 +32,7 @@ internal static class CollectCommandHandler
         /// <returns></returns>
         private static async Task<int> Collect(CancellationToken ct, IConsole console, int processId, string output, int timeout, bool verbose, string name, string diagnosticPort)
         {
-            if (!CommandUtils.ValidateArgumentsForAttach (processId, name, diagnosticPort, out int resolvedProcessId))
+            if (!CommandUtils.ValidateArgumentsForAttach(processId, name, diagnosticPort, out int resolvedProcessId))
             {
                 return -1;
             }

src/Tools/dotnet-gcdump/DotNetHeapDump/EventPipeDotNetHeapDumper.cs

@@ -165,10 +165,9 @@ public static bool DumpFromEventPipe(CancellationToken ct, int processId, string
 
                 gcDumpSession.Source.Clr.GCStart += delegate (GCStartTraceData data)
                 {
-                    if (processId == 0)
+                    if (gcDumpSession.UseWildcardProcessId)
                     {
                         processId = data.ProcessID;
-                        log.WriteLine("Process wildcard selects process id {0}", processId);
                     }
                     if (data.ProcessID != processId)
                     {
@@ -217,7 +216,7 @@ public static bool DumpFromEventPipe(CancellationToken ct, int processId, string
 
                 if (memoryGraph != null)
                 {
-                    dumper.SetupCallbacks(memoryGraph, gcDumpSession.Source, processId.ToString());
+                    dumper.SetupCallbacks(memoryGraph, gcDumpSession.Source, gcDumpSession.UseWildcardProcessId ? null : processId.ToString());
                 }
 
                 // Set up a separate thread that will listen for EventPipe events coming back telling us we succeeded.
@@ -323,8 +322,23 @@ internal sealed class EventPipeSessionController : IDisposable
         public IReadOnlyList<EventPipeProvider> Providers => _providers.AsReadOnly();
         public EventPipeEventSource Source => _source;
 
+        public bool UseWildcardProcessId => _diagnosticPort != null;
+
         public EventPipeSessionController(int pid, string diagnosticPort, List<EventPipeProvider> providers, bool requestRundown = true)
         {
+            if (string.IsNullOrEmpty(diagnosticPort))
+            {
+                try
+                {
+                    string defaultAddress = PidIpcEndpoint.GetDefaultAddress(pid);
+                    if (!string.IsNullOrEmpty(defaultAddress) && PidIpcEndpoint.IsDefaultAddressDSRouter(pid, defaultAddress))
+                    {
+                        diagnosticPort = defaultAddress + ",connect";
+                    }
+                }
+                catch { }
+            }
+
             if (!string.IsNullOrEmpty(diagnosticPort))
             {
                 _diagnosticPort = IpcEndpointConfig.Parse(diagnosticPort);