fix(bedrock): handle non-text contentBlockDelta events in converse_stream (#3404)

Co-authored-by: Nir Gazit <[email protected]>

Author: octavifs

packages/opentelemetry-instrumentation-bedrock/opentelemetry/instrumentation/bedrock/__init__.py

@@ -388,7 +388,7 @@ def wrap(*args, **kwargs):
                 span = kwargs.pop("span")
                 event = func(*args, **kwargs)
                 nonlocal role
-                if "contentBlockDelta" in event:
+                if "contentBlockDelta" in event and "text" in event["contentBlockDelta"].get("delta", {}):
                     response_msg.append(event["contentBlockDelta"]["delta"]["text"])
                 elif "messageStart" in event:
                     role = event["messageStart"]["role"]

packages/opentelemetry-instrumentation-bedrock/tests/traces/cassettes/test_anthropic/test_anthropic_converse_stream_with_tool_use.yaml

@@ -0,0 +1,132 @@
+interactions:
+- request:
+    body: '{"messages": [{"role": "user", "content": [{"text": "What is the weather
+      in Barcelona?"}]}], "toolConfig": {"tools": [{"toolSpec": {"name": "get_weather",
+      "description": "Get the current weather for a location", "inputSchema": {"json":
+      {"type": "object", "properties": {"location": {"type": "string", "description":
+      "The city name"}}, "required": ["location"]}}}}]}, "inferenceConfig": {"maxTokens":
+      300, "temperature": 0.5}}'
+    headers:
+      Content-Length:
+      - '425'
+      Content-Type:
+      - !!binary |
+        YXBwbGljYXRpb24vanNvbg==
+      User-Agent:
+      - !!binary |
+        Qm90bzMvMS4zNC4xNDUgbWQvQm90b2NvcmUjMS4zNC4xNDUgdWEvMi4wIG9zL21hY29zIzI0LjYu
+        MCBtZC9hcmNoI2FybTY0IGxhbmcvcHl0aG9uIzMuMTEuMTIgbWQvcHlpbXBsI0NQeXRob24gY2Zn
+        L3JldHJ5LW1vZGUjbGVnYWN5IEJvdG9jb3JlLzEuMzQuMTQ1
+      X-Amz-Date:
+      - !!binary |
+        MjAyNTEwMDlUMTUzNzI5Wg==
+      amz-sdk-invocation-id:
+      - !!binary |
+        MTg2NWQ3NDUtYjEzNS00NGY5LThjZjUtZTMzMjQwMTEyZWEw
+      amz-sdk-request:
+      - !!binary |
+        YXR0ZW1wdD0x
+    method: POST
+    uri: https://bedrock-runtime.us-east-1.amazonaws.com/model/anthropic.claude-3-sonnet-20240229-v1%3A0/converse-stream
+  response:
+    body:
+      string: !!binary |
+        AAAAoAAAAFKQYHAnCzpldmVudC10eXBlBwAMbWVzc2FnZVN0YXJ0DTpjb250ZW50LXR5cGUHABBh
+        cHBsaWNhdGlvbi9qc29uDTptZXNzYWdlLXR5cGUHAAVldmVudHsicCI6ImFiY2RlZmdoaWprbG1u
+        b3BxcnN0dXZ3eHl6QUJDREVGR0hJIiwicm9sZSI6ImFzc2lzdGFudCJ9CdeWBQAAALwAAABXRRr+
+        Kws6ZXZlbnQtdHlwZQcAEWNvbnRlbnRCbG9ja0RlbHRhDTpjb250ZW50LXR5cGUHABBhcHBsaWNh
+        dGlvbi9qc29uDTptZXNzYWdlLXR5cGUHAAVldmVudHsiY29udGVudEJsb2NrSW5kZXgiOjAsImRl
+        bHRhIjp7InRleHQiOiJPa2F5In0sInAiOiJhYmNkZWZnaGlqa2xtbm9wcXJzdHV2d3h5ekFCQ0RF
+        In0w4o7XAAAAvgAAAFc/2q1LCzpldmVudC10eXBlBwARY29udGVudEJsb2NrRGVsdGENOmNvbnRl
+        bnQtdHlwZQcAEGFwcGxpY2F0aW9uL2pzb24NOm1lc3NhZ2UtdHlwZQcABWV2ZW50eyJjb250ZW50
+        QmxvY2tJbmRleCI6MCwiZGVsdGEiOnsidGV4dCI6IiwifSwicCI6ImFiY2RlZmdoaWprbG1ub3Bx
+        cnN0dXZ3eHl6QUJDREVGR0hJSiJ9VK8L7wAAALUAAABXSAqcWgs6ZXZlbnQtdHlwZQcAEWNvbnRl
+        bnRCbG9ja0RlbHRhDTpjb250ZW50LXR5cGUHABBhcHBsaWNhdGlvbi9qc29uDTptZXNzYWdlLXR5
+        cGUHAAVldmVudHsiY29udGVudEJsb2NrSW5kZXgiOjAsImRlbHRhIjp7InRleHQiOiIgbGV0In0s
+        InAiOiJhYmNkZWZnaGlqa2xtbm9wcXJzdHV2d3gifVP2VB8AAADLAAAAVw7owvQLOmV2ZW50LXR5
+        cGUHABFjb250ZW50QmxvY2tEZWx0YQ06Y29udGVudC10eXBlBwAQYXBwbGljYXRpb24vanNvbg06
+        bWVzc2FnZS10eXBlBwAFZXZlbnR7ImNvbnRlbnRCbG9ja0luZGV4IjowLCJkZWx0YSI6eyJ0ZXh0
+        IjoiIG1lIn0sInAiOiJhYmNkZWZnaGlqa2xtbm9wcXJzdHV2d3h5ekFCQ0RFRkdISUpLTE1OT1BR
+        UlNUVSJ9PuPo+AAAAKgAAABX0HrPaQs6ZXZlbnQtdHlwZQcAEWNvbnRlbnRCbG9ja0RlbHRhDTpj
+        b250ZW50LXR5cGUHABBhcHBsaWNhdGlvbi9qc29uDTptZXNzYWdlLXR5cGUHAAVldmVudHsiY29u
+        dGVudEJsb2NrSW5kZXgiOjAsImRlbHRhIjp7InRleHQiOiIgY2hlY2sifSwicCI6ImFiY2RlZmdo
+        aSJ9Gp4XkQAAAKAAAABX4AqEqAs6ZXZlbnQtdHlwZQcAEWNvbnRlbnRCbG9ja0RlbHRhDTpjb250
+        ZW50LXR5cGUHABBhcHBsaWNhdGlvbi9qc29uDTptZXNzYWdlLXR5cGUHAAVldmVudHsiY29udGVu
+        dEJsb2NrSW5kZXgiOjAsImRlbHRhIjp7InRleHQiOiIgdGhlIn0sInAiOiJhYmMifePRLc8AAAC7
+        AAAAV/c6IjsLOmV2ZW50LXR5cGUHABFjb250ZW50QmxvY2tEZWx0YQ06Y29udGVudC10eXBlBwAQ
+        YXBwbGljYXRpb24vanNvbg06bWVzc2FnZS10eXBlBwAFZXZlbnR7ImNvbnRlbnRCbG9ja0luZGV4
+        IjowLCJkZWx0YSI6eyJ0ZXh0IjoiIHdlYXRoZXIifSwicCI6ImFiY2RlZmdoaWprbG1ub3BxcnN0
+        dXZ3eHl6In0qhm0SAAAArAAAAFcl+mmpCzpldmVudC10eXBlBwARY29udGVudEJsb2NrRGVsdGEN
+        OmNvbnRlbnQtdHlwZQcAEGFwcGxpY2F0aW9uL2pzb24NOm1lc3NhZ2UtdHlwZQcABWV2ZW50eyJj
+        b250ZW50QmxvY2tJbmRleCI6MCwiZGVsdGEiOnsidGV4dCI6IiBmb3IifSwicCI6ImFiY2RlZmdo
+        aWprbG1ubyJ99ysW0AAAAMkAAABXdCiRlAs6ZXZlbnQtdHlwZQcAEWNvbnRlbnRCbG9ja0RlbHRh
+        DTpjb250ZW50LXR5cGUHABBhcHBsaWNhdGlvbi9qc29uDTptZXNzYWdlLXR5cGUHAAVldmVudHsi
+        Y29udGVudEJsb2NrSW5kZXgiOjAsImRlbHRhIjp7InRleHQiOiIgQmFyY2Vsb25hIn0sInAiOiJh
+        YmNkZWZnaGlqa2xtbm9wcXJzdHV2d3h5ekFCQ0RFRkdISUpLTCJ9dQFosgAAAMEAAABXRFjaVQs6
+        ZXZlbnQtdHlwZQcAEWNvbnRlbnRCbG9ja0RlbHRhDTpjb250ZW50LXR5cGUHABBhcHBsaWNhdGlv
+        bi9qc29uDTptZXNzYWdlLXR5cGUHAAVldmVudHsiY29udGVudEJsb2NrSW5kZXgiOjAsImRlbHRh
+        Ijp7InRleHQiOiIgdXNpbmcifSwicCI6ImFiY2RlZmdoaWprbG1ub3BxcnN0dXZ3eHl6QUJDREVG
+        R0gifQn6Cj4AAACiAAAAV5rK18gLOmV2ZW50LXR5cGUHABFjb250ZW50QmxvY2tEZWx0YQ06Y29u
+        dGVudC10eXBlBwAQYXBwbGljYXRpb24vanNvbg06bWVzc2FnZS10eXBlBwAFZXZlbnR7ImNvbnRl
+        bnRCbG9ja0luZGV4IjowLCJkZWx0YSI6eyJ0ZXh0IjoiIHRoZSJ9LCJwIjoiYWJjZGUifR59TKYA
+        AACwAAAAV4DqEyoLOmV2ZW50LXR5cGUHABFjb250ZW50QmxvY2tEZWx0YQ06Y29udGVudC10eXBl
+        BwAQYXBwbGljYXRpb24vanNvbg06bWVzc2FnZS10eXBlBwAFZXZlbnR7ImNvbnRlbnRCbG9ja0lu
+        ZGV4IjowLCJkZWx0YSI6eyJ0ZXh0IjoiIGF2YWlsYWJsZSJ9LCJwIjoiYWJjZGVmZ2hpamtsbSJ9
+        R3HVnwAAAL0AAABXeHrXmws6ZXZlbnQtdHlwZQcAEWNvbnRlbnRCbG9ja0RlbHRhDTpjb250ZW50
+        LXR5cGUHABBhcHBsaWNhdGlvbi9qc29uDTptZXNzYWdlLXR5cGUHAAVldmVudHsiY29udGVudEJs
+        b2NrSW5kZXgiOjAsImRlbHRhIjp7InRleHQiOiIgdG9vbCJ9LCJwIjoiYWJjZGVmZ2hpamtsbW5v
+        cHFyc3R1dnd4eXpBQkNERSJ9DXybgAAAALIAAABX+ipASgs6ZXZlbnQtdHlwZQcAEWNvbnRlbnRC
+        bG9ja0RlbHRhDTpjb250ZW50LXR5cGUHABBhcHBsaWNhdGlvbi9qc29uDTptZXNzYWdlLXR5cGUH
+        AAVldmVudHsiY29udGVudEJsb2NrSW5kZXgiOjAsImRlbHRhIjp7InRleHQiOiI6In0sInAiOiJh
+        YmNkZWZnaGlqa2xtbm9wcXJzdHV2d3gifU8L/HgAAACcAAAAVvPc4bkLOmV2ZW50LXR5cGUHABBj
+        b250ZW50QmxvY2tTdG9wDTpjb250ZW50LXR5cGUHABBhcHBsaWNhdGlvbi9qc29uDTptZXNzYWdl
+        LXR5cGUHAAVldmVudHsiY29udGVudEJsb2NrSW5kZXgiOjAsInAiOiJhYmNkZWZnaGlqa2xtbm9w
+        cXJzdHV2d3gifWORzUUAAAEPAAAAV9khX0oLOmV2ZW50LXR5cGUHABFjb250ZW50QmxvY2tTdGFy
+        dA06Y29udGVudC10eXBlBwAQYXBwbGljYXRpb24vanNvbg06bWVzc2FnZS10eXBlBwAFZXZlbnR7
+        ImNvbnRlbnRCbG9ja0luZGV4IjoxLCJwIjoiYWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXpBQkNE
+        RUZHSElKS0xNTk9QUVJTVFVWV1giLCJzdGFydCI6eyJ0b29sVXNlIjp7Im5hbWUiOiJnZXRfd2Vh
+        dGhlciIsInRvb2xVc2VJZCI6InRvb2x1c2VfeXlwWURyNzFUd0N3QnlveWFvNC1WZyJ9fX2H4Ebd
+        AAAAxgAAAFf2eAZFCzpldmVudC10eXBlBwARY29udGVudEJsb2NrRGVsdGENOmNvbnRlbnQtdHlw
+        ZQcAEGFwcGxpY2F0aW9uL2pzb24NOm1lc3NhZ2UtdHlwZQcABWV2ZW50eyJjb250ZW50QmxvY2tJ
+        bmRleCI6MSwiZGVsdGEiOnsidG9vbFVzZSI6eyJpbnB1dCI6IiJ9fSwicCI6ImFiY2RlZmdoaWpr
+        bG1ub3BxcnN0dXZ3eHl6QUJDREVGIn14/2YJAAAAxQAAAFex2HyVCzpldmVudC10eXBlBwARY29u
+        dGVudEJsb2NrRGVsdGENOmNvbnRlbnQtdHlwZQcAEGFwcGxpY2F0aW9uL2pzb24NOm1lc3NhZ2Ut
+        dHlwZQcABWV2ZW50eyJjb250ZW50QmxvY2tJbmRleCI6MSwiZGVsdGEiOnsidG9vbFVzZSI6eyJp
+        bnB1dCI6IntcImxvY2F0aSJ9fSwicCI6ImFiY2RlZmdoaWprbG1ub3BxcnN0dXYifWRGfuMAAAC/
+        AAAAVwK6hPsLOmV2ZW50LXR5cGUHABFjb250ZW50QmxvY2tEZWx0YQ06Y29udGVudC10eXBlBwAQ
+        YXBwbGljYXRpb24vanNvbg06bWVzc2FnZS10eXBlBwAFZXZlbnR7ImNvbnRlbnRCbG9ja0luZGV4
+        IjoxLCJkZWx0YSI6eyJ0b29sVXNlIjp7ImlucHV0Ijoib25cIjogXCJCYXIifX0sInAiOiJhYmNk
+        ZWZnaGlqa2xtbiJ9EYMO9gAAAMcAAABXyxgv9Qs6ZXZlbnQtdHlwZQcAEWNvbnRlbnRCbG9ja0Rl
+        bHRhDTpjb250ZW50LXR5cGUHABBhcHBsaWNhdGlvbi9qc29uDTptZXNzYWdlLXR5cGUHAAVldmVu
+        dHsiY29udGVudEJsb2NrSW5kZXgiOjEsImRlbHRhIjp7InRvb2xVc2UiOnsiaW5wdXQiOiJjZSJ9
+        fSwicCI6ImFiY2RlZmdoaWprbG1ub3BxcnN0dXZ3eHl6QUJDREUifSZWjxQAAADFAAAAV7HYfJUL
+        OmV2ZW50LXR5cGUHABFjb250ZW50QmxvY2tEZWx0YQ06Y29udGVudC10eXBlBwAQYXBwbGljYXRp
+        b24vanNvbg06bWVzc2FnZS10eXBlBwAFZXZlbnR7ImNvbnRlbnRCbG9ja0luZGV4IjoxLCJkZWx0
+        YSI6eyJ0b29sVXNlIjp7ImlucHV0IjoibG9uYVwifSJ9fSwicCI6ImFiY2RlZmdoaWprbG1ub3Bx
+        cnN0dXZ3eCJ9ZJRmigAAALEAAABWyo0KDAs6ZXZlbnQtdHlwZQcAEGNvbnRlbnRCbG9ja1N0b3AN
+        OmNvbnRlbnQtdHlwZQcAEGFwcGxpY2F0aW9uL2pzb24NOm1lc3NhZ2UtdHlwZQcABWV2ZW50eyJj
+        b250ZW50QmxvY2tJbmRleCI6MSwicCI6ImFiY2RlZmdoaWprbG1ub3BxcnN0dXZ3eHl6QUJDREVG
+        R0hJSktMTU5PUFFSUyJ9QmndSQAAAK4AAABRtlmf/As6ZXZlbnQtdHlwZQcAC21lc3NhZ2VTdG9w
+        DTpjb250ZW50LXR5cGUHABBhcHBsaWNhdGlvbi9qc29uDTptZXNzYWdlLXR5cGUHAAVldmVudHsi
+        cCI6ImFiY2RlZmdoaWprbG1ub3BxcnN0dXZ3eHl6QUJDREVGR0hJSktMTU5PUFFSUyIsInN0b3BS
+        ZWFzb24iOiJ0b29sX3VzZSJ9MTlQawAAAQoAAABOdap4+gs6ZXZlbnQtdHlwZQcACG1ldGFkYXRh
+        DTpjb250ZW50LXR5cGUHABBhcHBsaWNhdGlvbi9qc29uDTptZXNzYWdlLXR5cGUHAAVldmVudHsi
+        bWV0cmljcyI6eyJsYXRlbmN5TXMiOjExNzZ9LCJwIjoiYWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4
+        eXpBQkNERUZHSElKS0xNTk9QUVJTVFVWV1giLCJ1c2FnZSI6eyJpbnB1dFRva2VucyI6MjM2LCJv
+        dXRwdXRUb2tlbnMiOjU4LCJzZXJ2ZXJUb29sVXNhZ2UiOnt9LCJ0b3RhbFRva2VucyI6Mjk0fX31
+        KYdd
+    headers:
+      Connection:
+      - keep-alive
+      Content-Type:
+      - application/vnd.amazon.eventstream
+      Date:
+      - Thu, 09 Oct 2025 15:37:29 GMT
+      Transfer-Encoding:
+      - chunked
+      x-amzn-RequestId:
+      - c1136034-9602-49a2-8b55-4034878dda8a
+    status:
+      code: 200
+      message: OK
+version: 1

