[cmd/opampsupervisor] fix: Clear config timeout timer & send APPLIED remote config status when running nop config #36733
+86
−8
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
github-actions
bot
requested review from
atoulme,
evan-bradley and
tigrannajaryan
dpaasman00
force-pushed
the
fix/supervisor-reports-error-nop-config
branch
3 times, most recently
from
fb6dba4 to
72cc91c
Compare
evan-bradley
approved these changes
Dec 13, 2024
| component: opampsupervisor | ||
|
|
||
| # A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). | ||
| note: Supervisor clears config timeout and reports 'Applied' remote config status when a nop config is received. |
There was a problem hiding this comment.
Suggested change
| note: Supervisor clears config timeout and reports 'Applied' remote config status when a nop config is received. | |
| note: Report an 'Applied' remote config status when an empty config is received. |
I think the timeout is largely an internal detail. Also, here a no-op config constitutes sending an empty config to the Supervisor, right? As opposed to sending a specific config from the server that is also a no-op.
There was a problem hiding this comment.
Yea, the timeout is internal so I'll remove the reference. And yes, this is in regards to an empty config file.
dpaasman00
force-pushed
the
fix/supervisor-reports-error-nop-config
branch
from
9d07203 to
5c5e255
Compare
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
When sending a nop config to the supervisor, it does not start the collector. However there is a config timeout that would report an error back to the OpAmp server in this case, despite the agent technically being healthy.
This change clears the config timeout when we aren't starting the agent due to a nop config. It also reports an 'Applied' remote config status, since to the OpAmp server it should appear as if it the collector is successfully running the config.
Link to tracking issue
Fixes #36682
Testing
Updated an e2e test to apply an empty config and verify an 'Applied' status is returned by the supervisor.