Review fixes for spring-webmvc-3.1:javaagent (open-telemetry#17752)

Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com>

Author: otelbot[bot]

instrumentation/spring/spring-webmvc/spring-webmvc-3.1/javaagent/build.gradle.kts

@@ -27,6 +27,7 @@ dependencies {
   compileOnly("javax.servlet:javax.servlet-api:3.1.0")
 
   // Include servlet instrumentation for verifying the tomcat requests
+  testInstrumentation(project(":instrumentation:spring:spring-webmvc:spring-webmvc-6.0:javaagent"))
   testInstrumentation(project(":instrumentation:servlet:servlet-3.0:javaagent"))
   testInstrumentation(project(":instrumentation:tomcat:tomcat-7.0:javaagent"))
   testInstrumentation(project(":instrumentation:spring:spring-web:spring-web-3.1:javaagent"))

instrumentation/spring/spring-webmvc/spring-webmvc-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v3_1/DispatcherServletInstrumentation.java

@@ -6,7 +6,6 @@
 package io.opentelemetry.javaagent.instrumentation.spring.webmvc.v3_1;
 
 import static io.opentelemetry.javaagent.instrumentation.spring.webmvc.v3_1.SpringWebMvcSingletons.modelAndViewInstrumenter;
-import static net.bytebuddy.matcher.ElementMatchers.isMethod;
 import static net.bytebuddy.matcher.ElementMatchers.isProtected;
 import static net.bytebuddy.matcher.ElementMatchers.named;
 import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
@@ -37,15 +36,13 @@ public ElementMatcher<TypeDescription> typeMatcher() {
   @Override
   public void transform(TypeTransformer transformer) {
     transformer.applyAdviceToMethod(
-        isMethod()
-            .and(isProtected())
+        isProtected()
             .and(named("onRefresh"))
             .and(takesArgument(0, named("org.springframework.context.ApplicationContext")))
             .and(takesArguments(1)),
         DispatcherServletInstrumentation.class.getName() + "$HandlerMappingAdvice");
     transformer.applyAdviceToMethod(
-        isMethod()
-            .and(isProtected())
+        isProtected()
             .and(named("render"))
             .and(takesArgument(0, named("org.springframework.web.servlet.ModelAndView"))),
         DispatcherServletInstrumentation.class.getName() + "$RenderAdvice");

instrumentation/spring/spring-webmvc/spring-webmvc-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v3_1/HandlerAdapterInstrumentation.java

@@ -9,7 +9,6 @@
 import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
 import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.implementsInterface;
 import static io.opentelemetry.javaagent.instrumentation.spring.webmvc.v3_1.SpringWebMvcSingletons.handlerInstrumenter;
-import static net.bytebuddy.matcher.ElementMatchers.isMethod;
 import static net.bytebuddy.matcher.ElementMatchers.isPublic;
 import static net.bytebuddy.matcher.ElementMatchers.nameStartsWith;
 import static net.bytebuddy.matcher.ElementMatchers.named;
@@ -44,8 +43,7 @@ public ElementMatcher<TypeDescription> typeMatcher() {
   @Override
   public void transform(TypeTransformer transformer) {
     transformer.applyAdviceToMethod(
-        isMethod()
-            .and(isPublic())
+        isPublic()
             .and(nameStartsWith("handle"))
             .and(takesArgument(0, named("javax.servlet.http.HttpServletRequest")))
             .and(takesArguments(3)),
@@ -59,7 +57,7 @@ public static class AdviceScope {
       private final Context context;
       private final Scope scope;
 
-      public AdviceScope(Context context, Scope scope) {
+      private AdviceScope(Context context, Scope scope) {
         this.context = context;
         this.scope = scope;
       }

instrumentation/spring/spring-webmvc/spring-webmvc-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v3_1/SpringWebMvcSingletons.java

@@ -12,23 +12,23 @@
 public class SpringWebMvcSingletons {
   private static final String INSTRUMENTATION_NAME = "io.opentelemetry.spring-webmvc-3.1";
 
-  private static final Instrumenter<Object, Void> HANDLER_INSTRUMENTER;
+  private static final Instrumenter<Object, Void> handlerInstrumenter;
 
-  private static final Instrumenter<ModelAndView, Void> MODEL_AND_VIEW_INSTRUMENTER;
+  private static final Instrumenter<ModelAndView, Void> modelAndViewInstrumenter;
 
   static {
     SpringWebMvcInstrumenterFactory factory =
         new SpringWebMvcInstrumenterFactory(INSTRUMENTATION_NAME);
-    HANDLER_INSTRUMENTER = factory.createHandlerInstrumenter();
-    MODEL_AND_VIEW_INSTRUMENTER = factory.createModelAndViewInstrumenter();
+    handlerInstrumenter = factory.createHandlerInstrumenter();
+    modelAndViewInstrumenter = factory.createModelAndViewInstrumenter();
   }
 
   public static Instrumenter<Object, Void> handlerInstrumenter() {
-    return HANDLER_INSTRUMENTER;
+    return handlerInstrumenter;
   }
 
   public static Instrumenter<ModelAndView, Void> modelAndViewInstrumenter() {
-    return MODEL_AND_VIEW_INSTRUMENTER;
+    return modelAndViewInstrumenter;
   }
 
   private SpringWebMvcSingletons() {}