open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflict (#2213)

This commit is contained in:
Trask Stalnaker 2021-02-06 21:12:17 -08:00 committed by GitHub
parent 7538a66d4c
commit 201691b8a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
instrumentation/aws-lambda-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambda/v1_0/ParentContextExtractor.java
View File

@ -43,7 +43,7 @@ public class ParentContextExtractor {
} }
static Context fromHttpHeaders(Map<String, String> headers) { static Context fromHttpHeaders(Map<String, String> headers) {
return BaseTracer.extract(lowercaseMap(headers), MapGetter.INSTANCE); return BaseTracer.extractWithGlobalPropagators(lowercaseMap(headers), MapGetter.INSTANCE);
} }
// lower-case map getter used for extraction // lower-case map getter used for extraction