diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Filter/FilteredStreamAdapter.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Filter/FilteredStreamAdapter.cs
index de144a0cc0..7174f10171 100644
--- a/src/Microsoft.AspNetCore.Server.Kestrel/Filter/FilteredStreamAdapter.cs
+++ b/src/Microsoft.AspNetCore.Server.Kestrel/Filter/FilteredStreamAdapter.cs
@@ -48,7 +48,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Filter
         {
             if (copyAsyncTask.IsFaulted)
             {
-                _log.LogError("FilteredStreamAdapter.CopyToAsync", copyAsyncTask.Exception);
+                _log.LogError(0, copyAsyncTask.Exception, "FilteredStreamAdapter.CopyToAsync");
             }
             else if (copyAsyncTask.IsCanceled)
             {
@@ -62,7 +62,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Filter
             }
             catch (Exception ex)
             {
-                _log.LogError("FilteredStreamAdapter.OnStreamClose", ex);
+                _log.LogError(0, ex, "FilteredStreamAdapter.OnStreamClose");
             }
         }
     }
diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/Connection.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/Connection.cs
index 0708796ecb..15f57a8076 100644
--- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/Connection.cs
+++ b/src/Microsoft.AspNetCore.Server.Kestrel/Http/Connection.cs
@@ -87,7 +87,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Http
 
                         if (task.IsFaulted)
                         {
-                            connection.Log.LogError("ConnectionFilter.OnConnection", task.Exception);
+                            connection.Log.LogError(0, task.Exception, "ConnectionFilter.OnConnection");
                             connection.ConnectionControl.End(ProduceEndType.SocketDisconnect);
                         }
                         else if (task.IsCanceled)
@@ -103,7 +103,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Http
                 }
                 catch (Exception ex)
                 {
-                    Log.LogError("ConnectionFilter.OnConnection", ex);
+                    Log.LogError(0, ex, "ConnectionFilter.OnConnection");
                     ConnectionControl.End(ProduceEndType.SocketDisconnect);
                 }
             }
diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/Frame.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/Frame.cs
index c6b5fe05f0..0c83003b88 100644
--- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/Frame.cs
+++ b/src/Microsoft.AspNetCore.Server.Kestrel/Http/Frame.cs
@@ -302,7 +302,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Http
                 }
                 catch (Exception ex)
                 {
-                    Log.LogError("Abort", ex);
+                    Log.LogError(0, ex, "Abort");
                 }
 
                 try
@@ -311,7 +311,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Http
                 }
                 catch (Exception ex)
                 {
-                    Log.LogError("Abort", ex);
+                    Log.LogError(0, ex, "Abort");
                 }
                 _abortedCts = null;
             }
diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameOfT.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameOfT.cs
index e9498b1d40..0d9ea1d673 100644
--- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameOfT.cs
+++ b/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameOfT.cs
@@ -140,7 +140,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Http
             }
             catch (Exception ex)
             {
-                Log.LogWarning("Connection processing ended abnormally", ex);
+                Log.LogWarning(0, ex, "Connection processing ended abnormally");
             }
             finally
             {
@@ -163,7 +163,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Http
                 }
                 catch (Exception ex)
                 {
-                    Log.LogWarning("Connection shutdown abnormally", ex);
+                    Log.LogWarning(0, ex, "Connection shutdown abnormally");
                 }
             }
         }
diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/Listener.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/Listener.cs
index d4137ad369..d43f54e58a 100644
--- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/Listener.cs
+++ b/src/Microsoft.AspNetCore.Server.Kestrel/Http/Listener.cs
@@ -56,7 +56,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Http
             var listener = (Listener) state;
             if (error != null)
             {
-                listener.Log.LogError("Listener.ConnectionCallback ", error);
+                listener.Log.LogError(0, error, "Listener.ConnectionCallback");
             }
             else
             {
diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/ListenerPrimary.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/ListenerPrimary.cs
index e9af35d142..58f46e14b8 100644
--- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/ListenerPrimary.cs
+++ b/src/Microsoft.AspNetCore.Server.Kestrel/Http/ListenerPrimary.cs
@@ -69,7 +69,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Http
             catch (UvException ex)
             {
                 dispatchPipe.Dispose();
-                Log.LogError("ListenerPrimary.OnListenPipe", ex);
+                Log.LogError(0, ex, "ListenerPrimary.OnListenPipe");
                 return;
             }
 
diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/ListenerSecondary.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/ListenerSecondary.cs
index b20c35ebc8..18d69c1dd5 100644
--- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/ListenerSecondary.cs
+++ b/src/Microsoft.AspNetCore.Server.Kestrel/Http/ListenerSecondary.cs
@@ -112,7 +112,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Http
                 {
                     Exception ex;
                     Thread.Loop.Libuv.Check(status, out ex);
-                    Log.LogError("DispatchPipe.ReadStart", ex);
+                    Log.LogError(0, ex, "DispatchPipe.ReadStart");
                 }
 
                 DispatchPipe.Dispose();
@@ -132,7 +132,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Http
             }
             catch (UvException ex)
             {
-                Log.LogError("DispatchPipe.Accept", ex);
+                Log.LogError(0, ex, "DispatchPipe.Accept");
                 acceptSocket.Dispose();
                 return;
             }
diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/PipeListener.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/PipeListener.cs
index 9e6849087f..19a10c552f 100644
--- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/PipeListener.cs
+++ b/src/Microsoft.AspNetCore.Server.Kestrel/Http/PipeListener.cs
@@ -46,7 +46,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Http
             }
             catch (UvException ex)
             {
-                Log.LogError("PipeListener.OnConnection", ex);
+                Log.LogError(0, ex, "PipeListener.OnConnection");
                 acceptSocket.Dispose();
                 return;
             }
diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/PipeListenerPrimary.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/PipeListenerPrimary.cs
index 6454fb6f58..4381a43c8b 100644
--- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/PipeListenerPrimary.cs
+++ b/src/Microsoft.AspNetCore.Server.Kestrel/Http/PipeListenerPrimary.cs
@@ -46,7 +46,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Http
             }
             catch (UvException ex)
             {
-                Log.LogError("ListenerPrimary.OnConnection", ex);
+                Log.LogError(0, ex, "ListenerPrimary.OnConnection");
                 acceptSocket.Dispose();
                 return;
             }
diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/SocketOutput.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/SocketOutput.cs
index 3e58a4b178..bb39a268ae 100644
--- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/SocketOutput.cs
+++ b/src/Microsoft.AspNetCore.Server.Kestrel/Http/SocketOutput.cs
@@ -653,7 +653,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Http
                     }
                     catch (Exception ex)
                     {
-                        Self._log.LogError("SocketOutput.OnWriteCompleted", ex);
+                        Self._log.LogError(0, ex, "SocketOutput.OnWriteCompleted");
                     }
                 }
             }
diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/TcpListener.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/TcpListener.cs
index 113f9f69b7..4c0f8f19ba 100644
--- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/TcpListener.cs
+++ b/src/Microsoft.AspNetCore.Server.Kestrel/Http/TcpListener.cs
@@ -48,7 +48,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Http
             }
             catch (UvException ex)
             {
-                Log.LogError("TcpListener.OnConnection", ex);
+                Log.LogError(0, ex, "TcpListener.OnConnection");
                 acceptSocket.Dispose();
                 return;
             }
diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/TcpListenerPrimary.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/TcpListenerPrimary.cs
index 6721e8b012..6c1697cfe8 100644
--- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/TcpListenerPrimary.cs
+++ b/src/Microsoft.AspNetCore.Server.Kestrel/Http/TcpListenerPrimary.cs
@@ -50,7 +50,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Http
             }
             catch (UvException ex)
             {
-                Log.LogError("TcpListenerPrimary.OnConnection", ex);
+                Log.LogError(0, ex, "TcpListenerPrimary.OnConnection");
                 acceptSocket.Dispose();
                 return;
             }
diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/KestrelThread.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/KestrelThread.cs
index 82c6f11f0a..bd9ac3020c 100644
--- a/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/KestrelThread.cs
+++ b/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/KestrelThread.cs
@@ -333,7 +333,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel
                     }
                     else
                     {
-                        _log.LogError("KestrelThread.DoPostWork", ex);
+                        _log.LogError(0, ex, "KestrelThread.DoPostWork");
                         throw;
                     }
                 }
@@ -362,7 +362,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel
                 }
                 catch (Exception ex)
                 {
-                    _log.LogError("KestrelThread.DoPostCloseHandle", ex);
+                    _log.LogError(0, ex, "KestrelThread.DoPostCloseHandle");
                     throw;
                 }
             }
diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/KestrelTrace.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/KestrelTrace.cs
index 5e8a2ee28f..9be3819e8b 100644
--- a/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/KestrelTrace.cs
+++ b/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/KestrelTrace.cs
@@ -115,7 +115,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel
 
         public virtual void ApplicationError(Exception ex)
         {
-            _logger.LogError(13, "An unhandled exception was thrown by the application.", ex);
+            _logger.LogError(13, ex, "An unhandled exception was thrown by the application.");
         }
 
         public virtual void ConnectionError(long connectionId, Exception ex)
@@ -128,7 +128,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel
             _connectionDisconnectedWrite(_logger, connectionId, count, ex);
         }
 
-        public virtual void Log(LogLevel logLevel, int eventId, object state, Exception exception, Func<object, Exception, string> formatter)
+        public virtual void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func<TState, Exception, string> formatter)
         {
             _logger.Log(logLevel, eventId, state, exception, formatter);
         }
diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvConnectRequest.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvConnectRequest.cs
index 1ceb8f9e51..bccd31a57b 100644
--- a/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvConnectRequest.cs
+++ b/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvConnectRequest.cs
@@ -66,7 +66,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Networking
             }
             catch (Exception ex)
             {
-                req._log.LogError("UvConnectRequest", ex);
+                req._log.LogError(0, ex, "UvConnectRequest");
                 throw;
             }
         }
diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvStreamHandle.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvStreamHandle.cs
index e60de40d3b..3b88c74a16 100644
--- a/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvStreamHandle.cs
+++ b/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvStreamHandle.cs
@@ -133,7 +133,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Networking
             }
             catch (Exception ex)
             {
-                stream._log.LogError("UvConnectionCb", ex);
+                stream._log.LogError(0, ex, "UvConnectionCb");
                 throw;
             }
         }
@@ -147,7 +147,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Networking
             }
             catch (Exception ex)
             {
-                stream._log.LogError("UvAllocCb", ex);
+                stream._log.LogError(0, ex, "UvAllocCb");
                 buf = stream.Libuv.buf_init(IntPtr.Zero, 0);
                 throw;
             }
@@ -163,7 +163,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Networking
             }
             catch (Exception ex)
             {
-                stream._log.LogError("UbReadCb", ex);
+                stream._log.LogError(0, ex, "UbReadCb");
                 throw;
             }
         }
diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvWriteReq.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvWriteReq.cs
index cdefbdaf9c..576fce68c2 100644
--- a/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvWriteReq.cs
+++ b/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvWriteReq.cs
@@ -177,7 +177,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Networking
             }
             catch (Exception ex)
             {
-                req._log.LogError("UvWriteCb", ex);
+                req._log.LogError(0, ex, "UvWriteCb");
                 throw;
             }
         }
diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/EngineTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/EngineTests.cs
index acfa41fb36..920e3151af 100644
--- a/test/Microsoft.AspNetCore.Server.KestrelTests/EngineTests.cs
+++ b/test/Microsoft.AspNetCore.Server.KestrelTests/EngineTests.cs
@@ -1167,10 +1167,10 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
                 return true;
             }
 
-            public void Log(LogLevel logLevel, int eventId, object state, Exception exception, Func<object, Exception, string> formatter)
+            public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func<TState, Exception, string> formatter)
             {
                 // Application errors are logged using 13 as the eventId.
-                if (eventId == 13)
+                if (eventId.Id == 13)
                 {
                     ApplicationErrorsLogged++;
                 }
diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/TestLogger.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/TestLogger.cs
index 2697a4b7ef..eead43b301 100644
--- a/test/Microsoft.AspNetCore.Server.KestrelTests/TestLogger.cs
+++ b/test/Microsoft.AspNetCore.Server.KestrelTests/TestLogger.cs
@@ -28,7 +28,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
 
         public class TestLogger : ILogger
         {
-            public void Log(LogLevel logLevel, int eventId, object state, Exception exception, Func<object, Exception, string> formatter)
+            public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func<TState, Exception, string> formatter)
             {
 #if false
                 Console.WriteLine($"Log {logLevel}[{eventId}]: {formatter(state, exception)} {exception?.Message}");