From d5b4faca0c550f0cc3e366063c36c1fbd1b0f492 Mon Sep 17 00:00:00 2001 From: Brice Dutheil Date: Thu, 3 Sep 2026 11:39:09 +0200 Subject: [PATCH 1/3] fix: align dd-trace-ot dependency lock Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent) Co-authored-by: Sisyphus --- dd-trace-ot/gradle.lockfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dd-trace-ot/gradle.lockfile b/dd-trace-ot/gradle.lockfile index 5dd18e93f09..ea3ee1a46ce 100644 --- a/dd-trace-ot/gradle.lockfile +++ b/dd-trace-ot/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=jmhRuntimeClasspath,ot31CompatibilityTestComp com.blogspot.mydailyjava:weak-lock-free:0.17=jmhRuntimeClasspath,ot31CompatibilityTestCompileClasspath,ot31CompatibilityTestRuntimeClasspath,ot33CompatibilityTestCompileClasspath,ot33CompatibilityTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,ot31CompatibilityTestCompileClasspath,ot31CompatibilityTestRuntimeClasspath,ot33CompatibilityTestCompileClasspath,ot33CompatibilityTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,ot31CompatibilityTestCompileClasspath,ot31CompatibilityTestRuntimeClasspath,ot33CompatibilityTestCompileClasspath,ot33CompatibilityTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=jmhRuntimeClasspath,ot31CompatibilityTestCompileClasspath,ot31CompatibilityTestRuntimeClasspath,ot33CompatibilityTestCompileClasspath,ot33CompatibilityTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=jmhRuntimeClasspath,ot31CompatibilityTestCompileClasspath,ot31CompatibilityTestRuntimeClasspath,ot33CompatibilityTestCompileClasspath,ot33CompatibilityTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,ot31CompatibilityTestCompileClasspath,ot31CompatibilityTestRuntimeClasspath,ot33CompatibilityTestCompileClasspath,ot33CompatibilityTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=jmhRuntimeClasspath,ot31CompatibilityTestRuntimeClasspath,ot33CompatibilityTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=jmhRuntimeClasspath,ot31CompatibilityTestRuntimeClasspath,ot33CompatibilityTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath From c9f2f99f2d2b5f288a67dac12d05dcf8cde46e5b Mon Sep 17 00:00:00 2001 From: Brice Dutheil Date: Thu, 3 Sep 2026 13:32:18 +0200 Subject: [PATCH 2/3] fix: refresh locks during scheduled validation --- .gitlab-ci.yml | 15 ++++++++++++++- dd-trace-ot/gradle.lockfile | 2 +- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index df0fca12659..6158883a849 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -519,9 +519,21 @@ validate_build: - cp workspace/dd-java-agent/build/libs/*.jar reference-artifacts/ - cp workspace/dd-trace-api/build/libs/*.jar reference-artifacts/ - cp workspace/dd-trace-ot/build/libs/*.jar reference-artifacts/ + # Scheduled builds refresh dependency locks before creating the reference artifacts. + # Refresh them here as well so the candidate uses the same dependency resolution. + - if [ $CI_PIPELINE_SOURCE == "schedule" ] ; then ./gradlew resolveAndLockAll --write-locks $GRADLE_ARGS; fi - ./gradlew --version # This will run the shadowJar task and exercise the build cache, allowing to identify build-cache issues - - ./gradlew compareToReferenceJar -PjardiffReferenceDir="$CI_PROJECT_DIR/reference-artifacts" -PskipTests $GRADLE_ARGS + # Keep both JAR sets for direct inspection when the comparison fails. + - | + if ! ./gradlew compareToReferenceJar -PjardiffReferenceDir="$CI_PROJECT_DIR/reference-artifacts" -PskipTests $GRADLE_ARGS; then + mkdir -p jar-comparison-artifacts/reference jar-comparison-artifacts/candidate + cp reference-artifacts/*.jar jar-comparison-artifacts/reference/ + cp workspace/dd-java-agent/build/libs/*.jar jar-comparison-artifacts/candidate/ + cp workspace/dd-trace-api/build/libs/*.jar jar-comparison-artifacts/candidate/ + cp workspace/dd-trace-ot/build/libs/*.jar jar-comparison-artifacts/candidate/ + exit 1 + fi after_script: - source .gitlab/gitlab-utils.sh - gitlab_section_start "collect-reports" "Collecting reports" @@ -531,6 +543,7 @@ validate_build: when: always paths: - ./check_reports + - './jar-comparison-artifacts' - '.gradle/daemon/*/*.out.log' .check_job: diff --git a/dd-trace-ot/gradle.lockfile b/dd-trace-ot/gradle.lockfile index ea3ee1a46ce..5dd18e93f09 100644 --- a/dd-trace-ot/gradle.lockfile +++ b/dd-trace-ot/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=jmhRuntimeClasspath,ot31CompatibilityTestComp com.blogspot.mydailyjava:weak-lock-free:0.17=jmhRuntimeClasspath,ot31CompatibilityTestCompileClasspath,ot31CompatibilityTestRuntimeClasspath,ot33CompatibilityTestCompileClasspath,ot33CompatibilityTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,ot31CompatibilityTestCompileClasspath,ot31CompatibilityTestRuntimeClasspath,ot33CompatibilityTestCompileClasspath,ot33CompatibilityTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,ot31CompatibilityTestCompileClasspath,ot31CompatibilityTestRuntimeClasspath,ot33CompatibilityTestCompileClasspath,ot33CompatibilityTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.5=jmhRuntimeClasspath,ot31CompatibilityTestCompileClasspath,ot31CompatibilityTestRuntimeClasspath,ot33CompatibilityTestCompileClasspath,ot33CompatibilityTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.4=jmhRuntimeClasspath,ot31CompatibilityTestCompileClasspath,ot31CompatibilityTestRuntimeClasspath,ot33CompatibilityTestCompileClasspath,ot33CompatibilityTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,ot31CompatibilityTestCompileClasspath,ot31CompatibilityTestRuntimeClasspath,ot33CompatibilityTestCompileClasspath,ot33CompatibilityTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=jmhRuntimeClasspath,ot31CompatibilityTestRuntimeClasspath,ot33CompatibilityTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=jmhRuntimeClasspath,ot31CompatibilityTestRuntimeClasspath,ot33CompatibilityTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath From cd311bd00ce28dcf173f3d32c9b9c69562a04cff Mon Sep 17 00:00:00 2001 From: Brice Dutheil Date: Thu, 3 Sep 2026 13:48:41 +0200 Subject: [PATCH 3/3] fix: keep comparison artifacts with reports --- .gitlab-ci.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6158883a849..196d953e377 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -527,11 +527,11 @@ validate_build: # Keep both JAR sets for direct inspection when the comparison fails. - | if ! ./gradlew compareToReferenceJar -PjardiffReferenceDir="$CI_PROJECT_DIR/reference-artifacts" -PskipTests $GRADLE_ARGS; then - mkdir -p jar-comparison-artifacts/reference jar-comparison-artifacts/candidate - cp reference-artifacts/*.jar jar-comparison-artifacts/reference/ - cp workspace/dd-java-agent/build/libs/*.jar jar-comparison-artifacts/candidate/ - cp workspace/dd-trace-api/build/libs/*.jar jar-comparison-artifacts/candidate/ - cp workspace/dd-trace-ot/build/libs/*.jar jar-comparison-artifacts/candidate/ + mkdir -p check_reports/jar-comparison-artifacts/reference check_reports/jar-comparison-artifacts/candidate + cp reference-artifacts/*.jar check_reports/jar-comparison-artifacts/reference/ + cp workspace/dd-java-agent/build/libs/*.jar check_reports/jar-comparison-artifacts/candidate/ + cp workspace/dd-trace-api/build/libs/*.jar check_reports/jar-comparison-artifacts/candidate/ + cp workspace/dd-trace-ot/build/libs/*.jar check_reports/jar-comparison-artifacts/candidate/ exit 1 fi after_script: @@ -543,7 +543,6 @@ validate_build: when: always paths: - ./check_reports - - './jar-comparison-artifacts' - '.gradle/daemon/*/*.out.log' .check_job: