From 1a41751e34288381f0cf0c979fae17589894b42e Mon Sep 17 00:00:00 2001 From: Guillaume Polaert Date: Wed, 31 May 2017 15:25:02 +0200 Subject: [PATCH 1/6] refactoring skel --- dd-java-agent-ittests/pom.xml | 199 ++++++++++++++++++ .../instrument/AWSInstrumentationTest.java | 0 .../instrument/ApacheHTTPClientTest.java | 0 .../JettyServletInstrumentationTest.java | 0 .../MongoClientInstrumentationTest.java | 0 .../instrument/OkHTTPInstrumentationTest.java | 0 .../TomcatServletInstrumentationTest.java | 0 .../contrib/agent/SayTracedHello.java | 0 .../agent/TraceAnnotationsManagerTest.java | 0 .../src/test/resources/logback.xml | 16 ++ dd-java-agent/pom.xml | 178 ++-------------- dd-trace-examples/async-tracing/pom.xml | 39 +--- .../dropwizard-mongo-client/pom.xml | 28 +-- dd-trace-examples/pom.xml | 28 +-- dd-trace-examples/spring-boot-jdbc/pom.xml | 43 +--- pom.xml | 49 +++-- 16 files changed, 298 insertions(+), 282 deletions(-) create mode 100644 dd-java-agent-ittests/pom.xml rename {dd-java-agent => dd-java-agent-ittests}/src/test/java/com/datadoghq/trace/instrument/AWSInstrumentationTest.java (100%) rename {dd-java-agent => dd-java-agent-ittests}/src/test/java/com/datadoghq/trace/instrument/ApacheHTTPClientTest.java (100%) rename {dd-java-agent => dd-java-agent-ittests}/src/test/java/com/datadoghq/trace/instrument/JettyServletInstrumentationTest.java (100%) rename {dd-java-agent => dd-java-agent-ittests}/src/test/java/com/datadoghq/trace/instrument/MongoClientInstrumentationTest.java (100%) rename {dd-java-agent => dd-java-agent-ittests}/src/test/java/com/datadoghq/trace/instrument/OkHTTPInstrumentationTest.java (100%) rename {dd-java-agent => dd-java-agent-ittests}/src/test/java/com/datadoghq/trace/instrument/TomcatServletInstrumentationTest.java (100%) rename {dd-java-agent => dd-java-agent-ittests}/src/test/java/io/opentracing/contrib/agent/SayTracedHello.java (100%) rename {dd-java-agent => dd-java-agent-ittests}/src/test/java/io/opentracing/contrib/agent/TraceAnnotationsManagerTest.java (100%) create mode 100644 dd-java-agent-ittests/src/test/resources/logback.xml diff --git a/dd-java-agent-ittests/pom.xml b/dd-java-agent-ittests/pom.xml new file mode 100644 index 00000000000..965d0bb51e8 --- /dev/null +++ b/dd-java-agent-ittests/pom.xml @@ -0,0 +1,199 @@ + + 4.0.0 + + + com.datadoghq + dd-trace-java + 0.0.2-SNAPSHOT + + + dd-java-agent-ittests + jar + dd-java-agent-ittests + Datadog Java Agent integration tests + https://github.com/datadog/dd-trace-java + + + + 0.0.2-SNAPSHOT + + + + + + + com.datadoghq + dd-java-agent + ${dd-trace.version} + test + + + + + io.opentracing + opentracing-mock + ${opentracing.version} + test + + + junit + junit + 4.12 + test + + + org.assertj + assertj-core + 3.6.2 + test + + + org.mockito + mockito-core + 2.7.22 + test + + + + + org.mongodb + mongo-java-driver + 3.4.2 + test + + + + + org.eclipse.jetty + jetty-server + 9.4.1.v20170120 + test + + + org.eclipse.jetty + jetty-servlet + 9.4.1.v20170120 + test + + + + + org.apache.tomcat.embed + tomcat-embed-core + 8.0.41 + test + + + org.apache.tomcat.embed + tomcat-embed-jasper + 8.0.41 + test + + + + + com.amazonaws + aws-java-sdk + 1.11.132 + test + + + org.apache.httpcomponents + httpclient + + + + + + + com.squareup.okhttp3 + okhttp + 3.6.0 + test + + + + + org.apache.httpcomponents + httpclient + 4.5.3 + test + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.10.4 + + + attach-javadocs + + jar + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.20 + + + true + + *Test.java + + 3 + false + -Xmx1g -Xms1g -XX:MaxPermSize=512m -Dorg.jboss.byteman.verbose=true + -javaagent:${M2_REPO}/com/datadoghq/dd-java-agent/${project.version}/dd-java-agent-${project.version}.jar + + target/FORK_DIRECTORY_${surefire.forkNumber} + + + + org.apache.maven.plugins + maven-shade-plugin + 2.4.3 + + + package + + shade + + + + + + + + + + + otarules.btm + + + + io.opentracing.contrib.agent.AnnotationsTracingAgent + io.opentracing.contrib.agent.AnnotationsTracingAgent + + true + true + ./${project.artifactId}.jar + + + + + + + + + + + \ No newline at end of file diff --git a/dd-java-agent/src/test/java/com/datadoghq/trace/instrument/AWSInstrumentationTest.java b/dd-java-agent-ittests/src/test/java/com/datadoghq/trace/instrument/AWSInstrumentationTest.java similarity index 100% rename from dd-java-agent/src/test/java/com/datadoghq/trace/instrument/AWSInstrumentationTest.java rename to dd-java-agent-ittests/src/test/java/com/datadoghq/trace/instrument/AWSInstrumentationTest.java diff --git a/dd-java-agent/src/test/java/com/datadoghq/trace/instrument/ApacheHTTPClientTest.java b/dd-java-agent-ittests/src/test/java/com/datadoghq/trace/instrument/ApacheHTTPClientTest.java similarity index 100% rename from dd-java-agent/src/test/java/com/datadoghq/trace/instrument/ApacheHTTPClientTest.java rename to dd-java-agent-ittests/src/test/java/com/datadoghq/trace/instrument/ApacheHTTPClientTest.java diff --git a/dd-java-agent/src/test/java/com/datadoghq/trace/instrument/JettyServletInstrumentationTest.java b/dd-java-agent-ittests/src/test/java/com/datadoghq/trace/instrument/JettyServletInstrumentationTest.java similarity index 100% rename from dd-java-agent/src/test/java/com/datadoghq/trace/instrument/JettyServletInstrumentationTest.java rename to dd-java-agent-ittests/src/test/java/com/datadoghq/trace/instrument/JettyServletInstrumentationTest.java diff --git a/dd-java-agent/src/test/java/com/datadoghq/trace/instrument/MongoClientInstrumentationTest.java b/dd-java-agent-ittests/src/test/java/com/datadoghq/trace/instrument/MongoClientInstrumentationTest.java similarity index 100% rename from dd-java-agent/src/test/java/com/datadoghq/trace/instrument/MongoClientInstrumentationTest.java rename to dd-java-agent-ittests/src/test/java/com/datadoghq/trace/instrument/MongoClientInstrumentationTest.java diff --git a/dd-java-agent/src/test/java/com/datadoghq/trace/instrument/OkHTTPInstrumentationTest.java b/dd-java-agent-ittests/src/test/java/com/datadoghq/trace/instrument/OkHTTPInstrumentationTest.java similarity index 100% rename from dd-java-agent/src/test/java/com/datadoghq/trace/instrument/OkHTTPInstrumentationTest.java rename to dd-java-agent-ittests/src/test/java/com/datadoghq/trace/instrument/OkHTTPInstrumentationTest.java diff --git a/dd-java-agent/src/test/java/com/datadoghq/trace/instrument/TomcatServletInstrumentationTest.java b/dd-java-agent-ittests/src/test/java/com/datadoghq/trace/instrument/TomcatServletInstrumentationTest.java similarity index 100% rename from dd-java-agent/src/test/java/com/datadoghq/trace/instrument/TomcatServletInstrumentationTest.java rename to dd-java-agent-ittests/src/test/java/com/datadoghq/trace/instrument/TomcatServletInstrumentationTest.java diff --git a/dd-java-agent/src/test/java/io/opentracing/contrib/agent/SayTracedHello.java b/dd-java-agent-ittests/src/test/java/io/opentracing/contrib/agent/SayTracedHello.java similarity index 100% rename from dd-java-agent/src/test/java/io/opentracing/contrib/agent/SayTracedHello.java rename to dd-java-agent-ittests/src/test/java/io/opentracing/contrib/agent/SayTracedHello.java diff --git a/dd-java-agent/src/test/java/io/opentracing/contrib/agent/TraceAnnotationsManagerTest.java b/dd-java-agent-ittests/src/test/java/io/opentracing/contrib/agent/TraceAnnotationsManagerTest.java similarity index 100% rename from dd-java-agent/src/test/java/io/opentracing/contrib/agent/TraceAnnotationsManagerTest.java rename to dd-java-agent-ittests/src/test/java/io/opentracing/contrib/agent/TraceAnnotationsManagerTest.java diff --git a/dd-java-agent-ittests/src/test/resources/logback.xml b/dd-java-agent-ittests/src/test/resources/logback.xml new file mode 100644 index 00000000000..f8fbe556c02 --- /dev/null +++ b/dd-java-agent-ittests/src/test/resources/logback.xml @@ -0,0 +1,16 @@ + + + + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + + + + \ No newline at end of file diff --git a/dd-java-agent/pom.xml b/dd-java-agent/pom.xml index befffb8accd..c8145480eab 100644 --- a/dd-java-agent/pom.xml +++ b/dd-java-agent/pom.xml @@ -15,25 +15,30 @@ + + 0.0.2-SNAPSHOT + + 0.22.0 0.0.12 0.0.8 0.0.1 0.0.4 - 0.22.0 - 1.8 - 0.0.2-SNAPSHOT + 0.0.1 + 0.0.1 + 0.0.1 + + 1.7 - - + com.datadoghq dd-trace - ${ot.dd-trace.version} + ${dd-trace.version} - + io.opentracing.contrib opentracing-agent @@ -63,6 +68,8 @@ opentracing-web-servlet-filter ${ot.contrib.webservlet.version} + + io.opentracing.contrib opentracing-mongo-driver @@ -78,11 +85,12 @@ + io.opentracing.contrib opentracing-jdbc - 0.0.1 + ${ot.contrib.jdbc.version} @@ -102,7 +110,7 @@ io.opentracing.contrib opentracing-aws-sdk - 0.0.1 + ${ot.contrib.aws.version} com.amazonaws @@ -115,104 +123,7 @@ io.opentracing.contrib opentracing-apache-httpclient - 0.0.1 - - - org.apache.httpcomponents - httpclient - - - - - - - io.opentracing.contrib - opentracing-elasticsearch-client - 0.0.1 - - - org.apache.logging.log4j - log4j-core - - - org.elasticsearch.client - transport - - - org.apache.logging.log4j - log4j-api - - - - - - - io.opentracing - opentracing-mock - ${opentracing.version} - test - - - junit - junit - 4.12 - test - - - org.assertj - assertj-core - 3.6.2 - test - - - org.mockito - mockito-core - 2.7.22 - test - - - - - org.mongodb - mongo-java-driver - 3.4.2 - test - - - - - org.eclipse.jetty - jetty-server - 9.4.1.v20170120 - test - - - org.eclipse.jetty - jetty-servlet - 9.4.1.v20170120 - test - - - - - org.apache.tomcat.embed - tomcat-embed-core - 8.0.41 - test - - - org.apache.tomcat.embed - tomcat-embed-jasper - 8.0.41 - test - - - - - com.amazonaws - aws-java-sdk - 1.11.132 - test + ${ot.contrib.httpclient.version} org.apache.httpcomponents @@ -221,26 +132,11 @@ - - - com.squareup.okhttp3 - okhttp - 3.6.0 - test - - - - - org.apache.httpcomponents - httpclient - 4.5.3 - test - - ${project.artifactId} + org.apache.maven.plugins maven-compiler-plugin @@ -250,36 +146,6 @@ ${java.version} - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.4 - - - attach-javadocs - - jar - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.20 - - true - - *Test.java - - 3 - false - -Xmx1g -Xms1g -XX:MaxPermSize=512m -Dorg.jboss.byteman.verbose=true - -javaagent:${M2_REPO}/com/datadoghq/dd-java-agent/${project.version}/dd-java-agent-${project.version}.jar - - target/FORK_DIRECTORY_${surefire.forkNumber} - - org.apache.maven.plugins maven-shade-plugin @@ -291,12 +157,6 @@ shade - - - - - - otarules.btm diff --git a/dd-trace-examples/async-tracing/pom.xml b/dd-trace-examples/async-tracing/pom.xml index 12a2b3d1aae..e7ef1e3a6b0 100644 --- a/dd-trace-examples/async-tracing/pom.xml +++ b/dd-trace-examples/async-tracing/pom.xml @@ -10,51 +10,18 @@ async-tracing async-tracing - http://maven.apache.org - - - - - com.datadoghq dd-trace - ${ot.dd-trace.version} + ${dd-trace.version} - - io.opentracing.contrib opentracing-spanmanager - 0.0.5 + ${opentracing.spanmanager.version} - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.4 - - - attach-javadocs - - jar - - - - - - org.apache.maven.plugins - maven-deploy-plugin - 2.8.2 - - true - - - - + diff --git a/dd-trace-examples/dropwizard-mongo-client/pom.xml b/dd-trace-examples/dropwizard-mongo-client/pom.xml index 5044e3578df..a4e71a49bd5 100644 --- a/dd-trace-examples/dropwizard-mongo-client/pom.xml +++ b/dd-trace-examples/dropwizard-mongo-client/pom.xml @@ -18,7 +18,7 @@ com.datadoghq dd-java-agent - ${ot.dd-trace.version} + ${dd-trace.version} @@ -39,30 +39,4 @@ - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.4 - - - attach-javadocs - - jar - - - - - - org.apache.maven.plugins - maven-deploy-plugin - 2.8.2 - - true - - - - - diff --git a/dd-trace-examples/pom.xml b/dd-trace-examples/pom.xml index c18a25f92ee..2bbb76994ab 100644 --- a/dd-trace-examples/pom.xml +++ b/dd-trace-examples/pom.xml @@ -1,5 +1,6 @@ - + dd-trace-java com.datadoghq @@ -16,32 +17,31 @@ spring-boot-jdbc + + + 0.0.2-SNAPSHOT + + 0.0.5 + + 1.8 + + - - org.apache.maven.plugins - maven-deploy-plugin - 2.8.2 - - true - - maven-compiler-plugin 3.6.1 - 1.8 - 1.8 + ${java.version} + ${java.version} true 512m - false - + false - \ No newline at end of file diff --git a/dd-trace-examples/spring-boot-jdbc/pom.xml b/dd-trace-examples/spring-boot-jdbc/pom.xml index c38f96c6c64..08580869d3b 100644 --- a/dd-trace-examples/spring-boot-jdbc/pom.xml +++ b/dd-trace-examples/spring-boot-jdbc/pom.xml @@ -58,38 +58,17 @@ - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.4 - - - attach-javadocs - - jar - - - - - - org.apache.maven.plugins - maven-deploy-plugin - 2.8.2 - - true - - - - org.apache.maven.plugins - maven-resources-plugin - 2.7 - - - @ - - false - - + + + + + + + + + + + org.springframework.boot spring-boot-maven-plugin diff --git a/pom.xml b/pom.xml index 80af26ee17f..f06353d784b 100644 --- a/pom.xml +++ b/pom.xml @@ -6,17 +6,12 @@ dd-trace-java 0.0.2-SNAPSHOT pom + + dd-trace-java Datadog tracing in Java https://github.com/datadog/dd-trace-java - - - 0.22.0 - 1.7 - 0.0.1-SNAPSHOT - - The MIT License (MIT) @@ -25,13 +20,6 @@ - - https://github.com/datadog/dd-trace-java - scm:git:git://github.com/datadog/dd-trace-java.git - scm:git:git@github.com:datadog/dd-trace-java.git - v0.0.1 - - datadog @@ -40,12 +28,23 @@ + + https://github.com/datadog/dd-trace-java + scm:git:git://github.com/datadog/dd-trace-java.git + scm:git:git@github.com:datadog/dd-trace-java.git + + dd-trace dd-java-agent + dd-java-agent-ittests dd-trace-examples + + 0.22.0 + 1.7 + @@ -60,6 +59,7 @@ + org.apache.maven.plugins maven-source-plugin @@ -73,6 +73,23 @@ + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.10.4 + + + attach-javadocs + + jar + + + + + + org.apache.maven.plugins maven-gpg-plugin @@ -87,6 +104,8 @@ + + org.apache.maven.plugins maven-compiler-plugin @@ -96,6 +115,8 @@ ${java.version} + + org.sonatype.plugins nexus-staging-maven-plugin From 69b620725e675b07a9a925dd854ce08a1a416c6c Mon Sep 17 00:00:00 2001 From: Guillaume Polaert Date: Wed, 31 May 2017 15:31:09 +0200 Subject: [PATCH 2/6] [maven-release-plugin] prepare release v0.0.2 --- dd-java-agent-ittests/pom.xml | 13 +++++-------- dd-java-agent/pom.xml | 4 ++-- dd-trace-examples/async-tracing/pom.xml | 2 +- dd-trace-examples/dropwizard-mongo-client/pom.xml | 2 +- dd-trace-examples/pom.xml | 5 ++--- dd-trace-examples/spring-boot-jdbc/pom.xml | 2 +- dd-trace/pom.xml | 2 +- pom.xml | 5 +++-- 8 files changed, 16 insertions(+), 19 deletions(-) diff --git a/dd-java-agent-ittests/pom.xml b/dd-java-agent-ittests/pom.xml index 965d0bb51e8..4f5171a2a1b 100644 --- a/dd-java-agent-ittests/pom.xml +++ b/dd-java-agent-ittests/pom.xml @@ -1,11 +1,10 @@ - + 4.0.0 com.datadoghq dd-trace-java - 0.0.2-SNAPSHOT + 0.0.2 dd-java-agent-ittests @@ -16,7 +15,7 @@ - 0.0.2-SNAPSHOT + 0.0.2 @@ -173,12 +172,10 @@ - + otarules.btm - + io.opentracing.contrib.agent.AnnotationsTracingAgent io.opentracing.contrib.agent.AnnotationsTracingAgent diff --git a/dd-java-agent/pom.xml b/dd-java-agent/pom.xml index c8145480eab..f11835704e0 100644 --- a/dd-java-agent/pom.xml +++ b/dd-java-agent/pom.xml @@ -4,7 +4,7 @@ com.datadoghq dd-trace-java - 0.0.2-SNAPSHOT + 0.0.2 dd-java-agent @@ -16,7 +16,7 @@ - 0.0.2-SNAPSHOT + 0.0.2 0.22.0 0.0.12 diff --git a/dd-trace-examples/async-tracing/pom.xml b/dd-trace-examples/async-tracing/pom.xml index e7ef1e3a6b0..27cc8534b88 100644 --- a/dd-trace-examples/async-tracing/pom.xml +++ b/dd-trace-examples/async-tracing/pom.xml @@ -4,7 +4,7 @@ com.datadoghq dd-trace-examples - 0.0.2-SNAPSHOT + 0.0.2 async-tracing diff --git a/dd-trace-examples/dropwizard-mongo-client/pom.xml b/dd-trace-examples/dropwizard-mongo-client/pom.xml index a4e71a49bd5..97f165ff3f0 100644 --- a/dd-trace-examples/dropwizard-mongo-client/pom.xml +++ b/dd-trace-examples/dropwizard-mongo-client/pom.xml @@ -5,7 +5,7 @@ com.datadoghq dd-trace-examples - 0.0.2-SNAPSHOT + 0.0.2 dropwizard-mongo-client diff --git a/dd-trace-examples/pom.xml b/dd-trace-examples/pom.xml index 2bbb76994ab..5a772d032bc 100644 --- a/dd-trace-examples/pom.xml +++ b/dd-trace-examples/pom.xml @@ -1,10 +1,9 @@ - + dd-trace-java com.datadoghq - 0.0.2-SNAPSHOT + 0.0.2 4.0.0 diff --git a/dd-trace-examples/spring-boot-jdbc/pom.xml b/dd-trace-examples/spring-boot-jdbc/pom.xml index 08580869d3b..e4767c6a016 100644 --- a/dd-trace-examples/spring-boot-jdbc/pom.xml +++ b/dd-trace-examples/spring-boot-jdbc/pom.xml @@ -5,7 +5,7 @@ com.datadoghq dd-trace-examples - 0.0.2-SNAPSHOT + 0.0.2 spring-boot-jdbc diff --git a/dd-trace/pom.xml b/dd-trace/pom.xml index f2a071c363a..a53e1e91f97 100644 --- a/dd-trace/pom.xml +++ b/dd-trace/pom.xml @@ -5,7 +5,7 @@ com.datadoghq dd-trace-java - 0.0.2-SNAPSHOT + 0.0.2 dd-trace diff --git a/pom.xml b/pom.xml index f06353d784b..214990acc40 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.datadoghq dd-trace-java - 0.0.2-SNAPSHOT + 0.0.2 pom @@ -32,7 +32,8 @@ https://github.com/datadog/dd-trace-java scm:git:git://github.com/datadog/dd-trace-java.git scm:git:git@github.com:datadog/dd-trace-java.git - + v0.0.2 + dd-trace From 1bb36a82af2ac69c07fc044e4e9874c1d5c1cb12 Mon Sep 17 00:00:00 2001 From: Guillaume Polaert Date: Wed, 31 May 2017 15:31:26 +0200 Subject: [PATCH 3/6] [maven-release-plugin] prepare for next development iteration --- dd-java-agent-ittests/pom.xml | 4 ++-- dd-java-agent/pom.xml | 4 ++-- dd-trace-examples/async-tracing/pom.xml | 2 +- dd-trace-examples/dropwizard-mongo-client/pom.xml | 2 +- dd-trace-examples/pom.xml | 2 +- dd-trace-examples/spring-boot-jdbc/pom.xml | 2 +- dd-trace/pom.xml | 2 +- pom.xml | 4 ++-- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dd-java-agent-ittests/pom.xml b/dd-java-agent-ittests/pom.xml index 4f5171a2a1b..64ca24a18c7 100644 --- a/dd-java-agent-ittests/pom.xml +++ b/dd-java-agent-ittests/pom.xml @@ -4,7 +4,7 @@ com.datadoghq dd-trace-java - 0.0.2 + 0.0.3-SNAPSHOT dd-java-agent-ittests @@ -15,7 +15,7 @@ - 0.0.2 + 0.0.3-SNAPSHOT diff --git a/dd-java-agent/pom.xml b/dd-java-agent/pom.xml index f11835704e0..508cac438eb 100644 --- a/dd-java-agent/pom.xml +++ b/dd-java-agent/pom.xml @@ -4,7 +4,7 @@ com.datadoghq dd-trace-java - 0.0.2 + 0.0.3-SNAPSHOT dd-java-agent @@ -16,7 +16,7 @@ - 0.0.2 + 0.0.3-SNAPSHOT 0.22.0 0.0.12 diff --git a/dd-trace-examples/async-tracing/pom.xml b/dd-trace-examples/async-tracing/pom.xml index 27cc8534b88..aff7debb79f 100644 --- a/dd-trace-examples/async-tracing/pom.xml +++ b/dd-trace-examples/async-tracing/pom.xml @@ -4,7 +4,7 @@ com.datadoghq dd-trace-examples - 0.0.2 + 0.0.3-SNAPSHOT async-tracing diff --git a/dd-trace-examples/dropwizard-mongo-client/pom.xml b/dd-trace-examples/dropwizard-mongo-client/pom.xml index 97f165ff3f0..a754b8633aa 100644 --- a/dd-trace-examples/dropwizard-mongo-client/pom.xml +++ b/dd-trace-examples/dropwizard-mongo-client/pom.xml @@ -5,7 +5,7 @@ com.datadoghq dd-trace-examples - 0.0.2 + 0.0.3-SNAPSHOT dropwizard-mongo-client diff --git a/dd-trace-examples/pom.xml b/dd-trace-examples/pom.xml index 5a772d032bc..66c5568628e 100644 --- a/dd-trace-examples/pom.xml +++ b/dd-trace-examples/pom.xml @@ -3,7 +3,7 @@ dd-trace-java com.datadoghq - 0.0.2 + 0.0.3-SNAPSHOT 4.0.0 diff --git a/dd-trace-examples/spring-boot-jdbc/pom.xml b/dd-trace-examples/spring-boot-jdbc/pom.xml index e4767c6a016..ccfabad1ba2 100644 --- a/dd-trace-examples/spring-boot-jdbc/pom.xml +++ b/dd-trace-examples/spring-boot-jdbc/pom.xml @@ -5,7 +5,7 @@ com.datadoghq dd-trace-examples - 0.0.2 + 0.0.3-SNAPSHOT spring-boot-jdbc diff --git a/dd-trace/pom.xml b/dd-trace/pom.xml index a53e1e91f97..67c90e5dda6 100644 --- a/dd-trace/pom.xml +++ b/dd-trace/pom.xml @@ -5,7 +5,7 @@ com.datadoghq dd-trace-java - 0.0.2 + 0.0.3-SNAPSHOT dd-trace diff --git a/pom.xml b/pom.xml index 214990acc40..b519ea2d93b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.datadoghq dd-trace-java - 0.0.2 + 0.0.3-SNAPSHOT pom @@ -32,7 +32,7 @@ https://github.com/datadog/dd-trace-java scm:git:git://github.com/datadog/dd-trace-java.git scm:git:git@github.com:datadog/dd-trace-java.git - v0.0.2 + HEAD From fcb214b9214393fafd39c08e8066bf4b4af7a9de Mon Sep 17 00:00:00 2001 From: Guillaume Polaert Date: Wed, 31 May 2017 15:37:06 +0200 Subject: [PATCH 4/6] fix version deps --- dd-java-agent/README.md | 4 ++-- dd-trace-examples/dropwizard-mongo-client/README.md | 4 ++-- dd-trace-examples/spring-boot-jdbc/README.md | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dd-java-agent/README.md b/dd-java-agent/README.md index cf13cdd6e55..c8e399d88bd 100644 --- a/dd-java-agent/README.md +++ b/dd-java-agent/README.md @@ -35,13 +35,13 @@ To instrument your project or your servers you simply have to declare the provid ``` # use latest version -curl -OL http://central.maven.org/maven2/com/datadoghq/dd-java-agent/0.0.1/dd-java-agent-0.0.1.jar +curl -OL http://central.maven.org/maven2/com/datadoghq/dd-java-agent/{version}/dd-java-agent-{version}.jar ``` - Then add the following JVM argument when launching your application (in IDE, using Maven run or simply in collaboration with the `>java -jar` command): ``` --javaagent:/path/to/the/dd-java-agent-0.0.1.jar +-javaagent:/path/to/the/dd-java-agent-{version}.jar ``` That's it! If you did this properly the agent was executed at pre-main, had detected and instrumented the supported libraries and custom traces. You should then see traces on [Datadog APM](https://app.datadoghq.com/apm/search). diff --git a/dd-trace-examples/dropwizard-mongo-client/README.md b/dd-trace-examples/dropwizard-mongo-client/README.md index d0c8fc0e191..02f0e890361 100644 --- a/dd-trace-examples/dropwizard-mongo-client/README.md +++ b/dd-trace-examples/dropwizard-mongo-client/README.md @@ -28,11 +28,11 @@ First, get the latest version of the dd-java-agent: ``` # Use latest version -curl -OL http://central.maven.org/maven2/com/datadoghq/dd-java-agent/0.0.1/dd-java-agent-0.0.1.jar +curl -OL http://central.maven.org/maven2/com/datadoghq/dd-java-agent/{version}/dd-java-agent-{version}.jar ``` Then, add the agent to the JVM. That can be done by providing the following argument: -`java -javaagent:/path/to/dd-java-agent-0.0.1.jar ...`. +`java -javaagent:/path/to/dd-java-agent-{version}.jar ...`. ### Generate traces diff --git a/dd-trace-examples/spring-boot-jdbc/README.md b/dd-trace-examples/spring-boot-jdbc/README.md index e85934db44e..95924c3471a 100644 --- a/dd-trace-examples/spring-boot-jdbc/README.md +++ b/dd-trace-examples/spring-boot-jdbc/README.md @@ -20,12 +20,12 @@ Each contribution hides the complexity to the developers. If you want to enable tracing you have to launch the application with the datadog java agent. -That can be done by providing the following JVM argument (assuming the `M2_REPO` env variable is set and we run version `0.0.1`): -`-javaagent:${M2_REPO}/com/datadoghq/dd-java-agent/0.0.1/dd-java-agent-0.0.1.jar`. +That can be done by providing the following JVM argument (assuming the `M2_REPO` env variable is set and we run version `{version}`): +`-javaagent:${M2_REPO}/com/datadoghq/dd-java-agent/{version}/dd-java-agent-{version}.jar`. There are 2 ways to test it: -- Either with Maven: `mvn spring-boot:run -Djavaagent:${M2_REPO}/com/datadoghq/dd-java-agent/0.0.1/dd-java-agent-0.0.1.jar` +- Either with Maven: `mvn spring-boot:run -Djavaagent:${M2_REPO}/com/datadoghq/dd-java-agent/{version}/dd-java-agent-{version}.jar` - Or if you prefer with your IDE providing the java agent command From c4f35a9a5af4c625104680de7f235b7514b00bea Mon Sep 17 00:00:00 2001 From: Guillaume Polaert Date: Wed, 31 May 2017 15:51:39 +0200 Subject: [PATCH 5/6] updating manualy some dep issues --- dd-trace-examples/async-tracing/pom.xml | 50 +++++++++++-------- .../dropwizard-mongo-client/pom.xml | 5 ++ dd-trace-examples/pom.xml | 4 -- 3 files changed, 34 insertions(+), 25 deletions(-) diff --git a/dd-trace-examples/async-tracing/pom.xml b/dd-trace-examples/async-tracing/pom.xml index aff7debb79f..6473ea35f59 100644 --- a/dd-trace-examples/async-tracing/pom.xml +++ b/dd-trace-examples/async-tracing/pom.xml @@ -1,27 +1,35 @@ - - 4.0.0 - - com.datadoghq - dd-trace-examples - 0.0.3-SNAPSHOT - + + 4.0.0 + + com.datadoghq + dd-trace-examples + 0.0.3-SNAPSHOT + - async-tracing - async-tracing + async-tracing + async-tracing + + + + 0.0.3-SNAPSHOT + + 0.0.5 + - - - com.datadoghq - dd-trace - ${dd-trace.version} - - - io.opentracing.contrib - opentracing-spanmanager - ${opentracing.spanmanager.version} - - + + + com.datadoghq + dd-trace + ${dd-trace.version} + + + io.opentracing.contrib + opentracing-spanmanager + ${opentracing.spanmanager.version} + + diff --git a/dd-trace-examples/dropwizard-mongo-client/pom.xml b/dd-trace-examples/dropwizard-mongo-client/pom.xml index a754b8633aa..145807e99e8 100644 --- a/dd-trace-examples/dropwizard-mongo-client/pom.xml +++ b/dd-trace-examples/dropwizard-mongo-client/pom.xml @@ -12,6 +12,11 @@ dropwizard-mongo-client jar + + + 0.0.3-SNAPSHOT + + diff --git a/dd-trace-examples/pom.xml b/dd-trace-examples/pom.xml index 66c5568628e..644929fb90c 100644 --- a/dd-trace-examples/pom.xml +++ b/dd-trace-examples/pom.xml @@ -17,10 +17,6 @@ - - 0.0.2-SNAPSHOT - - 0.0.5 1.8 From cbf4e0faa0f47fc999536d58f1c78581fedd2f70 Mon Sep 17 00:00:00 2001 From: Guillaume Polaert Date: Wed, 31 May 2017 16:27:42 +0200 Subject: [PATCH 6/6] updating manualy some dep issues --- dd-trace-examples/async-tracing/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dd-trace-examples/async-tracing/pom.xml b/dd-trace-examples/async-tracing/pom.xml index 6473ea35f59..80b78c8f942 100644 --- a/dd-trace-examples/async-tracing/pom.xml +++ b/dd-trace-examples/async-tracing/pom.xml @@ -10,7 +10,7 @@ async-tracing async-tracing - + 0.0.3-SNAPSHOT