OpenTelemetry Auto-Instrumentation for Java uses SemVer standard for versioning of its artifacts.
Instead of manually specifying project version (and by extension the version of built artifacts)
in gradle build scripts, we use nebula-release-plugin
to calculate the current version based on git tags. This plugin looks for the latest tag of the form
vX.Y.Z on the current branch and calculates the current project version as vX.Y.(Z+1)-SNAPSHOT.
Every successful CI build of the master branch automatically executes ./gradlew snapshot as the last task.
This signals Nebula plugin to build and publish to
JFrog OSS repositorynext minor release version.
This means version vX.(Y+1).0-SNAPSHOT.
Open the release build workflow in your browser here.
You will see a button that says "Run workflow". Press the button, enter the version number you want to release in the input field that pops up, and then press "Run workflow".
This triggers the release process, which builds the artifacts, publishes the artifacts, and creates and pushes a git tag with the version number.
Once the GitHub workflow completes, go to Github release
page, press
Draft a new release to write release notes about the new release. If there is already a draft
release notes, just point it at the created tag.
All patch releases should include only bug-fixes, and must avoid adding/modifying the public APIs.
Open the patch release build workflow in your browser here.
You will see a button that says "Run workflow". Press the button, enter the version number you want to release in the input field for version that pops up and the commits you want to cherrypick for the patch as a comma-separated list. Then, press "Run workflow".
If the commits cannot be cleanly applied to the release branch, for example because it has diverged too much from main, then the workflow will fail before building. In this case, you will need to prepare the release branch manually.
This example will assume patching into release branch v1.2.x from a git repository with remotes
named origin and upstream.
$ git remote -v
origin [email protected]:username/opentelemetry-java.git (fetch)
origin [email protected]:username/opentelemetry-java.git (push)
upstream [email protected]:open-telemetry/opentelemetry-java.git (fetch)
upstream [email protected]:open-telemetry/opentelemetry-java.git (push)
First, checkout the release branch
git fetch upstream v1.2.x
git checkout upstream/v1.2.x
Apply cherrypicks manually and commit. It is ok to apply multiple cherrypicks in a single commit. Use a commit message such as "Manual cherrypick for commits commithash1, commithash2".
After commiting the change, push to your fork's branch.
git push origin v1.2.x
Create a PR to have code review and merge this into upstream's release branch. As this was not applied automatically, we need to do code review to make sure the manual cherrypick is correct.
After it is merged, Run the patch release workflow again, but leave the commits input field blank. The release will be made with the current state of the release branch, which is what you prepared above.