Merge pull request #649 from nanny07/fix/643

Fix TraceId and SpanId with null value

Author: ckadluba

src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Output/StandardColumnDataGenerator.cs

@@ -51,9 +51,9 @@ public KeyValuePair<string, object> GetStandardColumnNameAndValue(StandardColumn
                 case StandardColumn.Level:
                     return new KeyValuePair<string, object>(_columnOptions.Level.ColumnName, _columnOptions.Level.StoreAsEnum ? (object)logEvent.Level : logEvent.Level.ToString());
                 case StandardColumn.TraceId:
-                    return new KeyValuePair<string, object>(_columnOptions.TraceId.ColumnName, logEvent.TraceId.ToString());
+                    return new KeyValuePair<string, object>(_columnOptions.TraceId.ColumnName, logEvent.TraceId?.ToString());
                 case StandardColumn.SpanId:
-                    return new KeyValuePair<string, object>(_columnOptions.SpanId.ColumnName, logEvent.SpanId.ToString());
+                    return new KeyValuePair<string, object>(_columnOptions.SpanId.ColumnName, logEvent.SpanId?.ToString());
                 case StandardColumn.TimeStamp:
                     return GetTimeStampStandardColumnNameAndValue(logEvent);
                 case StandardColumn.Exception:

test/Serilog.Sinks.MSSqlServer.Tests/Sinks/MSSqlServer/Output/StandardColumnDataGeneratorTests.cs

@@ -282,6 +282,25 @@ public void GetStandardColumnNameAndValueForTraceIdReturnsLogLevelKeyValue()
             Assert.Equal("34898a9020e0390190b0982370034f00", result.Value);
         }
 
+        [Fact]
+        public void GetStandardColumnNameAndNullValueForTraceIdReturnsLogLevelKeyValue()
+        {
+            // Arrange
+            var traceId = default(ActivityTraceId);
+            var logEvent = new LogEvent(
+                new DateTimeOffset(2020, 1, 1, 0, 0, 0, 0, TimeSpan.Zero),
+                LogEventLevel.Debug, null, new MessageTemplate(new List<MessageTemplateToken>() { new TextToken("Test message") }),
+                new List<LogEventProperty>(), traceId, ActivitySpanId.CreateRandom());
+            SetupSut(new MSSqlServer.ColumnOptions(), CultureInfo.InvariantCulture);
+
+            // Act
+            var result = _sut.GetStandardColumnNameAndValue(StandardColumn.TraceId, logEvent);
+
+            // Assert
+            Assert.Equal("TraceId", result.Key);
+            Assert.Null(result.Value);
+        }
+
         [Fact]
         public void GetStandardColumnNameAndValueForSpanIdReturnsLogLevelKeyValue()
         {
@@ -301,6 +320,25 @@ public void GetStandardColumnNameAndValueForSpanIdReturnsLogLevelKeyValue()
             Assert.Equal("0390190b09823700", result.Value);
         }
 
+        [Fact]
+        public void GetStandardColumnNameAndNullValueForSpanIdReturnsLogLevelKeyValue()
+        {
+            // Arrange
+            var spanId = default(ActivitySpanId);
+            var logEvent = new LogEvent(
+                new DateTimeOffset(2020, 1, 1, 0, 0, 0, 0, TimeSpan.Zero),
+                LogEventLevel.Debug, null, new MessageTemplate(new List<MessageTemplateToken>() { new TextToken("Test message") }),
+                new List<LogEventProperty>(), ActivityTraceId.CreateRandom(), spanId);
+            SetupSut(new MSSqlServer.ColumnOptions(), CultureInfo.InvariantCulture);
+
+            // Act
+            var result = _sut.GetStandardColumnNameAndValue(StandardColumn.SpanId, logEvent);
+
+            // Assert
+            Assert.Equal("SpanId", result.Key);
+            Assert.Null(result.Value);
+        }
+
         [Fact]
         public void GetStandardColumnNameAndValueForLogLevelReturnsLogLevelKeyValueAsEnum()
         {