From ff4f39779efcdbd581ae1762413774f2eb0ab324 Mon Sep 17 00:00:00 2001 From: Tyler Benson Date: Fri, 10 Nov 2017 11:45:00 -0500 Subject: [PATCH] Fix transitive dependencies New instrumentation was bringing in their dependencies into the jar, resulting in a much larger jar file. This should resolve that. --- dd-java-agent/dd-java-agent.gradle | 18 +++++++++++---- .../integrations/aws-sdk/aws-sdk.gradle | 2 +- .../integrations/servlet-2/servlet-2.gradle | 3 +-- .../integrations/servlet-3/servlet-3.gradle | 3 +-- .../integrations/spring-web/spring-web.gradle | 3 +-- dd-trace/dd-trace.gradle | 2 +- gradle/dependencies.gradle | 23 +++++++++++-------- 7 files changed, 32 insertions(+), 22 deletions(-) diff --git a/dd-java-agent/dd-java-agent.gradle b/dd-java-agent/dd-java-agent.gradle index 6ae074ff62..763ae0bebf 100644 --- a/dd-java-agent/dd-java-agent.gradle +++ b/dd-java-agent/dd-java-agent.gradle @@ -21,15 +21,23 @@ dependencies { compile project(':dd-java-agent:tooling') compile project(':dd-trace-annotations') - compile project(':dd-java-agent:integrations:aws-sdk') - compile project(':dd-java-agent:integrations:servlet-2') - compile project(':dd-java-agent:integrations:servlet-3') - compile project(':dd-java-agent:integrations:spring-web') + compile(project(':dd-java-agent:integrations:aws-sdk')) { + transitive = false + } + compile(project(':dd-java-agent:integrations:servlet-2')) { + transitive = false + } + compile(project(':dd-java-agent:integrations:servlet-3')) { + transitive = false + } + compile(project(':dd-java-agent:integrations:spring-web')) { + transitive = false + } compile deps.bytebuddy compile group: 'org.jboss.byteman', name: 'byteman', version: '3.0.10' - compile group: 'com.google.auto.service', name: 'auto-service', version: '1.0-rc3' + compile deps.autoservice compile deps.slf4j compile group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.25' diff --git a/dd-java-agent/integrations/aws-sdk/aws-sdk.gradle b/dd-java-agent/integrations/aws-sdk/aws-sdk.gradle index 67a4d7708e..29d567c320 100644 --- a/dd-java-agent/integrations/aws-sdk/aws-sdk.gradle +++ b/dd-java-agent/integrations/aws-sdk/aws-sdk.gradle @@ -23,7 +23,7 @@ dependencies { compile deps.bytebuddy compile deps.opentracing + compile deps.autoservice compile group: 'io.opentracing.contrib', name: 'opentracing-aws-sdk', version: '0.0.2' - compile group: 'com.google.auto.service', name: 'auto-service', version: '1.0-rc3' } diff --git a/dd-java-agent/integrations/servlet-2/servlet-2.gradle b/dd-java-agent/integrations/servlet-2/servlet-2.gradle index 23358ae565..bc59374da5 100644 --- a/dd-java-agent/integrations/servlet-2/servlet-2.gradle +++ b/dd-java-agent/integrations/servlet-2/servlet-2.gradle @@ -21,6 +21,5 @@ dependencies { compile deps.bytebuddy compile deps.opentracing - - compile group: 'com.google.auto.service', name: 'auto-service', version: '1.0-rc3' + compile deps.autoservice } diff --git a/dd-java-agent/integrations/servlet-3/servlet-3.gradle b/dd-java-agent/integrations/servlet-3/servlet-3.gradle index 35cc217d0b..a26472ba2e 100644 --- a/dd-java-agent/integrations/servlet-3/servlet-3.gradle +++ b/dd-java-agent/integrations/servlet-3/servlet-3.gradle @@ -22,6 +22,5 @@ dependencies { compile deps.bytebuddy compile deps.opentracing - - compile group: 'com.google.auto.service', name: 'auto-service', version: '1.0-rc3' + compile deps.autoservice } diff --git a/dd-java-agent/integrations/spring-web/spring-web.gradle b/dd-java-agent/integrations/spring-web/spring-web.gradle index 2ca83728bd..85cf27beeb 100644 --- a/dd-java-agent/integrations/spring-web/spring-web.gradle +++ b/dd-java-agent/integrations/spring-web/spring-web.gradle @@ -24,6 +24,5 @@ dependencies { compile deps.bytebuddy compile deps.opentracing - - compile group: 'com.google.auto.service', name: 'auto-service', version: '1.0-rc3' + compile deps.autoservice } diff --git a/dd-trace/dd-trace.gradle b/dd-trace/dd-trace.gradle index 947f55fb5d..eb38d04f5a 100644 --- a/dd-trace/dd-trace.gradle +++ b/dd-trace/dd-trace.gradle @@ -24,7 +24,7 @@ dependencies { compile deps.jackson compile deps.slf4j - compile group: 'com.google.auto.service', name: 'auto-service', version: '1.0-rc3' + compile deps.autoservice compile group: 'org.msgpack', name: 'jackson-dataformat-msgpack', version: '0.8.13' testCompile deps.testLogging diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index d5964610c7..dee011a848 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -23,21 +23,26 @@ ext { opentracingMock: dependencies.create(group: 'io.opentracing', name: 'opentracing-mock', version: version.opentracing), // General - slf4j : "org.slf4j:slf4j-api:${version.slf4j}", - guava : "com.google.guava:guava:$version.guava", - jackson : [ + slf4j : "org.slf4j:slf4j-api:${version.slf4j}", + guava : "com.google.guava:guava:$version.guava", + jackson : [ dependencies.create(group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: version.jackson), dependencies.create(group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: version.jackson), ], - bytebuddy : dependencies.create(group: 'net.bytebuddy', name: 'byte-buddy', version: '1.7.6'), - + bytebuddy : dependencies.create(group: 'net.bytebuddy', name: 'byte-buddy', version: '1.7.6'), + autoservice: [ + dependencies.create(group: 'com.google.auto.service', name: 'auto-service', version: '1.0-rc3'), + dependencies.create(group: 'com.google.auto', name: 'auto-common', version: '0.3'), + dependencies.create(group: 'com.google.guava', name: 'guava', version: '19.0'), + ], + // Testing - spock : dependencies.create("org.spockframework:spock-core:${version.spock}", { + spock : dependencies.create("org.spockframework:spock-core:${version.spock}", { exclude group: "org.codehaus.groovy", module: "groovy-all" }), - groovy : "org.codehaus.groovy:groovy-all:${version.groovy}", - junit : "junit:junit:${version.junit}", - testLogging : [ + groovy : "org.codehaus.groovy:groovy-all:${version.groovy}", + junit : "junit:junit:${version.junit}", + testLogging: [ dependencies.create(group: 'ch.qos.logback', name: 'logback-classic', version: version.logback), dependencies.create(group: 'org.slf4j', name: 'log4j-over-slf4j', version: version.slf4j), dependencies.create(group: 'org.slf4j', name: 'jcl-over-slf4j', version: version.slf4j),