diff --git a/dd-java-agent-ittests/pom.xml b/dd-java-agent-ittests/pom.xml index 65d3eb59eae..1e03ea6abd2 100644 --- a/dd-java-agent-ittests/pom.xml +++ b/dd-java-agent-ittests/pom.xml @@ -250,8 +250,8 @@ - io.opentracing.contrib.agent.AnnotationsTracingAgent - io.opentracing.contrib.agent.AnnotationsTracingAgent + com.datadoghq.trace.agent.AnnotationsTracingAgent + com.datadoghq.trace.agent.AnnotationsTracingAgent true true diff --git a/dd-java-agent-ittests/src/test/java/io/opentracing/contrib/agent/SayTracedHello.java b/dd-java-agent-ittests/src/test/java/com/datadoghq/trace/agent/SayTracedHello.java similarity index 86% rename from dd-java-agent-ittests/src/test/java/io/opentracing/contrib/agent/SayTracedHello.java rename to dd-java-agent-ittests/src/test/java/com/datadoghq/trace/agent/SayTracedHello.java index 0e5fda60b5c..0d3111f3dbc 100644 --- a/dd-java-agent-ittests/src/test/java/io/opentracing/contrib/agent/SayTracedHello.java +++ b/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.datadoghq.trace.Trace; public class SayTracedHello { diff --git a/dd-java-agent-ittests/src/test/java/io/opentracing/contrib/agent/TraceAnnotationsManagerTest.java b/dd-java-agent-ittests/src/test/java/com/datadoghq/trace/agent/TraceAnnotationsManagerTest.java similarity index 94% rename from dd-java-agent-ittests/src/test/java/io/opentracing/contrib/agent/TraceAnnotationsManagerTest.java rename to dd-java-agent-ittests/src/test/java/com/datadoghq/trace/agent/TraceAnnotationsManagerTest.java index 7c3bd476939..8073cabc43e 100644 --- a/dd-java-agent-ittests/src/test/java/io/opentracing/contrib/agent/TraceAnnotationsManagerTest.java +++ b/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{ diff --git a/dd-java-agent-ittests/src/test/java/com/datadoghq/trace/instrument/AAgentIntegration.java b/dd-java-agent-ittests/src/test/java/com/datadoghq/trace/agent/integration/AAgentIntegration.java similarity index 91% rename from dd-java-agent-ittests/src/test/java/com/datadoghq/trace/instrument/AAgentIntegration.java rename to dd-java-agent-ittests/src/test/java/com/datadoghq/trace/agent/integration/AAgentIntegration.java index 42dd61f4f38..bef110b9310 100644 --- a/dd-java-agent-ittests/src/test/java/com/datadoghq/trace/instrument/AAgentIntegration.java +++ b/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; diff --git a/dd-java-agent-ittests/src/test/java/com/datadoghq/trace/instrument/AWSInstrumentationTest.java b/dd-java-agent-ittests/src/test/java/com/datadoghq/trace/agent/integration/AWSInstrumentationTest.java similarity index 93% rename from dd-java-agent-ittests/src/test/java/com/datadoghq/trace/instrument/AWSInstrumentationTest.java rename to dd-java-agent-ittests/src/test/java/com/datadoghq/trace/agent/integration/AWSInstrumentationTest.java index 3f2a2d2731b..f134a2eb22c 100644 --- a/dd-java-agent-ittests/src/test/java/com/datadoghq/trace/instrument/AWSInstrumentationTest.java +++ b/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; diff --git a/dd-java-agent-ittests/src/test/java/com/datadoghq/trace/instrument/ApacheHTTPClientTest.java b/dd-java-agent-ittests/src/test/java/com/datadoghq/trace/agent/integration/ApacheHTTPClientTest.java similarity index 81% rename from dd-java-agent-ittests/src/test/java/com/datadoghq/trace/instrument/ApacheHTTPClientTest.java rename to dd-java-agent-ittests/src/test/java/com/datadoghq/trace/agent/integration/ApacheHTTPClientTest.java index 1e4159035e0..bc9a6d8b002 100644 --- a/dd-java-agent-ittests/src/test/java/com/datadoghq/trace/instrument/ApacheHTTPClientTest.java +++ b/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 { diff --git a/dd-java-agent-ittests/src/test/java/com/datadoghq/trace/instrument/CassandraIntegrationTest.java b/dd-java-agent-ittests/src/test/java/com/datadoghq/trace/agent/integration/CassandraIntegrationTest.java similarity index 96% rename from dd-java-agent-ittests/src/test/java/com/datadoghq/trace/instrument/CassandraIntegrationTest.java rename to dd-java-agent-ittests/src/test/java/com/datadoghq/trace/agent/integration/CassandraIntegrationTest.java index c1d69d549ca..6c9e5787a32 100644 --- a/dd-java-agent-ittests/src/test/java/com/datadoghq/trace/instrument/CassandraIntegrationTest.java +++ b/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; diff --git a/dd-java-agent-ittests/src/test/java/com/datadoghq/trace/instrument/ElasticsearchIntegrationTest.java b/dd-java-agent-ittests/src/test/java/com/datadoghq/trace/agent/integration/ElasticsearchIntegrationTest.java similarity index 100% rename from dd-java-agent-ittests/src/test/java/com/datadoghq/trace/instrument/ElasticsearchIntegrationTest.java rename to dd-java-agent-ittests/src/test/java/com/datadoghq/trace/agent/integration/ElasticsearchIntegrationTest.java diff --git a/dd-java-agent-ittests/src/test/java/com/datadoghq/trace/instrument/JMSInstrumentationTest.java b/dd-java-agent-ittests/src/test/java/com/datadoghq/trace/agent/integration/JMSInstrumentationTest.java similarity index 96% rename from dd-java-agent-ittests/src/test/java/com/datadoghq/trace/instrument/JMSInstrumentationTest.java rename to dd-java-agent-ittests/src/test/java/com/datadoghq/trace/agent/integration/JMSInstrumentationTest.java index 56e685c0e5b..a094dbe2edb 100644 --- a/dd-java-agent-ittests/src/test/java/com/datadoghq/trace/instrument/JMSInstrumentationTest.java +++ b/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; diff --git a/dd-java-agent-ittests/src/test/java/com/datadoghq/trace/instrument/JettyServletInstrumentationTest.java b/dd-java-agent-ittests/src/test/java/com/datadoghq/trace/agent/integration/JettyServletInstrumentationTest.java similarity index 95% rename from dd-java-agent-ittests/src/test/java/com/datadoghq/trace/instrument/JettyServletInstrumentationTest.java rename to dd-java-agent-ittests/src/test/java/com/datadoghq/trace/agent/integration/JettyServletInstrumentationTest.java index aca8d10cbf6..61f639b4d61 100644 --- a/dd-java-agent-ittests/src/test/java/com/datadoghq/trace/instrument/JettyServletInstrumentationTest.java +++ b/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; diff --git a/dd-java-agent-ittests/src/test/java/com/datadoghq/trace/instrument/MongoClientInstrumentationTest.java b/dd-java-agent-ittests/src/test/java/com/datadoghq/trace/agent/integration/MongoClientInstrumentationTest.java similarity index 92% rename from dd-java-agent-ittests/src/test/java/com/datadoghq/trace/instrument/MongoClientInstrumentationTest.java rename to dd-java-agent-ittests/src/test/java/com/datadoghq/trace/agent/integration/MongoClientInstrumentationTest.java index 037e0f65b01..aeabff751e7 100644 --- a/dd-java-agent-ittests/src/test/java/com/datadoghq/trace/instrument/MongoClientInstrumentationTest.java +++ b/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; diff --git a/dd-java-agent-ittests/src/test/java/com/datadoghq/trace/instrument/OkHTTPInstrumentationTest.java b/dd-java-agent-ittests/src/test/java/com/datadoghq/trace/agent/integration/OkHTTPInstrumentationTest.java similarity index 90% rename from dd-java-agent-ittests/src/test/java/com/datadoghq/trace/instrument/OkHTTPInstrumentationTest.java rename to dd-java-agent-ittests/src/test/java/com/datadoghq/trace/agent/integration/OkHTTPInstrumentationTest.java index f391124e5ec..8afd2fc1803 100644 --- a/dd-java-agent-ittests/src/test/java/com/datadoghq/trace/instrument/OkHTTPInstrumentationTest.java +++ b/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; diff --git a/dd-java-agent-ittests/src/test/java/com/datadoghq/trace/instrument/TomcatServletInstrumentationTest.java b/dd-java-agent-ittests/src/test/java/com/datadoghq/trace/agent/integration/TomcatServletInstrumentationTest.java similarity index 96% rename from dd-java-agent-ittests/src/test/java/com/datadoghq/trace/instrument/TomcatServletInstrumentationTest.java rename to dd-java-agent-ittests/src/test/java/com/datadoghq/trace/agent/integration/TomcatServletInstrumentationTest.java index bef7c18cdfd..99e6b01b04c 100644 --- a/dd-java-agent-ittests/src/test/java/com/datadoghq/trace/instrument/TomcatServletInstrumentationTest.java +++ b/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; diff --git a/dd-java-agent/pom.xml b/dd-java-agent/pom.xml index 857dc93c1ed..085b04136f4 100644 --- a/dd-java-agent/pom.xml +++ b/dd-java-agent/pom.xml @@ -293,8 +293,8 @@ - io.opentracing.contrib.agent.AnnotationsTracingAgent - io.opentracing.contrib.agent.AnnotationsTracingAgent + com.datadoghq.trace.agent.AnnotationsTracingAgent + com.datadoghq.trace.agent.AnnotationsTracingAgent true true diff --git a/dd-java-agent/src/main/java/com/datadoghq/trace/resolver/AgentTracerConfig.java b/dd-java-agent/src/main/java/com/datadoghq/trace/agent/AgentTracerConfig.java similarity index 90% rename from dd-java-agent/src/main/java/com/datadoghq/trace/resolver/AgentTracerConfig.java rename to dd-java-agent/src/main/java/com/datadoghq/trace/agent/AgentTracerConfig.java index 64e5e87af53..4d25368a992 100644 --- a/dd-java-agent/src/main/java/com/datadoghq/trace/resolver/AgentTracerConfig.java +++ b/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; diff --git a/dd-java-agent/src/main/java/io/opentracing/contrib/agent/AnnotationsTracingAgent.java b/dd-java-agent/src/main/java/com/datadoghq/trace/agent/AnnotationsTracingAgent.java similarity index 90% rename from dd-java-agent/src/main/java/io/opentracing/contrib/agent/AnnotationsTracingAgent.java rename to dd-java-agent/src/main/java/com/datadoghq/trace/agent/AnnotationsTracingAgent.java index 1218b94d5ff..30def10f4a7 100644 --- a/dd-java-agent/src/main/java/io/opentracing/contrib/agent/AnnotationsTracingAgent.java +++ b/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; } diff --git a/dd-java-agent/src/main/java/io/opentracing/contrib/agent/InstrumentationChecker.java b/dd-java-agent/src/main/java/com/datadoghq/trace/agent/InstrumentationChecker.java similarity index 98% rename from dd-java-agent/src/main/java/io/opentracing/contrib/agent/InstrumentationChecker.java rename to dd-java-agent/src/main/java/com/datadoghq/trace/agent/InstrumentationChecker.java index be20cbcad45..d22536ea176 100644 --- a/dd-java-agent/src/main/java/io/opentracing/contrib/agent/InstrumentationChecker.java +++ b/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; diff --git a/dd-java-agent/src/main/java/io/opentracing/contrib/agent/TraceAnnotationsManager.java b/dd-java-agent/src/main/java/com/datadoghq/trace/agent/TraceAnnotationsManager.java similarity index 99% rename from dd-java-agent/src/main/java/io/opentracing/contrib/agent/TraceAnnotationsManager.java rename to dd-java-agent/src/main/java/com/datadoghq/trace/agent/TraceAnnotationsManager.java index 06da8e3ad44..db78226df1d 100644 --- a/dd-java-agent/src/main/java/io/opentracing/contrib/agent/TraceAnnotationsManager.java +++ b/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.datadoghq.trace.Trace; import com.datadoghq.trace.resolver.DDTracerFactory; import com.datadoghq.trace.resolver.FactoryUtils; import javassist.ClassPool; diff --git a/dd-java-agent/src/main/java/io/opentracing/contrib/agent/helper/AWSClientHelper.java b/dd-java-agent/src/main/java/com/datadoghq/trace/agent/integration/AWSClientHelper.java similarity index 97% rename from dd-java-agent/src/main/java/io/opentracing/contrib/agent/helper/AWSClientHelper.java rename to dd-java-agent/src/main/java/com/datadoghq/trace/agent/integration/AWSClientHelper.java index d066e969aac..5dea5574ed6 100644 --- a/dd-java-agent/src/main/java/io/opentracing/contrib/agent/helper/AWSClientHelper.java +++ b/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; diff --git a/dd-java-agent/src/main/java/io/opentracing/contrib/agent/helper/ApacheHTTPClientHelper.java b/dd-java-agent/src/main/java/com/datadoghq/trace/agent/integration/ApacheHTTPClientHelper.java similarity index 95% rename from dd-java-agent/src/main/java/io/opentracing/contrib/agent/helper/ApacheHTTPClientHelper.java rename to dd-java-agent/src/main/java/com/datadoghq/trace/agent/integration/ApacheHTTPClientHelper.java index 9a29e079d1b..b680a04551d 100644 --- a/dd-java-agent/src/main/java/io/opentracing/contrib/agent/helper/ApacheHTTPClientHelper.java +++ b/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; diff --git a/dd-java-agent/src/main/java/io/opentracing/contrib/agent/helper/CassandraHelper.java b/dd-java-agent/src/main/java/com/datadoghq/trace/agent/integration/CassandraHelper.java similarity index 96% rename from dd-java-agent/src/main/java/io/opentracing/contrib/agent/helper/CassandraHelper.java rename to dd-java-agent/src/main/java/com/datadoghq/trace/agent/integration/CassandraHelper.java index 90de93fc07b..b6cbec787f8 100644 --- a/dd-java-agent/src/main/java/io/opentracing/contrib/agent/helper/CassandraHelper.java +++ b/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; diff --git a/dd-java-agent/src/main/java/io/opentracing/contrib/agent/helper/DDAgentTracingHelper.java b/dd-java-agent/src/main/java/com/datadoghq/trace/agent/integration/DDAgentTracingHelper.java similarity index 98% rename from dd-java-agent/src/main/java/io/opentracing/contrib/agent/helper/DDAgentTracingHelper.java rename to dd-java-agent/src/main/java/com/datadoghq/trace/agent/integration/DDAgentTracingHelper.java index f888dad53a4..5e50adf2644 100644 --- a/dd-java-agent/src/main/java/io/opentracing/contrib/agent/helper/DDAgentTracingHelper.java +++ b/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; diff --git a/dd-java-agent/src/main/java/io/opentracing/contrib/agent/helper/ElasticsearchHelper.java b/dd-java-agent/src/main/java/com/datadoghq/trace/agent/integration/ElasticsearchHelper.java similarity index 91% rename from dd-java-agent/src/main/java/io/opentracing/contrib/agent/helper/ElasticsearchHelper.java rename to dd-java-agent/src/main/java/com/datadoghq/trace/agent/integration/ElasticsearchHelper.java index b870c7f4de7..158a3f0ce30 100644 --- a/dd-java-agent/src/main/java/io/opentracing/contrib/agent/helper/ElasticsearchHelper.java +++ b/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 { @@ -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 diff --git a/dd-java-agent/src/main/java/io/opentracing/contrib/agent/helper/JMSMessageConsumerHelper.java b/dd-java-agent/src/main/java/com/datadoghq/trace/agent/integration/JMSMessageConsumerHelper.java similarity index 94% rename from dd-java-agent/src/main/java/io/opentracing/contrib/agent/helper/JMSMessageConsumerHelper.java rename to dd-java-agent/src/main/java/com/datadoghq/trace/agent/integration/JMSMessageConsumerHelper.java index 3f674f6c051..3ab120b3bdb 100644 --- a/dd-java-agent/src/main/java/io/opentracing/contrib/agent/helper/JMSMessageConsumerHelper.java +++ b/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; diff --git a/dd-java-agent/src/main/java/io/opentracing/contrib/agent/helper/JMSMessageProducerHelper.java b/dd-java-agent/src/main/java/com/datadoghq/trace/agent/integration/JMSMessageProducerHelper.java similarity index 94% rename from dd-java-agent/src/main/java/io/opentracing/contrib/agent/helper/JMSMessageProducerHelper.java rename to dd-java-agent/src/main/java/com/datadoghq/trace/agent/integration/JMSMessageProducerHelper.java index fee56b6bb29..5eba7fd22fe 100644 --- a/dd-java-agent/src/main/java/io/opentracing/contrib/agent/helper/JMSMessageProducerHelper.java +++ b/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; diff --git a/dd-java-agent/src/main/java/io/opentracing/contrib/agent/helper/JettyServletHelper.java b/dd-java-agent/src/main/java/com/datadoghq/trace/agent/integration/JettyServletHelper.java similarity index 95% rename from dd-java-agent/src/main/java/io/opentracing/contrib/agent/helper/JettyServletHelper.java rename to dd-java-agent/src/main/java/com/datadoghq/trace/agent/integration/JettyServletHelper.java index fecf2704125..4f4b2dd2200 100644 --- a/dd-java-agent/src/main/java/io/opentracing/contrib/agent/helper/JettyServletHelper.java +++ b/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; diff --git a/dd-java-agent/src/main/java/io/opentracing/contrib/agent/helper/MongoHelper.java b/dd-java-agent/src/main/java/com/datadoghq/trace/agent/integration/MongoHelper.java similarity index 95% rename from dd-java-agent/src/main/java/io/opentracing/contrib/agent/helper/MongoHelper.java rename to dd-java-agent/src/main/java/com/datadoghq/trace/agent/integration/MongoHelper.java index 4497a8171c1..834716f353f 100644 --- a/dd-java-agent/src/main/java/io/opentracing/contrib/agent/helper/MongoHelper.java +++ b/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; diff --git a/dd-java-agent/src/main/java/io/opentracing/contrib/agent/helper/OkHttpHelper.java b/dd-java-agent/src/main/java/com/datadoghq/trace/agent/integration/OkHttpHelper.java similarity index 95% rename from dd-java-agent/src/main/java/io/opentracing/contrib/agent/helper/OkHttpHelper.java rename to dd-java-agent/src/main/java/com/datadoghq/trace/agent/integration/OkHttpHelper.java index a14a0fc15c8..a1c53313d19 100644 --- a/dd-java-agent/src/main/java/io/opentracing/contrib/agent/helper/OkHttpHelper.java +++ b/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; diff --git a/dd-java-agent/src/main/java/io/opentracing/contrib/agent/helper/TomcatServletHelper.java b/dd-java-agent/src/main/java/com/datadoghq/trace/agent/integration/TomcatServletHelper.java similarity index 95% rename from dd-java-agent/src/main/java/io/opentracing/contrib/agent/helper/TomcatServletHelper.java rename to dd-java-agent/src/main/java/com/datadoghq/trace/agent/integration/TomcatServletHelper.java index 7ff96225bb9..55d94f168dd 100644 --- a/dd-java-agent/src/main/java/io/opentracing/contrib/agent/helper/TomcatServletHelper.java +++ b/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; diff --git a/dd-java-agent/src/main/resources/otarules.btm b/dd-java-agent/src/main/resources/otarules.btm index 981d83efe61..d2dbef5ebac 100644 --- a/dd-java-agent/src/main/resources/otarules.btm +++ b/dd-java-agent/src/main/resources/otarules.btm @@ -13,7 +13,7 @@ RULE opentracing-mongo-driver CLASS com.mongodb.MongoClientOptions$Builder METHOD build -HELPER io.opentracing.contrib.agent.helper.MongoHelper +HELPER com.datadoghq.trace.agent.integration.MongoHelper AT ENTRY IF getState($0) == 0 DO @@ -26,7 +26,7 @@ ENDRULE RULE opentracing-aws-sdk CLASS ^com.amazonaws.client.builder.AwsClientBuilder METHOD build() -HELPER io.opentracing.contrib.agent.helper.AWSClientHelper +HELPER com.datadoghq.trace.agent.integration.AWSClientHelper AT ENTRY IF TRUE DO @@ -39,7 +39,7 @@ ENDRULE RULE opentracing-apache-httpclient CLASS org.apache.http.impl.client.HttpClientBuilder METHOD create() -HELPER io.opentracing.contrib.agent.helper.ApacheHTTPClientHelper +HELPER com.datadoghq.trace.agent.integration.ApacheHTTPClientHelper AT EXIT IF TRUE DO @@ -52,7 +52,7 @@ ENDRULE RULE opentracing-elasticsearch-client INTERFACE org.elasticsearch.client.ElasticsearchClient METHOD execute(org.elasticsearch.action.Action,org.elasticsearch.action.ActionRequest,org.elasticsearch.action.ActionListener) -HELPER io.opentracing.contrib.agent.helper.ElasticsearchHelper +HELPER com.datadoghq.trace.agent.integration.ElasticsearchHelper AT ENTRY IF $# == 3 AND NOT $3.getClass().getCanonicalName().equals("io.opentracing.contrib.elasticsearch.TracingResponseListener") DO @@ -66,7 +66,7 @@ ENDRULE RULE opentracing-cassandra-driver CLASS com.datastax.driver.core.Cluster$Manager METHOD newSession() -HELPER io.opentracing.contrib.agent.helper.CassandraHelper +HELPER com.datadoghq.trace.agent.integration.CassandraHelper AT EXIT IF TRUE DO @@ -81,7 +81,7 @@ ENDRULE RULE opentracing-web-servlet-filter_jetty CLASS org.eclipse.jetty.servlet.ServletContextHandler METHOD -HELPER io.opentracing.contrib.agent.helper.JettyServletHelper +HELPER com.datadoghq.trace.agent.integration.JettyServletHelper AT EXIT IF getState($0.getServletContext()) == 0 DO @@ -94,7 +94,7 @@ ENDRULE RULE opentracing-web-servlet-filter_tomcat CLASS org.apache.catalina.core.ApplicationContext METHOD -HELPER io.opentracing.contrib.agent.helper.TomcatServletHelper +HELPER com.datadoghq.trace.agent.integration.TomcatServletHelper AT EXIT IF TRUE DO @@ -107,7 +107,7 @@ ENDRULE RULE opentracing-okhttp3 CLASS okhttp3.OkHttpClient$Builder METHOD build() -HELPER io.opentracing.contrib.agent.helper.OkHttpHelper +HELPER com.datadoghq.trace.agent.integration.OkHttpHelper AT ENTRY IF TRUE DO @@ -120,7 +120,7 @@ ENDRULE RULE opentracing-jms-2_producer INTERFACE javax.jms.Session METHOD createProducer -HELPER io.opentracing.contrib.agent.helper.JMSMessageProducerHelper +HELPER com.datadoghq.trace.agent.integration.JMSMessageProducerHelper AT EXIT IF TRUE DO @@ -131,7 +131,7 @@ ENDRULE RULE opentracing-jms-2_consumer INTERFACE javax.jms.Session METHOD createConsumer -HELPER io.opentracing.contrib.agent.helper.JMSMessageConsumerHelper +HELPER com.datadoghq.trace.agent.integration.JMSMessageConsumerHelper AT EXIT IF TRUE DO diff --git a/dd-java-agent/src/test/java/io/opentracing/contrib/agent/InstrumentationCheckerTest.java b/dd-java-agent/src/test/java/com/datadoghq/trace/agent/InstrumentationCheckerTest.java similarity index 91% rename from dd-java-agent/src/test/java/io/opentracing/contrib/agent/InstrumentationCheckerTest.java rename to dd-java-agent/src/test/java/com/datadoghq/trace/agent/InstrumentationCheckerTest.java index 1f84e5b8bc1..9d0326e81e4 100644 --- a/dd-java-agent/src/test/java/io/opentracing/contrib/agent/InstrumentationCheckerTest.java +++ b/dd-java-agent/src/test/java/com/datadoghq/trace/agent/InstrumentationCheckerTest.java @@ -1,5 +1,6 @@ -package io.opentracing.contrib.agent; +package com.datadoghq.trace.agent; +import com.datadoghq.trace.agent.InstrumentationChecker; import com.datadoghq.trace.resolver.FactoryUtils; import org.junit.Before; import org.junit.Test; diff --git a/dd-trace-annotations/src/main/java/io/opentracing/contrib/agent/Trace.java b/dd-trace-annotations/src/main/java/com/datadoghq/trace/Trace.java similarity index 94% rename from dd-trace-annotations/src/main/java/io/opentracing/contrib/agent/Trace.java rename to dd-trace-annotations/src/main/java/com/datadoghq/trace/Trace.java index d7e387d8d55..3a2df7597cf 100644 --- a/dd-trace-annotations/src/main/java/io/opentracing/contrib/agent/Trace.java +++ b/dd-trace-annotations/src/main/java/com/datadoghq/trace/Trace.java @@ -1,4 +1,4 @@ -package io.opentracing.contrib.agent; +package com.datadoghq.trace; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/dd-trace-examples/dropwizard-mongo-client/src/main/java/com/example/helloworld/client/TracedClient.java b/dd-trace-examples/dropwizard-mongo-client/src/main/java/com/example/helloworld/client/TracedClient.java index 0f55fb70f00..15ae1dcc6cb 100644 --- a/dd-trace-examples/dropwizard-mongo-client/src/main/java/com/example/helloworld/client/TracedClient.java +++ b/dd-trace-examples/dropwizard-mongo-client/src/main/java/com/example/helloworld/client/TracedClient.java @@ -2,7 +2,7 @@ import java.io.IOException; -import io.opentracing.contrib.agent.Trace; +import com.datadoghq.trace.Trace; import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.Response; diff --git a/dd-trace-examples/dropwizard-mongo-client/src/main/java/com/example/helloworld/resources/SimpleCrudResource.java b/dd-trace-examples/dropwizard-mongo-client/src/main/java/com/example/helloworld/resources/SimpleCrudResource.java index 0c728cbfb2e..a8fcb57c0d5 100644 --- a/dd-trace-examples/dropwizard-mongo-client/src/main/java/com/example/helloworld/resources/SimpleCrudResource.java +++ b/dd-trace-examples/dropwizard-mongo-client/src/main/java/com/example/helloworld/resources/SimpleCrudResource.java @@ -1,11 +1,11 @@ package com.example.helloworld.resources; +import com.datadoghq.trace.Trace; import com.example.helloworld.api.Book; import com.google.common.base.Optional; import com.mongodb.MongoClient; import com.mongodb.client.MongoCursor; import com.mongodb.client.MongoDatabase; -import io.opentracing.contrib.agent.Trace; import org.bson.Document; import javax.ws.rs.GET; diff --git a/dd-trace/src/main/java/com/datadoghq/trace/DDTracer.java b/dd-trace/src/main/java/com/datadoghq/trace/DDTracer.java index ce3330c7497..933c2f45fb1 100644 --- a/dd-trace/src/main/java/com/datadoghq/trace/DDTracer.java +++ b/dd-trace/src/main/java/com/datadoghq/trace/DDTracer.java @@ -18,7 +18,7 @@ /** - * DDTracer makes it easy to send traces and span to DD using the OpenTracing instrumentation. + * DDTracer makes it easy to send traces and span to DD using the OpenTracing integration. */ public class DDTracer implements io.opentracing.Tracer { diff --git a/dd-trace/src/main/java/com/datadoghq/trace/sampling/RateSampler.java b/dd-trace/src/main/java/com/datadoghq/trace/sampling/RateSampler.java index dd33797f61e..6db238a1871 100644 --- a/dd-trace/src/main/java/com/datadoghq/trace/sampling/RateSampler.java +++ b/dd-trace/src/main/java/com/datadoghq/trace/sampling/RateSampler.java @@ -11,7 +11,7 @@ * This sampler sample the traces at a predefined rate. *

* Keep (100 * `sample_rate`)% of the traces. - * It samples randomly, its main purpose is to reduce the instrumentation footprint. + * It samples randomly, its main purpose is to reduce the integration footprint. */ @AutoService(Sampler.class) public class RateSampler extends AbstractSampler {