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 #198 from DataDog/tyler/update 

Update dependencies
This commit is contained in:
Tyler Benson 2018-01-22 16:47:50 -05:00 committed by GitHub
parent b0737e6a88 92b6cc86f6
commit 9acbe5710e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,7 +17,7 @@ apply from: "${rootDir}/gradle/java.gradle"
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('io.opentracing.contrib:opentracing-aws-sdk:0.0.3-RC1') { compile('io.opentracing.contrib:opentracing-aws-sdk:0.0.3') {
transitive = false transitive = false
} }

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

@ -44,7 +44,7 @@ if (!JavaVersion.current().isJava8Compatible()) {
dependencies { dependencies {
compileOnly group: 'com.datastax.cassandra', name: 'cassandra-driver-core', version: '3.2.0' compileOnly group: 'com.datastax.cassandra', name: 'cassandra-driver-core', version: '3.2.0'
compile('io.opentracing.contrib:opentracing-cassandra-driver:0.0.3-RC1') { compile('io.opentracing.contrib:opentracing-cassandra-driver:0.0.3') {
transitive = false transitive = false
} }

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

@ -27,7 +27,7 @@ if (!JavaVersion.current().isJava8Compatible()) {
dependencies { dependencies {
compileOnly group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.0.0' compileOnly group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.0.0'
compile('io.opentracing.contrib:opentracing-okhttp3:0.1.0-RC1') { compile('io.opentracing.contrib:opentracing-okhttp3:0.1.0') {
transitive = false transitive = false
} }

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

@ -14,7 +14,7 @@ apply from: "${rootDir}/gradle/java.gradle"
dependencies { dependencies {
compileOnly group: 'javax.servlet', name: 'servlet-api', version: '2.3' compileOnly group: 'javax.servlet', name: 'servlet-api', version: '2.3'
compile('io.opentracing.contrib:opentracing-web-servlet-filter:0.1.0-RC1') { compile('io.opentracing.contrib:opentracing-web-servlet-filter:0.1.0') {
transitive = false transitive = false
} }

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

@ -15,7 +15,7 @@ apply from: "${rootDir}/gradle/java.gradle"
dependencies { dependencies {
compileOnly group: 'javax.servlet', name: 'javax.servlet-api', version: '3.0.1' compileOnly group: 'javax.servlet', name: 'javax.servlet-api', version: '3.0.1'
compile('io.opentracing.contrib:opentracing-web-servlet-filter:0.1.0-RC1') { compile('io.opentracing.contrib:opentracing-web-servlet-filter:0.1.0') {
transitive = false transitive = false
} }

11
dd-trace-ot/src/main/java/datadog/opentracing/DDTracer.java
View File

@ -14,7 +14,6 @@ import datadog.trace.common.sampling.RateByServiceSampler;
import datadog.trace.common.sampling.Sampler; import datadog.trace.common.sampling.Sampler;
import datadog.trace.common.writer.DDAgentWriter; import datadog.trace.common.writer.DDAgentWriter;
import datadog.trace.common.writer.DDApi; import datadog.trace.common.writer.DDApi;
import datadog.trace.common.writer.DDApi.ResponseListener;
import datadog.trace.common.writer.Writer; import datadog.trace.common.writer.Writer;
import io.opentracing.Scope; import io.opentracing.Scope;
import io.opentracing.ScopeManager; import io.opentracing.ScopeManager;
@ -274,16 +273,16 @@ public class DDTracer extends ThreadLocalScopeManager implements io.opentracing.
} }
@Override @Override
@Deprecated
public DDSpan startManual() { public DDSpan startManual() {
final DDSpan span = startSpan(); return start();
log.debug("Starting a new manual span: {}", span);
return span;
} }
@Override @Override
@Deprecated
public DDSpan start() { public DDSpan start() {
return startManual(); final DDSpan span = startSpan();
log.debug("Starting a new span: {}", span);
return span;
} }
@Override @Override

2
gradle/dependencies.gradle
View File

@ -35,7 +35,7 @@ ext {
], ],
bytebuddy : dependencies.create(group: 'net.bytebuddy', name: 'byte-buddy', version: "${version.bytebuddy}"), bytebuddy : dependencies.create(group: 'net.bytebuddy', name: 'byte-buddy', version: "${version.bytebuddy}"),
autoservice: [ autoservice: [
dependencies.create(group: 'com.google.auto.service', name: 'auto-service', version: '1.0-rc3'), dependencies.create(group: 'com.google.auto.service', name: 'auto-service', version: '1.0-rc4'),
dependencies.create(group: 'com.google.auto', name: 'auto-common', version: '0.3'), dependencies.create(group: 'com.google.auto', name: 'auto-common', version: '0.3'),
dependencies.create(group: 'com.google.guava', name: 'guava', version: '19.0'), dependencies.create(group: 'com.google.guava', name: 'guava', version: '19.0'),
], ],