From fcc09636963d44854329a9c91f72fccb6d5e9547 Mon Sep 17 00:00:00 2001
From: James Skimming <647706+JSkimming@users.noreply.github.com>
Date: Mon, 18 Jul 2022 09:14:51 +0100
Subject: [PATCH 1/2] Added tests to demonstrate an issue with service
 registration

See serilog/serilog-extensions-hosting#63
---
 .../SerilogHostBuilderExtensionsTests.cs      | 109 ++++++++++++++++++
 1 file changed, 109 insertions(+)
 create mode 100644 test/Serilog.Extensions.Hosting.Tests/SerilogHostBuilderExtensionsTests.cs

diff --git a/test/Serilog.Extensions.Hosting.Tests/SerilogHostBuilderExtensionsTests.cs b/test/Serilog.Extensions.Hosting.Tests/SerilogHostBuilderExtensionsTests.cs
new file mode 100644
index 0000000..c9ba14b
--- /dev/null
+++ b/test/Serilog.Extensions.Hosting.Tests/SerilogHostBuilderExtensionsTests.cs
@@ -0,0 +1,109 @@
+using System;
+using System.Collections.Generic;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
+using Xunit;
+
+namespace Serilog.Extensions.Hosting.Tests
+{
+    public class SerilogHostBuilderExtensionsTests
+    {
+        [Fact]
+        public void ServicesAreRegisteredWhenCallingUseSerilog()
+        {
+            // Arrange
+            var collection = new ServiceCollection();
+            IHostBuilder builder = new FakeHostBuilder(collection);
+
+            // Act
+            builder.UseSerilog();
+
+            // Assert
+            IServiceProvider provider = collection.BuildServiceProvider();
+            provider.GetRequiredService<ILoggerFactory>();
+            provider.GetRequiredService<IDiagnosticContext>();
+        }
+
+        [Fact]
+        public void ServicesAreRegisteredWhenCallingUseSerilogWithLogger()
+        {
+            // Arrange
+            var collection = new ServiceCollection();
+            IHostBuilder builder = new FakeHostBuilder(collection);
+            ILogger logger = new LoggerConfiguration().CreateLogger();
+
+            // Act
+            builder.UseSerilog(logger);
+
+            // Assert
+            IServiceProvider provider = collection.BuildServiceProvider();
+            provider.GetRequiredService<ILogger>();
+            provider.GetRequiredService<ILoggerFactory>();
+            provider.GetRequiredService<IDiagnosticContext>();
+        }
+
+        [Fact]
+        public void ServicesAreRegisteredWhenCallingUseSerilogWithConfigureDelegate()
+        {
+            // Arrange
+            var collection = new ServiceCollection();
+            IHostBuilder builder = new FakeHostBuilder(collection);
+
+            // Act
+            builder.UseSerilog((_, _) => { });
+
+            // Assert
+            IServiceProvider provider = collection.BuildServiceProvider();
+            provider.GetRequiredService<ILogger>();
+            provider.GetRequiredService<ILoggerFactory>();
+            provider.GetRequiredService<IDiagnosticContext>();
+        }
+
+        private class FakeHostBuilder : IHostBuilder
+        {
+            private readonly IServiceCollection _collection;
+
+            public FakeHostBuilder(IServiceCollection collection) => _collection = collection;
+
+            public IHostBuilder ConfigureHostConfiguration(Action<IConfigurationBuilder> configureDelegate)
+            {
+                throw new NotImplementedException();
+            }
+
+            public IHostBuilder ConfigureAppConfiguration(Action<HostBuilderContext, IConfigurationBuilder> configureDelegate)
+            {
+                throw new NotImplementedException();
+            }
+
+            public IHostBuilder ConfigureServices(Action<HostBuilderContext, IServiceCollection> configureDelegate)
+            {
+                configureDelegate(null, _collection);
+                return this;
+            }
+
+            public IHostBuilder UseServiceProviderFactory<TContainerBuilder>(IServiceProviderFactory<TContainerBuilder> factory)
+            {
+                throw new NotImplementedException();
+            }
+
+            public IHostBuilder UseServiceProviderFactory<TContainerBuilder>(Func<HostBuilderContext, IServiceProviderFactory<TContainerBuilder>> factory)
+            {
+                throw new NotImplementedException();
+            }
+
+            public IHostBuilder ConfigureContainer<TContainerBuilder>(Action<HostBuilderContext, TContainerBuilder> configureDelegate)
+            {
+                throw new NotImplementedException();
+            }
+
+            public IHost Build()
+            {
+                throw new NotImplementedException();
+            }
+
+            public IDictionary<object, object> Properties { get; }
+        }
+    }
+}

From 2b5895c83885a45bde094837cfc307bd1fa4aed4 Mon Sep 17 00:00:00 2001
From: James Skimming <647706+JSkimming@users.noreply.github.com>
Date: Mon, 18 Jul 2022 09:25:22 +0100
Subject: [PATCH 2/2] Still use RegisteredLogger when provided with a logger

Fixes serilog/serilog-extensions-hosting#63
---
 src/Serilog.Extensions.Hosting/SerilogHostBuilderExtensions.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Serilog.Extensions.Hosting/SerilogHostBuilderExtensions.cs b/src/Serilog.Extensions.Hosting/SerilogHostBuilderExtensions.cs
index 086f810..d588000 100644
--- a/src/Serilog.Extensions.Hosting/SerilogHostBuilderExtensions.cs
+++ b/src/Serilog.Extensions.Hosting/SerilogHostBuilderExtensions.cs
@@ -84,6 +84,9 @@ public static IHostBuilder UseSerilog(
                 {
                     // This won't (and shouldn't) take ownership of the logger. 
                     collection.AddSingleton(logger);
+
+                    // Still need to use RegisteredLogger as it is used by ConfigureDiagnosticContext.
+                    collection.AddSingleton(new RegisteredLogger(logger));
                 }
                 bool useRegisteredLogger = logger != null;
                 ConfigureDiagnosticContext(collection, useRegisteredLogger);