chore(propagator): modify extract function and test cases

Author: Div95

propagator/opentelemetry-propagator-env/src/opentelemetry/propagators/env/composite_propagator.py

@@ -40,10 +40,7 @@ def extract(self, carrier: CarrierT, context: typing.Optional[Context] = None, g
             self._propagators = [TraceContextTextMapPropagator(), W3CBaggagePropagator()]
 
         for propagator in self._propagators:
-            if isinstance(propagator, B3SingleFormat):
-                context = B3MultiFormat().extract(carrier, context, getter)
-            else:
-                context = propagator.extract(carrier, context, getter)
+            context = propagator.extract(carrier, context, getter)
         return context
 
     def inject(self, carrier: CarrierT, context: typing.Optional[Context] = None, setter: Setter = textmap.default_setter) -> None:

propagator/opentelemetry-propagator-env/src/opentelemetry/propagators/env/propagator.py

@@ -36,8 +36,6 @@ def __init__(self, formatter):
 
     # delegating to extract function implementation of the formatter
     def extract(self, carrier: CarrierT, context: typing.Optional[Context] = None, getter: Getter = DefaultGetter()) -> Context:
-        if isinstance(self.formatter, B3SingleFormat):
-            return B3MultiFormat().extract(carrier = carrier, context=context, getter = getter)
         return self.formatter.extract(carrier = carrier, context=context, getter = getter)
 
     # delegating to inject function implementation of the formatter

propagator/opentelemetry-propagator-env/tests/test_b3_multi_format_baggage_composite_env_propagator.py

@@ -412,7 +412,6 @@ def test_extract_when_b3_format_is_valid_and_baggage_invalid(self):
     @mock.patch.dict(os.environ, {"baggage": "key1=value1,key2=value2"})
     def test_extract_when_baggage_is_valid_but_b3_spanid_is_invalid(self):
         extracted_context = self.composite_propagator_b3_baggage_object.extract(carrier = os.environ, getter = getter)
-        print("****extracted_context: ***", extracted_context)
         self.assertEqual(baggage.get_all(extracted_context), {'key1':'value1', 'key2':'value2'})
 
     @mock.patch.dict(os.environ, {"x-b3-traceid": "98fea4de58eca772"})

propagator/opentelemetry-propagator-env/tests/test_b3_multi_format_tracecontext_composite_env_propagator.py

@@ -307,7 +307,7 @@ def test_inject_when_traceid_has_16_hex_char(self):
 
     def test_extract_when_no_trace_details(self):
         extracted_context = self.composite_env_propagator_baggage_w3c_object.extract(getter = getter, carrier = os.environ)
-        self.assertEqual(extracted_context , {})
+        self.assertEqual(opentelemetry.trace.get_current_span(extracted_context), opentelemetry.trace.span.INVALID_SPAN)
 
     @mock.patch.dict(os.environ, {"b3": "8128c50fd8653b5d98fea4de58eca772-136eec09c948be26-1-e28bf981e15deb7f"})
     @mock.patch.dict(os.environ, {"traceparent": "00-8128c50fd8653b5d98fea4de58eca772-136eec09c948be26-01"})
@@ -356,13 +356,13 @@ def test_extract_when_baggage_is_valid_and_traceid_of_w3c_has_16_hex_char(self):
     @mock.patch.dict(os.environ, {"traceparent": "00-8128c5-136eec09c948be26-01"})
     def test_extract_when_w3c_traceid_is_invalid(self):
         extracted_context = self.composite_env_propagator_baggage_w3c_object.extract(getter = getter, carrier = os.environ)
-        self.assertEqual(extracted_context , {})
+        self.assertEqual(opentelemetry.trace.get_current_span(extracted_context), opentelemetry.trace.span.INVALID_SPAN)
 
     @mock.patch.dict(os.environ, {"b3": "8128c50fd8653b5d98fea4de-136eec09c-1-e28bf981e15deb7f"})
-    @mock.patch.dict(os.environ, {"traceparent": "00-8128c50fd8653b5d98fea4de-136eec09c-01"})
+    @mock.patch.dict(os.environ, {"traceparent": "00-8128c50-136eec09c-01"})
     def test_extract_when_w3c_traceid_and_spanid_are_invalid(self):
         extracted_context = self.composite_env_propagator_baggage_w3c_object.extract(getter = getter, carrier = os.environ)
-        self.assertEqual(extracted_context , {})
+        self.assertEqual(opentelemetry.trace.get_current_span(extracted_context), opentelemetry.trace.span.INVALID_SPAN)
 
     @mock.patch.dict(os.environ, {"b3": "8128c50fd8653b5d98fea4de58eca772-136eec09c948be26-1-e28bf981e15deb7f"})
     @mock.patch.dict(os.environ, {"traceparent": "00-8128c50fd8653b5d98fea4de58eca772-136eec09c948be26-01"})
@@ -380,7 +380,7 @@ def test_extract_when_baggage_is_not_present_in_os_environ(self):
     @mock.patch.dict(os.environ, {"baggage": "example1-value1;example2-value2"})
     def test_extract_baggage_invalid_format(self):
         extracted_context = self.composite_env_propagator_baggage_w3c_object.extract(getter = getter, carrier = os.environ)
-        self.assertEqual(extracted_context , {})
+        self.assertEqual(opentelemetry.trace.get_current_span(extracted_context), opentelemetry.trace.span.INVALID_SPAN)
 
     @mock.patch.dict(os.environ, {"baggage": "example1=value1%2Cvalue2,example2=value3%2Cvalue4"})
     def test_extract_when_baggage_with_valid_format_has_commas_in_values(self):
@@ -393,7 +393,7 @@ def test_extract_when_baggage_with_valid_format_has_commas_in_values(self):
 
     def test_extract_context_when_no_trace_details(self):
         extracted_context = self.composite_env_propagator_baggage_w3c_object.extract_context()
-        self.assertEqual(extracted_context , {})
+        self.assertEqual(opentelemetry.trace.get_current_span(extracted_context), opentelemetry.trace.span.INVALID_SPAN)
 
     @mock.patch.dict(os.environ, {"b3": "8128c50fd8653b5d98fea4de58eca772-136eec09c948be26-1-e28bf981e15deb7f"})
     @mock.patch.dict(os.environ, {"traceparent": "00-8128c50fd8653b5d98fea4de58eca772-136eec09c948be26-01"})
@@ -444,13 +444,13 @@ def test_extract_context_when_baggage_is_valid_and_traceid_of_w3c_has_16_hex_cha
     @mock.patch.dict(os.environ, {"traceparent": "00-8128c50fd8653b5d98fea4de-136eec09c948be26-01"})
     def test_extract_context_when_w3c_traceid_is_invalid(self):
         extracted_context = self.composite_env_propagator_baggage_w3c_object.extract_context()
-        self.assertEqual(extracted_context , {})
+        self.assertEqual(opentelemetry.trace.get_current_span(extracted_context), opentelemetry.trace.span.INVALID_SPAN)
 
     @mock.patch.dict(os.environ, {"b3": "8128c50fd8653b5d98fea4de-136eec09c-1-e28bf981e15deb7f"})
     @mock.patch.dict(os.environ, {"traceparent": "00-8128c50fd8653b5d98fea4de-136eec09c-01"})
     def test_extract_context_when_w3c_traceid_and_spanid_are_invalid(self):
         extracted_context = self.composite_env_propagator_baggage_w3c_object.extract_context()
-        self.assertEqual(extracted_context , {})
+        self.assertEqual(opentelemetry.trace.get_current_span(extracted_context), opentelemetry.trace.span.INVALID_SPAN)
 
     @mock.patch.dict(os.environ, {"b3": "8128c50fd8653b5d98fea4de58eca772-136eec09c948be26-1-e28bf981e15deb7f"})
     @mock.patch.dict(os.environ, {"traceparent": "00-8128c50fd8653b5d98fea4de58eca772-136eec09c948be26-01"})
@@ -468,7 +468,7 @@ def test_extract_context_when_baggage_is_not_present_os_environ(self):
     @mock.patch.dict(os.environ, {"baggage": "example1-value1;example2-value2"})
     def test_extract_context_baggage_invalid_format(self):
         extracted_context = self.composite_env_propagator_baggage_w3c_object.extract_context()
-        self.assertEqual(extracted_context , {})
+        self.assertEqual(opentelemetry.trace.get_current_span(extracted_context), opentelemetry.trace.span.INVALID_SPAN)
 
     @mock.patch.dict(os.environ, {"baggage": "example1=value1%2Cvalue2,example2=value3%2Cvalue4"})
     def test_extract_context_when_baggage_with_valid_format_has_commas_in_values(self):

propagator/opentelemetry-propagator-env/tests/test_b3_single_format_tracecontext_composite_env_propagator.py

@@ -142,27 +142,27 @@ def test_extract_valid_w3cformat_present_in_environment_variable(self):
     @mock.patch.dict(os.environ, {"traceparent": "00-8128c50fd8653b5d98fea4de58eca772-136eec06-a"})
     def test_extract_w3cformat_with_invalid_span_id(self):
         extracted_context = self.composite_env_propagator_w3c_obj.extract(getter = getter, carrier = os.environ)
-        self.assertEqual(extracted_context , {})
+        self.assertEqual(opentelemetry.trace.get_current_span(extracted_context), opentelemetry.trace.span.INVALID_SPAN)
 
     @mock.patch.dict(os.environ, {"traceparent": "00-8128c50ed865ca77-136eec06ae45ae57-1"})
     def test_extract_w3cformat_with_invalid_trace_id_having_16_hex_char(self):
         extracted_context = self.composite_env_propagator_w3c_obj.extract(getter = getter, carrier = os.environ)
-        self.assertEqual( extracted_context , {})
+        self.assertEqual( opentelemetry.trace.get_current_span(extracted_context), opentelemetry.trace.span.INVALID_SPAN)
 
     @mock.patch.dict(os.environ, {"traceparent": "00-8128c50fd865ca77-136eec06-1"})
     def test_extract_w3cformat_with_invalid_trace_id_and_span_id(self):
         extracted_context = self.composite_env_propagator_w3c_obj.extract(getter = getter, carrier = os.environ)
-        self.assertEqual(extracted_context , {})
+        self.assertEqual(opentelemetry.trace.get_current_span(extracted_context), opentelemetry.trace.span.INVALID_SPAN)
 
     def test_extract_when_no_trace_details_in_w3c_format(self):
         extracted_context = self.composite_env_propagator_w3c_obj.extract(getter = getter, carrier = os.environ)
-        self.assertEqual(extracted_context , {})
+        self.assertEqual(opentelemetry.trace.get_current_span(extracted_context), opentelemetry.trace.span.INVALID_SPAN)
 
     # test cases for extract_context
 
     def test_extract_context_when_no_trace_details(self):
         extracted_context = self.composite_env_propagator_w3c_obj.extract_context()
-        self.assertEqual(extracted_context , {})
+        self.assertEqual(opentelemetry.trace.get_current_span(extracted_context), opentelemetry.trace.span.INVALID_SPAN)
 
     @mock.patch.dict(os.environ, {"traceparent": "00-8128c50fd8653b5d98fea4de58eca772-136eec09c948be26-01"})
     def test_extract_context_valid_w3cformat_in_environment_variable(self):
@@ -176,14 +176,14 @@ def test_extract_context_valid_w3cformat_in_environment_variable(self):
     @mock.patch.dict(os.environ, {"traceparent": "00-8128c50fd8653b5d98fea4de58eca772-136eec06-a"})
     def test_extract_context_w3cformat_with_invalid_span_id(self):
         extracted_context = self.composite_env_propagator_w3c_obj.extract_context()
-        self.assertEqual(extracted_context , {})
+        self.assertEqual(opentelemetry.trace.get_current_span(extracted_context), opentelemetry.trace.span.INVALID_SPAN)
 
     @mock.patch.dict(os.environ, {"traceparent": "00-8128c50ed865ca77-136eec06ae45ae57-1"})
     def test_extract_context_w3cformat_with_invalid_trace_id_having_16_hex_char(self):
         extracted_context = self.composite_env_propagator_w3c_obj.extract_context()
-        self.assertEqual(extracted_context , {})
+        self.assertEqual(opentelemetry.trace.get_current_span(extracted_context), opentelemetry.trace.span.INVALID_SPAN)
 
     @mock.patch.dict(os.environ, {"traceparent": "00-8128c50fd865ca77-136eec06-1"})
     def test_extract_context_w3cformat_with_invalid_trace_id_and_span_id(self):
         extracted_context = self.composite_env_propagator_w3c_obj.extract_context()
-        self.assertEqual(extracted_context , {})
+        self.assertEqual(opentelemetry.trace.get_current_span(extracted_context), opentelemetry.trace.span.INVALID_SPAN)

propagator/opentelemetry-propagator-env/tests/test_tracecontext_baggage_composite_env_propagator.py

@@ -109,22 +109,22 @@ def test_inject_to_carrier_when_attached_context_and_context_passed_as_param_are
 
     def test_extract_context_when_no_trace_details_in_w3c_format(self):
         extracted_context_w3c = self.env_propagator_w3c_obj.extract_context()
-        self.assertEqual(extracted_context_w3c , {})
+        self.assertEqual(opentelemetry.trace.get_current_span(extracted_context_w3c), opentelemetry.trace.span.INVALID_SPAN)
 
     @mock.patch.dict(os.environ, {'traceparent': '00-123-136eec09c948be26-1'})
     def test_extract_context_when_traceid_format_does_not_match_regex_for_w3c(self):
         extracted_context = self.env_propagator_w3c_obj.extract_context()
-        self.assertEqual(extracted_context , {})
+        self.assertEqual(opentelemetry.trace.get_current_span(extracted_context), opentelemetry.trace.span.INVALID_SPAN)
 
     @mock.patch.dict(os.environ, {'traceparent': '00-8128c50fd8653b5d98fea4de58eca772-136e-1'})
     def test_extract_context_when_spanid_format_does_not_match_regex_for_w3c(self):
         extracted_context = self.env_propagator_w3c_obj.extract_context()
-        self.assertEqual(extracted_context , {})
+        self.assertEqual(opentelemetry.trace.get_current_span(extracted_context), opentelemetry.trace.span.INVALID_SPAN)
 
     @mock.patch.dict(os.environ, {'traceparent': '00-123-136-1'})
     def test_extract_context_when_traceid_and_spanid_format_do_not_match_regex_for_w3c(self):
         extracted_context = self.env_propagator_w3c_obj.extract_context()
-        self.assertEqual(extracted_context , {})
+        self.assertEqual(opentelemetry.trace.get_current_span(extracted_context), opentelemetry.trace.span.INVALID_SPAN)
 
     @mock.patch.dict(os.environ, {'traceparent': '00-8128c50fd8653b5d98fea4de58eca772-136eec09c948be26-01'})
     @mock.patch.dict(os.environ, {'tracestate': 'congo=t61rcWkgMzE'})
@@ -189,23 +189,23 @@ def test_extract_when_valid_w3cformat_in_environment_variable(self):
     @mock.patch.dict(os.environ, {"traceparent": "00-8128ca772-136eec06-01"})
     def test_extract_when_invalid_w3cformat_in_environment_variable(self):
         extracted_context = self.env_propagator_w3c_obj.extract(getter = getter, carrier = os.environ)
-        self.assertEqual(extracted_context , {})
+        self.assertEqual(opentelemetry.trace.get_current_span(extracted_context), opentelemetry.trace.span.INVALID_SPAN)
 
     @mock.patch.dict(os.environ, {"traceparent": "00-8128c50fd8653b5d98fea4de58eca772-136eec06-01"})
     def test_extract_w3cformat_with_invalid_span_id(self):
         extracted_context = self.env_propagator_w3c_obj.extract(getter = getter, carrier = os.environ)
-        self.assertEqual(extracted_context , {})
+        self.assertEqual(opentelemetry.trace.get_current_span(extracted_context), opentelemetry.trace.span.INVALID_SPAN)
 
     @mock.patch.dict(os.environ, {"traceparent": "00-8128c50fd8653b5d-136eec06ae45ae57-01"})
     def test_extract_w3cformat_with_trace_id_having_16_hex_char(self):
         extracted_context = self.env_propagator_w3c_obj.extract(getter = getter, carrier = os.environ)
-        self.assertEqual(extracted_context , {})
+        self.assertEqual(opentelemetry.trace.get_current_span(extracted_context), opentelemetry.trace.span.INVALID_SPAN)
 
     @mock.patch.dict(os.environ, {"traceparent": "00-8128c50fd865ca77-136eec06-01"})
     def test_extract_w3cformat_with_invalid_trace_id_and_span_id(self):
         extracted_context = self.env_propagator_w3c_obj.extract(getter = getter, carrier = os.environ)
-        self.assertEqual(extracted_context , {})
+        self.assertEqual(opentelemetry.trace.get_current_span(extracted_context), opentelemetry.trace.span.INVALID_SPAN)
 
     def test_extract_when_no_trace_details_in_w3c_format(self):
         extracted_context = self.env_propagator_w3c_obj.extract(getter = getter, carrier = os.environ)
-        self.assertEqual(extracted_context , {})
+        self.assertEqual(opentelemetry.trace.get_current_span(extracted_context), opentelemetry.trace.span.INVALID_SPAN)