[9.0](backport #6927) Fix deadlock in error handling in OTelManager #6956
Conversation
This file contains 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
![mergify[bot]](https://avatars.githubusercontent.com/in/10562?s=60&v=4){kind=small}
* Fix race in error handling. * Add changelog. * Add testing. * Changelog bug-fix. (cherry picked from commit 9b572ef)
mergify
bot
requested review from
kaanyalti and
andrzej-stencel
and removed request for
a team
github-actions
bot
added
the
Team:Elastic-Agent-Control-Plane
|
Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-Plane) |
|
blakerouse
approved these changes
Feb 20, 2025
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 does this PR do?
Fixes an issue where a deadlock would cause the the OTelManager to get stuck.
This also seems to be the cause of the flaky test
TestOTelManager_Run. I have ran this over 100 times and hit no more errors with this PR.Why is it important?
Deadlock causes the running internal OTel collector from getting any more updates or actions.
Checklist
[ ] I have made corresponding changes to the documentation[ ] I have made corresponding change to the default configuration files./changelog/fragmentsusing the changelog tool[ ] I have added an integration test or an E2E testDisruptive User Impact
None
How to test this PR locally
go test -race -v -count=100 github.com/elastic/elastic-agent/internal/pkg/otel/managerRelated issues
This is an automatic backport of pull request #6927 done by [Mergify](https://mergify.com).