Skip to content

Commit cee31b4

Browse files
tylerbensontylerbenson
committed
Rename packages for consistency
1 parent e77b8dd commit cee31b4

36 files changed

+67
-66
lines changed

‎dd-java-agent-ittests/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -250,8 +250,8 @@
250250
</transformer>
251251
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
252252
<manifestEntries>
253-
<Agent-Class>io.opentracing.contrib.agent.AnnotationsTracingAgent</Agent-Class>
254-
<Premain-Class>io.opentracing.contrib.agent.AnnotationsTracingAgent
253+
<Agent-Class>com.datadoghq.trace.agent.AnnotationsTracingAgent</Agent-Class>
254+
<Premain-Class>com.datadoghq.trace.agent.AnnotationsTracingAgent
255255
</Premain-Class>
256256
<Can-Redefine-Classes>true</Can-Redefine-Classes>
257257
<Can-Retransform-Classes>true</Can-Retransform-Classes>

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

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
package io.opentracing.contrib.agent;
1+
package com.datadoghq.trace.agent;
2+
3+
import com.datadog.trace.Trace;
24

35
public class SayTracedHello {
46

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package io.opentracing.contrib.agent;
1+
package com.datadoghq.trace.agent;
22

33
import static org.assertj.core.api.Assertions.assertThat;
44

55
import org.junit.Before;
66
import org.junit.Test;
77

8-
import com.datadoghq.trace.instrument.AAgentIntegration;
8+
import com.datadoghq.trace.agent.integration.AAgentIntegration;
99

1010
public class TraceAnnotationsManagerTest extends AAgentIntegration{
1111

‎dd-java-agent-ittests/src/test/java/com/datadoghq/trace/instrument/AAgentIntegration.java renamed to ‎dd-java-agent-ittests/src/test/java/com/datadoghq/trace/agent/integration/AAgentIntegration.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.datadoghq.trace.instrument;
1+
package com.datadoghq.trace.agent.integration;
22

33
import org.junit.Before;
44

‎dd-java-agent-ittests/src/test/java/com/datadoghq/trace/instrument/AWSInstrumentationTest.java renamed to ‎dd-java-agent-ittests/src/test/java/com/datadoghq/trace/agent/integration/AWSInstrumentationTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.datadoghq.trace.instrument;
1+
package com.datadoghq.trace.agent.integration;
22

33
import com.amazonaws.regions.Regions;
44
import com.amazonaws.services.s3.AmazonS3ClientBuilder;

‎dd-java-agent-ittests/src/test/java/com/datadoghq/trace/instrument/ApacheHTTPClientTest.java renamed to ‎dd-java-agent-ittests/src/test/java/com/datadoghq/trace/agent/integration/ApacheHTTPClientTest.java

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
1-
package com.datadoghq.trace.instrument;
1+
package com.datadoghq.trace.agent.integration;
22

33
import io.opentracing.contrib.apache.http.client.TracingHttpClientBuilder;
4-
import org.apache.http.HttpResponse;
5-
import org.apache.http.client.HttpClient;
6-
import org.apache.http.client.methods.HttpGet;
74
import org.apache.http.impl.client.HttpClientBuilder;
85
import org.junit.Test;
96

10-
import java.io.BufferedReader;
11-
import java.io.InputStreamReader;
12-
137
import static org.assertj.core.api.Assertions.assertThat;
148

159
public class ApacheHTTPClientTest extends AAgentIntegration {

‎dd-java-agent-ittests/src/test/java/com/datadoghq/trace/instrument/CassandraIntegrationTest.java renamed to ‎dd-java-agent-ittests/src/test/java/com/datadoghq/trace/agent/integration/CassandraIntegrationTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.datadoghq.trace.instrument;
1+
package com.datadoghq.trace.agent.integration;
22

33
import com.datastax.driver.core.Cluster;
44
import com.datastax.driver.core.Session;

‎dd-java-agent-ittests/src/test/java/com/datadoghq/trace/instrument/ElasticsearchIntegrationTest.java renamed to ‎dd-java-agent-ittests/src/test/java/com/datadoghq/trace/agent/integration/ElasticsearchIntegrationTest.java

File renamed without changes.

‎dd-java-agent-ittests/src/test/java/com/datadoghq/trace/instrument/JMSInstrumentationTest.java renamed to ‎dd-java-agent-ittests/src/test/java/com/datadoghq/trace/agent/integration/JMSInstrumentationTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.datadoghq.trace.instrument;
1+
package com.datadoghq.trace.agent.integration;
22

33
import io.opentracing.contrib.jms.TracingMessageProducer;
44
import io.opentracing.contrib.jms.common.TracingMessageConsumer;

‎dd-java-agent-ittests/src/test/java/com/datadoghq/trace/instrument/JettyServletInstrumentationTest.java renamed to ‎dd-java-agent-ittests/src/test/java/com/datadoghq/trace/agent/integration/JettyServletInstrumentationTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.datadoghq.trace.instrument;
1+
package com.datadoghq.trace.agent.integration;
22

33
import static org.assertj.core.api.Assertions.assertThat;
44

‎dd-java-agent-ittests/src/test/java/com/datadoghq/trace/instrument/MongoClientInstrumentationTest.java renamed to ‎dd-java-agent-ittests/src/test/java/com/datadoghq/trace/agent/integration/MongoClientInstrumentationTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.datadoghq.trace.instrument;
1+
package com.datadoghq.trace.agent.integration;
22

33
import static org.assertj.core.api.Assertions.assertThat;
44

‎dd-java-agent-ittests/src/test/java/com/datadoghq/trace/instrument/OkHTTPInstrumentationTest.java renamed to ‎dd-java-agent-ittests/src/test/java/com/datadoghq/trace/agent/integration/OkHTTPInstrumentationTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.datadoghq.trace.instrument;
1+
package com.datadoghq.trace.agent.integration;
22

33
import static org.assertj.core.api.Assertions.assertThat;
44

‎dd-java-agent-ittests/src/test/java/com/datadoghq/trace/instrument/TomcatServletInstrumentationTest.java renamed to ‎dd-java-agent-ittests/src/test/java/com/datadoghq/trace/agent/integration/TomcatServletInstrumentationTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.datadoghq.trace.instrument;
1+
package com.datadoghq.trace.agent.integration;
22

33
import static org.assertj.core.api.Assertions.assertThat;
44

‎dd-java-agent/pom.xml

+10-10
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
<version>0.9.11</version>
6161
</dependency>
6262

63-
<!-- Server side instrumentation -->
63+
<!-- Server sintegrationtion -->
6464
<dependency>
6565
<groupId>io.opentracing.contrib</groupId>
6666
<artifactId>opentracing-web-servlet-filter</artifactId>
@@ -85,7 +85,7 @@
8585
<scope>provided</scope>
8686
</dependency>
8787

88-
<!-- Mongo instrumentation -->
88+
<!-- Mointegrationtion -->
8989
<dependency>
9090
<groupId>io.opentracing.contrib</groupId>
9191
<artifactId>opentracing-mongo-driver</artifactId>
@@ -121,7 +121,7 @@
121121
<version>${ot.contrib.jdbc.version}</version>
122122
</dependency>
123123

124-
<!-- Client side instrumentation -->
124+
<!-- Client sintegrationtion -->
125125
<dependency>
126126
<groupId>io.opentracing.contrib</groupId>
127127
<artifactId>opentracing-okhttp3</artifactId>
@@ -140,7 +140,7 @@
140140
<scope>provided</scope>
141141
</dependency>
142142

143-
<!-- JMS instrumentation -->
143+
<!-- integrationtion -->
144144
<dependency>
145145
<groupId>io.opentracing.contrib</groupId>
146146
<artifactId>opentracing-jms-2</artifactId>
@@ -159,7 +159,7 @@
159159
<scope>provided</scope>
160160
</dependency>
161161

162-
<!-- AWS SDK instrumentation -->
162+
<!-- AWS integrationtion -->
163163
<dependency>
164164
<groupId>io.opentracing.contrib</groupId>
165165
<artifactId>opentracing-aws-sdk</artifactId>
@@ -178,7 +178,7 @@
178178
<scope>provided</scope>
179179
</dependency>
180180

181-
<!-- Cassandra instrumentation -->
181+
<!-- Cassanintegrationtion -->
182182
<dependency>
183183
<groupId>io.opentracing.contrib</groupId>
184184
<artifactId>opentracing-cassandra-driver</artifactId>
@@ -197,7 +197,7 @@
197197
<scope>provided</scope>
198198
</dependency>
199199

200-
<!-- Elasticsearch instrumentation -->
200+
<!-- Elasticseaintegrationtion -->
201201
<dependency>
202202
<groupId>io.opentracing.contrib</groupId>
203203
<artifactId>opentracing-elasticsearch-client</artifactId>
@@ -216,7 +216,7 @@
216216
<scope>provided</scope>
217217
</dependency>
218218

219-
<!-- Apache HTTP instrumentation -->
219+
<!-- Apache Hintegrationtion -->
220220
<dependency>
221221
<groupId>io.opentracing.contrib</groupId>
222222
<artifactId>opentracing-apache-httpclient</artifactId>
@@ -293,8 +293,8 @@
293293
</transformer>
294294
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
295295
<manifestEntries>
296-
<Agent-Class>io.opentracing.contrib.agent.AnnotationsTracingAgent</Agent-Class>
297-
<Premain-Class>io.opentracing.contrib.agent.AnnotationsTracingAgent
296+
<Agent-Class>com.datadoghq.trace.agent.AnnotationsTracingAgent</Agent-Class>
297+
<Premain-Class>com.datadoghq.trace.agent.AnnotationsTracingAgent
298298
</Premain-Class>
299299
<Can-Redefine-Classes>true</Can-Redefine-Classes>
300300
<Can-Retransform-Classes>true</Can-Retransform-Classes>

‎dd-java-agent/src/main/java/com/datadoghq/trace/resolver/AgentTracerConfig.java renamed to ‎dd-java-agent/src/main/java/com/datadoghq/trace/agent/AgentTracerConfig.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
package com.datadoghq.trace.resolver;
1+
package com.datadoghq.trace.agent;
2+
3+
import com.datadoghq.trace.resolver.TracerConfig;
24

35
import java.util.ArrayList;
46
import java.util.List;

‎dd-java-agent/src/main/java/io/opentracing/contrib/agent/AnnotationsTracingAgent.java renamed to ‎dd-java-agent/src/main/java/com/datadoghq/trace/agent/AnnotationsTracingAgent.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package io.opentracing.contrib.agent;
17+
package com.datadoghq.trace.agent;
18+
19+
import io.opentracing.contrib.agent.OpenTracingAgent;
1820

1921
import java.lang.instrument.Instrumentation;
2022

@@ -42,7 +44,7 @@ protected static String addManager(String agentArgs) {
4244
} else {
4345
agentArgs += ",";
4446
}
45-
agentArgs += "manager:"+io.opentracing.contrib.agent.TraceAnnotationsManager.class.getName();
47+
agentArgs += "manager:" + TraceAnnotationsManager.class.getName();
4648

4749
return agentArgs;
4850
}

‎dd-java-agent/src/main/java/io/opentracing/contrib/agent/InstrumentationChecker.java renamed to ‎dd-java-agent/src/main/java/com/datadoghq/trace/agent/InstrumentationChecker.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.opentracing.contrib.agent;
1+
package com.datadoghq.trace.agent;
22

33
import com.datadoghq.trace.resolver.FactoryUtils;
44

‎dd-java-agent/src/main/java/io/opentracing/contrib/agent/TraceAnnotationsManager.java renamed to ‎dd-java-agent/src/main/java/com/datadoghq/trace/agent/TraceAnnotationsManager.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package io.opentracing.contrib.agent;
1+
package com.datadoghq.trace.agent;
22

3-
import com.datadoghq.trace.resolver.AgentTracerConfig;
3+
import com.datadog.trace.Trace;
44
import com.datadoghq.trace.resolver.DDTracerFactory;
55
import com.datadoghq.trace.resolver.FactoryUtils;
66
import javassist.ClassPool;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.opentracing.contrib.agent.helper;
1+
package com.datadoghq.trace.agent.integration;
22

33
import com.amazonaws.client.builder.AwsClientBuilder;
44
import com.amazonaws.handlers.RequestHandler2;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.opentracing.contrib.agent.helper;
1+
package com.datadoghq.trace.agent.integration;
22

33
import io.opentracing.contrib.apache.http.client.TracingHttpClientBuilder;
44
import org.apache.http.impl.client.HttpClientBuilder;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.opentracing.contrib.agent.helper;
1+
package com.datadoghq.trace.agent.integration;
22

33
import com.datastax.driver.core.Session;
44
import io.opentracing.Tracer;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.opentracing.contrib.agent.helper;
1+
package com.datadoghq.trace.agent.integration;
22

33
import io.opentracing.NoopTracerFactory;
44
import io.opentracing.Tracer;

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.opentracing.contrib.agent.helper;
1+
package com.datadoghq.trace.agent.integration;
22

33
import io.opentracing.ActiveSpan;
44
import io.opentracing.Span;
@@ -12,7 +12,7 @@
1212

1313
/**
1414
* Instrument all Elasticsearch queries.
15-
* We have not found a way to inject the opentracing contribution, so this helper is the instrumentation.
15+
* We have not found a way to inject the opentracing contribution, so this integration is the integration.
1616
* FIXME find a better to way to inject the OT contrib
1717
*/
1818
public class ElasticsearchHelper extends DDAgentTracingHelper<ActionListener> {
@@ -24,7 +24,7 @@ public ElasticsearchHelper(Rule rule) {
2424
private Object request;
2525

2626
/**
27-
* This method is used to register/save some object that will be used for the instrumentation.
27+
* This method is used to register/save some object that will be used for the integration.
2828
* Currently, we need to keep a reference of the request called
2929
*
3030
* @param request The request used for the query
@@ -39,7 +39,7 @@ public ActionListener patch(ActionListener listener) {
3939
}
4040

4141
/**
42-
* Strategy: When a query is executed, if start the instrumentation and a new Span.
42+
* Strategy: When a query is executed, if start the integration and a new Span.
4343
* We override the default FutureAction by using the one provided in the opentracing contribution.
4444
*
4545
* @param listener default listener

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.opentracing.contrib.agent.helper;
1+
package com.datadoghq.trace.agent.integration;
22

33
import io.opentracing.contrib.jms.common.TracingMessageConsumer;
44
import org.jboss.byteman.rule.Rule;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.opentracing.contrib.agent.helper;
1+
package com.datadoghq.trace.agent.integration;
22

33
import io.opentracing.contrib.jms.TracingMessageProducer;
44
import org.jboss.byteman.rule.Rule;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.opentracing.contrib.agent.helper;
1+
package com.datadoghq.trace.agent.integration;
22

33
import io.opentracing.contrib.web.servlet.filter.TracingFilter;
44
import org.eclipse.jetty.servlet.ServletContextHandler;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.opentracing.contrib.agent.helper;
1+
package com.datadoghq.trace.agent.integration;
22

33
import com.mongodb.MongoClientOptions;
44
import io.opentracing.contrib.mongo.TracingCommandListener;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.opentracing.contrib.agent.helper;
1+
package com.datadoghq.trace.agent.integration;
22

33
import io.opentracing.contrib.okhttp3.TracingInterceptor;
44
import okhttp3.OkHttpClient;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.opentracing.contrib.agent.helper;
1+
package com.datadoghq.trace.agent.integration;
22

33
import io.opentracing.contrib.web.servlet.filter.TracingFilter;
44
import org.apache.catalina.core.ApplicationContext;

0 commit comments

Comments
 (0)