diff --git a/dd-java-agent/dependency-reduced-pom.xml b/dd-java-agent/dependency-reduced-pom.xml
index c51b62677e..6dc901f9ae 100644
--- a/dd-java-agent/dependency-reduced-pom.xml
+++ b/dd-java-agent/dependency-reduced-pom.xml
@@ -1,556 +1,565 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <parent>
-    <artifactId>raclette-java-examples</artifactId>
-    <groupId>com.datadoghq</groupId>
-    <version>1.0-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>dd-java-agent</artifactId>
-  <version>0.0.1</version>
-  <build>
-    <finalName>${project.artifactId}</finalName>
-    <plugins>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.20</version>
-        <configuration>
-          <argLine>-javaagent:${M2_REPO}/com/datadoghq/dd-java-agent/${version}/dd-java-agent-${version}.jar</argLine>
-          <includes>
-            <include>*Test.java</include>
-          </includes>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-shade-plugin</artifactId>
-        <version>2.4.3</version>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-            <configuration>
-              <artifactSet>
-                <excludes />
-              </artifactSet>
-              <transformers>
-                <transformer>
-                  <resource>otarules.btm</resource>
-                </transformer>
-                <transformer>
-                  <manifestEntries>
-                    <Agent-Class>io.opentracing.contrib.agent.AnnotationsTracingAgent</Agent-Class>
-                    <Premain-Class>io.opentracing.contrib.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>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>io.opentracing</groupId>
-      <artifactId>opentracing-mock</artifactId>
-      <version>0.22.0</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <artifactId>hamcrest-core</artifactId>
-          <groupId>org.hamcrest</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.assertj</groupId>
-      <artifactId>assertj-core</artifactId>
-      <version>3.6.2</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mongodb</groupId>
-      <artifactId>mongo-java-driver</artifactId>
-      <version>3.4.2</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.squareup.okhttp3</groupId>
-      <artifactId>okhttp</artifactId>
-      <version>3.6.0</version>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <artifactId>okio</artifactId>
-          <groupId>com.squareup.okio</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-server</artifactId>
-      <version>9.4.1.v20170120</version>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <artifactId>javax.servlet-api</artifactId>
-          <groupId>javax.servlet</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>jetty-http</artifactId>
-          <groupId>org.eclipse.jetty</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>jetty-io</artifactId>
-          <groupId>org.eclipse.jetty</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-servlet</artifactId>
-      <version>9.4.1.v20170120</version>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <artifactId>jetty-security</artifactId>
-          <groupId>org.eclipse.jetty</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.tomcat.embed</groupId>
-      <artifactId>tomcat-embed-core</artifactId>
-      <version>8.0.41</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.tomcat.embed</groupId>
-      <artifactId>tomcat-embed-jasper</artifactId>
-      <version>8.0.41</version>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <artifactId>tomcat-embed-el</artifactId>
-          <groupId>org.apache.tomcat.embed</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>ecj</artifactId>
-          <groupId>org.eclipse.jdt.core.compiler</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>com.amazonaws</groupId>
-      <artifactId>aws-java-sdk</artifactId>
-      <version>1.11.132</version>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <artifactId>aws-java-sdk-athena</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-marketplaceentitlement</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-codestar</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-lexmodelbuilding</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-resourcegroupstaggingapi</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-pinpoint</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-xray</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-opsworkscm</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-support</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-simpledb</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-servicecatalog</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-servermigration</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-simpleworkflow</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-storagegateway</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-route53</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-s3</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-importexport</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-sts</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-sqs</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-rds</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-redshift</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-elasticbeanstalk</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-glacier</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-iam</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-datapipeline</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-elasticloadbalancing</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-elasticloadbalancingv2</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-emr</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-elasticache</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-elastictranscoder</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-ec2</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-dynamodb</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-sns</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-budgets</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-cloudtrail</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-cloudwatch</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-logs</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-events</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-cognitoidentity</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-cognitosync</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-directconnect</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-cloudformation</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-cloudfront</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-clouddirectory</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-kinesis</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-opsworks</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-ses</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-autoscaling</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-cloudsearch</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-cloudwatchmetrics</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-codedeploy</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-codepipeline</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-kms</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-config</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-lambda</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-ecs</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-ecr</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-cloudhsm</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-ssm</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-workspaces</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-machinelearning</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-directory</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-efs</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-codecommit</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-devicefarm</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-elasticsearch</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-waf</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-marketplacecommerceanalytics</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-inspector</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-iot</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-api-gateway</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-acm</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-gamelift</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-dms</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-marketplacemeteringservice</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-cognitoidp</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-discovery</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-applicationautoscaling</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-snowball</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-rekognition</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-polly</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-lightsail</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-stepfunctions</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-health</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-costandusagereport</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-codebuild</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-appstream</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-shield</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-batch</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-lex</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-mechanicalturkrequester</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-organizations</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-workdocs</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-core</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-models</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aws-java-sdk-swf-libraries</artifactId>
-          <groupId>com.amazonaws</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-  </dependencies>
-  <properties>
-    <opentracing.version>0.22.0</opentracing.version>
-    <ot.contrib.okhttp.version>0.0.4</ot.contrib.okhttp.version>
-    <ot.agent.version>0.0.12</ot.agent.version>
-    <ot.contrib.webservlet.version>0.0.8</ot.contrib.webservlet.version>
-    <ot.dd-trace.version>1.0-SNAPSHOT</ot.dd-trace.version>
-    <ot.contrib.mongo.version>0.0.1</ot.contrib.mongo.version>
-  </properties>
-</project>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <parent>
+    <artifactId>dd-trace-java</artifactId>
+    <groupId>com.datadoghq</groupId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>dd-java-agent</artifactId>
+  <name>dd-java-agent</name>
+  <build>
+    <finalName>${project.artifactId}</finalName>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.6.1</version>
+        <configuration>
+          <source>${java.version}</source>
+          <target>${java.version}</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>2.20</version>
+        <configuration>
+          <argLine>-javaagent:${M2_REPO}/com/datadoghq/dd-java-agent/${project.version}/dd-java-agent-${project.version}.jar</argLine>
+          <includes>
+            <include>*Test.java</include>
+          </includes>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>2.4.3</version>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <artifactSet>
+                <excludes />
+              </artifactSet>
+              <transformers>
+                <transformer>
+                  <resource>otarules.btm</resource>
+                </transformer>
+                <transformer>
+                  <manifestEntries>
+                    <Agent-Class>io.opentracing.contrib.agent.AnnotationsTracingAgent</Agent-Class>
+                    <Premain-Class>io.opentracing.contrib.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>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>io.opentracing</groupId>
+      <artifactId>opentracing-mock</artifactId>
+      <version>0.22.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>hamcrest-core</artifactId>
+          <groupId>org.hamcrest</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
+      <version>3.6.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mongodb</groupId>
+      <artifactId>mongo-java-driver</artifactId>
+      <version>3.4.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.squareup.okhttp3</groupId>
+      <artifactId>okhttp</artifactId>
+      <version>3.6.0</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>okio</artifactId>
+          <groupId>com.squareup.okio</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-server</artifactId>
+      <version>9.4.1.v20170120</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>javax.servlet-api</artifactId>
+          <groupId>javax.servlet</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>jetty-http</artifactId>
+          <groupId>org.eclipse.jetty</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>jetty-io</artifactId>
+          <groupId>org.eclipse.jetty</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-servlet</artifactId>
+      <version>9.4.1.v20170120</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>jetty-security</artifactId>
+          <groupId>org.eclipse.jetty</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.tomcat.embed</groupId>
+      <artifactId>tomcat-embed-core</artifactId>
+      <version>8.0.41</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.tomcat.embed</groupId>
+      <artifactId>tomcat-embed-jasper</artifactId>
+      <version>8.0.41</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>tomcat-embed-el</artifactId>
+          <groupId>org.apache.tomcat.embed</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>ecj</artifactId>
+          <groupId>org.eclipse.jdt.core.compiler</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>com.amazonaws</groupId>
+      <artifactId>aws-java-sdk</artifactId>
+      <version>1.11.132</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>aws-java-sdk-athena</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-marketplaceentitlement</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-codestar</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-lexmodelbuilding</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-resourcegroupstaggingapi</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-pinpoint</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-xray</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-opsworkscm</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-support</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-simpledb</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-servicecatalog</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-servermigration</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-simpleworkflow</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-storagegateway</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-route53</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-s3</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-importexport</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-sts</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-sqs</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-rds</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-redshift</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-elasticbeanstalk</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-glacier</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-iam</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-datapipeline</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-elasticloadbalancing</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-elasticloadbalancingv2</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-emr</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-elasticache</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-elastictranscoder</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-ec2</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-dynamodb</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-sns</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-budgets</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-cloudtrail</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-cloudwatch</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-logs</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-events</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-cognitoidentity</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-cognitosync</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-directconnect</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-cloudformation</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-cloudfront</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-clouddirectory</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-kinesis</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-opsworks</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-ses</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-autoscaling</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-cloudsearch</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-cloudwatchmetrics</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-codedeploy</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-codepipeline</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-kms</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-config</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-lambda</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-ecs</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-ecr</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-cloudhsm</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-ssm</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-workspaces</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-machinelearning</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-directory</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-efs</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-codecommit</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-devicefarm</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-elasticsearch</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-waf</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-marketplacecommerceanalytics</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-inspector</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-iot</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-api-gateway</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-acm</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-gamelift</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-dms</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-marketplacemeteringservice</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-cognitoidp</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-discovery</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-applicationautoscaling</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-snowball</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-rekognition</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-polly</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-lightsail</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-stepfunctions</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-health</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-costandusagereport</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-codebuild</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-appstream</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-shield</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-batch</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-lex</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-mechanicalturkrequester</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-organizations</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-workdocs</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-core</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-models</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aws-java-sdk-swf-libraries</artifactId>
+          <groupId>com.amazonaws</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+  </dependencies>
+  <properties>
+    <opentracing.version>0.22.0</opentracing.version>
+    <ot.contrib.okhttp.version>0.0.4</ot.contrib.okhttp.version>
+    <ot.agent.version>0.0.12</ot.agent.version>
+    <java.version>1.8</java.version>
+    <ot.contrib.webservlet.version>0.0.8</ot.contrib.webservlet.version>
+    <ot.dd-trace.version>1.0-SNAPSHOT</ot.dd-trace.version>
+    <ot.contrib.mongo.version>0.0.1</ot.contrib.mongo.version>
+  </properties>
+</project>
+
diff --git a/dd-java-agent/pom.xml b/dd-java-agent/pom.xml
index 198ab4b098..51f9d5878c 100644
--- a/dd-java-agent/pom.xml
+++ b/dd-java-agent/pom.xml
@@ -195,7 +195,7 @@
 				<artifactId>maven-surefire-plugin</artifactId>
 				<version>2.20</version>
 				<configuration>
