use PekkoRouteHolder in Tapir instrumentation + test

Author: samwright

instrumentation/pekko/pekko-http-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/server/tapir/RouteWrapper.java

@@ -6,9 +6,10 @@
 package io.opentelemetry.javaagent.instrumentation.pekkohttp.v1_0.server.tapir;
 
 import io.opentelemetry.context.Context;
-import io.opentelemetry.instrumentation.api.semconv.http.HttpServerRoute;
-import io.opentelemetry.instrumentation.api.semconv.http.HttpServerRouteSource;
 import io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge;
+import io.opentelemetry.javaagent.instrumentation.pekkohttp.v1_0.server.route.PekkoRouteHolder;
+import java.nio.charset.Charset;
+import org.apache.pekko.http.scaladsl.model.Uri;
 import org.apache.pekko.http.scaladsl.server.RequestContext;
 import org.apache.pekko.http.scaladsl.server.RouteResult;
 import scala.Function1;
@@ -22,6 +23,7 @@
 import sttp.tapir.server.ServerEndpoint;
 
 public class RouteWrapper implements Function1<RequestContext, Future<RouteResult>> {
+  private static final Uri.Path EMPTY = Uri.Path$.MODULE$.apply("", Charset.defaultCharset());
   private final Function1<RequestContext, Future<RouteResult>> route;
   private final ServerEndpoint<?, ?> serverEndpoint;
 
@@ -32,6 +34,12 @@ public RouteWrapper(
   }
 
   public class Finalizer implements PartialFunction<Try<RouteResult>, Unit> {
+    private final Uri.Path beforeMatch;
+
+    public Finalizer(Uri.Path beforeMatch) {
+      this.beforeMatch = beforeMatch;
+    }
+
     @Override
     public boolean isDefinedAt(Try<RouteResult> tryResult) {
       return tryResult.isSuccess();
@@ -40,7 +48,8 @@ public boolean isDefinedAt(Try<RouteResult> tryResult) {
     @Override
     public Unit apply(Try<RouteResult> tryResult) {
       Context context = Java8BytecodeBridge.currentContext();
-      if (tryResult.isSuccess()) {
+      PekkoRouteHolder routeHolder = PekkoRouteHolder.get(context);
+      if (routeHolder != null && tryResult.isSuccess()) {
         RouteResult result = tryResult.get();
         if (result.getClass() == RouteResult.Complete.class) {
           String path =
@@ -54,7 +63,7 @@ public Unit apply(Try<RouteResult> tryResult) {
                   "*",
                   Option.apply("*"),
                   Option.apply("*"));
-          HttpServerRoute.update(context, HttpServerRouteSource.NESTED_CONTROLLER, path);
+          routeHolder.push(beforeMatch, EMPTY, path);
         }
       }
       return null;
@@ -63,6 +72,6 @@ public Unit apply(Try<RouteResult> tryResult) {
 
   @Override
   public Future<RouteResult> apply(RequestContext ctx) {
-    return route.apply(ctx).andThen(new Finalizer(), ctx.executionContext());
+    return route.apply(ctx).andThen(new Finalizer(ctx.unmatchedPath()), ctx.executionContext());
   }
 }

instrumentation/pekko/pekko-http-1.0/javaagent/src/tapirTest/scala/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/TapirHttpServerRouteTest.scala

@@ -15,15 +15,7 @@ import io.opentelemetry.testing.internal.armeria.common.{
 }
 import org.apache.pekko.actor.ActorSystem
 import org.apache.pekko.http.scaladsl.Http
-import org.apache.pekko.http.scaladsl.server.Directives.{
-  IntNumber,
-  complete,
-  concat,
-  path,
-  pathEndOrSingleSlash,
-  pathPrefix,
-  pathSingleSlash
-}
+import org.apache.pekko.http.scaladsl.server.Directives.{concat, pathPrefix}
 import org.apache.pekko.http.scaladsl.server.Route
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.extension.RegisterExtension
@@ -52,6 +44,7 @@ class TapirHttpServerRouteTest {
   }
 
   @Test def testSimple(): Unit = {
+    import org.apache.pekko.http.scaladsl.server.Directives._
     val route = path("test") {
       complete("ok")
     }
@@ -60,6 +53,7 @@ class TapirHttpServerRouteTest {
   }
 
   @Test def testRoute(): Unit = {
+    import org.apache.pekko.http.scaladsl.server.Directives._
     val route = concat(
       pathEndOrSingleSlash {
         complete("root")
@@ -99,6 +93,21 @@ class TapirHttpServerRouteTest {
     test(routes, "/test/4", "GET /test/4")
   }
 
+  @Test def testTapirWithPathPrefix(): Unit = {
+    val interpreter = PekkoHttpServerInterpreter()(system.dispatcher)
+    val tapirRoute = interpreter.toRoute(
+      endpoint.get
+        .in(path[Int]("i") / "bar")
+        .errorOut(stringBody)
+        .out(stringBody)
+        .serverLogicPure[Future](_ => Right("ok"))
+    )
+
+    val prefixedRoute = pathPrefix("foo") { tapirRoute }
+    test(prefixedRoute, "/foo/123/bar", "GET /foo/{i}/bar")
+
+  }
+
   def test(route: Route, path: String, spanName: String): Unit = {
     val port = PortUtils.findOpenPort
     val address: URI = buildAddress(port)