Merge branch 'master' of github.com:DataDog/dd-trace-java into labbati/jdbc-error-glasshfish

Author: labbati

.github/CODEOWNERS

@@ -0,0 +1,4 @@
+# Automatically assign the team as a reviewer.
+# https://help.github.com/en/articles/about-code-owners
+
+* @DataDog/apm-java

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

@@ -4,7 +4,10 @@ plugins {
 apply from: "${rootDir}/gradle/java.gradle"
 
 dependencies {
-  compile 'com.datadoghq:jmxfetch:0.27.0'
+  compile('com.datadoghq:jmxfetch:0.29.0'){
+    exclude group: 'org.slf4j', module: 'slf4j-log4j12'
+    exclude group: 'log4j', module: 'log4j'
+  }
   compile deps.slf4j
   compile project(':dd-trace-api')
 }
@@ -32,12 +35,23 @@ tasks.register("submodulesUpdate", Exec) {
   group 'Build Setup'
   description 'Initializes and updates integrations-core git submodule'
   commandLine 'git', 'submodule', 'update', '--init', 'integrations-core'
+  def submoduleHead = file("${project.rootDir}/.git/modules/dd-java-agent/agent-jmxfetch/integrations-core/HEAD")
+  if (submoduleHead.exists()) {
+    inputs.file "${project.rootDir}/.git/modules/dd-java-agent/agent-jmxfetch/integrations-core/HEAD"
+  }
+  def integrationsCore = file("$projectDir/integrations-core")
+  outputs.dir integrationsCore
+  if (integrationsCore.list().length == 0) {
+    outputs.upToDateWhen { false }
+  }
 }
 
 tasks.register("copyMetricConfigs", Exec) {
   group 'Build Setup'
   description 'Copy metrics.yaml files from integrations-core into resources'
   commandLine './copy-metric-configs.sh', 'integrations-core', sourceSets.main.output.resourcesDir
+  inputs.dir file("$projectDir/integrations-core")
+  outputs.dir sourceSets.main.output.resourcesDir
   doFirst {
     // Ensure the resources directory is available.
     file(sourceSets.main.output.resourcesDir).mkdirs()

dd-java-agent/agent-jmxfetch/integrations-core

@@ -1,5 +1,7 @@
 package datadog.trace.agent.jmxfetch;
 
+import static org.datadog.jmxfetch.AppConfig.ACTION_COLLECT;
+
 import com.google.common.collect.ImmutableList;
 import datadog.trace.api.Config;
 import java.io.IOException;
@@ -16,6 +18,7 @@
 import org.apache.commons.io.IOUtils;
 import org.datadog.jmxfetch.App;
 import org.datadog.jmxfetch.AppConfig;
+import org.datadog.jmxfetch.reporter.ReporterFactory;
 
 @Slf4j
 public class JMXFetch {
@@ -38,6 +41,14 @@ private static void run(final Config config) {
       return;
     }
 
+    if (!log.isDebugEnabled()
+        && System.getProperty("org.slf4j.simpleLogger.log.org.datadog.jmxfetch") == null) {
+      // Reduce noisiness of jmxfetch logging.
+      System.setProperty("org.slf4j.simpleLogger.log.org.datadog.jmxfetch", "warn");
+    }
+
+    final String jmxFetchConfigDir = config.getJmxFetchConfigDir();
+    final List<String> jmxFetchConfigs = config.getJmxFetchConfigs();
     final List<String> internalMetricsConfigs = getInternalMetricFiles();
     final List<String> metricsConfigs = config.getJmxFetchMetricsConfigs();
     final Integer checkPeriod = config.getJmxFetchCheckPeriod();
@@ -48,7 +59,9 @@ private static void run(final Config config) {
     final String logLevel = getLogLevel();
 
     log.info(
-        "JMXFetch config: {} {} {} {} {} {} {} {}",
+        "JMXFetch config: {} {} {} {} {} {} {} {} {} {}",
+        jmxFetchConfigDir,
+        jmxFetchConfigs,
         internalMetricsConfigs,
         metricsConfigs,
         checkPeriod,
@@ -57,17 +70,24 @@ private static void run(final Config config) {
         reporter,
         logLocation,
         logLevel);
-    final AppConfig appConfig =
-        AppConfig.create(
-            DEFAULT_CONFIGS,
-            internalMetricsConfigs,
-            metricsConfigs,
-            checkPeriod,
-            refreshBeansPeriod,
-            globalTags,
-            reporter,
-            logLocation,
-            logLevel);
+
+    final AppConfig.AppConfigBuilder configBuilder =
+        AppConfig.builder()
+            .action(ImmutableList.of(ACTION_COLLECT))
+            .confdDirectory(jmxFetchConfigDir)
+            .yamlFileList(jmxFetchConfigs)
+            .targetDirectInstances(true)
+            .instanceConfigResources(DEFAULT_CONFIGS)
+            .metricConfigResources(internalMetricsConfigs)
+            .metricConfigFiles(metricsConfigs)
+            .refreshBeansPeriod(refreshBeansPeriod)
+            .globalTags(globalTags)
+            .reporter(ReporterFactory.getReporter(reporter));
+
+    if (checkPeriod != null) {
+      configBuilder.checkPeriod(checkPeriod);
+    }
+    final AppConfig appConfig = configBuilder.build();
 
     final Thread thread =
         new Thread(
@@ -131,7 +151,7 @@ private static List<String> getInternalMetricFiles() {
         for (final String config : split) {
           integrationName.clear();
           integrationName.add(config.replace(".yaml", ""));
-          if (Config.integrationEnabled(integrationName, false)) {
+          if (Config.jmxFetchIntegrationEnabled(integrationName, false)) {
             final URL resource = JMXFetch.class.getResource("metricconfigs/" + config);
             result.add(resource.getPath().split("\\.jar!/")[1]);
           }

dd-java-agent/agent-jmxfetch/src/main/java/datadog/trace/agent/jmxfetch/JMXFetch.java

@@ -3,6 +3,6 @@ init_config:
   new_gc_metrics: true
 
 instances:
-- jmx_url: service:jmx:local:///
-  conf:
-    # Intentionally left empty for now
+  - jvm_direct: true
+    name: dd-java-agent default
+    conf: [] # Intentionally left empty for now

dd-java-agent/agent-jmxfetch/src/main/resources/jmxfetch-config.yaml

@@ -121,6 +121,16 @@ public static ResettableClassFileTransformer installBytebuddyAgent(
             .or(nameStartsWith("com.intellij.rt.debugger."))
             .or(nameStartsWith("com.p6spy."))
             .or(nameStartsWith("com.newrelic."))
+            .or(nameStartsWith("com.dynatrace."))
+            .or(nameStartsWith("com.jloadtrace."))
+            .or(nameStartsWith("com.appdynamics."))
+            .or(nameStartsWith("com.singularity."))
+            .or(nameStartsWith("com.jinspired."))
+            .or(nameStartsWith("org.jinspired."))
+            .or(nameStartsWith("org.apache.log4j."))
+            .or(nameStartsWith("org.slf4j.").and(not(named("org.slf4j.MDC"))))
+            .or(nameContains("$JaxbAccessor"))
+            .or(nameContains("CGLIB$$"))
             .or(nameContains("javassist"))
             .or(nameContains(".asm."))
             .or(nameMatches("com\\.mchange\\.v2\\.c3p0\\..*Proxy"))

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

@@ -53,6 +53,7 @@ private static class SkipClassLoaderMatcher
       classesToSkip.add("sun.reflect.DelegatingClassLoader");
       classesToSkip.add("jdk.internal.reflect.DelegatingClassLoader");
       classesToSkip.add("clojure.lang.DynamicClassLoader");
+      classesToSkip.add("org.apache.cxf.common.util.ASMHelper$TypeHelperClassLoader");
       classesToSkip.add(DatadogClassLoader.class.getName());
       CLASSLOADER_CLASSES_TO_SKIP = Collections.unmodifiableSet(classesToSkip);
     }

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

@@ -107,9 +107,11 @@ dependencies {
 }
 
 tasks.withType(Test).configureEach {
-  jvmArgs "-Ddd.writer.type=LogWriter", "-Ddd.service.name=java-app"
-  jvmArgs "-Ddatadog.slf4j.simpleLogger.defaultLogLevel=debug"
-  jvmArgs "-Dorg.slf4j.simpleLogger.defaultLogLevel=debug"
+  jvmArgs "-Ddd.service.name=java-agent-tests"
+  jvmArgs "-Ddd.writer.type=LoggingWriter"
+  // Multi-threaded logging seems to be causing deadlocks with Gradle's log capture.
+//  jvmArgs "-Ddatadog.slf4j.simpleLogger.defaultLogLevel=debug"
+//  jvmArgs "-Dorg.slf4j.simpleLogger.defaultLogLevel=debug"
 
   doFirst {
     // Defining here to allow jacoco to be first on the command line.

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

@@ -0,0 +1,89 @@
+import datadog.opentracing.DDSpan
+import datadog.opentracing.scopemanager.ContinuableScope
+import datadog.trace.agent.test.AgentTestRunner
+import datadog.trace.api.Trace
+import io.opentracing.util.GlobalTracer
+
+import java.util.concurrent.ArrayBlockingQueue
+import java.util.concurrent.CompletableFuture
+import java.util.concurrent.ThreadPoolExecutor
+import java.util.concurrent.TimeUnit
+import java.util.function.Function
+import java.util.function.Supplier
+
+/**
+ * Note: ideally this should live with the rest of ExecutorInstrumentationTest,
+ * but this code needs java8 so we put it here for now.
+ */
+class CompletableFutureTest extends AgentTestRunner {
+
+  def "CompletableFuture test"() {
+    setup:
+    def pool = new ThreadPoolExecutor(1, 1, 1000, TimeUnit.NANOSECONDS, new ArrayBlockingQueue<Runnable>(1))
+    def differentPool = new ThreadPoolExecutor(1, 1, 1000, TimeUnit.NANOSECONDS, new ArrayBlockingQueue<Runnable>(1))
+    def supplier = new Supplier<String>() {
+      @Override
+      @Trace(operationName = "supplier")
+      String get() {
+        sleep(1000)
+        return "a"
+      }
+    }
+
+    def function = new Function<String, String>() {
+      @Override
+      @Trace(operationName = "function")
+      String apply(String s) {
+        return s + "c"
+      }
+    }
+
+    def future = new Supplier<CompletableFuture<String>>() {
+      @Override
+      @Trace(operationName = "parent")
+      CompletableFuture<String> get() {
+        ((ContinuableScope) GlobalTracer.get().scopeManager().active()).setAsyncPropagation(true)
+        return CompletableFuture.supplyAsync(supplier, pool)
+          .thenCompose({ s -> CompletableFuture.supplyAsync(new AppendingSupplier(s), differentPool) })
+          .thenApply(function)
+      }
+    }.get()
+
+    def result = future.get()
+
+    TEST_WRITER.waitForTraces(1)
+    List<DDSpan> trace = TEST_WRITER.get(0)
+
+    expect:
+    result == "abc"
+
+    TEST_WRITER.size() == 1
+    trace.size() == 4
+    trace.get(0).operationName == "parent"
+    trace.get(1).operationName == "function"
+    trace.get(1).parentId == trace.get(0).spanId
+    trace.get(2).operationName == "appendingSupplier"
+    trace.get(2).parentId == trace.get(0).spanId
+    trace.get(3).operationName == "supplier"
+    trace.get(3).parentId == trace.get(0).spanId
+
+    cleanup:
+    pool?.shutdown()
+    differentPool?.shutdown()
+  }
+
+  class AppendingSupplier implements Supplier<String> {
+    String letter
+
+    AppendingSupplier(String letter) {
+      this.letter = letter
+    }
+
+    @Override
+    @Trace(operationName = "appendingSupplier")
+    String get() {
+      return letter + "b"
+    }
+  }
+
+}

dd-java-agent/instrumentation/java-concurrent/src/slickTest/groovy/CompletableFutureTest.groovy

@@ -12,6 +12,11 @@
 public abstract class KafkaDecorator extends ClientDecorator {
   public static final KafkaDecorator PRODUCER_DECORATE =
       new KafkaDecorator() {
+        @Override
+        protected String service() {
+          return "kafka";
+        }
+
         @Override
         protected String spanKind() {
           return Tags.SPAN_KIND_PRODUCER;
@@ -25,6 +30,16 @@ protected String spanType() {
 
   public static final KafkaDecorator CONSUMER_DECORATE =
       new KafkaDecorator() {
+        @Override
+        protected String service() {
+          /*
+            Use default service name. Common use-case here is to have consumer span parent
+            children spans in instrumented application. Since service name is inherited it makes
+            sense to default that to application service name rather than 'kafka'.
+          */
+          return null;
+        }
+
         @Override
         protected String spanKind() {
           return Tags.SPAN_KIND_CONSUMER;
@@ -41,11 +56,6 @@ protected String[] instrumentationNames() {
     return new String[] {"kafka"};
   }
 
-  @Override
-  protected String service() {
-    return "kafka";
-  }
-
   @Override
   protected String component() {
     return "java-kafka";