fix(byoo): bump collector version after the genrule change - #506
fix(byoo): bump collector version after the genrule change#506balajinvda wants to merge 1 commit into
Conversation
The collector's VERSION last moved to 0.157.1 in #478. #444 then changed files under byoo-otel-collector/ without bumping it, so two different collector builds now share one version. That happened despite the guard: #444 did bump VERSION, from 0.157.0 to 0.157.1, but by the time it merged #478 had already published 0.157.1, so the rebase made its bump a no-op. The check compares against the merge base and cannot see that the target version was taken in the meantime. Bump to 0.157.2 so the current collector contents have a version of their own. Co-authored-by: Balaji Ganesan <bganesan@nvidia.com> Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: Path: .coderabbit.yaml Review profile: CHILL Plan: Enterprise Run ID: 📒 Files selected for processing (1)
📝 WalkthroughWalkthroughThe BYOO OTEL collector version is bumped from ChangesBYOO OTEL collector version
Estimated code review effort: 1 (Trivial) | ~2 minutes Suggested reviewers: 🚥 Pre-merge checks | ✅ 5✅ Passed checks (5 passed)
✨ Finishing Touches🧪 Generate unit tests (beta)
Comment |
Two CI failures from the previous commit. http-invocation kept a third reference to the protoc extension, use_repo(protoc, "com_google_protobuf"), which the scripted edit did not match: it handled the bazel_dep and the protoc.toolchain call but not use_repo. Removing the extension left that line pointing at an undefined name, so the module failed to load. The service already declares protobuf directly for its cargo_build_script, so the use_repo was redundant once protobuf provides protoc; the surrounding comment described the old toolchains_protoc arrangement and is corrected. Rescanned every module for protoc references including use_repo forms. http-invocation was the only one, and it now builds clean locally. This commit also bumps the byoo collector version. Changing its .bazelversion and MODULE.bazel trips check-byoo-otel-collector-version, which requires a bump whenever anything under byoo-otel-collector/ changes. 0.157.2 is the value #506 was opening to set, for the same underlying reason: #444 changed collector files while its own bump was neutralised by a rebase, leaving two builds sharing 0.157.1. Folding it here keeps a single PR touching VERSION rather than two that would conflict; #506 is superseded. Co-authored-by: Balaji Ganesan <bganesan@nvidia.com> Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
|
Superseded by #525, which carried this same bump. #525 modified Main is now at The underlying guard weakness is still worth a follow-up: a version bump can be silently neutralised when another PR claims that version first, because the check compares against the merge base rather than the published version. That is what happened to #444. |
Why
The collector's
VERSIONlast moved to 0.157.1 in #478. #444 then changed files underbyoo-otel-collector/without bumping it, so two different collector builds currently share one version on main.This slipped past the guard rather than around it. #444 did bump VERSION, 0.157.0 to 0.157.1 — but #478 published 0.157.1 first, so after the rebase #444's bump was a no-op while its other collector changes remained.
check-byoo-otel-collector-versioncompares against the merge base and cannot tell that the target version was claimed in the meantime.What changed
VERSIONto 0.157.2, so the current collector contents have a version of their own.Customer Release Notes
Not customer visible.
Plan Summary
Not applicable.
Usage
Not applicable.
Testing
tools/ci/check-byoo-otel-collector-versionpasses: onlyVERSIONchanged, so no collector files require a bump.Notes
The guard has a real blind spot here — a version bump can be silently neutralised by another PR taking that version first. Worth a follow-up to compare against the published version rather than the diff, but that is a separate change and this file needs fixing now either way.
References
None
Related Merge Requests/Pull Requests
Follows #444, #478.
Dependencies
None
Summary by CodeRabbit