From 517ecca4c1a919002da5ffc6cc09863d309babd1 Mon Sep 17 00:00:00 2001
From: Nikolay Martynov <nikolay.martynov@datadoghq.com>
Date: Thu, 5 Mar 2020 12:15:48 -0500
Subject: [PATCH] Remove explicit concurrent instrumentation dependencies

Since we include concurrent instrumentation for all instrumentatin
projects now there is no point in including it in every instrumentation.
---
 .../instrumentation/akka-http-10.0/akka-http-10.0.gradle  | 8 --------
 .../apache-httpasyncclient-4.gradle                       | 4 +---
 .../aws-java-sdk-2.2/aws-java-sdk-2.2.gradle              | 3 ---
 dd-java-agent/instrumentation/cdi-1.2/cdi-1.2.gradle      | 2 --
 .../instrumentation/dropwizard/dropwizard.gradle          | 1 -
 .../instrumentation/finatra-2.9/finatra-2.9.gradle        | 4 ----
 dd-java-agent/instrumentation/grizzly-2/grizzly-2.gradle  | 2 --
 dd-java-agent/instrumentation/grpc-1.5/grpc-1.5.gradle    | 2 --
 .../instrumentation/hystrix-1.4/hystrix-1.4.gradle        | 1 -
 .../jax-rs-annotations-2/jax-rs-annotations-2.gradle      | 7 +++----
 .../jax-rs-client-2.0/jax-rs-client-2.0.gradle            | 2 --
 dd-java-agent/instrumentation/jetty-8/jetty-8.gradle      | 1 -
 dd-java-agent/instrumentation/netty-4.0/netty-4.0.gradle  | 2 --
 dd-java-agent/instrumentation/netty-4.1/netty-4.1.gradle  | 1 -
 dd-java-agent/instrumentation/play-2.4/play-2.4.gradle    | 1 -
 dd-java-agent/instrumentation/play-2.6/play-2.6.gradle    | 1 -
 dd-java-agent/instrumentation/play-ws-1/play-ws-1.gradle  | 2 --
 .../instrumentation/play-ws-2.1/play-ws-2.1.gradle        | 2 --
 dd-java-agent/instrumentation/play-ws-2/play-ws-2.gradle  | 4 +---
 .../instrumentation/ratpack-1.4/ratpack-1.4.gradle        | 1 -
 .../reactor-core-3.1/reactor-core-3.1.gradle              | 1 -
 .../instrumentation/servlet/request-3/request-3.gradle    | 1 -
 .../spring-webflux-5/spring-webflux-5.gradle              | 1 -
 dd-java-agent/instrumentation/twilio/twilio.gradle        | 1 -
 dd-java-agent/instrumentation/vertx/vertx.gradle          | 1 -
 25 files changed, 5 insertions(+), 51 deletions(-)

diff --git a/dd-java-agent/instrumentation/akka-http-10.0/akka-http-10.0.gradle b/dd-java-agent/instrumentation/akka-http-10.0/akka-http-10.0.gradle
index 484ebbd536..e23e9c08ca 100644
--- a/dd-java-agent/instrumentation/akka-http-10.0/akka-http-10.0.gradle
+++ b/dd-java-agent/instrumentation/akka-http-10.0/akka-http-10.0.gradle
@@ -80,25 +80,17 @@ dependencies {
 
   testCompile group: 'com.typesafe.akka', name: 'akka-http_2.11', version: '10.0.0'
   testCompile group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.6.0'
-  testCompile project(':dd-java-agent:instrumentation:java-concurrent')
   testCompile project(':dd-java-agent:instrumentation:trace-annotation')
 
   lagomTestCompile project(':dd-java-agent:instrumentation:akka-http-10.0')
-  lagomTestCompile project(':dd-java-agent:instrumentation:trace-annotation')
-  lagomTestCompile project(':dd-java-agent:instrumentation:java-concurrent')
-
   lagomTestCompile group: 'com.lightbend.lagom', name: 'lagom-javadsl-testkit_2.11', version: '1.4.0'
 
   // There are some internal API changes in 10.1 that we would like to test separately for
   version101TestCompile group: 'com.typesafe.akka', name: 'akka-http_2.11', version: '10.1.0'
   version101TestCompile group: 'com.typesafe.akka', name: 'akka-stream_2.11', version: '2.5.11'
-  version101TestCompile project(':dd-java-agent:instrumentation:java-concurrent')
-  version101TestCompile project(':dd-java-agent:instrumentation:trace-annotation')
 
   latestDepTestCompile group: 'com.typesafe.akka', name: 'akka-http_2.11', version: '+'
   latestDepTestCompile group: 'com.typesafe.akka', name: 'akka-stream_2.11', version: '+'
-  latestDepTestCompile project(':dd-java-agent:instrumentation:java-concurrent')
-  latestDepTestCompile project(':dd-java-agent:instrumentation:trace-annotation')
 }
 
 test.dependsOn lagomTest
