fixed an error where the logging providers would not all be resolved (#…

…1990)
RocketSurgeonsGuild · Apr 30, 2024 · 44c11ee · 44c11ee
1 parent a1f25e2
commit 44c11ee
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 35 deletions.
diff --git a/src/Hosting/Conventions/HostingConvention.cs b/src/Hosting/Conventions/HostingConvention.cs
@@ -2,51 +2,18 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
 using OpenTelemetry;
 using OpenTelemetry.Resources;
 using Rocket.Surgery.Conventions;
 using Rocket.Surgery.Conventions.DependencyInjection;
-using Rocket.Surgery.Hosting;
-using Rocket.Surgery.LaunchPad.Serilog;
 using Rocket.Surgery.LaunchPad.Telemetry;
 
 namespace Rocket.Surgery.LaunchPad.Hosting.Conventions;
 
 [ExportConvention]
-internal class HostingConvention : IServiceConvention, IHostApplicationConvention, IOpenTelemetryConvention
+[AfterConvention<SerilogHostingConvention>]
+internal class HostingConvention : IServiceConvention, IOpenTelemetryConvention
 {
-    public void Register(IConventionContext context, IHostApplicationBuilder builder)
-    {
-        if (context.GetOrAdd(() => new LaunchPadLoggingOptions()).WriteToProviders != true)
-        {
-            var providers = builder.Services.Where(z => z.ServiceType == typeof(ILoggerProvider)).ToArray();
-            builder.Logging.ClearProviders();
-            builder.OnHostStarting(
-                provider => providers.Aggregate(
-                    provider.GetRequiredService<ILoggerFactory>(),
-                    (factory, descriptor) =>
-                    {
-                        switch (descriptor)
-                        {
-                            case { ImplementationFactory: { } method, } when method(provider) is ILoggerProvider p:
-                                factory.AddProvider(p);
-                                break;
-                            case { ImplementationInstance: ILoggerProvider instance, }:
-                                factory.AddProvider(instance);
-                                break;
-                            case { ImplementationType: { } type, } when ActivatorUtilities.CreateInstance(provider, type) is ILoggerProvider instance:
-                                factory.AddProvider(instance);
-                                break;
-                        }
-
-                        return factory;
-                    }
-                )
-            );
-        }
-    }
-
     public void Register(IConventionContext context, IConfiguration configuration, IOpenTelemetryBuilder builder)
     {
         builder.ConfigureResource(

diff --git a/src/Hosting/Conventions/SerilogConsoleLoggingConvention.cs b/src/Hosting/Conventions/SerilogConsoleLoggingConvention.cs
@@ -15,6 +15,7 @@ namespace Rocket.Surgery.LaunchPad.Hosting.Conventions;
 /// <seealso cref="ISerilogConvention" />
 [PublicAPI]
 [ExportConvention]
+[AfterConvention<SerilogHostingConvention>]
 public sealed class SerilogConsoleLoggingConvention : ISerilogConvention
 {
     private readonly LaunchPadLoggingOptions _options;

diff --git a/src/Hosting/Conventions/SerilogDebugLoggingConvention.cs b/src/Hosting/Conventions/SerilogDebugLoggingConvention.cs
@@ -14,6 +14,7 @@ namespace Rocket.Surgery.LaunchPad.Hosting.Conventions;
 /// <seealso cref="ISerilogConvention" />
 [PublicAPI]
 [ExportConvention]
+[AfterConvention<SerilogHostingConvention>]
 public sealed class SerilogDebugLoggingConvention : ISerilogConvention
 {
     private readonly LaunchPadLoggingOptions _options;

diff --git a/src/Hosting/Conventions/SerilogHostingConvention.cs b/src/Hosting/Conventions/SerilogHostingConvention.cs
@@ -64,5 +64,20 @@ public void Register(IConventionContext context, IHostApplicationBuilder builder
                 // ReSharper disable once NullableWarningSuppressionIsUsed
                 builder.Services.AddSingleton(context.Get<ILoggerFactory>()!);
         }
+
+        if (_options.WriteToProviders) return;
+
+        builder.OnHostStarting(
+            provider => provider
+                       .GetServices<ILoggerProvider>()
+                       .Aggregate(
+                            provider.GetRequiredService<ILoggerFactory>(),
+                            (factory, loggerProvider) =>
+                            {
+                                factory.AddProvider(loggerProvider);
+                                return factory;
+                            }
+                        )
+        );
     }
 }