Skip to content

🍒 13031 - Fix tracer version on release branches built from a detached HEAD - #13072

Merged
mhdatie merged 3 commits into
release/v1.68.xfrom
mo.atie/backport-pr-13031
Oct 27, 2026
Merged

mhdatie merged 3 commits into
release/v1.68.xfrom
mo.atie/backport-pr-13031

Conversation

@mhdatie

@mhdatie mhdatie commented Oct 27, 2026 •

Copy link
Copy Markdown
Contributor

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.

S3 path Last modified (UTC) dd-java-agent.version Manifest Implementation-Version
dd-trace-java-builds/147812303/dd-java-agent.jar Oct 27, 13:36:50 1.68.1-SNAPSHOT~6dbf51db52 1.68.1-SNAPSHOT
dd-trace-java-builds/release/v1.68.x/dd-java-agent.jar Oct 27, 13:36:47 1.68.1-SNAPSHOT~6dbf51db52 1.68.1-SNAPSHOT

mhdatie and others added 3 commits October 27, 2026 08:13
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)
@mhdatie
mhdatie requested a review from a team as a code owner October 27, 2026 12:13
@mhdatie mhdatie added the type: bug fix Bug fix label Oct 27, 2026
@mhdatie
mhdatie removed the request for review from a team October 27, 2026 12:13
@mhdatie mhdatie added tag: no release notes Changes to exclude from release notes comp: tooling Build & Tooling labels Oct 27, 2026
@mhdatie
mhdatie requested a review from sarahchen6 October 27, 2026 12:13
@mhdatie mhdatie added the tag: ai generated Largely based on code generated by an AI or LLM label Oct 27, 2026
@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Oct 27, 2026 •

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-10-27T12:15:34.009953Z a7f10c0 PR opened
🔒 Security Review ✅ Completed 2026-10-27T12:17:33.920193Z a7f10c0 PR opened
ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@datadog-prod-us1-4 datadog-prod-us1-4 Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bits Code Review: PASS

More details

The detached-HEAD fallback restores release-branch patch numbering through CI_COMMIT_BRANCH while preserving attached-branch and tag version selection.

Was this helpful? React 👍 or 👎

Open Bits AI session

🤖 Bits Code Review · Commit a7f10c0

@datadog-prod-us1-4

datadog-prod-us1-4 Bot commented Oct 27, 2026 •

Copy link
Copy Markdown

🎯 Code Coverage (details)
• Patch Coverage: 100.00%
• Overall Coverage: 59.99% (-0.00%)

This comment will be updated automatically if new data arrives.
🔗 Commit SHA: a7f10c0 | Docs | Give us feedback!

@dd-octo-sts

dd-octo-sts Bot commented Oct 27, 2026

Copy link
Copy Markdown
Contributor

🟢 Java Benchmark SLOs — All performance SLOs passed

Suite Status
Startup 🟢 pass

SLO thresholds are defined here based on automatically generated metrics. A warning is raised when results are within 5% of the threshold.

PR vs. master results
Scenario Candidate master Δ (95% CI of mean)
startup:insecure-bank:iast:Agent 14.01 s 13.98 s [-0.6%; +1.0%] (no difference)
startup:insecure-bank:tracing:Agent 12.90 s 12.90 s [-0.7%; +0.7%] (no difference)
startup:petclinic:appsec:Agent 16.61 s 16.86 s [-5.7%; +2.8%] (no difference)
startup:petclinic:iast:Agent 16.78 s 16.59 s [-3.0%; +5.3%] (no difference)
startup:petclinic:profiling:Agent 16.26 s 16.65 s [-6.5%; +1.7%] (no difference)
startup:petclinic:sca:Agent 16.98 s 16.38 s [-0.7%; +8.0%] (no difference)
startup:petclinic:tracing:Agent 16.12 s 16.16 s [-1.1%; +0.7%] (no difference)

Commit: a7f10c08 · CI Pipeline · Benchmarking Platform UI


Load and DaCapo benchmarks can be triggered manually in the GitLab pipeline. Results will appear in the Benchmarking Platform UI after completion.

@mhdatie
mhdatie merged commit 6dbf51d into release/v1.68.x Oct 27, 2026
620 of 626 checks passed
@mhdatie
mhdatie deleted the mo.atie/backport-pr-13031 branch October 27, 2026 13:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

comp: tooling Build & Tooling tag: ai generated Largely based on code generated by an AI or LLM tag: no release notes Changes to exclude from release notes type: bug fix Bug fix

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants