Add exception handling and supression for advice.

Also centralize classloader matching.

Author: tylerbenson

.gitignore

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

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

@@ -1,6 +1,7 @@
 package dd.inst.aws;
 
-import static dd.trace.ClassLoaderHasClassMatcher.classLoaderHasClasses;
+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;
@@ -32,13 +33,14 @@ public AgentBuilder instrument(final AgentBuilder agentBuilder) {
             new AgentBuilder.Transformer.ForAdvice()
                 .advice(
                     named("build").and(takesArguments(0)).and(isPublic()),
-                    AWSClientAdvice.class.getName()))
+                    AWSClientAdvice.class.getName())
+                .withExceptionHandler(defaultExceptionHandler()))
         .asDecorator();
   }
 
   public static class AWSClientAdvice {
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class)
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
     public static void addHandler(@Advice.This final AwsClientBuilder builder) {
 
       final RequestHandler2 handler = new TracingRequestHandler(GlobalTracer.get());

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/servlet-2/servlet-2.gradle

@@ -14,13 +14,13 @@ 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: 'io.opentracing.contrib', name: 'opentracing-web-servlet-filter', version: '0.0.9'
   compile group: 'com.google.auto.service', name: 'auto-service', version: '1.0-rc3'
 }

dd-java-agent/integrations/servlet-2/src/main/java/dd/inst/servlet2/HttpServlet2Instrumentation.java

@@ -1,6 +1,7 @@
 package dd.inst.servlet2;
 
-import static dd.trace.ClassLoaderHasClassMatcher.classLoaderHasClasses;
+import static dd.trace.ClassLoaderMatcher.classLoaderHasClasses;
+import static dd.trace.ExceptionHandlers.defaultExceptionHandler;
 import static net.bytebuddy.matcher.ElementMatchers.isProtected;
 import static net.bytebuddy.matcher.ElementMatchers.named;
 import static net.bytebuddy.matcher.ElementMatchers.not;
