Get the configured log level switches through the Options object

Fixes serilog#206

Author: 0xced

src/Serilog.Settings.Configuration/ConfigurationLoggerConfigurationExtensions.cs

@@ -216,6 +216,10 @@ public static LoggerConfiguration Configuration(
             { Assemblies: {} } => GetConfigurationReader(configuration, options, options.Assemblies),
             _ => GetConfigurationReader(configuration, options ?? new Options(), options?.DependencyContext),
         };
+        if (options != null)
+        {
+            options.LogLevelSwitches = configurationReader.LogLevelSwitches;
+        }
         return settingConfiguration.Settings(configurationReader);
     }
 

src/Serilog.Settings.Configuration/Settings/Configuration/ConfigurationReader.cs

@@ -58,6 +58,8 @@ public void Configure(LoggerConfiguration loggerConfiguration)
         ApplyAuditSinks(loggerConfiguration);
     }
 
+    internal IReadOnlyDictionary<string, LoggingLevelSwitch> LogLevelSwitches => _resolutionContext.DeclaredLevelSwitches;
+
     void ProcessFilterSwitchDeclarations()
     {
         var filterSwitchesDirective = _section.GetSection("FilterSwitches");

src/Serilog.Settings.Configuration/Settings/Configuration/Options.cs

@@ -1,6 +1,7 @@
 using System.Globalization;
 using System.Reflection;
 using Microsoft.Extensions.DependencyModel;
+using Serilog.Core;
 
 namespace Serilog.Settings.Configuration;
 
@@ -56,6 +57,14 @@ public Options() : this(dependencyContext: null)
     /// </summary>
     public IFormatProvider FormatProvider { get; init; } = CultureInfo.InvariantCulture;
 
+    /// <summary>
+    /// The log level switches that were loaded from the <c>LevelSwitches</c> section of the configuration.
+    /// <para/>
+    /// The log level switches are only available after calling the ReadFrom.Configuration() method.
+    /// </summary>
+    /// <remarks>The keys of the dictionary are the name of the switches, including the leading <c>$</c> character.</remarks>
+    public IReadOnlyDictionary<string, LoggingLevelSwitch> LogLevelSwitches { get; internal set; } = new Dictionary<string, LoggingLevelSwitch>();
+
     internal Assembly[] Assemblies { get; }
     internal DependencyContext DependencyContext { get; }
     internal ConfigurationAssemblySource? ConfigurationAssemblySource { get; }

src/Serilog.Settings.Configuration/Settings/Configuration/ResolutionContext.cs

@@ -9,7 +9,7 @@ namespace Serilog.Settings.Configuration;
 /// </summary>
 sealed class ResolutionContext
 {
-    readonly IDictionary<string, LoggingLevelSwitch> _declaredLevelSwitches;
+    readonly Dictionary<string, LoggingLevelSwitch> _declaredLevelSwitches;
     readonly IDictionary<string, LoggingFilterSwitchProxy> _declaredFilterSwitches;
     readonly IConfiguration _appConfiguration;
 
@@ -23,6 +23,8 @@ public ResolutionContext(IConfiguration appConfiguration = null, IFormatProvider
 
     public IFormatProvider FormatProvider { get; }
 
+    internal IReadOnlyDictionary<string, LoggingLevelSwitch> DeclaredLevelSwitches => _declaredLevelSwitches;
+
     /// <summary>
     /// Looks up a switch in the declared LoggingLevelSwitches
     /// </summary>

test/Serilog.Settings.Configuration.Tests/ConfigurationSettingsTests.cs

@@ -11,24 +11,24 @@ namespace Serilog.Settings.Configuration.Tests;
 
 public class ConfigurationSettingsTests
 {
-    static LoggerConfiguration ConfigFromJson(string jsonString, string secondJsonSource = null)
+    static LoggerConfiguration ConfigFromJson(string jsonString, string secondJsonSource = null, Options options = null)
     {
-        return ConfigFromJson(jsonString, secondJsonSource, out _);
+        return ConfigFromJson(jsonString, secondJsonSource, out _, options);
     }
 
-    static LoggerConfiguration ConfigFromJson(string jsonString, out IConfiguration configuration)
+    static LoggerConfiguration ConfigFromJson(string jsonString, out IConfiguration configuration, Options options = null)
     {
-        return ConfigFromJson(jsonString, null, out configuration);
+        return ConfigFromJson(jsonString, null, out configuration, options);
     }
 
-    static LoggerConfiguration ConfigFromJson(string jsonString, string secondJsonSource, out IConfiguration configuration)
+    static LoggerConfiguration ConfigFromJson(string jsonString, string secondJsonSource, out IConfiguration configuration, Options options)
     {
         var builder = new ConfigurationBuilder().AddJsonString(jsonString);
         if (secondJsonSource != null)
             builder.AddJsonString(secondJsonSource);
         configuration = builder.Build();
         return new LoggerConfiguration()
-            .ReadFrom.Configuration(configuration);
+            .ReadFrom.Configuration(configuration, options);
     }
 
     [Fact]
@@ -385,10 +385,13 @@ public void LoggingLevelSwitchIsConfigured(string switchName)
             }}";
         LogEvent evt = null;
 
-        var log = ConfigFromJson(json)
+        var options = new Options();
+        var log = ConfigFromJson(json, options: options)
             .WriteTo.Sink(new DelegatingSink(e => evt = e))
             .CreateLogger();
 
+        Assert.Contains("$switch1", options.LogLevelSwitches);
+        Assert.Equal(LogEventLevel.Warning, options.LogLevelSwitches["$switch1"].MinimumLevel);
         log.Write(Some.DebugEvent());
         Assert.True(evt is null, "LoggingLevelSwitch initial level was Warning. It should not log Debug messages");
         log.Write(Some.InformationEvent());

test/Serilog.Settings.Configuration.Tests/DynamicLevelChangeTests.cs

@@ -45,11 +45,14 @@ public DynamicLevelChangeTests()
     [Fact]
     public void ShouldRespectDynamicLevelChanges()
     {
+        var options = new Options();
         using var logger = new LoggerConfiguration()
             .ReadFrom
-            .Configuration(new ConfigurationBuilder().Add(_configSource).Build())
+            .Configuration(new ConfigurationBuilder().Add(_configSource).Build(), options)
             .CreateLogger();
 
+        Assert.Equal(LogEventLevel.Information, options.LogLevelSwitches["$mySwitch"].MinimumLevel);
+
         DummyConsoleSink.Emitted.Clear();
         logger.Write(Some.DebugEvent());
         Assert.Empty(DummyConsoleSink.Emitted);
@@ -64,6 +67,7 @@ public void ShouldRespectDynamicLevelChanges()
         logger.Write(Some.DebugEvent());
         logger.ForContext(Constants.SourceContextPropertyName, "Root.Test").Write(Some.DebugEvent());
         Assert.Single(DummyConsoleSink.Emitted);
+        Assert.Equal(LogEventLevel.Debug, options.LogLevelSwitches["$mySwitch"].MinimumLevel);
 
         DummyConsoleSink.Emitted.Clear();
         UpdateConfig(overrideLevel: LogEventLevel.Debug);