Merge pull request #1045 from DataDog/landerson/decorator-errors

Skip `@Decorator` classes when instrumenting

dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/AgentInstaller.java

@@ -2,6 +2,7 @@
 
 import static datadog.trace.agent.tooling.ClassLoaderMatcher.skipClassLoader;
 import static net.bytebuddy.matcher.ElementMatchers.any;
+import static net.bytebuddy.matcher.ElementMatchers.isAnnotatedWith;
 import static net.bytebuddy.matcher.ElementMatchers.nameContains;
 import static net.bytebuddy.matcher.ElementMatchers.nameMatches;
 import static net.bytebuddy.matcher.ElementMatchers.nameStartsWith;
@@ -130,6 +131,7 @@ public static ResettableClassFileTransformer installBytebuddyAgent(
             .or(nameContains("javassist"))
             .or(nameContains(".asm."))
             .or(nameMatches("com\\.mchange\\.v2\\.c3p0\\..*Proxy"))
+            .or(isAnnotatedWith(named("javax.decorator.Decorator")))
             .or(matchesConfiguredExcludes());
 
     for (final AgentBuilder.Listener listener : listeners) {

dd-java-agent/instrumentation/cdi-1.2/cdi-1.2.gradle

@@ -0,0 +1,22 @@
+apply from: "${rootDir}/gradle/java.gradle"
+
+apply plugin: 'org.unbroken-dome.test-sets'
+
+testSets {
+  latestDepTest {
+    dirName = 'test'
+  }
+}
+
+dependencies {
+  testCompile project(':dd-java-agent:instrumentation:java-concurrent')
+
+  testCompile group: 'org.jboss.weld', name: 'weld-core', version: '2.3.0.Final'
+  testCompile group: 'org.jboss.weld.se', name: 'weld-se', version: '2.3.0.Final'
+  testCompile group: 'org.jboss.weld.se', name: 'weld-se-core', version: '2.3.0.Final'
+
+  // Beyond 2.x is CDI 2+ and requires Java 8
+  latestDepTestCompile group: 'org.jboss.weld', name: 'weld-core', version: '2.+'
+  latestDepTestCompile group: 'org.jboss.weld.se', name: 'weld-se', version: '2.+'
+  latestDepTestCompile group: 'org.jboss.weld.se', name: 'weld-se-core', version: '2.+'
+}

dd-java-agent/instrumentation/cdi-1.2/src/test/groovy/CDIContainerTest.groovy

@@ -0,0 +1,25 @@
+import datadog.trace.agent.test.AgentTestRunner
+import datadog.trace.instrumentation.TestBean
+import org.jboss.weld.environment.se.Weld
+import org.jboss.weld.environment.se.WeldContainer
+import org.jboss.weld.environment.se.threading.RunnableDecorator
+
+class CDIContainerTest extends AgentTestRunner {
+
+  def "CDI container starts with agent"() {
+    given:
+    Weld builder = new Weld()
+      .disableDiscovery()
+      .addDecorator(RunnableDecorator)
+      .addBeanClass(TestBean)
+
+    when:
+    WeldContainer container = builder.initialize()
+
+    then:
+    container.isRunning()
+
+    cleanup:
+    container?.shutdown()
+  }
+}

dd-java-agent/instrumentation/cdi-1.2/src/test/java/datadog/trace/instrumentation/TestBean.java

@@ -0,0 +1,14 @@
+package datadog.trace.instrumentation;
+
+public class TestBean {
+
+  private String someField;
+
+  public String getSomeField() {
+    return someField;
+  }
+
+  public void setSomeField(final String someField) {
+    this.someField = someField;
+  }
+}

settings.gradle

@@ -28,6 +28,7 @@ include ':dd-java-agent:instrumentation:apache-httpasyncclient-4'
 include ':dd-java-agent:instrumentation:apache-httpclient-4'
 include ':dd-java-agent:instrumentation:aws-java-sdk-1.11.0'
 include ':dd-java-agent:instrumentation:aws-java-sdk-2.2'
+include ':dd-java-agent:instrumentation:cdi-1.2'
 include ':dd-java-agent:instrumentation:couchbase-2.0'
 include ':dd-java-agent:instrumentation:couchbase-2.6'
 include ':dd-java-agent:instrumentation:datastax-cassandra-3'