Merge branch 'master' into alexeyk/protocol-v1-1

Author: AlexeyKuznetsov-DD

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

@@ -32,10 +32,6 @@ When converting Groovy code to Java code, make sure that:
 - When translating Spock `Mock(...)` usage, use `libs.bundles.mockito` instead of writing manual recording/stub implementations
 
 TableTest usage
-  Dependency, if missing add:
-    - Groovy: testImplementation libs.tabletest
-    - Kotlin: testImplementation(libs.tabletest)
-
   Import: `import org.tabletest.junit.TableTest;`
 
   JDK 8 rules:

.claude/skills/migrate-junit-source-to-tabletest/SKILL.md

@@ -11,11 +11,6 @@ Process (do in this order):
 4) Write each modified file once in full using Write (no incremental per-test edits).
 5) Run module tests once and verify "BUILD SUCCESSFUL". If failed, inspect JUnit XML report.
 
-Dependency:
-- If missing, add:
-  - Groovy: testImplementation libs.tabletest
-  - Kotlin: testImplementation(libs.tabletest)
-
 Import: `import org.tabletest.junit.TableTest;`
 
 JDK 8 rules:
@@ -34,6 +29,7 @@ Table formatting rules (mandatory):
 - Use '|' as delimiter.
 - Align columns with spaces so pipes line up vertically.
 - Prefer single quotes for strings requiring quotes (e.g., 'a|b', '[]', '{}', ' ').
+- Use value sets (`{a, b, c}`) instead of matrix-style repetition when only one dimension varies across otherwise-identical rows.
 
 Conversions:
 A) @CsvSource
@@ -42,7 +38,8 @@ A) @CsvSource
 - If delimiter is ',' (default): replace ',' with '|' in rows.
 
 B) @ValueSource
-- Convert to @TableTest with header from parameter name.
+- Keep single-parameter tests on `@ValueSource` (and `@NullSource` when null cases are needed).
+- Otherwise convert to @TableTest with header from parameter name.
 - Each value becomes one row.
 - Add "scenario" column using common sense for name.
 
@@ -60,6 +57,11 @@ C) @MethodSource (convert only if values are representable as strings)
 - '' = empty string.
 - For String params that start with '[' or '{', quote to avoid collection parsing (prefer '[]'/'{}').
 
+D) @TypeConverter
+- Use `@TypeConverter` for symbolic constants used by migrated table rows (e.g. `Long.MAX_VALUE`, `DDSpanId.MAX`).
+- Prefer explicit one-case-one-return mappings.
+- Prefer shared converter utilities (e.g. in `utils/test-utils`) when reuse across modules is likely.
+
 Scenario handling:
 - If MethodSource includes a leading description string OR @ParameterizedTest(name=...) uses {0}, convert that to a scenario column and remove that parameter from method signature.
 

.github/workflows/enforce-groovy-migration.yaml

@@ -4,6 +4,7 @@ on:
     types: [opened, edited, ready_for_review, labeled, unlabeled, synchronize]
     branches:
       - master
+      - 'release/v*'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

components/json/build.gradle.kts

@@ -7,7 +7,3 @@ apply(from = "$rootDir/gradle/java.gradle")
 jmh {
   jmhVersion = libs.versions.jmh.get()
 }
-
-dependencies {
-  testImplementation(libs.tabletest)
-}

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

@@ -17,6 +17,8 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
+import org.junit.jupiter.params.provider.NullSource;
+import org.junit.jupiter.params.provider.ValueSource;
 import org.tabletest.junit.Scenario;
 import org.tabletest.junit.TableTest;
 
@@ -77,28 +79,16 @@ static Stream<Arguments> testMappingToJsonObjectArguments() {
             "{\"key1\":null,\"key2\":\"bar\",\"key3\":3,\"key4\":3456789123,\"key5\":3.142,\"key6\":3.141592653589793,\"key7\":true,\"key8\":\"toString\"}"));
   }
 
-  @TableTest({
-    "Scenario     | Json  ",
-    "null         |       ",
-    "null string  | 'null'",
-    "empty string | ''    ",
-    "empty object | '{}'  "
-  })
   @ParameterizedTest(name = "test mapping to Map from empty JSON object: {0}")
+  @NullSource
+  @ValueSource(strings = {"null", "", "{}"})
   void testMappingToMapFromEmptyJsonObject(String json) throws IOException {
     Map<String, Object> parsed = JsonMapper.fromJsonToMap(json);
     assertEquals(emptyMap(), parsed);
   }
 
