Fix null exception on PropagationHelpers (#142)

signalfx · Sep 23, 2021 · 11c506e · 11c506e
1 parent 26512b4
commit 11c506e
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/tracer/src/Datadog.Trace/Propagation/PropagationHelpers.cs b/tracer/src/Datadog.Trace/Propagation/PropagationHelpers.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using Datadog.Trace.Conventions;
 using Datadog.Trace.Logging;
 
@@ -9,7 +10,7 @@ internal static class PropagationHelpers
     {
         public static TraceId ParseTraceId<T>(T carrier, Func<T, string, IEnumerable<string>> getter, string headerName, ITraceIdConvention traceIdConvention, IDatadogLogger logger)
         {
-            var headerValues = getter(carrier, headerName);
+            var headerValues = getter(carrier, headerName) ?? Enumerable.Empty<string>();
 
             foreach (var headerValue in headerValues)
             {
@@ -28,7 +29,7 @@ public static TraceId ParseTraceId<T>(T carrier, Func<T, string, IEnumerable<str
 
         public static string ParseString<T>(T carrier, Func<T, string, IEnumerable<string>> getter, string headerName)
         {
-            var headerValues = getter(carrier, headerName);
+            var headerValues = getter(carrier, headerName) ?? Enumerable.Empty<string>();
 
             foreach (var headerValue in headerValues)
             {