diff --git a/instrumentation/vertx-reactive-3.5/javaagent/build.gradle.kts b/instrumentation/vertx-reactive-3.5/javaagent/build.gradle.kts index edf4f390f3..2ca51b3daa 100644 --- a/instrumentation/vertx-reactive-3.5/javaagent/build.gradle.kts +++ b/instrumentation/vertx-reactive-3.5/javaagent/build.gradle.kts @@ -19,9 +19,9 @@ dependencies { testInstrumentation(project(":instrumentation:jdbc:javaagent")) testInstrumentation(project(":instrumentation:netty:netty-4.1:javaagent")) + testInstrumentation(project(":instrumentation:rxjava:rxjava-2.0:javaagent")) testInstrumentation(project(":instrumentation:vertx-http-client-3.0:javaagent")) testInstrumentation(project(":instrumentation:vertx-web-3.0:javaagent")) - //TODO we should include rjxava2 instrumentation here as well testLibrary("io.vertx:vertx-web-client:${vertxVersion}") testLibrary("io.vertx:vertx-jdbc-client:${vertxVersion}") diff --git a/instrumentation/vertx-reactive-3.5/javaagent/src/test/groovy/client/VertxRxCircuitBreakerWebClientTest.groovy b/instrumentation/vertx-reactive-3.5/javaagent/src/test/groovy/client/VertxRxCircuitBreakerWebClientTest.groovy index 3f6f5c9939..70624fdbeb 100644 --- a/instrumentation/vertx-reactive-3.5/javaagent/src/test/groovy/client/VertxRxCircuitBreakerWebClientTest.groovy +++ b/instrumentation/vertx-reactive-3.5/javaagent/src/test/groovy/client/VertxRxCircuitBreakerWebClientTest.groovy @@ -104,11 +104,4 @@ class VertxRxCircuitBreakerWebClientTest extends HttpClientTest> SingleConnection createSingleConnection(String host, int port) { return new VertxRxCircuitBreakerSingleConnection(host, port, breaker) } - - @Override - boolean testCallbackWithParent() { - //Make rxjava2 instrumentation work with vert.x reactive in order to fix this test - return false - } - } diff --git a/instrumentation/vertx-reactive-3.5/javaagent/src/test/groovy/client/VertxRxWebClientTest.groovy b/instrumentation/vertx-reactive-3.5/javaagent/src/test/groovy/client/VertxRxWebClientTest.groovy index 0eab797f84..c8597ebd19 100644 --- a/instrumentation/vertx-reactive-3.5/javaagent/src/test/groovy/client/VertxRxWebClientTest.groovy +++ b/instrumentation/vertx-reactive-3.5/javaagent/src/test/groovy/client/VertxRxWebClientTest.groovy @@ -92,10 +92,4 @@ class VertxRxWebClientTest extends HttpClientTest> implement SingleConnection createSingleConnection(String host, int port) { return new VertxRxSingleConnection(host, port) } - - @Override - boolean testCallbackWithParent() { - //Make rxjava2 instrumentation work with vert.x reactive in order to fix this test - return false - } }