Return original context if parsing TraceContext fails

open-telemetry · Jan 17, 2020 · 562ed24 · 562ed24
1 parent 7000c57
commit 562ed24
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/api/lib/opentelemetry/trace/propagation/http_trace_context_extractor.rb b/api/lib/opentelemetry/trace/propagation/http_trace_context_extractor.rb
@@ -32,8 +32,8 @@ def initialize(traceparent_header_key: 'traceparent',
         #   which expects the carrier to respond to [] and []=.
         # @yield [Carrier, String] if an optional getter is provided, extract will yield the carrier
         #   and the header key to the getter.
-        # @return [Context] Updated context with span context from the header, or a new one if
-        #   parsing fails.
+        # @return [Context] Updated context with span context from the header, or the original
+        #   context if parsing fails.
         def extract(context, carrier, &getter)
           getter ||= default_getter
           header = getter.call(carrier, @traceparent_header_key)
@@ -48,7 +48,7 @@ def extract(context, carrier, &getter)
                                                 remote: true)
           context.set_value(ContextKeys.extracted_span_context_key, span_context)
         rescue OpenTelemetry::Error
-          context.set_value(ContextKeys.extracted_span_context_key, Trace::SpanContext.new)
+          context
         end
       end
     end

diff --git a/api/test/opentelemetry/trace/propagation/http_trace_context_extractor_test.rb b/api/test/opentelemetry/trace/propagation/http_trace_context_extractor_test.rb
@@ -64,11 +64,11 @@
       _(span_context.tracestate).must_equal('vendorname=opaquevalue')
     end
 
-    it 'returns a valid non-remote SpanContext on error' do
+    it 'returns original context on error' do
       ctx = extractor.extract(context, {}) { invalid_traceparent_header }
+      _(ctx).must_equal(context)
       span_context = ctx[span_context_key]
-      _(span_context).wont_be :remote?
-      _(span_context).must_be :valid?
+      _(span_context).must_be_nil
     end
   end
 end