Fix nested http.route

instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/HandlerAdapterInstrumentation.java

@@ -65,8 +65,12 @@ public static void methodEnter(
 
       Context parentContext = Context.current();
 
+      // HttpRouteSource.CONTROLLER has userFirst true, and it will make http.route updated once
+      // using the last portion of the nested path.
+      // HttpRouteSource.NESTED_CONTROLLER has useFirst false, and it will make http.route updated
+      // twice: 1st using the last portion of the nested path, 2nd time using the full nested path.
       HttpRouteHolder.updateHttpRoute(
-          parentContext, HttpRouteSource.CONTROLLER, httpRouteGetter(), exchange);
+          parentContext, HttpRouteSource.NESTED_CONTROLLER, httpRouteGetter(), exchange);
 
       if (handler == null) {
         return;

instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/server/base/ServerTestController.java

@@ -116,6 +116,18 @@ public Mono<String> capture_headers(ServerHttpRequest request, ServerHttpRespons
         });
   }
 
+  @GetMapping("/nestedPath")
+  public Mono<String> nested_path(ServerHttpRequest request, ServerHttpResponse response) {
+    ServerEndpoint endpoint = ServerEndpoint.NESTED_PATH;
+
+    return wrapControllerMethod(
+        endpoint,
+        () -> {
+          setStatus(response, endpoint);
+          return endpoint.getBody();
+        });
+  }
+
   protected abstract <T> Mono<T> wrapControllerMethod(ServerEndpoint endpoint, Supplier<T> handler);
 
   private static void setStatus(ServerHttpResponse response, ServerEndpoint endpoint) {

instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/server/base/ServerTestRouteFactory.java

@@ -6,6 +6,8 @@
 package server.base;
 
 import static org.springframework.web.reactive.function.server.RequestPredicates.GET;
+import static org.springframework.web.reactive.function.server.RequestPredicates.path;
+import static org.springframework.web.reactive.function.server.RouterFunctions.nest;
 import static org.springframework.web.reactive.function.server.RouterFunctions.route;
 
 import io.opentelemetry.api.trace.Span;
@@ -98,7 +100,17 @@ public RouterFunction<ServerResponse> createRoutes() {
                           request.headers().asHttpHeaders().getFirst("X-Test-Request")),
                   null,
                   null);
-            });
+            })
+        .andNest(
+            path("/nestedPath"),
+            nest(
+                path("/hello"),
+                route(
+                    path("/world"),
+                    request -> {
+                      ServerEndpoint endpoint = ServerEndpoint.NESTED_PATH;
+                      return respond(endpoint, null, null, null);
+                    })));
   }
 
   protected Mono<ServerResponse> respond(

instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/server/base/SpringWebFluxServerTest.java

@@ -6,12 +6,18 @@
 package server.base;
 
 import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.EXCEPTION;
+import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.NESTED_PATH;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 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.AggregatedHttpRequest;
+import io.opentelemetry.testing.internal.armeria.common.AggregatedHttpResponse;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.springframework.boot.SpringApplication;
 import org.springframework.context.ConfigurableApplicationContext;
@@ -52,6 +58,8 @@ public String expectedHttpRoute(ServerEndpoint endpoint) {
         return getContextPath() + "/path/{id}/param";
       case NOT_FOUND:
         return "/**";
+      case NESTED_PATH:
+        return "/nestedPath/hello/world";
       default:
         return super.expectedHttpRoute(endpoint);
     }
@@ -63,4 +71,18 @@ protected void configure(HttpServerTestOptions options) {
     options.setExpectedException(new IllegalStateException(EXCEPTION.getBody()));
     options.setHasHandlerSpan(unused -> true);
   }
+
+  @Test
+  void nestedPath() {
+    assumeTrue(Boolean.getBoolean("testLatestDeps"));
+
+    String method = "GET";
+    AggregatedHttpRequest request = request(NESTED_PATH, method);
+    AggregatedHttpResponse response = client.execute(request).aggregate().join();
+    assertThat(response.status().code()).isEqualTo(NESTED_PATH.getStatus());
+    assertThat(response.contentUtf8()).isEqualTo(NESTED_PATH.getBody());
+    assertResponseHasCustomizedHeaders(response, NESTED_PATH, null);
+
+    assertTheTraces(1, null, null, null, method, NESTED_PATH, response);
+  }
 }

testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpServerTest.java

@@ -94,7 +94,7 @@ public static <T> T controller(ServerEndpoint endpoint, Supplier<T> closure) {
     return GlobalTraceUtil.runWithSpan("controller", () -> closure.get());
   }
 
-  private AggregatedHttpRequest request(ServerEndpoint uri, String method) {
+  protected AggregatedHttpRequest request(ServerEndpoint uri, String method) {
     return AggregatedHttpRequest.of(HttpMethod.valueOf(method), resolveAddress(uri));
   }
 

testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/ServerEndpoint.java

@@ -19,6 +19,11 @@ public enum ServerEndpoint {
   EXCEPTION("exception", 500, "controller exception"),
   NOT_FOUND("notFound", 404, "not found"),
   CAPTURE_HEADERS("captureHeaders", 200, "headers captured"),
+  NESTED_PATH(
+      "nestedPath/hello/world",
+      200,
+      "nested path"), // TODO (heya) move it to webflux test module after this has been converted to
+  // a class
   CAPTURE_PARAMETERS("captureParameters", 200, "parameters captured"),
 
   // TODO: add tests for the following cases: