[9.4] Update elastic/beats and align beats-bump automation#6728
Open
jeniawhite wants to merge 1 commit into
Open
[9.4] Update elastic/beats and align beats-bump automation#6728jeniawhite wants to merge 1 commit into
jeniawhite wants to merge 1 commit into
Conversation
Backport the dedicated beats-bump automation to 9.4 and bump elastic/beats to the latest 9.4 commit, fixing the build/lint breaks it surfaces. - .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, gomod source, export-versions). The old config used requiredEnv GIT_BRANCH and scms/actions, which the new workflow does not set, so the branch jobs failed at config load. - updatecli.yml: remove beats from the matrices (now owned by the dedicated workflow). - cmd/root.go: drop the removed otelconsumer blank import (moved out of x-pack in beats and de-registered as an output type). - internal/launcher/launcher.go: replace deprecated Manager.Start with PreInit/PostInit. - go.mod/go.sum: bump to beats 9.4 tip; cloudbeat.reference.yml: regenerated (autodiscover labels.dedot default flipped to true). Verified locally: go mod tidy, go build ./... (GOEXPERIMENT=jsonv2), staticcheck SA1019, and go test ./internal/launcher all pass. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
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
1 participant
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.4and bumpelastic/beatsto the latest9.4commit, fixing the build/lint breaks it surfaces.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.4still had the old config (requiredEnv "GIT_BRANCH"+scms/actions), while the new workflow setsBRANCH_NAMEand runs--commit=false. So theupdate-beats (9.4)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).cmd/root.go: drop thex-pack/libbeat/outputs/otelconsumerblank import — beats moved it out of x-pack and de-registered it as an output type (Move otelconsumer out of x-pack beats#49929), which is present on the9.4beats branch.internal/launcher/launcher.go: replace deprecatedManager.StartwithPreInit/PostInit(staticcheck SA1019).go.mod/go.sum: bump to beats9.4tip;cloudbeat.reference.yml: regenerated (autodiscoverlabels.dedotdefault flipped totrue).Verification (local, real toolchain)
go mod tidy,go build ./...(GOEXPERIMENT=jsonv2),staticcheck -checks SA1019 ./internal/launcher/,go test ./internal/launcher/→ all pass.🤖 Generated with Claude Code