Merge branch 'master' into daniel.mohedano/smoke-test-latest-resolution

Author: daniel-mohedano

.claude/skills/migrate-groovy-to-java/SKILL.md

@@ -14,8 +14,8 @@ Migrate test Groovy files to Java using JUnit 5
 When converting Groovy code to Java code, make sure that:
 - The Java code generated is compatible with JDK 8
 - When translating Spock tests, favor using `@CsvSource` with `|` delimiters
-- When using `@MethodSource`, name the arguments method by appending `Arguments` using camelCase to the test method name (e.g. `testMethodArguments`)
-- Ensure parameterized test names are human-readable (i.e. no hashcodes); instead add a description string as the first `Arguments.of(...)` value or index the test case
+- When using `@MethodSource`, name the arguments method by appending `Arguments` using camelCase to the test method name (e.g. `testMethodArguments`) and return a `Stream` of arguments using `Stream.of(...)` and `arguments(...)` with static import.
+- Ensure parameterized test names are human-readable (i.e. no hashcodes); instead add a description string as the first `Arguments.arguments(...)` value or index the test case
 - When converting tuples, create a light dedicated structure instead to keep the typing system
 - Instead of checking a state and throwing an exception, use JUnit asserts
 - Do not wrap checked exceptions and throw a Runtime exception; prefer adding a throws clause at method declaration

.gitignore

@@ -60,6 +60,7 @@ out/
 
 # Others #
 ##########
