Repository navigation
🍒 13031 - Fix tracer version on release branches built from a detached HEAD - #13072
Conversation
GitLab checks out the pipeline commit as a detached HEAD, so `git rev-parse --abbrev-ref HEAD` returns "HEAD" and release branch builds were versioned with a minor bump instead of a patch bump. Fall back to CI_COMMIT_BRANCH when git reports a detached HEAD. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> (cherry picked from commit 373de76)
…ersionPlugin.kt Co-authored-by: Douglas Q Hawkins <douglas.hawkins@datadoghq.com> (cherry picked from commit 5f8212d)
Co-authored-by: Douglas Q Hawkins <douglas.hawkins@datadoghq.com> (cherry picked from commit 60ab6cd)
Codex Review SummaryThis comment shows the latest Codex review activity on this pull request.
ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings. |
There was a problem hiding this comment.
More details
The detached-HEAD fallback restores release-branch patch numbering through CI_COMMIT_BRANCH while preserving attached-branch and tag version selection.
🤖 Bits Code Review · Commit a7f10c0
🟢 Java Benchmark SLOs — All performance SLOs passed
PR vs. master results
Commit: Load and DaCapo benchmarks can be triggered manually in the GitLab pipeline. Results will appear in the Benchmarking Platform UI after completion. |
Backport #13031 to release/v1.68.x
Now that 1.68.0 is out, I want to verify the fix using the testing steps from the PR. This is safe to keep and easy to revert if needed.
Expected Result
On the next build / patch release, the artifact uploaded to internal S3 should contain the correct patch version bump rather than a minor bump.
Output from Gitlab after merging this PR (before and after):
The S3 jars: I downloaded both and read them with unzip -p, without running them.
dd-java-agent.versionImplementation-Versiondd-trace-java-builds/147812303/dd-java-agent.jar1.68.1-SNAPSHOT~6dbf51db521.68.1-SNAPSHOTdd-trace-java-builds/release/v1.68.x/dd-java-agent.jar1.68.1-SNAPSHOT~6dbf51db521.68.1-SNAPSHOT