DiagnosticContext/IDiagnosticContext

global.json

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

samples/SimpleServiceSample/PrintTimeService.cs

@@ -4,7 +4,7 @@
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 
-namespace SimpleWebSample
+namespace SimpleServiceSample
 {
     public class PrintTimeService : IHostedService, IDisposable
     {

samples/SimpleServiceSample/Program.cs

@@ -1,11 +1,11 @@
 using System;
 using System.IO;
-using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Configuration;
-using Serilog;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using Serilog;
 
-namespace SimpleWebSample
+namespace SimpleServiceSample
 {
     public class Program
     {

serilog-extensions-hosting.sln.DotSettings

@@ -0,0 +1,5 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=appsettings/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=benaadams/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=destructure/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Serilog/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

src/Serilog.Extensions.Hosting/Extensions/Hosting/AmbientDiagnosticContextCollector.cs

@@ -0,0 +1,32 @@
+using System;
+using System.Threading;
+
+namespace Serilog.Extensions.Hosting
+{
+    class AmbientDiagnosticContextCollector : IDisposable
+    {
+        static readonly AsyncLocal<AmbientDiagnosticContextCollector> AmbientCollector =
+            new AsyncLocal<AmbientDiagnosticContextCollector>();
+
+        // The indirection here ensures that completing collection cleans up the collector in all
+        // execution contexts. Via @benaadams' addition to `HttpContextAccessor` :-)
+        DiagnosticContextCollector _collector;
+
+        public static DiagnosticContextCollector Current => AmbientCollector.Value?._collector;
+
+        public static DiagnosticContextCollector Begin()
+        {
+            var value = new AmbientDiagnosticContextCollector();
+            value._collector = new DiagnosticContextCollector(value);
+            AmbientCollector.Value = value;
+            return value._collector;
+        }
+
+        public void Dispose()
+        {
+            _collector = null;
+            if (AmbientCollector.Value == this)
+                AmbientCollector.Value = null;
+        }
+    }
+}

src/Serilog.Extensions.Hosting/Extensions/Hosting/DiagnosticContext.cs

@@ -0,0 +1,59 @@
+// Copyright 2019 Serilog Contributors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+using System;
+
+namespace Serilog.Extensions.Hosting
+{
+    /// <summary>
+    /// Implements an ambient/async-local diagnostic context. Consumers should
+    /// use <see cref="IDiagnosticContext"/> in preference to this concrete type.
+    /// </summary>
+    public class DiagnosticContext : IDiagnosticContext
+    {
+        readonly ILogger _logger;
+
+        /// <summary>
+        /// Construct a <see cref="DiagnosticContext"/>.
+        /// </summary>
+        /// <param name="logger">A logger for binding properties in the context, or <c>null</c> to use <see cref="Log.Logger"/>.</param>
+        public DiagnosticContext(ILogger logger)
+        {
+            _logger = logger;
+        }
+
+        /// <summary>
+        /// Start collecting properties to associate with the current async context. This will replace
+        /// the active collector, if any.
+        /// </summary>
+        /// <returns>A collector that will receive events added in the current async context.</returns>
+        public DiagnosticContextCollector BeginCollection()
+        {
+            return AmbientDiagnosticContextCollector.Begin();
+        }
+
+        /// <inheritdoc cref="IDiagnosticContext.Add"/>
+        public void Add(string propertyName, object value, bool destructureObjects = false)
+        {
+            if (propertyName == null) throw new ArgumentNullException(nameof(propertyName));
+
+            var collector = AmbientDiagnosticContextCollector.Current;
+            if (collector != null && 
+                (_logger ?? Log.Logger).BindProperty(propertyName, value, destructureObjects, out var property))
+            {
+                collector.Add(property);
+            }
+        }
+    }
+}

src/Serilog.Extensions.Hosting/Extensions/Hosting/DiagnosticContextCollector.cs

@@ -0,0 +1,51 @@
+using System;
+using System.Collections.Generic;
+using Serilog.Events;
+
+namespace Serilog.Extensions.Hosting
+{
+    /// <summary>
+    /// A container that receives properties added to a diagnostic context.
+    /// </summary>
+    public sealed class DiagnosticContextCollector : IDisposable
+    {
+        readonly AmbientDiagnosticContextCollector _ambientCollector;
+        List<LogEventProperty> _properties = new List<LogEventProperty>();
+
+        internal DiagnosticContextCollector(AmbientDiagnosticContextCollector ambientCollector)
+        {
+            _ambientCollector = ambientCollector ?? throw new ArgumentNullException(nameof(ambientCollector));
+        }
+
+        /// <summary>
+        /// Add the property to the context.
+        /// </summary>
+        /// <param name="property">The property to add.</param>
+        public void Add(LogEventProperty property)
+        {
+            if (property == null) throw new ArgumentNullException(nameof(property));
+            _properties?.Add(property);
+        }
+
+        /// <summary>
+        /// Complete the context and retrieve the properties added to it, if any. This will
+        /// stop collection and remove the collector from the original execution context and
+        /// any of its children.
+        /// </summary>
+        /// <param name="properties">The collected properties, or null if no collection is active.</param>
+        /// <returns>True if properties could be collected.</returns>
+        public bool TryComplete(out List<LogEventProperty> properties)
+        {
+            properties = _properties;
+            _properties = null;
+            Dispose();
+            return properties != null;
+        }
+
+        /// <inheritdoc/>
+        public void Dispose()
+        {
+            _ambientCollector.Dispose();
+        }
+    }
+}

src/Serilog.Extensions.Hosting/Hosting/SerilogLoggerFactory.cs → src/Serilog.Extensions.Hosting/Extensions/Hosting/SerilogLoggerFactory.cs

@@ -12,18 +12,25 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+using System;
+using System.ComponentModel;
 using Microsoft.Extensions.Logging;
 using Serilog.Debugging;
 using Serilog.Extensions.Logging;
 
+// To line up with the convention used elsewhere in the *.Extensions libraries, this
+// should have been Serilog.Extensions.Hosting.
+// ReSharper disable once CheckNamespace
 namespace Serilog.Hosting
 {
     /// <summary>
     /// Implements <see cref="ILoggerFactory"/> so that we can inject Serilog Logger.
     /// </summary>
+    [Obsolete("Replaced with Serilog.Extensions.Logging.SerilogLoggerFactory")]
+    [EditorBrowsable(EditorBrowsableState.Never)]
     public class SerilogLoggerFactory : ILoggerFactory
     {
-        private readonly SerilogLoggerProvider _provider;
+        readonly SerilogLoggerProvider _provider;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="SerilogLoggerFactory"/> class.

src/Serilog.Extensions.Hosting/IDiagnosticContext.cs

@@ -0,0 +1,31 @@
+// Copyright 2019 Serilog Contributors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+namespace Serilog
+{
+    /// <summary>
+    /// Collects diagnostic information for packaging into wide events.
+    /// </summary>
+    public interface IDiagnosticContext
+    {
+        /// <summary>
+        /// Add the specified property to the request's diagnostic payload.
+        /// </summary>
+        /// <param name="propertyName">The name of the property. Must be non-empty.</param>
+        /// <param name="value">The property value.</param>
+        /// <param name="destructureObjects">If true, the value will be serialized as structured
+        /// data if possible; if false, the object will be recorded as a scalar or simple array.</param>
+        void Add(string propertyName, object value, bool destructureObjects = false); 
+    }
+}

src/Serilog.Extensions.Hosting/Serilog.Extensions.Hosting.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>Serilog support for .NET Core logging in hosted services</Description>
-    <VersionPrefix>2.0.1</VersionPrefix>
+    <VersionPrefix>3.0.0</VersionPrefix>
     <Authors>Microsoft;Serilog Contributors</Authors>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -23,8 +23,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Serilog" Version="2.5.0" />
-    <PackageReference Include="Serilog.Extensions.Logging" Version="2.0.0" />
+    <PackageReference Include="Serilog" Version="2.8.0" />
+    <PackageReference Include="Serilog.Extensions.Logging" Version="3.0.0-*" />
     <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="2.1.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.1.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.1.0" />