fix(issues): Replace 'Internal Error' message on Postgres query timeout errors #87691
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
github-actions
bot
added
the
Scope: Backend
yuvmen
commented
Mar 24, 2025
| @@ -168,13 +170,12 @@ class FooBarError(Exception): | |||
| pass | |||
|
|
|||
|
|
|||
| class HandleQueryErrorsTest: | |||
| class HandleQueryErrorsTest(APITestCase): | |||
There was a problem hiding this comment.
Looks like this test wasn't running at all from what I can tell since it didnt inherit APITestCase
yuvmen
commented
Mar 24, 2025
| @patch("sentry.api.utils.ParseError") | ||
| def test_handle_query_errors(self, mock_parse_error): | ||
| exceptions = [ | ||
| DatasetSelectionError, | ||
| IncompatibleMetricsQuery, | ||
| InvalidParams, |
There was a problem hiding this comment.
InvalidParams is not being converted in the actual code, and fails since now I actually run this test. From what I could tell InvalidParams is actually correctly not being converted to a user error since it is sometimes indeed an 'Internal Error' so I removed it from this test (which didnt run until now).
Codecov ReportAll modified and coverable lines are covered by tests ✅ ✅ All tests successful. No failed tests found. Additional details and impacted files@@ Coverage Diff @@
## master #87691 +/- ##
==========================================
- Coverage 87.78% 87.75% -0.03%
==========================================
Files 9899 9891 -8
Lines 563493 561770 -1723
Branches 22134 22134
==========================================
- Hits 494675 492995 -1680
+ Misses 68417 68374 -43
Partials 401 401 |
…ut errors Handle Postgres statement timeout errors on issue search which previously displayed 'Internal Error' but will now show more appropriate message explaining the query took too long and to possibly revise it Closes: #80166
yuvmen
force-pushed
the
yuvmen/improve-postgres-query-timeout-messaging
branch
from
ee0dd55 to
5886cc2
Compare
yuvmen
added a commit
that referenced
this pull request
Mar 25, 2025
…m visible internally A small addition on top of #87691. There we changed it so these errors are now treated as user errors but actually these could possibly come from our own Postgres queries taking too long even on reasonable queries, and without capturing we wouldn't even know they are happening. Even if thats not the case we want to keep these errors visible in Sentry to be able to monitor them.
yuvmen
added a commit
that referenced
this pull request
Mar 26, 2025
…m visible internally A small addition on top of #87691. There we changed it so these errors are now treated as user errors but actually these could possibly come from our own Postgres queries taking too long even on reasonable queries, and without capturing we wouldn't even know they are happening. Even if thats not the case we want to keep these errors visible in Sentry to be able to monitor them.
yuvmen
added a commit
that referenced
this pull request
Mar 26, 2025
A small addition on top of #87691. There we changed it so these errors are now treated as user errors but actually these could possibly come from our own Postgres queries taking too long even on reasonable queries, and without capturing we wouldn't even know they are happening. Even if thats not the case we want to keep these errors visible in Sentry to be able to monitor them.
andrewshie-sentry
pushed a commit
that referenced
this pull request
Mar 27, 2025
A small addition on top of #87691. There we changed it so these errors are now treated as user errors but actually these could possibly come from our own Postgres queries taking too long even on reasonable queries, and without capturing we wouldn't even know they are happening. Even if thats not the case we want to keep these errors visible in Sentry to be able to monitor them.
yuvmen
added a commit
that referenced
this pull request
Mar 27, 2025
follow up on #87691, it turns out the organization/issues endpoint actually did not use handle_query_errors and so this fix did not catch. added it now to the endpoint, aligning it with the other endpoints we have there. Also made the catch more specific, as QUERY_CANCELED from postgres are not always timeouts, same code is used for user cancelations, which do not apply to the error message we are converting to. Added endpoint tests as well to cover this.
yuvmen
added a commit
that referenced
this pull request
Mar 28, 2025
…#88158) follow up on #87691, it turns out the organization/issues endpoint actually did not use handle_query_errors and so this fix did not catch. added it now to the endpoint, aligning it with the other endpoints we have there. Also made the catch more specific, as QUERY_CANCELED from postgres are not always timeouts, same code is used for user cancelations, which do not apply to the error message we are converting to. Added endpoint tests as well to cover this.
andrewshie-sentry
pushed a commit
that referenced
this pull request
Mar 31, 2025
…#88158) follow up on #87691, it turns out the organization/issues endpoint actually did not use handle_query_errors and so this fix did not catch. added it now to the endpoint, aligning it with the other endpoints we have there. Also made the catch more specific, as QUERY_CANCELED from postgres are not always timeouts, same code is used for user cancelations, which do not apply to the error message we are converting to. Added endpoint tests as well to cover this.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Handle Postgres statement timeout errors on issue search which previously displayed 'Internal Error' but will now show more appropriate message explaining the query took too long and to possibly revise it
Closes: #80166