Merge 943a967b55 into 9dda4d895f

litellm/proxy/utils.py

@@ -1436,9 +1436,18 @@ class ProxyLogging:
         # current alerting threshold
         alerting_threshold: float = self.alerting_threshold
 
-        # add a 100 second buffer to the alerting threshold
-        # ensures we don't send errant hanging request slack alerts
-        alerting_threshold += 100
+        # This marker's ttl must outlive the hanging-request tracker entry
+        # (alerting_threshold * 1.5 + HANGING_ALERT_BUFFER_TIME_SECONDS, see
+        # HangingRequestCheck._get_metadata) - otherwise a completed request
+        # can have its marker expire before the tracker gets around to
+        # checking it (only the 20 oldest entries are scanned per pass),
+        # producing a false "hanging request" alert for a request that
+        # already finished successfully.
+        from litellm.types.integrations.slack_alerting import (
+            HANGING_ALERT_BUFFER_TIME_SECONDS,
+        )
+
+        alerting_threshold = alerting_threshold * 1.5 + HANGING_ALERT_BUFFER_TIME_SECONDS
 
         await self.internal_usage_cache.async_set_cache(
             key=f"request_status:{litellm_call_id}",

tests/test_litellm/proxy/test_proxy_utils.py

@@ -26,6 +26,35 @@ def test_get_custom_url(monkeypatch):
     assert custom_url == "http://0.0.0.0:4000/litellm/ui/"
 
 
+@pytest.mark.asyncio
+async def test_update_request_status_marker_ttl_outlives_tracker_entry():
+    """The completion marker written by update_request_status must have a
+    ttl >= the hanging-request tracker entry's ttl (alerting_threshold * 1.5
+    + HANGING_ALERT_BUFFER_TIME_SECONDS). Otherwise a completed request's
+    marker can expire before the hanging-request check gets around to
+    scanning it, producing a false "hanging request" alert. See #43285.
+    """
+    from litellm.types.integrations.slack_alerting import (
+        HANGING_ALERT_BUFFER_TIME_SECONDS,
+    )
+
+    proxy_logging_obj = ProxyLogging(user_api_key_cache=DualCache())
+    proxy_logging_obj.alerting = ["slack"]
+    proxy_logging_obj.alerting_threshold = 300
+
+    tracker_entry_ttl = 300 * 1.5 + HANGING_ALERT_BUFFER_TIME_SECONDS
+
+    with patch.object(
+        proxy_logging_obj.internal_usage_cache, "async_set_cache", new=AsyncMock()
+    ) as mock_set_cache:
+        await proxy_logging_obj.update_request_status(
+            litellm_call_id="test_call_id", status="success"
+        )
+
+    used_ttl = mock_set_cache.call_args.kwargs["ttl"]
+    assert used_ttl >= tracker_entry_ttl
+
+
 def test_proxy_only_error_true_for_llm_route():
     proxy_logging_obj = ProxyLogging(user_api_key_cache=DualCache())
     assert proxy_logging_obj._is_proxy_only_llm_api_error(

tests/test_litellm/proxy/utils/proxy_logging/test_lifecycle.py

@@ -483,7 +483,9 @@ async def test_update_request_status_when_alerting_set_writes_cache(proxy_loggin
         "key": "request_status:call-1",
         "value": "success",
         "local_only": True,
-        "ttl": 105.0,
+        # alerting_threshold * 1.5 + HANGING_ALERT_BUFFER_TIME_SECONDS, matching
+        # the hanging-request tracker entry's own ttl (see #43285).
+        "ttl": 67.5,
     }