From 3cdcb2bbb7c929dabf57d735ef9411edfa615a5f Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Mon, 28 Aug 2023 00:24:30 -0700 Subject: [PATCH] Simplify some route getters (#9316) --- .../instrumentation/armeria/v1_3/ServerDecorator.java | 3 +-- .../javaagent/instrumentation/finatra/FinatraSingletons.java | 3 +-- .../javaagent/instrumentation/ratpack/RatpackSingletons.java | 3 +-- .../instrumentation/restlet/v1_1/TracingFilter.java | 2 +- .../instrumentation/restlet/v2_0/TracingFilter.java | 2 +- .../javaagent/instrumentation/sparkjava/SparkRouteUpdater.java | 3 +-- .../javaagent/instrumentation/vaadin/VaadinHelper.java | 2 +- 7 files changed, 7 insertions(+), 11 deletions(-) diff --git a/instrumentation/armeria-1.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/ServerDecorator.java b/instrumentation/armeria-1.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/ServerDecorator.java index d8a453bd02..fb3b7b0a39 100644 --- a/instrumentation/armeria-1.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/ServerDecorator.java +++ b/instrumentation/armeria-1.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/ServerDecorator.java @@ -34,8 +34,7 @@ class ServerDecorator extends SimpleDecoratingHttpService { 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); diff --git a/instrumentation/finatra-2.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/finatra/FinatraSingletons.java b/instrumentation/finatra-2.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/finatra/FinatraSingletons.java index 0f2796d020..a497d8663a 100644 --- a/instrumentation/finatra-2.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/finatra/FinatraSingletons.java +++ b/instrumentation/finatra-2.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/finatra/FinatraSingletons.java @@ -34,8 +34,7 @@ public final class FinatraSingletons { } 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() {} diff --git a/instrumentation/ratpack/ratpack-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ratpack/RatpackSingletons.java b/instrumentation/ratpack/ratpack-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ratpack/RatpackSingletons.java index d7769ea846..6486abe673 100644 --- a/instrumentation/ratpack/ratpack-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ratpack/RatpackSingletons.java +++ b/instrumentation/ratpack/ratpack-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ratpack/RatpackSingletons.java @@ -41,8 +41,7 @@ public final class RatpackSingletons { } // 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; } diff --git a/instrumentation/restlet/restlet-1.1/library/src/main/java/io/opentelemetry/instrumentation/restlet/v1_1/TracingFilter.java b/instrumentation/restlet/restlet-1.1/library/src/main/java/io/opentelemetry/instrumentation/restlet/v1_1/TracingFilter.java index dd26533937..244a278f99 100644 --- a/instrumentation/restlet/restlet-1.1/library/src/main/java/io/opentelemetry/instrumentation/restlet/v1_1/TracingFilter.java +++ b/instrumentation/restlet/restlet-1.1/library/src/main/java/io/opentelemetry/instrumentation/restlet/v1_1/TracingFilter.java @@ -38,7 +38,7 @@ final class TracingFilter extends Filter { scope = context.makeCurrent(); } - HttpServerRoute.update(context, CONTROLLER, (ctx, s) -> s, path); + HttpServerRoute.update(context, CONTROLLER, path); Throwable statusThrowable = null; try { diff --git a/instrumentation/restlet/restlet-2.0/library/src/main/java/io/opentelemetry/instrumentation/restlet/v2_0/TracingFilter.java b/instrumentation/restlet/restlet-2.0/library/src/main/java/io/opentelemetry/instrumentation/restlet/v2_0/TracingFilter.java index 9ee6f4da0d..59ffa8f067 100644 --- a/instrumentation/restlet/restlet-2.0/library/src/main/java/io/opentelemetry/instrumentation/restlet/v2_0/TracingFilter.java +++ b/instrumentation/restlet/restlet-2.0/library/src/main/java/io/opentelemetry/instrumentation/restlet/v2_0/TracingFilter.java @@ -39,7 +39,7 @@ final class TracingFilter extends Filter { scope = context.makeCurrent(); } - HttpServerRoute.update(context, CONTROLLER, (ctx, s) -> s, path); + HttpServerRoute.update(context, CONTROLLER, path); Throwable statusThrowable = null; try { diff --git a/instrumentation/spark-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/sparkjava/SparkRouteUpdater.java b/instrumentation/spark-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/sparkjava/SparkRouteUpdater.java index bf516b8c91..db6ef2f6d4 100644 --- a/instrumentation/spark-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/sparkjava/SparkRouteUpdater.java +++ b/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()); } } diff --git a/instrumentation/vaadin-14.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vaadin/VaadinHelper.java b/instrumentation/vaadin-14.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vaadin/VaadinHelper.java index 77c002499f..a5812bdd66 100644 --- a/instrumentation/vaadin-14.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vaadin/VaadinHelper.java +++ b/instrumentation/vaadin-14.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vaadin/VaadinHelper.java @@ -110,7 +110,7 @@ public class VaadinHelper { HttpServerRoute.update( context, HttpServerRouteSource.NESTED_CONTROLLER, - (c, loc) -> ServletContextPath.prepend(c, getSpanNameForLocation(loc)), + (ctx, loc) -> ServletContextPath.prepend(ctx, getSpanNameForLocation(loc)), location); }