-					<argLine>-javaagent:${M2_REPO}/com/datadoghq/dd-java-agent/${version}/dd-java-agent-${version}.jar</argLine>
+					<argLine>-javaagent:${M2_REPO}/com/datadoghq/dd-java-agent/${project.version}/dd-java-agent-${project.version}.jar</argLine>
 					<includes>
 						<include>*Test.java</include>
 					</includes>
diff --git a/dd-java-agent/src/test/java/com/datadoghq/trace/instrument/AWSInstrumentationTest.java b/dd-java-agent/src/test/java/com/datadoghq/trace/instrument/AWSInstrumentationTest.java
index d56d5e55ae..62b747e4b2 100644
--- a/dd-java-agent/src/test/java/com/datadoghq/trace/instrument/AWSInstrumentationTest.java
+++ b/dd-java-agent/src/test/java/com/datadoghq/trace/instrument/AWSInstrumentationTest.java
@@ -20,7 +20,7 @@ public class AWSInstrumentationTest {
 
         assertThat(builder.getRequestHandlers()).isNotNull();
         assertThat(builder.getRequestHandlers().size()).isEqualTo(1);
-        assertThat(builder.getRequestHandlers().get(0).getClass()).isInstanceOf(TracingRequestHandler.class);
+        assertThat(builder.getRequestHandlers().get(0).getClass()).isEqualTo(TracingRequestHandler.class);
     }
 
 
