feat: Switch to Serilog

src/Microsoft.ComponentDetection.Orchestrator/Extensions/ServiceCollectionExtensions.cs

@@ -25,6 +25,8 @@
 using Microsoft.ComponentDetection.Orchestrator.Services;
 using Microsoft.ComponentDetection.Orchestrator.Services.GraphTranslation;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Serilog.Extensions.Logging;
 
 public static class ServiceCollectionExtensions
 {
@@ -37,6 +39,8 @@ public static IServiceCollection AddComponentDetection(this IServiceCollection s
     {
         services.AddSingleton<Orchestrator>();
 
+        ConfigureLoggingProviders(services);
+
         // Shared services
         services.AddSingleton<ITelemetryService, CommandLineTelemetryService>();
         services.AddSingleton<ICommandLineInvocationService, CommandLineInvocationService>();
@@ -128,4 +132,23 @@ public static IServiceCollection AddComponentDetection(this IServiceCollection s
 
         return services;
     }
+
+    private static void ConfigureLoggingProviders(IServiceCollection services)
+    {
+        var providers = new LoggerProviderCollection();
+        services.AddSingleton(providers);
+        services.AddSingleton<ILoggerFactory>(sc =>
+        {
+            var providerCollection = sc.GetService<LoggerProviderCollection>();
+            var factory = new SerilogLoggerFactory(null, true, providerCollection);
+
+            foreach (var provider in sc.GetServices<ILoggerProvider>())
+            {
+                factory.AddProvider(provider);
+            }
+
+            return factory;
+        });
+        services.AddLogging(l => l.AddFilter<SerilogLoggerProvider>(null, LogLevel.Trace));
+    }
 }

src/Microsoft.ComponentDetection.Orchestrator/Microsoft.ComponentDetection.Orchestrator.csproj

@@ -8,6 +8,9 @@
         <PackageReference Include="Newtonsoft.Json" />
         <PackageReference Include="Polly" />
         <PackageReference Include="Serilog" />
+        <PackageReference Include="Serilog.Extensions.Logging" />
+        <PackageReference Include="Serilog.Sinks.Console" />
+        <PackageReference Include="Serilog.Sinks.File" />
         <PackageReference Include="System.Runtime.Loader" />
         <PackageReference Include="System.Threading.Tasks.Dataflow" />
         <PackageReference Include="System.Reactive" />

src/Microsoft.ComponentDetection.Orchestrator/Orchestrator.cs

@@ -2,6 +2,7 @@ namespace Microsoft.ComponentDetection.Orchestrator;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Runtime.InteropServices;
@@ -20,12 +21,11 @@ namespace Microsoft.ComponentDetection.Orchestrator;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
-using Serilog.Core;
+using Serilog;
 using Serilog.Events;
 
 public class Orchestrator
 {
-    public static readonly LoggingLevelSwitch MinimumLogLevelSwitch = new();
     private static readonly bool IsLinux = RuntimeInformation.IsOSPlatform(OSPlatform.Linux);
 
     private readonly IServiceProvider serviceProvider;
@@ -59,14 +59,18 @@ public async Task<ScanResult> LoadAsync(string[] args, CancellationToken cancell
             baseArguments = new BaseArguments();
         }
 
-        // Set the minimum logging level
-        MinimumLogLevelSwitch.MinimumLevel = baseArguments.Verbosity switch
-        {
-            VerbosityMode.Quiet => LogEventLevel.Error,
-            VerbosityMode.Normal => LogEventLevel.Information,
-            VerbosityMode.Verbose => LogEventLevel.Debug,
-            _ => throw new ArgumentOutOfRangeException(nameof(baseArguments.Verbosity), "Invalid verbosity level"),
-        };
+        Log.Logger = new LoggerConfiguration()
+            .WriteTo.Console()
+            .WriteTo.File(Path.Combine(baseArguments.Output ?? Path.GetTempPath(), $"GovCompDiscLog_{DateTime.Now:yyyyMMddHHmmssfff}.txt"), buffered: true)
+            .MinimumLevel.Is(baseArguments.Verbosity switch
+            {
+                VerbosityMode.Quiet => LogEventLevel.Error,
+                VerbosityMode.Normal => LogEventLevel.Information,
+                VerbosityMode.Verbose => LogEventLevel.Debug,
+                _ => throw new ArgumentOutOfRangeException(nameof(baseArguments.Verbosity), "Invalid verbosity level"),
+            })
+            .Enrich.FromLogContext()
+            .CreateLogger();
 
         // This is required so TelemetryRelay can be accessed via it's static singleton
         // It should be refactored out at a later date

src/Microsoft.ComponentDetection/Microsoft.ComponentDetection.csproj

@@ -11,9 +11,7 @@
       <PackageReference Include="Microsoft.Extensions.Logging" />
       <PackageReference Include="Serilog" />
       <PackageReference Include="Serilog.Extensions.Hosting" />
-      <PackageReference Include="Serilog.Extensions.Logging" />
       <PackageReference Include="Serilog.Sinks.Console" />
-      <PackageReference Include="Serilog.Sinks.File" />
       <PackageReference Include="System.Threading.Tasks.Dataflow" />
     </ItemGroup>
 

src/Microsoft.ComponentDetection/Program.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Diagnostics;
-using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.ComponentDetection.Contracts;
@@ -22,14 +21,10 @@
 
     Log.Logger = new LoggerConfiguration()
         .WriteTo.Console()
-        .WriteTo.File(Path.Combine(Path.GetTempPath(), $"GovCompDiscLog_{DateTime.Now:yyyyMMddHHmmssfff}.txt"), buffered: true)
-        .MinimumLevel.ControlledBy(Orchestrator.MinimumLogLevelSwitch)
-        .Enrich.FromLogContext()
-        .CreateLogger();
+        .CreateBootstrapLogger();
 
     var serviceProvider = new ServiceCollection()
         .AddComponentDetection()
-        .AddLogging(l => l.AddSerilog(dispose: true))
         .BuildServiceProvider();
     var orchestrator = serviceProvider.GetRequiredService<Orchestrator>();
     var result = await orchestrator.LoadAsync(args);