** -> *, PekkoRouteHolder.get, isConstructor(), unused

Author: samwright

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

@@ -145,9 +145,9 @@ public void onPush() {
                 if (!headers.isEmpty()) {
                   response = (HttpResponse) response.addHeaders(headers);
                 }
-                PekkoRouteHolder routeHolder = tracingRequest.context.get(PekkoRouteHolder.KEY);
+                PekkoRouteHolder routeHolder = PekkoRouteHolder.get(tracingRequest.context);
                 if (routeHolder != null) {
-                  routeHolder.pushIfNotCompletelyMatched("**");
+                  routeHolder.pushIfNotCompletelyMatched("*");
                   HttpServerRoute.update(
                       tracingRequest.context,
                       HttpServerRouteSource.CONTROLLER,

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

@@ -45,7 +45,7 @@ public static void onExit(
         @Advice.Return PathMatcher.Matching<?> result) {
       // result is either matched or unmatched, we only care about the matches
       Context context = Java8BytecodeBridge.currentContext();
-      PekkoRouteHolder routeHolder = context.get(PekkoRouteHolder.KEY);
+      PekkoRouteHolder routeHolder = PekkoRouteHolder.get(context);
       if (routeHolder == null) {
         return;
       }

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

@@ -10,17 +10,17 @@
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.ContextKey;
 import io.opentelemetry.context.ImplicitContextKeyed;
+import java.util.ArrayDeque;
 import java.util.Deque;
-import java.util.LinkedList;
 import org.apache.pekko.http.scaladsl.model.Uri;
 
 public class PekkoRouteHolder implements ImplicitContextKeyed {
-  public static final ContextKey<PekkoRouteHolder> KEY = named("opentelemetry-pekko-route");
+  private static final ContextKey<PekkoRouteHolder> KEY = named("opentelemetry-pekko-route");
 
   private StringBuilder route = new StringBuilder();
   private Uri.Path lastUnmatchedPath = null;
   private boolean lastWasMatched = false;
-  private final Deque<State> savedStates = new LinkedList<>();
+  private final Deque<State> savedStates = new ArrayDeque<>();
 
   public static Context init(Context context) {
     if (context.get(KEY) != null) {
@@ -29,6 +29,10 @@ public static Context init(Context context) {
     return context.with(new PekkoRouteHolder());
   }
 
+  public static PekkoRouteHolder get(Context context) {
+    return context.get(KEY);
+  }
+
   public void push(Uri.Path beforeMatch, Uri.Path afterMatch, String pathToPush) {
     // Only accept the suggested 'pathToPush' if:
     // - either this is the first match, or

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

@@ -22,7 +22,7 @@ public PekkoRouteWrapper(Function1<RequestContext, Future<RouteResult>> route) {
   @Override
   public Future<RouteResult> apply(RequestContext ctx) {
     Context context = Java8BytecodeBridge.currentContext();
-    PekkoRouteHolder routeHolder = context.get(PekkoRouteHolder.KEY);
+    PekkoRouteHolder routeHolder = PekkoRouteHolder.get(context);
     if (routeHolder == null) {
       return route.apply(ctx);
     } else {

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

@@ -5,12 +5,12 @@
 
 package io.opentelemetry.javaagent.instrumentation.pekkohttp.v1_0.server.route;
 
+import static net.bytebuddy.matcher.ElementMatchers.isConstructor;
 import static net.bytebuddy.matcher.ElementMatchers.named;
 
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
 import net.bytebuddy.asm.Advice;
-import net.bytebuddy.description.method.MethodDescription;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
 import org.apache.pekko.http.scaladsl.server.RequestContext;
@@ -26,11 +26,11 @@ public ElementMatcher<TypeDescription> typeMatcher() {
 
   @Override
   public void transform(TypeTransformer transformer) {
-    transformer.applyAdviceToMethod(
-        MethodDescription::isConstructor, this.getClass().getName() + "$ApplyAdvice");
+    transformer.applyAdviceToMethod(isConstructor(), this.getClass().getName() + "$ApplyAdvice");
     transformer.applyAdviceToMethod(named("$tilde"), this.getClass().getName() + "$ApplyAdvice");
   }
 
+  @SuppressWarnings("unused")
   public static class ApplyAdvice {
 
     @Advice.OnMethodEnter(suppress = Throwable.class)

instrumentation/pekko/pekko-http-1.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/PekkoHttpServerRouteTest.scala

@@ -106,8 +106,8 @@ class PekkoHttpServerRouteTest {
 
   @Test def testNotMatch(): Unit = {
     val route = pathPrefix("foo" ~ not("bar")) { complete("ok") }
-    test(route, "/fooish", "GET /foo**")
-    test(route, "/fooish/123", "GET /foo**")
+    test(route, "/fooish", "GET /foo*")
+    test(route, "/fooish/123", "GET /foo*")
   }
 
   @Test def testProvide(): Unit = {