Fix Vert.x sub-router http.route attributes

instrumentation/vertx/vertx-web-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/web/v3_0/RoutingContextHandlerWrapper.java

@@ -51,6 +51,15 @@ public void handle(RoutingContext context) {
 
   private static String getRoute(Context otelContext, RoutingContext routingContext) {
     String route = routingContext.currentRoute().getPath();
+    if (route == null) {
+      return RouteHolder.get(otelContext);
+    }
+    String mountPoint = routingContext.mountPoint();
+    if (mountPoint != null) {
+      return mountPoint.endsWith("/") && route.startsWith("/")
+          ? mountPoint.substring(0, mountPoint.length() - 1) + route
+          : mountPoint + route;
+    }
     String existingRoute = RouteHolder.get(otelContext);
     return existingRoute != null ? existingRoute + route : route;
   }

instrumentation/vertx/vertx-web-3.0/javaagent/src/version3Test/java/io/opentelemetry/javaagent/instrumentation/vertx/web/v3_0/VertxWebServer.java

@@ -25,6 +25,8 @@ void end(HttpServerResponse response, String message) {
   public void start(Future<Void> startFuture) {
     int port = config().getInteger(CONFIG_HTTP_SERVER_PORT);
     Router router = buildRouter();
+    router.mountSubRouter("/child", buildRouter());
+
     Router mainRouter = Router.router(vertx);
     mainRouter.mountSubRouter("/vertx-app", router);
 

instrumentation/vertx/vertx-web-3.0/javaagent/src/version41Test/java/io/opentelemetry/javaagent/instrumentation/vertx/web/v3_0/Vertx41WebServer.java

@@ -25,6 +25,8 @@ void end(HttpServerResponse response, String message) {
   public void start(Promise<Void> startPromise) {
     int port = config().getInteger(CONFIG_HTTP_SERVER_PORT);
     Router router = buildRouter();
+    router.route("/child/*").subRouter(buildRouter());
+
     Router mainRouter = Router.router(vertx);
     mainRouter.route("/vertx-app/*").subRouter(router);
 

instrumentation/vertx/vertx-web-3.0/javaagent/src/version5Test/java/io/opentelemetry/javaagent/instrumentation/vertx/web/v3_0/Vertx5WebServer.java

@@ -25,6 +25,8 @@ void end(HttpServerResponse response, String message) {
   public void start(Promise<Void> startPromise) {
     int port = config().getInteger(CONFIG_HTTP_SERVER_PORT);
     Router router = buildRouter();
+    router.route("/child/*").subRouter(buildRouter());
+
     Router mainRouter = Router.router(vertx);
     mainRouter.route("/vertx-app/*").subRouter(router);
 

instrumentation/vertx/vertx-web-3.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/web/v3_0/AbstractVertxHttpServerTest.java

@@ -6,13 +6,15 @@
 package io.opentelemetry.javaagent.instrumentation.vertx.web.v3_0;
 
 import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import io.opentelemetry.instrumentation.api.internal.HttpConstants;
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
 import io.opentelemetry.instrumentation.testing.junit.http.AbstractHttpServerTest;
 import io.opentelemetry.instrumentation.testing.junit.http.HttpServerInstrumentationExtension;
 import io.opentelemetry.instrumentation.testing.junit.http.HttpServerTestOptions;
 import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint;
+import io.opentelemetry.testing.internal.armeria.common.AggregatedHttpResponse;
 import io.vertx.core.AbstractVerticle;
 import io.vertx.core.DeploymentOptions;
 import io.vertx.core.Vertx;
@@ -22,10 +24,14 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeoutException;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 abstract class AbstractVertxHttpServerTest extends AbstractHttpServerTest<Vertx> {
 
+  private static final ServerEndpoint SUB_ROUTER_PATH_PARAM =
+      new ServerEndpoint("SUB_ROUTER_PATH_PARAM", "child/path/123/param", 200, "123", false);
+
   @RegisterExtension
   static final InstrumentationExtension testing = HttpServerInstrumentationExtension.forAgent();
 
@@ -45,10 +51,25 @@ protected void configure(HttpServerTestOptions options) {
           if (Objects.equals(endpoint, ServerEndpoint.NOT_FOUND)) {
             return getContextPath();
           }
+          if (Objects.equals(endpoint, SUB_ROUTER_PATH_PARAM)) {
+            return getContextPath() + "/child/path/:id/param";
+          }
           return super.expectedHttpRoute(endpoint, method);
         });
   }
 
+  @Test
+  void subRouterRouteIncludesMountPath() {
+    String method = "GET";
+    AggregatedHttpResponse response =
+        client.execute(request(SUB_ROUTER_PATH_PARAM, method)).aggregate().join();
+
+    assertThat(response.status().code()).isEqualTo(SUB_ROUTER_PATH_PARAM.getStatus());
+    assertThat(response.contentUtf8()).isEqualTo(SUB_ROUTER_PATH_PARAM.getBody());
+
+    assertTheTraces(1, null, null, null, method, SUB_ROUTER_PATH_PARAM);
+  }
+
   @Override
   protected Vertx setupServer() throws ExecutionException, InterruptedException, TimeoutException {
     Vertx server =

instrumentation/vertx/vertx-web-3.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/web/v3_0/AbstractVertxWebServer.java

@@ -33,6 +33,7 @@ public abstract class AbstractVertxWebServer extends AbstractVerticle {
   Router buildRouter() {
     Router router = Router.router(vertx);
 
+    router.route().handler(RoutingContext::next);
     // verify that calling RoutingContext::next doesn't affect http.route
     router.route(SUCCESS.getPath()).handler(RoutingContext::next);
     //noinspection Convert2Lambda