Moved levelSwitch to sink options

Avoids making the already bloated config extensions method interface even more bloated (although levelSwitch is connected parameter restrictedToMinimumLevel which speaks for having levelSwitch next to it).

Author: ckadluba

README.md

@@ -281,6 +281,9 @@ This setting is not used by the audit sink as it writes each event immediately a
 A Flag to eagerly write a batch to the database containing the first received event regardless of `BatchPostingLimit` or `BatchPeriod`. It defaults to `true`.
 This setting is not used by the audit sink as it writes each event immediately and not in a batched manner.
 
+### LevelSwitch
+
+A switch allowing the pass-through minimum level to be changed at runtime. If this is set, the parameter `restrictedToMinimumLevel` in the [sink configuration method](#sink-configuration) is ignored.
 
 ## ColumnOptions Object
 

sample/CustomLogEventFormatterDemo/Program.cs

@@ -42,15 +42,15 @@ public static void Main()
                     {
                         TableName = _tableName,
                         SchemaName = _schemaName,
-                        AutoCreateSqlTable = true
+                        AutoCreateSqlTable = true,
+                        LevelSwitch = levelSwitch
                     },
                     appConfiguration: null,
                     restrictedToMinimumLevel: Serilog.Events.LogEventLevel.Verbose,
                     formatProvider: null,
                     columnOptions: options,
                     columnOptionsSection: null,
-                    logEventFormatter: customFormatter,
-                    levelSwitch: levelSwitch)
+                    logEventFormatter: customFormatter)
                 .CreateLogger();
 
             try

src/Serilog.Sinks.MSSqlServer/Configuration/Extensions/Hybrid/LoggerConfigurationMSSqlServerExtensions.cs

