Merge pull request #187 from DataDog/ark/fix_helpers

Fix helpers for okhttp, httpclient, and servlet3

Author: tylerbenson

dd-java-agent/instrumentation/apache-httpclient-4.3/src/main/java/datadog/trace/instrumentation/apachehttpclient/ApacheHttpClientInstrumentation.java

@@ -34,7 +34,8 @@ public AgentBuilder instrument(final AgentBuilder agentBuilder) {
                 "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(

dd-java-agent/instrumentation/okhttp-3/src/main/java/datadog/trace/instrumentation/okhttp3/OkHttp3Instrumentation.java

@@ -26,7 +26,13 @@ public AgentBuilder instrument(final AgentBuilder agentBuilder) {
     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",

dd-java-agent/instrumentation/servlet-3/src/main/java/datadog/trace/instrumentation/servlet3/FilterChain3Instrumentation.java

@@ -49,7 +49,8 @@ public AgentBuilder instrument(final AgentBuilder agentBuilder) {
                 "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(

dd-java-agent/instrumentation/servlet-3/src/main/java/datadog/trace/instrumentation/servlet3/HttpServlet3Instrumentation.java

@@ -47,7 +47,8 @@ public AgentBuilder instrument(final AgentBuilder agentBuilder) {
                 "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(