fix(api): Preserve RateLimitExceeded metadata in handle_query_errors (#109821)

Re-raise RateLimitExceeded instead of converting to Throttled in
handle_query_errors(), so `custom_exception_handler` can capture the
rate limit metadata (policy, quota_unit, storage_key, quota_used,
rejection_threshold) onto the request for access log middleware.

No changes for the user, since `custom_exception_handler` will still
reraise `Throttled` with the same error message for the frontend.

Co-authored-by: Claude <noreply@anthropic.com>

Author: cvxluo

src/sentry/api/handlers.py

@@ -2,6 +2,7 @@
 from rest_framework.exceptions import Throttled
 from rest_framework.views import exception_handler
 
+from sentry.search.events.constants import RATE_LIMIT_ERROR_MESSAGE
 from sentry.types.ratelimit import SnubaRateLimitMeta
 from sentry.utils.snuba import RateLimitExceeded
 
@@ -30,9 +31,7 @@ def custom_exception_handler(exc, context):
                 level="warning",
             )
         # let the client know that they've been rate limited with details
-        exc = Throttled(
-            detail="Rate limit exceeded. Please try your query with a smaller date range or fewer projects."
-        )
+        exc = Throttled(detail=RATE_LIMIT_ERROR_MESSAGE)
 
     response = exception_handler(exc, context)
 

src/sentry/api/utils.py

@@ -416,7 +416,7 @@ def handle_query_errors() -> Generator[None]:
         arg = error.args[0] if len(error.args) > 0 else None
         if isinstance(error, RateLimitExceeded):
             sentry_sdk.set_tag("query.error_reason", "RateLimitExceeded")
-            raise Throttled(detail=RATE_LIMIT_ERROR_MESSAGE)
+            raise
         if isinstance(
             error,
             (

tests/sentry/api/test_handlers.py

@@ -3,6 +3,7 @@
 from rest_framework.permissions import AllowAny
 
 from sentry.api.base import Endpoint
+from sentry.search.events.constants import RATE_LIMIT_ERROR_MESSAGE
 from sentry.testutils.cases import APITestCase
 from sentry.testutils.silo import control_silo_test
 from sentry.utils.snuba import RateLimitExceeded
@@ -30,7 +31,4 @@ def test_simple(self) -> None:
         resp = self.get_response()
         assert resp.status_code == 429
 
-        assert (
-            resp.data["detail"]
-            == "Rate limit exceeded. Please try your query with a smaller date range or fewer projects."
-        )
+        assert resp.data["detail"] == RATE_LIMIT_ERROR_MESSAGE

tests/sentry/api/test_utils.py

@@ -29,7 +29,6 @@
     QueryOutsideRetentionError,
     QuerySizeExceeded,
     QueryTooManySimultaneous,
-    RateLimitExceeded,
     SchemaValidationError,
     SnubaError,
     UnqualifiedQueryError,
@@ -185,7 +184,6 @@ def test_handle_query_errors(self, mock_parse_error: MagicMock) -> None:
             QueryOutsideRetentionError,
             QuerySizeExceeded,
             QueryTooManySimultaneous,
-            RateLimitExceeded,
             SchemaValidationError,
             SnubaError,
             UnqualifiedQueryError,