Match latest spec update.

Author: tylerbenson

aws-xray-propagator/src/main/java/io/opentelemetry/contrib/awsxray/propagator/AwsXrayLambdaPropagator.java

@@ -60,21 +60,21 @@ public <C> void inject(Context context, @Nullable C carrier, TextMapSetter<C> se
 
   @Override
   public <C> Context extract(Context context, @Nullable C carrier, TextMapGetter<C> getter) {
+    Context xrayContext = xrayPropagator.extract(context, carrier, getter);
+
     if (Span.fromContext(context).getSpanContext().isValid()) {
-      return xrayPropagator.extract(context, carrier, getter);
+      return xrayContext;
     }
 
-    context = xrayPropagator.extract(context, carrier, getter);
-
     String traceHeader = System.getProperty(AWS_TRACE_HEADER_PROP);
     if (isEmptyOrNull(traceHeader)) {
       traceHeader = System.getenv(AWS_TRACE_HEADER_ENV_KEY);
     }
     if (isEmptyOrNull(traceHeader)) {
-      return context;
+      return xrayContext;
     }
     return xrayPropagator.extract(
-        context,
+        xrayContext,
         Collections.singletonMap(AwsXrayPropagator.TRACE_HEADER_KEY, traceHeader),
         MapGetter.INSTANCE);
   }