Merge branch 'master' into andrea.marziali/ffm-instrument

Author: amarziali

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

@@ -1,20 +1,64 @@
 ---
 name: migrate-groovy-to-java
-description: migrate test groovy files to java
+description: >
+  Converts Spock/Groovy test files in a Gradle module to equivalent JUnit 5 Java tests.
+  Use when asked to "migrate groovy", "convert groovy to java", "g2j", or when a module
+  has .groovy test files that need to be replaced with .java equivalents.
 ---
 
 Migrate test Groovy files to Java using JUnit 5
 
-1. List all groovy files of the current gradle module
-2. convert groovy files to Java using Junit 5
-3. make sure the tests are still passing after migration
-4. remove groovy files
+1. List all Groovy files of the current Gradle module
+2. Convert Groovy files to Java using JUnit 5
+3. Make sure the tests are still passing after migration and that the test count has not changed
+4. Remove Groovy files
+5. Add the migrated module path(s) to `.github/g2j-migrated-modules.txt`
 
-When converting groovy code to java code make sure that:
-- the Java code generated is compatible with JDK 8
-- when translating Spock test, favor using `@CsvSource` with `|` delimiters
-- when using a `@MethodSource`, use the test method name, and suffix it with `_arguments`
-- when converting tuples, create light dedicated structure instead to keep the typing system
+When converting Groovy code to Java code, make sure that:
+- The Java code generated is compatible with JDK 8
+- When translating Spock tests, prefer `@TableTest` for data rows that are naturally tabular. See detailed guidance in the "TableTest usage" section.
+- `@TableTest` and `@MethodSource` may be combined on the same `@ParameterizedTest` when most cases are tabular but a few cases require programmatic setup.
+- In combined mode, keep table-friendly cases in `@TableTest`, and put only non-tabular/complex cases in `@MethodSource`.
+- If `@TableTest` is not viable for the test at all, use `@MethodSource` only.
+- For `@MethodSource`, name the arguments method `<testMethodName>Arguments` (camelCase, e.g. `testMethodArguments`) and return `Stream<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 exception and throwing a Runtime exception, prefer adding a throws clause at method declaration
+- Instead of using `assertTrue(a.equals(b))` or `assertFalse(a.equals(b))`, use `assertEquals(expected, actual)` and `assertNotEquals(unexpected, actual)`
+- Import frequently used types rather than using fully-qualified names inline, to improve readability
+- Do not wrap checked exceptions and throw a Runtime exception; prefer adding a throws clause at method declaration
 - Do not mark local variables `final`
+- Ensure variables are human-readable; avoid single-letter names and pre-define variables that are referenced multiple times
+- 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:
+    - No text blocks.
+    - @TableTest must use String[] annotation array syntax:
+    ```
+    @TableTest({
+      "a | b",
+      "1 | 2"
+    })
+    ```
+
+  Spock `where:` → @TableTest:
+    - First row = header (column names = method parameters).
+    - Add `scenario` column as first column (display name, not a method parameter).
+    - Use `|` delimiter; align columns so pipes line up vertically.
+    - Prefer single quotes for strings with special chars (e.g., `'a|b'`, `'[]'`).
+    - Blank cell = null (object types); `''` = empty string.
+    - Collections: `[a, b]` = List/array, `{a, b}` = Set, `[k: v]` = Map.
+
+  Mixed eligibility:
+    - Prefer combining `@TableTest` + `@MethodSource` on one `@ParameterizedTest` when only some cases are complex.
+    - Use `@MethodSource` only when tabular representation is not practical for the test.
+
+  Do NOT use @TableTest when:
+    - Majority of rows require complex objects or custom converters.

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

@@ -0,0 +1,77 @@
+---
+name: migrate-junit-source-to-tabletest
+description: Convert JUnit 5 @MethodSource/@CsvSource/@ValueSource parameterized tests to @TableTest (JDK8)
+---
+Goal: Migrate JUnit 5 parameterized tests using @MethodSource/@CsvSource/@ValueSource to @TableTest with minimal churn and passing tests.
+
+Process (do in this order):
+1) Locate targets via Grep (no agent subprocess). Search for: "@ParameterizedTest", "@MethodSource", "@CsvSource", "@ValueSource".
+2) Read all matching files up front (parallel is OK).
+3) Convert eligible tests to @TableTest.
+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:
+- No text blocks.
+- @TableTest must use String[] annotation array syntax:
+  ```
+  @TableTest({
+   "a | b",
+   "1 | 2"
+  })
+  ```
+
+Table formatting rules (mandatory):
+- Always include a header row (parameter names).
+- Always add a "scenario" column; using common sense for naming; scenario is NOT a method parameter.
+- Use '|' as delimiter.
+- Align columns with spaces so pipes line up vertically.
+- Prefer single quotes for strings requiring quotes (e.g., 'a|b', '[]', '{}', ' ').
+
+Conversions:
+A) @CsvSource
+- Remove @ParameterizedTest and @CsvSource.
+- If delimiter is '|': rows map directly to @TableTest.
+- If delimiter is ',' (default): replace ',' with '|' in rows.
+
+B) @ValueSource
+- Convert to @TableTest with header from parameter name.
+- Each value becomes one row.
+- Add "scenario" column using common sense for name.
+
+C) @MethodSource (convert only if values are representable as strings)
+- Convert when argument values are primitives, strings, enums, booleans, nulls, and simple collection literals supported by TableTest:
+  - Array: [a, b, ...]
+  - List: [a, b, ...]
+  - Set: {a, b, ...}
+  - Map: [k: v, ...]
+- `@TableTest` and `@MethodSource` may be combined on the same `@ParameterizedTest` when most cases are tabular but a few cases require programmatic setup.
+- In combined mode, keep table-friendly cases in `@TableTest`, and put only non-tabular/complex cases in `@MethodSource`.
+- If `@TableTest` is not viable for the test at all, use `@MethodSource` only.
+- For `@MethodSource`, name the arguments method `<testMethodName>Arguments` (camelCase, e.g. `testMethodArguments`) and return `Stream<Arguments>` using `Stream.of(...)` and `arguments(...)` with static import.
+- Blank cell = null (non-primitive).
+- '' = empty string.
+- For String params that start with '[' or '{', quote to avoid collection parsing (prefer '[]'/'{}').
+
+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.
+
+Cleanup:
+- Delete now-unused @MethodSource provider methods and unused imports.
+
+Mixed eligibility:
+- Prefer combining `@TableTest` + `@MethodSource` on one `@ParameterizedTest` when only some cases are complex.
+
+Do NOT convert when:
+- Most rows require complex builders/mocks.
+
+Test command (exact):
+./gradlew :path:to:module:test --rerun-tasks 2>&1 | tail -20
+- If BUILD FAILED: cat path/to/module/build/test-results/test/TEST-*.xml

.github/CODEOWNERS

@@ -51,11 +51,10 @@
 **/InferredProxy*.groovy                                        @DataDog/apm-serverless
 
 # @DataDog/apm-lang-platform-java
-/.circleci/                             @DataDog/apm-lang-platform-java
 /.github/                               @DataDog/apm-lang-platform-java
 /benchmark/                             @DataDog/apm-lang-platform-java
 /components/                            @DataDog/apm-lang-platform-java
-/dd-java-agent/instrumentation/java-*/  @DataDog/apm-lang-platform-java
+/dd-java-agent/instrumentation/java/    @DataDog/apm-lang-platform-java
 /dd-smoke-tests/concurrent/             @DataDog/apm-lang-platform-java
 /dd-smoke-tests/lib-injection/          @DataDog/apm-lang-platform-java
 /metadata/                              @DataDog/apm-lang-platform-java
@@ -80,7 +79,7 @@
 /dd-smoke-tests/iast-propagation/                               @DataDog/asm-java
 /dd-smoke-tests/iast-util/                                      @DataDog/asm-java
 /dd-smoke-tests/spring-security/                                @DataDog/asm-java
-/dd-java-agent/instrumentation/commons-fileupload/              @DataDog/asm-java
+/dd-java-agent/instrumentation/commons-fileupload-1.5/          @DataDog/asm-java
 /dd-java-agent/instrumentation/spring/spring-security/          @DataDog/asm-java
 /dd-trace-api/src/main/java/datadog/trace/api/aiguard/          @DataDog/asm-java
 /dd-trace-api/src/main/java/datadog/trace/api/EventTracker.java @DataDog/asm-java
@@ -103,12 +102,12 @@
 /dd-java-agent/instrumentation/cucumber-5.4/        @DataDog/ci-app-libraries
 /dd-java-agent/instrumentation/jacoco-0.8.9/        @DataDog/ci-app-libraries
 /dd-java-agent/instrumentation/junit                @DataDog/ci-app-libraries
-/dd-java-agent/instrumentation/karate/              @DataDog/ci-app-libraries
+/dd-java-agent/instrumentation/karate-1.0/          @DataDog/ci-app-libraries
 /dd-java-agent/instrumentation/scalatest-3.0.8/     @DataDog/ci-app-libraries
-/dd-java-agent/instrumentation/selenium/            @DataDog/ci-app-libraries
+/dd-java-agent/instrumentation/selenium-3.13/       @DataDog/ci-app-libraries
 /dd-java-agent/instrumentation/testng/              @DataDog/ci-app-libraries
 /dd-java-agent/instrumentation/gradle/              @DataDog/ci-app-libraries
-/dd-java-agent/instrumentation/gradle-testing/      @DataDog/ci-app-libraries
+/dd-java-agent/instrumentation/gradle-testing-5.1/  @DataDog/ci-app-libraries
 /dd-java-agent/instrumentation/maven                @DataDog/ci-app-libraries
 /dd-java-agent/instrumentation/weaver-0.9/          @DataDog/ci-app-libraries
 /dd-smoke-tests/gradle/                             @DataDog/ci-app-libraries
@@ -130,24 +129,24 @@
 /dd-java-agent/instrumentation/spark/           @DataDog/data-jobs-monitoring
 
 # @DataDog/data-streams-monitoring
-/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/datastreams  @DataDog/data-streams-monitoring
-/dd-trace-core/src/main/java/datadog/trace/core/datastreams                  @DataDog/data-streams-monitoring
-/dd-trace-core/src/test/groovy/datadog/trace/core/datastreams                @DataDog/data-streams-monitoring
-/internal-api/src/main/java/datadog/trace/api/datastreams                    @DataDog/data-streams-monitoring
-/dd-smoke-tests/datastreams/                                                 @DataDog/data-streams-monitoring
-/internal-api/src/test/groovy/datadog/trace/api/datastreams                  @DataDog/data-streams-monitoring
-**/datastreams/                                                              @DataDog/data-streams-monitoring
-**/DataStreams*                                                              @DataDog/data-streams-monitoring
-**/dsmTest/**                                                                @DataDog/data-streams-monitoring
+/dd-java-agent/instrumentation-testing/src/main/groovy/datadog/trace/agent/test/datastreams @DataDog/data-streams-monitoring
+/dd-trace-core/src/main/java/datadog/trace/core/datastreams                                 @DataDog/data-streams-monitoring
+/dd-trace-core/src/test/groovy/datadog/trace/core/datastreams                               @DataDog/data-streams-monitoring
+/internal-api/src/main/java/datadog/trace/api/datastreams                                   @DataDog/data-streams-monitoring
+/dd-smoke-tests/datastreams/                                                                @DataDog/data-streams-monitoring
+/internal-api/src/test/groovy/datadog/trace/api/datastreams                                 @DataDog/data-streams-monitoring
+**/datastreams/                                                                             @DataDog/data-streams-monitoring
+**/DataStreams*                                                                             @DataDog/data-streams-monitoring
+**/dsmTest/**                                                                               @DataDog/data-streams-monitoring
 
 /dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/       @DataDog/data-streams-monitoring @DataDog/apm-idm-java
-/dd-java-agent/instrumentation/avro/                            @DataDog/data-streams-monitoring @DataDog/apm-idm-java
+/dd-java-agent/instrumentation/avro-1.11.3/                     @DataDog/data-streams-monitoring @DataDog/apm-idm-java
 /dd-java-agent/instrumentation/aws-java/aws-java-sns-1.0/       @DataDog/data-streams-monitoring @DataDog/apm-idm-java
 /dd-java-agent/instrumentation/aws-java/aws-java-sns-2.0/       @DataDog/data-streams-monitoring @DataDog/apm-idm-java
 /dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/       @DataDog/data-streams-monitoring @DataDog/apm-idm-java
 /dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/       @DataDog/data-streams-monitoring @DataDog/apm-idm-java
 /dd-java-agent/instrumentation/confluent-schema-registry/       @DataDog/data-streams-monitoring @DataDog/apm-idm-java
-/dd-java-agent/instrumentation/google-pubsub/                   @DataDog/data-streams-monitoring @DataDog/apm-idm-java
+/dd-java-agent/instrumentation/google-pubsub-1.116/             @DataDog/data-streams-monitoring @DataDog/apm-idm-java
 /dd-java-agent/instrumentation/grpc-1.5/                        @DataDog/data-streams-monitoring @DataDog/apm-idm-java
 /dd-java-agent/instrumentation/kafka/kafka-clients-0.11/        @DataDog/data-streams-monitoring @DataDog/apm-idm-java
 /dd-java-agent/instrumentation/kafka/kafka-clients-3.8/         @DataDog/data-streams-monitoring @DataDog/apm-idm-java
@@ -183,7 +182,8 @@
 /dd-trace-core/src/test/groovy/datadog/trace/llmobs/  @DataDog/ml-observability
 
 # @DataDog/database-monitoring
-datadog/trace/bootstrap/instrumentation/dbm  @DataDog/database-monitoring @DataDog/apm-idm-java
+/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/dbm/   @DataDog/database-monitoring @DataDog/apm-idm-java
+/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/dbm/ @DataDog/database-monitoring @DataDog/apm-idm-java
 
 # @DataDog/rum
 /internal-api/src/main/java/datadog/trace/api/rum/   @DataDog/rum

.github/chainguard/self.update-smoke-test-latest-versions.create-pr.sts.yaml

@@ -0,0 +1,13 @@
+issuer: https://token.actions.githubusercontent.com
+
+subject: repo:DataDog/dd-trace-java:ref:refs/heads/master
+
+claim_pattern:
+  event_name: (schedule|workflow_dispatch)
+  ref: refs/heads/master
+  ref_protected: "true"
+  job_workflow_ref: DataDog/dd-trace-java/\.github/workflows/update-smoke-test-latest-versions\.yaml@refs/heads/master
+
+permissions:
+  contents: write
+  pull_requests: write

.github/g2j-migrated-modules.txt

@@ -0,0 +1,10 @@
+# This file lists modules that have been migrated from Groovy to Java / JUnit 5.
+# New *.groovy files under any src/<*test*>/groovy/ path
+# in these modules will fail the 'enforce-groovy-migration' PR check.
+#
+# After a module is migrated, add it on a new line here.
+# Use the filesystem path prefix as seen below.
+
+buildSrc/call-site-instrumentation-plugin
+components/json
+dd-trace-api

.github/workflows/README.md

@@ -91,16 +91,6 @@ Close them if no following update within a week.
 
 _Recovery:_ Manually trigger the action again.
 
-### update-docker-build-image [🔗](update-docker-build-image.yaml)
-
-_Trigger:_ Quarterly released, loosely [a day after the new image tag is created](https://github.com/DataDog/dd-trace-java-docker-build/blob/master/.github/workflows/docker-tag.yml).
-
-_Action:_ Update the Docker build image used in GitLab CI with the latest tag.
-
-_Recovery:_ Download artifacts and upload them manually to the related _download release_.
-
-_Notes:_  Manually trigger the action again given the desired image tag as input.
-
 ### update-download-releases [🔗](update-download-releases.yaml)
 
 _Trigger:_ When a release is published.
@@ -123,6 +113,19 @@ _Action:_
 
 _Recovery:_ Check at the milestone for the related issues and update them manually.
 
+### enforce-groovy-migration [🔗](enforce-groovy-migration.yaml)
+
+_Trigger:_ When creating or updating a pull request targeting `master`, or when labels are updated.
+
+_Actions:_
+
+* Fail the PR if a new Groovy test file is added to a module listed in [`.github/g2j-migrated-modules.txt`](../g2j-migrated-modules.txt) (hard enforcement),
+* Post a warning comment on the PR if a new Groovy test file is added to any other non-exempt module (soft warning). Instrumentation (`dd-java-agent/instrumentation/`) and smoke-test (`dd-smoke-tests/`) modules are exempt from this warning.
+
+_Recovery:_ Re-write the Groovy test files in Java / JUnit 5. To override this check entirely, add the `tag: override-groovy-enforcement` label to the PR. Remove the label to re-enable enforcement.
+
+_Notes:_ The migrated modules list is always read from `master`. Add a new entry to `.github/g2j-migrated-modules.txt` each time a module is migrated to Java / JUnit 5.
+
 ## Code Quality and Security
 
 ### analyze-changes [🔗](analyze-changes.yaml)
@@ -158,6 +161,14 @@ _Action:_ Create a PR updating the Grade dependencies and their locking files.
 
 _Recovery:_ Manually trigger the action again.
 
+### update-smoke-test-latest-versions [🔗](update-smoke-test-latest-versions.yaml)
+
+_Trigger:_ Every week or manually.
+
+_Action:_ Create a PR updating the pinned "latest" tool versions (Gradle, Maven, Maven Surefire) used by CI Visibility smoke tests.
+
+_Recovery:_ Manually trigger the action again.
+
 ### update-jmxfetch-submodule [🔗](update-jmxfetch-submodule.yaml)
 
 _Trigger:_ Monthly or manually

.github/workflows/analyze-changes.yaml

@@ -39,14 +39,8 @@ jobs:
         env:
           ORG_GRADLE_PROJECT_akkaRepositoryToken: ${{ secrets.AKKA_REPO_TOKEN }}
         run: |
-          GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xmx3G -Xms2G'" \
-          JAVA_HOME=$JAVA_HOME_8_X64 \
-          JAVA_8_HOME=$JAVA_HOME_8_X64 \
-          JAVA_11_HOME=$JAVA_HOME_11_X64 \
-          JAVA_17_HOME=$JAVA_HOME_17_X64 \
-          JAVA_21_HOME=$JAVA_HOME_21_X64 \
-          ./gradlew clean :dd-java-agent:shadowJar \
-            --build-cache --parallel --stacktrace --no-daemon --max-workers=4
+          GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xms2G -Xmx3G'" \
+          ./gradlew clean :dd-java-agent:shadowJar --build-cache --parallel --stacktrace --no-daemon --max-workers=4
 
       - name: Perform CodeQL Analysis and upload results to GitHub Security tab
         uses: github/codeql-action/analyze@c793b717bc78562f491db7b0e93a3a178b099162 # v4.32.5
@@ -85,14 +79,8 @@ jobs:
         env:
           ORG_GRADLE_PROJECT_akkaRepositoryToken: ${{ secrets.AKKA_REPO_TOKEN }}
         run: |
-          GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xmx3G -Xms2G'" \
-          JAVA_HOME=$JAVA_HOME_8_X64 \
-          JAVA_8_HOME=$JAVA_HOME_8_X64 \
-          JAVA_11_HOME=$JAVA_HOME_11_X64 \
-          JAVA_17_HOME=$JAVA_HOME_17_X64 \
-          JAVA_21_HOME=$JAVA_HOME_21_X64 \
-          ./gradlew clean publishToMavenLocal \
-            --build-cache --parallel --stacktrace --no-daemon --max-workers=4
+          GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xms2G -Xmx3G'" \
+          ./gradlew clean publishToMavenLocal --build-cache --parallel --stacktrace --no-daemon --max-workers=4
 
       - name: Copy published artifacts
         run: |