open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #238 from DataDog/tyler/remove-deps 

Remove unneeded dependencies on dd-trace-ot.
This commit is contained in:
Andrew Kent 2018-02-21 09:35:11 -08:00 committed by GitHub
parent 09c90afcb2 a3a70e6ea3
commit 0812501aa3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dd-java-agent/agent-tooling/agent-tooling.gradle
View File

@ -2,9 +2,11 @@ apply from: "${rootDir}/gradle/java.gradle"
dependencies { dependencies {
compile project(':dd-java-agent:agent-bootstrap') compile project(':dd-java-agent:agent-bootstrap')
compile project(':dd-trace-ot')
compile deps.bytebuddy compile deps.bytebuddy
compile deps.bytebuddyagent compile deps.bytebuddyagent
compile deps.autoservice
compileOnly project(':dd-trace-ot')
testCompile deps.opentracing testCompile deps.opentracing
} }

1
dd-java-agent/instrumentation/apache-httpclient-4.3/apache-httpclient-4.3.gradle
View File

@ -27,7 +27,6 @@ apply from: "${rootDir}/gradle/java.gradle"
dependencies { dependencies {
compileOnly group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.3' compileOnly group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.3'
compile project(':dd-trace-ot')
compile project(':dd-java-agent:agent-tooling') compile project(':dd-java-agent:agent-tooling')
compile deps.bytebuddy compile deps.bytebuddy

1
dd-java-agent/instrumentation/aws-sdk/aws-sdk.gradle
View File

@ -29,7 +29,6 @@ if (JavaVersion.current() != JavaVersion.VERSION_1_8) {
dependencies { dependencies {
compileOnly group: 'com.amazonaws', name: 'aws-java-sdk-core', version: '1.11.119' compileOnly group: 'com.amazonaws', name: 'aws-java-sdk-core', version: '1.11.119'
compile project(':dd-trace-ot')
compile project(':dd-java-agent:agent-tooling') compile project(':dd-java-agent:agent-tooling')
compile deps.bytebuddy compile deps.bytebuddy

1
dd-java-agent/instrumentation/datastax-cassandra-3.2/datastax-cassandra-3.2.gradle
View File

@ -48,7 +48,6 @@ dependencies {
transitive = false transitive = false
} }
compile project(':dd-trace-ot')
compile project(':dd-java-agent:agent-tooling') compile project(':dd-java-agent:agent-tooling')
compile deps.bytebuddy compile deps.bytebuddy

1
dd-java-agent/instrumentation/jax-rs/jax-rs.gradle
View File

@ -15,7 +15,6 @@ dependencies {
compile deps.opentracing compile deps.opentracing
compile deps.autoservice compile deps.autoservice
compile project(':dd-trace-ot')
compile project(':dd-java-agent:agent-tooling') compile project(':dd-java-agent:agent-tooling')
testCompile project(':dd-java-agent:testing') testCompile project(':dd-java-agent:testing')

1
dd-java-agent/instrumentation/jdbc/jdbc.gradle
View File

@ -1,7 +1,6 @@
apply from: "${rootDir}/gradle/java.gradle" apply from: "${rootDir}/gradle/java.gradle"
dependencies { dependencies {
compile project(':dd-trace-ot')
compile project(':dd-java-agent:agent-tooling') compile project(':dd-java-agent:agent-tooling')
compile deps.bytebuddy compile deps.bytebuddy

1
dd-java-agent/instrumentation/jms-1/jms-1.gradle
View File

@ -20,7 +20,6 @@ dependencies {
compile deps.opentracing compile deps.opentracing
compile deps.autoservice compile deps.autoservice
compile project(':dd-trace-ot')
compile project(':dd-java-agent:agent-tooling') compile project(':dd-java-agent:agent-tooling')
testCompile project(':dd-java-agent:testing') testCompile project(':dd-java-agent:testing')

1
dd-java-agent/instrumentation/jms-2/jms-2.gradle
View File

@ -24,7 +24,6 @@ dependencies {
compile deps.opentracing compile deps.opentracing
compile deps.autoservice compile deps.autoservice
compile project(':dd-trace-ot')
compile project(':dd-java-agent:agent-tooling') compile project(':dd-java-agent:agent-tooling')
testCompile project(':dd-java-agent:testing') testCompile project(':dd-java-agent:testing')

1
dd-java-agent/instrumentation/kafka-clients-0.11/kafka-clients-0.11.gradle
View File

@ -15,7 +15,6 @@ apply from: "${rootDir}/gradle/java.gradle"
dependencies { dependencies {
compileOnly group: 'org.apache.kafka', name: 'kafka-clients', version: '0.11.0.0' compileOnly group: 'org.apache.kafka', name: 'kafka-clients', version: '0.11.0.0'
compile project(':dd-trace-ot')
compile project(':dd-java-agent:agent-tooling') compile project(':dd-java-agent:agent-tooling')
compile deps.bytebuddy compile deps.bytebuddy

1
dd-java-agent/instrumentation/kafka-streams-0.11/kafka-streams-0.11.gradle
View File

@ -15,7 +15,6 @@ apply from: "${rootDir}/gradle/java.gradle"
dependencies { dependencies {
compileOnly group: 'org.apache.kafka', name: 'kafka-streams', version: '0.11.0.0' compileOnly group: 'org.apache.kafka', name: 'kafka-streams', version: '0.11.0.0'
compile project(':dd-trace-ot')
compile project(':dd-java-agent:agent-tooling') compile project(':dd-java-agent:agent-tooling')
compile deps.bytebuddy compile deps.bytebuddy

2
dd-java-agent/instrumentation/mongo-3.1/mongo-3.1.gradle
View File

@ -15,11 +15,11 @@ apply from: "${rootDir}/gradle/java.gradle"
dependencies { dependencies {
compileOnly group: 'org.mongodb', name: 'mongo-java-driver', version: '3.4.2' compileOnly group: 'org.mongodb', name: 'mongo-java-driver', version: '3.4.2'
compile project(':dd-trace-ot')
compile project(':dd-java-agent:agent-tooling') compile project(':dd-java-agent:agent-tooling')
compile deps.bytebuddy compile deps.bytebuddy
compile deps.opentracing compile deps.opentracing
testCompile project(':dd-trace-ot')
testCompile group: 'org.mongodb', name: 'mongo-java-driver', version: '3.4.2' testCompile group: 'org.mongodb', name: 'mongo-java-driver', version: '3.4.2'
} }

1
dd-java-agent/instrumentation/mongo-async-3.3/mongo-async-3.3.gradle
View File

@ -19,7 +19,6 @@ dependencies {
} }
compileOnly group: 'org.mongodb', name: 'mongodb-driver-async', version: '3.4.2' compileOnly group: 'org.mongodb', name: 'mongodb-driver-async', version: '3.4.2'
compile project(':dd-trace-ot')
compile project(':dd-java-agent:agent-tooling') compile project(':dd-java-agent:agent-tooling')
compile deps.bytebuddy compile deps.bytebuddy

1
dd-java-agent/instrumentation/okhttp-3/okhttp-3.gradle
View File

@ -31,7 +31,6 @@ dependencies {
transitive = false transitive = false
} }
compile project(':dd-trace-ot')
compile project(':dd-java-agent:agent-tooling') compile project(':dd-java-agent:agent-tooling')
compile deps.bytebuddy compile deps.bytebuddy

1
dd-java-agent/instrumentation/servlet-2/servlet-2.gradle
View File

@ -18,7 +18,6 @@ dependencies {
transitive = false transitive = false
} }
compile project(':dd-trace-ot')
compile project(':dd-java-agent:agent-tooling') compile project(':dd-java-agent:agent-tooling')
compile deps.bytebuddy compile deps.bytebuddy

1
dd-java-agent/instrumentation/spring-web/spring-web.gradle
View File

@ -19,7 +19,6 @@ dependencies {
// compileOnly group: 'org.springframework', name: 'spring-webmvc', version: '2.5.6' // compileOnly group: 'org.springframework', name: 'spring-webmvc', version: '2.5.6'
// compileOnly group: 'javax.servlet', name: 'servlet-api', version: '2.4' // compileOnly group: 'javax.servlet', name: 'servlet-api', version: '2.4'
compile project(':dd-trace-ot')
compile project(':dd-java-agent:agent-tooling') compile project(':dd-java-agent:agent-tooling')
compile deps.bytebuddy compile deps.bytebuddy

1
dd-java-agent/instrumentation/trace-annotation/trace-annotation.gradle
View File

@ -1,7 +1,6 @@
apply from: "${rootDir}/gradle/java.gradle" apply from: "${rootDir}/gradle/java.gradle"
dependencies { dependencies {
compile project(':dd-trace-ot')
compile project(':dd-trace-api') compile project(':dd-trace-api')
compile project(':dd-java-agent:agent-tooling') compile project(':dd-java-agent:agent-tooling')