Fix: XRay propagator null exception (open-telemetry#833)

* Fixing XRay propagator null exception * Add test for missing header Co-authored-by: Robert <robertlaurin@users.noreply.github.com>
DataDog · Jun 24, 2021 · 42fa792 · 42fa792
1 parent bef61b5
commit 42fa792
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/propagator/xray/lib/opentelemetry/propagator/xray/text_map_propagator.rb b/propagator/xray/lib/opentelemetry/propagator/xray/text_map_propagator.rb
@@ -38,6 +38,8 @@ class TextMapPropagator
         #   if extraction fails
         def extract(carrier, context: Context.current, getter: Context::Propagation.text_map_getter)
           header = getter.get(carrier, XRAY_CONTEXT_KEY)
+          return context unless header
+
           match = parse_header(header)
           return context unless match
 

diff --git a/propagator/xray/test/text_map_propagator_test.rb b/propagator/xray/test/text_map_propagator_test.rb
@@ -79,6 +79,14 @@
 
       context = propagator.extract(carrier, context: parent_context)
 
+      _(context).must_equal(parent_context)
+    end
+    it 'handles missing header gracefully' do
+      parent_context = OpenTelemetry::Context.empty
+      carrier = {}
+
+      context = propagator.extract(carrier, context: parent_context)
+
       _(context).must_equal(parent_context)
     end
   end