polish: pr feedback.

Author: eternalcuriouslearner

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

@@ -27,9 +27,6 @@
 )
 from opentelemetry.util.genai.handler import TelemetryHandler
 from opentelemetry.util.genai.invocation import InferenceInvocation
-from opentelemetry.util.genai.utils import (
-    should_capture_content_on_spans_in_experimental_mode,
-)
 
 from .messages_extractors import (
     extract_params,
@@ -113,7 +110,10 @@ def _create_invocation(
     args: tuple[Any, ...],
     kwargs: dict[str, Any],
 ) -> tuple[InferenceInvocation, bool]:
-    capture_content = should_capture_content_on_spans_in_experimental_mode()
+    should_capture_content = cast(
+        "Callable[[], bool]", getattr(handler, "should_capture_content")
+    )
+    capture_content = should_capture_content()
     params = extract_params(*args, **kwargs)
     attributes = get_llm_request_attributes(params, instance)
     request_model_attribute = attributes.get(
@@ -145,7 +145,7 @@ def messages_stream(
     """Wrap the sync `stream` method of the `Messages` class."""
 
     def traced_method(
-        wrapped: Callable[..., "MessageStreamManager[Any]"],
+        wrapped: Callable[..., "MessageStreamManager"],
         instance: "Messages",
         args: tuple[Any, ...],
         kwargs: dict[str, Any],

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

@@ -19,7 +19,7 @@
 import base64
 import json
 from dataclasses import dataclass
-from typing import TYPE_CHECKING, Any
+from typing import TYPE_CHECKING, Any, cast
 
 from anthropic.types import (
     InputJSONDelta,
@@ -160,12 +160,9 @@ def _convert_content_block_to_part(
             id=block.tool_use_id,
         )
 
-    # ContentBlockParam variants are TypedDicts (dicts at runtime);
-    # newer SDK versions may add Pydantic block types not handled above.
-    if isinstance(block, dict):
-        return _convert_dict_block_to_part(block)
-
-    return None
+    if not hasattr(block, "get"):
+        return None
+    return _convert_dict_block_to_part(cast("Mapping[str, Any]", block))
 
 
 def convert_content_to_parts(

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

@@ -28,10 +28,6 @@
     cast,
 )
 
-from opentelemetry.util.genai.types import (
-    Error,
-)
-
 from .messages_extractors import set_invocation_response_attributes
 
 try:
@@ -58,6 +54,8 @@
     )
     from anthropic.types.parsed_message import ParsedMessage
 
+    from opentelemetry.util.genai.invocation import InferenceInvocation
+
 
 _logger = logging.getLogger(__name__)
 ResponseT = TypeVar("ResponseT")
@@ -66,7 +64,7 @@
 
 
 def _set_response_attributes(
-    invocation: Any,
+    invocation: "InferenceInvocation",
     result: "Message | None",
     capture_content: bool,
 ) -> None:
@@ -110,7 +108,7 @@ def __init__(self, message: Message, capture_content: bool):
         self._message = message
         self._capture_content = capture_content
 
-    def extract_into(self, invocation: Any) -> None:
+    def extract_into(self, invocation: "InferenceInvocation") -> None:
         """Extract response data into the invocation."""
         set_invocation_response_attributes(
             invocation, self._message, self._capture_content
@@ -133,7 +131,7 @@ class MessagesStreamWrapper(
     def __init__(
         self,
         stream: "Stream[RawMessageStreamEvent] | MessageStream[ResponseFormatT]",
-        invocation: Any,
+        invocation: "InferenceInvocation",
         capture_content: bool,
     ):
         self.stream = stream
@@ -153,9 +151,7 @@ def __exit__(
     ) -> bool:
         try:
             if exc_type is not None:
-                self._fail(
-                    str(exc_val), type(exc_val) if exc_val else Exception
-                )
+                self._fail(exc_val or Exception())
         finally:
             self.close()
         return False
@@ -178,7 +174,7 @@ def __next__(
             self._stop()
             raise
         except Exception as exc:
-            self._fail(str(exc), type(exc))
+            self._fail(exc)
             raise
         with self._safe_instrumentation("stream chunk processing"):
             self._process_chunk(chunk)
@@ -202,11 +198,11 @@ def _stop(self) -> None:
             self.invocation.stop()
         self._finalized = True
 
-    def _fail(self, message: str, error_type: type[BaseException]) -> None:
+    def _fail(self, exc: BaseException) -> None:
         if self._finalized:
             return
         with self._safe_instrumentation("invocation fail"):
-            self.invocation.fail(Error(message=message, type=error_type))
+            self.invocation.fail(exc)
         self._finalized = True
 
     @staticmethod
@@ -251,7 +247,7 @@ class AsyncMessagesStreamWrapper(MessagesStreamWrapper[ResponseFormatT]):
     def __init__(
         self,
         stream: "AsyncStream[RawMessageStreamEvent] | AsyncMessageStream[ResponseFormatT]",
-        invocation: Any,
+        invocation: "InferenceInvocation",
         capture_content: bool,
     ):
         self.stream = stream
@@ -273,9 +269,7 @@ async def __aexit__(
     ) -> bool:
         try:
             if exc_type is not None:
-                self._fail(
-                    str(exc_val), type(exc_val) if exc_val else Exception
-                )
+                self._fail(exc_val or Exception())
         finally:
             await self.close()
         return False
@@ -302,7 +296,7 @@ async def __anext__(
             self._stop()
             raise
         except Exception as exc:
-            self._fail(str(exc), type(exc))
+            self._fail(exc)
             raise
         with self._safe_instrumentation("stream chunk processing"):
             self._process_chunk(chunk)
@@ -315,7 +309,7 @@ class MessagesStreamManagerWrapper(Generic[ResponseFormatT]):
     def __init__(
         self,
         manager: "MessageStreamManager[ResponseFormatT]",
-        invocation: Any,
+        invocation: "InferenceInvocation",
         capture_content: bool,
     ):
         self._manager = manager
@@ -374,7 +368,7 @@ class AsyncMessagesStreamManagerWrapper(Generic[ResponseFormatT]):
     def __init__(
         self,
         manager: "AsyncMessageStreamManager[ResponseFormatT]",
-        invocation: Any,
+        invocation: "InferenceInvocation",
         capture_content: bool,
     ):
         self._manager = manager

instrumentation-genai/opentelemetry-instrumentation-anthropic/tests/test_async_wrappers.py

@@ -192,17 +192,15 @@ def test_sync_stream_wrapper_exit_fails_and_closes_on_exception():
     failures = []
 
     wrapper._stop = lambda: stopped.append(True)
-    wrapper._fail = lambda message, error_type: failures.append(
-        (message, error_type)
-    )
+    wrapper._fail = failures.append
 
     error = ValueError("boom")
     result = wrapper.__exit__(ValueError, error, None)
 
     assert result is False
     assert stream.close_calls == 1
     assert stopped == [True]
-    assert failures == [("boom", ValueError)]
+    assert failures == [error]
 
 
 def test_sync_stream_wrapper_processes_events_and_stops_on_completion():
@@ -232,14 +230,12 @@ def test_sync_stream_wrapper_fails_and_reraises_stream_errors():
     wrapper = _make_stream_wrapper(stream)
     failures = []
 
-    wrapper._fail = lambda message, error_type: failures.append(
-        (message, error_type)
-    )
+    wrapper._fail = failures.append
 
     with pytest.raises(ValueError, match="boom"):
         next(wrapper)
 
-    assert failures == [("boom", ValueError)]
+    assert failures == [error]
 
 
 def test_sync_stream_wrapper_getattr_passthrough():
@@ -376,17 +372,15 @@ async def test_async_stream_wrapper_exit_fails_and_closes_on_exception():
     failures = []
 
     wrapper._stop = lambda: stopped.append(True)
-    wrapper._fail = lambda message, error_type: failures.append(
-        (message, error_type)
-    )
+    wrapper._fail = failures.append
 
     error = ValueError("boom")
     result = await wrapper.__aexit__(ValueError, error, None)
 
     assert result is False
     assert stream.close_calls == 1
     assert stopped == [True]
-    assert failures == [("boom", ValueError)]
+    assert failures == [error]
 
 
 @pytest.mark.asyncio
@@ -432,14 +426,12 @@ async def test_async_stream_wrapper_fails_and_reraises_stream_errors():
     wrapper = _make_async_stream_wrapper(stream)
     failures = []
 
-    wrapper._fail = lambda message, error_type: failures.append(
-        (message, error_type)
-    )
+    wrapper._fail = failures.append
 
     with pytest.raises(ValueError, match="boom"):
         await anext(wrapper)
 
-    assert failures == [("boom", ValueError)]
+    assert failures == [error]
 
 
 @pytest.mark.asyncio