Merge pull request #2 from DataDog/master

merge from original

Author: gygabyte

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

@@ -4,7 +4,7 @@ plugins {
 apply from: "${rootDir}/gradle/java.gradle"
 
 dependencies {
-  compile('com.datadoghq:jmxfetch:0.29.0'){
+  compile('com.datadoghq:jmxfetch:0.30.0'){
     exclude group: 'org.slf4j', module: 'slf4j-log4j12'
     exclude group: 'log4j', module: 'log4j'
   }

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

@@ -74,6 +74,8 @@ private static void run(final Config config) {
     final AppConfig.AppConfigBuilder configBuilder =
         AppConfig.builder()
             .action(ImmutableList.of(ACTION_COLLECT))
+            // App should be run as daemon otherwise CLI apps would not exit once main method exits.
+            .daemon(true)
             .confdDirectory(jmxFetchConfigDir)
             .yamlFileList(jmxFetchConfigs)
             .targetDirectInstances(true)

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

@@ -95,7 +95,7 @@ private boolean shouldSkipInstance(final ClassLoader loader) {
 
     /**
      * TODO: this turns out to be useless with OSGi: {@code
-     * }org.eclipse.osgi.internal.loader.BundleLoader#isRequestFromVM} returns {@code true} when
+     * org.eclipse.osgi.internal.loader.BundleLoader#isRequestFromVM} returns {@code true} when
      * class loading is issued from this check and {@code false} for 'real' class loads. We should
      * come up with some sort of hack to avoid this problem.
      */

dd-java-agent/instrumentation/couchbase-2.0/src/test/groovy/util/AbstractCouchbaseTest.groovy

@@ -16,6 +16,7 @@ import com.couchbase.mock.CouchbaseMock
 import com.couchbase.mock.http.query.QueryServer
 import datadog.trace.agent.test.AgentTestRunner
 import datadog.trace.agent.test.utils.PortUtils
+import datadog.trace.api.Config
 import spock.lang.Shared
 
 import java.util.concurrent.RejectedExecutionException
@@ -87,6 +88,9 @@ abstract class AbstractCouchbaseTest extends AgentTestRunner {
     // Cache buckets:
     couchbaseCluster.openBucket(bucketCouchbase.name(), bucketCouchbase.password())
     memcacheCluster.openBucket(bucketMemcache.name(), bucketMemcache.password())
+
+    // This setting should have no effect since decorator returns null for the instance.
+    System.setProperty(Config.PREFIX + Config.DB_CLIENT_HOST_SPLIT_BY_INSTANCE, "true")
   }
 
   private static BucketConfiguration convert(BucketSettings bucketSettings) {
@@ -112,6 +116,8 @@ abstract class AbstractCouchbaseTest extends AgentTestRunner {
     }
 
     mock?.stop()
+
+    System.clearProperty(Config.PREFIX + Config.DB_CLIENT_HOST_SPLIT_BY_INSTANCE)
   }
 
   private DefaultCouchbaseEnvironment.Builder envBuilder(BucketSettings bucketSettings) {

dd-java-agent/instrumentation/datastax-cassandra-3/src/test/groovy/CassandraClientTest.groovy

@@ -3,11 +3,13 @@ import com.datastax.driver.core.Session
 import datadog.opentracing.DDSpan
 import datadog.trace.agent.test.AgentTestRunner
 import datadog.trace.agent.test.asserts.TraceAssert
+import datadog.trace.api.Config
 import datadog.trace.api.DDSpanTypes
 import io.opentracing.tag.Tags
 import org.cassandraunit.utils.EmbeddedCassandraServerHelper
 import spock.lang.Shared
 
+import static datadog.trace.agent.test.utils.ConfigUtils.withConfigOverride
 import static datadog.trace.agent.test.utils.TraceUtils.basicSpan
 import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace
 
@@ -44,68 +46,72 @@ class CassandraClientTest extends AgentTestRunner {
     setup:
     Session session = cluster.connect(keyspace)
 
-    session.execute(statement)
+    withConfigOverride(Config.DB_CLIENT_HOST_SPLIT_BY_INSTANCE, "$renameService") {
+      session.execute(statement)
+    }
 
     expect:
     assertTraces(keyspace ? 2 : 1) {
       if (keyspace) {
         trace(0, 1) {
-          cassandraSpan(it, 0, "USE $keyspace", null)
+          cassandraSpan(it, 0, "USE $keyspace", null, false)
         }
       }
       trace(keyspace ? 1 : 0, 1) {
-        cassandraSpan(it, 0, statement, keyspace)
+        cassandraSpan(it, 0, statement, keyspace, renameService)
       }
     }
 
     cleanup:
     session.close()
 
     where:
-    statement                                                                                         | keyspace
-    "DROP KEYSPACE IF EXISTS sync_test"                                                               | null
-    "CREATE KEYSPACE sync_test WITH REPLICATION = {'class':'SimpleStrategy', 'replication_factor':3}" | null
-    "CREATE TABLE sync_test.users ( id UUID PRIMARY KEY, name text )"                                 | "sync_test"
-    "INSERT INTO sync_test.users (id, name) values (uuid(), 'alice')"                                 | "sync_test"
-    "SELECT * FROM users where name = 'alice' ALLOW FILTERING"                                        | "sync_test"
+    statement                                                                                         | keyspace    | renameService
+    "DROP KEYSPACE IF EXISTS sync_test"                                                               | null        | false
+    "CREATE KEYSPACE sync_test WITH REPLICATION = {'class':'SimpleStrategy', 'replication_factor':3}" | null        | true
+    "CREATE TABLE sync_test.users ( id UUID PRIMARY KEY, name text )"                                 | "sync_test" | false
+    "INSERT INTO sync_test.users (id, name) values (uuid(), 'alice')"                                 | "sync_test" | false
+    "SELECT * FROM users where name = 'alice' ALLOW FILTERING"                                        | "sync_test" | true
   }
 
   def "test async"() {
     setup:
     Session session = cluster.connect(keyspace)
     runUnderTrace("parent") {
-      session.executeAsync(statement)
+      withConfigOverride(Config.DB_CLIENT_HOST_SPLIT_BY_INSTANCE, "$renameService") {
+        session.executeAsync(statement)
+      }
       blockUntilChildSpansFinished(1)
     }
 
     expect:
     assertTraces(keyspace ? 2 : 1) {
       if (keyspace) {
         trace(0, 1) {
-          cassandraSpan(it, 0, "USE $keyspace", null)
+          cassandraSpan(it, 0, "USE $keyspace", null, false)
         }
       }
       trace(keyspace ? 1 : 0, 2) {
         basicSpan(it, 0, "parent")
-        cassandraSpan(it, 1, statement, keyspace, span(0))
+        cassandraSpan(it, 1, statement, keyspace, renameService, span(0))
       }
     }
 
     cleanup:
     session.close()
 
     where:
-    statement                                                                                          | keyspace
-    "DROP KEYSPACE IF EXISTS async_test"                                                               | null
-    "CREATE KEYSPACE async_test WITH REPLICATION = {'class':'SimpleStrategy', 'replication_factor':3}" | null
-    "CREATE TABLE async_test.users ( id UUID PRIMARY KEY, name text )"                                 | "async_test"
-    "INSERT INTO async_test.users (id, name) values (uuid(), 'alice')"                                 | "async_test"
-    "SELECT * FROM users where name = 'alice' ALLOW FILTERING"                                         | "async_test"
+    statement                                                                                          | keyspace     | renameService
+    "DROP KEYSPACE IF EXISTS async_test"                                                               | null         | false
+    "CREATE KEYSPACE async_test WITH REPLICATION = {'class':'SimpleStrategy', 'replication_factor':3}" | null         | true
+    "CREATE TABLE async_test.users ( id UUID PRIMARY KEY, name text )"                                 | "async_test" | false
+    "INSERT INTO async_test.users (id, name) values (uuid(), 'alice')"                                 | "async_test" | false
+    "SELECT * FROM users where name = 'alice' ALLOW FILTERING"                                         | "async_test" | true
   }
 
-  def cassandraSpan(TraceAssert trace, int index, String statement, String keyspace, Object parentSpan = null, Throwable exception = null) {
+  def cassandraSpan(TraceAssert trace, int index, String statement, String keyspace, boolean renameService, Object parentSpan = null, Throwable exception = null) {
     trace.span(index) {
-      serviceName "cassandra"
+      serviceName renameService && keyspace ? keyspace : "cassandra"
       operationName "cassandra.query"
       resourceName statement
       spanType DDSpanTypes.CASSANDRA

dd-java-agent/instrumentation/google-http-client/google-http-client.gradle

@@ -0,0 +1,34 @@
+muzzle {
+  pass {
+    group = "com.google.http-client"
+    module = "google-http-client"
+    
+    // 1.19.0 is the first release.  The versions before are betas and RCs
+    versions = "[1.19.0,)"
+  }
+}
+
+apply from: "${rootDir}/gradle/java.gradle"
+apply plugin: 'org.unbroken-dome.test-sets'
+
+testSets {
+  latestDepTest {
+    dirName = 'test'
+  }
+}
+
+dependencies {
+  compileOnly group: 'com.google.http-client', name: 'google-http-client', version: '1.19.0'
+
+  compile project(':dd-java-agent:agent-tooling')
+
+  compile deps.bytebuddy
+  compile deps.opentracing
+  annotationProcessor deps.autoservice
+  implementation deps.autoservice
+
+  testCompile project(':dd-java-agent:testing')
+  testCompile group: 'com.google.http-client', name: 'google-http-client', version: '1.19.0'
+
+  latestDepTestCompile group: 'com.google.http-client', name: 'google-http-client', version: '+'
+}

dd-java-agent/instrumentation/google-http-client/src/main/java/datadog/trace/instrumentation/googlehttpclient/GoogleHttpClientDecorator.java

@@ -0,0 +1,50 @@
+package datadog.trace.instrumentation.googlehttpclient;
+
+import com.google.api.client.http.HttpRequest;
+import com.google.api.client.http.HttpResponse;
+import datadog.trace.agent.decorator.HttpClientDecorator;
+import java.net.URI;
+import java.net.URISyntaxException;
+
+public class GoogleHttpClientDecorator extends HttpClientDecorator<HttpRequest, HttpResponse> {
+  public static final GoogleHttpClientDecorator DECORATE = new GoogleHttpClientDecorator();
+
+  @Override
+  protected String method(final HttpRequest httpRequest) {
+    return httpRequest.getRequestMethod();
+  }
+
+  @Override
+  protected URI url(final HttpRequest httpRequest) throws URISyntaxException {
+    // Google uses %20 (space) instead of "+" for spaces in the fragment
+    // Add "+" back for consistency with the other http client instrumentations
+    final String url = httpRequest.getUrl().build();
+    final String fixedUrl = url.replaceAll("%20", "+");
+    return new URI(fixedUrl);
+  }
+
+  @Override
+  protected String hostname(final HttpRequest httpRequest) {
+    return httpRequest.getUrl().getHost();
+  }
+
+  @Override
+  protected Integer port(final HttpRequest httpRequest) {
+    return httpRequest.getUrl().getPort();
+  }
+
+  @Override
+  protected Integer status(final HttpResponse httpResponse) {
+    return httpResponse.getStatusCode();
+  }
+
+  @Override
+  protected String[] instrumentationNames() {
+    return new String[] {"google-http-client"};
+  }
+
+  @Override
+  protected String component() {
+    return "google-http-client";
+  }
+}