fix muzzle and check previous latest version

Author: jandro996

dd-java-agent/instrumentation/org-json/build.gradle

@@ -1,10 +1,25 @@
 muzzle {
   pass {
+    name = 'all'
     group = 'org.json'
     module = 'json'
     versions = '[20070829, ]'
     assertInverse = true
   }
+  pass {
+    name = 'before_20241224'
+    group = 'org.json'
+    module = 'json'
+    versions = '[20070829, 20241224)'
+    assertInverse = true
+  }
+  pass {
+    name = 'after_20241224'
+    group = 'org.json'
+    module = 'json'
+    versions = '[20241224, ]'
+    assertInverse = true
+  }
 }
 
 apply from: "$rootDir/gradle/java.gradle"
@@ -18,6 +33,5 @@ dependencies {
   testRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter')
   testRuntimeOnly project(':dd-java-agent:instrumentation:java-io') //Needed for Reader
 
-  //FIXME: ASM
   latestDepTestImplementation group: 'org.json', name: 'json', version: '+'
 }

dd-java-agent/instrumentation/org-json/src/main/java/datadog/trace/instrumentation/json/JSONArrayInstrumentation.java

@@ -24,6 +24,11 @@ public JSONArrayInstrumentation() {
     super("org-json");
   }
 
+  @Override
+  public String muzzleDirective() {
+    return "all";
+  }
+
   @Override
   public String instrumentedType() {
     return "org.json.JSONArray";

dd-java-agent/instrumentation/org-json/src/main/java/datadog/trace/instrumentation/json/JSONCookieInstrumentation.java

@@ -19,6 +19,11 @@ public JSONCookieInstrumentation() {
     super("org-json");
   }
 
+  @Override
+  public String muzzleDirective() {
+    return "all";
+  }
+
   @Override
   public String instrumentedType() {
     return "org.json.Cookie";

dd-java-agent/instrumentation/org-json/src/main/java/datadog/trace/instrumentation/json/JSONObjectAfter20250107Instrumentation.java renamed to dd-java-agent/instrumentation/org-json/src/main/java/datadog/trace/instrumentation/json/JSONObject20241224Instrumentation.java

@@ -20,19 +20,23 @@
 import net.bytebuddy.matcher.ElementMatcher;
 
 @AutoService(InstrumenterModule.class)
-public class JSONObjectAfter20250107Instrumentation extends InstrumenterModule.Iast
+public class JSONObject20241224Instrumentation extends InstrumenterModule.Iast
     implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public JSONObjectAfter20250107Instrumentation() {
+  public JSONObject20241224Instrumentation() {
     super("org-json");
   }
 
-  // Avoid matching servlet 3 which has its own instrumentation
-  static final ElementMatcher.Junction<ClassLoader> AFTER_20250107 =
+  static final ElementMatcher.Junction<ClassLoader> AFTER_20241224 =
       hasClassNamed("org.json.StringBuilderWriter");
 
+  @Override
+  public String muzzleDirective() {
+    return "after_20241224";
+  }
+
   @Override
   public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    return AFTER_20250107;
+    return AFTER_20241224;
   }
 
   @Override

dd-java-agent/instrumentation/org-json/src/main/java/datadog/trace/instrumentation/json/JSONObjectBefore20250107Instrumentation.java renamed to dd-java-agent/instrumentation/org-json/src/main/java/datadog/trace/instrumentation/json/JSONObjectInstrumentation.java

@@ -7,6 +7,7 @@
 import static net.bytebuddy.matcher.ElementMatchers.isPublic;
 import static net.bytebuddy.matcher.ElementMatchers.not;
 import static net.bytebuddy.matcher.ElementMatchers.returns;
+import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
 import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
 
 import com.google.auto.service.AutoService;
@@ -15,23 +16,28 @@
 import datadog.trace.api.iast.InstrumentationBridge;
 import datadog.trace.api.iast.Propagation;
 import datadog.trace.api.iast.propagation.PropagationModule;
+import java.util.Map;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.matcher.ElementMatcher;
 
 @AutoService(InstrumenterModule.class)
-public class JSONObjectBefore20250107Instrumentation extends InstrumenterModule.Iast
+public class JSONObjectInstrumentation extends InstrumenterModule.Iast
     implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-  public JSONObjectBefore20250107Instrumentation() {
+  public JSONObjectInstrumentation() {
     super("org-json");
   }
 
-  // Avoid matching servlet 3 which has its own instrumentation
-  static final ElementMatcher.Junction<ClassLoader> BEFORE_20250107 =
+  static final ElementMatcher.Junction<ClassLoader> BEFORE_20241224 =
       not(hasClassNamed("org.json.StringBuilderWriter"));
 
   @Override
   public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    return BEFORE_20250107;
+    return BEFORE_20241224;
+  }
+
+  @Override
+  public String muzzleDirective() {
+    return "before_20241224";
   }
 
   @Override
@@ -41,8 +47,14 @@ public String instrumentedType() {
 
   @Override
   public void methodAdvice(MethodTransformer transformer) {
+    // public JSONObject(JSONTokener x)
+    transformer.applyAdvice(
+        isConstructor().and(takesArguments(1)).and(takesArgument(0, named("org.json.JSONTokener"))),
+        getClass().getName() + "$ConstructorAdvice");
+    // private JSONObject(Map<?, ?> m)
     transformer.applyAdvice(
-        isConstructor().and(takesArguments(1)), getClass().getName() + "$ConstructorAdvice");
+        isConstructor().and(takesArguments(1)).and(takesArgument(0, Map.class)),
+        getClass().getName() + "$ConstructorAdvice");
     transformer.applyAdvice(
         isMethod()
             .and(isPublic())

dd-java-agent/instrumentation/org-json/src/main/java/datadog/trace/instrumentation/json/JSONTokenerInstrumentation.java

@@ -25,6 +25,11 @@ public String instrumentedType() {
     return "org.json.JSONTokener";
   }
 
+  @Override
+  public String muzzleDirective() {
+    return "all";
+  }
+
   @Override
   public void methodAdvice(MethodTransformer transformer) {
     transformer.applyAdvice(