fix(redis): Make quiet_redis_noise group RedisClusterExceptions that escape (#101547)

The aim of quiet_redis_noise is to apply standard refinements to Redis
error reporting to code within the context.
RedisClusterExceptions are grouped because they can be raised nearly
anywhere, but that grouping is lost when (as is common) they escape the
context.
This ensures they are reported within the context, avoiding violating
expectations.

Author: kcons

src/sentry/utils/exceptions.py

@@ -115,4 +115,12 @@ def quiet_redis_noise() -> Generator[None]:
         exception_grouping_context({RedisClusterException: "redis.redis_cluster_exception"}),
         set_sentry_exception_levels({TimeoutError: "info", MovedError: "info"}),
     ):
-        yield
+        try:
+            yield
+        except RedisClusterException:
+            # RedisClusterException, unlike the others, propagates in most cases, so we
+            # want to report it within the grouping context to ensure it is grouped correctly.
+            # Unless there's another exception in this execution context in the interim, any
+            # top-level reporting should be dropped by the Sentry dupe detection.
+            sentry_sdk.capture_exception()
+            raise

tests/sentry/utils/test_exceptions.py

@@ -2,10 +2,13 @@
 from typing import Any
 from unittest.mock import Mock, patch
 
+from rediscluster.exceptions import RedisClusterException  # type: ignore[attr-defined]
+
 from sentry.taskworker.state import CurrentTaskState
 from sentry.taskworker.workerchild import ProcessingDeadlineExceeded
 from sentry.utils.exceptions import (
     exception_grouping_context,
+    quiet_redis_noise,
     set_sentry_exception_levels,
     timeout_grouping_context,
 )
@@ -447,3 +450,26 @@ def test_basic_functionality_minimal_mocking(self) -> None:
             # Verify the level was changed and other data preserved
             assert result["level"] == "warning"
             assert result["other_data"] == "preserved"
+
+
+class TestQuietRedisNoise:
+    def test_redis_cluster_exception_captured_and_reraised(self) -> None:
+
+        with patch("sentry_sdk.capture_exception") as mock_capture:
+            try:
+                with quiet_redis_noise():
+                    raise RedisClusterException("Cannot connect to Redis")
+            except RedisClusterException:
+                mock_capture.assert_called_once()
+            else:
+                assert False, "RedisClusterException was not re-raised"
+
+    def test_other_exceptions_not_captured(self) -> None:
+        with patch("sentry_sdk.capture_exception") as mock_capture:
+            try:
+                with quiet_redis_noise():
+                    raise ValueError("Some other error")
+            except ValueError:
+                mock_capture.assert_not_called()
+            else:
+                assert False, "ValueError was not re-raised"