diff --git a/dd-java-agent/instrumentation/apache-httpasyncclient-4/apache-httpasyncclient-4.gradle b/dd-java-agent/instrumentation/apache-httpasyncclient-4/apache-httpasyncclient-4.gradle
index 6005d2b6a9..3f63c2f4d8 100644
--- a/dd-java-agent/instrumentation/apache-httpasyncclient-4/apache-httpasyncclient-4.gradle
+++ b/dd-java-agent/instrumentation/apache-httpasyncclient-4/apache-httpasyncclient-4.gradle
@@ -22,9 +22,7 @@ testSets {
 
 dependencies {
   compileOnly group: 'org.apache.httpcomponents', name: 'httpasyncclient', version: '4.0'
-
-  testCompile project(':dd-java-agent:instrumentation:java-concurrent')
-
+  
   testCompile group: 'org.apache.httpcomponents', name: 'httpasyncclient', version: '4.0'
 
   latestDepTestCompile group: 'org.apache.httpcomponents', name: 'httpasyncclient', version: '+'
diff --git a/dd-java-agent/instrumentation/aws-java-sdk-2.2/aws-java-sdk-2.2.gradle b/dd-java-agent/instrumentation/aws-java-sdk-2.2/aws-java-sdk-2.2.gradle
index 9e67b23da5..8624a688f4 100644
--- a/dd-java-agent/instrumentation/aws-java-sdk-2.2/aws-java-sdk-2.2.gradle
+++ b/dd-java-agent/instrumentation/aws-java-sdk-2.2/aws-java-sdk-2.2.gradle
@@ -26,8 +26,6 @@ dependencies {
   testCompile project(':dd-java-agent:instrumentation:apache-httpclient-4')
   // Also include netty instrumentation because it is used by aws async client
   testCompile project(':dd-java-agent:instrumentation:netty-4.1')
-  // Needed by netty async instrumentation
-  testCompile project(':dd-java-agent:instrumentation:java-concurrent')
   testCompile group: 'software.amazon.awssdk', name: 'apache-client', version: '2.2.0'
   testCompile group: 'software.amazon.awssdk', name: 's3', version: '2.2.0'
   testCompile group: 'software.amazon.awssdk', name: 'rds', version: '2.2.0'
@@ -38,7 +36,6 @@ dependencies {
 
   latestDepTestCompile project(':dd-java-agent:instrumentation:apache-httpclient-4')
   latestDepTestCompile project(':dd-java-agent:instrumentation:netty-4.1')
-  latestDepTestCompile project(':dd-java-agent:instrumentation:java-concurrent')
 
   latestDepTestCompile group: 'software.amazon.awssdk', name: 'apache-client', version: '+'
   latestDepTestCompile group: 'software.amazon.awssdk', name: 's3', version: '+'
diff --git a/dd-java-agent/instrumentation/cdi-1.2/cdi-1.2.gradle b/dd-java-agent/instrumentation/cdi-1.2/cdi-1.2.gradle
index 89072a7fce..79de40d49e 100644
--- a/dd-java-agent/instrumentation/cdi-1.2/cdi-1.2.gradle
+++ b/dd-java-agent/instrumentation/cdi-1.2/cdi-1.2.gradle
@@ -9,8 +9,6 @@ testSets {
 }
 
 dependencies {
-  testCompile project(':dd-java-agent:instrumentation:java-concurrent')
-  
   testCompile group: 'org.jboss.weld', name: 'weld-core', version: '2.3.0.Final'
   testCompile group: 'org.jboss.weld.se', name: 'weld-se', version: '2.3.0.Final'
   testCompile group: 'org.jboss.weld.se', name: 'weld-se-core', version: '2.3.0.Final'
diff --git a/dd-java-agent/instrumentation/dropwizard/dropwizard.gradle b/dd-java-agent/instrumentation/dropwizard/dropwizard.gradle
index e9cded163a..79c23460c5 100644
--- a/dd-java-agent/instrumentation/dropwizard/dropwizard.gradle
+++ b/dd-java-agent/instrumentation/dropwizard/dropwizard.gradle
@@ -9,7 +9,6 @@ apply from: "${rootDir}/gradle/java.gradle"
 //}
 
 dependencies {
-  testCompile project(':dd-java-agent:instrumentation:java-concurrent')
   testCompile project(':dd-java-agent:instrumentation:jax-rs-annotations-2')
   testCompile project(':dd-java-agent:instrumentation:servlet:request-3')
 
diff --git a/dd-java-agent/instrumentation/finatra-2.9/finatra-2.9.gradle b/dd-java-agent/instrumentation/finatra-2.9/finatra-2.9.gradle
index b856b7d3ee..6c20fe25ed 100644
--- a/dd-java-agent/instrumentation/finatra-2.9/finatra-2.9.gradle
+++ b/dd-java-agent/instrumentation/finatra-2.9/finatra-2.9.gradle
@@ -34,18 +34,14 @@ dependencies {
   compileOnly group: 'com.twitter', name: 'finatra-http_2.11', version: '2.9.0'
 
   testCompile project(':dd-java-agent:instrumentation:netty-4.1')
-  testCompile project(':dd-java-agent:instrumentation:java-concurrent')
 
   testCompile group: 'com.twitter', name: 'finatra-http_2.11', version: '19.12.0'
   testCompile(group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.10') {
     force = true
   }
-
   // Required for older versions of finatra on JDKs >= 11
   testCompile group: 'com.sun.activation', name: 'javax.activation', version: '1.2.0'
 
-  latestDepTestCompile project(':dd-java-agent:instrumentation:netty-4.1')
-  latestDepTestCompile project(':dd-java-agent:instrumentation:java-concurrent')
   latestDepTestCompile group: 'com.twitter', name: 'finatra-http_2.11', version: '+'
 }
 
diff --git a/dd-java-agent/instrumentation/grizzly-2/grizzly-2.gradle b/dd-java-agent/instrumentation/grizzly-2/grizzly-2.gradle
index 79f4877ea6..a95bc706a5 100644
--- a/dd-java-agent/instrumentation/grizzly-2/grizzly-2.gradle
+++ b/dd-java-agent/instrumentation/grizzly-2/grizzly-2.gradle
@@ -22,8 +22,6 @@ testSets {
 dependencies {
   compileOnly group: 'org.glassfish.grizzly', name: 'grizzly-http-server', version: '2.0'
 
-  testCompile project(':dd-java-agent:instrumentation:java-concurrent')
-
   testCompile group: 'javax.xml.bind', name: 'jaxb-api', version: '2.2.3'
   testCompile group: 'javax.ws.rs', name: 'javax.ws.rs-api', version: '2.0'
   testCompile group: 'org.glassfish.grizzly', name: 'grizzly-http-server', version: '2.0'
diff --git a/dd-java-agent/instrumentation/grpc-1.5/grpc-1.5.gradle b/dd-java-agent/instrumentation/grpc-1.5/grpc-1.5.gradle
index 4c79ae255b..9a3bbcc008 100644
--- a/dd-java-agent/instrumentation/grpc-1.5/grpc-1.5.gradle
+++ b/dd-java-agent/instrumentation/grpc-1.5/grpc-1.5.gradle
@@ -49,8 +49,6 @@ dependencies {
   testCompile group: 'io.grpc', name: 'grpc-stub', version: grpcVersion
   testCompile group: 'javax.annotation', name: 'javax.annotation-api', version: '1.3.2'
 
-  testCompile project(':dd-java-agent:instrumentation:java-concurrent')
-
   latestDepTestCompile sourceSets.test.output // include the protobuf generated classes
   latestDepTestCompile group: 'io.grpc', name: 'grpc-netty', version: '+'
   latestDepTestCompile group: 'io.grpc', name: 'grpc-protobuf', version: '+'
diff --git a/dd-java-agent/instrumentation/hystrix-1.4/hystrix-1.4.gradle b/dd-java-agent/instrumentation/hystrix-1.4/hystrix-1.4.gradle
index bf5a23ae7a..8368ff68ec 100644
--- a/dd-java-agent/instrumentation/hystrix-1.4/hystrix-1.4.gradle
+++ b/dd-java-agent/instrumentation/hystrix-1.4/hystrix-1.4.gradle
@@ -22,7 +22,6 @@ dependencies {
   compileOnly group: 'com.netflix.hystrix', name: 'hystrix-core', version: '1.4.0'
   compileOnly group: 'io.reactivex', name: 'rxjava', version: '1.0.7'
 
-  testCompile project(':dd-java-agent:instrumentation:java-concurrent')
   testCompile project(':dd-java-agent:instrumentation:trace-annotation')
 
   testCompile group: 'io.reactivex', name: 'rxjava', version: '1.0.7'
diff --git a/dd-java-agent/instrumentation/jax-rs-annotations-2/jax-rs-annotations-2.gradle b/dd-java-agent/instrumentation/jax-rs-annotations-2/jax-rs-annotations-2.gradle
index f3f6b920a1..a68814615a 100644
--- a/dd-java-agent/instrumentation/jax-rs-annotations-2/jax-rs-annotations-2.gradle
+++ b/dd-java-agent/instrumentation/jax-rs-annotations-2/jax-rs-annotations-2.gradle
@@ -28,7 +28,6 @@ testSets {
 dependencies {
   compileOnly group: 'javax.ws.rs', name: 'javax.ws.rs-api', version: '2.0'
 
-  testCompile project(':dd-java-agent:instrumentation:java-concurrent')
   testCompile project(':dd-java-agent:instrumentation:servlet:request-3')
   testCompile project(':dd-java-agent:instrumentation:jax-rs-annotations-2:filter-jersey')
   testCompile project(':dd-java-agent:instrumentation:jax-rs-annotations-2:filter-resteasy-3.0')
@@ -41,14 +40,14 @@ dependencies {
   testCompile group: 'com.fasterxml.jackson.module', name: 'jackson-module-afterburner', version: '2.9.10'
 
   latestDepTestCompile group: 'io.dropwizard', name: 'dropwizard-testing', version: '1.+'
-  
+
   // Resteasy
   testCompile group: 'org.jboss.resteasy', name: 'resteasy-jaxrs', version: '3.0.0.Final'
-  
+
   resteasy31TestCompile(group: 'org.jboss.resteasy', name: 'resteasy-jaxrs', version: '3.1.0.Final') {
     force = true
   }
-  
+
   latestDepTestCompile group: 'org.jboss.resteasy', name: 'resteasy-jaxrs', version: '+'
 }
 
diff --git a/dd-java-agent/instrumentation/jax-rs-client-2.0/jax-rs-client-2.0.gradle b/dd-java-agent/instrumentation/jax-rs-client-2.0/jax-rs-client-2.0.gradle
index 445a57a421..6993d488a5 100644
--- a/dd-java-agent/instrumentation/jax-rs-client-2.0/jax-rs-client-2.0.gradle
+++ b/dd-java-agent/instrumentation/jax-rs-client-2.0/jax-rs-client-2.0.gradle
@@ -27,8 +27,6 @@ dependencies {
   compileOnly group: 'javax.ws.rs', name: 'javax.ws.rs-api', version: '2.0.1'
   compileOnly group: 'javax.annotation', name: 'javax.annotation-api', version: '1.2'
 
-  testCompile project(':dd-java-agent:instrumentation:java-concurrent')
-
   testCompile project(':dd-java-agent:instrumentation:jax-rs-client-2.0:connection-error-handling-jersey')
   testCompile project(':dd-java-agent:instrumentation:jax-rs-client-2.0:connection-error-handling-resteasy')
 
diff --git a/dd-java-agent/instrumentation/jetty-8/jetty-8.gradle b/dd-java-agent/instrumentation/jetty-8/jetty-8.gradle
index 0a54a83ebf..00ac618a82 100644
--- a/dd-java-agent/instrumentation/jetty-8/jetty-8.gradle
+++ b/dd-java-agent/instrumentation/jetty-8/jetty-8.gradle
@@ -24,7 +24,6 @@ dependencies {
   testCompile(project(':dd-java-agent:testing')) {
     exclude group: 'org.eclipse.jetty', module: 'jetty-server'
   }
-  testCompile project(':dd-java-agent:instrumentation:java-concurrent')
 
   testCompile group: 'org.eclipse.jetty', name: 'jetty-server', version: '8.0.0.v20110901'
   testCompile group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '8.0.0.v20110901'
diff --git a/dd-java-agent/instrumentation/netty-4.0/netty-4.0.gradle b/dd-java-agent/instrumentation/netty-4.0/netty-4.0.gradle
index 9380d12710..5a067cbff6 100644
--- a/dd-java-agent/instrumentation/netty-4.0/netty-4.0.gradle
+++ b/dd-java-agent/instrumentation/netty-4.0/netty-4.0.gradle
@@ -43,8 +43,6 @@ testSets {
 dependencies {
   compileOnly group: 'io.netty', name: 'netty-codec-http', version: '4.0.0.Final'
 
-  testCompile project(':dd-java-agent:instrumentation:java-concurrent')
-
   testCompile group: 'io.netty', name: 'netty-codec-http', version: '4.0.0.Final'
   testCompile group: 'org.asynchttpclient', name: 'async-http-client', version: '2.0.0'
 
diff --git a/dd-java-agent/instrumentation/netty-4.1/netty-4.1.gradle b/dd-java-agent/instrumentation/netty-4.1/netty-4.1.gradle
index 56e83baa97..35d16d4a5e 100644
--- a/dd-java-agent/instrumentation/netty-4.1/netty-4.1.gradle
+++ b/dd-java-agent/instrumentation/netty-4.1/netty-4.1.gradle
@@ -42,7 +42,6 @@ testSets {
 dependencies {
   compileOnly group: 'io.netty', name: 'netty-codec-http', version: '4.1.0.Final'
 
-  testCompile project(':dd-java-agent:instrumentation:java-concurrent')
   testCompile project(':dd-java-agent:instrumentation:trace-annotation')
   testCompile group: 'io.netty', name: 'netty-codec-http', version: '4.1.0.Final'
   testCompile group: 'org.asynchttpclient', name: 'async-http-client', version: '2.1.0'
diff --git a/dd-java-agent/instrumentation/play-2.4/play-2.4.gradle b/dd-java-agent/instrumentation/play-2.4/play-2.4.gradle
index 9b10dec9aa..75b64eaa96 100644
--- a/dd-java-agent/instrumentation/play-2.4/play-2.4.gradle
+++ b/dd-java-agent/instrumentation/play-2.4/play-2.4.gradle
@@ -36,7 +36,6 @@ testSets {
 dependencies {
   main_java8Compile group: 'com.typesafe.play', name: 'play_2.11', version: '2.4.0'
 
-  testCompile project(':dd-java-agent:instrumentation:java-concurrent')
   testCompile project(':dd-java-agent:instrumentation:netty-4.0')
   testCompile project(':dd-java-agent:instrumentation:netty-4.1')
   testCompile project(':dd-java-agent:instrumentation:akka-http-10.0')
diff --git a/dd-java-agent/instrumentation/play-2.6/play-2.6.gradle b/dd-java-agent/instrumentation/play-2.6/play-2.6.gradle
index 595e834d96..1838c4550c 100644
--- a/dd-java-agent/instrumentation/play-2.6/play-2.6.gradle
+++ b/dd-java-agent/instrumentation/play-2.6/play-2.6.gradle
@@ -41,7 +41,6 @@ testSets {
 dependencies {
   main_java8Compile group: 'com.typesafe.play', name: "play_$scalaVersion", version: playVersion
 
-  testCompile project(':dd-java-agent:instrumentation:java-concurrent')
   testCompile project(':dd-java-agent:instrumentation:netty-4.0')
   testCompile project(':dd-java-agent:instrumentation:netty-4.1')
   testCompile project(':dd-java-agent:instrumentation:akka-http-10.0')
diff --git a/dd-java-agent/instrumentation/play-ws-1/play-ws-1.gradle b/dd-java-agent/instrumentation/play-ws-1/play-ws-1.gradle
index f739f33df4..36eb55d42d 100644
--- a/dd-java-agent/instrumentation/play-ws-1/play-ws-1.gradle
+++ b/dd-java-agent/instrumentation/play-ws-1/play-ws-1.gradle
@@ -41,8 +41,6 @@ dependencies {
   compile project(':dd-java-agent:instrumentation:play-ws')
   testCompile project(path: ':dd-java-agent:instrumentation:play-ws', configuration: 'testArtifacts')
 
-  testCompile project(':dd-java-agent:instrumentation:java-concurrent')
-
   // These are to ensure cross compatibility
   testCompile project(':dd-java-agent:instrumentation:netty-4.0')
   testCompile project(':dd-java-agent:instrumentation:netty-4.1')
diff --git a/dd-java-agent/instrumentation/play-ws-2.1/play-ws-2.1.gradle b/dd-java-agent/instrumentation/play-ws-2.1/play-ws-2.1.gradle
index 3f30bb3f6d..7ac380a4ff 100644
--- a/dd-java-agent/instrumentation/play-ws-2.1/play-ws-2.1.gradle
+++ b/dd-java-agent/instrumentation/play-ws-2.1/play-ws-2.1.gradle
@@ -64,8 +64,6 @@ dependencies {
   compile project(':dd-java-agent:instrumentation:play-ws')
   testCompile project(path: ':dd-java-agent:instrumentation:play-ws', configuration: 'testArtifacts')
 
-  testCompile project(':dd-java-agent:instrumentation:java-concurrent')
-
   // These are to ensure cross compatibility
   testCompile project(':dd-java-agent:instrumentation:netty-4.0')
   testCompile project(':dd-java-agent:instrumentation:netty-4.1')
diff --git a/dd-java-agent/instrumentation/play-ws-2/play-ws-2.gradle b/dd-java-agent/instrumentation/play-ws-2/play-ws-2.gradle
index 02b550a534..35b1638788 100644
--- a/dd-java-agent/instrumentation/play-ws-2/play-ws-2.gradle
+++ b/dd-java-agent/instrumentation/play-ws-2/play-ws-2.gradle
@@ -64,14 +64,12 @@ dependencies {
   compile project(':dd-java-agent:instrumentation:play-ws')
   testCompile project(path: ':dd-java-agent:instrumentation:play-ws', configuration: 'testArtifacts')
 
-  testCompile project(':dd-java-agent:instrumentation:java-concurrent')
-
   // These are to ensure cross compatibility
   testCompile project(':dd-java-agent:instrumentation:netty-4.0')
   testCompile project(':dd-java-agent:instrumentation:netty-4.1')
   testCompile project(':dd-java-agent:instrumentation:akka-http-10.0')
 
   testCompile group: 'com.typesafe.play', name: "play-ahc-ws-standalone_$scalaVersion", version: '2.0.0'
-  
+
   latestDepTestCompile group: 'com.typesafe.play', name: "play-ahc-ws-standalone_$scalaVersion", version: '2.0.+'
 }
diff --git a/dd-java-agent/instrumentation/ratpack-1.4/ratpack-1.4.gradle b/dd-java-agent/instrumentation/ratpack-1.4/ratpack-1.4.gradle
index 6bb358afb4..8724e91561 100644
--- a/dd-java-agent/instrumentation/ratpack-1.4/ratpack-1.4.gradle
+++ b/dd-java-agent/instrumentation/ratpack-1.4/ratpack-1.4.gradle
@@ -31,7 +31,6 @@ testSets {
 dependencies {
   main_java8CompileOnly group: 'io.ratpack', name: 'ratpack-core', version: '1.4.0'
 
-  testCompile project(':dd-java-agent:instrumentation:java-concurrent')
   testCompile project(':dd-java-agent:instrumentation:netty-4.1')
   testCompile group: 'io.ratpack', name: 'ratpack-groovy-test', version: '1.4.0'
   latestDepTestCompile group: 'io.ratpack', name: 'ratpack-groovy-test', version: '+'
diff --git a/dd-java-agent/instrumentation/reactor-core-3.1/reactor-core-3.1.gradle b/dd-java-agent/instrumentation/reactor-core-3.1/reactor-core-3.1.gradle
index 6c4a6e1e5a..3c1ff53639 100644
--- a/dd-java-agent/instrumentation/reactor-core-3.1/reactor-core-3.1.gradle
+++ b/dd-java-agent/instrumentation/reactor-core-3.1/reactor-core-3.1.gradle
@@ -27,7 +27,6 @@ dependencies {
   main_java8CompileOnly group: 'io.projectreactor', name: 'reactor-core', version: '3.1.0.RELEASE'
 
   testCompile project(':dd-java-agent:instrumentation:trace-annotation')
-  testCompile project(':dd-java-agent:instrumentation:java-concurrent')
 
   testCompile group: 'io.projectreactor', name: 'reactor-core', version: '3.1.0.RELEASE'
 
diff --git a/dd-java-agent/instrumentation/servlet/request-3/request-3.gradle b/dd-java-agent/instrumentation/servlet/request-3/request-3.gradle
index 4968ce0a5c..a029d13cc5 100644
--- a/dd-java-agent/instrumentation/servlet/request-3/request-3.gradle
+++ b/dd-java-agent/instrumentation/servlet/request-3/request-3.gradle
@@ -28,7 +28,6 @@ dependencies {
   testCompile(project(':dd-java-agent:testing')) {
     exclude group: 'org.eclipse.jetty', module: 'jetty-server'
   }
-  testCompile project(':dd-java-agent:instrumentation:java-concurrent')
   testCompile project(':dd-java-agent:instrumentation:jetty-8') // See if there's any conflicts.
   testCompile group: 'org.eclipse.jetty', name: 'jetty-server', version: '8.2.0.v20160908'
   testCompile group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '8.2.0.v20160908'
diff --git a/dd-java-agent/instrumentation/spring-webflux-5/spring-webflux-5.gradle b/dd-java-agent/instrumentation/spring-webflux-5/spring-webflux-5.gradle
index b395043ac7..4bf1dbc545 100644
--- a/dd-java-agent/instrumentation/spring-webflux-5/spring-webflux-5.gradle
+++ b/dd-java-agent/instrumentation/spring-webflux-5/spring-webflux-5.gradle
@@ -32,7 +32,6 @@ dependencies {
   // TODO: It is unclear why we need to use `compile` here (instead of 'compileOnly')
   compile project(':dd-java-agent:instrumentation:reactor-core-3.1')
 
-  testCompile project(':dd-java-agent:instrumentation:java-concurrent')
   testCompile project(':dd-java-agent:instrumentation:trace-annotation')
   testCompile project(':dd-java-agent:instrumentation:netty-4.1')
   testCompile project(':dd-java-agent:instrumentation:reactor-core-3.1')
diff --git a/dd-java-agent/instrumentation/twilio/twilio.gradle b/dd-java-agent/instrumentation/twilio/twilio.gradle
index 86465e983e..a2ee148751 100644
--- a/dd-java-agent/instrumentation/twilio/twilio.gradle
+++ b/dd-java-agent/instrumentation/twilio/twilio.gradle
@@ -19,7 +19,6 @@ dependencies {
 
   testCompile group: 'com.twilio.sdk', name: 'twilio', version: '0.0.1'
   testCompile project(':dd-java-agent:instrumentation:apache-httpclient-4')
-  testCompile project(':dd-java-agent:instrumentation:java-concurrent')
   testCompile group: 'nl.jqno.equalsverifier', name: 'equalsverifier', version: '2.5.2' // Last version to support Java7
 
   latestDepTestCompile group: 'com.twilio.sdk', name: 'twilio', version: '+'
diff --git a/dd-java-agent/instrumentation/vertx/vertx.gradle b/dd-java-agent/instrumentation/vertx/vertx.gradle
index 15db39edfb..e2b5a7a0bc 100644
--- a/dd-java-agent/instrumentation/vertx/vertx.gradle
+++ b/dd-java-agent/instrumentation/vertx/vertx.gradle
@@ -20,7 +20,6 @@ dependencies {
 //  compileOnly group: 'io.vertx', name: 'vertx-web', version: '3.5.0'
 
   testCompile project(':dd-java-agent:instrumentation:netty-4.1')
-  testCompile project(':dd-java-agent:instrumentation:java-concurrent')
   testCompile project(':dd-java-agent:instrumentation:trace-annotation')
 
   // Tests seem to fail before 3.5... maybe a problem with some of the tests?