fix(otel v2): keep a caller's trace_user_id where Langfuse writes it on a full span

This commit is contained in:
yucheng-berri 2026-10-24 01:10:53 -07:00
parent feef7ba584
commit 8cbc77019b
2 changed files with 47 additions and 16 deletions

View file

@ -1,7 +1,8 @@
"""The span engine: dedup, start, run the mapper chain, set status, end."""
from collections import OrderedDict
from collections.abc import Callable, Mapping, Sequence
from collections.abc import Callable, Iterable, Mapping, Sequence
from itertools import chain
from types import MappingProxyType
from typing import Final
@ -85,6 +86,21 @@ def error_attributes(error: SpanError) -> Mapping[str, AttrValue]:
return MappingProxyType({key: value for key, value in pairs if value})
def _without_user_id(attributes: Mapping[str, AttrValue]) -> Iterable[tuple[str, AttrValue]]:
return ((key, value) for key, value in attributes.items() if key != User.ID)
def merge_mapped(outputs: Sequence[Mapping[str, AttrValue]]) -> Mapping[str, AttrValue]:
"""The mappers' attributes in mapper order, a later mapper's value winning. ``user.id`` sits where the last
mapper that writes it puts it, so a full span evicts it no sooner than that mapper's other attributes."""
last_user_writer: Final = max((index for index, output in enumerate(outputs) if User.ID in output), default=-1)
placed: Final = (
output.items() if index == last_user_writer else _without_user_id(output)
for index, output in enumerate(outputs)
)
return MappingProxyType(dict(chain.from_iterable(placed)))
def span_attribute_limit(span: Span) -> int | None:
"""The attribute count limit ``span`` was built with, ``None`` when unbounded."""
if not isinstance(span, SdkSpan):
@ -311,9 +327,7 @@ class SpanEmitter:
)
else None
)
mapped: Final = MappingProxyType(
{key: value for mapper in self._mappers for key, value in mapper.map(data).items()}
)
mapped: Final = merge_mapped(tuple(mapper.map(data) for mapper in self._mappers))
stamped_later: Final = error_attributes(error) if error else _NO_ATTRIBUTES
reserved: Final = len(stamped_later.keys() - mapped.keys())
budget: Final = attribute_budget(span, reserved, frozenset(mapped))

View file

@ -351,12 +351,12 @@ def test_llm_call_span_withholds_an_end_user_the_metadata_allowlist_drops(metada
assert not {"end-1", "caller-1"} & {str(value) for value in span.attributes.values()}
def _end_user_spans(monkeypatch, mapper_names, limit, message_counts):
def _user_spans(monkeypatch, mapper_names, limit, message_counts, metadata):
monkeypatch.setenv("OTEL_SPAN_ATTRIBUTE_COUNT_LIMIT", str(limit))
logger, exporter = _logger_with(mapper_names=mapper_names, capture_message_content=CaptureMessageContent.SPAN_ONLY)
for count in message_counts:
messages = [{"role": "user", "content": f"m{index}"} for index in range(count)]
_emit_llm(logger, _user_kwargs({"user_api_key_end_user_id": "end-1"}, messages, f"call_{count}"))
_emit_llm(logger, _user_kwargs(metadata, messages, f"call_{count}"))
return exporter.get_finished_spans()
@ -372,7 +372,10 @@ def _end_user_spans(monkeypatch, mapper_names, limit, message_counts):
def test_user_id_costs_no_other_attribute_at_the_span_limit(monkeypatch, mapper_names, limits, message_counts):
def spans() -> list:
return list(
chain.from_iterable(_end_user_spans(monkeypatch, mapper_names, limit, message_counts) for limit in limits)
chain.from_iterable(
_user_spans(monkeypatch, mapper_names, limit, message_counts, {"user_api_key_end_user_id": "end-1"})
for limit in limits
)
)
with_user_id: Final = spans()
@ -385,15 +388,29 @@ def test_user_id_costs_no_other_attribute_at_the_span_limit(monkeypatch, mapper_
assert with_user.dropped_attributes == without.dropped_attributes
def test_langfuse_vocabulary_keeps_the_caller_trace_user_at_the_span_limit():
logger, exporter = _logger_with(
mapper_names=["genai", "openinference", "langfuse"], capture_message_content=CaptureMessageContent.SPAN_ONLY
)
messages: Final = [{"role": "user", "content": f"m{index}"} for index in range(80)]
_emit_llm(logger, _user_kwargs({"trace_user_id": "caller-1"}, messages))
(span,) = exporter.get_finished_spans()
assert span.attributes[User.ID] == "caller-1"
assert span.dropped_attributes == 0
@pytest.mark.parametrize(
"metadata",
[{"trace_user_id": "caller-1"}, {"trace_user_id": "caller-1", "user_api_key_end_user_id": "end-1"}],
ids=["caller-trace-user", "caller-trace-user-and-end-user"],
)
@pytest.mark.parametrize(
"mapper_names",
[["genai", "langfuse"], ["genai", "openinference", "langfuse"]],
ids=["langfuse", "langfuse-with-openinference"],
)
def test_langfuse_vocabulary_keeps_the_caller_trace_user_at_the_span_limit(monkeypatch, mapper_names, metadata):
def spans() -> list:
return list(
chain.from_iterable(_user_spans(monkeypatch, mapper_names, limit, [1], metadata) for limit in range(16, 45))
)
with_user_id: Final = spans()
monkeypatch.delitem(GenAIMapper._LLM_CALL_ATTRS, User.ID)
without_user_id: Final = spans()
assert any(span.dropped_attributes and span.attributes.get(User.ID) == "caller-1" for span in with_user_id)
for with_user, without in zip(with_user_id, without_user_id, strict=True):
assert dict(with_user.attributes) == dict(without.attributes)
assert with_user.dropped_attributes == without.dropped_attributes
def test_streaming_span_carries_time_to_first_chunk():