@@ -234,10 +234,10 @@ index cb19d1e568..12ed174bb2 100644
234234 assertThat(spanContext.getSpanId()).isEqualTo("00f067aa0ba902b7");
235235diff --git a/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/internal/ParentContextExtractorTest.java b/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/internal/ParentContextExtractorTest.java
236236new file mode 100644
237- index 0000000000..dc1fdeb302
237+ index 0000000000..76fc823a65
238238--- /dev/null
239239+++ b/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/internal/ParentContextExtractorTest.java
240- @@ -0,0 +1,310 @@
240+ @@ -0,0 +1,337 @@
241241+ /*
242242+ * Copyright The OpenTelemetry Authors
243243+ * SPDX-License-Identifier: Apache-2.0
@@ -471,6 +471,33 @@ index 0000000000..dc1fdeb302
471471+ }
472472+
473473+ @Test
474+ + void shouldPreferLambdaContextOverHttp() {
475+ + // given
476+ + Map<String, String> headers =
477+ + ImmutableMap.of(
478+ + "X-b3-traceId",
479+ + "4fd0b6131f19f39af59518d127b0cafe",
480+ + "x-b3-spanid",
481+ + "0000000000000123",
482+ + "X-B3-Sampled",
483+ + "true");
484+ + Context mockLambdaContextWithXrayTraceId = mock(Context.class);
485+ + when(mockLambdaContextWithXrayTraceId.getXrayTraceId())
486+ + .thenReturn("Root=1-8a3c60f7-d188f8fa79d48a391a778fa6;Parent=0000000000000456;Sampled=1");
487+ +
488+ + // when
489+ + io.opentelemetry.context.Context context =
490+ + ParentContextExtractor.extract(
491+ + headers, INSTRUMENTER_WITH_B3_XRAY_PROPAGATORS, mockLambdaContextWithXrayTraceId);
492+ + // then
493+ + Span span = Span.fromContext(context);
494+ + SpanContext spanContext = span.getSpanContext();
495+ + assertThat(spanContext.isValid()).isTrue();
496+ + assertThat(spanContext.getSpanId()).isEqualTo("0000000000000456");
497+ + assertThat(spanContext.getTraceId()).isEqualTo("8a3c60f7d188f8fa79d48a391a778fa6");
498+ + }
499+ +
500+ + @Test
474501+ void shouldPreferHttpOverXrayIdSetByLambdaContext() {
475502+ // given
476503+ Map<String, String> headers =
0 commit comments