Apply repo conventions to *SpanNaming classes

trask · trask · commit 6c95ffb18231 · 2026-04-13T16:50:08.000-07:00
diff --git a/instrumentation/grails-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grails/GrailsServerSpanNaming.java b/instrumentation/grails-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grails/GrailsServerSpanNaming.java
@@ -11,7 +11,7 @@
 
 public class GrailsServerSpanNaming {
 
-  public static final HttpServerRouteGetter<GrailsControllerUrlMappingInfo> SERVER_SPAN_NAME =
+  private static final HttpServerRouteGetter<GrailsControllerUrlMappingInfo> serverSpanName =
       (context, info) -> {
         String action =
             info.getActionName() != null
@@ -21,5 +21,9 @@ public class GrailsServerSpanNaming {
         return ServletContextPath.prepend(context, "/" + info.getControllerName() + "/" + action);
       };
 
+  public static HttpServerRouteGetter<GrailsControllerUrlMappingInfo> serverSpanName() {
+    return serverSpanName;
+  }
+
   private GrailsServerSpanNaming() {}
 }
diff --git a/instrumentation/grails-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grails/UrlMappingsInfoHandlerAdapterInstrumentation.java b/instrumentation/grails-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grails/UrlMappingsInfoHandlerAdapterInstrumentation.java
@@ -49,7 +49,7 @@ public static void nameSpan(@Advice.Argument(2) Object handler) {
         HttpServerRoute.update(
             parentContext,
             HttpServerRouteSource.CONTROLLER,
-            GrailsServerSpanNaming.SERVER_SPAN_NAME,
+            GrailsServerSpanNaming.serverSpanName(),
             (GrailsControllerUrlMappingInfo) handler);
       }
     }