-  // temporary disable spotless, will open issue to fix this.
-  // spotless:off
-  @TableTest({
-      "Scenario | Json  ",
-      "integer  | 1     ",
-      "array    | [1, 2]"
-  })
-  // spotless:on
   @ParameterizedTest(name = "test mapping to Map from non-object JSON: {0}")
+  @ValueSource(strings = {"1", "[1, 2]"})
   void testMappingToMapFromNonObjectJson(String json) {
     assertThrows(IOException.class, () -> JsonMapper.fromJsonToMap(json));
   }
@@ -138,14 +128,9 @@ void testMappingArrayToJsonArray(String ignoredScenario, String[] input, String
     assertArrayEquals(input != null ? input : new String[] {}, parsed);
   }
 
-  @TableTest({
-    "Scenario      | Json  ",
-    "null          |       ",
-    "null string   | 'null'",
-    "empty string  | ''    ",
-    "empty array   | '[]'  "
-  })
   @ParameterizedTest(name = "test mapping to List from empty JSON object: {0}")
+  @NullSource
+  @ValueSource(strings = {"null", "", "[]"})
   void testMappingToListFromEmptyJsonObject(String json) throws IOException {
     List<String> parsed = JsonMapper.fromJsonToList(json);
     assertEquals(emptyList(), parsed);

dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/SourceRemapper.java

@@ -13,11 +13,18 @@ static SourceRemapper getSourceRemapper(String sourceFile, SourceMap sourceMap)
     JvmLanguage jvmLanguage = JvmLanguage.of(sourceFile);
     switch (jvmLanguage) {
       case KOTLIN:
-        StratumExt stratum = sourceMap.getStratum("KotlinDebug");
-        if (stratum == null) {
-          throw new IllegalArgumentException("No stratum found for KotlinDebug");
+        StratumExt stratumMain = sourceMap.getStratum("Kotlin");
+        if (stratumMain == null) {
+          stratumMain = sourceMap.getStratum(sourceMap.getDefaultStratumName());
+          if (stratumMain == null) {
+            throw new IllegalArgumentException("No default stratum found");
+          }
         }
-        return new KotlinSourceRemapper(stratum);
+        StratumExt stratumDebug = sourceMap.getStratum("KotlinDebug");
+        if (stratumDebug == null) {
+          throw new IllegalArgumentException("No stratumDebug found for KotlinDebug");
+        }
+        return new KotlinSourceRemapper(stratumMain, stratumDebug);
       default:
         return NOOP_REMAPPER;
     }
@@ -33,19 +40,33 @@ public int remapSourceLine(int line) {
   }
 
   class KotlinSourceRemapper implements SourceRemapper {
-    private final StratumExt stratum;
+    private final StratumExt stratumMain;
+    private final StratumExt stratumDebug;
 
-    public KotlinSourceRemapper(StratumExt stratum) {
-      this.stratum = stratum;
+    public KotlinSourceRemapper(StratumExt stratumMain, StratumExt stratumDebug) {
+      this.stratumMain = stratumMain;
+      this.stratumDebug = stratumDebug;
     }
 
     @Override
     public int remapSourceLine(int line) {
-      Pair<String, Integer> pair = stratum.getInputLine(line);
-      if (pair == null || pair.getRight() == null) {
-        return line;
+      Pair<String, Integer> pairDebug = stratumDebug.getInputLine(line);
+      if (pairDebug == null || pairDebug.getRight() == null) {
+        Pair<String, Integer> pairMain = stratumMain.getInputLine(line);
+        if (pairMain == null || pairMain.getRight() == null) {
+          return line;
+        }
+        String fileId = pairMain.getLeft();
+        String sourceFileName = stratumMain.getSourceFileName(fileId);
+        if (sourceFileName == null) {
+          throw new IllegalArgumentException("Cannot find source filename for fileid=" + fileId);
+        }
+        if (sourceFileName.equals("fake.kt")) {
+          return -1; // no mapping possible
+        }
+        return pairMain.getRight();
       }
-      return pair.getRight();
+      return pairDebug.getRight();
     }
   }
 }

dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/SymbolExtractor.java

@@ -506,7 +506,7 @@ private static MethodLineInfo extractMethodLineInfo(
       if (node.getType() == AbstractInsnNode.LINE) {
         LineNumberNode lineNumberNode = (LineNumberNode) node;
         int newLine = sourceRemapper.remapSourceLine(lineNumberNode.line);
-        if (dedupSet.add(newLine)) {
+        if (newLine > 0 && dedupSet.add(newLine)) {
           lineNo.add(newLine);
         }
         maxLine = Math.max(newLine, maxLine);

dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/symbol/SourceRemapperTest.java

@@ -21,9 +21,11 @@ public void noopSourceRemapper() {
   @Test
   public void kotlinSourceRemapper() {
     SourceMap sourceMapMock = mock(SourceMap.class);
-    StratumExt stratumMock = mock(StratumExt.class);
-    when(sourceMapMock.getStratum(eq("KotlinDebug"))).thenReturn(stratumMock);
-    when(stratumMock.getInputLine(eq(42))).thenReturn(Pair.of("", 24));
+    StratumExt stratumMainMock = mock(StratumExt.class);
+    StratumExt stratumDebugMock = mock(StratumExt.class);
+    when(sourceMapMock.getStratum(eq("Kotlin"))).thenReturn(stratumMainMock);
+    when(sourceMapMock.getStratum(eq("KotlinDebug"))).thenReturn(stratumDebugMock);
+    when(stratumDebugMock.getInputLine(eq(42))).thenReturn(Pair.of("", 24));
     SourceRemapper sourceRemapper = SourceRemapper.getSourceRemapper("foo.kt", sourceMapMock);
     assertTrue(sourceRemapper instanceof SourceRemapper.KotlinSourceRemapper);
     assertEquals(24, sourceRemapper.remapSourceLine(42));

dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/symbol/SymbolExtractionTransformerTest.java

@@ -1002,7 +1002,7 @@ public void symbolExtraction16() throws IOException, URISyntaxException {
     }
     assertEquals(2, symbolSinkMock.jarScopes.size());
     Scope classScope = symbolSinkMock.jarScopes.get(0).getScopes().get(0);
-    assertScope(classScope, ScopeType.CLASS, CLASS_NAME, 6, 17, SOURCE_FILE, 4, 1);
+    assertScope(classScope, ScopeType.CLASS, CLASS_NAME, 6, 23, SOURCE_FILE, 5, 1);
     assertLangSpecifics(
         classScope.getLanguageSpecifics(),
         asList("public", "final"),
@@ -1024,12 +1024,15 @@ public void symbolExtraction16() throws IOException, URISyntaxException {
     Scope f2MethodScope = classScope.getScopes().get(2);
     assertScope(f2MethodScope, ScopeType.METHOD, "f2", 10, 17, SOURCE_FILE, 3, 1);
     assertLineRanges(f2MethodScope, "10-10", "12-12", "14-14", "16-17");
+    Scope f3MethodScope = classScope.getScopes().get(3);
+    assertScope(f3MethodScope, ScopeType.METHOD, "f3", 21, 23, SOURCE_FILE, 1, 1);
+    assertLineRanges(f3MethodScope, "21-23");
     assertScope(
-        classScope.getScopes().get(3), ScopeType.METHOD, "<clinit>", 0, 0, SOURCE_FILE, 0, 0);
+        classScope.getScopes().get(4), ScopeType.METHOD, "<clinit>", 0, 0, SOURCE_FILE, 0, 0);
 
     Scope companionClassScope = symbolSinkMock.jarScopes.get(1).getScopes().get(0);
     assertScope(
-        companionClassScope, ScopeType.CLASS, CLASS_NAME + "$Companion", 22, 23, SOURCE_FILE, 3, 0);
+        companionClassScope, ScopeType.CLASS, CLASS_NAME + "$Companion", 28, 29, SOURCE_FILE, 3, 0);
     assertLangSpecifics(
         classScope.getLanguageSpecifics(),
         asList("public", "final"),
@@ -1047,8 +1050,8 @@ public void symbolExtraction16() throws IOException, URISyntaxException {
         0,
         0);
     Scope mainMethodScope = companionClassScope.getScopes().get(1);
-    assertScope(mainMethodScope, ScopeType.METHOD, "main", 22, 23, SOURCE_FILE, 1, 1);
-    assertLineRanges(mainMethodScope, "22-23");
+    assertScope(mainMethodScope, ScopeType.METHOD, "main", 28, 29, SOURCE_FILE, 1, 1);
+    assertLineRanges(mainMethodScope, "28-29");
   }
 
   @Test

dd-java-agent/agent-debugger/src/test/resources/CapturedSnapshot301.kt

@@ -15,6 +15,12 @@ class CapturedSnapshot301 {
     return value
   }
 
+  fun f3(value: Int): Int {
+    val list = listOf(value, 2, 3)
+    val max = list.maxOf { it -> it > 0 }
+    return value
+  }
+
   companion object {
     fun main(arg: String): Int {
       val c = CapturedSnapshot301()