Merge branch 'main' of github.com:open-telemetry/opentelemetry-java-instrumentation into indy-migration-2

SylvainJuge · SylvainJuge · commit d0ef02451be8 · 2025-05-23T15:30:42.000+02:00
diff --git a/benchmark-overhead-jmh/build.gradle.kts b/benchmark-overhead-jmh/build.gradle.kts
@@ -13,7 +13,7 @@ otelJava {
 }
 
 dependencies {
-  jmhImplementation("org.springframework.boot:spring-boot-starter-web:3.4.5")
+  jmhImplementation("org.springframework.boot:spring-boot-starter-web:3.5.0")
 }
 
 tasks {
diff --git a/benchmark-overhead/gradle/wrapper/gradle-wrapper.properties b/benchmark-overhead/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=61ad310d3c7d3e5da131b76bbf22b5a4c0786e9d892dae8c1658d4b484de3caa
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
+distributionSha256Sum=845952a9d6afa783db70bb3b0effaae45ae5542ca2bb7929619e8af49cb634cf
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/docs/contributing/running-tests.md b/docs/contributing/running-tests.md
@@ -2,7 +2,7 @@
 
 ## Java versions
 
-Open Telemetry Auto Instrumentation's minimal supported version is java 8.
+OpenTelemetry Auto Instrumentation's minimal supported version is java 8.
 All jar files that we produce, unless noted otherwise, have bytecode
 compatibility with the java 8 runtime. Our test suite is executed against
 java 8, all LTS versions and the latest non-LTS version.
diff --git a/examples/distro/gradle/wrapper/gradle-wrapper.properties b/examples/distro/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=61ad310d3c7d3e5da131b76bbf22b5a4c0786e9d892dae8c1658d4b484de3caa
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
+distributionSha256Sum=845952a9d6afa783db70bb3b0effaae45ae5542ca2bb7929619e8af49cb634cf
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/examples/extension/gradle/wrapper/gradle-wrapper.properties b/examples/extension/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=61ad310d3c7d3e5da131b76bbf22b5a4c0786e9d892dae8c1658d4b484de3caa
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
+distributionSha256Sum=845952a9d6afa783db70bb3b0effaae45ae5542ca2bb7929619e8af49cb634cf
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradle-plugins/gradle/wrapper/gradle-wrapper.properties b/gradle-plugins/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=61ad310d3c7d3e5da131b76bbf22b5a4c0786e9d892dae8c1658d4b484de3caa
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
+distributionSha256Sum=845952a9d6afa783db70bb3b0effaae45ae5542ca2bb7929619e8af49cb634cf
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=61ad310d3c7d3e5da131b76bbf22b5a4c0786e9d892dae8c1658d4b484de3caa
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
+distributionSha256Sum=845952a9d6afa783db70bb3b0effaae45ae5542ca2bb7929619e8af49cb634cf
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/instrumentation/apache-httpclient/apache-httpclient-5.2/library/README.md b/instrumentation/apache-httpclient/apache-httpclient-5.2/library/README.md
@@ -47,12 +47,12 @@ public class ApacheHttpClientConfiguration {
     this.openTelemetry = openTelemetry;
   }
 
-  // creates a new http client builder for constructing http clients with open telemetry instrumentation
+  // creates a new http client builder for constructing http clients with opentelemetry instrumentation
   public HttpClientBuilder createBuilder() {
     return ApacheHttpClientTelemetry.builder(openTelemetry).build().newHttpClientBuilder();
   }
 
-  // creates a new http client with open telemetry instrumentation
+  // creates a new http client with opentelemetry instrumentation
   public HttpClient newHttpClient() {
     return ApacheHttpClientTelemetry.builder(openTelemetry).build().newHttpClient();
   }
diff --git a/instrumentation/jaxrs-client/jaxrs-client-2.0-testing/build.gradle.kts b/instrumentation/jaxrs-client/jaxrs-client-2.0-testing/build.gradle.kts
@@ -8,7 +8,8 @@ dependencies {
   testLibrary("org.glassfish.jersey.core:jersey-client:2.0")
   testLibrary("org.jboss.resteasy:resteasy-client:3.0.5.Final")
   // ^ This version has timeouts https://issues.redhat.com/browse/RESTEASY-975
-  testLibrary("org.apache.cxf:cxf-rt-rs-client:3.1.0")
+  // testLibrary("org.apache.cxf:cxf-rt-rs-client:3.1.0")
+  testImplementation("org.apache.cxf:cxf-rt-rs-client:3.1.0")
   // Doesn't work with CXF 3.0.x because their context is wrong:
   // https://github.com/apache/cxf/commit/335c7bad2436f08d6d54180212df5a52157c9f21
 
@@ -24,7 +25,8 @@ dependencies {
   latestDepTestLibrary("org.glassfish.jersey.inject:jersey-hk2:2.+")
   latestDepTestLibrary("org.glassfish.jersey.core:jersey-client:2.+")
   latestDepTestLibrary("org.jboss.resteasy:resteasy-client:3.0.26.Final")
-  latestDepTestLibrary("org.apache.cxf:cxf-rt-rs-client:3.+")
+  // latestDepTestLibrary("org.apache.cxf:cxf-rt-rs-client:3.+")
+  latestDepTestLibrary("org.apache.cxf:cxf-rt-rs-client:3.6.6")
 }
 
 // Requires old Guava. Can't use enforcedPlatform since predates BOM
diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-cxf-3.2/javaagent/build.gradle.kts b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-cxf-3.2/javaagent/build.gradle.kts
@@ -10,6 +10,7 @@ muzzle {
     module.set("cxf-rt-frontend-jaxrs")
     versions.set("[3.2,4)")
     extraDependency("javax.servlet:javax.servlet-api:3.1.0")
+    skip("3.6.7") // version is present in maven metadata, but pom and jar are missing
   }
   pass {
     group.set("org.apache.tomee")
@@ -26,7 +27,9 @@ dependencies {
 
   compileOnly("javax.ws.rs:javax.ws.rs-api:2.0")
   compileOnly("javax.servlet:javax.servlet-api:3.1.0")
-  library("org.apache.cxf:cxf-rt-frontend-jaxrs:3.2.0")
+  // library("org.apache.cxf:cxf-rt-frontend-jaxrs:3.2.0")
+  compileOnly("org.apache.cxf:cxf-rt-frontend-jaxrs:3.2.0")
+  testImplementation("org.apache.cxf:cxf-rt-frontend-jaxrs:3.2.0")
 
   implementation(project(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-common:javaagent"))
 
@@ -47,7 +50,8 @@ dependencies {
   testLibrary("org.apache.cxf:cxf-rt-ws-policy:3.2.0")
 
   latestDepTestLibrary("org.eclipse.jetty:jetty-webapp:10.+") // documented limitation
-  latestDepTestLibrary("org.apache.cxf:cxf-rt-frontend-jaxrs:3.+") // documented limitation
+  latestDepTestLibrary("org.apache.cxf:cxf-rt-frontend-jaxrs:3.6.6") // documented limitation
+  // latestDepTestLibrary("org.apache.cxf:cxf-rt-frontend-jaxrs:3.+") // documented limitation
   latestDepTestLibrary("org.apache.cxf:cxf-rt-transports-http-jetty:3.+") // documented limitation
   latestDepTestLibrary("org.apache.cxf:cxf-rt-ws-policy:3.+") // documented limitation
 }
diff --git a/instrumentation/jaxws/jaxws-cxf-3.0/javaagent/build.gradle.kts b/instrumentation/jaxws/jaxws-cxf-3.0/javaagent/build.gradle.kts
@@ -11,13 +11,17 @@ muzzle {
     versions.set("[3.0.0,)")
     extraDependency("javax.servlet:javax.servlet-api:3.0.1")
     extraDependency("jakarta.servlet:jakarta.servlet-api:5.0.0")
+    skip("3.6.7") // version is present in maven metadata, but pom and jar are missing
   }
 }
 
 dependencies {
   bootstrap(project(":instrumentation:servlet:servlet-common:bootstrap"))
 
-  library("org.apache.cxf:cxf-rt-frontend-jaxws:3.0.0")
+  // library("org.apache.cxf:cxf-rt-frontend-jaxws:3.0.0")
+  compileOnly("org.apache.cxf:cxf-rt-frontend-jaxws:3.0.0")
+  testImplementation("org.apache.cxf:cxf-rt-frontend-jaxws:3.0.0")
+
   compileOnly("javax.servlet:javax.servlet-api:3.0.1")
   compileOnly("jakarta.servlet:jakarta.servlet-api:5.0.0")
   compileOnly(project(":muzzle"))
@@ -40,7 +44,8 @@ dependencies {
   testImplementation("javax.annotation:javax.annotation-api:1.2")
   testImplementation("com.sun.xml.messaging.saaj:saaj-impl:1.5.2")
 
-  latestDepTestLibrary("org.apache.cxf:cxf-rt-frontend-jaxws:3.+") // documented limitation
+  latestDepTestLibrary("org.apache.cxf:cxf-rt-frontend-jaxws:3.6.6") // documented limitation
+  // latestDepTestLibrary("org.apache.cxf:cxf-rt-frontend-jaxws:3.+") // documented limitation
   latestDepTestLibrary("org.apache.cxf:cxf-rt-transports-http:3.+") // documented limitation
 }
 
diff --git a/instrumentation/jmx-metrics/README.md b/instrumentation/jmx-metrics/README.md
@@ -6,7 +6,7 @@ local [MBeans](https://docs.oracle.com/javase/tutorial/jmx/mbeans/index.html)
 available within the instrumented application. The required MBeans and corresponding metrics can be described using a YAML configuration file. The individual metric configurations allow precise metric selection and identification.
 
 The selected JMX metrics are reported using the Java Agent internal SDK. This means that they share the configuration and metric exporter with other metrics collected by the agent and are controlled by the same properties, for example `otel.metric.export.interval` or `otel.metrics.exporter`.
-The Open Telemetry resource description for the metrics reported by JMX Metric Insight will be the same as for other metrics exported by the SDK, while the instrumentation scope will be `io.opentelemetry.jmx`.
+The OpenTelemetry resource description for the metrics reported by JMX Metric Insight will be the same as for other metrics exported by the SDK, while the instrumentation scope will be `io.opentelemetry.jmx`.
 
 To control the time interval between MBean detection attempts, one can use the `otel.jmx.discovery.delay` property, which defines the number of milliseconds to elapse between the first and the next detection cycle. JMX Metric Insight may dynamically adjust the time interval between further attempts, but it guarantees that the MBean discovery will run perpetually.
 
diff --git a/instrumentation/jmx-metrics/library/src/main/java/io/opentelemetry/instrumentation/jmx/engine/MetricDef.java b/instrumentation/jmx-metrics/library/src/main/java/io/opentelemetry/instrumentation/jmx/engine/MetricDef.java
@@ -8,7 +8,7 @@
 import java.util.List;
 
 /**
- * A class providing a complete definition on how to create an Open Telemetry metric out of the JMX
+ * A class providing a complete definition on how to create an OpenTelemetry metric out of the JMX
  * system: how to extract values from MBeans and how to model, name and decorate them with
  * attributes using OpenTelemetry Metric API. Objects of this class are immutable.
  */
diff --git a/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/web/SpringWebInstrumentationAutoConfiguration.java b/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/web/SpringWebInstrumentationAutoConfiguration.java
@@ -18,7 +18,7 @@
 /**
  * Configures {@link RestTemplate} for tracing.
  *
- * <p>Adds Open Telemetry instrumentation to RestTemplate beans after initialization.
+ * <p>Adds OpenTelemetry instrumentation to RestTemplate beans after initialization.
  *
  * <p>This class is internal and is hence not for public use. Its APIs are unstable and can change
  * at any time.
diff --git a/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/webflux/SpringWebfluxInstrumentationAutoConfiguration.java b/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/webflux/SpringWebfluxInstrumentationAutoConfiguration.java
@@ -18,7 +18,7 @@
 /**
  * Configures {@link WebClient} for tracing.
  *
- * <p>Adds Open Telemetry instrumentation to WebClient beans after initialization.
+ * <p>Adds OpenTelemetry instrumentation to WebClient beans after initialization.
  *
  * <p>This class is internal and is hence not for public use. Its APIs are unstable and can change
  * at any time.
diff --git a/instrumentation/spring/spring-boot-autoconfigure/src/main/javaSpring3/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/web/RestClientInstrumentationAutoConfiguration.java b/instrumentation/spring/spring-boot-autoconfigure/src/main/javaSpring3/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/web/RestClientInstrumentationAutoConfiguration.java
@@ -20,7 +20,7 @@
 /**
  * Configures {@link RestClient} for tracing.
  *
- * <p>Adds Open Telemetry instrumentation to {@link RestClient} beans after initialization.
+ * <p>Adds OpenTelemetry instrumentation to {@link RestClient} beans after initialization.
  *
  * <p>This class is internal and is hence not for public use. Its APIs are unstable and can change
  * at any time.
diff --git a/instrumentation/vertx/vertx-web-3.0/javaagent/build.gradle.kts b/instrumentation/vertx/vertx-web-3.0/javaagent/build.gradle.kts
@@ -20,45 +20,59 @@ dependencies {
   testInstrumentation(project(":instrumentation:jdbc:javaagent"))
 }
 
+val testLatestDeps = findProperty("testLatestDeps") as Boolean
+
 testing {
   suites {
     val version3Test by registering(JvmTestSuite::class) {
       dependencies {
         implementation(project(":instrumentation:vertx:vertx-web-3.0:testing"))
 
-        implementation("io.vertx:vertx-web:3.0.0")
-        implementation("io.vertx:vertx-jdbc-client:3.0.0")
-        implementation("io.vertx:vertx-codegen:3.0.0")
-        implementation("io.vertx:vertx-docgen:3.0.0")
+        val version = if (testLatestDeps) "3.+" else "3.0.0"
+        implementation("io.vertx:vertx-web:$version")
+        implementation("io.vertx:vertx-jdbc-client:$version")
+        implementation("io.vertx:vertx-codegen:$version")
+        implementation("io.vertx:vertx-docgen:$version")
       }
     }
 
-    val latestDepTest by registering(JvmTestSuite::class) {
+    val version41Test by registering(JvmTestSuite::class) {
       dependencies {
         implementation(project(":instrumentation:vertx:vertx-web-3.0:testing"))
 
-        implementation("io.vertx:vertx-web:4.+")
-        implementation("io.vertx:vertx-jdbc-client:4.+")
-        implementation("io.vertx:vertx-codegen:4.+")
+        val version = if (testLatestDeps) "4.+" else "4.1.0"
+        implementation("io.vertx:vertx-web:$version")
+        implementation("io.vertx:vertx-jdbc-client:$version")
+        implementation("io.vertx:vertx-codegen:$version")
+      }
+    }
+
+    val version5Test by registering(JvmTestSuite::class) {
+      dependencies {
+        implementation(project(":instrumentation:vertx:vertx-web-3.0:testing"))
+
+        val version = if (testLatestDeps) "latest.release" else "5.0.0"
+        implementation("io.vertx:vertx-web:$version")
+        implementation("io.vertx:vertx-jdbc-client:$version")
+        implementation("io.vertx:vertx-codegen:$version")
       }
     }
   }
 }
 
-val testLatestDeps = findProperty("testLatestDeps") as Boolean
-
 tasks {
-  if (testLatestDeps) {
-    // disable regular test running and compiling tasks when latest dep test task is run
-    named("test") {
+  named("compileVersion5TestJava", JavaCompile::class).configure {
+    options.release.set(11)
+  }
+  val testJavaVersion =
+    gradle.startParameter.projectProperties.get("testJavaVersion")?.let(JavaVersion::toVersion)
+      ?: JavaVersion.current()
+  if (!testJavaVersion.isCompatibleWith(JavaVersion.VERSION_11)) {
+    named("version5Test", Test::class).configure {
       enabled = false
     }
   }
 
-  named("latestDepTest") {
-    enabled = testLatestDeps
-  }
-
   check {
     dependsOn(testing.suites)
   }
diff --git a/instrumentation/vertx/vertx-web-3.0/javaagent/src/version41Test/java/io/netty/handler/codec/haproxy/HAProxyMessage.java b/instrumentation/vertx/vertx-web-3.0/javaagent/src/version41Test/java/io/netty/handler/codec/haproxy/HAProxyMessage.java
diff --git a/instrumentation/vertx/vertx-web-3.0/javaagent/src/version41Test/java/io/netty/handler/codec/haproxy/HAProxyProxiedProtocol.java b/instrumentation/vertx/vertx-web-3.0/javaagent/src/version41Test/java/io/netty/handler/codec/haproxy/HAProxyProxiedProtocol.java
diff --git a/instrumentation/vertx/vertx-web-3.0/javaagent/src/version41Test/java/io/opentelemetry/javaagent/instrumentation/vertx/Vertx41HttpServerTest.java b/instrumentation/vertx/vertx-web-3.0/javaagent/src/version41Test/java/io/opentelemetry/javaagent/instrumentation/vertx/Vertx41HttpServerTest.java
@@ -8,11 +8,11 @@
 import io.vertx.core.AbstractVerticle;
 import io.vertx.core.Vertx;
 
-class VertxLatestHttpServerTest extends AbstractVertxHttpServerTest {
+class Vertx41HttpServerTest extends AbstractVertxHttpServerTest {
 
   @Override
   protected Class<? extends AbstractVerticle> verticle() {
-    return VertxLatestWebServer.class;
+    return Vertx41WebServer.class;
   }
 
   @Override
diff --git a/instrumentation/vertx/vertx-web-3.0/javaagent/src/version41Test/java/io/opentelemetry/javaagent/instrumentation/vertx/Vertx41WebServer.java b/instrumentation/vertx/vertx-web-3.0/javaagent/src/version41Test/java/io/opentelemetry/javaagent/instrumentation/vertx/Vertx41WebServer.java
@@ -9,7 +9,7 @@
 import io.vertx.core.http.HttpServerResponse;
 import io.vertx.ext.web.Router;
 
-public class VertxLatestWebServer extends AbstractVertxWebServer {
+public class Vertx41WebServer extends AbstractVertxWebServer {
 
   @Override
   public void end(HttpServerResponse response) {
diff --git a/instrumentation/vertx/vertx-web-3.0/javaagent/src/version5Test/java/io/netty/handler/codec/haproxy/HAProxyMessage.java b/instrumentation/vertx/vertx-web-3.0/javaagent/src/version5Test/java/io/netty/handler/codec/haproxy/HAProxyMessage.java
@@ -0,0 +1,10 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.netty.handler.codec.haproxy;
+
+// instrumentation fails without this class
+@SuppressWarnings("checkstyle:AbbreviationAsWordInName")
+public class HAProxyMessage {}
diff --git a/instrumentation/vertx/vertx-web-3.0/javaagent/src/version5Test/java/io/netty/handler/codec/haproxy/HAProxyProxiedProtocol.java b/instrumentation/vertx/vertx-web-3.0/javaagent/src/version5Test/java/io/netty/handler/codec/haproxy/HAProxyProxiedProtocol.java
@@ -0,0 +1,10 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.netty.handler.codec.haproxy;
+
+// instrumentation fails without this class
+@SuppressWarnings("checkstyle:AbbreviationAsWordInName")
+public class HAProxyProxiedProtocol {}
diff --git a/instrumentation/vertx/vertx-web-3.0/javaagent/src/version5Test/java/io/opentelemetry/javaagent/instrumentation/vertx/Vertx5HttpServerTest.java b/instrumentation/vertx/vertx-web-3.0/javaagent/src/version5Test/java/io/opentelemetry/javaagent/instrumentation/vertx/Vertx5HttpServerTest.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.javaagent.instrumentation.vertx;
+
+import io.vertx.core.AbstractVerticle;
+import io.vertx.core.DeploymentOptions;
+import io.vertx.core.Vertx;
+import io.vertx.core.VertxOptions;
+import io.vertx.core.json.JsonObject;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+class Vertx5HttpServerTest extends AbstractVertxHttpServerTest {
+
+  @Override
+  protected Class<? extends AbstractVerticle> verticle() {
+    return Vertx5WebServer.class;
+  }
+
+  @Override
+  protected Vertx setupServer()
+      throws ExecutionException, InterruptedException, TimeoutException, NoSuchMethodException {
+    Vertx server =
+        Vertx.vertx(
+            new VertxOptions()
+            // Useful for debugging:
+            // .setBlockedThreadCheckInterval(Integer.MAX_VALUE)
+            );
+    CompletableFuture<Void> future = new CompletableFuture<>();
+
+    server
+        .deployVerticle(
+            verticle().getName(),
+            new DeploymentOptions()
+                .setConfig(
+                    new JsonObject()
+                        .put(AbstractVertxWebServer.CONFIG_HTTP_SERVER_PORT, (Object) port))
+                .setInstances(3))
+        .onComplete(
+            res -> {
+              if (!res.succeeded()) {
+                throw new IllegalStateException("Cannot deploy server Verticle", res.cause());
+              }
+              future.complete(null);
+            });
+
+    future.get(30, TimeUnit.SECONDS);
+    return server;
+  }
+
+  @Override
+  protected void stopServer(Vertx server) throws Exception {
+    server.close();
+  }
+}
diff --git a/instrumentation/vertx/vertx-web-3.0/javaagent/src/version5Test/java/io/opentelemetry/javaagent/instrumentation/vertx/Vertx5WebServer.java b/instrumentation/vertx/vertx-web-3.0/javaagent/src/version5Test/java/io/opentelemetry/javaagent/instrumentation/vertx/Vertx5WebServer.java

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ otelJava {`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`dependencies {`
`16`		`- jmhImplementation("org.springframework.boot:spring-boot-starter-web:3.4.5")`
	`16`	`+ jmhImplementation("org.springframework.boot:spring-boot-starter-web:3.5.0")`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`tasks {`
Original file line number	Diff line number	Diff line change
`@@ -47,12 +47,12 @@ public class ApacheHttpClientConfiguration {`
`47`	`47`	`this.openTelemetry = openTelemetry;`
`48`	`48`	`}`
`49`	`49`
`50`		`- // creates a new http client builder for constructing http clients with open telemetry instrumentation`
	`50`	`+ // creates a new http client builder for constructing http clients with opentelemetry instrumentation`
`51`	`51`	`public HttpClientBuilder createBuilder() {`
`52`	`52`	`return ApacheHttpClientTelemetry.builder(openTelemetry).build().newHttpClientBuilder();`
`53`	`53`	`}`
`54`	`54`
`55`		`- // creates a new http client with open telemetry instrumentation`
	`55`	`+ // creates a new http client with opentelemetry instrumentation`
`56`	`56`	`public HttpClient newHttpClient() {`
`57`	`57`	`return ApacheHttpClientTelemetry.builder(openTelemetry).build().newHttpClient();`
`58`	`58`	`}`