Skip to content

feat: bump beats and drop global beat registries #17376

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 9 commits into from
Jul 8, 2025
Merged

feat: bump beats and drop global beat registries #17376

merged 9 commits into from
Jul 8, 2025

Conversation

kruskall
Copy link
Member

Motivation/summary

replace global registries with instance-scoped registries
update for latest beats changes

Checklist

For functional changes, consider:

  • Is it observable through the addition of either logging or metrics?
  • Is its use being published in telemetry to enable product improvement?
  • Have system tests been added to avoid regression?

How to test these changes

Related issues

@kruskall
feat: bump beats and drop global beat registries
ba54982 
replace global registries with instance-scoped registries
@kruskall kruskall requested a review from a team as a code owner June 25, 2025 21:34
@github-actions GitHub Actions
Copy link
Contributor

🤖 GitHub comments

Expand to view the GitHub comments

Just comment with:

  • run docs-build : Re-trigger the docs validation. (use unformatted text in the comment!)

@mergify Mergify
Copy link
Contributor

mergify bot commented Jun 25, 2025

This pull request does not have a backport label. Could you fix it @kruskall? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-7.17 is the label to automatically backport to the 7.17 branch.
  • backport-8./d is the label to automatically backport to the 8./d branch. /d is the digit.
  • backport-9./d is the label to automatically backport to the 9./d branch. /d is the digit.
  • backport-active-all is the label that automatically backports to all active branches.
  • backport-active-8 is the label that automatically backports to all active minor branches for the 8 major.
  • backport-active-9 is the label that automatically backports to all active minor branches for the 9 major.

isaacaflores2
isaacaflores2 previously approved these changes Jun 26, 2025
View reviewed changes
@mergify Mergify
Copy link
Contributor

mergify bot commented Jul 3, 2025

This pull request is now in conflicts. Could you fix it @kruskall? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b feat/bump-beats-global-registry upstream/feat/bump-beats-global-registry
git merge upstream/main
git push upstream feat/bump-beats-global-registry

@kruskall kruskall mentioned this pull request Jul 3, 2025
Closed
@kruskall kruskall requested review from isaacaflores2 and a team July 3, 2025 14:11
@kruskall kruskall mentioned this pull request Jul 3, 2025
Closed
simitt
simitt reviewed Jul 4, 2025
View reviewed changes
Copy link
Contributor

@simitt simitt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Generally looks good, just a minor comment. Have you manually tested this change and confirmed that behaviour is as expected? Since this brings in some good amount of libbeat refactoring a manual test through would be good.

internal/beatcmd/beat.go
b.Monitoring.InfoRegistry(),
b.Monitoring.StateRegistry(),
b.Monitoring.StatsRegistry(),
b.Monitoring.InputsRegistry(),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where is the InputsRegistry() used?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's used by beats, we don't use it on our side

@kruskall
Copy link
Member Author

kruskall commented Jul 4, 2025

we've a lot of test coverage for beat monitoring since the switch to otel metrics, I think that's already good enough imo

@kruskall kruskall requested a review from simitt July 4, 2025 10:50
@kruskall kruskall enabled auto-merge (squash) July 8, 2025 10:33
@kruskall kruskall merged commit 5c0b8e7 into elastic:main Jul 8, 2025
19 checks passed
@kruskall kruskall deleted the feat/bump-beats-global-registry branch July 8, 2025 10:41
@kruskall
Copy link
Member Author

kruskall commented Jul 8, 2025

@Mergifyio backport 9.1 9.0 8.19

@mergify Mergify
Copy link
Contributor

mergify bot commented Jul 8, 2025 •
edited
Loading

backport 9.1 9.0 8.19

✅ Backports have been created

mergify bot pushed a commit that referenced this pull request Jul 8, 2025
@kruskall @mergify
feat: bump beats and drop global beat registries (#17376)
09acf2b 
* feat: bump beats and drop global beat registries

replace global registries with instance-scoped registries

* fix: bump deps

* lint: regenerate notice and fix compile errors

* feat: bump beats

(cherry picked from commit 5c0b8e7)

# Conflicts:
#	go.sum
@mergify mergify bot mentioned this pull request Jul 8, 2025
Merged
2 tasks
mergify bot pushed a commit that referenced this pull request Jul 8, 2025
@kruskall @mergify
feat: bump beats and drop global beat registries (#17376)
8e3ea1b 
* feat: bump beats and drop global beat registries

replace global registries with instance-scoped registries

* fix: bump deps

* lint: regenerate notice and fix compile errors

* feat: bump beats

(cherry picked from commit 5c0b8e7)

# Conflicts:
#	NOTICE-fips.txt
#	NOTICE.txt
#	go.mod
#	go.sum
#	internal/beatcmd/beat.go
#	internal/beater/beater.go
mergify bot pushed a commit that referenced this pull request Jul 8, 2025
@kruskall @mergify
feat: bump beats and drop global beat registries (#17376)
c162374 
* feat: bump beats and drop global beat registries

replace global registries with instance-scoped registries

* fix: bump deps

* lint: regenerate notice and fix compile errors

* feat: bump beats

(cherry picked from commit 5c0b8e7)

# Conflicts:
#	NOTICE-fips.txt
#	NOTICE.txt
#	go.mod
#	go.sum
This was referenced Jul 8, 2025
Closed
Merged
mergify bot added a commit that referenced this pull request Jul 8, 2025
@mergify @kruskall
[9.1] (backport #17376) feat: bump beats and drop global beat registr…
c38fd02 
…ies (#17514)

* feat: bump beats and drop global beat registries (#17376)

* feat: bump beats and drop global beat registries

replace global registries with instance-scoped registries

* fix: bump deps

* lint: regenerate notice and fix compile errors

* feat: bump beats

(cherry picked from commit 5c0b8e7)

# Conflicts:
#	go.sum

* feat: bump beats

---------

Co-authored-by: kruskall <99559985+kruskall@users.noreply.github.com>
mergify bot added a commit that referenced this pull request Jul 8, 2025
@mergify @kruskall
[8.19] (backport #17376) feat: bump beats and drop global beat regist…
570a508 
…ries (#17516)

* feat: bump beats and drop global beat registries (#17376)

* feat: bump beats and drop global beat registries

replace global registries with instance-scoped registries

* fix: bump deps

* lint: regenerate notice and fix compile errors

* feat: bump beats

(cherry picked from commit 5c0b8e7)

# Conflicts:
#	NOTICE-fips.txt
#	NOTICE.txt
#	go.mod
#	go.sum

* feat: bump beats

---------

Co-authored-by: kruskall <99559985+kruskall@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@isaacaflores2 isaacaflores2

@simitt simitt

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@kruskall @simitt @isaacaflores2