Fix Spring detection (#10740)

Fix Spring detection

MethodParameters attribute is mandatory since Spring 6.1 and not 6.0
Changed the class to be detected, on a 6.1 only class: Restclient

Co-authored-by: jean-philippe.bempel <jean-philippe.bempel@datadoghq.com>

Author: jpbempel

dd-java-agent/agent-debugger/build.gradle

@@ -67,7 +67,7 @@ dependencies {
 
   testRuntimeOnly group: 'org.scala-lang', name: 'scala-compiler', version: libs.versions.scala213.get()
   testRuntimeOnly group: 'antlr', name: 'antlr', version: '2.7.7'
-  testRuntimeOnly group: 'org.springframework', name: 'spring-web', version: '6.0.0'
+  testRuntimeOnly group: 'org.springframework', name: 'spring-web', version: '6.1.0'
 }
 
 tasks.named("shadowJar", ShadowJar) {

dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/SpringHelper.java

@@ -6,9 +6,8 @@ public class SpringHelper {
 
   public static boolean isSpringUsingOnlyMethodParameters(Instrumentation inst) {
     for (Class<?> clazz : inst.getAllLoadedClasses()) {
-      if ("org.springframework.web.bind.annotation.ControllerMappingReflectiveProcessor"
-          .equals(clazz.getName())) {
-        // If this class (coming from Spring web since version 6) is found loaded it means Spring
+      if ("org.springframework.web.client.RestClient".equals(clazz.getName())) {
+        // If this class (coming from Spring web since version 6.1) is found loaded it means Spring
         // supports only getting parameter names from the MethodParameter attribute
         return true;
       }

dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/CapturedSnapshotTest.java

@@ -3019,9 +3019,7 @@ public void methodParametersAttribute() throws Exception {
     Instrumentation inst = mock(Instrumentation.class);
     if (JavaVirtualMachine.isJavaVersion(17)) {
       // on JDK 17 introduced Spring6 class
-      Class<?> springClass =
-          Class.forName(
-              "org.springframework.web.bind.annotation.ControllerMappingReflectiveProcessor");
+      Class<?> springClass = Class.forName("org.springframework.web.client.RestClient");
       when(inst.getAllLoadedClasses()).thenReturn(new Class[] {springClass});
     } else {
       when(inst.getAllLoadedClasses()).thenReturn(new Class[0]);

dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/ConfigurationUpdaterTest.java

@@ -639,9 +639,7 @@ public void methodParametersAttribute() throws Exception {
     Class<?> testClass = loadClass(CLASS_NAME, buffers);
     if (JavaVirtualMachine.isJavaVersion(17)) {
       // on JDK 17 introduced Spring6 class
-      Class<?> springClass =
-          Class.forName(
-              "org.springframework.web.bind.annotation.ControllerMappingReflectiveProcessor");
+      Class<?> springClass = Class.forName("org.springframework.web.client.RestClient");
       when(inst.getAllLoadedClasses()).thenReturn(new Class[] {testClass, springClass});
     } else {
       when(inst.getAllLoadedClasses()).thenReturn(new Class[] {testClass});

dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/SpringHelperTest.java

@@ -14,9 +14,7 @@ class SpringHelperTest {
   @Test
   @EnabledForJreRange(min = JRE.JAVA_17)
   void isSpringUsingOnlyMethodParametersTrue() throws Exception {
-    Class<?> clazz =
-        Class.forName(
-            "org.springframework.web.bind.annotation.ControllerMappingReflectiveProcessor");
+    Class<?> clazz = Class.forName("org.springframework.web.client.RestClient");
     Instrumentation inst = mock(Instrumentation.class);
     when(inst.getAllLoadedClasses()).thenReturn(new Class[] {clazz});
     assertTrue(SpringHelper.isSpringUsingOnlyMethodParameters(inst));