@@ -41,13 +42,14 @@ public AgentBuilder instrument(final AgentBuilder agentBuilder) {
                         .and(takesArgument(0, named("javax.servlet.http.HttpServletRequest")))
                         .and(takesArgument(1, named("javax.servlet.http.HttpServletResponse")))
                         .and(isProtected()),
-                    HttpServlet2Advice.class.getName()))
+                    HttpServlet2Advice.class.getName())
+                .withExceptionHandler(defaultExceptionHandler()))
         .asDecorator();
   }
 
   public static class HttpServlet2Advice {
 
-    @Advice.OnMethodEnter
+    @Advice.OnMethodEnter(suppress = Throwable.class)
     public static ActiveSpan startSpan(@Advice.Argument(0) final HttpServletRequest req) {
 
       final SpanContext extractedContext =
@@ -65,7 +67,7 @@ public static ActiveSpan startSpan(@Advice.Argument(0) final HttpServletRequest
       return span;
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class)
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
     public static void stopSpan(
         @Advice.Argument(0) final HttpServletRequest req,
         @Advice.Argument(1) final HttpServletResponse resp,

dd-java-agent/integrations/servlet-3/servlet-3.gradle

@@ -15,13 +15,13 @@ apply from: "${rootDir}/gradle/java.gradle"
 
 dependencies {
   compileOnly group: 'javax.servlet', name: 'javax.servlet-api', version: '3.0.1'
+  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: 'io.opentracing.contrib', name: 'opentracing-web-servlet-filter', version: '0.0.9'
   compile group: 'com.google.auto.service', name: 'auto-service', version: '1.0-rc3'
 }

dd-java-agent/integrations/servlet-3/src/main/java/dd/inst/servlet3/HttpServlet3Instrumentation.java

@@ -1,6 +1,7 @@
 package dd.inst.servlet3;
 
-import static dd.trace.ClassLoaderHasClassMatcher.classLoaderHasClasses;
+import static dd.trace.ClassLoaderMatcher.classLoaderHasClasses;
+import static dd.trace.ExceptionHandlers.defaultExceptionHandler;
 import static net.bytebuddy.matcher.ElementMatchers.isProtected;
 import static net.bytebuddy.matcher.ElementMatchers.named;
 import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
@@ -41,13 +42,14 @@ public AgentBuilder instrument(final AgentBuilder agentBuilder) {
                         .and(takesArgument(0, named("javax.servlet.http.HttpServletRequest")))
                         .and(takesArgument(1, named("javax.servlet.http.HttpServletResponse")))
                         .and(isProtected()),
-                    HttpServlet3Advice.class.getName()))
+                    HttpServlet3Advice.class.getName())
+                .withExceptionHandler(defaultExceptionHandler()))
         .asDecorator();
   }
 
   public static class HttpServlet3Advice {
 
-    @Advice.OnMethodEnter
+    @Advice.OnMethodEnter(suppress = Throwable.class)
     public static ActiveSpan startSpan(@Advice.Argument(0) final HttpServletRequest req) {
 
       final SpanContext extractedContext =
@@ -65,7 +67,7 @@ public static ActiveSpan startSpan(@Advice.Argument(0) final HttpServletRequest
       return span;
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class)
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
     public static void stopSpan(
         @Advice.Argument(0) final HttpServletRequest req,
         @Advice.Argument(1) final HttpServletResponse resp,

dd-java-agent/integrations/spring-web/src/main/java/dd/inst/springweb/SpringWebInstrumentation.java

@@ -1,6 +1,7 @@
 package dd.inst.springweb;
 
-import static dd.trace.ClassLoaderHasClassWithFieldMatcher.classLoaderHasClassWithField;
+import static dd.trace.ClassLoaderMatcher.classLoaderHasClassWithField;
+import static dd.trace.ExceptionHandlers.defaultExceptionHandler;
 import static net.bytebuddy.matcher.ElementMatchers.hasSuperType;
 import static net.bytebuddy.matcher.ElementMatchers.isInterface;
 import static net.bytebuddy.matcher.ElementMatchers.isMethod;
@@ -43,12 +44,14 @@ public AgentBuilder instrument(final AgentBuilder agentBuilder) {
                         .and(isPublic())
                         .and(nameStartsWith("handle"))
                         .and(takesArgument(0, named("javax.servlet.http.HttpServletRequest"))),
-                    SpringWebAdvice.class.getName()));
+                    SpringWebAdvice.class.getName())
+                .withExceptionHandler(defaultExceptionHandler()))
+        .asDecorator();
   }
 
   public static class SpringWebAdvice {
 
-    @Advice.OnMethodEnter
+    @Advice.OnMethodEnter(suppress = Throwable.class)
     public static void nameResource(@Advice.Argument(0) final HttpServletRequest request) {
       final ActiveSpan span = GlobalTracer.get().activeSpan();
       if (span != null) {

dd-java-agent/src/main/java/com/datadoghq/agent/ClassLoaderIntegrationInjector.java

@@ -11,6 +11,7 @@
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
+// TODO: consider augmenting with com.sun.xml.internal.bind.v2.runtime.reflect.opt.Injector
 public class ClassLoaderIntegrationInjector {
   private final Map<ZipEntry, byte[]> entries;
   private final Map<ClassLoader, Method> invocationPoints = Maps.newConcurrentMap();

dd-java-agent/src/main/java/com/datadoghq/agent/InstrumentationRulesManager.java

@@ -1,17 +1,21 @@
 package com.datadoghq.agent;
 
 import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
+import io.opentracing.Tracer;
+import io.opentracing.contrib.tracerresolver.TracerResolver;
+import io.opentracing.util.GlobalTracer;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.WeakHashMap;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.zip.ZipEntry;
@@ -29,13 +33,16 @@ public class InstrumentationRulesManager {
   private static final String INTEGRATION_RULES = "integration-rules.btm";
   private static final String HELPERS_NAME = "/helpers.jar.zip";
 
+  private static final Object SYNC = new Object();
+
   private final Retransformer transformer;
   private final TracingAgentConfig config;
   private final AgentRulesManager agentRulesManager;
   private final ClassLoaderIntegrationInjector injector;
   private final InstrumentationChecker checker = new InstrumentationChecker();
 
-  private final Set<ClassLoader> initializedClassloaders = Sets.newConcurrentHashSet();
+  private final Set<ClassLoader> initializedClassloaders =
+      Collections.newSetFromMap(new WeakHashMap<ClassLoader, Boolean>());
 
   public InstrumentationRulesManager(
       final Retransformer trans,
@@ -77,6 +84,9 @@ public static void registerClassLoad() {
   }
 
   public static void registerClassLoad(final Object obj) {
+    if (AgentRulesManager.INSTANCE == null) {
+      return;
+    }
     final ClassLoader cl;
     if (obj instanceof ClassLoader) {
       cl = (ClassLoader) obj;
@@ -122,6 +132,8 @@ public void initialize(final ClassLoader classLoader) {
     } catch (final Exception e) {
       log.warn("Error uninstalling scripts", e);
     }
+
+    initTracer();
   }
 
   /**
@@ -152,4 +164,20 @@ private void uninstallScripts(final List<String> installedScripts, final List<St
       log.info("Uninstall rule scripts: {}", rulesToRemove.toString());
     }
   }
+
+  private void initTracer() {
+    synchronized (SYNC) {
+      if (!GlobalTracer.isRegistered()) {
+        // Try to obtain a tracer using the TracerResolver
+        final Tracer resolved = TracerResolver.resolveTracer();
+        if (resolved != null) {
+          try {
+            GlobalTracer.register(resolved);
+          } catch (final RuntimeException re) {
+            log.warn("Failed to register tracer '" + resolved + "'", re);
+          }
+        }
+      }
+    }
+  }
 }