Fix helpers for httpclient, and servlet3
MODIFY
dd-java-agent/instrumentation/apache-httpclient-4.3/src/main/java/datadog/trace/instrumentation/apachehttpclient/ApacheHttpClientInstrumentation.java
dd-java-agent/instrumentation/apache-httpclient-4.3/src/main/java/datadog/trace/instrumentation/apachehttpclient/ApacheHttpClientInstrumentation.java
@@ -34,7 +34,8 @@ public class ApacheHttpClientInstrumentation implements Instrumenter {
"org.apache.http.impl.execchain.ClientExecChain"))
.transform(
new HelperInjector(
- "datadog.trace.instrumentation.apachehttpclient.DDTracingClientExec"))
+ "datadog.trace.instrumentation.apachehttpclient.DDTracingClientExec",
+ "datadog.trace.instrumentation.apachehttpclient.DDTracingClientExec$HttpHeadersInjectAdapter"))
.transform(
DDAdvice.create()
.advice(

MODIFY
dd-java-agent/instrumentation/okhttp-3/src/main/java/datadog/trace/instrumentation/okhttp3/OkHttp3Instrumentation.java
dd-java-agent/instrumentation/okhttp-3/src/main/java/datadog/trace/instrumentation/okhttp3/OkHttp3Instrumentation.java
@@ -26,7 +26,13 @@ public class OkHttp3Instrumentation implements Instrumenter {
return agentBuilder
.type(
named("okhttp3.OkHttpClient"),
- classLoaderHasClasses("okhttp3.Cookie", "okhttp3.ConnectionPool", "okhttp3.Headers"))
+ classLoaderHasClasses(
+ "okhttp3.Request",
+ "okhttp3.Response",
+ "okhttp3.Connection",
+ "okhttp3.Cookie",
+ "okhttp3.ConnectionPool",
+ "okhttp3.Headers"))
.transform(
new HelperInjector(
"io.opentracing.contrib.okhttp3.OkHttpClientSpanDecorator",

MODIFY
dd-java-agent/instrumentation/servlet-3/src/main/java/datadog/trace/instrumentation/servlet3/FilterChain3Instrumentation.java
dd-java-agent/instrumentation/servlet-3/src/main/java/datadog/trace/instrumentation/servlet3/FilterChain3Instrumentation.java
@@ -49,7 +49,8 @@ public final class FilterChain3Instrumentation implements Instrumenter {
"io.opentracing.contrib.web.servlet.filter.ServletFilterSpanDecorator",
"io.opentracing.contrib.web.servlet.filter.ServletFilterSpanDecorator$1",
"io.opentracing.contrib.web.servlet.filter.TracingFilter",
- "io.opentracing.contrib.web.servlet.filter.TracingFilter$1"))
+ "io.opentracing.contrib.web.servlet.filter.TracingFilter$1",
+ getClass().getName() + "$HttpServlet3Advice$TagSettingAsyncListener"))
.transform(
DDAdvice.create()
.advice(

MODIFY
dd-java-agent/instrumentation/servlet-3/src/main/java/datadog/trace/instrumentation/servlet3/HttpServlet3Instrumentation.java
dd-java-agent/instrumentation/servlet-3/src/main/java/datadog/trace/instrumentation/servlet3/HttpServlet3Instrumentation.java
@@ -47,7 +47,8 @@ public final class HttpServlet3Instrumentation implements Instrumenter {
"io.opentracing.contrib.web.servlet.filter.ServletFilterSpanDecorator",
"io.opentracing.contrib.web.servlet.filter.ServletFilterSpanDecorator$1",
"io.opentracing.contrib.web.servlet.filter.TracingFilter",
- "io.opentracing.contrib.web.servlet.filter.TracingFilter$1"))
+ "io.opentracing.contrib.web.servlet.filter.TracingFilter$1",
+ getClass().getName() + "$HttpServlet3Advice$TagSettingAsyncListener"))
.transform(
DDAdvice.create()
.advice(

Fix helpers for httpclient, and servlet3