Simplify some route getters (#9316)

Author: trask

instrumentation/armeria-1.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/ServerDecorator.java

@@ -34,8 +34,7 @@ public HttpResponse serve(ServiceRequestContext ctx, HttpRequest req) throws Exc
 
     Context otelContext = Context.current();
 
-    HttpServerRoute.update(
-        otelContext, HttpServerRouteSource.SERVER, (context, name) -> name, matchedRoute);
+    HttpServerRoute.update(otelContext, HttpServerRouteSource.SERVER, matchedRoute);
 
     try {
       return unwrap().serve(ctx, req);

instrumentation/finatra-2.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/finatra/FinatraSingletons.java

@@ -34,8 +34,7 @@ public static Instrumenter<Class<?>, Void> instrumenter() {
   }
 
   public static void updateServerSpanName(Context context, RouteInfo routeInfo) {
-    HttpServerRoute.update(
-        context, HttpServerRouteSource.CONTROLLER, (c, route) -> route.path(), routeInfo);
+    HttpServerRoute.update(context, HttpServerRouteSource.CONTROLLER, routeInfo.path());
   }
 
   private FinatraSingletons() {}

instrumentation/ratpack/ratpack-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ratpack/RatpackSingletons.java

@@ -41,8 +41,7 @@ public static String updateServerSpanName(
     }
 
     // update the netty server span name; FILTER is probably the best match for ratpack Handlers
-    HttpServerRoute.update(
-        otelContext, HttpServerRouteSource.SERVER_FILTER, (context, name) -> name, matchedRoute);
+    HttpServerRoute.update(otelContext, HttpServerRouteSource.SERVER_FILTER, matchedRoute);
     return matchedRoute;
   }
 

instrumentation/restlet/restlet-1.1/library/src/main/java/io/opentelemetry/instrumentation/restlet/v1_1/TracingFilter.java

@@ -38,7 +38,7 @@ public int doHandle(Request request, Response response) {
       scope = context.makeCurrent();
     }
 
-    HttpServerRoute.update(context, CONTROLLER, (ctx, s) -> s, path);
+    HttpServerRoute.update(context, CONTROLLER, path);
 
     Throwable statusThrowable = null;
     try {

instrumentation/restlet/restlet-2.0/library/src/main/java/io/opentelemetry/instrumentation/restlet/v2_0/TracingFilter.java

@@ -39,7 +39,7 @@ public int doHandle(Request request, Response response) {
       scope = context.makeCurrent();
     }
 
-    HttpServerRoute.update(context, CONTROLLER, (ctx, s) -> s, path);
+    HttpServerRoute.update(context, CONTROLLER, path);
 
     Throwable statusThrowable = null;
     try {

instrumentation/spark-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/sparkjava/SparkRouteUpdater.java

@@ -16,8 +16,7 @@ public final class SparkRouteUpdater {
   public static void updateHttpRoute(@Nullable RouteMatch routeMatch) {
     if (routeMatch != null) {
       Context context = Context.current();
-      HttpServerRoute.update(
-          context, HttpServerRouteSource.CONTROLLER, (c, r) -> r.getMatchUri(), routeMatch);
+      HttpServerRoute.update(context, HttpServerRouteSource.CONTROLLER, routeMatch.getMatchUri());
     }
   }
 

instrumentation/vaadin-14.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vaadin/VaadinHelper.java

@@ -110,7 +110,7 @@ public void updateServerSpanName(Location location) {
     HttpServerRoute.update(
         context,
         HttpServerRouteSource.NESTED_CONTROLLER,
-        (c, loc) -> ServletContextPath.prepend(c, getSpanNameForLocation(loc)),
+        (ctx, loc) -> ServletContextPath.prepend(ctx, getSpanNameForLocation(loc)),
         location);
   }