Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix warning on emitting diagnostics for otel hybrid mode #6973

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix warning on emitting diagnostics for otel hybrid mode #6973

wants to merge 1 commit into from
+25 −8

Conversation

swiatekm
Copy link
Contributor

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

  • I have read and understood the pull request guidelines of this project.
  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have added tests that prove my fix is effective or that my feature works

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

@swiatekm
Fix warning on emitting diagnostics for otel hybrid mode
983008c 
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.
@swiatekm swiatekm added bug Something isn't working Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team backport-8.x Automated backport to the 8.x branch with mergify backport-8.18 Automated backport to the 8.18 branch backport-active-9 Automated backport with mergify to all the active 9.[0-9]+ branches labels Feb 21, 2025
@swiatekm swiatekm requested a review from a team as a code owner February 21, 2025 16:14
@elasticmachine
Copy link
Contributor

Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-Plane)

@elastic-sonarqube Elastic SonarQube
Copy link

Quality Gate passed Quality Gate passed

Issues
0 New issues
0 Fixed issues
0 Accepted issues

Measures
0 Security Hotspots
100.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube

@swiatekm swiatekm added the backport-8.17 Automated backport with mergify label Feb 24, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pkoutsovasilis pkoutsovasilis pkoutsovasilis approved these changes

@andrzej-stencel andrzej-stencel Awaiting requested review from andrzej-stencel andrzej-stencel is a code owner automatically assigned from elastic/elastic-agent-control-plane

@pchila pchila Awaiting requested review from pchila pchila is a code owner automatically assigned from elastic/elastic-agent-control-plane

Assignees

@swiatekm swiatekm

Labels
backport-8.x Automated backport to the 8.x branch with mergify backport-8.17 Automated backport with mergify backport-8.18 Automated backport to the 8.18 branch backport-active-9 Automated backport with mergify to all the active 9.[0-9]+ branches bug Something isn't working skip-changelog Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Could not redact otel.yaml error on running elastic-agent diagnostics command.
3 participants
@swiatekm @elasticmachine @pkoutsovasilis