Merge branch 'master' into mtoff/otlp-traces-exporter-config

Author: mtoffl01

.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/analyze-changes.yaml

@@ -30,7 +30,7 @@ jobs:
             ${{ runner.os }}-gradle-
         
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@0d579ffd059c29b07949a3cce3983f0780820c98 # v4.32.6
+        uses: github/codeql-action/init@b1bff81932f5cdfc8695c7752dcee935dcd061c8 # v4.33.0
         with:
           languages: 'java'
           build-mode: 'manual'
@@ -43,7 +43,7 @@ jobs:
           ./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@0d579ffd059c29b07949a3cce3983f0780820c98 # v4.32.6
+        uses: github/codeql-action/analyze@b1bff81932f5cdfc8695c7752dcee935dcd061c8 # v4.33.0
 
   trivy:
     name: Analyze changes with Trivy
@@ -102,7 +102,7 @@ jobs:
           TRIVY_JAVA_DB_REPOSITORY: ghcr.io/aquasecurity/trivy-java-db,public.ecr.aws/aquasecurity/trivy-java-db
 
       - name: Upload Trivy scan results to GitHub Security tab
-        uses: github/codeql-action/upload-sarif@0d579ffd059c29b07949a3cce3983f0780820c98 # v4.32.6
+        uses: github/codeql-action/upload-sarif@b1bff81932f5cdfc8695c7752dcee935dcd061c8 # v4.33.0
         if: always()
         with:
           sarif_file: 'trivy-results.sarif'

.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 }}

.gitlab/collect_results.sh

@@ -12,7 +12,13 @@ WORKSPACE_DIR=workspace
 mkdir -p $TEST_RESULTS_DIR
 mkdir -p $WORKSPACE_DIR
 
-mapfile -t TEST_RESULT_DIRS < <(find $WORKSPACE_DIR -name test-results -type d)
+# Main project modules redirect their build directory to workspace/<project-path>/build/ in CI
+# (see build.gradle.kts layout.buildDirectory override). buildSrc is a separate Gradle build
+# that runs before the main build is configured, so this redirect never applies to it;
+# its test results always land in buildSrc/**/build/test-results/, not under workspace/.
+SEARCH_DIRS=($WORKSPACE_DIR buildSrc)
+
+mapfile -t TEST_RESULT_DIRS < <(find "${SEARCH_DIRS[@]}" -name test-results -type d)
 
 if [[ ${#TEST_RESULT_DIRS[@]} -eq 0 ]]; then
   echo "No test results found"

buildSrc/src/test/kotlin/datadog/gradle/plugin/GradleFixture.kt

@@ -23,7 +23,12 @@ internal open class GradleFixture(protected val projectDir: File) {
    */
   fun run(vararg args: String, expectFailure: Boolean = false, env: Map<String, String> = emptyMap()): BuildResult {
     val runner = GradleRunner.create()
-      .withTestKitDir(File(projectDir, ".gradle-test-kit"))
+      // Use a testkit dir scoped to this fixture's projectDir. The Tooling API always uses a
+      // daemon and ignores org.gradle.daemon=false. By giving each test its own testkit dir,
+      // we force a fresh daemon per test — ensuring withEnvironment() vars (e.g.
+      // MAVEN_REPOSITORY_PROXY) are correctly set on the daemon JVM and not inherited from
+      // a previously-started daemon with a different test's environment.
+      .withTestKitDir(file(".testkit"))
       .withPluginClasspath()
       .withProjectDir(projectDir)
       .withEnvironment(System.getenv() + env)

components/http/http-api/src/main/java/datadog/http/client/HttpClient.java

@@ -41,7 +41,7 @@ public interface HttpClient {
    * @return a new http client builder
    */
   static Builder newBuilder() {
-    return HttpProviders.newClientBuilder();
+    return HttpProviders.get().newClientBuilder();
   }
 
   /** Builder for constructing {@link HttpClient} instances. */

components/http/http-api/src/main/java/datadog/http/client/HttpProvider.java

@@ -0,0 +1,28 @@
+package datadog.http.client;
+
+import java.net.URI;
+import java.nio.ByteBuffer;
+import java.util.List;
+
+/** Factory class providing the various HTTP client class implementations. */
+public abstract class HttpProvider {
+  public abstract HttpClient.Builder newClientBuilder();
+
+  public abstract HttpRequest.Builder newRequestBuilder();
+
+  public abstract HttpUrl.Builder newUrlBuilder();
+
+  public abstract HttpUrl httpUrlParse(String url);
+
+  public abstract HttpUrl httpUrlFrom(URI uri);
+
+  public abstract HttpRequestBody requestBodyOfString(String content);
+
+  public abstract HttpRequestBody requestBodyOfBytes(byte[] bytes);
+
+  public abstract HttpRequestBody requestBodyOfByteBuffers(List<ByteBuffer> buffers);
+
+  public abstract HttpRequestBody requestBodyGzip(HttpRequestBody body);
+
+  public abstract HttpRequestBody.MultipartBuilder requestBodyMultipart();
+}