From c5173586433a224c4f83cc3cad831bb4cd074ae4 Mon Sep 17 00:00:00 2001
From: Amin Ghadersohi <amin.ghadersohi@gmail.com>
Date: Thu, 9 Oct 2025 16:28:07 -0400
Subject: [PATCH] fix(slack): improve rate limit error handling and logging

Addresses the issue where Slack API rate limit errors were being
swallowed or masked by generic error messages. This change improves
observability and reliability of Slack integrations.

Changes:
- Increased retry count from 2 to 4 to provide more buffer before failure
- Added explicit error handling for HTTP 429 rate limit responses
- Enhanced logging with Retry-After header and retry handler status
- Added client initialization logging for debugging
- Fixed edge case where ex.response could be a string instead of object

This will make rate limit errors clearly visible in monitoring systems
like Datadog, making it easier to diagnose and respond to Slack API
rate limiting issues.
---
 superset/utils/slack.py | 47 +++++++++++++++++++++++++++++++----------
 1 file changed, 36 insertions(+), 11 deletions(-)

diff --git a/superset/utils/slack.py b/superset/utils/slack.py
index e1557934a663..0f2c4c36990f 100644
--- a/superset/utils/slack.py
+++ b/superset/utils/slack.py
@@ -50,8 +50,9 @@ def get_slack_client() -> WebClient:
         token = token()
     client = WebClient(token=token, proxy=app.config["SLACK_PROXY"])
 
-    rate_limit_handler = RateLimitErrorRetryHandler(max_retry_count=2)
+    rate_limit_handler = RateLimitErrorRetryHandler(max_retry_count=4)
     client.retry_handlers.append(rate_limit_handler)
+    logger.info("Slack client initialized with rate limit handler (max_retry_count=4)")
 
     return client
 
@@ -74,16 +75,40 @@ def get_channels() -> list[SlackChannelSchema]:
     extra_params = {"types": ",".join(SlackChannelTypes)}
     cursor = None
 
-    while True:
-        response = client.conversations_list(
-            limit=999, cursor=cursor, exclude_archived=True, **extra_params
-        )
-        channels.extend(
-            channel_schema.load(channel) for channel in response.data["channels"]
-        )
-        cursor = response.data.get("response_metadata", {}).get("next_cursor")
-        if not cursor:
-            break
+    try:
+        while True:
+            try:
+                response = client.conversations_list(
+                    limit=999, cursor=cursor, exclude_archived=True, **extra_params
+                )
+                channels.extend(
+                    channel_schema.load(channel)
+                    for channel in response.data["channels"]
+                )
+                cursor = response.data.get("response_metadata", {}).get("next_cursor")
+                if not cursor:
+                    break
+            except SlackApiError as ex:
+                # Check if this is a rate limit error
+                if (
+                    hasattr(ex.response, "status_code")
+                    and ex.response.status_code == 429
+                ):
+                    retry_after = ex.response.headers.get("Retry-After", "unknown")
+                    logger.error(
+                        "Slack API rate limit exceeded (HTTP 429). "
+                        "Retry-After: %s seconds. "
+                        "This may indicate the retry handler failed or "
+                        "exhausted retries (max 4). Error: %s",
+                        retry_after,
+                        ex,
+                    )
+                else:
+                    logger.error("Slack API error: %s", ex)
+                raise
+    except Exception:
+        logger.exception("Unexpected error fetching Slack channels")
+        raise
 
     return channels