Repository navigation
Conversation
Compute tracer versions for a release process where release/vX.Y.x is cut from master before vX.Y.0 is tagged: - release/vX.Y.x builds X.Y.0-rc.N before the line tag, with N the commits added to the branch since it was cut from master, then X.Y.(Z+1)-rc.N after vX.Y.Z as today. - master and feature branches build the next minor after the newest release/vX.Y.x branch, so master moves on at the branch cut. Warns when master is missing from the clone or was merged into a release branch. Not wired into TracerVersionPlugin yet. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Contributor
Contributor
🟢 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. |
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This branch has not been deployed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What Does This Do
Adds the version logic for a branch-first release process, where
release/vX.Y.xis cut from master beforevX.Y.0is tagged. It is not wired intoTracerVersionPluginyet, so current builds are unchanged.release/v1.69.xat the cut1.69.0-rc.0release/v1.69.xafter the system-tests pin1.69.0-rc.1v1.69.0tag pipeline1.69.0release/v1.69.xafterv1.69.01.69.1-rc.N(same as today)release/v1.69.xexists1.70.0-SNAPSHOTMotivation
Today
vX.Y.0is created on master before the release branch is cut. Creating the tag publishes the release, so publishing can't be deferred until after the branch is cut. It also means every release branch build is a candidate for the next patch, never for the release itself: today's firstrelease/v1.69.xbuilds were1.69.1-rc.0and1.69.1-rc.1.With branch-first, the current logic breaks:
1.68.1-rc.249.1.69.0-SNAPSHOTafter the cut.Follow-up to #13262.
Process flow
Current (tag first)
vX.Y.0on master. This one push:release/vX.Y.xand opens the system-tests pin PR (create-release-branch.yaml);release/vX.Y.x, then tagvX.Y.Zon the branch.New (branch first)
release/vX.Y.xfrom master. Open the system-tests pin PR and close the milestone. Master moves toX.(Y+1).0-SNAPSHOT.X.Y.0-rc.Nbuilds on the release branch, and cherry-pick fixes.vX.Y.0on the release branch head. The tag pipeline publishes.What has to change to get there
TracerVersionPluginbehind a switch, off by default, so the current logic stays availabledd-trace-java-releasersteam can createv*tagsrelease/vX.Y.xwith a green pipeline, then rebuilding at the release version, checking the jar contents, publishing, and SSI. The full suite already ran on the release branch.Additional Notes
git merge-base), so later master commits are never counted.release/vX.Y.xbranch, read withgit ls-remote, falling back to local remote-tracking refs.TracerVersionPluginwill be a separate change.Test plan
cd buildSrc && ../gradlew :test -PrunBuildSrcTests --tests '*BranchFirst*'TracerVersionIntegrationTestunchanged and passingorigin/master. A feature-branchllm validationjob suggests they do:git fetch origin masterdidn't createorigin/master, andgit merge-base HEAD origin/mastersucceeded. To confirm on a release branch, once wired, check the build job log of the nextrelease/v*pipeline for the "Master is missing from the git clone" warning, or addgit rev-parse --verify origin/masterto a release-branch job.git ls-remotecall on master/feature builds in CI and locally, including offlineRisks
CI_COMMIT_TAGlogic, publishing configuration) would only be covered by the jar checks.Jira ticket: APMLP-2339
🤖 Generated with Claude Code