Set shutdown timeout for beat receivers to 5s by default#51940
Merged
mergify[bot] merged 1 commit intoJul 14, 2026
Conversation
Beat receivers need a longer timeout than the default 1s, as it needs to exceed the batcher flush timeout. The current code gives the impression of this already happening, but in reality, if the beater handles pipeline shutdown on its own, the default timeout wins.
swiatekm
added
bug
Team:Elastic-Agent-Data-Plane
botelastic
Bot
added
needs_team
Contributor
🤖 GitHub commentsJust comment with:
|
|
Pinging @elastic/elastic-agent-data-plane (Team:Elastic-Agent-Data-Plane) |
cmacknz
approved these changes
Jul 14, 2026
leehinman
approved these changes
Jul 14, 2026
Contributor
|
Queued — the merge queue status continues in this comment ↓. |
belimawr
approved these changes
Jul 14, 2026
Contributor
Merge Queue Status
This pull request spent 1 hour 28 minutes 27 seconds in the queue, including 1 hour 27 minutes 30 seconds running CI. Required conditions to merge
|
Contributor
|
@Mergifyio backport 9.5 9.4 9.3 8.19 |
Contributor
✅ Backports have been createdDetails
Cherry-pick of 8f4bbab has failed: To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally |
This was referenced Jul 14, 2026
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
4 participants
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.
Proposed commit message
Set shutdown timeout for beat receivers to 5s by default.
Beat receivers need a longer timeout than the default 1s, as it needs to exceed the batcher flush timeout. The current code gives the impression of this already happening, but in reality, if the beater handles pipeline shutdown on its own, the default timeout wins.
The PR adds the default in
NewBeatForReceiverand adds a test for filebeat receiver which asserts that the timeout is at least 5 seconds.Checklist
[ ] I have made corresponding changes to the documentation[ ] I have made corresponding change to the default configuration filesstresstest.shscript to run them under stress conditions and race detector to verify their stability.[ ] I have added an entry in./changelog/fragmentsusing the changelog tool.Related issues