Ensure that ingester returns safe errors #6019
Merged
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
duricanikolic
force-pushed
the
yuri/safe-to-wrap
branch
from
01c1e43
to
52f6312
Compare
Signed-off-by: Yuri Nikolic <durica.nikolic@grafana.com>
Signed-off-by: Yuri Nikolic <durica.nikolic@grafana.com>
duricanikolic
force-pushed
the
yuri/safe-to-wrap
branch
from
52f6312
to
eb79466
Compare
56quarters
approved these changes
Sep 14, 2023
Signed-off-by: Yuri Nikolic <durica.nikolic@grafana.com>
pstibrany
reviewed
Sep 14, 2023
Signed-off-by: Yuri Nikolic <durica.nikolic@grafana.com>
pstibrany
approved these changes
Sep 14, 2023
56quarters
reviewed
Sep 14, 2023
Signed-off-by: Yuri Nikolic <durica.nikolic@grafana.com>
Signed-off-by: Yuri Nikolic <durica.nikolic@grafana.com>
56quarters
approved these changes
Sep 14, 2023
4 tasks
This was referenced Dec 18, 2023
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 this PR does
In PR #5584 we introduced the
safeToWrapinterface to annotate error types that can be safely returned by ingester. These errors can be safely wrapped with a userID and returned to the caller. On the other hand, it is not safe to wrap and return unsafe errors, and they are only annotated with a userID. The new functionwrapOrAnnotateWithUser()implements this logic, and replaces bothwrapWithUser()andannotateWithUser().Additionally, this PR marks some additional ingester errors as safe.
Which issue(s) this PR fixes or relates to
Relates to #6008
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]