Skip to content

chore: prepare v2.9.3 release - #7426

Merged
zhxiaogg merged 1 commit into
grafana:release-v2.9from
zhxiaogg:release-v2.9.3-prep
Jun 8, 2026
Merged

chore: prepare v2.9.3 release#7426
zhxiaogg merged 1 commit into
grafana:release-v2.9from
zhxiaogg:release-v2.9.3-prep

Conversation

@zhxiaogg

@zhxiaogg zhxiaogg commented Jun 8, 2026

Copy link
Copy Markdown
Contributor

What this PR does:

Prepares the v2.9.3 patch release:

  • Adds the # v2.9.3 section to CHANGELOG.md (security dependency updates, Go 1.26.3, busybox removal, Prometheus/OTel bump, metrics-generator panic fix, OpenCensus receiver removal).
  • Bumps the grafana/tempo image tag to 2.9.3 in example configs, docs, and compiled jsonnet (make bump-tempo-image-tag + make jsonnet).

Which issue(s) this PR fixes:

N/A — release preparation.

Checklist

  • Tests updated
  • Documentation added
  • Changelog entry added under .chloggen/

Add the v2.9.3 changelog section and bump the tempo image tag to 2.9.3
in example configs and compiled jsonnet. v2.9.3 collects the security
dependency updates (golang.org/x/net, golang.org/x/crypto,
golang.org/x/sys, github.com/apache/thrift), the Go 1.26.3 upgrade, the
busybox removal (CVE-2025-60876), the Prometheus/OTel dependency bump, a
metrics-generator panic fix, and the OpenCensus receiver removal
backported to release-v2.9.
@zhxiaogg
zhxiaogg merged commit 420e186 into grafana:release-v2.9 Jun 8, 2026
28 checks passed
mattdurham added a commit that referenced this pull request Jul 23, 2026
Run before tagging so users following docs/examples get the correct
released version rather than latest or the stale 2.9.3 reference (2.9.3
was never actually published -- see the changelog-prep commit).

Ran:
  make bump-tempo-image-tag TEMPO_IMAGE_TAG=2.9.4
  make jsonnet

Also fixes a pre-existing bug in bump-tempo-image-tag on this branch: the
sed -i invocation was hardcoded to the macOS/BSD `sed -i ''` form instead
of the portable `sed -i $(SED_OPTS)` main uses, so the target failed
outright on Linux. Brought it in line with main's Makefile.

Matches the pattern from the v2.9.3 and v2.9.2 release-prep PRs, which
both bumped the image tag in examples/jsonnet before tagging (bundled with
the changelog cut for v2.9.3's #7426, as a same-day follow-up PR #7059 for
v2.9.2).
mattdurham added a commit that referenced this pull request Jul 23, 2026
* chore: prepare v2.9.4 changelog

v2.9.3 was tagged but never published as a real GitHub release (still a
draft, no announcement) -- rolling its content forward into v2.9.4 instead
of publishing it separately.

Collates both pending .chloggen entries into the v2.9.4 section:
- Go 1.26.5 / x/net / x/text CVE fix (#7641 backport, #7659)
- Drop 32-bit ARM binary archives (#7106, already shipped in the unreleased
  v2.9.3 draft)

Renamed the existing "# v2.9.3" CHANGELOG heading to "# v2.9.4" and merged
the new entries into it rather than creating a separate v2.9.3 section, so
the release notes read as one coherent v2.9.4 release.

Removed the stale "Build Tempo with Go 1.26.3" security line from the
merged section since it's superseded by the Go 1.26.5 entry landing in the
same release -- shipping both statements together would be confusing about
which Go version v2.9.4 actually ships.

* chore: bump tempo image tag to 2.9.4 in examples and jsonnet

Run before tagging so users following docs/examples get the correct
released version rather than latest or the stale 2.9.3 reference (2.9.3
was never actually published -- see the changelog-prep commit).

Ran:
  make bump-tempo-image-tag TEMPO_IMAGE_TAG=2.9.4
  make jsonnet

Also fixes a pre-existing bug in bump-tempo-image-tag on this branch: the
sed -i invocation was hardcoded to the macOS/BSD `sed -i ''` form instead
of the portable `sed -i $(SED_OPTS)` main uses, so the target failed
outright on Linux. Brought it in line with main's Makefile.

Matches the pattern from the v2.9.3 and v2.9.2 release-prep PRs, which
both bumped the image tag in examples/jsonnet before tagging (bundled with
the changelog cut for v2.9.3's #7426, as a same-day follow-up PR #7059 for
v2.9.2).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants