From d3ce6b1a3ed1430d81e8a17c87d51a1de1914545 Mon Sep 17 00:00:00 2001
From: Guillaume Polaert <gpolaert@gmail.com>
Date: Thu, 29 Jun 2017 15:08:12 +0200
Subject: [PATCH 01/10] shading all stuff and removing from the scope all libs
 which can crash the app

---
 dd-java-agent-ittests/pom.xml |  6 +++++
 dd-java-agent/pom.xml         |  8 ++++++-
 dd-trace-annotations/pom.xml  | 11 ---------
 dd-trace/pom.xml              | 43 +++++++++++++++++++++--------------
 pom.xml                       |  5 ++--
 5 files changed, 42 insertions(+), 31 deletions(-)

diff --git a/dd-java-agent-ittests/pom.xml b/dd-java-agent-ittests/pom.xml
index cfdd3bc03b6..31d8519f7e4 100644
--- a/dd-java-agent-ittests/pom.xml
+++ b/dd-java-agent-ittests/pom.xml
@@ -30,6 +30,12 @@
         </dependency>
 
         <!-- JUnit tests -->
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>1.2.3</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>io.opentracing</groupId>
             <artifactId>opentracing-mock</artifactId>
diff --git a/dd-java-agent/pom.xml b/dd-java-agent/pom.xml
index 085b04136f4..076d9d89f6c 100644
--- a/dd-java-agent/pom.xml
+++ b/dd-java-agent/pom.xml
@@ -236,7 +236,13 @@
         </dependency>
 
 
-        <!-- JUnit tests -->
+        <!-- Tests -->
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>1.2.3</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>io.opentracing</groupId>
             <artifactId>opentracing-mock</artifactId>
diff --git a/dd-trace-annotations/pom.xml b/dd-trace-annotations/pom.xml
index bdd2a001794..35ed089adde 100644
--- a/dd-trace-annotations/pom.xml
+++ b/dd-trace-annotations/pom.xml
@@ -11,15 +11,4 @@
   <name>dd-trace-annotations</name>
   <url>https://github.com/datadog/dd-trace-java</url>
   <packaging>jar</packaging>
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
 </project>
diff --git a/dd-trace/pom.xml b/dd-trace/pom.xml
index 723553ce334..b5349bbe4dd 100644
--- a/dd-trace/pom.xml
+++ b/dd-trace/pom.xml
@@ -56,11 +56,6 @@
             <artifactId>slf4j-api</artifactId>
             <version>1.7.25</version>
         </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <version>1.2.3</version>
-        </dependency>
 
         <!-- Required for the tracer resolver / annotation -->
         <dependency>
@@ -70,6 +65,12 @@
         </dependency>
 
         <!-- Testing dependencies -->
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>1.2.3</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -108,7 +109,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>2.4.1</version>
+                <version>2.4.3</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -119,23 +120,31 @@
                             <relocations>
                                 <relocation>
                                     <pattern>com.fasterxml</pattern>
-                                    <shadedPattern>dd.com.fasterxml</shadedPattern>
+                                    <shadedPattern>shaded.com.fasterxml</shadedPattern>
                                 </relocation>
-                                <!--<relocation>-->
-                                    <!--<pattern>com.google</pattern>-->
-                                    <!--<shadedPattern>dd.com.google</shadedPattern>-->
-                                <!--</relocation>-->
                                 <relocation>
-                                    <pattern>org.yaml</pattern>
-                                    <shadedPattern>dd.org.yaml</shadedPattern>
+                                    <pattern>com.google.guava</pattern>
+                                    <shadedPattern>shaded.com.google.guava</shadedPattern>
                                 </relocation>
                                 <relocation>
-                                    <pattern>org.slf4j</pattern>
-                                    <shadedPattern>dd.org.slf4j</shadedPattern>
+                                    <pattern>com.google.common</pattern>
+                                    <shadedPattern>shaded.com.google.common</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>com.google.auto</pattern>
+                                    <shadedPattern>shaded.com.google.auto</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>com.google.thirdparty</pattern>
+                                    <shadedPattern>shaded.com.google.thirdparty</shadedPattern>
                                 </relocation>
                                 <relocation>
-                                    <pattern>ch.qos</pattern>
-                                    <shadedPattern>dd.ch.qos</shadedPattern>
+                                    <pattern>org.yaml</pattern>
+                                    <shadedPattern>shaded.org.yaml</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>org.slf4j</pattern>
+                                    <shadedPattern>shaded.org.slf4j</shadedPattern>
                                 </relocation>
                             </relocations>
                             <transformers>
