More

Author: JamesNK

src/Middleware/Diagnostics/src/ExceptionHandler/ExceptionHandlerMiddlewareImpl.cs

@@ -171,18 +171,18 @@ private async Task HandleException(HttpContext context, ExceptionDispatchInfo ed
             context.Response.OnStarting(_clearCacheHeadersDelegate, context.Response);
 
             string? handlerTag = null;
-            var result = ExceptionHandlerResult.Unhandled;
+            var result = ExceptionHandledType.Unhandled;
             foreach (var exceptionHandler in _exceptionHandlers)
             {
                 if (await exceptionHandler.TryHandleAsync(context, edi.SourceException, context.RequestAborted))
                 {
-                    result = ExceptionHandlerResult.IExceptionHandler;
+                    result = ExceptionHandledType.ExceptionHandlerService;
                     handlerTag = exceptionHandler.GetType().FullName;
                     break;
                 }
             }
 
-            if (result == ExceptionHandlerResult.Unhandled)
+            if (result == ExceptionHandledType.Unhandled)
             {
                 if (_options.ExceptionHandler is not null)
                 {
@@ -193,12 +193,12 @@ private async Task HandleException(HttpContext context, ExceptionDispatchInfo ed
                     {
                         if (_options.ExceptionHandlingPath.HasValue)
                         {
-                            result = ExceptionHandlerResult.ExceptionHandlingPath;
+                            result = ExceptionHandledType.ExceptionHandlingPath;
                             handlerTag = _options.ExceptionHandlingPath.Value;
                         }
                         else
                         {
-                            result = ExceptionHandlerResult.ExceptionHandler;
+                            result = ExceptionHandledType.ExceptionHandlerCallback;
                         }
                     }
                 }
@@ -212,13 +212,13 @@ private async Task HandleException(HttpContext context, ExceptionDispatchInfo ed
                         Exception = edi.SourceException,
                     }))
                     {
-                        result = ExceptionHandlerResult.ProblemDetailsService;
+                        result = ExceptionHandledType.ProblemDetailsService;
                         handlerTag = _problemDetailsService.GetType().FullName;
                     }
                 }
             }
 
-            if (result != ExceptionHandlerResult.Unhandled || _options.StatusCodeSelector != null || context.Response.StatusCode != StatusCodes.Status404NotFound || _options.AllowStatusCode404Response)
+            if (result != ExceptionHandledType.Unhandled || _options.StatusCodeSelector != null || context.Response.StatusCode != StatusCodes.Status404NotFound || _options.AllowStatusCode404Response)
             {
                 var suppressLogging = false;
 
@@ -227,7 +227,12 @@ private async Task HandleException(HttpContext context, ExceptionDispatchInfo ed
                 // Run the configured callback to determine if the exception logging in middleware should be suppressed.
                 if (_options.SuppressLoggingCallback is { } suppressLoggingCallback)
                 {
-                    var logContext = new ExceptionHandlerSuppressLoggingContext { Exception = edi.SourceException, HandlerResult = result };
+                    var logContext = new ExceptionHandlerSuppressLoggingContext
+                    {
+                        HttpContext = context,
+                        Exception = edi.SourceException,
+                        ExceptionHandledBy = result
+                    };
                     suppressLogging = suppressLoggingCallback(logContext);
                 }
 

src/Middleware/Diagnostics/test/UnitTests/ExceptionHandlerMiddlewareTest.cs

@@ -86,7 +86,7 @@ public async Task ExceptionIsSetOnProblemDetailsContext()
         Assert.Equal("Test exception", originalExceptionMessage);
 
         Assert.IsType<Exception>(loggingContext.Exception);
-        Assert.Equal(ExceptionHandlerResult.ProblemDetailsService, loggingContext.HandlerResult);
+        Assert.Equal(ExceptionHandledType.ProblemDetailsService, loggingContext.ExceptionHandledBy);
     }
 
     [Fact]
@@ -114,9 +114,9 @@ public async Task Invoke_ExceptionThrownResultsInClearedRouteValuesAndEndpoint()
     }
 
     [Theory]
-    [InlineData(ExceptionHandlerResult.ExceptionHandler, false)]
-    [InlineData(ExceptionHandlerResult.ProblemDetailsService, true)]
-    public async Task Invoke_HasExceptionHandler_SuppressLogging_CallbackRun(ExceptionHandlerResult suppressResult, bool logged)
+    [InlineData(ExceptionHandledType.ExceptionHandlerCallback, false)]
+    [InlineData(ExceptionHandledType.ProblemDetailsService, true)]
+    public async Task Invoke_HasExceptionHandler_SuppressLogging_CallbackRun(ExceptionHandledType suppressResult, bool logged)
     {
         // Arrange
         var sink = new TestSink();
@@ -128,7 +128,7 @@ public async Task Invoke_HasExceptionHandler_SuppressLogging_CallbackRun(Excepti
                 context.Features.Set<IHttpResponseFeature>(new TestHttpResponseFeature());
                 return Task.CompletedTask;
             },
-            suppressLoggingCallback: c => c.HandlerResult == suppressResult);
+            suppressLoggingCallback: c => c.ExceptionHandledBy == suppressResult);
         var middleware = CreateMiddleware(_ => throw new InvalidOperationException(), optionsAccessor, loggerFactory: new TestLoggerFactory(sink, true));
 
         // Act & Assert