diff --git a/dd-java-agent/instrumentation/aws-sdk/aws-sdk.gradle b/dd-java-agent/instrumentation/aws-sdk/aws-sdk.gradle index 02fd22e88d..b4b240d29b 100644 --- a/dd-java-agent/instrumentation/aws-sdk/aws-sdk.gradle +++ b/dd-java-agent/instrumentation/aws-sdk/aws-sdk.gradle @@ -17,7 +17,7 @@ apply from: "${rootDir}/gradle/java.gradle" dependencies { 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 } diff --git a/dd-java-agent/instrumentation/datastax-cassandra-3.2/datastax-cassandra-3.2.gradle b/dd-java-agent/instrumentation/datastax-cassandra-3.2/datastax-cassandra-3.2.gradle index ec7c07bfc0..f935b15843 100644 --- a/dd-java-agent/instrumentation/datastax-cassandra-3.2/datastax-cassandra-3.2.gradle +++ b/dd-java-agent/instrumentation/datastax-cassandra-3.2/datastax-cassandra-3.2.gradle @@ -44,7 +44,7 @@ if (!JavaVersion.current().isJava8Compatible()) { dependencies { 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 } diff --git a/dd-java-agent/instrumentation/okhttp-3/okhttp-3.gradle b/dd-java-agent/instrumentation/okhttp-3/okhttp-3.gradle index 95b0379a46..6c986bb184 100644 --- a/dd-java-agent/instrumentation/okhttp-3/okhttp-3.gradle +++ b/dd-java-agent/instrumentation/okhttp-3/okhttp-3.gradle @@ -27,7 +27,7 @@ if (!JavaVersion.current().isJava8Compatible()) { dependencies { 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 } diff --git a/dd-java-agent/instrumentation/servlet-2/servlet-2.gradle b/dd-java-agent/instrumentation/servlet-2/servlet-2.gradle index be88e6984c..ce5378d2ed 100644 --- a/dd-java-agent/instrumentation/servlet-2/servlet-2.gradle +++ b/dd-java-agent/instrumentation/servlet-2/servlet-2.gradle @@ -14,7 +14,7 @@ apply from: "${rootDir}/gradle/java.gradle" dependencies { 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 } diff --git a/dd-java-agent/instrumentation/servlet-3/servlet-3.gradle b/dd-java-agent/instrumentation/servlet-3/servlet-3.gradle index 2b51871262..9583e775c5 100644 --- a/dd-java-agent/instrumentation/servlet-3/servlet-3.gradle +++ b/dd-java-agent/instrumentation/servlet-3/servlet-3.gradle @@ -15,7 +15,7 @@ apply from: "${rootDir}/gradle/java.gradle" dependencies { 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 } diff --git a/dd-trace-ot/src/main/java/datadog/opentracing/DDTracer.java b/dd-trace-ot/src/main/java/datadog/opentracing/DDTracer.java index 446f32ea2f..14d018818e 100644 --- a/dd-trace-ot/src/main/java/datadog/opentracing/DDTracer.java +++ b/dd-trace-ot/src/main/java/datadog/opentracing/DDTracer.java @@ -14,7 +14,6 @@ import datadog.trace.common.sampling.RateByServiceSampler; import datadog.trace.common.sampling.Sampler; import datadog.trace.common.writer.DDAgentWriter; import datadog.trace.common.writer.DDApi; -import datadog.trace.common.writer.DDApi.ResponseListener; import datadog.trace.common.writer.Writer; import io.opentracing.Scope; import io.opentracing.ScopeManager; @@ -274,16 +273,16 @@ public class DDTracer extends ThreadLocalScopeManager implements io.opentracing. } @Override + @Deprecated public DDSpan startManual() { - final DDSpan span = startSpan(); - log.debug("Starting a new manual span: {}", span); - return span; + return start(); } @Override - @Deprecated public DDSpan start() { - return startManual(); + final DDSpan span = startSpan(); + log.debug("Starting a new span: {}", span); + return span; } @Override diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 408c10c855..7840dcad8c 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -35,7 +35,7 @@ ext { ], bytebuddy : dependencies.create(group: 'net.bytebuddy', name: 'byte-buddy', version: "${version.bytebuddy}"), 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.guava', name: 'guava', version: '19.0'), ],