Skip to content

Commit 88bc85b

Browse files
Yun-KimjjxctKyle-Verhoog
authored
fix(llmobs): encode llm objects in utf-8 before sending [backport #11961 to 2.19] (#12033)
Backports #11961 to 2.19. **Note that due to non-existent test files/conftest utilities in the 2.19 branch, this backport avoids backporting over the entire diff of #11961 and instead just backports over the fix implementation.** This PR resolves an issue in the Python SDK where non-ascii/utf8 characters being annotated on spans resulted in span payloads being dropped due to encoding errors. In #11330 we previously added the `ensure_ascii=False` option to our `safe_json()` helper's use of `json.dumps(...)` in order to keep non-ascii characters from being encoded multiple times into nonsense (as we were calling `safe_json()` multiple nested times while building the span event from the span tags. However this resulted in issues where non-latin1 characters (which is a subset of utf-8 and apparently the encoding scheme HTTP library relies on, which we in turn rely on to submit payloads) broke the encoding at payload submission time. To fix this, we remove the `ensure_ascii=False` option at the final write time. Also note that after #11543 we mostly centralized all of the times a span event is encoded, which is at write time and when encoding the span's input/output value fields (which can be a json dictionary format). Since we need to provide valid json formatting for the IO fields (which leads to a prettier UI display), we still need to call `json.dumps(ensure_ascii=False)` to avoid the same problem as fixed by end (i.e. write time) This PR also adds minor test fixtures mocking out the LLMObs back end intake to make assertions on the payloads we should be submitting to LLMObs, since previous tests were all relying on the span events prior to encoding/submission and weren't able to cover this scenario. --------- ## Checklist - [x] PR author has checked that all the criteria below are met - The PR description includes an overview of the change - The PR description articulates the motivation for the change - The change includes tests OR the PR description describes a testing strategy - The PR description notes risks associated with the change, if any - Newly-added code is easy to change - The change follows the [library release note guidelines](https://ddtrace.readthedocs.io/en/stable/releasenotes.html) - The change includes or references documentation updates if necessary - Backport labels are set (if [applicable](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting)) ## Reviewer Checklist - [x] Reviewer has checked that all the criteria below are met - Title is accurate - All changes are related to the pull request's stated goal - Avoids breaking [API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces) changes - Testing strategy adequately addresses listed risks - Newly-added code is easy to change - Release note makes sense to a user of the library - If necessary, author has acknowledged and discussed the performance implications of this PR as reported in the benchmarks PR comment - Backport labels are set in a manner that is consistent with the [release branch maintenance policy](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting) Co-authored-by: Jonathan Chavez <[email protected]> Co-authored-by: Kyle Verhoog <[email protected]>
1 parent 7a1d6b9 commit 88bc85b

File tree

6 files changed

+25
-16
lines changed

6 files changed

+25
-16
lines changed

ddtrace/llmobs/_llmobs.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
from ddtrace.internal.telemetry.constants import TELEMETRY_APM_PRODUCT
2525
from ddtrace.internal.utils.formats import asbool
2626
from ddtrace.internal.utils.formats import parse_tags_str
27+
from ddtrace.llmobs._constants import AGENTLESS_BASE_URL
2728
from ddtrace.llmobs._constants import ANNOTATIONS_CONTEXT_ID
2829
from ddtrace.llmobs._constants import INPUT_DOCUMENTS
2930
from ddtrace.llmobs._constants import INPUT_MESSAGES
@@ -85,6 +86,7 @@ def __init__(self, tracer=None):
8586

8687
self._llmobs_span_writer = LLMObsSpanWriter(
8788
is_agentless=config._llmobs_agentless_enabled,
89+
agentless_url="%s.%s" % (AGENTLESS_BASE_URL, config._dd_site),
8890
interval=float(os.getenv("_DD_LLMOBS_WRITER_INTERVAL", 1.0)),
8991
timeout=float(os.getenv("_DD_LLMOBS_WRITER_TIMEOUT", 5.0)),
9092
)
@@ -108,7 +110,7 @@ def __init__(self, tracer=None):
108110
self._annotation_context_lock = forksafe.RLock()
109111
self.tracer.on_start_span(self._do_annotations)
110112

111-
def _do_annotations(self, span):
113+
def _do_annotations(self, span: Span) -> None:
112114
# get the current span context
113115
# only do the annotations if it matches the context
114116
if span.span_type != SpanTypes.LLM: # do this check to avoid the warning log in `annotate`

ddtrace/llmobs/_utils.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,10 +178,10 @@ def _unserializable_default_repr(obj):
178178
return default_repr
179179

180180

181-
def safe_json(obj):
181+
def safe_json(obj, ensure_ascii=True):
182182
if isinstance(obj, str):
183183
return obj
184184
try:
185-
return json.dumps(obj, ensure_ascii=False, skipkeys=True, default=_unserializable_default_repr)
185+
return json.dumps(obj, ensure_ascii=ensure_ascii, skipkeys=True, default=_unserializable_default_repr)
186186
except Exception:
187187
log.error("Failed to serialize object to JSON.", exc_info=True)

ddtrace/llmobs/_writer.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
from ddtrace.internal.periodic import PeriodicService
2323
from ddtrace.internal.writer import HTTPWriter
2424
from ddtrace.internal.writer import WriterClientBase
25-
from ddtrace.llmobs._constants import AGENTLESS_BASE_URL
2625
from ddtrace.llmobs._constants import AGENTLESS_ENDPOINT
2726
from ddtrace.llmobs._constants import DROPPED_IO_COLLECTION_ERROR
2827
from ddtrace.llmobs._constants import DROPPED_VALUE_TEXT
@@ -237,15 +236,18 @@ def __init__(
237236
interval: float,
238237
timeout: float,
239238
is_agentless: bool = True,
239+
agentless_url: str = "",
240240
dogstatsd=None,
241241
sync_mode=False,
242242
reuse_connections=None,
243243
):
244244
headers = {}
245245
clients = [] # type: List[WriterClientBase]
246246
if is_agentless:
247+
if not agentless_url:
248+
raise ValueError("agentless_url is required for agentless mode")
247249
clients.append(LLMObsAgentlessEventClient())
248-
intake_url = "%s.%s" % (AGENTLESS_BASE_URL, config._dd_site)
250+
intake_url = agentless_url
249251
headers["DD-API-KEY"] = config._dd_api_key
250252
else:
251253
clients.append(LLMObsProxiedEventClient())
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
fixes:
3+
- |
4+
LLM Observability: This fix resolves an issue where annotating a span with non latin-1 (but valid utf-8) input/output values resulted in encoding errors.

tests/llmobs/test_llmobs_span_agent_writer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ def test_flush_queue_when_event_cause_queue_to_exceed_payload_limit(
4949

5050

5151
def test_truncating_oversized_events(mock_writer_logs, mock_http_writer_send_payload_response):
52-
llmobs_span_writer = LLMObsSpanWriter(is_agentless=True, interval=1000, timeout=1)
52+
llmobs_span_writer = LLMObsSpanWriter(is_agentless=False, interval=1000, timeout=1)
5353
llmobs_span_writer.enqueue(_oversized_llm_event())
5454
llmobs_span_writer.enqueue(_oversized_retrieval_event())
5555
llmobs_span_writer.enqueue(_oversized_workflow_event())

tests/llmobs/test_llmobs_span_agentless_writer.py

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@
2020

2121
def test_writer_start(mock_writer_logs):
2222
with override_global_config(dict(_dd_api_key="foobar.baz", _dd_site=DATADOG_SITE)):
23-
llmobs_span_writer = LLMObsSpanWriter(is_agentless=True, interval=1000, timeout=1)
23+
llmobs_span_writer = LLMObsSpanWriter(is_agentless=True, agentless_url=INTAKE_URL, interval=1000, timeout=1)
2424
llmobs_span_writer.start()
2525
mock_writer_logs.debug.assert_has_calls([mock.call("started %r to %r", "LLMObsSpanWriter", INTAKE_URL)])
2626

2727

2828
def test_buffer_limit(mock_writer_logs, mock_http_writer_send_payload_response):
2929
with override_global_config(dict(_dd_api_key="foobar.baz", _dd_site=DATADOG_SITE)):
30-
llmobs_span_writer = LLMObsSpanWriter(is_agentless=True, interval=1000, timeout=1)
30+
llmobs_span_writer = LLMObsSpanWriter(is_agentless=True, agentless_url=INTAKE_URL, interval=1000, timeout=1)
3131
for _ in range(1001):
3232
llmobs_span_writer.enqueue({})
3333
mock_writer_logs.warning.assert_called_with(
@@ -39,7 +39,7 @@ def test_flush_queue_when_event_cause_queue_to_exceed_payload_limit(
3939
mock_writer_logs, mock_http_writer_send_payload_response
4040
):
4141
with override_global_config(dict(_dd_api_key="foobar.baz", _dd_site=DATADOG_SITE)):
42-
llmobs_span_writer = LLMObsSpanWriter(is_agentless=True, interval=1000, timeout=1)
42+
llmobs_span_writer = LLMObsSpanWriter(is_agentless=True, agentless_url=INTAKE_URL, interval=1000, timeout=1)
4343
llmobs_span_writer.enqueue(_large_event())
4444
llmobs_span_writer.enqueue(_large_event())
4545
llmobs_span_writer.enqueue(_large_event())
@@ -56,7 +56,7 @@ def test_flush_queue_when_event_cause_queue_to_exceed_payload_limit(
5656

5757
def test_truncating_oversized_events(mock_writer_logs, mock_http_writer_send_payload_response):
5858
with override_global_config(dict(_dd_api_key="foobar.baz", _dd_site=DATADOG_SITE)):
59-
llmobs_span_writer = LLMObsSpanWriter(is_agentless=True, interval=1000, timeout=1)
59+
llmobs_span_writer = LLMObsSpanWriter(is_agentless=True, agentless_url=INTAKE_URL, interval=1000, timeout=1)
6060
llmobs_span_writer.enqueue(_oversized_llm_event())
6161
llmobs_span_writer.enqueue(_oversized_retrieval_event())
6262
llmobs_span_writer.enqueue(_oversized_workflow_event())
@@ -77,7 +77,7 @@ def test_truncating_oversized_events(mock_writer_logs, mock_http_writer_send_pay
7777

7878
def test_send_completion_event(mock_writer_logs, mock_http_writer_logs, mock_http_writer_send_payload_response):
7979
with override_global_config(dict(_dd_site=DATADOG_SITE, _dd_api_key="foobar.baz")):
80-
llmobs_span_writer = LLMObsSpanWriter(is_agentless=True, interval=1, timeout=1)
80+
llmobs_span_writer = LLMObsSpanWriter(is_agentless=True, agentless_url=INTAKE_URL, interval=1, timeout=1)
8181
llmobs_span_writer.start()
8282
llmobs_span_writer.enqueue(_completion_event())
8383
llmobs_span_writer.periodic()
@@ -87,7 +87,7 @@ def test_send_completion_event(mock_writer_logs, mock_http_writer_logs, mock_htt
8787

8888
def test_send_chat_completion_event(mock_writer_logs, mock_http_writer_logs, mock_http_writer_send_payload_response):
8989
with override_global_config(dict(_dd_site=DATADOG_SITE, _dd_api_key="foobar.baz")):
90-
llmobs_span_writer = LLMObsSpanWriter(is_agentless=True, interval=1, timeout=1)
90+
llmobs_span_writer = LLMObsSpanWriter(is_agentless=True, agentless_url=INTAKE_URL, interval=1, timeout=1)
9191
llmobs_span_writer.start()
9292
llmobs_span_writer.enqueue(_chat_completion_event())
9393
llmobs_span_writer.periodic()
@@ -97,7 +97,7 @@ def test_send_chat_completion_event(mock_writer_logs, mock_http_writer_logs, moc
9797

9898
def test_send_completion_bad_api_key(mock_http_writer_logs, mock_http_writer_put_response_forbidden):
9999
with override_global_config(dict(_dd_site=DATADOG_SITE, _dd_api_key="<bad-api-key>")):
100-
llmobs_span_writer = LLMObsSpanWriter(is_agentless=True, interval=1, timeout=1)
100+
llmobs_span_writer = LLMObsSpanWriter(is_agentless=True, agentless_url=INTAKE_URL, interval=1, timeout=1)
101101
llmobs_span_writer.start()
102102
llmobs_span_writer.enqueue(_completion_event())
103103
llmobs_span_writer.periodic()
@@ -111,7 +111,7 @@ def test_send_completion_bad_api_key(mock_http_writer_logs, mock_http_writer_put
111111

112112
def test_send_timed_events(mock_writer_logs, mock_http_writer_logs, mock_http_writer_send_payload_response):
113113
with override_global_config(dict(_dd_site=DATADOG_SITE, _dd_api_key="foobar.baz")):
114-
llmobs_span_writer = LLMObsSpanWriter(is_agentless=True, interval=0.01, timeout=1)
114+
llmobs_span_writer = LLMObsSpanWriter(is_agentless=True, agentless_url=INTAKE_URL, interval=0.01, timeout=1)
115115
llmobs_span_writer.start()
116116
mock_writer_logs.reset_mock()
117117

@@ -127,7 +127,7 @@ def test_send_timed_events(mock_writer_logs, mock_http_writer_logs, mock_http_wr
127127

128128
def test_send_multiple_events(mock_writer_logs, mock_http_writer_logs, mock_http_writer_send_payload_response):
129129
with override_global_config(dict(_dd_site=DATADOG_SITE, _dd_api_key="foobar.baz")):
130-
llmobs_span_writer = LLMObsSpanWriter(is_agentless=True, interval=0.01, timeout=1)
130+
llmobs_span_writer = LLMObsSpanWriter(is_agentless=True, agentless_url=INTAKE_URL, interval=0.01, timeout=1)
131131
llmobs_span_writer.start()
132132
mock_writer_logs.reset_mock()
133133

@@ -159,6 +159,7 @@ def test_send_on_exit(mock_writer_logs, run_python_code_in_subprocess):
159159
160160
from ddtrace.internal.utils.http import Response
161161
from ddtrace.llmobs._writer import LLMObsSpanWriter
162+
from tests.llmobs.test_llmobs_span_agentless_writer import INTAKE_URL
162163
from tests.llmobs.test_llmobs_span_agentless_writer import _completion_event
163164
164165
with mock.patch(
@@ -168,7 +169,7 @@ def test_send_on_exit(mock_writer_logs, run_python_code_in_subprocess):
168169
body="{}",
169170
),
170171
):
171-
llmobs_span_writer = LLMObsSpanWriter(is_agentless=True, interval=0.01, timeout=1)
172+
llmobs_span_writer = LLMObsSpanWriter(is_agentless=True, agentless_url=INTAKE_URL, interval=0.01, timeout=1)
172173
llmobs_span_writer.start()
173174
llmobs_span_writer.enqueue(_completion_event())
174175
""",

0 commit comments

Comments
 (0)