packages/opentelemetry-instrumentation-bedrock/tests/traces/test_anthropic.py

@@ -977,6 +977,92 @@ def prompt_caching_call(brt):
     assert spans[1].attributes.get(CacheSpanAttrs.CACHED) == "read"
 
 
+@pytest.mark.vcr
+def test_anthropic_converse_stream_with_tool_use(
+    instrument_legacy, brt, span_exporter, log_exporter
+):
+    """Test converse_stream with tool use to validate handling of non-text contentBlockDelta events."""
+    messages = [
+        {
+            "role": "user",
+            "content": [{"text": "What is the weather in Barcelona?"}],
+        }
+    ]
+
+    tools = [
+        {
+            "toolSpec": {
+                "name": "get_weather",
+                "description": "Get the current weather for a location",
+                "inputSchema": {
+                    "json": {
+                        "type": "object",
+                        "properties": {
+                            "location": {
+                                "type": "string",
+                                "description": "The city name",
+                            }
+                        },
+                        "required": ["location"],
+                    }
+                },
+            }
+        }
+    ]
+
+    tool_config = {"tools": tools}
+    inf_params = {"maxTokens": 300, "temperature": 0.5}
+
+    response = brt.converse_stream(
+        modelId="anthropic.claude-3-sonnet-20240229-v1:0",
+        messages=messages,
+        toolConfig=tool_config,
+        inferenceConfig=inf_params,
+    )
+
+    stream = response.get("stream")
+    content = ""
+    tool_use_found = False
+
+    for event in stream:
+        # Test should handle contentBlockDelta events without text field
+        if "contentBlockDelta" in event:
+            delta = event["contentBlockDelta"].get("delta", {})
+            # Only append if text exists (validates the fix)
+            if "text" in delta:
+                content += delta["text"]
+            # Check if we got a toolUse delta
+            if "toolUse" in delta:
+                tool_use_found = True
+
+    spans = span_exporter.get_finished_spans()
+    assert len(spans) == 1
+    assert spans[0].name == "bedrock.converse"
+
+    bedrock_span = spans[0]
+
+    # Assert on model name
+    assert (
+        bedrock_span.attributes.get("gen_ai.request.model")
+        == "claude-3-sonnet-20240229-v1:0"
+    )
+
+    # Assert on vendor
+    assert bedrock_span.attributes.get("gen_ai.system") == "AWS"
+
+    # Assert on request type
+    assert bedrock_span.attributes.get("llm.request.type") == "chat"
+
+    # tool use should have been triggered
+    # (This test validates that non-text deltas don't crash the instrumentation)
+    assert tool_use_found is True
+
+    logs = log_exporter.get_finished_logs()
+    assert (
+        len(logs) == 0
+    ), "Assert that it doesn't emit logs when use_legacy_attributes is True"
+
+
 def assert_message_in_logs(log: LogData, event_name: str, expected_content: dict):
     assert log.log_record.attributes.get(EventAttributes.EVENT_NAME) == event_name
     assert (