scriptoriumadmin/litellm
1
0
Fork 0
mirror of https://github.com/BerriAI/litellm.git synced 2026-09-16 23:41:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 103

Merge pull request #41205 from BerriAI/litellm_lit_5856_error_log_call_id

Browse source 
fix(proxy): include litellm_call_id in LLM API exception logs
This commit is contained in:
yucheng-berri 2026-09-15 16:47:57 -07:00 • committed by GitHub
commit c1a3784e6c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 98 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
litellm/proxy/common_request_processing.py
View file

@ -1451,10 +1451,13 @@ def _has_attribute_error_in_chain(exc: Exception) -> bool:
_CLIENT_DISCONNECT_DETAIL: Final = "Client disconnected the request"
def _log_llm_api_exception(e: Exception) -> None:
def _log_llm_api_exception(e: Exception, litellm_call_id: str | None) -> None:
if getattr(e, "status_code", None) == 499 and getattr(e, "detail", None) == _CLIENT_DISCONNECT_DETAIL:
verbose_proxy_logger.info(
"litellm.proxy.proxy_server._handle_llm_api_exception(): client disconnected, upstream LLM request cancelled"
"litellm.proxy.proxy_server._handle_llm_api_exception(): client disconnected, "
"upstream LLM request cancelled - litellm_call_id=%s",
litellm_call_id,
extra=MappingProxyType({"litellm_call_id": litellm_call_id}),
)
return
log_fn: Final = (
@ -1462,7 +1465,12 @@ def _log_llm_api_exception(e: Exception) -> None:
if is_expected_client_error(e) and not litellm.log_client_error_tracebacks
else verbose_proxy_logger.exception
)
log_fn("litellm.proxy.proxy_server._handle_llm_api_exception(): Exception occured - %s", e)
log_fn(
"litellm.proxy.proxy_server._handle_llm_api_exception(): Exception occured - litellm_call_id=%s - %s",
litellm_call_id,
e,
extra=MappingProxyType({"litellm_call_id": litellm_call_id}),
)
async def _cancel_llm_call_on_client_disconnect(
@ -3421,7 +3429,11 @@ class ProxyBaseLLMRequestProcessing:
version: str | None = None,
):
"""Raises ProxyException (OpenAI API compatible) if an exception is raised"""
_log_llm_api_exception(e)
logging_obj: Final[LiteLLMLoggingObj | None] = self.data.get("litellm_logging_obj", None)
_log_llm_api_exception(
e,
(logging_obj.litellm_call_id if logging_obj is not None else None) or self.data.get("litellm_call_id"),
)
# Allow callbacks to transform the error response
transformed_exception: Final = await proxy_logging_obj.post_call_failure_hook(
user_api_key_dict=user_api_key_dict,

83
tests/test_litellm/proxy/test_common_request_processing.py
View file

@ -8169,7 +8169,7 @@ def test_log_llm_api_exception_traceback_only_for_unexpected_errors(exc, expect_
try:
raise exc
except Exception as raised:
_log_llm_api_exception(raised)
_log_llm_api_exception(raised, "call-id-for-traceback-test")
finally:
verbose_proxy_logger.propagate = False
@ -8663,3 +8663,84 @@ class TestBackgroundResponseRetrievalGovernance:
assert "_guardrail_pipelines" not in data["litellm_metadata"]
assert "applied_policies" not in data["litellm_metadata"]
class TestErrorLogCarriesCallId:
"""Regression for LIT-5856 / #37532: the ERROR line emitted for a failed LLM
request must carry the litellm_call_id the client got back in the
x-litellm-call-id response header, so a logged exception can be tied to a
specific request."""
async def _invoke(self, data: dict[str, object]) -> None:
from litellm._logging import verbose_proxy_logger
processor: Final = ProxyBaseLLMRequestProcessing(data=data)
proxy_logging_obj: Final = MagicMock()
proxy_logging_obj.post_call_failure_hook = AsyncMock(return_value=None)
verbose_proxy_logger.propagate = True
try:
with pytest.raises(ProxyException):
await processor._handle_llm_api_exception(
e=ValueError("upstream blew up"),
user_api_key_dict=ProxyUserAPIKeyAuth(api_key="sk-test"),
proxy_logging_obj=proxy_logging_obj,
)
finally:
verbose_proxy_logger.propagate = False
@staticmethod
def _error_record(caplog: pytest.LogCaptureFixture):
return next(r for r in caplog.records if "_handle_llm_api_exception(): Exception occured" in r.getMessage())
async def test_call_id_from_logging_obj_is_logged(self, caplog: pytest.LogCaptureFixture) -> None:
call_id: Final = str(uuid.uuid4())
logging_obj: Final = MagicMock()
logging_obj.litellm_call_id = call_id
with caplog.at_level("ERROR", logger="LiteLLM Proxy"):
await self._invoke({"litellm_logging_obj": logging_obj, "litellm_call_id": "stale-id"})
record: Final = self._error_record(caplog)
assert record.litellm_call_id == call_id
assert call_id in record.getMessage()
async def test_call_id_falls_back_to_request_data(self, caplog: pytest.LogCaptureFixture) -> None:
call_id: Final = str(uuid.uuid4())
with caplog.at_level("ERROR", logger="LiteLLM Proxy"):
await self._invoke({"litellm_call_id": call_id})
record: Final = self._error_record(caplog)
assert record.litellm_call_id == call_id
assert call_id in record.getMessage()
async def test_call_id_falls_back_when_logging_obj_has_none(self, caplog: pytest.LogCaptureFixture) -> None:
call_id: Final = str(uuid.uuid4())
logging_obj: Final = MagicMock()
logging_obj.litellm_call_id = None
with caplog.at_level("ERROR", logger="LiteLLM Proxy"):
await self._invoke({"litellm_logging_obj": logging_obj, "litellm_call_id": call_id})
record: Final = self._error_record(caplog)
assert record.litellm_call_id == call_id
assert call_id in record.getMessage()
def test_client_disconnect_log_carries_call_id(self, caplog: pytest.LogCaptureFixture) -> None:
from litellm._logging import verbose_proxy_logger
from litellm.proxy.common_request_processing import (
_CLIENT_DISCONNECT_DETAIL,
_log_llm_api_exception,
)
call_id: Final = str(uuid.uuid4())
verbose_proxy_logger.propagate = True
try:
with caplog.at_level("INFO", logger="LiteLLM Proxy"):
_log_llm_api_exception(
HTTPException(status_code=499, detail=_CLIENT_DISCONNECT_DETAIL),
call_id,
)
finally:
verbose_proxy_logger.propagate = False
record: Final = caplog.records[-1]
assert record.litellm_call_id == call_id
assert call_id in record.getMessage()