Bugfix: also write SelfLog and rethrow in SqlBulkBatchWriter if and exception is thrown during preparing of the log events DataTable.

Author: ckadluba

src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Platform/SqlBulkBatchWriter.cs

@@ -34,11 +34,10 @@ public SqlBulkBatchWriter(
 
         public async Task WriteBatch(IEnumerable<LogEvent> events, DataTable dataTable)
         {
-            // Copy the events to the data table
-            FillDataTable(events, dataTable);
-
             try
             {
+                FillDataTable(events, dataTable);
+
                 using (var cn = _sqlConnectionFactory.Create())
                 {
                     await cn.OpenAsync().ConfigureAwait(false);
@@ -61,7 +60,6 @@ public async Task WriteBatch(IEnumerable<LogEvent> events, DataTable dataTable)
             }
             finally
             {
-                // Processed the items, clear for the next run
                 dataTable.Clear();
             }
         }

test/Serilog.Sinks.MSSqlServer.Tests/Sinks/MSSqlServer/Platform/SqlBulkBatchWriterTests.cs

@@ -177,6 +177,18 @@ public async Task WriteBatchClearsDataTable()
             Assert.Empty(_dataTable.Rows);
         }
 
+        [Fact]
+        public void WriteBatchRethrowsIfLogEventDataGeneratorMockGetColumnsAndValuesThrows()
+        {
+            // Arrange
+            _logEventDataGeneratorMock.Setup(d => d.GetColumnsAndValues(It.IsAny<LogEvent>()))
+                .Callback(() => throw new Exception());
+            var logEvents = CreateLogEvents();
+
+            // Act + assert
+            Assert.ThrowsAsync<Exception>(() => _sut.WriteBatch(logEvents, _dataTable));
+        }
+
         [Fact]
         public void WriteBatchRethrowsIfSqlConnectionFactoryCreateThrows()
         {