Merge pull request #184 from DataDog/tyler/move-stuff

Lots of renaming

Author: tylerbenson

.circleci/save_artifacts.sh

@@ -33,7 +33,7 @@ function save_libs () {
 save_reports dd-java-agent
 save_reports dd-java-agent/tooling
 # Save reports for all instrumentation projects
-for integration_path in dd-java-agent/integrations/*; do
+for integration_path in dd-java-agent/instrumentation/*; do
     save_reports $integration_path
 done
 save_reports dd-java-agent-ittests

.gitignore

@@ -11,7 +11,7 @@ target
 /.gradle
 */.gradle
 **/build/
-dd-trace-examples/**/build/
+examples/**/build/
 
 # Eclipse #
 ###########
@@ -49,9 +49,9 @@ Thumbs.db
 /bin
 /out
 */out
-dd-java-agent/integrations/*/out
+dd-java-agent/instrumentation/*/out
 dd-java-agent/benchmark-integration/perf-test-settings.rc
-dd-trace-examples/*/out
+examples/*/out
 derby.log
 
 !dd-java-agent/benchmark/releases/*.jar

README.md

@@ -17,7 +17,7 @@ These three things help you instrument Java applications:
 
 **Note:** dd-java-agent is considered experimental. Some integrations may not activate in all cases. Additional manual instrumentation using the [Opentracing API](https://github.com/opentracing/opentracing-java) is strongly encouraged.
 
-**[Datadog Tracer](https://github.com/DataDog/dd-trace-java/tree/master/dd-trace)**: an OpenTracing-compatible library that lets you trace any piece of your Java code, not just whole methods.
+**[Datadog Tracer](https://github.com/DataDog/dd-trace-java/tree/master/dd-trace-ot)**: an OpenTracing-compatible library that lets you trace any piece of your Java code, not just whole methods.
 
 **[Datadog APM Agent](https://github.com/DataDog/datadog-trace-agent)**: a (non-Java) service that runs on your application servers, accepting trace data from the Datadog Java Agent and/or Datadog Tracer and sending it to Datadog. (The APM Agent is not part of this repo; it's the same Agent to which all Datadog tracers—Go, Python, etc—send data)
 
@@ -91,20 +91,20 @@ The Java Agent lets you add a `@Trace` annotation to any method to measure its e
 
 #### Setup
 
-Add the `dd-trace-annotations` dependency to your project. For Maven, add this to pom.xml:
+Add the `dd-trace-api` dependency to your project. For Maven, add this to pom.xml:
 
 ```xml
 <dependency>
 	<groupId>com.datadoghq</groupId>
-	<artifactId>dd-trace-annotations</artifactId>
+	<artifactId>dd-trace-api</artifactId>
 	<version>{version}</version>
 </dependency>
 ```
 
 For gradle, add:
 
 ```gradle
-compile group: 'com.datadoghq', name: 'dd-trace-annotations', version: {version}
+compile group: 'com.datadoghq', name: 'dd-trace-api', version: {version}
 ```
 
 The Java Agent lets you use `@Trace` not just for `com.example.myproject`, but also for any application whose name _begins_ like that, e.g. `com.example.myproject.foobar`. If you're tempted to list something like `["com", "io"]` to avoid having to fuss with this configuration as you add new projects, be careful; providing `@Trace`-ability to too many applications could hurt your package's build time.
@@ -133,7 +133,7 @@ When you don't pass an `operationName`, the Java Agent sets it to the method nam
 
 ### Manual Instrumentation
 
-You can use the Datadog Tracer (`dd-trace`) library to measure execution times for specific pieces of code. This lets you trace your application more precisely than you can with the Java Agent alone.
+You can use the Datadog Tracer (`dd-trace-ot`) library to measure execution times for specific pieces of code. This lets you trace your application more precisely than you can with the Java Agent alone.
 
 #### Setup
 
@@ -157,7 +157,7 @@ For Maven, add this to pom.xml:
 <!-- Datadog Tracer (only needed if you do not use dd-java-agent) -->
 <dependency>
     <groupId>com.datadoghq</groupId>
-    <artifactId>dd-trace</artifactId>
+    <artifactId>dd-trace-ot</artifactId>
     <version>${dd-trace-java.version}</version>
 </dependency>
 ```
@@ -167,14 +167,14 @@ For gradle, add:
 ```
 compile group: 'io.opentracing', name: 'opentracing-api', version: "0.30.0"
 compile group: 'io.opentracing', name: 'opentracing-util', version: "0.30.0"
-compile group: 'com.datadoghq', name: 'dd-trace', version: "${dd-trace-java.version}"
+compile group: 'com.datadoghq', name: 'dd-trace-ot', version: "${dd-trace-java.version}"
 ```
 
 Configure your application using environment variables or system properties as discussed in the [config](#configuration) section.
 
 #### Examples
 
-Rather than referencing classes directly from `dd-trace` (other than registering `DDTracer`), we strongly suggest using the [OpenTracing API](https://github.com/opentracing/opentracing-java).
+Rather than referencing classes directly from `dd-trace-ot` (other than registering `DDTracer`), we strongly suggest using the [OpenTracing API](https://github.com/opentracing/opentracing-java).
 [Additional documentation on the api](docs/opentracing-api.md) is also available.
 
 Let's look at a simple example.
@@ -230,9 +230,9 @@ public class Application {
         io.opentracing.util.GlobalTracer.register(tracer);
 
         // OR from the API
-        Writer writer = new com.datadoghq.trace.writer.DDAgentWriter();
-        Sampler sampler = new com.datadoghq.trace.sampling.AllSampler();
-        Tracer tracer = new com.datadoghq.trace.DDTracer(writer, sampler);
+        Writer writer = new datadog.trace.api.writer.DDAgentWriter();
+        Sampler sampler = new datadog.trace.api.sampling.AllSampler();
+        Tracer tracer = new datadog.opentracing.DDTracer(writer, sampler);
         io.opentracing.util.GlobalTracer.register(tracer);
 
         // ...
@@ -242,7 +242,7 @@ public class Application {
 
 ## Further Reading
 
-- Browse the [example applications](dd-trace-examples) in this repository to see Java tracing in action
+- Browse the [example applications](examples) in this repository to see Java tracing in action
 - Read [OpenTracing's documentation](https://github.com/opentracing/opentracing-java); feel free to use the Trace Java API to customize your instrumentation.
 - Brush up on [Datadog APM Terminology](https://docs.datadoghq.com/tracing/terminology/)
 - Read the [Datadog APM FAQ](https://docs.datadoghq.com/tracing/faq/)

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

@@ -6,12 +6,16 @@ evaluationDependsOn(':dd-java-agent:tooling')
 compileTestJava.dependsOn tasks.getByPath(':dd-java-agent:tooling:testClasses')
 
 dependencies {
-  testCompile project(':dd-trace-annotations')
-  testCompile project(':dd-trace')
+  testCompile project(':dd-trace-api')
+  testCompile project(':dd-trace-ot')
 
   testCompile deps.opentracingMock
 
-  testCompile project(':dd-java-agent:testing')
+  testCompile(project(':dd-java-agent:testing')) {
+    // Otherwise this can bring in classes that aren't "shadowed"
+    // that conflicts with those that are which are in the agent.
+    transitive = false
+  }
 
   testCompile group: 'org.mongodb', name: 'mongo-java-driver', version: '3.4.2'
   testCompile group: 'org.mongodb', name: 'mongodb-driver-async', version: '3.4.2'
@@ -54,7 +58,7 @@ test {
   }
 
   if (project.hasProperty("disableShadowRelocate") && disableShadowRelocate) {
-    exclude 'com/datadoghq/agent/ShadowPackageRenamingTest.class'
+    exclude 'datadog/trace/agent/ShadowPackageRenamingTest.class'
   }
 }
 

dd-java-agent-ittests/src/test/groovy/com/datadoghq/agent/integration/TestHttpServer.groovy renamed to dd-java-agent-ittests/src/test/groovy/datadog/trace/agent/integration/TestHttpServer.groovy

@@ -1,4 +1,4 @@
-package com.datadoghq.agent.integration
+package datadog.trace.agent.integration
 
 import io.opentracing.ActiveSpan
 import io.opentracing.SpanContext

dd-java-agent-ittests/src/test/groovy/com/datadoghq/agent/integration/httpclient/ApacheHttpClientTest.groovy renamed to dd-java-agent-ittests/src/test/groovy/datadog/trace/agent/integration/httpclient/ApacheHttpClientTest.groovy

@@ -1,10 +1,10 @@
-package com.datadoghq.agent.integration.httpclient
+package datadog.trace.agent.integration.httpclient
 
-import com.datadoghq.agent.integration.TestHttpServer
-import com.datadoghq.trace.DDBaseSpan
-import com.datadoghq.trace.DDTracer
-import com.datadoghq.trace.writer.ListWriter
-import dd.test.TestUtils
+import datadog.opentracing.DDBaseSpan
+import datadog.opentracing.DDTracer
+import datadog.trace.agent.integration.TestHttpServer
+import datadog.trace.agent.test.TestUtils
+import datadog.trace.common.writer.ListWriter
 import io.opentracing.tag.Tags
 import org.apache.http.HttpResponse
 import org.apache.http.client.HttpClient

dd-java-agent-ittests/src/test/groovy/com/datadoghq/agent/integration/jdbc/JDBCInstrumentationTest.groovy renamed to dd-java-agent-ittests/src/test/groovy/datadog/trace/agent/integration/jdbc/JDBCInstrumentationTest.groovy

@@ -1,8 +1,8 @@
-package com.datadoghq.agent.integration.jdbc
+package datadog.trace.agent.integration.jdbc
 
-import com.datadoghq.trace.DDTracer
-import com.datadoghq.trace.writer.ListWriter
-import dd.test.TestUtils
+import datadog.opentracing.DDTracer
+import datadog.trace.agent.test.TestUtils
+import datadog.trace.common.writer.ListWriter
 import org.apache.derby.jdbc.EmbeddedDriver
 import org.h2.Driver
 import org.hsqldb.jdbc.JDBCDriver

dd-java-agent-ittests/src/test/groovy/com/datadoghq/agent/integration/servlet/JettyServletTest.groovy renamed to dd-java-agent-ittests/src/test/groovy/datadog/trace/agent/integration/servlet/JettyServletTest.groovy

@@ -1,8 +1,8 @@
-package com.datadoghq.agent.integration.servlet
+package datadog.trace.agent.integration.servlet
 
-import com.datadoghq.trace.DDBaseSpan
-import com.datadoghq.trace.DDTracer
-import com.datadoghq.trace.writer.ListWriter
+import datadog.opentracing.DDBaseSpan
+import datadog.opentracing.DDTracer
+import datadog.trace.common.writer.ListWriter
 import io.opentracing.util.GlobalTracer
 import okhttp3.Interceptor
 import okhttp3.OkHttpClient
@@ -15,6 +15,7 @@ import spock.lang.Unroll
 
 import java.lang.reflect.Field
 import java.util.concurrent.CountDownLatch
+import java.util.concurrent.TimeUnit
 
 class JettyServletTest extends Specification {
 
@@ -27,7 +28,7 @@ class JettyServletTest extends Specification {
     @Override
     Response intercept(Interceptor.Chain chain) throws IOException {
       def response = chain.proceed(chain.request())
-      JettyServletTest.latch.await()
+      JettyServletTest.latch.await(10, TimeUnit.SECONDS) // don't block forever or test never fails.
       return response
     }
   })

dd-java-agent-ittests/src/test/groovy/com/datadoghq/agent/integration/servlet/TestServlet.groovy renamed to dd-java-agent-ittests/src/test/groovy/datadog/trace/agent/integration/servlet/TestServlet.groovy

@@ -1,4 +1,4 @@
-package com.datadoghq.agent.integration.servlet
+package datadog.trace.agent.integration.servlet
 
 import groovy.servlet.AbstractHttpServlet
 

dd-java-agent-ittests/src/test/groovy/com/datadoghq/agent/integration/servlet/TomcatServletTest.groovy renamed to dd-java-agent-ittests/src/test/groovy/datadog/trace/agent/integration/servlet/TomcatServletTest.groovy

@@ -1,8 +1,8 @@
-package com.datadoghq.agent.integration.servlet
+package datadog.trace.agent.integration.servlet
 
-import com.datadoghq.trace.DDTracer
-import com.datadoghq.trace.writer.ListWriter
 import com.google.common.io.Files
+import datadog.opentracing.DDTracer
+import datadog.trace.common.writer.ListWriter
 import io.opentracing.util.GlobalTracer
 import okhttp3.OkHttpClient
 import okhttp3.Request