fix(pekko): Ensure tilde$1 onExit is run in correct order

Author: masonedmison

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

@@ -0,0 +1,24 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.javaagent.instrumentation.pekkohttp.v1_0.server.route;
+
+import org.apache.pekko.http.scaladsl.server.RouteResult;
+import scala.PartialFunction;
+import scala.Unit;
+import scala.util.Try;
+
+public class RestoreOnExit implements PartialFunction<Try<RouteResult>, Unit> {
+  @Override
+  public boolean isDefinedAt(Try<RouteResult> x) {
+    return true;
+  }
+
+  @Override
+  public Unit apply(Try<RouteResult> v1) {
+    PekkoRouteHolder.restore();
+    return null;
+  }
+}

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

@@ -12,6 +12,9 @@
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
+import org.apache.pekko.http.scaladsl.server.RequestContext;
+import org.apache.pekko.http.scaladsl.server.RouteResult;
+import scala.concurrent.Future;
 
 public class RouteConcatenationInstrumentation implements TypeInstrumentation {
   @Override
@@ -39,8 +42,10 @@ public static void onEnter() {
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void onExit() {
-      PekkoRouteHolder.restore();
+    public static void onExit(
+        @Advice.Argument(value = 2) RequestContext ctx,
+        @Advice.Return(readOnly = false) Future<RouteResult> fut) {
+      fut = fut.andThen(new RestoreOnExit(), ctx.executionContext());
     }
   }