Merge branch 'master' into bdu/report-grpc-status-code-to-tracer-client-computed-stats

Author: bric3

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

@@ -16,8 +16,11 @@ 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`) and return a `Stream` of arguments using `Stream.of(...)` and `arguments(...)` with static import.
+- 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
@@ -27,3 +30,35 @@ When converting Groovy code to Java code, make sure that:
 - 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/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.