Removed some public properties from MSSqlServerSinkTraits.

Author: ckadluba

src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/MSSqlServerAuditSink.cs

@@ -31,6 +31,7 @@ namespace Serilog.Sinks.MSSqlServer
     /// </summary>
     public class MSSqlServerAuditSink : ILogEventSink, IDisposable
     {
+        private readonly SinkOptions _sinkOptions;
         private readonly ISqlConnectionFactory _sqlConnectionFactory;
         private readonly MSSqlServerSinkTraits _traits;
 
@@ -77,25 +78,23 @@ public MSSqlServerAuditSink(
             ColumnOptions columnOptions = null,
             ITextFormatter logEventFormatter = null)
         {
-            if (sinkOptions?.TableName == null)
+            _sinkOptions = sinkOptions;
+            if (_sinkOptions?.TableName == null)
             {
                 throw new InvalidOperationException("Table name must be specified!");
             }
 
-            columnOptions?.FinalizeConfigurationForSinkConstructor();
+            columnOptions = columnOptions ?? new ColumnOptions();
+            columnOptions.FinalizeConfigurationForSinkConstructor();
+            if (columnOptions.DisableTriggers)
+                throw new NotSupportedException($"The {nameof(ColumnOptions.DisableTriggers)} option is not supported for auditing.");
 
-            if (columnOptions != null)
-            {
-                if (columnOptions.DisableTriggers)
-                    throw new NotSupportedException($"The {nameof(ColumnOptions.DisableTriggers)} option is not supported for auditing.");
-            }
-
-            var azureManagedServiceAuthenticator = new AzureManagedServiceAuthenticator(sinkOptions.UseAzureManagedIdentity,
-                sinkOptions.AzureServiceTokenProviderResource);
+            var azureManagedServiceAuthenticator = new AzureManagedServiceAuthenticator(_sinkOptions.UseAzureManagedIdentity,
+                _sinkOptions.AzureServiceTokenProviderResource);
             _sqlConnectionFactory = new SqlConnectionFactory(connectionString, azureManagedServiceAuthenticator);
 
-            _traits = new MSSqlServerSinkTraits(_sqlConnectionFactory, sinkOptions.TableName, sinkOptions.SchemaName,
-                columnOptions, formatProvider, sinkOptions.AutoCreateSqlTable, logEventFormatter);
+            _traits = new MSSqlServerSinkTraits(_sqlConnectionFactory, _sinkOptions.TableName, _sinkOptions.SchemaName,
+                columnOptions, formatProvider, _sinkOptions.AutoCreateSqlTable, logEventFormatter);
         }
 
         /// <summary>Emit the provided log event to the sink.</summary>
@@ -111,7 +110,7 @@ public void Emit(LogEvent logEvent)
                     {
                         command.CommandType = CommandType.Text;
 
-                        var fieldList = new StringBuilder($"INSERT INTO [{_traits.SchemaName}].[{_traits.TableName}] (");
+                        var fieldList = new StringBuilder($"INSERT INTO [{_sinkOptions.SchemaName}].[{_sinkOptions.TableName}] (");
                         var parameterList = new StringBuilder(") VALUES (");
 
                         var index = 0;

src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/MSSqlServerSink.cs

@@ -33,6 +33,8 @@ namespace Serilog.Sinks.MSSqlServer
     /// </summary>
     public class MSSqlServerSink : PeriodicBatchingSink
     {
+        private readonly SinkOptions _sinkOptions;
+        private readonly ColumnOptions _columnOptions;
         private readonly ISqlConnectionFactory _sqlConnectionFactory;
         private readonly MSSqlServerSinkTraits _traits;
 
@@ -99,19 +101,21 @@ public MSSqlServerSink(
             ITextFormatter logEventFormatter = null)
             : base(sinkOptions?.BatchPostingLimit ?? DefaultBatchPostingLimit, sinkOptions?.BatchPeriod ?? DefaultPeriod)
         {
+            _sinkOptions = sinkOptions;
             if (sinkOptions?.TableName == null)
             {
                 throw new InvalidOperationException("Table name must be specified!");
             }
 
-            columnOptions?.FinalizeConfigurationForSinkConstructor();
+            _columnOptions = columnOptions ?? new ColumnOptions();
+            _columnOptions.FinalizeConfigurationForSinkConstructor();
 
             var azureManagedServiceAuthenticator = new AzureManagedServiceAuthenticator(sinkOptions.UseAzureManagedIdentity,
                 sinkOptions.AzureServiceTokenProviderResource);
             _sqlConnectionFactory = new SqlConnectionFactory(connectionString, azureManagedServiceAuthenticator);
 
             _traits = new MSSqlServerSinkTraits(_sqlConnectionFactory, sinkOptions.TableName, sinkOptions.SchemaName,
-                columnOptions, formatProvider, sinkOptions.AutoCreateSqlTable, logEventFormatter);
+                _columnOptions, formatProvider, sinkOptions.AutoCreateSqlTable, logEventFormatter);
         }
 
         /// <summary>
@@ -133,12 +137,12 @@ protected override async Task EmitBatchAsync(IEnumerable<LogEvent> events)
                 using (var cn = _sqlConnectionFactory.Create())
                 {
                     await cn.OpenAsync().ConfigureAwait(false);
-                    using (var copy = _traits.ColumnOptions.DisableTriggers
+                    using (var copy = _columnOptions.DisableTriggers
                             ? new SqlBulkCopy(cn)
                             : new SqlBulkCopy(cn, SqlBulkCopyOptions.CheckConstraints | SqlBulkCopyOptions.FireTriggers, null)
                     )
                     {
-                        copy.DestinationTableName = string.Format(CultureInfo.InvariantCulture, "[{0}].[{1}]", _traits.SchemaName, _traits.TableName);
+                        copy.DestinationTableName = string.Format(CultureInfo.InvariantCulture, "[{0}].[{1}]", _sinkOptions.SchemaName, _sinkOptions.TableName);
                         foreach (var column in _traits.EventTable.Columns)
                         {
                             var columnName = ((DataColumn)column).ColumnName;

src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/MSSqlServerSinkTraits.cs

@@ -27,12 +27,12 @@ namespace Serilog.Sinks.MSSqlServer
     /// <summary>Contains common functionality and properties used by both MSSqlServerSinks.</summary>
     internal class MSSqlServerSinkTraits : IDisposable
     {
+        private readonly string _tableName;
+        private readonly string _schemaName;
+        private readonly ColumnOptions _columnOptions;
         private readonly ILogEventDataGenerator _logEventDataGenerator;
         private bool _disposedValue;
 
-        public string TableName { get; }
-        public string SchemaName { get; }
-        public ColumnOptions ColumnOptions { get; }
         public DataTable EventTable { get; }
 
         public MSSqlServerSinkTraits(
@@ -61,13 +61,13 @@ internal MSSqlServerSinkTraits(
             if (string.IsNullOrWhiteSpace(tableName))
                 throw new ArgumentNullException(nameof(tableName));
 
+            _tableName = tableName;
+            _schemaName = schemaName;
+            _columnOptions = columnOptions;
+
             if (sqlTableCreator == null)
                 throw new ArgumentNullException(nameof(sqlTableCreator));
 
-            TableName = tableName;
-            SchemaName = schemaName;
-            ColumnOptions = columnOptions ?? new ColumnOptions();
-
             // TODO initialize this outside of this class
             var standardColumnDataGenerator = new StandardColumnDataGenerator(columnOptions, formatProvider, logEventFormatter);
             var propertiesColumnDataGenerator = new PropertiesColumnDataGenerator(columnOptions);
@@ -79,7 +79,7 @@ internal MSSqlServerSinkTraits(
             {
                 try
                 {
-                    sqlTableCreator.CreateTable(SchemaName, TableName, EventTable, ColumnOptions); // return code ignored, 0 = failure?
+                    sqlTableCreator.CreateTable(_schemaName, _tableName, EventTable, _columnOptions); // return code ignored, 0 = failure?
                 }
                 catch (Exception ex)
                 {
@@ -95,24 +95,24 @@ public IEnumerable<KeyValuePair<string, object>> GetColumnsAndValues(LogEvent lo
 
         private DataTable CreateDataTable()
         {
-            var eventsTable = new DataTable(TableName);
+            var eventsTable = new DataTable(_tableName);
 
-            foreach (var standardColumn in ColumnOptions.Store)
+            foreach (var standardColumn in _columnOptions.Store)
             {
-                var standardOpts = ColumnOptions.GetStandardColumnOptions(standardColumn);
+                var standardOpts = _columnOptions.GetStandardColumnOptions(standardColumn);
                 var dataColumn = standardOpts.AsDataColumn();
                 eventsTable.Columns.Add(dataColumn);
-                if (standardOpts == ColumnOptions.PrimaryKey)
+                if (standardOpts == _columnOptions.PrimaryKey)
                     eventsTable.PrimaryKey = new DataColumn[] { dataColumn };
             }
 
-            if (ColumnOptions.AdditionalColumns != null)
+            if (_columnOptions.AdditionalColumns != null)
             {
-                foreach (var addCol in ColumnOptions.AdditionalColumns)
+                foreach (var addCol in _columnOptions.AdditionalColumns)
                 {
                     var dataColumn = addCol.AsDataColumn();
                     eventsTable.Columns.Add(dataColumn);
-                    if (addCol == ColumnOptions.PrimaryKey)
+                    if (addCol == _columnOptions.PrimaryKey)
                         eventsTable.PrimaryKey = new DataColumn[] { dataColumn };
                 }
             }