diff --git a/pom.xml b/pom.xml
index 9da053e7461..954a7f33295 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,8 +32,8 @@
         <url>https://github.com/datadog/dd-trace-java</url>
         <connection>scm:git:git://github.com/datadog/dd-trace-java.git</connection>
         <developerConnection>scm:git:git@github.com:datadog/dd-trace-java.git</developerConnection>
-      <tag>HEAD</tag>
-  </scm>
+        <tag>HEAD</tag>
+    </scm>
 
     <modules>
         <module>dd-trace</module>
@@ -47,6 +47,7 @@
         <maven.deploy.skip>true</maven.deploy.skip>
         <opentracing.version>0.30.0</opentracing.version>
         <java.version>1.7</java.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
     <distributionManagement>

From 359c0879f03715afebb2278f5356ada7015b7983 Mon Sep 17 00:00:00 2001
From: Guillaume Polaert <gpolaert@gmail.com>
Date: Thu, 29 Jun 2017 19:42:58 +0200
Subject: [PATCH 02/10] fix shapping issues and pom refactoring

---
 dd-java-agent-ittests/pom.xml | 40 +----------------------------------
 dd-java-agent/pom.xml         | 37 +++++++++++++++++++++++++++++---
 dd-trace/pom.xml              | 19 ++---------------
 3 files changed, 37 insertions(+), 59 deletions(-)

diff --git a/dd-java-agent-ittests/pom.xml b/dd-java-agent-ittests/pom.xml
index 31d8519f7e4..92602fad043 100644
--- a/dd-java-agent-ittests/pom.xml
+++ b/dd-java-agent-ittests/pom.xml
@@ -11,7 +11,7 @@
     <name>dd-java-agent-ittests</name>
     <description>Datadog Java Agent integration tests</description>
     <url>https://github.com/datadog/dd-trace-java</url>
-    <packaging>pom</packaging>
+    <packaging>jar</packaging>
 
 
     <properties>
@@ -201,37 +201,15 @@
     </dependencies>
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.10.4</version>
-                <executions>
-                    <execution>
-                        <id>attach-javadocs</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>2.19</version>
                 <configuration>
-                    <includes>
-                        <!--<include>*Test.java</include>-->
-                    </includes>
-                    <excludes>
-                        <exclude>*Test.java</exclude>
-                    </excludes>
-                    <!--<forkCount>3</forkCount>-->
-                    <!--<reuseForks>false</reuseForks>-->
                     <argLine>
                         -javaagent:${M2_REPO}/com/datadoghq/dd-java-agent/${project.version}/dd-java-agent-${project.version}.jar
                         -Dorg.jboss.byteman.verbose=true
                     </argLine>
-                    <!--<workingDirectory>target/FORK_DIRECTORY_${surefire.forkNumber}</workingDirectory>-->
                 </configuration>
             </plugin>
             <plugin>
@@ -245,26 +223,10 @@
                             <goal>shade</goal>
                         </goals>
                         <configuration>
-                            <artifactSet>
-                                <excludes>
-                                    <!-- <exclude>ch.qos.logback:*</exclude> -->
-                                    <!-- <exclude>org.slf4j:*</exclude> -->
-                                </excludes>
-                            </artifactSet>
                             <transformers>
                                 <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
                                     <resource>otarules.btm</resource>
                                 </transformer>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                    <manifestEntries>
-                                        <Agent-Class>com.datadoghq.trace.agent.AnnotationsTracingAgent</Agent-Class>
-                                        <Premain-Class>com.datadoghq.trace.agent.AnnotationsTracingAgent
-                                        </Premain-Class>
-                                        <Can-Redefine-Classes>true</Can-Redefine-Classes>
-                                        <Can-Retransform-Classes>true</Can-Retransform-Classes>
-                                        <Boot-Class-Path>./${project.artifactId}.jar</Boot-Class-Path>
-                                    </manifestEntries>
-                                </transformer>
                             </transformers>
                         </configuration>
                     </execution>
diff --git a/dd-java-agent/pom.xml b/dd-java-agent/pom.xml
index 076d9d89f6c..bc2dbb426d4 100644
--- a/dd-java-agent/pom.xml
+++ b/dd-java-agent/pom.xml
@@ -52,7 +52,6 @@
             <version>${ot.agent.version}</version>
         </dependency>
 
-
         <!-- Used to find annotated methods -->
         <dependency>
             <groupId>org.reflections</groupId>
