From db0b14f4d78dfe0ee5f44f3d098497b68e2b357b Mon Sep 17 00:00:00 2001
From: Hargo Khalsa <hargo.khalsa@wyyerd.com>
Date: Wed, 24 Aug 2022 17:38:25 -0700
Subject: [PATCH] Fix XrayPropagator when no header is present

---
 opentelemetry-aws/src/lib.rs | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/opentelemetry-aws/src/lib.rs b/opentelemetry-aws/src/lib.rs
index 89a6d2d2d1..61dfc45f31 100644
--- a/opentelemetry-aws/src/lib.rs
+++ b/opentelemetry-aws/src/lib.rs
@@ -203,11 +203,9 @@ pub mod trace {
         }
 
         fn extract_with_context(&self, cx: &Context, extractor: &dyn Extractor) -> Context {
-            let extracted = self
-                .extract_span_context(extractor)
-                .unwrap_or_else(|_| SpanContext::empty_context());
-
-            cx.with_remote_span_context(extracted)
+            self.extract_span_context(extractor)
+                .map(|sc| cx.with_remote_span_context(sc))
+                .unwrap_or_else(|_| cx.clone())
         }
 
         fn fields(&self) -> FieldIter<'_> {