fix: per-message trace context propagation for persistent sessions#1128
fix: per-message trace context propagation for persistent sessions#1128Syed-Umer-Ali wants to merge 2 commits into
Conversation
Inject the ambient OTel trace context into every user message sent to the CLI (instead of only at connect() time), so outbound MCP/tool spans attribute to the caller's current turn trace in long-lived sessions. Changes: - Add _internal/_trace_helpers.py with shared inject_trace_into_message() - ClaudeSDKClient.query(): inject trace context into string/AsyncIterable messages - InternalClient._process_query_inner(): inject trace context into initial message - Query.stream_input(): inject trace context into each streamed message - Query.set_trace_context(): new control request to update CLI trace context Closes #1126
Adds 16 tests across 5 test classes: - TestInjectTraceIntoMessage: direct unit tests for the helper (traceparent/tracestate injection, no-op without OTel, error handling) - TestClaudeSDKClientQueryTraceInjection: string + AsyncIterable prompts via ClaudeSDKClient.query() - TestInternalClientProcessQueryTraceInjection: string + AsyncIterable prompts via query() - TestQueryStreamInputTraceInjection: per-message injection in Query.stream_input() - TestQuerySetTraceContext: control request with trace context
|
Reply for knoal: a) Single messages: TestInjectTraceIntoMessage verifies traceparent/tracestate injection, no-op without OTel, no-op without active span, and error handling. b) Multi-message streams: TestClaudeSDKClientQueryTraceInjection.test_async_iterable_prompt_each_message_gets_trace_context and TestQueryStreamInputTraceInjection.test_stream_input_injects_trace_context verify every message in an AsyncIterable gets its own trace context. TestInternalClientProcessQueryTraceInjection.test_async_iterable_prompt_injects_trace_context covers the query(prompt=stream) path. c) No propagation without OTel: Both the string and iterable paths have tests verifying traceparent is absent when opentelemetry is not installed. d) Query.set_trace_context() is tested separately, including no-op and error handling. All 16 tests pass. PR updated.
|
1 participant
Inject the ambient OTel trace context into every user message sent to the CLI (instead of only at connect() time), so outbound MCP/tool spans attribute to the caller's current turn trace in long-lived sessions.
Changes:
Closes #1126