Merge branch 'master' of github.com:DataDog/dd-trace-java into labbati/config-file

Author: labbati

.circleci/collect_reports.sh

@@ -4,6 +4,8 @@
 # This folder will be saved by circleci and available after test runs.
 
 set -e
+#Enable '**' support
+shopt -s globstar
 
 REPORTS_DIR=./reports
 mkdir -p $REPORTS_DIR >/dev/null 2>&1

.circleci/collect_results.sh

@@ -4,6 +4,8 @@
 # This folder will be saved by circleci and available after test runs.
 
 set -e
+#Enable '**' support
+shopt -s globstar
 
 TEST_RESULTS_DIR=./results
 mkdir -p $TEST_RESULTS_DIR >/dev/null 2>&1

.circleci/config.yml

@@ -38,6 +38,7 @@ jobs:
     - persist_to_workspace:
         root: .
         paths:
+        - .gradle
         - workspace
 
     - save_cache:
@@ -93,7 +94,13 @@ jobs:
     <<: *default_test_job
     environment:
     # We are building on Java8, this is our default JVM so no need to set more homes
-    - TEST_TASK: test latestDepTest jacocoTestReport jacocoTestCoverageVerification
+    - TEST_TASK: test jacocoTestReport jacocoTestCoverageVerification
+
+  test_latest8:
+    <<: *default_test_job
+    environment:
+    # We are building on Java8, this is our default JVM so no need to set more homes
+    - TEST_TASK: latestDepTest
 
   test_ibm8:
     <<: *default_test_job
@@ -249,6 +256,12 @@ workflows:
         filters:
           tags:
             only: /.*/
+    - test_latest8:
+        requires:
+        - build
+        filters:
+          tags:
+            only: /.*/
     - test_ibm8:
         requires:
         - build
@@ -305,6 +318,7 @@ workflows:
         requires:
         - test_7
         - test_8
+        - test_latest8
         - test_ibm8
         - test_9
         - test_10
@@ -322,6 +336,7 @@ workflows:
         requires:
         - test_7
         - test_8
+        - test_latest8
         - test_ibm8
         - test_9
         - test_10

dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/decorator/DatabaseClientDecorator.java

@@ -1,5 +1,7 @@
 package datadog.trace.agent.decorator;
 
+import datadog.trace.api.Config;
+import datadog.trace.api.DDTags;
 import io.opentracing.Span;
 import io.opentracing.tag.Tags;
 
@@ -29,7 +31,11 @@ public Span onConnection(final Span span, final CONNECTION connection) {
     assert span != null;
     if (connection != null) {
       Tags.DB_USER.set(span, dbUser(connection));
-      Tags.DB_INSTANCE.set(span, dbInstance(connection));
+      final String instanceName = dbInstance(connection);
+      Tags.DB_INSTANCE.set(span, instanceName);
+      if (instanceName != null && Config.get().isDbClientSplitByInstance()) {
+        span.setTag(DDTags.SERVICE_NAME, instanceName);
+      }
     }
     return span;
   }

dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/muzzle/ReferenceCreator.java

@@ -260,7 +260,10 @@ public void visitFieldInsn(
       // * DONE field-source class (descriptor)
       //   * DONE field-source visibility from this point (PRIVATE?)
 
-      final Type ownerType = Type.getType("L" + owner + ";");
+      final Type ownerType =
+          owner.startsWith("[")
+              ? underlyingType(Type.getType(owner))
+              : Type.getType("L" + owner + ";");
       final Type fieldType = Type.getType(descriptor);
 
       final List<Reference.Flag> fieldFlags = new ArrayList<>();
@@ -334,7 +337,10 @@ public void visitMethodInsn(
         }
       }
 
