Adds a few most useful enrichers from the Serilog.Classic.Web project (we dont want all thex extra bloat such as handlers etc)

src/Umbraco.Core/Logging/Serilog/Enrichers/HttpRequestIdEnricher.cs

@@ -0,0 +1,61 @@
+using System;
+using System.Web;
+using Serilog.Core;
+using Serilog.Events;
+
+namespace Umbraco.Core.Logging.Serilog.Enrichers
+{
+    /// <summary>
+    /// Enrich log events with a HttpRequestId GUID.
+    /// Original source - https://github.com/serilog-web/classic/blob/master/src/SerilogWeb.Classic/Classic/Enrichers/HttpRequestIdEnricher.cs
+    /// Nupkg: 'Serilog.Web.Classic' contains handlers & extra bits we do not want
+    /// </summary>
+    internal class HttpRequestIdEnricher : ILogEventEnricher
+    {
+        /// <summary>
+        /// The property name added to enriched log events.
+        /// </summary>
+        public const string HttpRequestIdPropertyName = "HttpRequestId";
+
+        static readonly string RequestIdItemName = typeof(HttpRequestIdEnricher).Name + "+RequestId";
+
+        /// <summary>
+        /// Enrich the log event with an id assigned to the currently-executing HTTP request, if any.
+        /// </summary>
+        /// <param name="logEvent">The log event to enrich.</param>
+        /// <param name="propertyFactory">Factory for creating new properties to add to the event.</param>
+        public void Enrich(LogEvent logEvent, ILogEventPropertyFactory propertyFactory)
+        {
+            if (logEvent == null) throw new ArgumentNullException("logEvent");
+
+            Guid requestId;
+            if (!TryGetCurrentHttpRequestId(out requestId))
+                return;
+
+            var requestIdProperty = new LogEventProperty(HttpRequestIdPropertyName, new ScalarValue(requestId));
+            logEvent.AddPropertyIfAbsent(requestIdProperty);
+        }
+
+        /// <summary>
+        /// Retrieve the id assigned to the currently-executing HTTP request, if any.
+        /// </summary>
+        /// <param name="requestId">The request id.</param>
+        /// <returns><c>true</c> if there is a request in progress; <c>false</c> otherwise.</returns>
+        public static bool TryGetCurrentHttpRequestId(out Guid requestId)
+        {
+            if (HttpContext.Current == null)
+            {
+                requestId = default(Guid);
+                return false;
+            }
+
+            var requestIdItem = HttpContext.Current.Items[RequestIdItemName];
+            if (requestIdItem == null)
+                HttpContext.Current.Items[RequestIdItemName] = requestId = Guid.NewGuid();
+            else
+                requestId = (Guid)requestIdItem;
+
+            return true;
+        }
+    }
+}

src/Umbraco.Core/Logging/Serilog/Enrichers/HttpRequestNumberEnricher.cs

@@ -0,0 +1,48 @@
+using System;
+using System.Threading;
+using System.Web;
+using Serilog.Core;
+using Serilog.Events;
+
+namespace Umbraco.Core.Logging.Serilog.Enrichers
+{
+    /// <summary>
+    /// Enrich log events with a HttpRequestNumber unique within the current
+    /// logging session.
+    /// Original source - https://github.com/serilog-web/classic/blob/master/src/SerilogWeb.Classic/Classic/Enrichers/HttpRequestNumberEnricher.cs
+    /// Nupkg: 'Serilog.Web.Classic' contains handlers & extra bits we do not want
+    /// </summary>
+    internal class HttpRequestNumberEnricher : ILogEventEnricher
+    {
+        /// <summary>
+        /// The property name added to enriched log events.
+        /// </summary>
+        public const string HttpRequestNumberPropertyName = "HttpRequestNumber";
+
+        static int _lastRequestNumber;
+        static readonly string RequestNumberItemName = typeof(HttpRequestNumberEnricher).Name + "+RequestNumber";
+
+        /// <summary>
+        /// Enrich the log event with the number assigned to the currently-executing HTTP request, if any.
+        /// </summary>
+        /// <param name="logEvent">The log event to enrich.</param>
+        /// <param name="propertyFactory">Factory for creating new properties to add to the event.</param>
+        public void Enrich(LogEvent logEvent, ILogEventPropertyFactory propertyFactory)
+        {
+            if (logEvent == null) throw new ArgumentNullException("logEvent");
+
+            if (HttpContext.Current == null)
+                return;
+
+            int requestNumber;
+            var requestNumberItem = HttpContext.Current.Items[RequestNumberItemName];
+            if (requestNumberItem == null)
+                HttpContext.Current.Items[RequestNumberItemName] = requestNumber = Interlocked.Increment(ref _lastRequestNumber);
+            else
+                requestNumber = (int)requestNumberItem;
+
+            var requestNumberProperty = new LogEventProperty(HttpRequestNumberPropertyName, new ScalarValue(requestNumber));
+            logEvent.AddPropertyIfAbsent(requestNumberProperty);
+        }
+    }
+}

src/Umbraco.Core/Logging/Serilog/Enrichers/HttpSessionIdEnricher.cs

@@ -0,0 +1,39 @@
+using Serilog.Core;
+using Serilog.Events;
+using System;
+using System.Web;
+
+namespace Umbraco.Core.Logging.Serilog.Enrichers
+{
+    /// <summary>
+    /// Enrich log events with the HttpSessionId property.
+    /// Original source - https://github.com/serilog-web/classic/blob/master/src/SerilogWeb.Classic/Classic/Enrichers/HttpSessionIdEnricher.cs
+    /// Nupkg: 'Serilog.Web.Classic' contains handlers & extra bits we do not want
+    /// </summary>
+    internal class HttpSessionIdEnricher : ILogEventEnricher
+    {
+        /// <summary>
+        /// The property name added to enriched log events.
+        /// </summary>
+        public const string HttpSessionIdPropertyName = "HttpSessionId";
+
+        /// <summary>
+        /// Enrich the log event with the current ASP.NET session id, if sessions are enabled.</summary>
+        /// <param name="logEvent">The log event to enrich.</param>
+        /// <param name="propertyFactory">Factory for creating new properties to add to the event.</param>
+        public void Enrich(LogEvent logEvent, ILogEventPropertyFactory propertyFactory)
+        {
+            if (logEvent == null) throw new ArgumentNullException("logEvent");
+
+            if (HttpContext.Current == null)
+                return;
+
+            if (HttpContext.Current.Session == null)
+                return;
+
+            var sessionId = HttpContext.Current.Session.SessionID;
+            var sessionIdProperty = new LogEventProperty(HttpSessionIdPropertyName, new ScalarValue(sessionId));
+            logEvent.AddPropertyIfAbsent(sessionIdProperty);
+        }
+    }
+}

src/Umbraco.Core/Umbraco.Core.csproj

@@ -328,6 +328,9 @@
     <Compile Include="KeyValuePairExtensions.cs" />
     <Compile Include="Logging\LogLevel.cs" />
     <Compile Include="Logging\MessageTemplates.cs" />
+    <Compile Include="Logging\Serilog\Enrichers\HttpRequestIdEnricher.cs" />
+    <Compile Include="Logging\Serilog\Enrichers\HttpRequestNumberEnricher.cs" />
+    <Compile Include="Logging\Serilog\Enrichers\HttpSessionIdEnricher.cs" />
     <Compile Include="Logging\Serilog\LoggerConfigExtensions.cs" />
     <Compile Include="Logging\Serilog\Enrichers\Log4NetLevelMapperEnricher.cs" />
     <Compile Include="Migrations\MigrationBase_Extra.cs" />