Update MethodParameters detection for fixed JDK (#12025)

Update MethodParameters detection for fixed JDK

JDK 17.0.20 fixes the Method Parameters bug (JDK-8240908) so we are
updating the detection to filter out for this JDK version and onward

# Conflicts:
#	dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DebuggerTransformer.java

fix tests to exact patch version

remove unnecessary JDK19 checks

Co-authored-by: devflow.devflow-routing-intake <devflow.devflow-routing-intake@kubernetes.us1.ddbuild.io>

Author: jpbempel

dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/ConfigurationUpdater.java

@@ -55,7 +55,8 @@
 public class ConfigurationUpdater implements DebuggerContext.ProbeResolver, ConfigurationAcceptor {
   private static final Logger LOGGER = LoggerFactory.getLogger(ConfigurationUpdater.class);
   private static final int MINUTES_BETWEEN_ERROR_LOG = 5;
-  private static final boolean JAVA_AT_LEAST_19 = JavaVirtualMachine.isJavaVersionAtLeast(19);
+  private static final boolean JAVA_AT_LEAST_17_0_20 =
+      JavaVirtualMachine.isJavaVersionAtLeast(17, 0, 20);
   private static final boolean JAVA_AT_LEAST_16 = JavaVirtualMachine.isJavaVersionAtLeast(16);
   private static final boolean JAVA_AT_LEAST_25_0_4 =
       JavaVirtualMachine.isJavaVersionAtLeast(25, 0, 4);
@@ -423,8 +424,8 @@ public static List<Class<?>> detectMethodParameters(
         Consumer<String> reportError,
         Instrumentation instrumentation,
         List<Class<?>> changedClasses) {
-      if (JAVA_AT_LEAST_19) {
-        // bug is fixed since JDK19, no need to perform detection
+      if (JAVA_AT_LEAST_17_0_20) {
+        // bug is fixed since JDK 19 and 17.0.20, no need to perform detection
         return changedClasses;
       }
       List<Class<?>> result = new ArrayList<>();

dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DebuggerTransformer.java

@@ -94,9 +94,10 @@ public class DebuggerTransformer implements ClassFileTransformer {
           SpanDecorationProbe.class,
           SpanProbe.class);
   private static final String JAVA_IO_TMPDIR = "java.io.tmpdir";
-  private static final boolean JAVA_AT_LEAST_19 = JavaVirtualMachine.isJavaVersionAtLeast(19);
   private static final boolean JAVA_AT_LEAST_25_0_4 =
       JavaVirtualMachine.isJavaVersionAtLeast(25, 0, 4);
+  private static final boolean JAVA_AT_LEAST_17_0_20 =
+      JavaVirtualMachine.isJavaVersionAtLeast(17, 0, 20);
   public static Path DUMP_PATH = Paths.get(SystemProperties.get(JAVA_IO_TMPDIR), "debugger");
   private static final String[] SKIPPED_PACKAGES =
       new String[] {
@@ -311,8 +312,8 @@ public byte[] transform(
    */
   private boolean checkMethodParameters(
       ClassNode classNode, List<ProbeDefinition> definitions, String fullyQualifiedClassName) {
-    if (JAVA_AT_LEAST_19) {
-      // bug is fixed since JDK19, no need to perform check
+    if (JAVA_AT_LEAST_17_0_20) {
+      // bug is fixed since JDK 19 and 17.0.20, no need to perform check
       return true;
     }
     boolean isRecord = ASMHelper.isRecord(classNode);

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

@@ -3191,7 +3191,7 @@ public void methodParametersAttribute() throws Exception {
     Class<?> testClass = loadClass(CLASS_NAME, buffers);
     int result = Reflect.onClass(testClass).call("main", "1").get();
     assertEquals(3, result);
-    if (JavaVirtualMachine.isJavaVersion(17)) {
+    if (JavaVirtualMachine.isJavaVersionBetween(17, 0, 0, 17, 0, 20)) {
       // on JDK 17 with Spring6 class, transformation cannot happen
       assertEquals(0, listener.snapshots.size());
       ArgumentCaptor<ProbeId> probeIdCaptor = ArgumentCaptor.forClass(ProbeId.class);
@@ -3226,7 +3226,8 @@ public void methodParametersAttributeRecord() throws Exception {
     Class<?> testClass = loadClass(CLASS_NAME, buffers);
     int result = Reflect.onClass(testClass).call("main", "1").get();
     assertEquals(42, result);
-    if (JavaVirtualMachine.isJavaVersionAtLeast(19)) {
+    if (JavaVirtualMachine.isJavaVersionAtLeast(19)
+        || JavaVirtualMachine.isJavaVersionAtLeast(17, 0, 20)) {
       Snapshot snapshot = assertOneSnapshot(listener);
       assertCaptureArgs(
           snapshot.getCaptures().getReturn(), "firstName", String.class.getTypeName(), "john");

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

@@ -658,7 +658,7 @@ public void methodParametersAttribute() throws Exception {
     Map<String, byte[]> buffers =
         compile(CLASS_NAME, SourceCompiler.DebugInfo.ALL, "8", Arrays.asList("-parameters"));
     Class<?> testClass = loadClass(CLASS_NAME, buffers);
-    if (JavaVirtualMachine.isJavaVersion(17)) {
+    if (JavaVirtualMachine.isJavaVersionBetween(17, 0, 0, 17, 0, 20)) {
       // on JDK 17 introduced Spring6 class
       Class<?> springClass = Class.forName("org.springframework.core.SpringVersion");
       when(inst.getAllLoadedClasses()).thenReturn(new Class[] {testClass, springClass});
@@ -669,7 +669,7 @@ public void methodParametersAttribute() throws Exception {
     configurationUpdater.accept(
         REMOTE_CONFIG,
         singletonList(LogProbe.builder().probeId(PROBE_ID).where(CLASS_NAME, "main").build()));
-    if (JavaVirtualMachine.isJavaVersion(17)) {
+    if (JavaVirtualMachine.isJavaVersionBetween(17, 0, 0, 17, 0, 20)) {
       // on JDK 17 with Spring6 class, transformation cannot happen
       verify(inst, times(2)).getAllLoadedClasses();
       verify(inst, times(0)).retransformClasses(any());