scriptoriumadmin/litellm
1
0
Fork 0
mirror of https://github.com/BerriAI/litellm.git synced 2026-09-07 08:26:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 89

respect log_raw_request_response setting

Browse source
This commit is contained in:
AlanPonnachan 2025-11-13 14:52:29 +00:00
parent e1c607e22a
commit 82dc608333
2 changed files with 63 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
litellm/integrations/opentelemetry.py
View file

@ -605,8 +605,13 @@ class OpenTelemetry(CustomLogger):
from opentelemetry import trace
from opentelemetry.trace import Status, StatusCode
# only log raw LLM request/response if message_logging is on and not globally turned off
if litellm.turn_off_message_logging or not self.message_logging:
# only log raw LLM request/response if message_logging is on, not globally turned off,
# and if raw request logging is enabled
if (
litellm.turn_off_message_logging
or not self.message_logging
or not litellm.log_raw_request_response
):
return
litellm_params = kwargs.get("litellm_params", {})
@ -1078,7 +1083,9 @@ class OpenTelemetry(CustomLogger):
span=span, key="hidden_params", value=safe_dumps(hidden_params)
)
# Cost breakdown tracking
cost_breakdown: Optional[CostBreakdown] = standard_logging_payload.get("cost_breakdown")
cost_breakdown: Optional[CostBreakdown] = standard_logging_payload.get(
"cost_breakdown"
)
if cost_breakdown:
for key, value in cost_breakdown.items():
if value is not None:

57
tests/test_litellm/integrations/test_opentelemetry.py
View file

@ -40,7 +40,9 @@ class TestOpenTelemetryGuardrails(unittest.TestCase):
}
# Create a kwargs dict with standard_logging_object containing guardrail information
kwargs = {"standard_logging_object": {"guardrail_information": [ guardrail_info ]}}
kwargs = {
"standard_logging_object": {"guardrail_information": [guardrail_info]}
}
# Call the method
otel._create_guardrail_span(kwargs=kwargs, context=None)
@ -248,7 +250,9 @@ class TestOpenTelemetry(unittest.TestCase):
}
# Create a kwargs dict with standard_logging_object containing guardrail information
kwargs = {"standard_logging_object": {"guardrail_information": [ guardrail_info ]}}
kwargs = {
"standard_logging_object": {"guardrail_information": [guardrail_info]}
}
# Call the method
otel._create_guardrail_span(kwargs=kwargs, context=None)
@ -618,8 +622,6 @@ class TestOpenTelemetry(unittest.TestCase):
# But other attributes from OTEL_RESOURCE_ATTRIBUTES should still be present
self.assertEqual(attributes.get("extra.attr"), "extra-value")
def test_handle_success_spans_only(self):
# make sure neither events nor metrics is on
os.environ.pop("LITELLM_OTEL_INTEGRATION_ENABLE_EVENTS", None)
@ -769,6 +771,7 @@ class TestOpenTelemetry(unittest.TestCase):
result = otel._get_span_name(kwargs)
self.assertEqual(result, LITELLM_REQUEST_SPAN_NAME)
@patch("litellm.log_raw_request_response", True)
@patch("litellm.turn_off_message_logging", False)
def test_maybe_log_raw_request_creates_span(self):
"""Test _maybe_log_raw_request creates span when logging enabled"""
@ -808,6 +811,52 @@ class TestOpenTelemetry(unittest.TestCase):
mock_tracer.start_span.assert_not_called()
@patch("litellm.log_raw_request_response", False)
@patch("litellm.turn_off_message_logging", False)
def test_maybe_log_raw_request_skips_when_log_raw_request_is_false(self):
"""
Test that _maybe_log_raw_request skips creating a span when the global
litellm.log_raw_request_response setting is False.
"""
otel = OpenTelemetry()
otel.message_logging = True
mock_tracer = MagicMock()
otel.get_tracer_to_use_for_request = MagicMock(return_value=mock_tracer)
kwargs = {"litellm_params": {"metadata": {}}}
otel._maybe_log_raw_request(
kwargs, {}, datetime.now(), datetime.now(), MagicMock()
)
# Assert
mock_tracer.start_span.assert_not_called()
@patch("litellm.log_raw_request_response", True)
@patch("litellm.turn_off_message_logging", False)
def test_maybe_log_raw_request_creates_span_when_log_raw_request_is_true(self):
"""
Test that _maybe_log_raw_request creates a span when the global
litellm.log_raw_request_response setting is explicitly True.
"""
otel = OpenTelemetry()
otel.message_logging = True
mock_tracer = MagicMock()
mock_span = MagicMock()
mock_tracer.start_span.return_value = mock_span
otel.get_tracer_to_use_for_request = MagicMock(return_value=mock_tracer)
otel.set_raw_request_attributes = MagicMock()
otel._to_ns = MagicMock(return_value=1234567890)
kwargs = {"litellm_params": {"metadata": {}}}
otel._maybe_log_raw_request(
kwargs, {}, datetime.now(), datetime.now(), MagicMock()
)
# Assert
mock_tracer.start_span.assert_called_once()
class TestOpenTelemetryHeaderSplitting(unittest.TestCase):
"""Test suite for _get_headers_dictionary method"""