Improve http host error logging

Author: C0nquistadore

src/Dibix.Http.Host/Data/DatabaseScopeMiddleware.cs

@@ -1,5 +1,4 @@
 using System.Threading.Tasks;
-using Dibix.Http.Host.Extensions;
 using Dibix.Http.Server;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;

src/Dibix.Http.Host/Diagnostics/DiagnosticsMiddleware.cs

@@ -0,0 +1,33 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Dibix.Http.Server;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+
+namespace Dibix.Http.Host
+{
+    internal sealed class DiagnosticsMiddleware
+    {
+        private readonly RequestDelegate _next;
+        private readonly ILogger<DiagnosticsMiddleware> _logger;
+        private readonly IOptions<DiagnosticsOptions> _diagnosticsOptions;
+
+        public DiagnosticsMiddleware(RequestDelegate next, ILogger<DiagnosticsMiddleware> logger, IOptions<DiagnosticsOptions> diagnosticsOptions)
+        {
+            _next = next;
+            _logger = logger;
+            _diagnosticsOptions = diagnosticsOptions;
+        }
+
+        public async Task InvokeAsync(HttpContext context)
+        {
+            IDiagnosticScopeProvider scopeProvider = _diagnosticsOptions.Value.Provider;
+            IEnumerable<KeyValuePair<string, object>> scopeProperties = scopeProvider.CollectScopeProperties(context);
+            using (_logger.BeginScope(scopeProperties))
+            {
+                await _next(context).ConfigureAwait(false);
+            }
+        }
+    }
+}

src/Dibix.Http.Host/Diagnostics/DiagnosticsOptions.cs

@@ -0,0 +1,9 @@
+using Dibix.Http.Server;
+
+namespace Dibix.Http.Host
+{
+    internal sealed class DiagnosticsOptions
+    {
+        public IDiagnosticScopeProvider Provider { get; set; } = new DefaultDiagnosticScope();
+    }
+}

src/Dibix.Http.Host/Dibix.Http.Host.csproj.DotSettings

@@ -4,6 +4,7 @@
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=configuration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=cors/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=data/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=diagnostics/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=model/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=registration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=routing/@EntryIndexedValue">True</s:Boolean>

src/Dibix.Http.Host/Model/HttpRequestDescriptor.cs

@@ -5,7 +5,6 @@
 using System.Net;
 using System.Security.Claims;
 using System.Threading.Tasks;
-using Dibix.Http.Host.Extensions;
 using Dibix.Http.Server;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Http;

src/Dibix.Http.Host/Program.cs

@@ -71,7 +71,11 @@ private static async Task Main(string[] args)
                     .AddScoped<IOptionsFactory<JwtBearerOptions>, ScopedJwtBearerOptionsFactory>();
             */
 
-            services.AddLogging(x => x.AddSimpleConsole(y => y.TimestampFormat = "\x1B[1'm'\x1B[37'm'[yyyy-MM-dd HH:mm:ss.fff\x1B[39'm'\x1B[22'm'] "));
+            services.AddLogging(x =>
+            {
+                x.AddSimpleConsole(y => y.TimestampFormat = "\x1B[1'm'\x1B[37'm'[yyyy-MM-dd HH:mm:ss.fff\x1B[39'm'\x1B[22'm'] ");
+                x.Configure(y => y.ActivityTrackingOptions = ActivityTrackingOptions.None);
+            });
 
             services.AddAuthentication()
                     .AddJwtBearer(x =>
@@ -113,6 +117,7 @@ private static async Task Main(string[] args)
 
             WebApplication app = builder.Build();
 
+            app.UseMiddleware<DiagnosticsMiddleware>();
             app.UseExceptionHandler();
             app.UseRouting();
             app.UseMiddleware<DatabaseScopeMiddleware>();

src/Dibix.Http.Host/Registration/DefaultEndpointRegistrar.cs

@@ -1,4 +1,5 @@
 using System;
+using Dibix.Http.Server;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.Logging;

src/Dibix.Http.Host/Registration/EndpointAuthorizationHandlerContextFactory.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Security.Claims;
-using Dibix.Http.Host.Extensions;
+using Dibix.Http.Server;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Authorization.Infrastructure;
 using Microsoft.AspNetCore.Http;

src/Dibix.Http.Host/Registration/HttpHostExtensionRegistrar.cs

@@ -82,6 +82,12 @@ IHttpHostExtensionConfigurationBuilder IHttpHostExtensionConfigurationBuilder.Co
                 return this;
             }
 
+            public IHttpHostExtensionConfigurationBuilder ConfigureDiagnosticScopeProvider<TProvider>() where TProvider : IDiagnosticScopeProvider, new()
+            {
+                _services.Configure<DiagnosticsOptions>(x => x.Provider = new TProvider());
+                return this;
+            }
+
             IHttpHostExtensionConfigurationBuilder IHttpHostExtensionConfigurationBuilder.OnHostStarted(Func<IHttpHostExtensionScope, Task> handler)
             {
                 _onHostStartedExtension = handler;

src/Dibix.Http.Host/Registration/IEndpointImplementationProvider.cs

@@ -1,4 +1,5 @@
 using System;
+using Dibix.Http.Server;
 
 namespace Dibix.Http.Host
 {