Merge branch 'main' into redis-semconv-opt-in

Author: tammy-baylis-swi

.github/workflows/test.yml

@@ -252,6 +252,25 @@ jobs:
       - name: Run tests
         run: tox -e py314-test-instrumentation-openai-v2-latest -- -ra
 
+  py313-test-instrumentation-openai-v2-pydantic1_ubuntu-latest:
+    name: instrumentation-openai-v2-pydantic1 3.13 Ubuntu
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+      - name: Checkout repo @ SHA - ${{ github.sha }}
+        uses: actions/checkout@v4
+
+      - name: Set up Python 3.13
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.13"
+
+      - name: Install tox
+        run: pip install tox-uv
+
+      - name: Run tests
+        run: tox -e py313-test-instrumentation-openai-v2-pydantic1 -- -ra
+
   pypy3-test-instrumentation-openai-v2-oldest_ubuntu-latest:
     name: instrumentation-openai-v2-oldest pypy-3.9 Ubuntu
     runs-on: ubuntu-latest

instrumentation-genai/opentelemetry-instrumentation-anthropic/CHANGELOG.md

@@ -9,6 +9,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+- Add async Anthropic message stream wrappers and manager wrappers, with wrapper
+  tests ([#4346](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4346))
+  - `AsyncMessagesStreamWrapper` for async message stream telemetry
+  - `AsyncMessagesStreamManagerWrapper` for async `Messages.stream()` telemetry
 - Add sync streaming support for `Messages.create(stream=True)` and `Messages.stream()`
   ([#4155](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4155))
   - `StreamWrapper` for handling `Messages.create(stream=True)` telemetry
@@ -22,4 +26,3 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - Captures response attributes: `gen_ai.response.id`, `gen_ai.response.model`, `gen_ai.response.finish_reasons`, `gen_ai.usage.input_tokens`, `gen_ai.usage.output_tokens`
   - Error handling with `error.type` attribute
   - Minimum supported anthropic version is 0.16.0 (SDK uses modern `anthropic.resources.messages` module structure introduced in this version)
-

instrumentation-genai/opentelemetry-instrumentation-anthropic/src/opentelemetry/instrumentation/anthropic/messages_extractors.py

@@ -29,6 +29,7 @@
 )
 from opentelemetry.util.genai.types import (
     InputMessage,
+    LLMInvocation,
     MessagePart,
     OutputMessage,
 )
@@ -153,6 +154,37 @@ def get_output_messages_from_message(
     ]
 
 
+def set_invocation_response_attributes(
+    invocation: LLMInvocation,
+    message: Message | None,
+    capture_content: bool,
+) -> None:
+    if message is None:
+        return
+
+    invocation.response_model_name = message.model
+    invocation.response_id = message.id
+
+    finish_reason = normalize_finish_reason(message.stop_reason)
+    if finish_reason:
+        invocation.finish_reasons = [finish_reason]
+
+    tokens = extract_usage_tokens(message.usage)
+    invocation.input_tokens = tokens.input_tokens
+    invocation.output_tokens = tokens.output_tokens
+    if tokens.cache_creation_input_tokens is not None:
+        invocation.attributes[GEN_AI_USAGE_CACHE_CREATION_INPUT_TOKENS] = (
+            tokens.cache_creation_input_tokens
+        )
+    if tokens.cache_read_input_tokens is not None:
+        invocation.attributes[GEN_AI_USAGE_CACHE_READ_INPUT_TOKENS] = (
+            tokens.cache_read_input_tokens
+        )
+
+    if capture_content:
+        invocation.output_messages = get_output_messages_from_message(message)
+
+
 def extract_params(  # pylint: disable=too-many-locals
     *,
     max_tokens: int | None = None,

instrumentation-genai/opentelemetry-instrumentation-anthropic/src/opentelemetry/instrumentation/anthropic/patch.py

@@ -14,6 +14,8 @@
 
 """Patching functions for Anthropic instrumentation."""
 
+from __future__ import annotations
+
 import logging
 from typing import TYPE_CHECKING, Any, Callable, Union, cast
 
@@ -56,7 +58,7 @@ def messages_create(
     Union[
         "AnthropicMessage",
         "AnthropicStream[RawMessageStreamEvent]",
-        MessagesStreamWrapper,
+        MessagesStreamWrapper[None],
     ],
 ]:
     """Wrap the `create` method of the `Messages` class to trace it."""
@@ -76,7 +78,7 @@ def traced_method(
     ) -> Union[
         "AnthropicMessage",
         "AnthropicStream[RawMessageStreamEvent]",
-        MessagesStreamWrapper,
+        MessagesStreamWrapper[None],
     ]:
         params = extract_params(*args, **kwargs)
         attributes = get_llm_request_attributes(params, instance)
@@ -121,13 +123,6 @@ def traced_method(
             raise
 
     return cast(
-        Callable[
-            ...,
-            Union[
-                "AnthropicMessage",
-                "AnthropicStream[RawMessageStreamEvent]",
-                MessagesStreamWrapper,
-            ],
-        ],
+        'Callable[..., Union["AnthropicMessage", "AnthropicStream[RawMessageStreamEvent]", MessagesStreamWrapper[None]]]',
         traced_method,
     )