diff --git a/dd-trace-examples/dropwizard-mongo-client/src/main/java/com/example/helloworld/resources/HelloWorldResource.java b/dd-trace-examples/dropwizard-mongo-client/src/main/java/com/example/helloworld/resources/HelloWorldResource.java
index 5b0335448f..17606447b5 100644
--- a/dd-trace-examples/dropwizard-mongo-client/src/main/java/com/example/helloworld/resources/HelloWorldResource.java
+++ b/dd-trace-examples/dropwizard-mongo-client/src/main/java/com/example/helloworld/resources/HelloWorldResource.java
@@ -1,7 +1,9 @@
 package com.example.helloworld.resources;
 
 import java.util.ArrayList;
+import java.util.List;
 import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.Consumer;
 
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
@@ -14,7 +16,6 @@ import org.bson.Document;
 import com.codahale.metrics.annotation.Timed;
 import com.example.helloworld.api.Saying;
 import com.google.common.base.Optional;
-import com.mongodb.Block;
 import com.mongodb.MongoClient;
 import com.mongodb.client.ListDatabasesIterable;
 
@@ -50,8 +51,13 @@ public class HelloWorldResource {
 
 		// Trace: Do  some stuff with the DB
 		ListDatabasesIterable<Document> documents = mongoClient.listDatabases();
-		ArrayList<String> list = new ArrayList<String>();
-		documents.forEach((Block<? super Document>) document -> list.add(document.toJson()));
+		final List<String> list = new ArrayList<String>();
+		documents.forEach(new Consumer<Document>() {
+			@Override
+			public void accept(Document t) {
+				list.add(t.toJson());
+			}
+		});
 		
 		afterDB();
 
diff --git a/pom.xml b/pom.xml
index 821d096b52..484f14374f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 
     <properties>
         <opentracing.version>0.22.0</opentracing.version>
-        <java.version>1.6</java.version>
+        <java.version>1.7</java.version>
     </properties>
 
     <licenses>
@@ -92,17 +92,17 @@
                     <!--</execution>-->
                 <!--</executions>-->
             <!--</plugin>-->
-            <plugin>
-                <groupId>org.sonatype.plugins</groupId>
-                <artifactId>nexus-staging-maven-plugin</artifactId>
-                <version>1.6.3</version>
-                <extensions>true</extensions>
-                <configuration>
-                    <serverId>ossrh</serverId>
-                    <nexusUrl>https://oss.sonatype.org/</nexusUrl>
-                    <autoReleaseAfterClose>true</autoReleaseAfterClose>
-                </configuration>
-            </plugin>
+<!--             <plugin> -->
+<!--                 <groupId>org.sonatype.plugins</groupId> -->
+<!--                 <artifactId>nexus-staging-maven-plugin</artifactId> -->
+<!--                 <version>1.6.3</version> -->
+<!--                 <extensions>true</extensions> -->
+<!--                 <configuration> -->
+<!--                     <serverId>ossrh</serverId> -->
+<!--                     <nexusUrl>https://oss.sonatype.org/</nexusUrl> -->
+<!--                     <autoReleaseAfterClose>true</autoReleaseAfterClose> -->
+<!--                 </configuration> -->
+<!--             </plugin> -->
         </plugins>
     </build>