move LogWithThreadPoolStats

Author: mgravell

src/StackExchange.Redis/ConnectionMultiplexer.cs

@@ -483,43 +483,21 @@ private static async Task<bool> WaitAllIgnoreErrorsAsync(string name, Task[] tas
                 return true;
             }
 
-            static void LogWithThreadPoolStats(ILogger? log, string message)
-            {
-                if (log?.IsEnabled(LogLevel.Information) != false)
-                {
-                    return;
-                }
-
-                var busyWorkerCount = 0;
-                if (log is not null)
-                {
-                    var sb = new StringBuilder();
-                    sb.Append(message);
-                    busyWorkerCount = PerfCounterHelper.GetThreadPoolStats(out string iocp, out string worker, out string? workItems);
-                    sb.Append(", IOCP: ").Append(iocp).Append(", WORKER: ").Append(worker);
-                    if (workItems is not null)
-                    {
-                        sb.Append(", POOL: ").Append(workItems);
-                    }
-                    log?.LogInformationThreadPoolStats(sb.ToString());
-                }
-            }
-
             var watch = ValueStopwatch.StartNew();
-            LogWithThreadPoolStats(log, $"Awaiting {tasks.Length} {name} task completion(s) for {timeoutMilliseconds}ms");
+            log.LogWithThreadPoolStats($"Awaiting {tasks.Length} {name} task completion(s) for {timeoutMilliseconds}ms");
             try
             {
                 // if none error, great
                 var remaining = timeoutMilliseconds - watch.ElapsedMilliseconds;
                 if (remaining <= 0)
                 {
-                    LogWithThreadPoolStats(log, "Timeout before awaiting for tasks");
+                    log.LogWithThreadPoolStats("Timeout before awaiting for tasks");
                     return false;
                 }
 
                 var allTasks = Task.WhenAll(tasks).ObserveErrors();
                 bool all = await allTasks.TimeoutAfter(timeoutMs: remaining).ObserveErrors().ForAwait();
-                LogWithThreadPoolStats(log, all ? $"All {tasks.Length} {name} tasks completed cleanly" : $"Not all {name} tasks completed cleanly (from {caller}#{callerLineNumber}, timeout {timeoutMilliseconds}ms)");
+                log.LogWithThreadPoolStats(all ? $"All {tasks.Length} {name} tasks completed cleanly" : $"Not all {name} tasks completed cleanly (from {caller}#{callerLineNumber}, timeout {timeoutMilliseconds}ms)");
                 return all;
             }
             catch
@@ -535,7 +513,7 @@ static void LogWithThreadPoolStats(ILogger? log, string message)
                     var remaining = timeoutMilliseconds - watch.ElapsedMilliseconds;
                     if (remaining <= 0)
                     {
-                        LogWithThreadPoolStats(log, "Timeout awaiting tasks");
+                        log.LogWithThreadPoolStats("Timeout awaiting tasks");
                         return false;
                     }
                     try
@@ -546,7 +524,7 @@ static void LogWithThreadPoolStats(ILogger? log, string message)
                     { }
                 }
             }
-            LogWithThreadPoolStats(log, "Finished awaiting tasks");
+            log.LogWithThreadPoolStats("Finished awaiting tasks");
             return false;
         }
 

src/StackExchange.Redis/LoggerExtensions.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Net;
+using System.Text;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 
@@ -23,6 +24,25 @@ internal readonly struct ConfigurationOptionsLogValue(ConfigurationOptions optio
         public override string ToString() => options.ToString(includePassword: false);
     }
 
+    // manual extensions
+    internal static void LogWithThreadPoolStats(this ILogger? log, string message)
+    {
+        if (log is null || !log.IsEnabled(LogLevel.Information))
+        {
+            return;
+        }
+
+        var sb = new StringBuilder();
+        sb.Append(message);
+        _ = PerfCounterHelper.GetThreadPoolStats(out string iocp, out string worker, out string? workItems);
+        sb.Append(", IOCP: ").Append(iocp).Append(", WORKER: ").Append(worker);
+        if (workItems is not null)
+        {
+            sb.Append(", POOL: ").Append(workItems);
+        }
+        log.LogInformationThreadPoolStats(sb.ToString());
+    }
+
     // Generated LoggerMessage methods
     [LoggerMessage(
         Level = LogLevel.Error,