diff --git a/dd-java-agent/dependency-reduced-pom.xml b/dd-java-agent/dependency-reduced-pom.xml
index 1c710cdb53..dfa9b31f79 100644
--- a/dd-java-agent/dependency-reduced-pom.xml
+++ b/dd-java-agent/dependency-reduced-pom.xml
@@ -1,668 +1,668 @@
-
-
-
- dd-trace-java
- com.datadoghq
- 1.0-SNAPSHOT
-
- 4.0.0
- dd-java-agent
- dd-java-agent
-
- ${project.artifactId}
-
-
- maven-compiler-plugin
- 3.6.1
-
- ${java.version}
- ${java.version}
-
-
-
- maven-surefire-plugin
- 2.20
-
-
- *Test.java
-
-
- ElasticSearchInstrumentationTest.java
-
- 3
- false
- -Xmx500m -Xms500m -XX:MaxPermSize=256m -Dorg.jboss.byteman.verbose=true -Djavaagent.enableAnnotations
- -javaagent:${M2_REPO}/com/datadoghq/dd-java-agent/${project.version}/dd-java-agent-${project.version}.jar
- target/FORK_DIRECTORY_${surefire.forkNumber}
-
-
-
- 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
-
-
-
-
-
-
-
-
-
-
-
- io.opentracing
- opentracing-mock
- 0.22.0
- test
-
-
- junit
- junit
- 4.12
- test
-
-
- hamcrest-core
- org.hamcrest
-
-
-
-
- org.assertj
- assertj-core
- 3.6.2
- test
-
-
- org.mongodb
- mongo-java-driver
- 3.4.2
- test
-
-
- org.eclipse.jetty
- jetty-server
- 9.4.1.v20170120
- test
-
-
- javax.servlet-api
- javax.servlet
-
-
- jetty-http
- org.eclipse.jetty
-
-
- jetty-io
- org.eclipse.jetty
-
-
-
-
- org.eclipse.jetty
- jetty-servlet
- 9.4.1.v20170120
- test
-
-
- jetty-security
- org.eclipse.jetty
-
-
-
-
- org.apache.tomcat.embed
- tomcat-embed-core
- 8.0.41
- test
-
-
- org.apache.tomcat.embed
- tomcat-embed-jasper
- 8.0.41
- test
-
-
- tomcat-embed-el
- org.apache.tomcat.embed
-
-
- ecj
- org.eclipse.jdt.core.compiler
-
-
-
-
- com.amazonaws
- aws-java-sdk
- 1.11.132
- test
-
-
- httpclient
- org.apache.httpcomponents
-
-
- aws-java-sdk-athena
- com.amazonaws
-
-
- aws-java-sdk-marketplaceentitlement
- com.amazonaws
-
-
- aws-java-sdk-codestar
- com.amazonaws
-
-
- aws-java-sdk-lexmodelbuilding
- com.amazonaws
-
-
- aws-java-sdk-resourcegroupstaggingapi
- com.amazonaws
-
-
- aws-java-sdk-pinpoint
- com.amazonaws
-
-
- aws-java-sdk-xray
- com.amazonaws
-
-
- aws-java-sdk-opsworkscm
- com.amazonaws
-
-
- aws-java-sdk-support
- com.amazonaws
-
-
- aws-java-sdk-simpledb
- com.amazonaws
-
-
- aws-java-sdk-servicecatalog
- com.amazonaws
-
-
- aws-java-sdk-servermigration
- com.amazonaws
-
-
- aws-java-sdk-simpleworkflow
- com.amazonaws
-
-
- aws-java-sdk-storagegateway
- com.amazonaws
-
-
- aws-java-sdk-route53
- com.amazonaws
-
-
- aws-java-sdk-s3
- com.amazonaws
-
-
- aws-java-sdk-importexport
- com.amazonaws
-
-
- aws-java-sdk-sts
- com.amazonaws
-
-
- aws-java-sdk-sqs
- com.amazonaws
-
-
- aws-java-sdk-rds
- com.amazonaws
-
-
- aws-java-sdk-redshift
- com.amazonaws
-
-
- aws-java-sdk-elasticbeanstalk
- com.amazonaws
-
-
- aws-java-sdk-glacier
- com.amazonaws
-
-
- aws-java-sdk-iam
- com.amazonaws
-
-
- aws-java-sdk-datapipeline
- com.amazonaws
-
-
- aws-java-sdk-elasticloadbalancing
- com.amazonaws
-
-
- aws-java-sdk-elasticloadbalancingv2
- com.amazonaws
-
-
- aws-java-sdk-emr
- com.amazonaws
-
-
- aws-java-sdk-elasticache
- com.amazonaws
-
-
- aws-java-sdk-elastictranscoder
- com.amazonaws
-
-
- aws-java-sdk-ec2
- com.amazonaws
-
-
- aws-java-sdk-dynamodb
- com.amazonaws
-
-
- aws-java-sdk-sns
- com.amazonaws
-
-
- aws-java-sdk-budgets
- com.amazonaws
-
-
- aws-java-sdk-cloudtrail
- com.amazonaws
-
-
- aws-java-sdk-cloudwatch
- com.amazonaws
-
-
- aws-java-sdk-logs
- com.amazonaws
-
-
- aws-java-sdk-events
- com.amazonaws
-
-
- aws-java-sdk-cognitoidentity
- com.amazonaws
-
-
- aws-java-sdk-cognitosync
- com.amazonaws
-
-
- aws-java-sdk-directconnect
- com.amazonaws
-
-
- aws-java-sdk-cloudformation
- com.amazonaws
-
-
- aws-java-sdk-cloudfront
- com.amazonaws
-
-
- aws-java-sdk-clouddirectory
- com.amazonaws
-
-
- aws-java-sdk-kinesis
- com.amazonaws
-
-
- aws-java-sdk-opsworks
- com.amazonaws
-
-
- aws-java-sdk-ses
- com.amazonaws
-
-
- aws-java-sdk-autoscaling
- com.amazonaws
-
-
- aws-java-sdk-cloudsearch
- com.amazonaws
-
-
- aws-java-sdk-cloudwatchmetrics
- com.amazonaws
-
-
- aws-java-sdk-codedeploy
- com.amazonaws
-
-
- aws-java-sdk-codepipeline
- com.amazonaws
-
-
- aws-java-sdk-kms
- com.amazonaws
-
-
- aws-java-sdk-config
- com.amazonaws
-
-
- aws-java-sdk-lambda
- com.amazonaws
-
-
- aws-java-sdk-ecs
- com.amazonaws
-
-
- aws-java-sdk-ecr
- com.amazonaws
-
-
- aws-java-sdk-cloudhsm
- com.amazonaws
-
-
- aws-java-sdk-ssm
- com.amazonaws
-
-
- aws-java-sdk-workspaces
- com.amazonaws
-
-
- aws-java-sdk-machinelearning
- com.amazonaws
-
-
- aws-java-sdk-directory
- com.amazonaws
-
-
- aws-java-sdk-efs
- com.amazonaws
-
-
- aws-java-sdk-codecommit
- com.amazonaws
-
-
- aws-java-sdk-devicefarm
- com.amazonaws
-
-
- aws-java-sdk-elasticsearch
- com.amazonaws
-
-
- aws-java-sdk-waf
- com.amazonaws
-
-
- aws-java-sdk-marketplacecommerceanalytics
- com.amazonaws
-
-
- aws-java-sdk-inspector
- com.amazonaws
-
-
- aws-java-sdk-iot
- com.amazonaws
-
-
- aws-java-sdk-api-gateway
- com.amazonaws
-
-
- aws-java-sdk-acm
- com.amazonaws
-
-
- aws-java-sdk-gamelift
- com.amazonaws
-
-
- aws-java-sdk-dms
- com.amazonaws
-
-
- aws-java-sdk-marketplacemeteringservice
- com.amazonaws
-
-
- aws-java-sdk-cognitoidp
- com.amazonaws
-
-
- aws-java-sdk-discovery
- com.amazonaws
-
-
- aws-java-sdk-applicationautoscaling
- com.amazonaws
-
-
- aws-java-sdk-snowball
- com.amazonaws
-
-
- aws-java-sdk-rekognition
- com.amazonaws
-
-
- aws-java-sdk-polly
- com.amazonaws
-
-
- aws-java-sdk-lightsail
- com.amazonaws
-
-
- aws-java-sdk-stepfunctions
- com.amazonaws
-
-
- aws-java-sdk-health
- com.amazonaws
-
-
- aws-java-sdk-costandusagereport
- com.amazonaws
-
-
- aws-java-sdk-codebuild
- com.amazonaws
-
-
- aws-java-sdk-appstream
- com.amazonaws
-
-
- aws-java-sdk-shield
- com.amazonaws
-
-
- aws-java-sdk-batch
- com.amazonaws
-
-
- aws-java-sdk-lex
- com.amazonaws
-
-
- aws-java-sdk-mechanicalturkrequester
- com.amazonaws
-
-
- aws-java-sdk-organizations
- com.amazonaws
-
-
- aws-java-sdk-workdocs
- com.amazonaws
-
-
- aws-java-sdk-core
- com.amazonaws
-
-
- aws-java-sdk-models
- com.amazonaws
-
-
- aws-java-sdk-swf-libraries
- com.amazonaws
-
-
-
-
- com.squareup.okhttp3
- okhttp
- 3.6.0
- test
-
-
- okio
- com.squareup.okio
-
-
-
-
- org.apache.httpcomponents
- httpclient
- 4.5.3
- test
-
-
- httpcore
- org.apache.httpcomponents
-
-
- commons-logging
- commons-logging
-
-
- commons-codec
- commons-codec
-
-
-
-
- org.elasticsearch.client
- transport
- 5.4.0
- test
-
-
- elasticsearch
- org.elasticsearch
-
-
- transport-netty3-client
- org.elasticsearch.plugin
-
-
- transport-netty4-client
- org.elasticsearch.plugin
-
-
- reindex-client
- org.elasticsearch.plugin
-
-
- lang-mustache-client
- org.elasticsearch.plugin
-
-
- percolator-client
- org.elasticsearch.plugin
-
-
-
-
- org.elasticsearch.client
- rest
- 5.4.0
- test
-
-
- httpasyncclient
- org.apache.httpcomponents
-
-
- httpcore-nio
- org.apache.httpcomponents
-
-
- httpcore
- org.apache.httpcomponents
-
-
- commons-codec
- commons-codec
-
-
- commons-logging
- commons-logging
-
-
-
-
- org.apache.logging.log4j
- log4j-api
- 2.7
- test
-
-
- org.apache.logging.log4j
- log4j-core
- 2.7
- test
-
-
-
- 0.22.0
- 0.0.4
- 0.0.12
- 1.8
- 0.0.8
- 1.0-SNAPSHOT
- 0.0.1
-
-
-
+
+
+
+ dd-trace-java
+ com.datadoghq
+ 1.0-SNAPSHOT
+
+ 4.0.0
+ dd-java-agent
+ dd-java-agent
+
+ ${project.artifactId}
+
+
+ maven-compiler-plugin
+ 3.6.1
+
+ ${java.version}
+ ${java.version}
+
+
+
+ maven-surefire-plugin
+ 2.20
+
+
+ *Test.java
+
+
+ ElasticSearchInstrumentationTest.java
+
+ 3
+ false
+ -Xmx500m -Xms500m -XX:MaxPermSize=256m -Dorg.jboss.byteman.verbose=true -Djavaagent.enableAnnotations
+ -javaagent:${M2_REPO}/com/datadoghq/dd-java-agent/${project.version}/dd-java-agent-${project.version}.jar
+ target/FORK_DIRECTORY_${surefire.forkNumber}
+
+
+
+ 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
+
+
+
+
+
+
+
+
+
+
+
+ io.opentracing
+ opentracing-mock
+ 0.22.0
+ test
+
+
+ junit
+ junit
+ 4.12
+ test
+
+
+ hamcrest-core
+ org.hamcrest
+
+
+
+
+ org.assertj
+ assertj-core
+ 3.6.2
+ test
+
+
+ org.mongodb
+ mongo-java-driver
+ 3.4.2
+ test
+
+
+ org.eclipse.jetty
+ jetty-server
+ 9.4.1.v20170120
+ test
+
+
+ javax.servlet-api
+ javax.servlet
+
+
+ jetty-http
+ org.eclipse.jetty
+
+
+ jetty-io
+ org.eclipse.jetty
+
+
+
+
+ org.eclipse.jetty
+ jetty-servlet
+ 9.4.1.v20170120
+ test
+
+
+ jetty-security
+ org.eclipse.jetty
+
+
+
+
+ org.apache.tomcat.embed
+ tomcat-embed-core
+ 8.0.41
+ test
+
+
+ org.apache.tomcat.embed
+ tomcat-embed-jasper
+ 8.0.41
+ test
+
+
+ tomcat-embed-el
+ org.apache.tomcat.embed
+
+
+ ecj
+ org.eclipse.jdt.core.compiler
+
+
+
+
+ com.amazonaws
+ aws-java-sdk
+ 1.11.132
+ test
+
+
+ httpclient
+ org.apache.httpcomponents
+
+
+ aws-java-sdk-athena
+ com.amazonaws
+
+
+ aws-java-sdk-marketplaceentitlement
+ com.amazonaws
+
+
+ aws-java-sdk-codestar
+ com.amazonaws
+
+
+ aws-java-sdk-lexmodelbuilding
+ com.amazonaws
+
+
+ aws-java-sdk-resourcegroupstaggingapi
+ com.amazonaws
+
+
+ aws-java-sdk-pinpoint
+ com.amazonaws
+
+
+ aws-java-sdk-xray
+ com.amazonaws
+
+
+ aws-java-sdk-opsworkscm
+ com.amazonaws
+
+
+ aws-java-sdk-support
+ com.amazonaws
+
+
+ aws-java-sdk-simpledb
+ com.amazonaws
+
+
+ aws-java-sdk-servicecatalog
+ com.amazonaws
+
+
+ aws-java-sdk-servermigration
+ com.amazonaws
+
+
+ aws-java-sdk-simpleworkflow
+ com.amazonaws
+
+
+ aws-java-sdk-storagegateway
+ com.amazonaws
+
+
+ aws-java-sdk-route53
+ com.amazonaws
+
+
+ aws-java-sdk-s3
+ com.amazonaws
+
+
+ aws-java-sdk-importexport
+ com.amazonaws
+
+
+ aws-java-sdk-sts
+ com.amazonaws
+
+
+ aws-java-sdk-sqs
+ com.amazonaws
+
+
+ aws-java-sdk-rds
+ com.amazonaws
+
+
+ aws-java-sdk-redshift
+ com.amazonaws
+
+
+ aws-java-sdk-elasticbeanstalk
+ com.amazonaws
+
+
+ aws-java-sdk-glacier
+ com.amazonaws
+
+
+ aws-java-sdk-iam
+ com.amazonaws
+
+
+ aws-java-sdk-datapipeline
+ com.amazonaws
+
+
+ aws-java-sdk-elasticloadbalancing
+ com.amazonaws
+
+
+ aws-java-sdk-elasticloadbalancingv2
+ com.amazonaws
+
+
+ aws-java-sdk-emr
+ com.amazonaws
+
+
+ aws-java-sdk-elasticache
+ com.amazonaws
+
+
+ aws-java-sdk-elastictranscoder
+ com.amazonaws
+
+
+ aws-java-sdk-ec2
+ com.amazonaws
+
+
+ aws-java-sdk-dynamodb
+ com.amazonaws
+
+
+ aws-java-sdk-sns
+ com.amazonaws
+
+
+ aws-java-sdk-budgets
+ com.amazonaws
+
+
+ aws-java-sdk-cloudtrail
+ com.amazonaws
+
+
+ aws-java-sdk-cloudwatch
+ com.amazonaws
+
+
+ aws-java-sdk-logs
+ com.amazonaws
+
+
+ aws-java-sdk-events
+ com.amazonaws
+
+
+ aws-java-sdk-cognitoidentity
+ com.amazonaws
+
+
+ aws-java-sdk-cognitosync
+ com.amazonaws
+
+
+ aws-java-sdk-directconnect
+ com.amazonaws
+
+
+ aws-java-sdk-cloudformation
+ com.amazonaws
+
+
+ aws-java-sdk-cloudfront
+ com.amazonaws
+
+
+ aws-java-sdk-clouddirectory
+ com.amazonaws
+
+
+ aws-java-sdk-kinesis
+ com.amazonaws
+
+
+ aws-java-sdk-opsworks
+ com.amazonaws
+
+
+ aws-java-sdk-ses
+ com.amazonaws
+
+
+ aws-java-sdk-autoscaling
+ com.amazonaws
+
+
+ aws-java-sdk-cloudsearch
+ com.amazonaws
+
+
+ aws-java-sdk-cloudwatchmetrics
+ com.amazonaws
+
+
+ aws-java-sdk-codedeploy
+ com.amazonaws
+
+
+ aws-java-sdk-codepipeline
+ com.amazonaws
+
+
+ aws-java-sdk-kms
+ com.amazonaws
+
+
+ aws-java-sdk-config
+ com.amazonaws
+
+
+ aws-java-sdk-lambda
+ com.amazonaws
+
+
+ aws-java-sdk-ecs
+ com.amazonaws
+
+
+ aws-java-sdk-ecr
+ com.amazonaws
+
+
+ aws-java-sdk-cloudhsm
+ com.amazonaws
+
+
+ aws-java-sdk-ssm
+ com.amazonaws
+
+
+ aws-java-sdk-workspaces
+ com.amazonaws
+
+
+ aws-java-sdk-machinelearning
+ com.amazonaws
+
+
+ aws-java-sdk-directory
+ com.amazonaws
+
+
+ aws-java-sdk-efs
+ com.amazonaws
+
+
+ aws-java-sdk-codecommit
+ com.amazonaws
+
+
+ aws-java-sdk-devicefarm
+ com.amazonaws
+
+
+ aws-java-sdk-elasticsearch
+ com.amazonaws
+
+
+ aws-java-sdk-waf
+ com.amazonaws
+
+
+ aws-java-sdk-marketplacecommerceanalytics
+ com.amazonaws
+
+
+ aws-java-sdk-inspector
+ com.amazonaws
+
+
+ aws-java-sdk-iot
+ com.amazonaws
+
+
+ aws-java-sdk-api-gateway
+ com.amazonaws
+
+
+ aws-java-sdk-acm
+ com.amazonaws
+
+
+ aws-java-sdk-gamelift
+ com.amazonaws
+
+
+ aws-java-sdk-dms
+ com.amazonaws
+
+
+ aws-java-sdk-marketplacemeteringservice
+ com.amazonaws
+
+
+ aws-java-sdk-cognitoidp
+ com.amazonaws
+
+
+ aws-java-sdk-discovery
+ com.amazonaws
+
+
+ aws-java-sdk-applicationautoscaling
+ com.amazonaws
+
+
+ aws-java-sdk-snowball
+ com.amazonaws
+
+
+ aws-java-sdk-rekognition
+ com.amazonaws
+
+
+ aws-java-sdk-polly
+ com.amazonaws
+
+
+ aws-java-sdk-lightsail
+ com.amazonaws
+
+
+ aws-java-sdk-stepfunctions
+ com.amazonaws
+
+
+ aws-java-sdk-health
+ com.amazonaws
+
+
+ aws-java-sdk-costandusagereport
+ com.amazonaws
+
+
+ aws-java-sdk-codebuild
+ com.amazonaws
+
+
+ aws-java-sdk-appstream
+ com.amazonaws
+
+
+ aws-java-sdk-shield
+ com.amazonaws
+
+
+ aws-java-sdk-batch
+ com.amazonaws
+
+
+ aws-java-sdk-lex
+ com.amazonaws
+
+
+ aws-java-sdk-mechanicalturkrequester
+ com.amazonaws
+
+
+ aws-java-sdk-organizations
+ com.amazonaws
+
+
+ aws-java-sdk-workdocs
+ com.amazonaws
+
+
+ aws-java-sdk-core
+ com.amazonaws
+
+
+ aws-java-sdk-models
+ com.amazonaws
+
+
+ aws-java-sdk-swf-libraries
+ com.amazonaws
+
+
+
+
+ com.squareup.okhttp3
+ okhttp
+ 3.6.0
+ test
+
+
+ okio
+ com.squareup.okio
+
+
+
+
+ org.apache.httpcomponents
+ httpclient
+ 4.5.3
+ test
+
+
+ httpcore
+ org.apache.httpcomponents
+
+
+ commons-logging
+ commons-logging
+
+
+ commons-codec
+ commons-codec
+
+
+
+
+ org.elasticsearch.client
+ transport
+ 5.4.0
+ test
+
+
+ elasticsearch
+ org.elasticsearch
+
+
+ transport-netty3-client
+ org.elasticsearch.plugin
+
+
+ transport-netty4-client
+ org.elasticsearch.plugin
+
+
+ reindex-client
+ org.elasticsearch.plugin
+
+
+ lang-mustache-client
+ org.elasticsearch.plugin
+
+
+ percolator-client
+ org.elasticsearch.plugin
+
+
+
+
+ org.elasticsearch.client
+ rest
+ 5.4.0
+ test
+
+
+ httpasyncclient
+ org.apache.httpcomponents
+
+
+ httpcore-nio
+ org.apache.httpcomponents
+
+
+ httpcore
+ org.apache.httpcomponents
+
+
+ commons-codec
+ commons-codec
+
+
+ commons-logging
+ commons-logging
+
+
+
+
+ org.apache.logging.log4j
+ log4j-api
+ 2.7
+ test
+
+
+ org.apache.logging.log4j
+ log4j-core
+ 2.7
+ test
+
+
+
+ 0.22.0
+ 0.0.4
+ 0.0.12
+ 1.8
+ 0.0.8
+ 1.0-SNAPSHOT
+ 0.0.1
+
+
+