+/dumps
 /logs/*
 /bin
 /out

.gitlab/ci_visibility_generate_job.sh

@@ -42,7 +42,19 @@ if [ -z "$pr_number" ]; then
   exit 0
 fi
 
-echo "PR #${pr_number} found, checking labels..."
+echo "PR #${pr_number} found, checking target branch..."
+set +e
+base_branch=$(gh pr view "$pr_number" --repo DataDog/dd-trace-java --json baseRefName --jq '.baseRefName' 2>&1)
+base_branch_status=$?
+set -e
+
+if [ $base_branch_status -eq 0 ] && [[ "$base_branch" == release/* ]]; then
+  echo "PR #$pr_number targets release branch '$base_branch' - skipping trigger"
+  add_dummy_job
+  exit 0
+fi
+
+echo "Checking labels..."
 set +e
 labels=$(gh pr view "$pr_number" --repo DataDog/dd-trace-java --json labels --jq '.labels[].name' 2>&1)
 labels_status=$?

buildSrc/call-site-instrumentation-plugin/src/test/java/datadog/trace/plugin/csi/impl/TypeResolverPoolTest.java

@@ -11,86 +11,57 @@
 
 class TypeResolverPoolTest {
 
+  TypeResolverPool resolver = new TypeResolverPool();
+
   @Test
   void testResolvePrimitive() {
-    TypeResolverPool resolver = new TypeResolverPool();
-
-    Class<?> result = resolver.resolveType(Type.INT_TYPE);
-
-    assertEquals(int.class, result);
+    assertEquals(int.class, resolver.resolveType(Type.INT_TYPE));
   }
 
   @Test
   void testResolvePrimitiveArray() {
-    TypeResolverPool resolver = new TypeResolverPool();
     Type type = Type.getType("[I");
-
-    Class<?> result = resolver.resolveType(type);
-
-    assertEquals(int[].class, result);
+    assertEquals(int[].class, resolver.resolveType(type));
   }
 
   @Test
   void testResolvePrimitiveMultidimensionalArray() {
-    TypeResolverPool resolver = new TypeResolverPool();
     Type type = Type.getType("[[[I");
-
-    Class<?> result = resolver.resolveType(type);
-
-    assertEquals(int[][][].class, result);
+    assertEquals(int[][][].class, resolver.resolveType(type));
   }
 
   @Test
   void testResolveClass() {
-    TypeResolverPool resolver = new TypeResolverPool();
     Type type = Type.getType(String.class);
-
-    Class<?> result = resolver.resolveType(type);
-
-    assertEquals(String.class, result);
+    assertEquals(String.class, resolver.resolveType(type));
   }
 
   @Test
   void testResolveClassArray() {
-    TypeResolverPool resolver = new TypeResolverPool();
     Type type = Type.getType(String[].class);
-
-    Class<?> result = resolver.resolveType(type);
-
-    assertEquals(String[].class, result);
+    assertEquals(String[].class, resolver.resolveType(type));
   }
 
   @Test
   void testResolveClassMultidimensionalArray() {
-    TypeResolverPool resolver = new TypeResolverPool();
     Type type = Type.getType(String[][][].class);
-
-    Class<?> result = resolver.resolveType(type);
-
-    assertEquals(String[][][].class, result);
+    assertEquals(String[][][].class, resolver.resolveType(type));
   }
 
   @Test
   void testTypeResolverFromMethod() {
-    TypeResolverPool resolver = new TypeResolverPool();
     Type type =
         Type.getMethodType(
             Type.getType(String[].class), Type.getType(String.class), Type.getType(String.class));
-
-    Class<?> result = resolver.resolveType(type.getReturnType());
-
-    assertEquals(String[].class, result);
+    assertEquals(String[].class, resolver.resolveType(type.getReturnType()));
   }
 
   @Test
   void testInheritedMethods() throws Exception {
-    TypeResolverPool resolver = new TypeResolverPool();
     Type owner = Type.getType(HttpServletRequest.class);
     String name = "getParameter";
     Type descriptor = Type.getMethodType(Type.getType(String.class), Type.getType(String.class));
-
     Method result = (Method) resolver.resolveMethod(new MethodType(owner, name, descriptor));
-
     assertEquals(ServletRequest.class.getDeclaredMethod("getParameter", String.class), result);
   }
 }

buildSrc/call-site-instrumentation-plugin/src/test/java/datadog/trace/plugin/csi/impl/ext/IastExtensionTest.java

@@ -22,6 +22,7 @@
 import datadog.trace.plugin.csi.impl.assertion.CallSiteAssert;
 import datadog.trace.plugin.csi.impl.ext.tests.IastExtensionCallSite;
 import java.io.File;
+import java.io.IOException;
 import java.lang.reflect.Method;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -46,12 +47,15 @@ class IastExtensionTest extends BaseCsiPluginTest {
 
   @BeforeEach
   void setup() throws Exception {
-    targetFolder = buildDir.toPath().resolve("target");
-    Files.createDirectories(targetFolder);
-    projectFolder = buildDir.toPath().resolve("project");
-    Files.createDirectories(projectFolder);
-    srcFolder = projectFolder.resolve("src/main/java");
-    Files.createDirectories(srcFolder);
+    targetFolder = createFolder("target");
+    projectFolder = createFolder("project");
+    srcFolder = createFolder("src/main/java");
+  }
+
+  private Path createFolder(String folderName) throws IOException {
+    Path folder = buildDir.toPath().resolve(folderName);
+    Files.createDirectories(folder);
+    return folder;
   }
 
   @ParameterizedTest

components/json/src/test/java/datadog/json/JsonMapperTest.java

@@ -4,8 +4,10 @@
 import static java.util.Collections.emptyMap;
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.params.provider.Arguments.arguments;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -24,7 +26,8 @@ class JsonMapperTest {
 
   @ParameterizedTest(name = "test mapping to JSON object: {0}")
   @MethodSource("testMappingToJsonObjectArguments")
-  void testMappingToJsonObject(String testCase, Map<String, Object> input, String expected)
+  void testMappingToJsonObject(
+      @SuppressWarnings("unused") String testCase, Map<String, Object> input, String expected)
       throws IOException {
     String json = JsonMapper.toJson(input);
     assertEquals(expected, json);
@@ -42,7 +45,7 @@ void testMappingToJsonObject(String testCase, Map<String, Object> input, String
         if (expectedValue instanceof UnsupportedType) {
           assertEquals(expectedValue.toString(), parsedValue);
         } else if (expectedValue instanceof Float) {
-          assertTrue(parsedValue instanceof Double);
+          assertInstanceOf(Double.class, parsedValue);
           assertEquals((Float) expectedValue, (Double) parsedValue, 0.001);
         } else {
           assertEquals(expectedValue, parsedValue);
@@ -74,15 +77,15 @@ static Stream<Arguments> testMappingToJsonObjectArguments() {
     complexMap.put("key8", new UnsupportedType());
 
     return Stream.of(
-        Arguments.of("null input", null, "{}"),
-        Arguments.of("empty map", new HashMap<>(), "{}"),
-        Arguments.of("single entry", singleEntry, "{\"key1\":\"value1\"}"),
-        Arguments.of("two entries", twoEntries, "{\"key1\":\"value1\",\"key2\":\"value2\"}"),
-        Arguments.of(
+        arguments("null input", null, "{}"),
+        arguments("empty map", new HashMap<>(), "{}"),
+        arguments("single entry", singleEntry, "{\"key1\":\"value1\"}"),
+        arguments("two entries", twoEntries, "{\"key1\":\"value1\",\"key2\":\"value2\"}"),
+        arguments(
             "quoted entries",
             quotedEntries,
             "{\"key1\":\"va\\\"lu\\\"e1\",\"ke\\\"y2\":\"value2\"}"),
-        Arguments.of(
+        arguments(
             "complex map",
             complexMap,
             "{\"key1\":null,\"key2\":\"bar\",\"key3\":3,\"key4\":3456789123,\"key5\":3.142,\"key6\":3.141592653589793,\"key7\":true,\"key8\":\"toString\"}"));
@@ -96,8 +99,7 @@ void testMappingToMapFromEmptyJsonObject(String json) throws IOException {
   }
 
   static Stream<Arguments> testMappingToMapFromEmptyJsonObjectArguments() {
-    return Stream.of(
-        Arguments.of((Object) null), Arguments.of("null"), Arguments.of(""), Arguments.of("{}"));
+    return Stream.of(arguments((Object) null), arguments("null"), arguments(""), arguments("{}"));
   }
 
   @ParameterizedTest(name = "test mapping to Map from non-object JSON: {0}")
@@ -118,11 +120,11 @@ void testMappingIterableToJsonArray(List<String> input, String expected) throws
 
   static Stream<Arguments> testMappingIterableToJsonArrayArguments() {
     return Stream.of(
-        Arguments.of(null, "[]"),
-        Arguments.of(new ArrayList<>(), "[]"),
-        Arguments.of(Arrays.asList("value1"), "[\"value1\"]"),
-        Arguments.of(Arrays.asList("value1", "value2"), "[\"value1\",\"value2\"]"),
-        Arguments.of(Arrays.asList("va\"lu\"e1", "value2"), "[\"va\\\"lu\\\"e1\",\"value2\"]"));
+        arguments(null, "[]"),
+        arguments(new ArrayList<>(), "[]"),
+        arguments(Arrays.asList("value1"), "[\"value1\"]"),
+        arguments(Arrays.asList("value1", "value2"), "[\"value1\",\"value2\"]"),
+        arguments(Arrays.asList("va\"lu\"e1", "value2"), "[\"va\\\"lu\\\"e1\",\"value2\"]"));
   }
 
   @ParameterizedTest(name = "test mapping array to JSON array: {0}")
@@ -138,11 +140,11 @@ void testMappingArrayToJsonArray(String testCase, String[] input, String expecte
 
   static Stream<Arguments> testMappingArrayToJsonArrayArguments() {
     return Stream.of(
-        Arguments.of("null input", (Object) null, "[]"),
-        Arguments.of("empty array", new String[] {}, "[]"),
-        Arguments.of("single element", new String[] {"value1"}, "[\"value1\"]"),
-        Arguments.of("two elements", new String[] {"value1", "value2"}, "[\"value1\",\"value2\"]"),
-        Arguments.of(
+        arguments("null input", (Object) null, "[]"),
+        arguments("empty array", new String[] {}, "[]"),
+        arguments("single element", new String[] {"value1"}, "[\"value1\"]"),
+        arguments("two elements", new String[] {"value1", "value2"}, "[\"value1\",\"value2\"]"),
+        arguments(
             "escaped quotes",
             new String[] {"va\"lu\"e1", "value2"},
             "[\"va\\\"lu\\\"e1\",\"value2\"]"));
@@ -156,8 +158,7 @@ void testMappingToListFromEmptyJsonObject(String json) throws IOException {
   }
 
   static Stream<Arguments> testMappingToListFromEmptyJsonObjectArguments() {
-    return Stream.of(
-        Arguments.of((Object) null), Arguments.of("null"), Arguments.of(""), Arguments.of("[]"));
+    return Stream.of(arguments((Object) null), arguments("null"), arguments(""), arguments("[]"));
   }
 
   @ParameterizedTest(name = "test mapping to JSON string: {0}")
@@ -169,20 +170,20 @@ void testMappingToJsonString(String input, String expected) {
 
   static Stream<Arguments> testMappingToJsonStringArguments() {
     return Stream.of(
-        Arguments.of((Object) null, ""),
-        Arguments.of("", ""),
-        Arguments.of(String.valueOf((char) 4096), "\"\\u1000\""),
-        Arguments.of(String.valueOf((char) 256), "\"\\u0100\""),
-        Arguments.of(String.valueOf((char) 128), "\"\\u0080\""),
-        Arguments.of("\b", "\"\\b\""),
-        Arguments.of("\t", "\"\\t\""),
-        Arguments.of("\n", "\"\\n\""),
-        Arguments.of("\f", "\"\\f\""),
-        Arguments.of("\r", "\"\\r\""),
-        Arguments.of("\"", "\"\\\"\""),
-        Arguments.of("/", "\"\\/\""),
-        Arguments.of("\\", "\"\\\\\""),
-        Arguments.of("a", "\"a\""));
+        arguments((Object) null, ""),
+        arguments("", ""),
+        arguments(String.valueOf((char) 4096), "\"\\u1000\""),
+        arguments(String.valueOf((char) 256), "\"\\u0100\""),
+        arguments(String.valueOf((char) 128), "\"\\u0080\""),
+        arguments("\b", "\"\\b\""),
+        arguments("\t", "\"\\t\""),
+        arguments("\n", "\"\\n\""),
+        arguments("\f", "\"\\f\""),
+        arguments("\r", "\"\\r\""),
+        arguments("\"", "\"\\\"\""),
+        arguments("/", "\"\\/\""),
+        arguments("\\", "\"\\\\\""),
+        arguments("a", "\"a\""));
   }
 
   private static class UnsupportedType {

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

@@ -52,6 +52,8 @@ commons-io:commons-io:2.20.0=spotbugs
 de.thetaphi:forbiddenapis:3.10=compileClasspath
 io.github.java-diff-utils:java-diff-utils:4.12=testRuntimeClasspath
 io.leangen.geantyref:geantyref:1.3.16=testRuntimeClasspath
+io.micrometer:micrometer-commons:1.12.0=testRuntimeClasspath
+io.micrometer:micrometer-observation:1.12.0=testRuntimeClasspath
 jakarta.annotation:jakarta.annotation-api:1.3.5=testCompileClasspath,testRuntimeClasspath
 jaxen:jaxen:2.0.0=spotbugs
 junit:junit:4.12=testCompileClasspath,testRuntimeClasspath
@@ -157,12 +159,16 @@ org.springframework.boot:spring-boot-starter-web:2.3.5.RELEASE=testCompileClassp
 org.springframework.boot:spring-boot-starter:2.3.5.RELEASE=testCompileClasspath,testRuntimeClasspath
 org.springframework.boot:spring-boot:2.3.5.RELEASE=testCompileClasspath,testRuntimeClasspath
 org.springframework:spring-aop:5.2.10.RELEASE=testCompileClasspath,testRuntimeClasspath
-org.springframework:spring-beans:5.2.10.RELEASE=testCompileClasspath,testRuntimeClasspath
+org.springframework:spring-beans:5.2.10.RELEASE=testCompileClasspath
+org.springframework:spring-beans:6.1.0=testRuntimeClasspath
 org.springframework:spring-context:5.2.10.RELEASE=testCompileClasspath,testRuntimeClasspath
-org.springframework:spring-core:5.2.10.RELEASE=testCompileClasspath,testRuntimeClasspath
+org.springframework:spring-core:5.2.10.RELEASE=testCompileClasspath
+org.springframework:spring-core:6.1.0=testRuntimeClasspath
 org.springframework:spring-expression:5.2.10.RELEASE=testCompileClasspath,testRuntimeClasspath
-org.springframework:spring-jcl:5.2.10.RELEASE=testCompileClasspath,testRuntimeClasspath
-org.springframework:spring-web:5.2.10.RELEASE=testCompileClasspath,testRuntimeClasspath
+org.springframework:spring-jcl:5.2.10.RELEASE=testCompileClasspath
+org.springframework:spring-jcl:6.1.0=testRuntimeClasspath
+org.springframework:spring-web:5.2.10.RELEASE=testCompileClasspath
+org.springframework:spring-web:6.1.0=testRuntimeClasspath
 org.springframework:spring-webmvc:5.2.10.RELEASE=testCompileClasspath,testRuntimeClasspath
 org.xmlresolver:xmlresolver:5.3.3=spotbugs
 org.yaml:snakeyaml:1.26=testCompileClasspath,testRuntimeClasspath