HttpSys log correct statuscode when application throws (#42223)

Author: campersau

src/Servers/HttpSys/src/RequestProcessing/RequestContext.cs

@@ -254,7 +254,6 @@ protected void SetFatalResponse(int status)
     {
         Response.StatusCode = status;
         Response.ContentLength = 0;
-        Dispose();
     }
 
     internal unsafe void Delegate(DelegationRule destination)

src/Servers/HttpSys/src/RequestProcessing/RequestContextOfT.cs

@@ -32,10 +32,12 @@ public override async Task ExecuteAsync()
             if (messagePump.Stopping)
             {
                 SetFatalResponse(503);
+                Dispose();
                 return;
             }
 
             TContext? context = default;
+            Exception? applicationException = null;
             messagePump.IncrementOutstandingRequest();
             try
             {
@@ -49,16 +51,12 @@ public override async Task ExecuteAsync()
                 {
                     await OnCompleted();
                 }
-                application.DisposeContext(context, null);
-                Dispose();
             }
             catch (Exception ex)
             {
+                applicationException = ex;
+
                 Log.RequestProcessError(Logger, ex);
-                if (context != null)
-                {
-                    application.DisposeContext(context, ex);
-                }
                 if (Response.HasStarted)
                 {
                     // Otherwise the default is Cancel = 0x8 (h2) or 0x010c (h3).
@@ -94,11 +92,18 @@ public override async Task ExecuteAsync()
             }
             finally
             {
+                if (context != null)
+                {
+                    application.DisposeContext(context, applicationException);
+                }
+
                 if (messagePump.DecrementOutstandingRequest() == 0 && messagePump.Stopping)
                 {
                     Log.RequestsDrained(Logger);
                     messagePump.SetShutdownSignal();
                 }
+
+                Dispose();
             }
         }
         catch (Exception ex)

src/Servers/test/FunctionalTests/HelloWorldTest.cs

@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using System.Net;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
 using Microsoft.AspNetCore.Testing;
@@ -108,4 +109,56 @@ public async Task HelloWorld(TestVariant variant)
             }
         }
     }
+
+    public static TestMatrix SelfHostTestVariants
+        => TestMatrix.ForServers(ServerType.Kestrel, ServerType.HttpSys)
+            .WithTfms(Tfm.Default)
+            .WithApplicationTypes(ApplicationType.Portable)
+            .WithAllHostingModels()
+            .WithAllArchitectures();
+
+    [ConditionalTheory]
+    [MemberData(nameof(SelfHostTestVariants))]
+    public async Task ApplicationException(TestVariant variant)
+    {
+        var testName = $"ApplicationException_{variant.Server}_{variant.Tfm}_{variant.Architecture}_{variant.ApplicationType}";
+        using (StartLog(out var loggerFactory, LogLevel.Debug, testName))
+        {
+            var logger = loggerFactory.CreateLogger("ApplicationException");
+
+            var deploymentParameters = new DeploymentParameters(variant)
+            {
+                ApplicationPath = Helpers.GetApplicationPath()
+            };
+
+            var output = string.Empty;
+            using (var deployer = new SelfHostDeployer(deploymentParameters, loggerFactory))
+            {
+                deployer.ProcessOutputListener = (data) =>
+                {
+                    if (!string.IsNullOrWhiteSpace(data))
+                    {
+                        output += data + '\n';
+                    }
+                };
+
+                var deploymentResult = await deployer.DeployAsync();
+
+                // Request to base address and check if various parts of the body are rendered & measure the cold startup time.
+                using (var response = await RetryHelper.RetryRequest(() =>
+                {
+                    return deploymentResult.HttpClient.GetAsync("/throwexception");
+                }, logger, deploymentResult.HostShutdownToken))
+                {
+                    Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode);
+
+                    var body = await response.Content.ReadAsStringAsync();
+                    Assert.Empty(body);
+                }
+            }
+            // Output should contain the ApplicationException and the 500 status code
+            Assert.Contains("System.ApplicationException: Application exception", output);
+            Assert.Contains("/throwexception - - - 500", output);
+        }
+    }
 }

src/Servers/testassets/ServerComparison.TestSites/Startup.cs

@@ -12,6 +12,14 @@ public class Startup
 {
     public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory)
     {
+        app.Map("/throwexception", subApp =>
+        {
+            subApp.Run(context =>
+            {
+                throw new ApplicationException("Application exception");
+            });
+        });
+
         app.Run(ctx =>
         {
             return ctx.Response.WriteAsync("Hello World " + RuntimeInformation.ProcessArchitecture);