diff --git a/samples/Sample/Controllers/HomeController.cs b/samples/Sample/Controllers/HomeController.cs index ec4ab25..8592337 100644 --- a/samples/Sample/Controllers/HomeController.cs +++ b/samples/Sample/Controllers/HomeController.cs @@ -35,6 +35,6 @@ public IActionResult Privacy() [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)] public IActionResult Error() { - return View(new ErrorViewModel {RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier}); + return View(new ErrorViewModel { RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier }); } } \ No newline at end of file diff --git a/samples/Sample/Sample.csproj b/samples/Sample/Sample.csproj index c43ac1a..b5a6d67 100644 --- a/samples/Sample/Sample.csproj +++ b/samples/Sample/Sample.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/Serilog.AspNetCore/AspNetCore/RequestLoggingMiddleware.cs b/src/Serilog.AspNetCore/AspNetCore/RequestLoggingMiddleware.cs index a0bd873..e4f50a8 100644 --- a/src/Serilog.AspNetCore/AspNetCore/RequestLoggingMiddleware.cs +++ b/src/Serilog.AspNetCore/AspNetCore/RequestLoggingMiddleware.cs @@ -32,7 +32,7 @@ class RequestLoggingMiddleware readonly Func> _getMessageTemplateProperties; readonly ILogger? _logger; readonly bool _includeQueryInRequestPath; - static readonly LogEventProperty[] NoProperties = Array.Empty(); + static readonly LogEventProperty[] NoProperties = []; public RequestLoggingMiddleware(RequestDelegate next, DiagnosticContext diagnosticContext, RequestLoggingOptions options) { @@ -102,7 +102,7 @@ bool LogCompletion(HttpContext httpContext, DiagnosticContextCollector collector properties, traceId, spanId); - + logger.Write(evt); return false; diff --git a/src/Serilog.AspNetCore/AspNetCore/RequestLoggingOptions.cs b/src/Serilog.AspNetCore/AspNetCore/RequestLoggingOptions.cs index d782e6d..fe9c1ab 100644 --- a/src/Serilog.AspNetCore/AspNetCore/RequestLoggingOptions.cs +++ b/src/Serilog.AspNetCore/AspNetCore/RequestLoggingOptions.cs @@ -35,13 +35,12 @@ static LogEventLevel DefaultGetLevel(HttpContext ctx, double _, Exception? ex) = : LogEventLevel.Information; static IEnumerable DefaultGetMessageTemplateProperties(HttpContext httpContext, string requestPath, double elapsedMs, int statusCode) => - new[] - { + [ new LogEventProperty("RequestMethod", new ScalarValue(httpContext.Request.Method)), new LogEventProperty("RequestPath", new ScalarValue(requestPath)), new LogEventProperty("StatusCode", new ScalarValue(statusCode)), new LogEventProperty("Elapsed", new ScalarValue(elapsedMs)) - }; + ]; /// /// Gets or sets the message template. The default value is diff --git a/src/Serilog.AspNetCore/Serilog.AspNetCore.csproj b/src/Serilog.AspNetCore/Serilog.AspNetCore.csproj index 875f204..26da33d 100644 --- a/src/Serilog.AspNetCore/Serilog.AspNetCore.csproj +++ b/src/Serilog.AspNetCore/Serilog.AspNetCore.csproj @@ -35,10 +35,7 @@ - - - diff --git a/test/Serilog.AspNetCore.Tests/SerilogWebHostBuilderExtensionsTests.cs b/test/Serilog.AspNetCore.Tests/SerilogWebHostBuilderExtensionsTests.cs index 7d4f8a1..61ea07a 100644 --- a/test/Serilog.AspNetCore.Tests/SerilogWebHostBuilderExtensionsTests.cs +++ b/test/Serilog.AspNetCore.Tests/SerilogWebHostBuilderExtensionsTests.cs @@ -71,12 +71,11 @@ public async Task RequestLoggingMiddlewareShouldEnrichWithCustomisedProperties() { options.MessageTemplate = "HTTP {RequestMethod} responded {Status} in {ElapsedMilliseconds:0.0000} ms"; options.GetMessageTemplateProperties = (ctx, _, elapsedMs, status) => - new[] - { + [ new LogEventProperty("RequestMethod", new ScalarValue(ctx.Request.Method)), new LogEventProperty("Status", new ScalarValue(status)), new LogEventProperty("ElapsedMilliseconds", new ScalarValue(elapsedMs)) - }; + ]; }); await web.CreateClient().GetAsync("/resource"); @@ -164,7 +163,7 @@ WebApplicationFactory Setup( return web; } - + [Fact] public async Task RequestLoggingMiddlewareShouldAddTraceAndSpanIds() { diff --git a/test/Serilog.AspNetCore.Tests/Support/SerilogSink.cs b/test/Serilog.AspNetCore.Tests/Support/SerilogSink.cs index 62e5966..a231d32 100644 --- a/test/Serilog.AspNetCore.Tests/Support/SerilogSink.cs +++ b/test/Serilog.AspNetCore.Tests/Support/SerilogSink.cs @@ -8,7 +8,7 @@ namespace Serilog.AspNetCore.Tests.Support; public class SerilogSink : ILogEventSink { - public List Writes { get; set; } = new(); + public List Writes { get; set; } = []; public void Emit(LogEvent logEvent) {