PR feedback

Author: JamesNK

src/Servers/Kestrel/Core/src/Internal/Http/Http1MessageBody.cs

@@ -115,10 +115,10 @@ protected async Task OnConsumeAsyncAwaited()
         }
     }
 
-    protected override void OnOnbservedBytesExceedMaxRequestBodySize(long? maxRequestBodySize)
+    protected override void OnObservedBytesExceedMaxRequestBodySize(long maxRequestBodySize)
     {
         _context.DisableKeepAlive(ConnectionEndReason.MaxRequestBodySizeExceeded);
-        KestrelBadHttpRequestException.Throw(RequestRejectionReason.RequestBodyTooLarge, maxRequestBodySize.GetValueOrDefault().ToString(CultureInfo.InvariantCulture));
+        KestrelBadHttpRequestException.Throw(RequestRejectionReason.RequestBodyTooLarge, maxRequestBodySize.ToString(CultureInfo.InvariantCulture));
     }
 
     public static MessageBody For(

src/Servers/Kestrel/Core/src/Internal/Http/MessageBody.cs

@@ -191,13 +191,13 @@ protected void AddAndCheckObservedBytes(long observedBytes)
         var maxRequestBodySize = _context.MaxRequestBodySize;
         if (_observedBytes > maxRequestBodySize)
         {
-            OnOnbservedBytesExceedMaxRequestBodySize(maxRequestBodySize);
+            OnObservedBytesExceedMaxRequestBodySize(maxRequestBodySize.Value);
         }
     }
 
-    protected virtual void OnOnbservedBytesExceedMaxRequestBodySize(long? maxRequestBodySize)
+    protected virtual void OnObservedBytesExceedMaxRequestBodySize(long maxRequestBodySize)
     {
-        KestrelBadHttpRequestException.Throw(RequestRejectionReason.RequestBodyTooLarge, maxRequestBodySize.GetValueOrDefault().ToString(CultureInfo.InvariantCulture));
+        KestrelBadHttpRequestException.Throw(RequestRejectionReason.RequestBodyTooLarge, maxRequestBodySize.ToString(CultureInfo.InvariantCulture));
     }
 
     protected ValueTask<ReadResult> StartTimingReadAsync(ValueTask<ReadResult> readAwaitable, CancellationToken cancellationToken)

src/Servers/Kestrel/Core/src/Internal/Infrastructure/KestrelMetrics.cs

