Add redacted addr to scrapeRedisHost error message (#638) #643
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
Pull Request Test Coverage Report for Build 1560
💛 - Coveralls |
Codecov Report
@@ Coverage Diff @@
## master #643 +/- ##
==========================================
- Coverage 88.24% 88.07% -0.18%
==========================================
Files 16 16
Lines 1922 1928 +6
==========================================
+ Hits 1696 1698 +2
- Misses 152 154 +2
- Partials 74 76 +2
📣 Codecov can now indicate which changes are the most critical in Pull Requests. Learn more |
oliver006
reviewed
May 14, 2022
exporter/exporter.go
Outdated
| @@ -527,7 +528,13 @@ func (e *Exporter) scrapeRedisHost(ch chan<- prometheus.Metric) error { | |||
| e.registerConstMetricGauge(ch, "exporter_last_scrape_connect_time_seconds", connectTookSeconds) | |||
|
|
|||
| if err != nil { | |||
| log.Errorf("Couldn't connect to redis instance") | |||
| var redactedAddr string | |||
| if redisURL, _ := url.Parse(e.redisAddr); redisURL != nil { | |||
There was a problem hiding this comment.
Maybe catch the error here instead of checking the result for nil? You could then output the error in the else block in log level debug to add addtl information.
|
@neomantra - do you still plan to make changes on this? I think surfacing the error would be good. |
|
I’ll incorporate that feedback today, thanks. |
|
I updated this per your comment and rebased to latest master. |
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.
When
scrapeRedisHostfails to connect to a Redis instance, the code now tries to redact the password of the Redis address (URL). If it can parse and redact it, it will print the address in the error message. Otherwise, we note that-debugis needed to see the address. It does not log any URL parsing errors, just in case that may leak any info.Testing: