FEATURE: update sdk version to target latest stable .net core SDK

FEATURE: use default empty overload in sample
FEATURE: rename GetLogEventLevel to GetLogLevel

Author: Sebastien Roche

global.json

@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "2.2.105"
+    "version": "2.2.402"
   }
-}
+}

samples/InlineInitializationSample/Startup.cs

@@ -48,14 +48,7 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env)
             // Write streamlined request completion events, instead of the more verbose ones from the framework.
             // To use the default framework request logging instead, remove this line and set the "Microsoft"
             // level in appsettings.json to "Information".
-            app.UseSerilogRequestLogging(opts =>
-            {
-                opts.GetLogEventLevel = statusCode =>
-                    statusCode == HttpStatusCode.InternalServerError
-                        ? LogEventLevel.Error
-                        : LogEventLevel.Information;
-                // OR opts.GetLogEventLevel = _ => LogEventLevel.Information;
-            });
+            app.UseSerilogRequestLogging();
 
             app.UseStaticFiles();
             app.UseCookiePolicy();

src/Serilog.AspNetCore/AspNetCore/RequestLoggingMiddleware.cs

@@ -12,35 +12,33 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
-using System.Diagnostics;
-using System.Linq;
-using System.Net;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Features;
 using Serilog.Events;
 using Serilog.Extensions.Hosting;
 using Serilog.Parsing;
+using System;
+using System.Diagnostics;
+using System.Linq;
+using System.Threading.Tasks;
 
 namespace Serilog.AspNetCore
 {
-    class RequestLoggingMiddleware
+    internal class RequestLoggingMiddleware
     {
         readonly RequestDelegate _next;
         readonly DiagnosticContext _diagnosticContext;
         readonly MessageTemplate _messageTemplate;
-        readonly Func<HttpStatusCode, LogEventLevel> _getLogEventLevel;
-
+        readonly Func<HttpContext, LogEventLevel> _getLogLevel;
         static readonly LogEventProperty[] NoProperties = new LogEventProperty[0];
-        
+
         public RequestLoggingMiddleware(RequestDelegate next, DiagnosticContext diagnosticContext, RequestLoggingOptions options)
         {
             if (options == null) throw new ArgumentNullException(nameof(options));
             _next = next ?? throw new ArgumentNullException(nameof(next));
             _diagnosticContext = diagnosticContext ?? throw new ArgumentNullException(nameof(diagnosticContext));
 
-            _getLogEventLevel = options.GetLogEventLevel;
+            _getLogLevel = options.GetLogLevel;
             _messageTemplate = new MessageTemplateParser().Parse(options.MessageTemplate);
         }
 
@@ -71,13 +69,13 @@ public async Task Invoke(HttpContext httpContext)
             }
         }
 
-        bool LogCompletion(HttpContext httpContext, DiagnosticContextCollector collector, int statusCode, double elapsedMs, Exception ex)
+        private bool LogCompletion(HttpContext httpContext, DiagnosticContextCollector collector, int statusCode, double elapsedMs, Exception ex)
         {
             var logger = Log.ForContext<RequestLoggingMiddleware>();
-            var level = _getLogEventLevel((HttpStatusCode)statusCode);
-            
+            var level = _getLogLevel(httpContext);
+
             if (!logger.IsEnabled(level)) return false;
-            
+
             if (!collector.TryComplete(out var collectedProperties))
                 collectedProperties = NoProperties;
 

src/Serilog.AspNetCore/RequestLoggingOptions.cs renamed to src/Serilog.AspNetCore/AspNetCore/RequestLoggingOptions.cs

@@ -12,14 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+using Microsoft.AspNetCore.Http;
 using Serilog.Events;
 using System;
-using System.Net;
 
-namespace Serilog
+namespace Serilog.AspNetCore
 {
     /// <summary>
-    /// Contains options for the Serilog.AspNetCore.RequestLoggingMiddleware.
+    /// Contains options for the <see cref="Serilog.AspNetCore.RequestLoggingMiddleware"/>.
     /// </summary>
     public class RequestLoggingOptions
     {
@@ -35,13 +35,13 @@ public class RequestLoggingOptions
         public string MessageTemplate { get; set; }
 
         /// <summary>
-        /// Gets or sets the function returning the LogEventLevel based on the HttpStatusCode.
+        /// Gets or sets the function returning the <see cref="LogEventLevel"/> based on the current <see cref="HttpContext"/>.
         /// The default behavior returns LogEventLevel.Error when HttpStatusCode is greater than 499
         /// </summary>
         /// <value>
-        /// The function returning the LogEventLevel.
+        /// The function returning the <see cref="LogEventLevel"/>.
         /// </value>
-        public Func<HttpStatusCode, LogEventLevel> GetLogEventLevel { get; set; }
+        public Func<HttpContext, LogEventLevel> GetLogLevel { get; set; }
 
         internal RequestLoggingOptions() { }
     }

src/Serilog.AspNetCore/SerilogApplicationBuilderExtensions.cs

@@ -15,6 +15,7 @@
 using System;
 using System.Net;
 using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Options;
 using Serilog.AspNetCore;
 using Serilog.Events;
@@ -29,8 +30,8 @@ public static class SerilogApplicationBuilderExtensions
         const string DefaultRequestCompletionMessageTemplate =
             "HTTP {RequestMethod} {RequestPath} responded {StatusCode} in {Elapsed:0.0000} ms";
 
-        static readonly Func<HttpStatusCode, LogEventLevel> DefaultGetLogEventLevel = 
-            s => (int) s > 499 ? LogEventLevel.Error : LogEventLevel.Information;
+        static Func<HttpContext, LogEventLevel> DefaultGetLogLevel = 
+            ctx => ctx.Response.StatusCode > 499 ? LogEventLevel.Error : LogEventLevel.Information;
 
         /// <summary>
         /// Adds middleware for streamlined request logging. Instead of writing HTTP request information
@@ -60,7 +61,7 @@ public static IApplicationBuilder UseSerilogRequestLogging(
         /// in <c>Startup.cs</c> before any handlers whose activities should be logged.
         /// </summary>
         /// <param name="app">The application builder.</param>
-        /// <param name="configureOptions"> An System.Action`1 to configure the provided <see cref="Serilog.RequestLoggingOptions" />.</param>
+        /// <param name="configureOptions">A <see cref="System.Action{T}" /> to configure the provided <see cref="RequestLoggingOptions" />.</param>
         /// <returns>The application builder.</returns>
         public static IApplicationBuilder UseSerilogRequestLogging(
             this IApplicationBuilder app,
@@ -70,15 +71,15 @@ public static IApplicationBuilder UseSerilogRequestLogging(
 
             var opts = new RequestLoggingOptions
             {
-                GetLogEventLevel = DefaultGetLogEventLevel,
+                GetLogLevel = DefaultGetLogLevel,
                 MessageTemplate = DefaultRequestCompletionMessageTemplate
             };
             configureOptions?.Invoke(opts);
 
             if (opts.MessageTemplate == null)
                 throw new ArgumentException($"{nameof(opts.MessageTemplate)} cannot be null.");
-            if (opts.GetLogEventLevel == null)
-                throw new ArgumentException($"{nameof(opts.GetLogEventLevel)} cannot be null.");
+            if (opts.GetLogLevel == null)
+                throw new ArgumentException($"{nameof(opts.GetLogLevel)} cannot be null.");
 
             return app.UseMiddleware<RequestLoggingMiddleware>(opts);
         }