@@ -497,7 +497,7 @@ internal static bool TryGetErrorType(ConnectionEndReason reason, [NotNullWhen(tr
             ConnectionEndReason.ServerTimeout => "server_timeout",
             ConnectionEndReason.StreamCreationError => "stream_creation_error",
             ConnectionEndReason.IOError => "io_error",
-            ConnectionEndReason.AppShutdown => "app_shutdown",
+            ConnectionEndReason.AppShutdownTimeout => "app_shutdown_timeout",
             ConnectionEndReason.TlsHandshakeFailed => "tls_handshake_failed",
             ConnectionEndReason.InvalidRequestLine => "invalid_request_line",
             ConnectionEndReason.TlsOverHttp => "tls_over_http",

src/Servers/Kestrel/Core/src/Internal/Infrastructure/TransportConnectionManager.cs

@@ -80,7 +80,7 @@ public async Task<bool> AbortAllConnectionsAsync()
                 // Connection didn't shutdown in allowed time. Force close the connection and set the end reason.
                 KestrelMetrics.AddConnectionEndReason(
                     connection.TransportConnection.Features.Get<IConnectionMetricsContextFeature>()?.MetricsContext,
-                    ConnectionEndReason.AppShutdown, overwrite: true);
+                    ConnectionEndReason.AppShutdownTimeout, overwrite: true);
 
                 connection.TransportConnection.Abort(new ConnectionAbortedException(CoreStrings.ConnectionAbortedDuringServerShutdown));
                 abortTasks.Add(connection.ExecutionTask);

src/Servers/Kestrel/Core/test/Http1/Http1ConnectionTests.cs

@@ -246,7 +246,7 @@ static bool TryReadResponse(ReadResult read, out SequencePosition consumed, out
         }
         Assert.Equal($"{connectionId}:{count:X8}", feature.TraceIdentifier);
 
-        _http1Connection.StopProcessingNextRequest(ConnectionEndReason.AppShutdown);
+        _http1Connection.StopProcessingNextRequest(ConnectionEndReason.AppShutdownTimeout);
         await requestProcessingTask.DefaultTimeout();
     }
 
@@ -572,7 +572,7 @@ public async Task ProcessRequestsAsyncEnablesKeepAliveTimeout()
         var expectedKeepAliveTimeout = _serviceContext.ServerOptions.Limits.KeepAliveTimeout;
         _timeoutControl.Verify(cc => cc.SetTimeout(expectedKeepAliveTimeout, TimeoutReason.KeepAlive));
 
-        _http1Connection.StopProcessingNextRequest(ConnectionEndReason.AppShutdown);
+        _http1Connection.StopProcessingNextRequest(ConnectionEndReason.AppShutdownTimeout);
         _application.Output.Complete();
 
         await requestProcessingTask.DefaultTimeout();
@@ -657,7 +657,7 @@ public async Task RequestProcessingTaskIsUnwrapped()
         var data = Encoding.ASCII.GetBytes("GET / HTTP/1.1\r\nHost:\r\n\r\n");
         await _application.Output.WriteAsync(data);
 
-        _http1Connection.StopProcessingNextRequest(ConnectionEndReason.AppShutdown);
+        _http1Connection.StopProcessingNextRequest(ConnectionEndReason.AppShutdownTimeout);
         Assert.IsNotType<Task<Task>>(requestProcessingTask);
 
         await requestProcessingTask.DefaultTimeout();

src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2ConnectionTests.cs

@@ -5109,7 +5109,7 @@ public async Task StopProcessingNextRequestSendsGracefulGOAWAYThenFinalGOAWAYWhe
 
         await StartStreamAsync(1, _browserRequestHeaders, endStream: false);
 
-        _connection.StopProcessingNextRequest(ConnectionEndReason.AppShutdown);
+        _connection.StopProcessingNextRequest(ConnectionEndReason.AppShutdownTimeout);
         await _closingStateReached.Task.DefaultTimeout();
 
         VerifyGoAway(await ReceiveFrameAsync(), Int32.MaxValue, Http2ErrorCode.NO_ERROR);
@@ -5132,7 +5132,7 @@ await ExpectAsync(Http2FrameType.DATA,
         await _closedStateReached.Task.DefaultTimeout();
         VerifyGoAway(await ReceiveFrameAsync(), 1, Http2ErrorCode.NO_ERROR);
 
-        AssertConnectionEndReason(ConnectionEndReason.AppShutdown);
+        AssertConnectionEndReason(ConnectionEndReason.AppShutdownTimeout);
     }
 
     [Fact]
@@ -5143,7 +5143,7 @@ public async Task AcceptNewStreamsDuringClosingConnection()
 
         await StartStreamAsync(1, _browserRequestHeaders, endStream: false);
 
-        _connection.StopProcessingNextRequest(ConnectionEndReason.AppShutdown);
+        _connection.StopProcessingNextRequest(ConnectionEndReason.AppShutdownTimeout);
         VerifyGoAway(await ReceiveFrameAsync(), Int32.MaxValue, Http2ErrorCode.NO_ERROR);
 
         await _closingStateReached.Task.DefaultTimeout();
@@ -5181,7 +5181,7 @@ await ExpectAsync(Http2FrameType.DATA,
 
         await WaitForConnectionStopAsync(expectedLastStreamId: 3, ignoreNonGoAwayFrames: false);
 
-        AssertConnectionEndReason(ConnectionEndReason.AppShutdown);
+        AssertConnectionEndReason(ConnectionEndReason.AppShutdownTimeout);
     }
 
     [Fact]

src/Servers/Kestrel/test/InMemory.FunctionalTests/KestrelMetricsTests.cs

@@ -305,7 +305,7 @@ public async Task Http1Connection_ServerShutdown_Abort()
 
         Assert.Collection(connectionDuration.GetMeasurementSnapshot(), m =>
         {
-            AssertDuration(m, "127.0.0.1", localPort: 0, "tcp", "ipv4", KestrelMetrics.Http11, error: KestrelMetrics.GetErrorType(ConnectionEndReason.AppShutdown));
+            AssertDuration(m, "127.0.0.1", localPort: 0, "tcp", "ipv4", KestrelMetrics.Http11, error: KestrelMetrics.GetErrorType(ConnectionEndReason.AppShutdownTimeout));
         });
     }
 
@@ -647,7 +647,7 @@ public async Task Http2Connection_ServerShutdown_Abort()
             await shutdownTask;
         }
 
-        Assert.Collection(connectionDuration.GetMeasurementSnapshot(), m => AssertDuration(m, "127.0.0.1", localPort: 0, "tcp", "ipv4", KestrelMetrics.Http2, error: KestrelMetrics.GetErrorType(ConnectionEndReason.AppShutdown)));
+        Assert.Collection(connectionDuration.GetMeasurementSnapshot(), m => AssertDuration(m, "127.0.0.1", localPort: 0, "tcp", "ipv4", KestrelMetrics.Http2, error: KestrelMetrics.GetErrorType(ConnectionEndReason.AppShutdownTimeout)));
     }
 
     [ConditionalFact]

src/Shared/ServerInfrastructure/Http2/ConnectionEndReason.cs

@@ -43,7 +43,7 @@ internal enum ConnectionEndReason
     StreamCreationError,
     IOError,
     ClientGoAway,
-    AppShutdown,
+    AppShutdownTimeout,
     GracefulAppShutdown,
     TransportCompleted,
     TlsHandshakeFailed,