Move On Exit Finalizer to separate class

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.javadsl.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

@@ -14,10 +14,7 @@
 import net.bytebuddy.matcher.ElementMatcher;
 import org.apache.pekko.http.javadsl.server.RouteResult;
 import org.apache.pekko.http.scaladsl.server.RequestContext;
-import scala.PartialFunction;
-import scala.Unit;
 import scala.concurrent.Future;
-import scala.util.Try;
 
 public class RouteConcatenationInstrumentation implements TypeInstrumentation {
   @Override
@@ -33,19 +30,6 @@ public void transform(TypeTransformer transformer) {
         named("$anonfun$$tilde$2"), this.getClass().getName() + "$Apply2Advice");
   }
 
-  public static class OnExitFinalizer 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;
-    }
-  }
-
   @SuppressWarnings("unused")
   public static class ApplyAdvice {
 
@@ -61,7 +45,7 @@ public static void onEnter() {
     public static void onExit(
         @Advice.Argument(value = 2) RequestContext ctx,
         @Advice.Return(readOnly = false) Future<RouteResult> fut) {
-      fut = fut.andThen(new OnExitFinalizer(), ctx.executionContext());
+      fut = fut.andThen(new RestoreOnExit(), ctx.executionContext());
     }
   }