Remove trace interfaces from Kestrel transports

src/Servers/Kestrel/Transport.Libuv/src/Internal/LibuvConnection.cs

@@ -36,7 +36,7 @@ internal partial class LibuvConnection : TransportConnection
         private bool _connectionClosed;
 
         public LibuvConnection(UvStreamHandle socket,
-                               ILibuvTrace log,
+                               ILogger log,
                                LibuvThread thread,
                                IPEndPoint remoteEndPoint,
                                IPEndPoint localEndPoint,
@@ -72,7 +72,7 @@ public LibuvConnection(UvStreamHandle socket,
         public PipeReader Output => Application.Input;
 
         public LibuvOutputConsumer OutputConsumer { get; set; }
-        private ILibuvTrace Log { get; }
+        private ILogger Log { get; }
         private LibuvThread Thread { get; }
         public override MemoryPool<byte> MemoryPool => Thread.MemoryPool;
 
@@ -114,7 +114,7 @@ private async Task StartCore()
                     else
                     {
                         // This is unexpected.
-                        Log.ConnectionError(ConnectionId, ex);
+                        LibuvTrace.ConnectionError(Log, ConnectionId, ex);
 
                         inputError = ex;
                         outputError = ex;
@@ -133,7 +133,7 @@ private async Task StartCore()
                     Input.CancelPendingFlush();
 
                     // Send a FIN
-                    Log.ConnectionWriteFin(ConnectionId, inputError.Message);
+                    LibuvTrace.ConnectionWriteFin(Log, ConnectionId, inputError.Message);
 
                     // We're done with the socket now
                     _socket.Dispose();
@@ -204,7 +204,7 @@ private void OnRead(UvStreamHandle handle, int status)
             }
             else if (status > 0)
             {
-                Log.ConnectionRead(ConnectionId, status);
+                LibuvTrace.ConnectionRead(Log, ConnectionId, status);
 
                 Input.Advance(status);
                 var flushTask = Input.FlushAsync();
@@ -225,7 +225,7 @@ private void OnRead(UvStreamHandle handle, int status)
 
                 if (status == LibuvConstants.EOF)
                 {
-                    Log.ConnectionReadFin(ConnectionId);
+                    LibuvTrace.ConnectionReadFin(Log, ConnectionId);
                 }
                 else
                 {
@@ -262,15 +262,15 @@ private void FireConnectionClosed()
 
         private async Task ApplyBackpressureAsync(ValueTask<FlushResult> flushTask)
         {
-            Log.ConnectionPause(ConnectionId);
+            LibuvTrace.ConnectionPause(Log, ConnectionId);
             _socket.ReadStop();
 
             var result = await flushTask;
 
             // If the reader isn't complete or cancelled then resume reading
             if (!result.IsCompleted && !result.IsCanceled)
             {
-                Log.ConnectionResume(ConnectionId);
+                LibuvTrace.ConnectionResume(Log, ConnectionId);
                 StartReading();
             }
         }
@@ -299,13 +299,13 @@ private Exception LogAndWrapReadError(UvException uvError)
             else if (LibuvConstants.IsConnectionReset(uvError.StatusCode))
             {
                 // Log connection resets at a lower (Debug) level.
-                Log.ConnectionReset(ConnectionId);
+                LibuvTrace.ConnectionReset(Log, ConnectionId);
                 return new ConnectionResetException(uvError.Message, uvError);
             }
             else
             {
                 // This is unexpected.
-                Log.ConnectionError(ConnectionId, uvError);
+                LibuvTrace.ConnectionError(Log, ConnectionId, uvError);
                 return new IOException(uvError.Message, uvError);
             }
         }

src/Servers/Kestrel/Transport.Libuv/src/Internal/LibuvConnectionListener.cs

@@ -39,7 +39,7 @@ public LibuvConnectionListener(LibuvFunctions uv, LibuvTransportContext context,
         public List<LibuvThread> Threads { get; } = new List<LibuvThread>();
 
         public IHostApplicationLifetime AppLifetime => TransportContext.AppLifetime;
-        public ILibuvTrace Log => TransportContext.Log;
+        public ILogger Log => TransportContext.Log;
 
 #pragma warning disable CS0618
         public LibuvTransportOptions TransportOptions => TransportContext.Options;

src/Servers/Kestrel/Transport.Libuv/src/Internal/LibuvTrace.cs → src/Servers/Kestrel/Transport.Libuv/src/Internal/LibuvLog.cs

@@ -6,56 +6,42 @@
 
 namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal
 {
-    internal partial class LibuvTrace : ILibuvTrace
+    internal static partial class LibuvTrace
     {
-        private readonly ILogger _logger;
-
-        public LibuvTrace(ILogger logger)
-        {
-            _logger = logger;
-        }
-
-        public void ConnectionRead(string connectionId, int count)
+        public static void ConnectionRead(ILogger logger, string connectionId, int count)
         {
             // Don't log for now since this could be *too* verbose.
             // Reserved: Event ID 3
         }
 
         [LoggerMessage(6, LogLevel.Debug, @"Connection id ""{ConnectionId}"" received FIN.", EventName = nameof(ConnectionReadFin))]
-        public partial void ConnectionReadFin(string connectionId);
+        public static partial void ConnectionReadFin(ILogger logger, string connectionId);
 
         [LoggerMessage(7, LogLevel.Debug, @"Connection id ""{ConnectionId}"" sending FIN because: ""{Reason}""", EventName = nameof(ConnectionWriteFin))]
-        public partial void ConnectionWriteFin(string connectionId, string reason);
+        public static partial void ConnectionWriteFin(ILogger logger, string connectionId, string reason);
 
-        public void ConnectionWrite(string connectionId, int count)
+        public static void ConnectionWrite(ILogger logger, string connectionId, int count)
         {
             // Don't log for now since this could be *too* verbose.
             // Reserved: Event ID 11
         }
 
-        public void ConnectionWriteCallback(string connectionId, int status)
+        public static void ConnectionWriteCallback(ILogger logger, string connectionId, int status)
         {
             // Don't log for now since this could be *too* verbose.
             // Reserved: Event ID 12
         }
 
         [LoggerMessage(14, LogLevel.Debug, @"Connection id ""{ConnectionId}"" communication error.", EventName = nameof(ConnectionError))]
-        public partial void ConnectionError(string connectionId, Exception ex);
+        public static partial void ConnectionError(ILogger logger, string connectionId, Exception ex);
 
         [LoggerMessage(19, LogLevel.Debug, @"Connection id ""{ConnectionId}"" reset.", EventName = nameof(ConnectionReset))]
-        public partial void ConnectionReset(string connectionId);
+        public static partial void ConnectionReset(ILogger logger, string connectionId);
 
         [LoggerMessage(4, LogLevel.Debug, @"Connection id ""{ConnectionId}"" paused.", EventName = nameof(ConnectionPause))]
-        public partial void ConnectionPause(string connectionId);
+        public static partial void ConnectionPause(ILogger logger, string connectionId);
 
         [LoggerMessage(5, LogLevel.Debug, @"Connection id ""{ConnectionId}"" resumed.", EventName = nameof(ConnectionResume))]
-        public partial void ConnectionResume(string connectionId);
-
-        public IDisposable BeginScope<TState>(TState state) => _logger.BeginScope(state);
-
-        public bool IsEnabled(LogLevel logLevel) => _logger.IsEnabled(logLevel);
-
-        public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func<TState, Exception, string> formatter)
-            => _logger.Log(logLevel, eventId, state, exception, formatter);
+        public static partial void ConnectionResume(ILogger logger, string connectionId);
     }
 }

src/Servers/Kestrel/Transport.Libuv/src/Internal/LibuvOutputConsumer.cs

@@ -5,6 +5,7 @@
 using System.IO.Pipelines;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal.Networking;
+using Microsoft.Extensions.Logging;
 
 namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal
 {
@@ -13,15 +14,15 @@ internal class LibuvOutputConsumer
         private readonly LibuvThread _thread;
         private readonly UvStreamHandle _socket;
         private readonly string _connectionId;
-        private readonly ILibuvTrace _log;
+        private readonly ILogger _log;
         private readonly PipeReader _pipe;
 
         public LibuvOutputConsumer(
             PipeReader pipe,
             LibuvThread thread,
             UvStreamHandle socket,
             string connectionId,
-            ILibuvTrace log)
+            ILogger log)
         {
             _pipe = pipe;
             _thread = thread;
@@ -97,7 +98,7 @@ private void LogWriteInfo(int status, Exception error)
         {
             if (error == null)
             {
-                _log.ConnectionWriteCallback(_connectionId, status);
+                LibuvTrace.ConnectionWriteCallback(_log, _connectionId, status);
             }
             else
             {
@@ -108,11 +109,11 @@ private void LogWriteInfo(int status, Exception error)
                 }
                 else if (LibuvConstants.IsConnectionReset(status))
                 {
-                    _log.ConnectionReset(_connectionId);
+                    LibuvTrace.ConnectionReset(_log, _connectionId);
                 }
                 else
                 {
-                    _log.ConnectionError(_connectionId, error);
+                    LibuvTrace.ConnectionError(_log, _connectionId, error);
                 }
             }
         }

src/Servers/Kestrel/Transport.Libuv/src/Internal/LibuvThread.cs

@@ -38,14 +38,14 @@ internal class LibuvThread : PipeScheduler
         private bool _stopImmediate;
         private bool _initCompleted;
         private Exception _closeError;
-        private readonly ILibuvTrace _log;
+        private readonly ILogger _log;
 
         public LibuvThread(LibuvFunctions libuv, LibuvTransportContext libuvTransportContext, int maxLoops = 8)
             : this(libuv, libuvTransportContext.AppLifetime, libuvTransportContext.Options.MemoryPoolFactory(), libuvTransportContext.Log, maxLoops)
         {
         }
 
-        public LibuvThread(LibuvFunctions libuv, IHostApplicationLifetime appLifetime, MemoryPool<byte> pool, ILibuvTrace log, int maxLoops = 8)
+        public LibuvThread(LibuvFunctions libuv, IHostApplicationLifetime appLifetime, MemoryPool<byte> pool, ILogger log, int maxLoops = 8)
         {
             _libuv = libuv;
             _appLifetime = appLifetime;

src/Servers/Kestrel/Transport.Libuv/src/Internal/LibuvTransportContext.cs

@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
 
 namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal
 {
@@ -13,6 +14,6 @@ internal class LibuvTransportContext
 
         public IHostApplicationLifetime AppLifetime { get; set; }
 
-        public ILibuvTrace Log { get; set; }
+        public ILogger Log { get; set; }
     }
 }

src/Servers/Kestrel/Transport.Libuv/src/Internal/LibuvTransportFactory.cs

@@ -37,7 +37,6 @@ public LibuvTransportFactory(
             }
 
             var logger = loggerFactory.CreateLogger("Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv");
-            var trace = new LibuvTrace(logger);
 
 #pragma warning disable CS0618
             var threadCount = options.Value.ThreadCount;
@@ -52,19 +51,19 @@ public LibuvTransportFactory(
 
             if (!LibuvConstants.ECONNRESET.HasValue)
             {
-                trace.LogWarning("Unable to determine ECONNRESET value on this platform.");
+                logger.LogWarning("Unable to determine ECONNRESET value on this platform.");
             }
 
             if (!LibuvConstants.EADDRINUSE.HasValue)
             {
-                trace.LogWarning("Unable to determine EADDRINUSE value on this platform.");
+                logger.LogWarning("Unable to determine EADDRINUSE value on this platform.");
             }
 
             _baseTransportContext = new LibuvTransportContext
             {
                 Options = options.Value,
                 AppLifetime = applicationLifetime,
-                Log = trace,
+                Log = logger,
             };
         }
 

src/Servers/Kestrel/Transport.Libuv/src/Internal/Listener.cs

@@ -25,7 +25,7 @@ public Listener(LibuvTransportContext transportContext) : base(transportContext)
 
         protected UvStreamHandle ListenSocket { get; private set; }
 
-        public ILibuvTrace Log => TransportContext.Log;
+        public ILogger Log => TransportContext.Log;
 
         public Task StartAsync(
             EndPoint endPoint,
@@ -184,7 +184,7 @@ private void OnConnection(UvStreamHandle listenSocket, int status)
             }
             catch (UvException ex) when (LibuvConstants.IsConnectionReset(ex.StatusCode))
             {
-                Log.ConnectionReset("(null)");
+                LibuvTrace.ConnectionReset(Log, "(null)");
                 acceptSocket?.Dispose();
             }
             catch (UvException ex)

src/Servers/Kestrel/Transport.Libuv/src/Internal/ListenerContext.cs

@@ -102,7 +102,7 @@ protected internal void HandleConnection(UvStreamHandle socket)
                     }
                     catch (UvException ex) when (LibuvConstants.IsConnectionReset(ex.StatusCode))
                     {
-                        TransportContext.Log.ConnectionReset("(null)");
+                        LibuvTrace.ConnectionReset(TransportContext.Log, "(null)");
                         socket.Dispose();
                         return;
                     }

src/Servers/Kestrel/Transport.Libuv/src/Internal/ListenerSecondary.cs

@@ -30,7 +30,7 @@ public ListenerSecondary(LibuvTransportContext transportContext) : base(transpor
 
         UvPipeHandle DispatchPipe { get; set; }
 
-        public ILibuvTrace Log => TransportContext.Log;
+        public ILogger Log => TransportContext.Log;
 
         public Task StartAsync(
             string pipeName,
@@ -156,7 +156,7 @@ private void ReadStartCallback(UvStreamHandle handle, int status)
             }
             catch (UvException ex) when (LibuvConstants.IsConnectionReset(ex.StatusCode))
             {
-                Log.ConnectionReset("(null)");
+                LibuvTrace.ConnectionReset(Log, "(null)");
                 acceptSocket.Dispose();
             }
             catch (UvException ex)

src/Servers/Kestrel/Transport.Libuv/src/Internal/Networking/UvAsyncHandle.cs

@@ -4,6 +4,7 @@
 using System;
 using System.Diagnostics;
 using System.Threading;
+using Microsoft.Extensions.Logging;
 
 namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal.Networking
 {
@@ -15,7 +16,7 @@ internal class UvAsyncHandle : UvHandle
         private Action _callback;
         private Action<Action<IntPtr>, IntPtr> _queueCloseHandle;
 
-        public UvAsyncHandle(ILibuvTrace logger) : base(logger)
+        public UvAsyncHandle(ILogger logger) : base(logger)
         {
         }
 

src/Servers/Kestrel/Transport.Libuv/src/Internal/Networking/UvConnectRequest.cs

@@ -16,7 +16,7 @@ internal class UvConnectRequest : UvRequest
         private Action<UvConnectRequest, int, UvException, object> _callback;
         private object _state;
 
-        public UvConnectRequest(ILibuvTrace logger) : base (logger)
+        public UvConnectRequest(ILogger logger) : base (logger)
         {
         }
 

src/Servers/Kestrel/Transport.Libuv/src/Internal/Networking/UvHandle.cs

@@ -4,6 +4,7 @@
 using System;
 using System.Diagnostics;
 using System.Threading;
+using Microsoft.Extensions.Logging;
 
 namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal.Networking
 {
@@ -12,7 +13,7 @@ internal abstract class UvHandle : UvMemory
         private static readonly LibuvFunctions.uv_close_cb _destroyMemory = (handle) => DestroyMemory(handle);
         private Action<Action<IntPtr>, IntPtr> _queueCloseHandle;
 
-        protected UvHandle(ILibuvTrace logger) : base (logger)
+        protected UvHandle(ILogger logger) : base (logger)
         {
         }