[opampextension] fix blocking agent shutdown due to unclosed channel #36754
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
Signed-off-by: Florian Bacher <[email protected]>
github-actions
bot
requested review from
evan-bradley,
portertech and
tigrannajaryan
bacherfl
changed the title
Signed-off-by: Florian Bacher <[email protected]>
Signed-off-by: Florian Bacher <[email protected]>
bacherfl
changed the title
Signed-off-by: Florian Bacher <[email protected]>
Signed-off-by: Florian Bacher <[email protected]>
Signed-off-by: Florian Bacher <[email protected]>
Signed-off-by: Florian Bacher <[email protected]>
Signed-off-by: Florian Bacher <[email protected]>
…end" This reverts commit e733761.
Signed-off-by: Florian Bacher <[email protected]>
bacherfl
changed the title
Signed-off-by: Florian Bacher <[email protected]>
atoulme
approved these changes
Dec 11, 2024
songy23
added
ready to merge
codeboten
approved these changes
Dec 11, 2024
|
Pinging code owners @portertech @evan-bradley @tigrannajaryan for a final review |
jaronoff97
approved these changes
Dec 11, 2024
evan-bradley
approved these changes
Dec 11, 2024
atoulme
approved these changes
Dec 11, 2024
|
One of the checks appears to be stuck, and I can't merge in main, so I put the |
It looks like the tests are running now, thanks for the reviews! |
|
Failing test might be related to #36772 |
pjanotti
approved these changes
Dec 11, 2024
sbylica-splunk
pushed a commit
to sbylica-splunk/opentelemetry-collector-contrib
that referenced
this pull request
Dec 17, 2024
…pen-telemetry#36754) <!--Ex. Fixing a bug - Describe the bug and how this fixes the issue. Ex. Adding a feature - Explain what this achieves.--> #### Description The changes introduced in open-telemetry#35892 seemed to have introduced some flakyness in the opampsupervisor e2e tests, as the shutdown of the opamp agent waits for the component health loop to end. Due to an unclosed channel within the opamp agent however, the agent does not properly shut down, and the supervisor runs into a timeout before ultimately sending a SIGKILL to the agent process. Closing the channel in the Shutdown method of the opamp extension fixes that and the agent gets shut down properly upon the reception of the SIGINT signal #### Link to tracking Issue: Fixes open-telemetry#36764 #### Testing This fixes the failing test mentioned in the issue (open-telemetry#36764) --------- Signed-off-by: Florian Bacher <[email protected]>
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.
Description
The changes introduced in #35892 seemed to have introduced some flakyness in the opampsupervisor e2e tests, as the shutdown of the opamp agent waits for the component health loop to end. Due to an unclosed channel within the opamp agent however, the agent does not properly shut down, and the supervisor runs into a timeout before ultimately sending a SIGKILL to the agent process.
Closing the channel in the Shutdown method of the opamp extension fixes that and the agent gets shut down properly upon the reception of the SIGINT signal
Link to tracking Issue:
Fixes #36764
Testing
This fixes the failing test mentioned in the issue (#36764)