[9.3] Update elastic/beats and align beats-bump automation#6729
Open
jeniawhite wants to merge 1 commit into
Open
[9.3] Update elastic/beats and align beats-bump automation#6729jeniawhite wants to merge 1 commit into
jeniawhite wants to merge 1 commit into
Conversation
Backport the dedicated beats-bump automation to 9.3 and bump elastic/beats to the latest 9.3 commit. - .ci/updatecli/updatecli.d/update-beats.yml: switch to the file-edit-only config used by the bump-beats-version.yml workflow (BRANCH_NAME, --commit=false). The old config used requiredEnv GIT_BRANCH + scms/actions, which the new workflow does not set, so the branch job failed at config load. - updatecli.yml: remove beats from the matrices (now owned by the dedicated workflow). - go.mod/go.sum: bump to beats 9.3 tip. No Go source changes needed on 9.3: the otelconsumer package still exists at the old path in beats 9.3, and Manager.Start already carries //nolint:staticcheck. Verified locally: go mod tidy, go build ./... (GOEXPERIMENT=jsonv2), and go vet on the observer-using packages all pass. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
olegsu
approved these changes
Jun 11, 2026
Contributor
|
This pull request is now in conflicts. Could you fix it? 🙏 |
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
Backport the dedicated beats-bump automation to
9.3and bumpelastic/beatsto the latest9.3commit.Why
The
update-beatsworkflow (onmain) checks out each active branch and runsupdatecli apply --config .ci/updatecli/updatecli.d/update-beats.yml. That config is read from the checked-out branch, but9.3still had the old config (requiredEnv "GIT_BRANCH"+scms/actions), while the new workflow setsBRANCH_NAMEand runs--commit=false. So theupdate-beats (9.3)job failed at config load:How
.ci/updatecli/updatecli.d/update-beats.yml: replace with the file-edit-only config the new workflow expects..github/workflows/updatecli.yml: removebeatsfrom the matrices (now owned by the dedicated workflow).go.mod/go.sum: bump to beats9.3tip.No Go source changes are needed on
9.3: theotelconsumerpackage still exists at the old path in beats9.3, andManager.Startalready carries//nolint:staticcheck.Verification (local, real toolchain)
go mod tidy,go build ./...(GOEXPERIMENT=jsonv2), andgo veton the observer-using packages → all pass.🤖 Generated with Claude Code