Fix vertx modules
MODIFY
instrumentation/vertx/vertx-http-client/vertx-http-client-3.0/javaagent/build.gradle.kts
instrumentation/vertx/vertx-http-client/vertx-http-client-3.0/javaagent/build.gradle.kts
@@ -17,7 +17,7 @@ dependencies {
compileOnly("com.google.auto.value:auto-value-annotations")
annotationProcessor("com.google.auto.value:auto-value")
- implementation(project(":instrumentation:vertx-http-client:vertx-http-client-common:javaagent"))
+ implementation(project(":instrumentation:vertx:vertx-http-client:vertx-http-client-common:javaagent"))
// We need both version as different versions of Vert.x use different versions of Netty
testInstrumentation(project(":instrumentation:netty:netty-4.0:javaagent"))

MODIFY
instrumentation/vertx/vertx-http-client/vertx-http-client-4.0/javaagent/build.gradle.kts
instrumentation/vertx/vertx-http-client/vertx-http-client-4.0/javaagent/build.gradle.kts
@@ -14,7 +14,7 @@ muzzle {
dependencies {
library("io.vertx:vertx-core:4.0.0")
- implementation(project(":instrumentation:vertx-http-client:vertx-http-client-common:javaagent"))
+ implementation(project(":instrumentation:vertx:vertx-http-client:vertx-http-client-common:javaagent"))
testInstrumentation(project(":instrumentation:netty:netty-4.1:javaagent"))
}

MODIFY
instrumentation/vertx/vertx-reactive-3.5/javaagent/build.gradle.kts
instrumentation/vertx/vertx-reactive-3.5/javaagent/build.gradle.kts
@@ -32,9 +32,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:vertx-http-client-3.0:javaagent"))
- testInstrumentation(project(":instrumentation:vertx-http-client:vertx-http-client-4.0:javaagent"))
- testInstrumentation(project(":instrumentation:vertx-web-3.0:javaagent"))
+ testInstrumentation(project(":instrumentation:vertx:vertx-http-client:vertx-http-client-3.0:javaagent"))
+ testInstrumentation(project(":instrumentation:vertx:vertx-http-client:vertx-http-client-4.0:javaagent"))
+ testInstrumentation(project(":instrumentation:vertx:vertx-web-3.0:javaagent"))
testImplementation("org.hsqldb:hsqldb:2.3.4")

MODIFY
instrumentation/vertx/vertx-web-3.0/javaagent/build.gradle.kts
instrumentation/vertx/vertx-web-3.0/javaagent/build.gradle.kts
@@ -31,7 +31,7 @@ dependencies {
testInstrumentation(project(":instrumentation:netty:netty-4.1:javaagent"))
testInstrumentation(project(":instrumentation:jdbc:javaagent"))
- testImplementation(project(":instrumentation:vertx-web-3.0:testing"))
+ testImplementation(project(":instrumentation:vertx:vertx-web-3.0:testing"))
add("version3TestImplementation", "io.vertx:vertx-web:3.0.0")
add("version3TestImplementation", "io.vertx:vertx-jdbc-client:3.0.0")

MODIFY
settings.gradle.kts
settings.gradle.kts
@@ -387,12 +387,12 @@ include(":instrumentation:undertow-1.4:bootstrap")
include(":instrumentation:undertow-1.4:javaagent")
include(":instrumentation:vaadin-14.2:javaagent")
include(":instrumentation:vaadin-14.2:testing")
-include(":instrumentation:vertx-http-client:vertx-http-client-3.0:javaagent")
-include(":instrumentation:vertx-http-client:vertx-http-client-4.0:javaagent")
-include(":instrumentation:vertx-http-client:vertx-http-client-common:javaagent")
-include(":instrumentation:vertx-reactive-3.5:javaagent")
-include(":instrumentation:vertx-web-3.0:javaagent")
-include(":instrumentation:vertx-web-3.0:testing")
+include(":instrumentation:vertx:vertx-http-client:vertx-http-client-3.0:javaagent")
+include(":instrumentation:vertx:vertx-http-client:vertx-http-client-4.0:javaagent")
+include(":instrumentation:vertx:vertx-http-client:vertx-http-client-common:javaagent")
+include(":instrumentation:vertx:vertx-reactive-3.5:javaagent")
+include(":instrumentation:vertx:vertx-web-3.0:javaagent")
+include(":instrumentation:vertx:vertx-web-3.0:testing")
include(":instrumentation:wicket-8.0:javaagent")
// benchmark

Fix vertx modules (#4967)