[cmd/opampsupervisor] Only report applying if config is changed #39500
Conversation
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
dpaasman00
requested review from
evan-bradley,
atoulme,
tigrannajaryan and
a team
as code owners
dpaasman00
force-pushed
the
fix/supervisor-dont-report-applying
branch
from
6ee5c52 to
6ad2c53
Compare
atoulme
reviewed
Apr 19, 2025
| } else { | ||
| } | ||
| if configChanged { | ||
| // only report applying if the config has changed and will run agent with new config |
There was a problem hiding this comment.
would you please add a test to cover this?
There was a problem hiding this comment.
Added a unit test for this case
|
Moving to draft so you can address adding a test. Please mark ready for review once added. |
dpaasman00
force-pushed
the
fix/supervisor-dont-report-applying
branch
from
6ad2c53 to
3fe4466
Compare
dpaasman00
force-pushed
the
fix/supervisor-dont-report-applying
branch
from
41a260e to
4e4ea74
Compare
dpaasman00
force-pushed
the
fix/supervisor-dont-report-applying
branch
from
4e4ea74 to
b005e20
Compare
djaglowski
approved these changes
Apr 25, 2025
atoulme
approved these changes
Apr 25, 2025
vincentfree
pushed a commit
to ing-bank/opentelemetry-collector-contrib
that referenced
this pull request
May 6, 2025
…-telemetry#39500) <!--Ex. Fixing a bug - Describe the bug and how this fixes the issue. Ex. Adding a feature - Explain what this achieves.--> #### Description Right now, the Supervisor will always report to the OpAMP server an "Applying" status when it receives a remote config (assuming there's no issue building the merged config). This is a problem because if the new config is not different from the current config, the Supervisor never restarts the Collector with the new config and the status "Applied" is never reported to the server. This change makes it so the Supervisor only reports the "Applying" status to the OpAMP server if the new config is different from the current and we intend to apply and restart the Collector. <!-- Issue number (e.g. open-telemetry#1234) or full URL to issue, if applicable. --> #### Link to tracking issue Fixes <!--Describe what testing was performed and which tests were added.--> #### Testing <!--Describe the documentation added.--> #### Documentation <!--Please delete paragraphs that you did not use before submitting.-->
vincentfree
pushed a commit
to ing-bank/opentelemetry-collector-contrib
that referenced
this pull request
May 20, 2025
…-telemetry#39500) <!--Ex. Fixing a bug - Describe the bug and how this fixes the issue. Ex. Adding a feature - Explain what this achieves.--> #### Description Right now, the Supervisor will always report to the OpAMP server an "Applying" status when it receives a remote config (assuming there's no issue building the merged config). This is a problem because if the new config is not different from the current config, the Supervisor never restarts the Collector with the new config and the status "Applied" is never reported to the server. This change makes it so the Supervisor only reports the "Applying" status to the OpAMP server if the new config is different from the current and we intend to apply and restart the Collector. <!-- Issue number (e.g. open-telemetry#1234) or full URL to issue, if applicable. --> #### Link to tracking issue Fixes <!--Describe what testing was performed and which tests were added.--> #### Testing <!--Describe the documentation added.--> #### Documentation <!--Please delete paragraphs that you did not use before submitting.-->
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
Right now, the Supervisor will always report to the OpAMP server an "Applying" status when it receives a remote config (assuming there's no issue building the merged config). This is a problem because if the new config is not different from the current config, the Supervisor never restarts the Collector with the new config and the status "Applied" is never reported to the server.
This change makes it so the Supervisor only reports the "Applying" status to the OpAMP server if the new config is different from the current and we intend to apply and restart the Collector.
Link to tracking issue
Fixes
Testing
Documentation