Skip to content

Commit ff4f397

Browse files
committed
Fix transitive dependencies
New instrumentation was bringing in their dependencies into the jar, resulting in a much larger jar file. This should resolve that.
1 parent 66355fe commit ff4f397

File tree

7 files changed

+32
-22
lines changed

7 files changed

+32
-22
lines changed

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

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,23 @@ dependencies {
2121
compile project(':dd-java-agent:tooling')
2222
compile project(':dd-trace-annotations')
2323

24-
compile project(':dd-java-agent:integrations:aws-sdk')
25-
compile project(':dd-java-agent:integrations:servlet-2')
26-
compile project(':dd-java-agent:integrations:servlet-3')
27-
compile project(':dd-java-agent:integrations:spring-web')
24+
compile(project(':dd-java-agent:integrations:aws-sdk')) {
25+
transitive = false
26+
}
27+
compile(project(':dd-java-agent:integrations:servlet-2')) {
28+
transitive = false
29+
}
30+
compile(project(':dd-java-agent:integrations:servlet-3')) {
31+
transitive = false
32+
}
33+
compile(project(':dd-java-agent:integrations:spring-web')) {
34+
transitive = false
35+
}
2836

2937
compile deps.bytebuddy
3038
compile group: 'org.jboss.byteman', name: 'byteman', version: '3.0.10'
3139

32-
compile group: 'com.google.auto.service', name: 'auto-service', version: '1.0-rc3'
40+
compile deps.autoservice
3341
compile deps.slf4j
3442

3543
compile group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.25'

dd-java-agent/integrations/aws-sdk/aws-sdk.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ dependencies {
2323

2424
compile deps.bytebuddy
2525
compile deps.opentracing
26+
compile deps.autoservice
2627

2728
compile group: 'io.opentracing.contrib', name: 'opentracing-aws-sdk', version: '0.0.2'
28-
compile group: 'com.google.auto.service', name: 'auto-service', version: '1.0-rc3'
2929
}

dd-java-agent/integrations/servlet-2/servlet-2.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,5 @@ dependencies {
2121

2222
compile deps.bytebuddy
2323
compile deps.opentracing
24-
25-
compile group: 'com.google.auto.service', name: 'auto-service', version: '1.0-rc3'
24+
compile deps.autoservice
2625
}

dd-java-agent/integrations/servlet-3/servlet-3.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,5 @@ dependencies {
2222

2323
compile deps.bytebuddy
2424
compile deps.opentracing
25-
26-
compile group: 'com.google.auto.service', name: 'auto-service', version: '1.0-rc3'
25+
compile deps.autoservice
2726
}

dd-java-agent/integrations/spring-web/spring-web.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,5 @@ dependencies {
2424

2525
compile deps.bytebuddy
2626
compile deps.opentracing
27-
28-
compile group: 'com.google.auto.service', name: 'auto-service', version: '1.0-rc3'
27+
compile deps.autoservice
2928
}

dd-trace/dd-trace.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ dependencies {
2424

2525
compile deps.jackson
2626
compile deps.slf4j
27-
compile group: 'com.google.auto.service', name: 'auto-service', version: '1.0-rc3'
27+
compile deps.autoservice
2828
compile group: 'org.msgpack', name: 'jackson-dataformat-msgpack', version: '0.8.13'
2929

3030
testCompile deps.testLogging

gradle/dependencies.gradle

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,26 @@ ext {
2323
opentracingMock: dependencies.create(group: 'io.opentracing', name: 'opentracing-mock', version: version.opentracing),
2424

2525
// General
26-
slf4j : "org.slf4j:slf4j-api:${version.slf4j}",
27-
guava : "com.google.guava:guava:$version.guava",
28-
jackson : [
26+
slf4j : "org.slf4j:slf4j-api:${version.slf4j}",
27+
guava : "com.google.guava:guava:$version.guava",
28+
jackson : [
2929
dependencies.create(group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: version.jackson),
3030
dependencies.create(group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: version.jackson),
3131
],
32-
bytebuddy : dependencies.create(group: 'net.bytebuddy', name: 'byte-buddy', version: '1.7.6'),
33-
32+
bytebuddy : dependencies.create(group: 'net.bytebuddy', name: 'byte-buddy', version: '1.7.6'),
33+
autoservice: [
34+
dependencies.create(group: 'com.google.auto.service', name: 'auto-service', version: '1.0-rc3'),
35+
dependencies.create(group: 'com.google.auto', name: 'auto-common', version: '0.3'),
36+
dependencies.create(group: 'com.google.guava', name: 'guava', version: '19.0'),
37+
],
38+
3439
// Testing
35-
spock : dependencies.create("org.spockframework:spock-core:${version.spock}", {
40+
spock : dependencies.create("org.spockframework:spock-core:${version.spock}", {
3641
exclude group: "org.codehaus.groovy", module: "groovy-all"
3742
}),
38-
groovy : "org.codehaus.groovy:groovy-all:${version.groovy}",
39-
junit : "junit:junit:${version.junit}",
40-
testLogging : [
43+
groovy : "org.codehaus.groovy:groovy-all:${version.groovy}",
44+
junit : "junit:junit:${version.junit}",
45+
testLogging: [
4146
dependencies.create(group: 'ch.qos.logback', name: 'logback-classic', version: version.logback),
4247
dependencies.create(group: 'org.slf4j', name: 'log4j-over-slf4j', version: version.slf4j),
4348
dependencies.create(group: 'org.slf4j', name: 'jcl-over-slf4j', version: version.slf4j),

0 commit comments

Comments
 (0)