@@ -293,6 +292,39 @@
                             <goal>shade</goal>
                         </goals>
                         <configuration>
+                            <artifactSet>
+                                <excludes>
+                                    <!-- If not, the shade plugin doesn't work -->
+                                    <exclude>io.opentracing.contrib:opentracing-agent</exclude>
+                                    <exclude>org.jboss.byteman:byteman</exclude>
+                                </excludes>
+                            </artifactSet>
+                            <relocations>
+                                <relocation>
+                                    <pattern>javassist</pattern>
+                                    <shadedPattern>shaded.javassist</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>org.reflections</pattern>
+                                    <shadedPattern>shaded.org.reflections</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>com.fasterxml</pattern>
+                                    <shadedPattern>shaded.com.fasterxml</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>com.google</pattern>
+                                    <shadedPattern>shaded.com.google</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>org.yaml</pattern>
+                                    <shadedPattern>shaded.org.yaml</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>org.slf4j</pattern>
+                                    <shadedPattern>shaded.org.slf4j</shadedPattern>
+                                </relocation>
+                            </relocations>
                             <transformers>
                                 <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
                                     <resource>otarules.btm</resource>
@@ -300,8 +332,7 @@
                                 <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                                     <manifestEntries>
                                         <Agent-Class>com.datadoghq.trace.agent.AnnotationsTracingAgent</Agent-Class>
-                                        <Premain-Class>com.datadoghq.trace.agent.AnnotationsTracingAgent
-                                        </Premain-Class>
+                                        <Premain-Class>com.datadoghq.trace.agent.AnnotationsTracingAgent</Premain-Class>
                                         <Can-Redefine-Classes>true</Can-Redefine-Classes>
                                         <Can-Retransform-Classes>true</Can-Retransform-Classes>
                                         <Boot-Class-Path>./${project.artifactId}.jar</Boot-Class-Path>
diff --git a/dd-trace/pom.xml b/dd-trace/pom.xml
index b5349bbe4dd..76b6b4d1423 100644
--- a/dd-trace/pom.xml
+++ b/dd-trace/pom.xml
@@ -123,20 +123,8 @@
                                     <shadedPattern>shaded.com.fasterxml</shadedPattern>
                                 </relocation>
                                 <relocation>
-                                    <pattern>com.google.guava</pattern>
-                                    <shadedPattern>shaded.com.google.guava</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>com.google.common</pattern>
-                                    <shadedPattern>shaded.com.google.common</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>com.google.auto</pattern>
-                                    <shadedPattern>shaded.com.google.auto</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>com.google.thirdparty</pattern>
-                                    <shadedPattern>shaded.com.google.thirdparty</shadedPattern>
+                                    <pattern>com.google</pattern>
+                                    <shadedPattern>shaded.com.google</shadedPattern>
                                 </relocation>
                                 <relocation>
                                     <pattern>org.yaml</pattern>
@@ -147,9 +135,6 @@
                                     <shadedPattern>shaded.org.slf4j</shadedPattern>
                                 </relocation>
                             </relocations>
-                            <transformers>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer" />
-                            </transformers>
                         </configuration>
                     </execution>
                 </executions>

From 3159cef4eada87d5a45d1c1e2ff660ee2d8318c8 Mon Sep 17 00:00:00 2001
From: Guillaume Polaert <gpolaert@gmail.com>
Date: Fri, 30 Jun 2017 09:07:57 +0200
Subject: [PATCH 03/10] Force skipping tests for the moment

---
 dd-java-agent-ittests/pom.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/dd-java-agent-ittests/pom.xml b/dd-java-agent-ittests/pom.xml
index 92602fad043..73724c6692e 100644
--- a/dd-java-agent-ittests/pom.xml
+++ b/dd-java-agent-ittests/pom.xml
@@ -17,6 +17,8 @@
     <properties>
         <maven.deploy.skip>true</maven.deploy.skip>
         <dd-trace.version>0.1.2-SNAPSHOT</dd-trace.version>
+        <!--Skip tests-->
+        <skipTests>true</skipTests>
     </properties>
 
     <dependencies>
@@ -28,6 +30,14 @@
             <version>${dd-trace.version}</version>
             <scope>test</scope>
         </dependency>
+        <!-- Required for the tracer resolver / annotation -->
+        <dependency>
+            <groupId>com.google.auto.service</groupId>
+            <artifactId>auto-service</artifactId>
+            <version>1.0-rc3</version>
+            <scope>compile</scope>
+        </dependency>
+
 
         <!-- JUnit tests -->
         <dependency>
