From 201691b8a1f67b8426c2441de75c04e1683e7697 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Sat, 6 Feb 2021 21:12:17 -0800 Subject: [PATCH] Fix merge conflict (#2213) --- .../instrumentation/awslambda/v1_0/ParentContextExtractor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instrumentation/aws-lambda-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambda/v1_0/ParentContextExtractor.java b/instrumentation/aws-lambda-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambda/v1_0/ParentContextExtractor.java index d45de63222..659cc390a6 100644 --- a/instrumentation/aws-lambda-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambda/v1_0/ParentContextExtractor.java +++ b/instrumentation/aws-lambda-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambda/v1_0/ParentContextExtractor.java @@ -43,7 +43,7 @@ public class ParentContextExtractor { } static Context fromHttpHeaders(Map headers) { - return BaseTracer.extract(lowercaseMap(headers), MapGetter.INSTANCE); + return BaseTracer.extractWithGlobalPropagators(lowercaseMap(headers), MapGetter.INSTANCE); } // lower-case map getter used for extraction