@@ -105,12 +105,11 @@ public static LoggerConfiguration MSSqlServer(
         /// <param name="sinkOptions">Supplies additional settings for the sink</param>
         /// <param name="sinkOptionsSection">A config section defining additional settings for the sink</param>
         /// <param name="appConfiguration">Additional application-level configuration. Required if connectionString is a name.</param>
-        /// <param name="restrictedToMinimumLevel">The minimum level for events passed through the sink. Ignored when <paramref name="levelSwitch"/> is specified.</param>
+        /// <param name="restrictedToMinimumLevel">The minimum level for events passed through the sink. Ignored when LevelSwitch in <paramref name="sinkOptions"/> is specified.</param>
         /// <param name="formatProvider">Supplies culture-specific formatting information, or null.</param>
         /// <param name="columnOptions">An externally-modified group of column settings</param>
         /// <param name="columnOptionsSection">A config section defining various column settings</param>
         /// <param name="logEventFormatter">Supplies custom formatter for the LogEvent column, or null</param>
-        /// <param name="levelSwitch">A switch allowing the pass-through minimum level to be changed at runtime.</param>
         /// <returns>Logger configuration, allowing configuration to continue.</returns>
         /// <exception cref="ArgumentNullException">A required parameter is null.</exception>
         public static LoggerConfiguration MSSqlServer(
@@ -123,15 +122,13 @@ public static LoggerConfiguration MSSqlServer(
             IFormatProvider formatProvider = null,
             ColumnOptions columnOptions = null,
             IConfigurationSection columnOptionsSection = null,
-            ITextFormatter logEventFormatter = null,
-            LoggingLevelSwitch levelSwitch = null) =>
+            ITextFormatter logEventFormatter = null) =>
             loggerConfiguration.MSSqlServerInternal(
                 connectionString: connectionString,
                 sinkOptions: sinkOptions,
                 sinkOptionsSection: sinkOptionsSection,
                 appConfiguration: appConfiguration,
                 restrictedToMinimumLevel: restrictedToMinimumLevel,
-                levelSwitch: levelSwitch,
                 formatProvider: formatProvider,
                 columnOptions: columnOptions,
                 columnOptionsSection: columnOptionsSection,
@@ -149,7 +146,6 @@ internal static LoggerConfiguration MSSqlServerInternal(
             IConfigurationSection sinkOptionsSection,
             IConfiguration appConfiguration,
             LogEventLevel restrictedToMinimumLevel,
-            LoggingLevelSwitch levelSwitch,
             IFormatProvider formatProvider,
             ColumnOptions columnOptions,
             IConfigurationSection columnOptionsSection,
@@ -169,7 +165,7 @@ internal static LoggerConfiguration MSSqlServerInternal(
 
             var periodicBatchingSink = batchingSinkFactory.Create(sink, sinkOptions);
 
-            return loggerConfiguration.Sink(periodicBatchingSink, restrictedToMinimumLevel, levelSwitch);
+            return loggerConfiguration.Sink(periodicBatchingSink, restrictedToMinimumLevel, sinkOptions?.LevelSwitch);
         }
 
         /// <summary>
@@ -230,12 +226,11 @@ public static LoggerConfiguration MSSqlServer(
         /// <param name="sinkOptions">Supplies additional settings for the sink</param>
         /// <param name="sinkOptionsSection">A config section defining additional settings for the sink</param>
         /// <param name="appConfiguration">Additional application-level configuration. Required if connectionString is a name.</param>
-        /// <param name="restrictedToMinimumLevel">The minimum level for events passed through the sink. Ignored when <paramref name="levelSwitch"/> is specified.</param>
+        /// <param name="restrictedToMinimumLevel">The minimum level for events passed through the sink. Ignored when LevelSwitch in <paramref name="sinkOptions"/> is specified.</param>
         /// <param name="formatProvider">Supplies culture-specific formatting information, or null.</param>
         /// <param name="columnOptions">An externally-modified group of column settings</param>
         /// <param name="columnOptionsSection">A config section defining various column settings</param>
         /// <param name="logEventFormatter">Supplies custom formatter for the LogEvent column, or null</param>
-        /// <param name="levelSwitch">A switch allowing the pass-through minimum level to be changed at runtime.</param>
         /// <returns>Logger configuration, allowing configuration to continue.</returns>
         /// <exception cref="ArgumentNullException">A required parameter is null.</exception>
         public static LoggerConfiguration MSSqlServer(
@@ -248,15 +243,13 @@ public static LoggerConfiguration MSSqlServer(
             IFormatProvider formatProvider = null,
             ColumnOptions columnOptions = null,
             IConfigurationSection columnOptionsSection = null,
-            ITextFormatter logEventFormatter = null,
-            LoggingLevelSwitch levelSwitch = null) =>
+            ITextFormatter logEventFormatter = null) =>
             loggerAuditSinkConfiguration.MSSqlServerInternal(
                 connectionString: connectionString,
                 sinkOptions: sinkOptions,
                 sinkOptionsSection: sinkOptionsSection,
                 appConfiguration: appConfiguration,
                 restrictedToMinimumLevel: restrictedToMinimumLevel,
-                levelSwitch: levelSwitch,
                 formatProvider: formatProvider,
                 columnOptions: columnOptions,
                 columnOptionsSection: columnOptionsSection,
@@ -273,7 +266,6 @@ internal static LoggerConfiguration MSSqlServerInternal(
             IConfigurationSection sinkOptionsSection,
             IConfiguration appConfiguration,
             LogEventLevel restrictedToMinimumLevel,
-            LoggingLevelSwitch levelSwitch,
             IFormatProvider formatProvider,
             ColumnOptions columnOptions,
             IConfigurationSection columnOptionsSection,
@@ -290,7 +282,7 @@ internal static LoggerConfiguration MSSqlServerInternal(
 
             var auditSink = auditSinkFactory.Create(connectionString, sinkOptions, formatProvider, columnOptions, logEventFormatter);
 
-            return loggerAuditSinkConfiguration.Sink(auditSink, restrictedToMinimumLevel, levelSwitch);
+            return loggerAuditSinkConfiguration.Sink(auditSink, restrictedToMinimumLevel, sinkOptions?.LevelSwitch);
         }
 
         private static void ReadConfiguration(

src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/MSSqlServerSinkOptions.cs

@@ -1,4 +1,5 @@
 using System;
+using Serilog.Core;
 
 namespace Serilog.Sinks.MSSqlServer
 {
@@ -66,5 +67,10 @@ internal MSSqlServerSinkOptions(
         /// Flag to eagerly emit a batch containing the first received event (default: true)
         /// </summary>
         public bool EagerlyEmitFirstEvent { get; set; }
+
+        /// <summary>
+        /// A switch allowing the pass-through minimum level to be changed at runtime
+        /// </summary>
+        public LoggingLevelSwitch LevelSwitch { get; set; }
     }
 }

test/Serilog.Sinks.MSSqlServer.Tests/Configuration/Extensions/Hybrid/ConfigurationExtensionsTests.cs

@@ -169,11 +169,11 @@ public void LogLevelSwitchIsApplied()
                 sinkOptions: new MSSqlServerSinkOptions
                 {
                     TableName = DatabaseFixture.LogTableName,
-                    AutoCreateSqlTable = true
+                    AutoCreateSqlTable = true,
+                    LevelSwitch = levelSwitch,
                 },
                 columnOptionsSection: columnOptionsSection,
-                formatProvider: CultureInfo.InvariantCulture,
-                levelSwitch: levelSwitch)
+                formatProvider: CultureInfo.InvariantCulture)
                 .CreateLogger();
 
             Log.Information(message1);