fix: skip empty claude stream session updates

Author: sipercai

instrumentation-loongsuite/loongsuite-instrumentation-claude-agent-sdk/src/opentelemetry/instrumentation/claude_agent_sdk/patch.py

@@ -608,6 +608,10 @@ def _process_stream_event_message(
         if isinstance(event, dict):
             session_id = event.get("session_id")
 
+    if not session_id:
+        # Entry baggage is already applied when the agent invocation starts.
+        return
+
     _set_session_id(agent_invocation, session_id)
 
 

instrumentation-loongsuite/loongsuite-instrumentation-claude-agent-sdk/tests/test_session_capture.py

@@ -22,6 +22,9 @@
 
 from opentelemetry import baggage
 from opentelemetry import context as otel_context
+from opentelemetry.instrumentation.claude_agent_sdk import (
+    patch as claude_patch,
+)
 from opentelemetry.instrumentation.claude_agent_sdk.patch import (
     _process_agent_invocation_stream,
     wrap_claude_client_query,
@@ -257,6 +260,23 @@ async def test_stream_event_dict_session_fallback(
     assert llm_span.attributes[GEN_AI_SESSION_ID] == "sess-event-dict"
 
 
+def test_stream_event_without_session_skips_baggage_lookup(monkeypatch):
+    def fail_baggage_lookup():
+        raise AssertionError("unexpected per-event baggage lookup")
+
+    monkeypatch.setattr(
+        claude_patch,
+        "_entry_baggage_identity_attributes",
+        fail_baggage_lookup,
+    )
+    agent_invocation = SimpleNamespace(conversation_id=None, attributes={})
+
+    claude_patch._process_stream_event_message(StreamEvent(), agent_invocation)
+
+    assert agent_invocation.conversation_id is None
+    assert GEN_AI_SESSION_ID not in agent_invocation.attributes
+
+
 @pytest.mark.asyncio
 async def test_client_query_session_id_is_used_before_result_message(
     tracer_provider, span_exporter