Rename

Author: JamesNK

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

@@ -99,20 +99,20 @@ protected override void OnRequestProcessingEnded()
     void IRequestProcessor.OnInputOrOutputCompleted()
     {
         // Closed gracefully.
-        _http1Output.Abort(ServerOptions.FinOnError ? new ConnectionAbortedException(CoreStrings.ConnectionAbortedByClient) : null!, ConnectionErrorReason.NoError);
+        _http1Output.Abort(ServerOptions.FinOnError ? new ConnectionAbortedException(CoreStrings.ConnectionAbortedByClient) : null!, ConnectionEndReason.NoError);
         CancelRequestAbortedToken();
     }
 
     void IHttpOutputAborter.OnInputOrOutputCompleted()
     {
-        _http1Output.Abort(new ConnectionAbortedException(CoreStrings.ConnectionAbortedByClient), ConnectionErrorReason.InputOrOutputCompleted);
+        _http1Output.Abort(new ConnectionAbortedException(CoreStrings.ConnectionAbortedByClient), ConnectionEndReason.InputOrOutputCompleted);
         CancelRequestAbortedToken();
     }
 
     /// <summary>
     /// Immediately kill the connection and poison the request body stream with an error.
     /// </summary>
-    public void Abort(ConnectionAbortedException abortReason, ConnectionErrorReason reason)
+    public void Abort(ConnectionAbortedException abortReason, ConnectionEndReason reason)
     {
         _http1Output.Abort(abortReason, reason);
         CancelRequestAbortedToken();
@@ -122,15 +122,15 @@ public void Abort(ConnectionAbortedException abortReason, ConnectionErrorReason
     protected override void ApplicationAbort()
     {
         Log.ApplicationAbortedConnection(ConnectionId, TraceIdentifier);
-        Abort(new ConnectionAbortedException(CoreStrings.ConnectionAbortedByApplication), ConnectionErrorReason.AbortedByApplication);
+        Abort(new ConnectionAbortedException(CoreStrings.ConnectionAbortedByApplication), ConnectionEndReason.AbortedByApplication);
     }
 
     /// <summary>
     /// Stops the request processing loop between requests.
     /// Called on all active connections when the server wants to initiate a shutdown
     /// and after a keep-alive timeout.
     /// </summary>
-    public void StopProcessingNextRequest(ConnectionErrorReason errorReason)
+    public void StopProcessingNextRequest(ConnectionEndReason errorReason)
     {
         _keepAlive = false;
         Input.CancelPendingRead();

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

@@ -72,7 +72,7 @@ protected override Task OnConsumeAsync()
             _context.ReportApplicationError(connectionAbortedException);
 
             // Have to abort the connection because we can't finish draining the request
-            _context.StopProcessingNextRequest(ConnectionErrorReason.AbortedByApplication);
+            _context.StopProcessingNextRequest(ConnectionEndReason.AbortedByApplication);
             return Task.CompletedTask;
         }
 
@@ -108,7 +108,7 @@ protected async Task OnConsumeAsyncAwaited()
             _context.ReportApplicationError(connectionAbortedException);
 
             // Have to abort the connection because we can't finish draining the request
-            _context.StopProcessingNextRequest(ConnectionErrorReason.AbortedByApplication);
+            _context.StopProcessingNextRequest(ConnectionEndReason.AbortedByApplication);
         }
         finally
         {

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

@@ -449,7 +449,7 @@ private void CompletePipe()
         }
     }
 
-    public void Abort(ConnectionAbortedException error, ConnectionErrorReason errorReason)
+    public void Abort(ConnectionAbortedException error, ConnectionEndReason errorReason)
     {
         // Abort can be called after Dispose if there's a flush timeout.
         // It's important to still call _lifetimeFeature.Abort() in this case.
@@ -460,9 +460,9 @@ public void Abort(ConnectionAbortedException error, ConnectionErrorReason errorR
                 return;
             }
 
-            if (errorReason != ConnectionErrorReason.NoError && _metricsTagsFeature != null)
+            if (errorReason != ConnectionEndReason.NoError && _metricsTagsFeature != null)
             {
-                _metricsTagsFeature.TryAddTag("kestrel.connection.error_reason", errorReason.ToString());
+                _metricsTagsFeature.TryAddTag(KestrelMetrics.KestrelConnectionEndReason, errorReason.ToString());
             }
 
             _aborted = true;

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

@@ -7,6 +7,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http;
 
 internal interface IHttpOutputAborter
 {
-    void Abort(ConnectionAbortedException abortReason, ConnectionErrorReason errorReason);
+    void Abort(ConnectionAbortedException abortReason, ConnectionEndReason errorReason);
     void OnInputOrOutputCompleted();
 }

src/Servers/Kestrel/Core/src/Internal/Http2/FlowControl/InputFlowControl.cs

@@ -41,7 +41,7 @@ public bool TryAdvance(int bytes)
             // flow-control window at the time of the abort.
             if (bytes > _flow.Available)
             {
-                throw new Http2ConnectionErrorException(CoreStrings.Http2ErrorFlowControlWindowExceeded, Http2ErrorCode.FLOW_CONTROL_ERROR, ConnectionErrorReason.FlowControlWindowExceeded);
+                throw new Http2ConnectionErrorException(CoreStrings.Http2ErrorFlowControlWindowExceeded, Http2ErrorCode.FLOW_CONTROL_ERROR, ConnectionEndReason.FlowControlWindowExceeded);
             }
 
             if (_flow.IsAborted)