Fix the empty headers use case for OTTracePropagator

propagator/opentelemetry-propagator-ot-trace/src/opentelemetry/propagators/ot_trace/__init__.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 from re import compile as re_compile
-from typing import Iterable, Optional
+from typing import Any, Iterable, Optional
 
 from opentelemetry.baggage import get_all, set_baggage
 from opentelemetry.context import Context
@@ -55,10 +55,10 @@ def extract(
     ) -> Context:
 
         traceid = _extract_first_element(
-            getter.get(carrier, OT_TRACE_ID_HEADER)
+            getter.get(carrier, OT_TRACE_ID_HEADER), INVALID_TRACE_ID
         )
 
-        spanid = _extract_first_element(getter.get(carrier, OT_SPAN_ID_HEADER))
+        spanid = _extract_first_element(getter.get(carrier, OT_SPAN_ID_HEADER), INVALID_SPAN_ID)
 
         sampled = _extract_first_element(
             getter.get(carrier, OT_SAMPLED_HEADER)
@@ -164,7 +164,8 @@ def fields(self):
 
 def _extract_first_element(
     items: Iterable[TextMapPropagatorT],
+    default: Any = None,
 ) -> Optional[TextMapPropagatorT]:
     if items is None:
-        return None
+        return default
     return next(iter(items), None)

propagator/opentelemetry-propagator-ot-trace/tests/test_ot_trace_propagator.py

@@ -366,3 +366,12 @@ def test_extract_baggage(self):
 
         self.assertEqual(baggage["abc"], "abc")
         self.assertEqual(baggage["def"], "def")
+
+    def test_extract_empty(self):
+        "Test extraction when no headers are present"
+
+        span_context = get_current_span(
+            self.ot_trace_propagator.extract(carrier_getter, {})
+        ).get_span_context()
+
+        self.assertEqual(span_context, INVALID_SPAN_CONTEXT)