diff --git a/instrumentation/vertx/vertx-http-client/vertx-http-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/client/ConnectionManagerInstrumentation.java b/instrumentation/vertx/vertx-http-client/vertx-http-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/client/ConnectionManagerInstrumentation.java index b92954a2e882..ecaf34449e42 100644 --- a/instrumentation/vertx/vertx-http-client/vertx-http-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/client/ConnectionManagerInstrumentation.java +++ b/instrumentation/vertx/vertx-http-client/vertx-http-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/client/ConnectionManagerInstrumentation.java @@ -32,6 +32,10 @@ public void transform(TypeTransformer transformer) { transformer.applyAdviceToMethod( named("getConnection").and(takesArgument(3, named("io.vertx.core.Handler"))), ConnectionManagerInstrumentation.class.getName() + "$GetConnectionArg3Advice"); + // since 4.3.4 + transformer.applyAdviceToMethod( + named("getConnection").and(takesArgument(4, named("io.vertx.core.Handler"))), + ConnectionManagerInstrumentation.class.getName() + "$GetConnectionArg4Advice"); } @SuppressWarnings("unused") @@ -51,4 +55,13 @@ public static void wrapHandler( handler = HandlerWrapper.wrap(handler); } } + + @SuppressWarnings("unused") + public static class GetConnectionArg4Advice { + @Advice.OnMethodEnter(suppress = Throwable.class) + public static void wrapHandler( + @Advice.Argument(value = 4, readOnly = false) Handler handler) { + handler = HandlerWrapper.wrap(handler); + } + } } diff --git a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/build.gradle.kts b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/build.gradle.kts index 9b3587daa29e..4d1e6d49f6c6 100644 --- a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/build.gradle.kts +++ b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/build.gradle.kts @@ -50,11 +50,9 @@ dependencies { add("version35TestImplementation", "io.vertx:vertx-jdbc-client:$vertxVersion") add("version35TestImplementation", "io.vertx:vertx-circuit-breaker:$vertxVersion") - // concurrency tests are failing with 4.3.4 - // tracking at https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues/6790 - add("latestDepTestImplementation", "io.vertx:vertx-web:4.3.3") - add("latestDepTestImplementation", "io.vertx:vertx-rx-java2:4.3.3") - add("latestDepTestImplementation", "io.vertx:vertx-web-client:4.3.3") - add("latestDepTestImplementation", "io.vertx:vertx-jdbc-client:4.3.3") - add("latestDepTestImplementation", "io.vertx:vertx-circuit-breaker:4.3.3") + add("latestDepTestImplementation", "io.vertx:vertx-web:4.+") + add("latestDepTestImplementation", "io.vertx:vertx-rx-java2:4.+") + add("latestDepTestImplementation", "io.vertx:vertx-web-client:4.+") + add("latestDepTestImplementation", "io.vertx:vertx-jdbc-client:4.+") + add("latestDepTestImplementation", "io.vertx:vertx-circuit-breaker:4.+") }