WIP

Author: ocelotl

Diff for: propagator/opentelemetry-propagator-aws-xray/src/opentelemetry/propagators/aws/aws_xray_propagator.py

@@ -346,14 +346,10 @@ def extract(
         getter: Getter[CarrierT] = default_getter,
     ) -> Context:
 
-        from ipdb import set_trace
-        set_trace
-
         xray_context = super().extract(carrier, context=context, getter=getter)
 
         if trace.get_current_span(context=context).get_span_context().is_valid:
-            # return xray_context
-            pass
+            return xray_context
 
         trace_header = (
             environ.get(AWS_TRACE_HEADER_PROP) or

Diff for: propagator/opentelemetry-propagator-aws-xray/tests/test_aws_xray_lambda_propagator.py

@@ -13,31 +13,23 @@
 # limitations under the License.
 
 from unittest import TestCase
-from ipdb import set_trace
 from requests.structures import CaseInsensitiveDict
 from unittest.mock import patch
 from os import environ
-from opentelemetry.trace import (
-    DEFAULT_TRACE_OPTIONS,
-    DEFAULT_TRACE_STATE,
-    SpanContext,
-)
 from opentelemetry.sdk.trace import ReadableSpan
 from opentelemetry.propagators.textmap import (
     DefaultGetter,
 )
 from opentelemetry.trace import (
     Link,
-    set_span_in_context,
-    NonRecordingSpan,
-    TraceFlags,
     get_current_span,
     TraceState
 )
 from opentelemetry.context import get_current
 
 from opentelemetry.propagators.aws.aws_xray_propagator import (
-    AwsXrayLambdaPropagator
+    AwsXrayLambdaPropagator,
+    TRACE_HEADER_KEY
 )
 
 
@@ -93,24 +85,21 @@ def test_extract_from_environment_variable(self):
         }
     )
     def test_add_link_from_environment_variable(self):
-        # TODO fix this test case
 
         propagator = AwsXrayLambdaPropagator()
 
         default_getter = DefaultGetter()
 
         carrier = CaseInsensitiveDict(
             {
-                # "_X_AMZN_TRACE_ID":
-                # TODO figure out why when super() extract is being called the
-                # link context is not what should be according to the java test
-                "x-amzn-trace-id":
+                TRACE_HEADER_KEY:
                 (
                     "Root=1-00000001-240000000000000000000001;"
                     "Parent=1600000000000001;Sampled=1"
                 )
             }
         )
+
         extracted_context = propagator.extract(
             carrier,
             context=get_current(),