Skip to content

Commit 23b0b7e

Browse files
tylerbensontylerbenson
authored
Merge pull request #26 from DataDog/gpolaert/new-shading
New shading
2 parents 70e43a1 + 73ab3d3 commit 23b0b7e

File tree

9 files changed

+86
-77
lines changed

9 files changed

+86
-77
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ dependencies {
55
testCompile group: 'junit', name: 'junit', version: '4.12'
66
testCompile group: 'org.assertj', name: 'assertj-core', version: '3.6.2'
77
testCompile group: 'org.mockito', name: 'mockito-core', version: '2.7.22'
8+
testCompile group: 'ch.qos.logback', name: 'logback-classic' , version: '1.2.3'
89
testCompile group: 'org.mongodb', name: 'mongo-java-driver', version: '3.4.2'
910
testCompile group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.4.1.v20170120'
1011
testCompile group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '9.4.1.v20170120'

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

Lines changed: 18 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,13 @@
1111
<name>dd-java-agent-ittests</name>
1212
<description>Datadog Java Agent integration tests</description>
1313
<url>https://github.com/datadog/dd-trace-java</url>
14-
14+
<packaging>jar</packaging>
1515

1616
<properties>
1717
<maven.deploy.skip>true</maven.deploy.skip>
1818
<dd-trace.version>0.1.2-SNAPSHOT</dd-trace.version>
19+
<!--Skip tests-->
20+
<skipTests>true</skipTests>
1921
</properties>
2022

2123
<dependencies>
@@ -27,8 +29,22 @@
2729
<version>${dd-trace.version}</version>
2830
<scope>test</scope>
2931
</dependency>
32+
<!-- Required for the tracer resolver / annotation -->
33+
<dependency>
34+
<groupId>com.google.auto.service</groupId>
35+
<artifactId>auto-service</artifactId>
36+
<version>1.0-rc3</version>
37+
<scope>compile</scope>
38+
</dependency>
39+
3040

3141
<!-- JUnit tests -->
42+
<dependency>
43+
<groupId>ch.qos.logback</groupId>
44+
<artifactId>logback-classic</artifactId>
45+
<version>1.2.3</version>
46+
<scope>test</scope>
47+
</dependency>
3248
<dependency>
3349
<groupId>io.opentracing</groupId>
3450
<artifactId>opentracing-mock</artifactId>
@@ -194,37 +210,16 @@
194210
</dependencies>
195211
<build>
196212
<plugins>
197-
<plugin>
198-
<groupId>org.apache.maven.plugins</groupId>
199-
<artifactId>maven-javadoc-plugin</artifactId>
200-
<version>2.10.4</version>
201-
<executions>
202-
<execution>
203-
<id>attach-javadocs</id>
204-
<goals>
205-
<goal>jar</goal>
206-
</goals>
207-
</execution>
208-
</executions>
209-
</plugin>
210213
<plugin>
211214
<groupId>org.apache.maven.plugins</groupId>
212215
<artifactId>maven-surefire-plugin</artifactId>
213216
<version>2.19</version>
214217
<configuration>
215-
<includes>
216-
<!--<include>*Test.java</include>-->
217-
</includes>
218-
<excludes>
219-
<exclude>*Test.java</exclude>
220-
</excludes>
221-
<!--<forkCount>3</forkCount>-->
222-
<!--<reuseForks>false</reuseForks>-->
223218
<argLine>
224219
-javaagent:${M2_REPO}/com/datadoghq/dd-java-agent/${project.version}/dd-java-agent-${project.version}.jar
225220
-Dorg.jboss.byteman.verbose=true
226221
</argLine>
227-
<!--<workingDirectory>target/FORK_DIRECTORY_${surefire.forkNumber}</workingDirectory>-->
222+
<skipTests>${skipTests}</skipTests>
228223
</configuration>
229224
</plugin>
230225
<plugin>
@@ -238,26 +233,10 @@
238233
<goal>shade</goal>
239234
</goals>
240235
<configuration>
241-
<artifactSet>
242-
<excludes>
243-
<!-- <exclude>ch.qos.logback:*</exclude> -->
244-
<!-- <exclude>org.slf4j:*</exclude> -->
245-
</excludes>
246-
</artifactSet>
247236
<transformers>
248237
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
249238
<resource>otarules.btm</resource>
250239
</transformer>
251-
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
252-
<manifestEntries>
253-
<Agent-Class>com.datadoghq.trace.agent.AnnotationsTracingAgent</Agent-Class>
254-
<Premain-Class>com.datadoghq.trace.agent.AnnotationsTracingAgent
255-
</Premain-Class>
256-
<Can-Redefine-Classes>true</Can-Redefine-Classes>
257-
<Can-Retransform-Classes>true</Can-Retransform-Classes>
258-
<Boot-Class-Path>./${project.artifactId}.jar</Boot-Class-Path>
259-
</manifestEntries>
260-
</transformer>
261240
</transformers>
262241
</configuration>
263242
</execution>

‎dd-java-agent-ittests/src/test/resources/dd-trace.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ sampler:
2121
# skipTagsPatterns: {"http.url": ".*/demo/add.*"}
2222

2323
# Enable custom annotation tracing over a selected set of packages
24-
enableCustomAnnotationTracingOver: ["io.opentracing.contrib.agent"]
24+
enableCustomAnnotationTracingOver: ["com.datadoghq.trace.agent"]
2525

2626
# Disable some instrumentations
2727
# disabledInstrumentations: ["apache http", "mongo", "jetty", "tomcat", ...]

‎dd-java-agent/build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ dependencies {
1212

1313
compile group: 'io.opentracing.contrib', name: 'opentracing-agent', version: '0.1.0'
1414
compile group: 'org.reflections', name: 'reflections', version: '0.9.11'
15+
compile group: 'com.google.auto.service', name: 'auto-service', version: '1.0-rc3'
1516

1617

1718
compile(group: 'io.opentracing.contrib', name: 'opentracing-web-servlet-filter', version: '0.0.9') {
@@ -45,6 +46,7 @@ dependencies {
4546
testCompile group: 'junit', name: 'junit', version: '4.12'
4647
testCompile group: 'org.assertj', name: 'assertj-core', version: '3.6.2'
4748
testCompile group: 'org.mockito', name: 'mockito-core', version: '2.7.22'
49+
testCompile group: 'ch.qos.logback', name: 'logback-classic' , version: '1.2.3'
4850
compileOnly group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '9.3.6.v20151106'
4951
compileOnly group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '9.0.0.M1'
5052
compileOnly group: 'org.mongodb', name: 'mongo-java-driver', version: '3.4.2'

‎dd-java-agent/pom.xml

Lines changed: 46 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,17 @@
5252
<version>${ot.agent.version}</version>
5353
</dependency>
5454

55-
5655
<!-- Used to find annotated methods -->
5756
<dependency>
5857
<groupId>org.reflections</groupId>
5958
<artifactId>reflections</artifactId>
6059
<version>0.9.11</version>
6160
</dependency>
61+
<dependency>
62+
<groupId>com.google.auto.service</groupId>
63+
<artifactId>auto-service</artifactId>
64+
<version>1.0-rc3</version>
65+
</dependency>
6266

6367
<!-- Server side instrumentation -->
6468
<dependency>
@@ -236,7 +240,13 @@
236240
</dependency>
237241

238242

239-
<!-- JUnit tests -->
243+
<!-- Tests -->
244+
<dependency>
245+
<groupId>ch.qos.logback</groupId>
246+
<artifactId>logback-classic</artifactId>
247+
<version>1.2.3</version>
248+
<scope>test</scope>
249+
</dependency>
240250
<dependency>
241251
<groupId>io.opentracing</groupId>
242252
<artifactId>opentracing-mock</artifactId>
@@ -287,15 +297,47 @@
287297
<goal>shade</goal>
288298
</goals>
289299
<configuration>
300+
<artifactSet>
301+
<excludes>
302+
<!-- If not, the shade plugin doesn't work -->
303+
<exclude>io.opentracing.contrib:opentracing-agent</exclude>
304+
<exclude>org.jboss.byteman:byteman</exclude>
305+
</excludes>
306+
</artifactSet>
307+
<relocations>
308+
<relocation>
309+
<pattern>javassist</pattern>
310+
<shadedPattern>shaded.javassist</shadedPattern>
311+
</relocation>
312+
<relocation>
313+
<pattern>org.reflections</pattern>
314+
<shadedPattern>shaded.org.reflections</shadedPattern>
315+
</relocation>
316+
<relocation>
317+
<pattern>com.fasterxml</pattern>
318+
<shadedPattern>shaded.com.fasterxml</shadedPattern>
319+
</relocation>
320+
<relocation>
321+
<pattern>com.google</pattern>
322+
<shadedPattern>shaded.com.google</shadedPattern>
323+
</relocation>
324+
<relocation>
325+
<pattern>org.yaml</pattern>
326+
<shadedPattern>shaded.org.yaml</shadedPattern>
327+
</relocation>
328+
<relocation>
329+
<pattern>org.slf4j</pattern>
330+
<shadedPattern>shaded.org.slf4j</shadedPattern>
331+
</relocation>
332+
</relocations>
290333
<transformers>
291334
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
292335
<resource>otarules.btm</resource>
293336
</transformer>
294337
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
295338
<manifestEntries>
296339
<Agent-Class>com.datadoghq.trace.agent.AnnotationsTracingAgent</Agent-Class>
297-
<Premain-Class>com.datadoghq.trace.agent.AnnotationsTracingAgent
298-
</Premain-Class>
340+
<Premain-Class>com.datadoghq.trace.agent.AnnotationsTracingAgent</Premain-Class>
299341
<Can-Redefine-Classes>true</Can-Redefine-Classes>
300342
<Can-Retransform-Classes>true</Can-Retransform-Classes>
301343
<Boot-Class-Path>./${project.artifactId}.jar</Boot-Class-Path>

‎dd-trace-annotations/pom.xml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,4 @@
1111
<name>dd-trace-annotations</name>
1212
<url>https://github.com/datadog/dd-trace-java</url>
1313
<packaging>jar</packaging>
14-
<properties>
15-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
16-
</properties>
17-
<dependencies>
18-
<dependency>
19-
<groupId>junit</groupId>
20-
<artifactId>junit</artifactId>
21-
<version>3.8.1</version>
22-
<scope>test</scope>
23-
</dependency>
24-
</dependencies>
2514
</project>

‎dd-trace/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ dependencies {
1616
testCompile group: 'junit', name: 'junit', version: '4.12'
1717
testCompile group: 'org.assertj', name: 'assertj-core', version: '3.6.2'
1818
testCompile group: 'org.mockito', name: 'mockito-core', version: '2.7.22'
19+
testCompile group: 'ch.qos.logback', name: 'logback-classic' , version: '1.2.3'
1920
}
2021

2122
shadowJar {

‎dd-trace/pom.xml

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,6 @@
5656
<artifactId>slf4j-api</artifactId>
5757
<version>1.7.25</version>
5858
</dependency>
59-
<dependency>
60-
<groupId>ch.qos.logback</groupId>
61-
<artifactId>logback-classic</artifactId>
62-
<version>1.2.3</version>
63-
</dependency>
6459

6560
<!-- Required for the tracer resolver / annotation -->
6661
<dependency>
@@ -70,6 +65,12 @@
7065
</dependency>
7166

7267
<!-- Testing dependencies -->
68+
<dependency>
69+
<groupId>ch.qos.logback</groupId>
70+
<artifactId>logback-classic</artifactId>
71+
<version>1.2.3</version>
72+
<scope>test</scope>
73+
</dependency>
7374
<dependency>
7475
<groupId>junit</groupId>
7576
<artifactId>junit</artifactId>
@@ -126,7 +127,7 @@
126127
<plugin>
127128
<groupId>org.apache.maven.plugins</groupId>
128129
<artifactId>maven-shade-plugin</artifactId>
129-
<version>2.4.1</version>
130+
<version>2.4.3</version>
130131
<executions>
131132
<execution>
132133
<phase>package</phase>
@@ -137,28 +138,21 @@
137138
<relocations>
138139
<relocation>
139140
<pattern>com.fasterxml</pattern>
140-
<shadedPattern>dd.com.fasterxml</shadedPattern>
141+
<shadedPattern>shaded.com.fasterxml</shadedPattern>
141142
</relocation>
142-
<!--<relocation>-->
143-
<!--<pattern>com.google</pattern>-->
144-
<!--<shadedPattern>dd.com.google</shadedPattern>-->
145-
<!--</relocation>-->
146143
<relocation>
147-
<pattern>org.yaml</pattern>
148-
<shadedPattern>dd.org.yaml</shadedPattern>
144+
<pattern>com.google</pattern>
145+
<shadedPattern>shaded.com.google</shadedPattern>
149146
</relocation>
150147
<relocation>
151-
<pattern>org.slf4j</pattern>
152-
<shadedPattern>dd.org.slf4j</shadedPattern>
148+
<pattern>org.yaml</pattern>
149+
<shadedPattern>shaded.org.yaml</shadedPattern>
153150
</relocation>
154151
<relocation>
155-
<pattern>ch.qos</pattern>
156-
<shadedPattern>dd.ch.qos</shadedPattern>
152+
<pattern>org.slf4j</pattern>
153+
<shadedPattern>shaded.org.slf4j</shadedPattern>
157154
</relocation>
158155
</relocations>
159-
<transformers>
160-
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer" />
161-
</transformers>
162156
</configuration>
163157
</execution>
164158
</executions>

‎pom.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
<url>https://github.com/datadog/dd-trace-java</url>
3333
<connection>scm:git:git://github.com/datadog/dd-trace-java.git</connection>
3434
<developerConnection>scm:git:[email protected]:datadog/dd-trace-java.git</developerConnection>
35-
<tag>HEAD</tag>
36-
</scm>
35+
<tag>HEAD</tag>
36+
</scm>
3737

3838
<modules>
3939
<module>dd-trace</module>
@@ -47,6 +47,7 @@
4747
<maven.deploy.skip>true</maven.deploy.skip>
4848
<opentracing.version>0.30.0</opentracing.version>
4949
<java.version>1.7</java.version>
50+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
5051
</properties>
5152

5253
<distributionManagement>

0 commit comments

Comments
 (0)