@@ -210,6 +220,7 @@
                         -javaagent:${M2_REPO}/com/datadoghq/dd-java-agent/${project.version}/dd-java-agent-${project.version}.jar
                         -Dorg.jboss.byteman.verbose=true
                     </argLine>
+                    <skipTests>${skipTests}</skipTests>
                 </configuration>
             </plugin>
             <plugin>

From 6bff68be6d3faf26b0903b233b51cff027e51ca3 Mon Sep 17 00:00:00 2001
From: Guillaume Polaert <gpolaert@gmail.com>
Date: Thu, 29 Jun 2017 15:08:12 +0200
Subject: [PATCH 04/10] shading all stuff and removing from the scope all libs
 which can crash the app

---
 dd-trace/pom.xml | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/dd-trace/pom.xml b/dd-trace/pom.xml
index 76b6b4d1423..b5349bbe4dd 100644
--- a/dd-trace/pom.xml
+++ b/dd-trace/pom.xml
@@ -123,8 +123,20 @@
                                     <shadedPattern>shaded.com.fasterxml</shadedPattern>
                                 </relocation>
                                 <relocation>
-                                    <pattern>com.google</pattern>
-                                    <shadedPattern>shaded.com.google</shadedPattern>
+                                    <pattern>com.google.guava</pattern>
+                                    <shadedPattern>shaded.com.google.guava</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>com.google.common</pattern>
+                                    <shadedPattern>shaded.com.google.common</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>com.google.auto</pattern>
+                                    <shadedPattern>shaded.com.google.auto</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>com.google.thirdparty</pattern>
+                                    <shadedPattern>shaded.com.google.thirdparty</shadedPattern>
                                 </relocation>
                                 <relocation>
                                     <pattern>org.yaml</pattern>
@@ -135,6 +147,9 @@
                                     <shadedPattern>shaded.org.slf4j</shadedPattern>
                                 </relocation>
                             </relocations>
+                            <transformers>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer" />
+                            </transformers>
                         </configuration>
                     </execution>
                 </executions>

From 5a582842ff95dfff0c27561a6eccfeeffa82d159 Mon Sep 17 00:00:00 2001
From: Guillaume Polaert <gpolaert@gmail.com>
Date: Thu, 29 Jun 2017 19:42:58 +0200
Subject: [PATCH 05/10] fix shapping issues and pom refactoring

---
 dd-java-agent-ittests/pom.xml | 11 -----------
 dd-trace/pom.xml              | 19 ++-----------------
 2 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/dd-java-agent-ittests/pom.xml b/dd-java-agent-ittests/pom.xml
index 73724c6692e..92602fad043 100644
--- a/dd-java-agent-ittests/pom.xml
+++ b/dd-java-agent-ittests/pom.xml
@@ -17,8 +17,6 @@
     <properties>
         <maven.deploy.skip>true</maven.deploy.skip>
         <dd-trace.version>0.1.2-SNAPSHOT</dd-trace.version>
-        <!--Skip tests-->
-        <skipTests>true</skipTests>
     </properties>
 
     <dependencies>
@@ -30,14 +28,6 @@
             <version>${dd-trace.version}</version>
             <scope>test</scope>
         </dependency>
-        <!-- Required for the tracer resolver / annotation -->
-        <dependency>
-            <groupId>com.google.auto.service</groupId>
-            <artifactId>auto-service</artifactId>
-            <version>1.0-rc3</version>
-            <scope>compile</scope>
-        </dependency>
-
 
         <!-- JUnit tests -->
         <dependency>
@@ -220,7 +210,6 @@
                         -javaagent:${M2_REPO}/com/datadoghq/dd-java-agent/${project.version}/dd-java-agent-${project.version}.jar
                         -Dorg.jboss.byteman.verbose=true
                     </argLine>
-                    <skipTests>${skipTests}</skipTests>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/dd-trace/pom.xml b/dd-trace/pom.xml
index b5349bbe4dd..76b6b4d1423 100644
--- a/dd-trace/pom.xml
+++ b/dd-trace/pom.xml
@@ -123,20 +123,8 @@
                                     <shadedPattern>shaded.com.fasterxml</shadedPattern>
                                 </relocation>
                                 <relocation>
