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

netty 4.0: do not modify headers in aws request

This commit is contained in:
Nikolay Martynov 2019-01-25 15:50:43 -05:00
parent 5029660418
commit d4943eb2b6
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/ChannelFutureListenerInstrumentation.java
View File

@ -28,8 +28,8 @@ public class ChannelFutureListenerInstrumentation extends Instrumenter.Default {
public ChannelFutureListenerInstrumentation() { public ChannelFutureListenerInstrumentation() {
super( super(
NettyChannelPipelineInstrumentation.INSTRUMENTATION_NAME, NettyChannelPipelineInstrumentation.INSTRUMENTATION_NAME,
NettyChannelPipelineInstrumentation.ADDITIONAL_INSTRUMENTATION_NAMES); NettyChannelPipelineInstrumentation.ADDITIONAL_INSTRUMENTATION_NAMES);
} }
@Override @Override

7
dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/client/HttpClientRequestTracingHandler.java
View File

@ -53,9 +53,12 @@ public class HttpClientRequestTracingHandler extends ChannelOutboundHandlerAdapt
.withTag(DDTags.SPAN_TYPE, DDSpanTypes.HTTP_CLIENT) .withTag(DDTags.SPAN_TYPE, DDSpanTypes.HTTP_CLIENT)
.start(); .start();
GlobalTracer.get() // AWS calls are often signed, so we can't add headers without breaking the signature.
if (!request.headers().contains("amz-sdk-invocation-id")) {
GlobalTracer.get()
.inject( .inject(
span.context(), Format.Builtin.HTTP_HEADERS, new NettyResponseInjectAdapter(request)); span.context(), Format.Builtin.HTTP_HEADERS, new NettyResponseInjectAdapter(request));
}
ctx.channel().attr(AttributeKeys.CLIENT_ATTRIBUTE_KEY).set(span); ctx.channel().attr(AttributeKeys.CLIENT_ATTRIBUTE_KEY).set(span);