-
Notifications
You must be signed in to change notification settings - Fork 770
Feat: Improve Error Handling for Server.Scrape #1158
New issue
Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? # to your account
Open
BoweFlex
wants to merge
2
commits into
prometheus-community:master
Choose a base branch
from
BoweFlex:improve-namespace-errorhandling
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Feat: Improve Error Handling for Server.Scrape #1158
BoweFlex
wants to merge
2
commits into
prometheus-community:master
from
BoweFlex:improve-namespace-errorhandling
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
0c0a5e1
to
05f7277
Compare
If there are errors querying namespace mappings, the potential error from querySettings is obscured. Adding an immediate return if there are errors retreiving settings. Signed-off-by: Jonathan Bowe <jonathan@bowedev.com>
05f7277
to
1b08472
Compare
sysadmind
requested changes
May 19, 2025
1b08472
to
6ba9241
Compare
sysadmind
approved these changes
May 21, 2025
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Previously if any errors were encountered by queryNamespaceMappings, only a count of those errors was returned - making debugging those errors harder than it needs to be. I'm changing this to immediately return nil if no errors are encountered, and otherwise an error will be formatted with each of the namespaces and what the error was for that namespace. Signed-off-by: Jonathan Bowe <jonathan@bowedev.com>
6ba9241
to
af34eba
Compare
SuperQ
reviewed
May 21, 2025
} | ||
err = fmt.Errorf("queryNamespaceMappings errors encountered") | ||
for namespace, errStr := range errMap { | ||
err = fmt.Errorf("%s, %s namespace had the following error: %s", err, namespace, errStr) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Minor nit to make it a little simpler to read (and shorter).
Suggested change
err = fmt.Errorf("%s, %s namespace had the following error: %s", err, namespace, errStr) | |
err = fmt.Errorf("%s, namespace: %s error: %s", err, namespace, errStr) |
# for free
to join this conversation on GitHub.
Already have an account?
# 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.
Previously if any errors were encountered by queryNamespaceMappings, only a count of those errors was returned - making debugging those errors harder than it needs to be.
I'm changing this to immediately return nil if no errors are encountered, and otherwise an error will be formatted with each of the namespaces and what the error was for that namespace.
Additionally, if any errors were encountered during querySettings, they were potentially obscured by queryNamespaceMappings errors. I've added an immediate return if errors are found during querySettings to ensure these errors are visible.