-                                    <pattern>com.google.guava</pattern>
-                                    <shadedPattern>shaded.com.google.guava</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>com.google.common</pattern>
-                                    <shadedPattern>shaded.com.google.common</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>com.google.auto</pattern>
-                                    <shadedPattern>shaded.com.google.auto</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>com.google.thirdparty</pattern>
-                                    <shadedPattern>shaded.com.google.thirdparty</shadedPattern>
+                                    <pattern>com.google</pattern>
+                                    <shadedPattern>shaded.com.google</shadedPattern>
                                 </relocation>
                                 <relocation>
                                     <pattern>org.yaml</pattern>
@@ -147,9 +135,6 @@
                                     <shadedPattern>shaded.org.slf4j</shadedPattern>
                                 </relocation>
                             </relocations>
-                            <transformers>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer" />
-                            </transformers>
                         </configuration>
                     </execution>
                 </executions>

From e0e808e4c4ccbfedd5da73779f9c02248aac0e74 Mon Sep 17 00:00:00 2001
From: Guillaume Polaert <gpolaert@gmail.com>
Date: Fri, 30 Jun 2017 09:07:57 +0200
Subject: [PATCH 06/10] Force skipping tests for the moment

---
 dd-java-agent-ittests/pom.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/dd-java-agent-ittests/pom.xml b/dd-java-agent-ittests/pom.xml
index 92602fad043..73724c6692e 100644
--- a/dd-java-agent-ittests/pom.xml
+++ b/dd-java-agent-ittests/pom.xml
@@ -17,6 +17,8 @@
     <properties>
         <maven.deploy.skip>true</maven.deploy.skip>
         <dd-trace.version>0.1.2-SNAPSHOT</dd-trace.version>
+        <!--Skip tests-->
+        <skipTests>true</skipTests>
     </properties>
 
     <dependencies>
@@ -28,6 +30,14 @@
             <version>${dd-trace.version}</version>
             <scope>test</scope>
         </dependency>
+        <!-- Required for the tracer resolver / annotation -->
+        <dependency>
+            <groupId>com.google.auto.service</groupId>
+            <artifactId>auto-service</artifactId>
+            <version>1.0-rc3</version>
+            <scope>compile</scope>
+        </dependency>
+
 
         <!-- JUnit tests -->
         <dependency>
@@ -210,6 +220,7 @@
                         -javaagent:${M2_REPO}/com/datadoghq/dd-java-agent/${project.version}/dd-java-agent-${project.version}.jar
                         -Dorg.jboss.byteman.verbose=true
                     </argLine>
+                    <skipTests>${skipTests}</skipTests>
                 </configuration>
             </plugin>
             <plugin>

From 1dc7d5a9b766d77fea9e8d3e17ab9b0c36ccf385 Mon Sep 17 00:00:00 2001
From: Guillaume Polaert <gpolaert@gmail.com>
Date: Mon, 3 Jul 2017 11:42:35 +0200
Subject: [PATCH 07/10] AutoService is used by the deps, need to compile with
 maven

---
 dd-java-agent/pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/dd-java-agent/pom.xml b/dd-java-agent/pom.xml
index bc2dbb426d4..5437c0e4564 100644
--- a/dd-java-agent/pom.xml
+++ b/dd-java-agent/pom.xml
@@ -58,6 +58,12 @@
             <artifactId>reflections</artifactId>
             <version>0.9.11</version>
         </dependency>
+        <dependency>
+            <groupId>com.google.auto.service</groupId>
+            <artifactId>auto-service</artifactId>
+            <version>1.0-rc3</version>
+            <scope>compile</scope>
+        </dependency>
 
         <!-- Server side instrumentation -->
         <dependency>

From f7b34d7deba58321f30a0f6c68c9bf629631ed21 Mon Sep 17 00:00:00 2001
From: Guillaume Polaert <gpolaert@gmail.com>
Date: Mon, 3 Jul 2017 11:44:47 +0200
Subject: [PATCH 08/10] Path has been changed. Fixing

---
 dd-java-agent-ittests/src/test/resources/dd-trace.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dd-java-agent-ittests/src/test/resources/dd-trace.yaml b/dd-java-agent-ittests/src/test/resources/dd-trace.yaml
index 41ead394860..8c557c46254 100644
--- a/dd-java-agent-ittests/src/test/resources/dd-trace.yaml
+++ b/dd-java-agent-ittests/src/test/resources/dd-trace.yaml
@@ -21,7 +21,7 @@ sampler:
   # skipTagsPatterns: {"http.url": ".*/demo/add.*"}
   
 # Enable custom annotation tracing over a selected set of packages
-enableCustomAnnotationTracingOver: ["io.opentracing.contrib.agent"]
+enableCustomAnnotationTracingOver: ["com.datadoghq.trace.agent"]
 
 # Disable some instrumentations
 # disabledInstrumentations: ["apache http", "mongo", "jetty", "tomcat", ...]
\ No newline at end of file

From a150548a72e6086697ef06f9d2bfc35b428d81d7 Mon Sep 17 00:00:00 2001
From: Guillaume Polaert <gpolaert@gmail.com>
Date: Mon, 3 Jul 2017 11:49:31 +0200
Subject: [PATCH 09/10] CircleCi

---
 dd-java-agent/pom.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dd-java-agent/pom.xml b/dd-java-agent/pom.xml
index 5437c0e4564..ac90af62a5b 100644
--- a/dd-java-agent/pom.xml
+++ b/dd-java-agent/pom.xml
@@ -62,7 +62,6 @@
             <groupId>com.google.auto.service</groupId>
             <artifactId>auto-service</artifactId>
             <version>1.0-rc3</version>
-            <scope>compile</scope>
         </dependency>
 
         <!-- Server side instrumentation -->

From 73ab3d36ab0dcd60fb22b8f546bc91fef6cdd589 Mon Sep 17 00:00:00 2001
From: Guillaume Polaert <gpolaert@gmail.com>
Date: Tue, 4 Jul 2017 10:57:47 +0200
Subject: [PATCH 10/10] Keep sync Maven and Gradle

---
 dd-java-agent-ittests/build.gradle | 1 +
 dd-java-agent/build.gradle         | 2 ++
 dd-trace/build.gradle              | 1 +
 3 files changed, 4 insertions(+)

diff --git a/dd-java-agent-ittests/build.gradle b/dd-java-agent-ittests/build.gradle
index fc8b289a2da..0207d986ee7 100644
--- a/dd-java-agent-ittests/build.gradle
+++ b/dd-java-agent-ittests/build.gradle
@@ -5,6 +5,7 @@ dependencies {
     testCompile group: 'junit', name: 'junit', version: '4.12'
     testCompile group: 'org.assertj', name: 'assertj-core', version: '3.6.2'
     testCompile group: 'org.mockito', name: 'mockito-core', version: '2.7.22'
+    testCompile group: 'ch.qos.logback', name: 'logback-classic' , version: '1.2.3'
     testCompile group: 'org.mongodb', name: 'mongo-java-driver', version: '3.4.2'
     testCompile group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.4.1.v20170120'
     testCompile group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '9.4.1.v20170120'
diff --git a/dd-java-agent/build.gradle b/dd-java-agent/build.gradle
index 249a6eb7392..51c2cdb5942 100644
--- a/dd-java-agent/build.gradle
+++ b/dd-java-agent/build.gradle
@@ -12,6 +12,7 @@ dependencies {
 
     compile group: 'io.opentracing.contrib', name: 'opentracing-agent', version: '0.1.0'
     compile group: 'org.reflections', name: 'reflections', version: '0.9.11'
+    compile group: 'com.google.auto.service', name: 'auto-service', version: '1.0-rc3'
 
 
     compile(group: 'io.opentracing.contrib', name: 'opentracing-web-servlet-filter', version: '0.0.9') {
@@ -45,6 +46,7 @@ dependencies {
     testCompile group: 'junit', name: 'junit', version: '4.12'
     testCompile group: 'org.assertj', name: 'assertj-core', version: '3.6.2'
     testCompile group: 'org.mockito', name: 'mockito-core', version: '2.7.22'
+    testCompile group: 'ch.qos.logback', name: 'logback-classic' , version: '1.2.3'
     compileOnly group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '9.3.6.v20151106'
     compileOnly group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '9.0.0.M1'
     compileOnly group: 'org.mongodb', name: 'mongo-java-driver', version: '3.4.2'
diff --git a/dd-trace/build.gradle b/dd-trace/build.gradle
index b6c47a3eefa..7655fbd6d82 100644
--- a/dd-trace/build.gradle
+++ b/dd-trace/build.gradle
@@ -16,6 +16,7 @@ dependencies {
     testCompile group: 'junit', name: 'junit', version: '4.12'
     testCompile group: 'org.assertj', name: 'assertj-core', version: '3.6.2'
     testCompile group: 'org.mockito', name: 'mockito-core', version: '2.7.22'
+    testCompile group: 'ch.qos.logback', name: 'logback-classic' , version: '1.2.3'
 }
 
 shadowJar {