-      final Type ownerType = Type.getType("L" + owner + ";");
+      final Type ownerType =
+          owner.startsWith("[")
+              ? underlyingType(Type.getType(owner))
+              : Type.getType("L" + owner + ";");
 
       final List<Reference.Flag> methodFlags = new ArrayList<>();
       methodFlags.add(

dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/decorator/DatabaseClientDecoratorTest.groovy

@@ -1,9 +1,12 @@
 package datadog.trace.agent.decorator
 
+import datadog.trace.api.Config
 import datadog.trace.api.DDTags
 import io.opentracing.Span
 import io.opentracing.tag.Tags
 
+import static datadog.trace.agent.test.utils.ConfigUtils.withConfigOverride
+
 class DatabaseClientDecoratorTest extends ClientDecoratorTest {
 
   def span = Mock(Span)
@@ -35,21 +38,26 @@ class DatabaseClientDecoratorTest extends ClientDecoratorTest {
     def decorator = newDecorator()
 
     when:
-    decorator.onConnection(span, session)
+    withConfigOverride(Config.DB_CLIENT_HOST_SPLIT_BY_INSTANCE, "$renameService") {
+      decorator.onConnection(span, session)
+    }
 
     then:
     if (session) {
       1 * span.setTag(Tags.DB_USER.key, session.user)
       1 * span.setTag(Tags.DB_INSTANCE.key, session.instance)
+      if (renameService && session.instance) {
+        1 * span.setTag(DDTags.SERVICE_NAME, session.instance)
+      }
     }
     0 * _
 
     where:
-    session                                        | _
-    null                                           | _
-    [user: "test-user"]                            | _
-    [instance: "test-instance"]                    | _
-    [user: "test-user", instance: "test-instance"] | _
+    renameService | session
+    false         | null
+    true          | [user: "test-user"]
+    false         | [instance: "test-instance"]
+    true          | [user: "test-user", instance: "test-instance"]
   }
 
   def "test onStatement"() {

dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/decorator/HttpClientDecoratorTest.groovy

@@ -26,12 +26,12 @@ class HttpClientDecoratorTest extends ClientDecoratorTest {
 
     then:
     if (req) {
-      1 * span.setTag(Tags.HTTP_METHOD.key, "test-method")
-      1 * span.setTag(Tags.HTTP_URL.key, "$testUrl")
-      1 * span.setTag(Tags.PEER_HOSTNAME.key, "test-host")
-      1 * span.setTag(Tags.PEER_PORT.key, 555)
+      1 * span.setTag(Tags.HTTP_METHOD.key, req.method)
+      1 * span.setTag(Tags.HTTP_URL.key, "$req.url")
+      1 * span.setTag(Tags.PEER_HOSTNAME.key, req.host)
+      1 * span.setTag(Tags.PEER_PORT.key, req.port)
       if (renameService) {
-        1 * span.setTag(DDTags.SERVICE_NAME, "test-host")
+        1 * span.setTag(DDTags.SERVICE_NAME, req.host)
       }
     }
     0 * _

dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/decorator/OrmClientDecoratorTest.groovy

@@ -1,12 +1,9 @@
 package datadog.trace.agent.decorator
 
 import datadog.trace.api.DDTags
-import io.opentracing.Span
 
 class OrmClientDecoratorTest extends DatabaseClientDecoratorTest {
 
-  def span = Mock(Span)
-
   def "test onOperation #testName"() {
     setup:
     decorator = newDecorator({ e -> entityName })

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

@@ -97,13 +97,6 @@ dependencies {
   testCompile deps.opentracingMock
   testCompile deps.testLogging
   testCompile deps.guava
-  testCompile group: 'org.assertj', name: 'assertj-core', version: '2.9.+'
-  testCompile group: 'org.mockito', name: 'mockito-core', version: '2.19.0'
-
-  testCompile group: 'org.mongodb', name: 'mongo-java-driver', version: '3.4.2'
-  testCompile group: 'org.mongodb', name: 'mongodb-driver-async', version: '3.4.2'
-  // run embedded mongodb for integration testing
-  testCompile group: 'de.flapdoodle.embed', name: 'de.flapdoodle.embed.mongo', version: '1.50.5'
 }
 
 tasks.withType(Test).configureEach {

dd-java-agent/instrumentation/akka-http-10.0/src/test/groovy/AkkaHttpClientInstrumentationTest.groovy

@@ -23,8 +23,12 @@ class AkkaHttpClientInstrumentationTest extends HttpClientTest<AkkaHttpClientDec
       .withMethod(HttpMethods.lookup(method).get())
       .addHeaders(headers.collect { RawHeader.create(it.key, it.value) })
 
-    def response = Http.get(system).singleRequest(request, materializer).toCompletableFuture().get()
-    blockUntilChildSpansFinished(1)
+    def response
+    try {
+      response = Http.get(system).singleRequest(request, materializer).toCompletableFuture().get()
+    } finally {
+      blockUntilChildSpansFinished(1)
+    }
     callback?.call()
     return response.status().intValue()
   }