Merge pull request #148 from DataDog/tyler/remove-super-matchers

Migrate expensive integrations using super matchers to byte buddy.

Author: tylerbenson

.gitignore

@@ -49,4 +49,5 @@ Thumbs.db
 /bin
 /out
 */out
+dd-java-agent/integrations/*/out
 dd-trace-examples/*/out

dd-java-agent-ittests/src/test/java/com/datadoghq/agent/instrumentation/annotation/TraceAnnotationsTest.java

@@ -21,6 +21,9 @@ public class TraceAnnotationsTest {
 
   @Before
   public void beforeTest() throws Exception {
+    Class.forName("com.datadoghq.agent.InstrumentationRulesManager")
+        .getMethod("registerClassLoad")
+        .invoke(null);
     try {
       GlobalTracer.register(tracer);
     } catch (final Exception e) {

dd-java-agent/dd-java-agent.gradle

@@ -21,7 +21,9 @@ dependencies {
   compile project(':dd-java-agent:tooling')
   compile project(':dd-trace-annotations')
 
-
+  compile project(':dd-java-agent:integrations:aws-sdk')
+  compile project(':dd-java-agent:integrations:servlet-2')
+  compile project(':dd-java-agent:integrations:servlet-3')
   compile project(':dd-java-agent:integrations:spring-web')
 
   compile deps.bytebuddy

dd-java-agent/integrations/aws-sdk/aws-sdk.gradle

@@ -12,3 +12,18 @@ versionScan {
     "com.amazonaws.http.request.HttpRequestFactory": null,
   ]
 }
+
+apply from: "${rootDir}/gradle/java.gradle"
+
+dependencies {
+  compileOnly group: 'com.amazonaws', name: 'aws-java-sdk-core', version: '1.11.119'
+
+  compile project(':dd-trace')
+  compile project(':dd-java-agent:tooling')
+
+  compile deps.bytebuddy
+  compile deps.opentracing
+
+  compile group: 'io.opentracing.contrib', name: 'opentracing-aws-sdk', version: '0.0.2'
+  compile group: 'com.google.auto.service', name: 'auto-service', version: '1.0-rc3'
+}

dd-java-agent/integrations/aws-sdk/src/main/java/dd/inst/aws/AWSClientInstrumentation.java

@@ -0,0 +1,61 @@
+package dd.inst.aws;
+
+import static dd.trace.ClassLoaderMatcher.classLoaderHasClasses;
+import static dd.trace.ExceptionHandlers.defaultExceptionHandler;
+import static net.bytebuddy.matcher.ElementMatchers.isPublic;
+import static net.bytebuddy.matcher.ElementMatchers.named;
+import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
+
+import com.amazonaws.client.builder.AwsClientBuilder;
+import com.amazonaws.handlers.RequestHandler2;
+import com.google.auto.service.AutoService;
+import dd.trace.Instrumenter;
+import io.opentracing.contrib.aws.TracingRequestHandler;
+import io.opentracing.util.GlobalTracer;
+import java.util.Arrays;
+import java.util.List;
+import net.bytebuddy.agent.builder.AgentBuilder;
+import net.bytebuddy.asm.Advice;
+
+@AutoService(Instrumenter.class)
+public final class AWSClientInstrumentation implements Instrumenter {
+
+  @Override
+  public AgentBuilder instrument(final AgentBuilder agentBuilder) {
+    return agentBuilder
+        .type(
+            named("com.amazonaws.client.builder.AwsSyncClientBuilder")
+                .or(named("com.amazonaws.client.builder.AwsAsyncClientBuilder")),
+            classLoaderHasClasses(
+                "com.amazonaws.http.client.HttpClientFactory",
+                "com.amazonaws.http.apache.utils.ApacheUtils"))
+        .transform(
+            new AgentBuilder.Transformer.ForAdvice()
+                .advice(
+                    named("build").and(takesArguments(0)).and(isPublic()),
+                    AWSClientAdvice.class.getName())
+                .withExceptionHandler(defaultExceptionHandler()))
+        .asDecorator();
+  }
+
+  public static class AWSClientAdvice {
+
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    public static void addHandler(@Advice.This final AwsClientBuilder builder) {
+
+      final RequestHandler2 handler = new TracingRequestHandler(GlobalTracer.get());
+
+      List<RequestHandler2> handlers = builder.getRequestHandlers();
+
+      if (handlers == null || handlers.isEmpty()) {
+        handlers = Arrays.asList(handler);
+      } else {
+        // Check if we already added the handler
+        if (!(handlers.get(0) instanceof TracingRequestHandler)) {
+          handlers.add(0, handler);
+        }
+      }
+      builder.setRequestHandlers(handler);
+    }
+  }
+}

dd-java-agent/integrations/helpers/helpers.gradle

@@ -22,13 +22,10 @@ dependencies {
   compile group: 'io.opentracing.contrib', name: 'opentracing-cassandra-driver', version: '0.0.2'
   compile group: 'io.opentracing.contrib', name: 'opentracing-apache-httpclient', version: '0.0.2'
 
-  compileOnly group: 'javax.servlet', name: 'javax.servlet-api', version: '3.0.1'
-//  compileOnly group: 'javax.servlet', name: 'servlet-api', version: '2.3'
   compileOnly group: 'org.mongodb', name: 'mongo-java-driver', version: '3.4.2'
   compileOnly group: 'org.mongodb', name: 'mongodb-driver-async', version: '3.4.2'
   compileOnly group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.6.0'
   compileOnly group: 'javax.jms', name: 'javax.jms-api', version: '2.0.1'
-  compileOnly group: 'com.amazonaws', name: 'aws-java-sdk-core', version: '1.11.119'
   compileOnly group: 'com.datastax.cassandra', name: 'cassandra-driver-core', version: '3.2.0'
   compileOnly group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.3'
 }

dd-java-agent/integrations/helpers/src/main/java/com/datadoghq/agent/integration/AWSClientHelper.java

@@ -9,3 +9,18 @@ versionScan {
     "javax.servlet.FilterChain"        : null,
   ]
 }
+
+apply from: "${rootDir}/gradle/java.gradle"
+
+dependencies {
+  compileOnly group: 'javax.servlet', name: 'servlet-api', version: '2.3'
+  compileOnly group: 'io.opentracing.contrib', name: 'opentracing-web-servlet-filter', version: '0.0.9'
+
+  compile project(':dd-trace')
+  compile project(':dd-java-agent:tooling')
+
+  compile deps.bytebuddy
+  compile deps.opentracing
+
+  compile group: 'com.google.auto.service', name: 'auto-service', version: '1.0-rc3'
+}