Rename packages for consistency

dd-java-agent-ittests/pom.xml

@@ -250,8 +250,8 @@
                                 </transformer>
                                 <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                                     <manifestEntries>
-                                        <Agent-Class>io.opentracing.contrib.agent.AnnotationsTracingAgent</Agent-Class>
-                                        <Premain-Class>io.opentracing.contrib.agent.AnnotationsTracingAgent
+                                        <Agent-Class>com.datadoghq.trace.agent.AnnotationsTracingAgent</Agent-Class>
+                                        <Premain-Class>com.datadoghq.trace.agent.AnnotationsTracingAgent
                                         </Premain-Class>
                                         <Can-Redefine-Classes>true</Can-Redefine-Classes>
                                         <Can-Retransform-Classes>true</Can-Retransform-Classes>

dd-java-agent-ittests/src/test/java/io/opentracing/contrib/agent/SayTracedHello.java → dd-java-agent-ittests/src/test/java/com/datadoghq/trace/agent/SayTracedHello.java

@@ -1,4 +1,6 @@
-package io.opentracing.contrib.agent;
+package com.datadoghq.trace.agent;
+
+import com.datadog.trace.Trace;
 
 public class SayTracedHello {
 

dd-java-agent-ittests/src/test/java/io/opentracing/contrib/agent/TraceAnnotationsManagerTest.java → dd-java-agent-ittests/src/test/java/com/datadoghq/trace/agent/TraceAnnotationsManagerTest.java

@@ -1,11 +1,11 @@
-package io.opentracing.contrib.agent;
+package com.datadoghq.trace.agent;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.Before;
 import org.junit.Test;
 
-import com.datadoghq.trace.instrument.AAgentIntegration;
+import com.datadoghq.trace.agent.integration.AAgentIntegration;
 
 public class TraceAnnotationsManagerTest extends AAgentIntegration{
 

dd-java-agent-ittests/src/test/java/com/datadoghq/trace/instrument/AAgentIntegration.java → dd-java-agent-ittests/src/test/java/com/datadoghq/trace/agent/integration/AAgentIntegration.java

@@ -1,4 +1,4 @@
-package com.datadoghq.trace.instrument;
+package com.datadoghq.trace.agent.integration;
 
 import org.junit.Before;
 

dd-java-agent-ittests/src/test/java/com/datadoghq/trace/instrument/AWSInstrumentationTest.java → dd-java-agent-ittests/src/test/java/com/datadoghq/trace/agent/integration/AWSInstrumentationTest.java

@@ -1,4 +1,4 @@
-package com.datadoghq.trace.instrument;
+package com.datadoghq.trace.agent.integration;
 
 import com.amazonaws.regions.Regions;
 import com.amazonaws.services.s3.AmazonS3ClientBuilder;

dd-java-agent-ittests/src/test/java/com/datadoghq/trace/instrument/ApacheHTTPClientTest.java → dd-java-agent-ittests/src/test/java/com/datadoghq/trace/agent/integration/ApacheHTTPClientTest.java

@@ -1,15 +1,9 @@
-package com.datadoghq.trace.instrument;
+package com.datadoghq.trace.agent.integration;
 
 import io.opentracing.contrib.apache.http.client.TracingHttpClientBuilder;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.HttpGet;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.junit.Test;
 
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class ApacheHTTPClientTest extends AAgentIntegration {

dd-java-agent-ittests/src/test/java/com/datadoghq/trace/instrument/CassandraIntegrationTest.java → dd-java-agent-ittests/src/test/java/com/datadoghq/trace/agent/integration/CassandraIntegrationTest.java

@@ -1,4 +1,4 @@
-package com.datadoghq.trace.instrument;
+package com.datadoghq.trace.agent.integration;
 
 import com.datastax.driver.core.Cluster;
 import com.datastax.driver.core.Session;

dd-java-agent-ittests/src/test/java/com/datadoghq/trace/instrument/JMSInstrumentationTest.java → dd-java-agent-ittests/src/test/java/com/datadoghq/trace/agent/integration/JMSInstrumentationTest.java

@@ -1,4 +1,4 @@
-package com.datadoghq.trace.instrument;
+package com.datadoghq.trace.agent.integration;
 
 import io.opentracing.contrib.jms.TracingMessageProducer;
 import io.opentracing.contrib.jms.common.TracingMessageConsumer;

dd-java-agent-ittests/src/test/java/com/datadoghq/trace/instrument/JettyServletInstrumentationTest.java → dd-java-agent-ittests/src/test/java/com/datadoghq/trace/agent/integration/JettyServletInstrumentationTest.java

@@ -1,4 +1,4 @@
-package com.datadoghq.trace.instrument;
+package com.datadoghq.trace.agent.integration;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

dd-java-agent-ittests/src/test/java/com/datadoghq/trace/instrument/MongoClientInstrumentationTest.java → dd-java-agent-ittests/src/test/java/com/datadoghq/trace/agent/integration/MongoClientInstrumentationTest.java

@@ -1,4 +1,4 @@
-package com.datadoghq.trace.instrument;
+package com.datadoghq.trace.agent.integration;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

dd-java-agent-ittests/src/test/java/com/datadoghq/trace/instrument/OkHTTPInstrumentationTest.java → dd-java-agent-ittests/src/test/java/com/datadoghq/trace/agent/integration/OkHTTPInstrumentationTest.java

@@ -1,4 +1,4 @@
-package com.datadoghq.trace.instrument;
+package com.datadoghq.trace.agent.integration;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

dd-java-agent-ittests/src/test/java/com/datadoghq/trace/instrument/TomcatServletInstrumentationTest.java → dd-java-agent-ittests/src/test/java/com/datadoghq/trace/agent/integration/TomcatServletInstrumentationTest.java

@@ -1,4 +1,4 @@
-package com.datadoghq.trace.instrument;
+package com.datadoghq.trace.agent.integration;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

dd-java-agent/pom.xml

@@ -60,7 +60,7 @@
             <version>0.9.11</version>
         </dependency>
 
-        <!-- Server side instrumentation -->
+        <!-- Server sintegrationtion -->
         <dependency>
             <groupId>io.opentracing.contrib</groupId>
             <artifactId>opentracing-web-servlet-filter</artifactId>
@@ -85,7 +85,7 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- Mongo instrumentation -->
+        <!-- Mointegrationtion -->
         <dependency>
             <groupId>io.opentracing.contrib</groupId>
             <artifactId>opentracing-mongo-driver</artifactId>
@@ -121,7 +121,7 @@
             <version>${ot.contrib.jdbc.version}</version>
         </dependency>
 
-        <!-- Client side instrumentation -->
+        <!-- Client sintegrationtion -->
         <dependency>
             <groupId>io.opentracing.contrib</groupId>
             <artifactId>opentracing-okhttp3</artifactId>
@@ -140,7 +140,7 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- JMS instrumentation -->
+        <!-- integrationtion -->
         <dependency>
             <groupId>io.opentracing.contrib</groupId>
             <artifactId>opentracing-jms-2</artifactId>
@@ -159,7 +159,7 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- AWS SDK instrumentation -->
+        <!-- AWS integrationtion -->
         <dependency>
             <groupId>io.opentracing.contrib</groupId>
             <artifactId>opentracing-aws-sdk</artifactId>
@@ -178,7 +178,7 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- Cassandra instrumentation -->
+        <!-- Cassanintegrationtion -->
         <dependency>
             <groupId>io.opentracing.contrib</groupId>
             <artifactId>opentracing-cassandra-driver</artifactId>
@@ -197,7 +197,7 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- Elasticsearch instrumentation -->
+        <!-- Elasticseaintegrationtion -->
         <dependency>
             <groupId>io.opentracing.contrib</groupId>
             <artifactId>opentracing-elasticsearch-client</artifactId>
@@ -216,7 +216,7 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- Apache HTTP instrumentation -->
+        <!-- Apache Hintegrationtion -->
         <dependency>
             <groupId>io.opentracing.contrib</groupId>
             <artifactId>opentracing-apache-httpclient</artifactId>
@@ -293,8 +293,8 @@
                                 </transformer>
                                 <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                                     <manifestEntries>
-                                        <Agent-Class>io.opentracing.contrib.agent.AnnotationsTracingAgent</Agent-Class>
-                                        <Premain-Class>io.opentracing.contrib.agent.AnnotationsTracingAgent
+                                        <Agent-Class>com.datadoghq.trace.agent.AnnotationsTracingAgent</Agent-Class>
+                                        <Premain-Class>com.datadoghq.trace.agent.AnnotationsTracingAgent
                                         </Premain-Class>
                                         <Can-Redefine-Classes>true</Can-Redefine-Classes>
                                         <Can-Retransform-Classes>true</Can-Retransform-Classes>

dd-java-agent/src/main/java/com/datadoghq/trace/resolver/AgentTracerConfig.java → dd-java-agent/src/main/java/com/datadoghq/trace/agent/AgentTracerConfig.java

@@ -1,4 +1,6 @@
-package com.datadoghq.trace.resolver;
+package com.datadoghq.trace.agent;
+
+import com.datadoghq.trace.resolver.TracerConfig;
 
 import java.util.ArrayList;
 import java.util.List;

dd-java-agent/src/main/java/io/opentracing/contrib/agent/AnnotationsTracingAgent.java → dd-java-agent/src/main/java/com/datadoghq/trace/agent/AnnotationsTracingAgent.java

@@ -14,7 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.opentracing.contrib.agent;
+package com.datadoghq.trace.agent;
+
+import io.opentracing.contrib.agent.OpenTracingAgent;
 
 import java.lang.instrument.Instrumentation;
 
@@ -42,7 +44,7 @@ protected static String addManager(String agentArgs) {
         } else {
             agentArgs += ",";
         }
-        agentArgs += "manager:"+io.opentracing.contrib.agent.TraceAnnotationsManager.class.getName();
+        agentArgs += "manager:" + TraceAnnotationsManager.class.getName();
 
         return agentArgs;
     }

dd-java-agent/src/main/java/io/opentracing/contrib/agent/InstrumentationChecker.java → dd-java-agent/src/main/java/com/datadoghq/trace/agent/InstrumentationChecker.java

@@ -1,4 +1,4 @@
-package io.opentracing.contrib.agent;
+package com.datadoghq.trace.agent;
 
 import com.datadoghq.trace.resolver.FactoryUtils;
 

dd-java-agent/src/main/java/io/opentracing/contrib/agent/TraceAnnotationsManager.java → dd-java-agent/src/main/java/com/datadoghq/trace/agent/TraceAnnotationsManager.java

@@ -1,6 +1,6 @@
-package io.opentracing.contrib.agent;
+package com.datadoghq.trace.agent;
 
-import com.datadoghq.trace.resolver.AgentTracerConfig;
+import com.datadog.trace.Trace;
 import com.datadoghq.trace.resolver.DDTracerFactory;
 import com.datadoghq.trace.resolver.FactoryUtils;
 import javassist.ClassPool;

dd-java-agent/src/main/java/io/opentracing/contrib/agent/helper/AWSClientHelper.java → dd-java-agent/src/main/java/com/datadoghq/trace/agent/integration/AWSClientHelper.java

@@ -1,4 +1,4 @@
-package io.opentracing.contrib.agent.helper;
+package com.datadoghq.trace.agent.integration;
 
 import com.amazonaws.client.builder.AwsClientBuilder;
 import com.amazonaws.handlers.RequestHandler2;

dd-java-agent/src/main/java/io/opentracing/contrib/agent/helper/ApacheHTTPClientHelper.java → dd-java-agent/src/main/java/com/datadoghq/trace/agent/integration/ApacheHTTPClientHelper.java

@@ -1,4 +1,4 @@
-package io.opentracing.contrib.agent.helper;
+package com.datadoghq.trace.agent.integration;
 
 import io.opentracing.contrib.apache.http.client.TracingHttpClientBuilder;
 import org.apache.http.impl.client.HttpClientBuilder;

dd-java-agent/src/main/java/io/opentracing/contrib/agent/helper/CassandraHelper.java → dd-java-agent/src/main/java/com/datadoghq/trace/agent/integration/CassandraHelper.java

@@ -1,4 +1,4 @@
-package io.opentracing.contrib.agent.helper;
+package com.datadoghq.trace.agent.integration;
 
 import com.datastax.driver.core.Session;
 import io.opentracing.Tracer;

dd-java-agent/src/main/java/io/opentracing/contrib/agent/helper/DDAgentTracingHelper.java → dd-java-agent/src/main/java/com/datadoghq/trace/agent/integration/DDAgentTracingHelper.java

@@ -1,4 +1,4 @@
-package io.opentracing.contrib.agent.helper;
+package com.datadoghq.trace.agent.integration;
 
 import io.opentracing.NoopTracerFactory;
 import io.opentracing.Tracer;

dd-java-agent/src/main/java/io/opentracing/contrib/agent/helper/ElasticsearchHelper.java → dd-java-agent/src/main/java/com/datadoghq/trace/agent/integration/ElasticsearchHelper.java

@@ -1,4 +1,4 @@
-package io.opentracing.contrib.agent.helper;
+package com.datadoghq.trace.agent.integration;
 
 import io.opentracing.ActiveSpan;
 import io.opentracing.Span;
@@ -12,7 +12,7 @@
 
 /**
  * Instrument all Elasticsearch queries.
- * We have not found a way to inject the opentracing contribution, so this helper is the instrumentation.
+ * We have not found a way to inject the opentracing contribution, so this integration is the integration.
  * FIXME find a better to way to inject the OT contrib
  */
 public class ElasticsearchHelper extends DDAgentTracingHelper<ActionListener> {
@@ -24,7 +24,7 @@ public ElasticsearchHelper(Rule rule) {
 	private Object request;
 
 	/**
-	 * This method is used to register/save some object that will be used for the instrumentation.
+	 * This method is used to register/save some object that will be used for the integration.
 	 * Currently, we need to keep a reference of the request called
 	 *
 	 * @param request The request used for the query
@@ -39,7 +39,7 @@ public ActionListener patch(ActionListener listener) {
 	}
 
 	/**
-	 * Strategy: When a query is executed, if start the instrumentation and a new Span.
+	 * Strategy: When a query is executed, if start the integration and a new Span.
 	 * We override the default FutureAction by using the one provided in the opentracing contribution.
 	 *
 	 * @param listener default listener

dd-java-agent/src/main/java/io/opentracing/contrib/agent/helper/JMSMessageConsumerHelper.java → dd-java-agent/src/main/java/com/datadoghq/trace/agent/integration/JMSMessageConsumerHelper.java

@@ -1,4 +1,4 @@
-package io.opentracing.contrib.agent.helper;
+package com.datadoghq.trace.agent.integration;
 
 import io.opentracing.contrib.jms.common.TracingMessageConsumer;
 import org.jboss.byteman.rule.Rule;

dd-java-agent/src/main/java/io/opentracing/contrib/agent/helper/JMSMessageProducerHelper.java → dd-java-agent/src/main/java/com/datadoghq/trace/agent/integration/JMSMessageProducerHelper.java

@@ -1,4 +1,4 @@
-package io.opentracing.contrib.agent.helper;
+package com.datadoghq.trace.agent.integration;
 
 import io.opentracing.contrib.jms.TracingMessageProducer;
 import org.jboss.byteman.rule.Rule;

dd-java-agent/src/main/java/io/opentracing/contrib/agent/helper/JettyServletHelper.java → dd-java-agent/src/main/java/com/datadoghq/trace/agent/integration/JettyServletHelper.java

@@ -1,4 +1,4 @@
-package io.opentracing.contrib.agent.helper;
+package com.datadoghq.trace.agent.integration;
 
 import io.opentracing.contrib.web.servlet.filter.TracingFilter;
 import org.eclipse.jetty.servlet.ServletContextHandler;

dd-java-agent/src/main/java/io/opentracing/contrib/agent/helper/MongoHelper.java → dd-java-agent/src/main/java/com/datadoghq/trace/agent/integration/MongoHelper.java

@@ -1,4 +1,4 @@
-package io.opentracing.contrib.agent.helper;
+package com.datadoghq.trace.agent.integration;
 
 import com.mongodb.MongoClientOptions;
 import io.opentracing.contrib.mongo.TracingCommandListener;

dd-java-agent/src/main/java/io/opentracing/contrib/agent/helper/OkHttpHelper.java → dd-java-agent/src/main/java/com/datadoghq/trace/agent/integration/OkHttpHelper.java

@@ -1,4 +1,4 @@
-package io.opentracing.contrib.agent.helper;
+package com.datadoghq.trace.agent.integration;
 
 import io.opentracing.contrib.okhttp3.TracingInterceptor;
 import okhttp3.OkHttpClient;

dd-java-agent/src/main/java/io/opentracing/contrib/agent/helper/TomcatServletHelper.java → dd-java-agent/src/main/java/com/datadoghq/trace/agent/integration/TomcatServletHelper.java

@@ -1,4 +1,4 @@
-package io.opentracing.contrib.agent.helper;
+package com.datadoghq.trace.agent.integration;
 
 import io.opentracing.contrib.web.servlet.filter.TracingFilter;
 import org.apache.catalina.core.ApplicationContext;