diff --git a/.circleci/config.yml b/.circleci/config.yml index 9df4649336..08eb35ce14 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -53,5 +53,6 @@ jobs: -Psigning.secretKeyRingFile=/home/circleci/dd-trace-java/.circleci/secring.gpg \ -PbintrayUser=${BINTRAY_USER} \ -PbintrayApiKey=${BINTRAY_API_KEY} \ + -PbuildInfo.build.number=${CIRCLE_BUILD_NUM} \ artifactoryPublish fi diff --git a/.gitignore b/.gitignore index 85df3260dc..62415a1df1 100644 --- a/.gitignore +++ b/.gitignore @@ -7,7 +7,7 @@ target # Gradle # ######### -!/gradle/wrapper/* +!**/gradle/wrapper/* /.gradle **/build/ dd-trace-examples/**/build/ diff --git a/dd-java-agent/src/main/java/io/opentracing/contrib/mongo/TracingCommandListenerFactory.java b/dd-java-agent/src/main/java/io/opentracing/contrib/mongo/TracingCommandListenerFactory.java index 84fccd296d..cc2dbe6cc5 100644 --- a/dd-java-agent/src/main/java/io/opentracing/contrib/mongo/TracingCommandListenerFactory.java +++ b/dd-java-agent/src/main/java/io/opentracing/contrib/mongo/TracingCommandListenerFactory.java @@ -2,6 +2,10 @@ package io.opentracing.contrib.mongo; import io.opentracing.Tracer; +/** + * This class exists purely to bypass the reduction in constructor visibility of + * TracingCommandListener. + */ public class TracingCommandListenerFactory { public static TracingCommandListener create(final Tracer tracer) { diff --git a/dd-trace-examples/async-tracing/gradle/wrapper/gradle-wrapper.jar b/dd-trace-examples/async-tracing/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000..37fa35e944 Binary files /dev/null and b/dd-trace-examples/async-tracing/gradle/wrapper/gradle-wrapper.jar differ diff --git a/dd-trace-examples/dropwizard-mongo-client/gradle/wrapper/gradle-wrapper.jar b/dd-trace-examples/dropwizard-mongo-client/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000..37fa35e944 Binary files /dev/null and b/dd-trace-examples/dropwizard-mongo-client/gradle/wrapper/gradle-wrapper.jar differ diff --git a/dd-trace-examples/rest-spark/gradle/wrapper/gradle-wrapper.jar b/dd-trace-examples/rest-spark/gradle/wrapper/gradle-wrapper.jar index 1ac1c1b0e6..895b7857cc 100644 Binary files a/dd-trace-examples/rest-spark/gradle/wrapper/gradle-wrapper.jar and b/dd-trace-examples/rest-spark/gradle/wrapper/gradle-wrapper.jar differ diff --git a/dd-trace-examples/spring-boot-jdbc/README.md b/dd-trace-examples/spring-boot-jdbc/README.md index 5865fffe23..23f00466cf 100644 --- a/dd-trace-examples/spring-boot-jdbc/README.md +++ b/dd-trace-examples/spring-boot-jdbc/README.md @@ -1,8 +1,8 @@ -## Spring-boot + JDBC (MySQL) example +## Spring-boot + JDBC example ### Purpose This project aims at demonstrating how to instrument legacy code based on the SpringBoot framework -and a MySQL JDBC connection. +and a JDBC connection. We are using the [opentracing contributions](https://github.com/opentracing-contrib) in order to trace: * All the JDBC queries and calls to the DB @@ -15,7 +15,7 @@ at this time. ### Run the demo -The demo consistes into a very simple backend backed by a MySQL db. The Spring Boot application exposes +The demo consistes into a very simple backend backed by an in-memory db. The Spring Boot application exposes 2 endpoints that can be reached via an HTTP request. #### Prerequisites @@ -30,10 +30,8 @@ connection properties are okay. ```properties # file: src/resources/application.properties -spring.datasource.driver-class-name= io.opentracing.contrib.jdbc.TracingDriver -spring.datasource.url= jdbc:tracing:mysql://localhost:3306/springdb -spring.datasource.username=root -spring.datasource.password=root +spring.datasource.driver-class-name=io.opentracing.contrib.jdbc.TracingDriver +spring.datasource.url=jdbc:tracing:h2:mem:spring-test ``` ```yaml diff --git a/dd-trace-examples/spring-boot-jdbc/gradle/wrapper/gradle-wrapper.jar b/dd-trace-examples/spring-boot-jdbc/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000..37fa35e944 Binary files /dev/null and b/dd-trace-examples/spring-boot-jdbc/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/publish.gradle b/gradle/publish.gradle index 4606a3ea15..96d31f0cbd 100644 --- a/gradle/publish.gradle +++ b/gradle/publish.gradle @@ -80,7 +80,6 @@ artifactoryPublish { task -> } defaults { publishConfigs('archives') - publishIvy = false } } } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 37fa35e944..895b7857cc 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