diff --git a/instrumentation/jaxrs/jaxrs-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v1_0/JaxrsAnnotationsInstrumentation.java b/instrumentation/jaxrs/jaxrs-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v1_0/JaxrsAnnotationsInstrumentation.java
@@ -88,7 +88,7 @@ public AdviceScope(CallDepth callDepth, Class<?> type, Method method) {
         HttpServerRoute.update(
             parentContext,
             HttpServerRouteSource.CONTROLLER,
-            JaxrsServerSpanNaming.SERVER_SPAN_NAME,
+          JaxrsServerSpanNaming.serverSpanName(),
             handlerData);
 
         if (!instrumenter().shouldStart(parentContext, handlerData)) {
diff --git a/instrumentation/jaxrs/jaxrs-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v1_0/JaxrsServerSpanNaming.java b/instrumentation/jaxrs/jaxrs-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v1_0/JaxrsServerSpanNaming.java
@@ -11,7 +11,7 @@
 
 public class JaxrsServerSpanNaming {
 
-  public static final HttpServerRouteGetter<HandlerData> SERVER_SPAN_NAME =
+  private static final HttpServerRouteGetter<HandlerData> serverSpanName =
       (context, handlerData) -> {
         String pathBasedSpanName = handlerData.getServerSpanName();
         // If path based name is empty skip prepending context path so that path based name would
@@ -25,5 +25,9 @@ public class JaxrsServerSpanNaming {
         return pathBasedSpanName;
       };
 
+  public static HttpServerRouteGetter<HandlerData> serverSpanName() {
+    return serverSpanName;
+  }
+
   private JaxrsServerSpanNaming() {}
 }
diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/DefaultRequestContextInstrumentation.java b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/DefaultRequestContextInstrumentation.java
@@ -56,7 +56,7 @@ public static AdviceScope start(Class<?> filterClass, Method method) {
         HttpServerRoute.update(
             parentContext,
             HttpServerRouteSource.CONTROLLER,
-            JaxrsServerSpanNaming.SERVER_SPAN_NAME,
+          JaxrsServerSpanNaming.serverSpanName(),
             handlerData);
 
         if (!instrumenter().shouldStart(parentContext, handlerData)) {
diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/JaxrsAnnotationsInstrumentation.java b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/JaxrsAnnotationsInstrumentation.java
@@ -116,7 +116,7 @@ public AdviceScope(CallDepth callDepth, Object[] args, Object target, Method met
         HttpServerRoute.update(
             parentContext,
             HttpServerRouteSource.CONTROLLER,
-            JaxrsServerSpanNaming.SERVER_SPAN_NAME,
+          JaxrsServerSpanNaming.serverSpanName(),
             handlerData);
 
         if (!instrumenter().shouldStart(parentContext, handlerData)) {
diff --git a/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/DefaultRequestContextInstrumentation.java b/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/DefaultRequestContextInstrumentation.java
@@ -55,7 +55,7 @@ public static AdviceScope start(Class<?> filterClass, Method method) {
         HttpServerRoute.update(
             parentContext,
             HttpServerRouteSource.CONTROLLER,
-            JaxrsServerSpanNaming.SERVER_SPAN_NAME,
+          JaxrsServerSpanNaming.serverSpanName(),
             handlerData);
 
         if (!instrumenter().shouldStart(parentContext, handlerData)) {
diff --git a/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/JaxrsAnnotationsInstrumentation.java b/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/JaxrsAnnotationsInstrumentation.java
@@ -114,7 +114,7 @@ public AdviceScope(CallDepth callDepth, Class<?> type, Method method, Object[] a
         HttpServerRoute.update(
             parentContext,
             HttpServerRouteSource.CONTROLLER,
-            JaxrsServerSpanNaming.SERVER_SPAN_NAME,
+          JaxrsServerSpanNaming.serverSpanName(),
             handlerData);
 
         if (!instrumenter().shouldStart(parentContext, handlerData)) {
diff --git a/instrumentation/jaxrs/jaxrs-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/JaxrsServerSpanNaming.java b/instrumentation/jaxrs/jaxrs-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/JaxrsServerSpanNaming.java
@@ -11,7 +11,7 @@
 
 public class JaxrsServerSpanNaming {
 
-  public static final HttpServerRouteGetter<HandlerData> SERVER_SPAN_NAME =
+  private static final HttpServerRouteGetter<HandlerData> serverSpanName =
       (context, handlerData) -> {
         String pathBasedSpanName = handlerData.getServerSpanName();
         // If path based name is empty skip prepending context path so that path based name would
@@ -25,5 +25,9 @@ public class JaxrsServerSpanNaming {
         return pathBasedSpanName;
       };
 
+  public static HttpServerRouteGetter<HandlerData> serverSpanName() {
+    return serverSpanName;
+  }
+
   private JaxrsServerSpanNaming() {}
 }
diff --git a/instrumentation/jaxrs/jaxrs-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/RequestContextHelper.java b/instrumentation/jaxrs/jaxrs-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/RequestContextHelper.java
@@ -26,7 +26,7 @@ public static <T extends HandlerData> Context createOrUpdateAbortSpan(
     HttpServerRoute.update(
         parentContext,
         HttpServerRouteSource.CONTROLLER,
-        JaxrsServerSpanNaming.SERVER_SPAN_NAME,
+      JaxrsServerSpanNaming.serverSpanName(),
         handlerData);
 
     if (currentSpan != null && currentSpan != serverSpan) {
diff --git a/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v3_1/HandlerAdapterInstrumentation.java b/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v3_1/HandlerAdapterInstrumentation.java
@@ -79,7 +79,7 @@ public static AdviceScope enter(HttpServletRequest request, Object handler) {
 
         // Name the parent span based on the matching pattern
         HttpServerRoute.update(
-            parentContext, CONTROLLER, SpringWebMvcServerSpanNaming.SERVER_SPAN_NAME, request);
+          parentContext, CONTROLLER, SpringWebMvcServerSpanNaming.serverSpanName(), request);
 
         if (!handlerInstrumenter().shouldStart(parentContext, handler)) {
           return null;
diff --git a/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v3_1/SpringWebMvcServerSpanNaming.java b/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v3_1/SpringWebMvcServerSpanNaming.java
@@ -12,7 +12,7 @@
 
 public class SpringWebMvcServerSpanNaming {
 
-  public static final HttpServerRouteGetter<HttpServletRequest> SERVER_SPAN_NAME =
+  private static final HttpServerRouteGetter<HttpServletRequest> serverSpanName =
       (context, request) -> {
         if (request == null) {
           return null;
@@ -25,5 +25,9 @@ public class SpringWebMvcServerSpanNaming {
         return null;
       };
 
+  public static HttpServerRouteGetter<HttpServletRequest> serverSpanName() {
+    return serverSpanName;
+  }
+
   private SpringWebMvcServerSpanNaming() {}
 }
diff --git a/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/javaagent/src/main/java/org/springframework/web/servlet/v3_1/OpenTelemetryHandlerMappingFilter.java b/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/javaagent/src/main/java/org/springframework/web/servlet/v3_1/OpenTelemetryHandlerMappingFilter.java
@@ -55,7 +55,7 @@ public class OpenTelemetryHandlerMappingFilter implements Filter, Ordered {
         if (findMapping(request)) {
           // Name the parent span based on the matching pattern
           // Let the parent span resource name be set with the attribute set in findMapping.
-          return SpringWebMvcServerSpanNaming.SERVER_SPAN_NAME.get(context, request);
+          return SpringWebMvcServerSpanNaming.serverSpanName().get(context, request);
         }
 
         return null;
diff --git a/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v6_0/HandlerAdapterInstrumentation.java b/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v6_0/HandlerAdapterInstrumentation.java
@@ -79,7 +79,7 @@ public static AdviceScope enter(HttpServletRequest request, Object handler) {
 
         // Name the parent span based on the matching pattern
         HttpServerRoute.update(
-            parentContext, CONTROLLER, SpringWebMvcServerSpanNaming.SERVER_SPAN_NAME, request);
+          parentContext, CONTROLLER, SpringWebMvcServerSpanNaming.serverSpanName(), request);
 
         if (!handlerInstrumenter().shouldStart(parentContext, handler)) {
           return null;
diff --git a/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v6_0/SpringWebMvcServerSpanNaming.java b/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v6_0/SpringWebMvcServerSpanNaming.java
@@ -12,7 +12,7 @@
 
 public class SpringWebMvcServerSpanNaming {
 
-  public static final HttpServerRouteGetter<HttpServletRequest> SERVER_SPAN_NAME =
+  private static final HttpServerRouteGetter<HttpServletRequest> serverSpanName =
       (context, request) -> {
         if (request == null) {
           return null;
@@ -25,5 +25,9 @@ public class SpringWebMvcServerSpanNaming {
         return null;
       };
 
+  public static HttpServerRouteGetter<HttpServletRequest> serverSpanName() {
+    return serverSpanName;
+  }
+
   private SpringWebMvcServerSpanNaming() {}
 }
diff --git a/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/javaagent/src/main/java/org/springframework/web/servlet/v6_0/OpenTelemetryHandlerMappingFilter.java b/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/javaagent/src/main/java/org/springframework/web/servlet/v6_0/OpenTelemetryHandlerMappingFilter.java
@@ -53,7 +53,7 @@ public class OpenTelemetryHandlerMappingFilter implements Filter, Ordered {
         if (findMapping(request)) {
           // Name the parent span based on the matching pattern
           // Let the parent span resource name be set with the attribute set in findMapping.
-          return SpringWebMvcServerSpanNaming.SERVER_SPAN_NAME.get(context, request);
+          return SpringWebMvcServerSpanNaming.serverSpanName().get(context, request);
         }
 
         return null;
diff --git a/instrumentation/struts/struts-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/struts/v2_3/ActionInvocationInstrumentation.java b/instrumentation/struts/struts-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/struts/v2_3/ActionInvocationInstrumentation.java
@@ -60,7 +60,7 @@ public static AdviceScope start(ActionInvocation actionInvocation) {
         HttpServerRoute.update(
             parentContext,
             CONTROLLER,
-            StrutsServerSpanNaming.serverSpanName,
+          StrutsServerSpanNaming.serverSpanName(),
             actionInvocation.getProxy());
 
         if (!instrumenter().shouldStart(parentContext, actionInvocation)) {
diff --git a/instrumentation/struts/struts-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/struts/v2_3/StrutsServerSpanNaming.java b/instrumentation/struts/struts-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/struts/v2_3/StrutsServerSpanNaming.java
@@ -11,7 +11,7 @@
 
 class StrutsServerSpanNaming {
 
-  static final HttpServerRouteGetter<ActionProxy> serverSpanName =
+  private static final HttpServerRouteGetter<ActionProxy> serverSpanName =
       (context, actionProxy) -> {
         // We take name from the config, because it contains the path pattern from the
         // configuration.
@@ -33,5 +33,9 @@ class StrutsServerSpanNaming {
         return ServletContextPath.prepend(context, result);
       };
 
+  static HttpServerRouteGetter<ActionProxy> serverSpanName() {
+    return serverSpanName;
+  }
+
   private StrutsServerSpanNaming() {}
 }
diff --git a/instrumentation/struts/struts-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/struts/v7_0/ActionInvocationInstrumentation.java b/instrumentation/struts/struts-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/struts/v7_0/ActionInvocationInstrumentation.java
@@ -60,7 +60,7 @@ public static AdviceScope start(ActionInvocation actionInvocation) {
         HttpServerRoute.update(
             parentContext,
             CONTROLLER,
-            StrutsServerSpanNaming.serverSpanName,
+          StrutsServerSpanNaming.serverSpanName(),
             actionInvocation.getProxy());
 
         if (!instrumenter().shouldStart(parentContext, actionInvocation)) {
diff --git a/instrumentation/struts/struts-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/struts/v7_0/StrutsServerSpanNaming.java b/instrumentation/struts/struts-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/struts/v7_0/StrutsServerSpanNaming.java
@@ -11,7 +11,7 @@
 
 class StrutsServerSpanNaming {
 
-  static final HttpServerRouteGetter<ActionProxy> serverSpanName =
+  private static final HttpServerRouteGetter<ActionProxy> serverSpanName =
       (context, actionProxy) -> {
         // We take name from the config, because it contains the path pattern from the
         // configuration.
@@ -33,5 +33,9 @@ class StrutsServerSpanNaming {
         return ServletContextPath.prepend(context, result);
       };
 
+  static HttpServerRouteGetter<ActionProxy> serverSpanName() {
+    return serverSpanName;
+  }
+
   private StrutsServerSpanNaming() {}
 }
diff --git a/instrumentation/tapestry-5.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tapestry/InitializeActivePageNameInstrumentation.java b/instrumentation/tapestry-5.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tapestry/InitializeActivePageNameInstrumentation.java
@@ -58,7 +58,7 @@ public static void onEnter(@Advice.Argument(0) ComponentEventRequestParameters p
       HttpServerRoute.update(
           currentContext(),
           CONTROLLER,
-          TapestryServerSpanNaming.serverSpanName,
+          TapestryServerSpanNaming.serverSpanName(),
           parameters.getActivePageName());
     }
   }
@@ -71,7 +71,7 @@ public static void onEnter(@Advice.Argument(0) PageRenderRequestParameters param
       HttpServerRoute.update(
           currentContext(),
           CONTROLLER,
-          TapestryServerSpanNaming.serverSpanName,
+          TapestryServerSpanNaming.serverSpanName(),
           parameters.getLogicalPageName());
     }
   }
diff --git a/instrumentation/tapestry-5.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tapestry/TapestryServerSpanNaming.java b/instrumentation/tapestry-5.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tapestry/TapestryServerSpanNaming.java
@@ -10,7 +10,7 @@
 
 public class TapestryServerSpanNaming {
 
-  public static final HttpServerRouteGetter<String> serverSpanName =
+  private static final HttpServerRouteGetter<String> serverSpanName =
       (context, pageName) -> {
         if (pageName == null) {
           return null;
@@ -22,5 +22,9 @@ public class TapestryServerSpanNaming {
         return ServletContextPath.prepend(context, pageName);
       };
 
+  public static HttpServerRouteGetter<String> serverSpanName() {
+    return serverSpanName;
+  }
+
   private TapestryServerSpanNaming() {}
 }
diff --git a/instrumentation/wicket-8.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/wicket/RequestHandlerExecutorInstrumentation.java b/instrumentation/wicket-8.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/wicket/RequestHandlerExecutorInstrumentation.java
@@ -42,7 +42,7 @@ public static void onEnter(@Advice.Argument(0) IRequestHandler handler) {
         HttpServerRoute.update(
             Java8BytecodeBridge.currentContext(),
             CONTROLLER,
-            WicketServerSpanNaming.serverSpanName,
+            WicketServerSpanNaming.serverSpanName(),
             (IPageClassRequestHandler) handler);
       }
     }
diff --git a/instrumentation/wicket-8.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/wicket/WicketServerSpanNaming.java b/instrumentation/wicket-8.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/wicket/WicketServerSpanNaming.java
@@ -12,7 +12,7 @@
 
 public class WicketServerSpanNaming {
 
-  public static final HttpServerRouteGetter<IPageClassRequestHandler> serverSpanName =
+  private static final HttpServerRouteGetter<IPageClassRequestHandler> serverSpanName =
       (context, handler) -> {
         // using class name as page name
         String pageName = handler.getPageClass().getName();
@@ -22,5 +22,9 @@ public class WicketServerSpanNaming {
         return ServletContextPath.prepend(context, filterPath + "/" + pageName);
       };
 
+  public static HttpServerRouteGetter<IPageClassRequestHandler> serverSpanName() {
+    return serverSpanName;
+  }
+
   private WicketServerSpanNaming() {}
 }

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public static void nameSpan(@Advice.Argument(2) Object handler) {`
`49`	`49`	`HttpServerRoute.update(`
`50`	`50`	`parentContext,`
`51`	`51`	`HttpServerRouteSource.CONTROLLER,`
`52`		`- GrailsServerSpanNaming.SERVER_SPAN_NAME,`
	`52`	`+ GrailsServerSpanNaming.serverSpanName(),`
`53`	`53`	`(GrailsControllerUrlMappingInfo) handler);`
`54`	`54`	`}`
`55`	`55`	`}`