[9.0](backport #6973) Fix warning on emitting diagnostics for otel hybrid mode #7045
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}
If an Otel hybrid mode configuration doesn't exist, we emit a plain text message into the config file generated by diagnostics. When we try to redact secrets from it, we fail to unmarshal it into a map and log a warning about it. Instead, only run the redaction after confirming the value is actually a map. (cherry picked from commit 087cfb3)
mergify
bot
requested review from
michalpristas and
blakerouse
and removed request for
a team
github-actions
bot
added
bug
|
Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-Plane) |
swiatekm
approved these changes
Feb 26, 2025
|
💚 Build Succeeded
cc @swiatekm |
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?
If an Otel hybrid mode configuration doesn't exist, we emit a plain text message into the config file generated by diagnostics. When we try to redact secrets from it, we fail to unmarshal it into a map and log a warning about it.
Instead, only run the redaction after confirming the value is actually a map.
Why is it important?
We shouldn't emit spurious warnings.
Checklist
How to test this PR locally
Build the agent locally, start it, and get diagnostics. You shouldn't see a warning message mentioned in #6783.
Related issues
Could not redact otel.yamlerror on running elastic-agent diagnostics command. #6783This is an automatic backport of pull request #6973 done by [Mergify](https://mergify.com).