Merge pull request #182 from DataDog/tyler/move-inst

Move @trace and JDBC instrumentation to individual modules

Author: tylerbenson

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

@@ -0,0 +1,10 @@
+apply from: "${rootDir}/gradle/java.gradle"
+
+dependencies {
+  compile project(':dd-trace')
+  compile project(':dd-java-agent:tooling')
+
+  compile deps.bytebuddy
+  compile deps.opentracing
+  compile deps.autoservice
+}

dd-java-agent/src/main/java/com/datadoghq/agent/instrumentation/jdbc/ConnectionInstrumentation.java renamed to dd-java-agent/integrations/jdbc/src/main/java/dd/trace/instrumentation/jdbc/ConnectionInstrumentation.java

@@ -1,4 +1,4 @@
-package com.datadoghq.agent.instrumentation.jdbc;
+package dd.trace.instrumentation.jdbc;
 
 import static net.bytebuddy.matcher.ElementMatchers.hasSuperType;
 import static net.bytebuddy.matcher.ElementMatchers.isConstructor;
@@ -64,7 +64,7 @@ public static void addDBInfo(@Advice.This final Connection connection) {
           }
           connectionInfo.put(connection, new DBInfo(sanitizedURL, type, user));
         }
-      } catch (Throwable t) {
+      } catch (final Throwable t) {
         // object may not be fully initialized.
         // calling constructor will populate map
       }

dd-java-agent/src/main/java/com/datadoghq/agent/instrumentation/jdbc/PreparedStatementInstrumentation.java renamed to dd-java-agent/integrations/jdbc/src/main/java/dd/trace/instrumentation/jdbc/PreparedStatementInstrumentation.java

@@ -1,4 +1,4 @@
-package com.datadoghq.agent.instrumentation.jdbc;
+package dd.trace.instrumentation.jdbc;
 
 import static net.bytebuddy.matcher.ElementMatchers.hasSuperType;
 import static net.bytebuddy.matcher.ElementMatchers.isInterface;

dd-java-agent/src/main/java/com/datadoghq/agent/instrumentation/jdbc/StatementInstrumentation.java renamed to dd-java-agent/integrations/jdbc/src/main/java/dd/trace/instrumentation/jdbc/StatementInstrumentation.java

@@ -1,4 +1,4 @@
-package com.datadoghq.agent.instrumentation.jdbc;
+package dd.trace.instrumentation.jdbc;
 
 import static net.bytebuddy.matcher.ElementMatchers.hasSuperType;
 import static net.bytebuddy.matcher.ElementMatchers.isInterface;

dd-java-agent/src/main/java/com/datadoghq/agent/instrumentation/annotation/TraceAnnotationInstrumentation.java renamed to dd-java-agent/integrations/trace-annotation/src/main/java/dd/trace/instrumentation/trace_annotation/TraceAnnotationInstrumentation.java

@@ -1,4 +1,4 @@
-package com.datadoghq.agent.instrumentation.annotation;
+package dd.trace.instrumentation.trace_annotation;
 
 import static net.bytebuddy.matcher.ElementMatchers.declaresMethod;
 import static net.bytebuddy.matcher.ElementMatchers.hasSuperType;
@@ -37,7 +37,7 @@ public static class TraceAdvice {
     @Advice.OnMethodEnter(suppress = Throwable.class)
     public static ActiveSpan startSpan(@Advice.Origin final Method method) {
       final Trace trace = method.getAnnotation(Trace.class);
-      String operationName = trace.operationName();
+      String operationName = trace == null ? null : trace.operationName();
       if (operationName == null || operationName.isEmpty()) {
         operationName = method.getDeclaringClass().getName() + "." + method.getName();
       }

dd-java-agent/integrations/trace-annotation/trace-annotation.gradle

@@ -0,0 +1,11 @@
+apply from: "${rootDir}/gradle/java.gradle"
+
+dependencies {
+  compile project(':dd-trace')
+  compile project(':dd-trace-annotations')
+  compile project(':dd-java-agent:tooling')
+
+  compile deps.bytebuddy
+  compile deps.opentracing
+  compile deps.autoservice
+}

settings.gradle

@@ -18,6 +18,7 @@ include ':dd-trace-annotations'
 include ':dd-java-agent:integrations:apache-httpclient-4.3'
 include ':dd-java-agent:integrations:aws-sdk'
 include ':dd-java-agent:integrations:datastax-cassandra-3.2'
+include ':dd-java-agent:integrations:jdbc'
 include ':dd-java-agent:integrations:jms-1'
 include ':dd-java-agent:integrations:jms-2'
 include ':dd-java-agent:integrations:mongo-3.1'
@@ -26,6 +27,7 @@ include ':dd-java-agent:integrations:okhttp-3'
 include ':dd-java-agent:integrations:servlet-2'
 include ':dd-java-agent:integrations:servlet-3'
 include ':dd-java-agent:integrations:spring-web'
+include ':dd-java-agent:integrations:trace-annotation'
 
 def setBuildFile(project) {
   project.buildFileName = "${project.name}.gradle"