open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Include rxjava2 instrumentation for vertx reactive tests (#3668)

This commit is contained in:
Lauri Tulmin 2021-07-26 05:42:00 +03:00 committed by GitHub
parent 4db7bd5ff3
commit c3d26f99fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
instrumentation/vertx-reactive-3.5/javaagent/build.gradle.kts
View File

@ -19,9 +19,9 @@ dependencies {
testInstrumentation(project(":instrumentation:jdbc:javaagent")) testInstrumentation(project(":instrumentation:jdbc:javaagent"))
testInstrumentation(project(":instrumentation:netty:netty-4.1: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-http-client-3.0:javaagent"))
testInstrumentation(project(":instrumentation:vertx-web-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-web-client:${vertxVersion}")
testLibrary("io.vertx:vertx-jdbc-client:${vertxVersion}") testLibrary("io.vertx:vertx-jdbc-client:${vertxVersion}")

7
instrumentation/vertx-reactive-3.5/javaagent/src/test/groovy/client/VertxRxCircuitBreakerWebClientTest.groovy
View File

@ -104,11 +104,4 @@ class VertxRxCircuitBreakerWebClientTest extends HttpClientTest<HttpRequest<?>>
SingleConnection createSingleConnection(String host, int port) { SingleConnection createSingleConnection(String host, int port) {
return new VertxRxCircuitBreakerSingleConnection(host, port, breaker) 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
}
} }

6
instrumentation/vertx-reactive-3.5/javaagent/src/test/groovy/client/VertxRxWebClientTest.groovy
View File

@ -92,10 +92,4 @@ class VertxRxWebClientTest extends HttpClientTest<HttpRequest<Buffer>> implement
SingleConnection createSingleConnection(String host, int port) { SingleConnection createSingleConnection(String host, int port) {
return new VertxRxSingleConnection(host, 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
}
} }