replace @deprecated with docstring info to avoid warnings for users

Author: lmolkova

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

@@ -29,7 +29,7 @@
 )
 from opentelemetry.util.genai.types import (
     InputMessage,
-    LLMInvocation,  # pyright: ignore[reportDeprecated]
+    LLMInvocation,
     MessagePart,
     OutputMessage,
 )
@@ -155,7 +155,7 @@ def get_output_messages_from_message(
 
 
 def set_invocation_response_attributes(
-    invocation: LLMInvocation,  # pyright: ignore[reportDeprecated]
+    invocation: LLMInvocation,
     message: Message | None,
     capture_content: bool,
 ) -> None:

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

@@ -28,7 +28,7 @@
 from opentelemetry.util.genai.handler import TelemetryHandler
 from opentelemetry.util.genai.types import (
     Error,
-    LLMInvocation,  # pyright: ignore[reportDeprecated]  # TODO: migrate to InferenceInvocation
+    LLMInvocation,  # TODO: migrate to InferenceInvocation
 )
 from opentelemetry.util.genai.utils import (
     should_capture_content_on_spans_in_experimental_mode,
@@ -94,7 +94,7 @@ def traced_method(
             else params.model
         )
 
-        invocation = LLMInvocation(  # pyright: ignore[reportDeprecated]
+        invocation = LLMInvocation(
             request_model=request_model,
             provider=ANTHROPIC,
             input_messages=get_input_messages(params.messages)
@@ -107,7 +107,7 @@ def traced_method(
         )
 
         # Use manual lifecycle management for both streaming and non-streaming
-        handler.start_llm(invocation)  # pyright: ignore[reportDeprecated]
+        handler.start_llm(invocation)
         try:
             result = wrapped(*args, **kwargs)
             if isinstance(result, AnthropicStream):
@@ -117,10 +117,10 @@ def traced_method(
 
             wrapper = MessageWrapper(result, capture_content)
             wrapper.extract_into(invocation)
-            handler.stop_llm(invocation)  # pyright: ignore[reportDeprecated]
+            handler.stop_llm(invocation)
             return wrapper.message
         except Exception as exc:
-            handler.fail_llm(  # pyright: ignore[reportDeprecated]
+            handler.fail_llm(
                 invocation, Error(message=str(exc), type=type(exc))
             )
             raise

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

@@ -31,7 +31,7 @@
 from opentelemetry.util.genai.handler import TelemetryHandler
 from opentelemetry.util.genai.types import (
     Error,
-    LLMInvocation,  # pyright: ignore[reportDeprecated]  # TODO: migrate to InferenceInvocation
+    LLMInvocation,  # TODO: migrate to InferenceInvocation
 )
 
 from .messages_extractors import set_invocation_response_attributes
@@ -68,7 +68,7 @@
 
 
 def _set_response_attributes(
-    invocation: LLMInvocation,  # pyright: ignore[reportDeprecated]
+    invocation: LLMInvocation,
     result: "Message | None",
     capture_content: bool,
 ) -> None:
@@ -112,7 +112,7 @@ def __init__(self, message: Message, capture_content: bool):
         self._message = message
         self._capture_content = capture_content
 
-    def extract_into(self, invocation: LLMInvocation) -> None:  # pyright: ignore[reportDeprecated]
+    def extract_into(self, invocation: LLMInvocation) -> None:
         """Extract response data into the invocation."""
         set_invocation_response_attributes(
             invocation, self._message, self._capture_content
@@ -136,7 +136,7 @@ def __init__(
         self,
         stream: "Stream[RawMessageStreamEvent] | MessageStream[ResponseFormatT]",
         handler: TelemetryHandler,
-        invocation: LLMInvocation,  # pyright: ignore[reportDeprecated]
+        invocation: LLMInvocation,
         capture_content: bool,
     ):
         self.stream = stream
@@ -203,14 +203,14 @@ def _stop(self) -> None:
                 self.invocation, self._message, self._capture_content
             )
         with self._safe_instrumentation("stop_llm"):
-            self.handler.stop_llm(self.invocation)  # pyright: ignore[reportDeprecated]
+            self.handler.stop_llm(self.invocation)
         self._finalized = True
 
     def _fail(self, message: str, error_type: type[BaseException]) -> None:
         if self._finalized:
             return
         with self._safe_instrumentation("fail_llm"):
-            self.handler.fail_llm(  # pyright: ignore[reportDeprecated]
+            self.handler.fail_llm(
                 self.invocation, Error(message=message, type=error_type)
             )
         self._finalized = True
@@ -258,7 +258,7 @@ def __init__(
         self,
         stream: "AsyncStream[RawMessageStreamEvent] | AsyncMessageStream[ResponseFormatT]",
         handler: TelemetryHandler,
-        invocation: LLMInvocation,  # pyright: ignore[reportDeprecated]
+        invocation: LLMInvocation,
         capture_content: bool,
     ):
         self.stream = stream
@@ -324,7 +324,7 @@ def __init__(
         self,
         manager: "MessageStreamManager[ResponseFormatT]",
         handler: TelemetryHandler,
-        invocation: LLMInvocation,  # pyright: ignore[reportDeprecated]
+        invocation: LLMInvocation,
         capture_content: bool,
     ):
         self._manager = manager
@@ -382,7 +382,7 @@ def __init__(
         self,
         manager: "AsyncMessageStreamManager[ResponseFormatT]",
         handler: TelemetryHandler,
-        invocation: LLMInvocation,  # pyright: ignore[reportDeprecated]
+        invocation: LLMInvocation,
         capture_content: bool,
     ):
         self._manager = manager

instrumentation-genai/opentelemetry-instrumentation-langchain/src/opentelemetry/instrumentation/langchain/callback_handler.py

@@ -28,7 +28,7 @@
 from opentelemetry.util.genai.types import (
     Error,
     InputMessage,
-    LLMInvocation,  # pyright: ignore[reportDeprecated]  # TODO: migrate to InferenceInvocation
+    LLMInvocation,  # TODO: migrate to InferenceInvocation
     MessagePart,
     OutputMessage,
     Text,
@@ -140,7 +140,7 @@ def on_chat_model_start(
                     )
                 )
 
-        llm_invocation = LLMInvocation(  # pyright: ignore[reportDeprecated]
+        llm_invocation = LLMInvocation(
             request_model=request_model,
             input_messages=input_messages,
             provider=provider,
@@ -152,13 +152,13 @@ def on_chat_model_start(
             temperature=temperature,
             max_tokens=max_tokens,
         )
-        llm_invocation = self._telemetry_handler.start_llm(  # pyright: ignore[reportDeprecated]
+        llm_invocation = self._telemetry_handler.start_llm(
             invocation=llm_invocation
         )
         self._invocation_manager.add_invocation_state(
             run_id=run_id,
             parent_run_id=parent_run_id,
-            invocation=llm_invocation,  # pyright: ignore[reportArgumentType]
+            invocation=llm_invocation,
         )
 
     def on_llm_end(
@@ -172,7 +172,7 @@ def on_llm_end(
         llm_invocation = self._invocation_manager.get_invocation(run_id=run_id)
         if llm_invocation is None or not isinstance(
             llm_invocation,
-            LLMInvocation,  # pyright: ignore[reportDeprecated]
+            LLMInvocation,
         ):
             # If the invocation does not exist, we cannot set attributes or end it
             return
@@ -247,7 +247,7 @@ def on_llm_end(
             if response_id is not None:
                 llm_invocation.response_id = str(response_id)
 
-        llm_invocation = self._telemetry_handler.stop_llm(  # pyright: ignore[reportDeprecated]
+        llm_invocation = self._telemetry_handler.stop_llm(
             invocation=llm_invocation
         )
         if llm_invocation.span and not llm_invocation.span.is_recording():
@@ -264,13 +264,13 @@ def on_llm_error(
         llm_invocation = self._invocation_manager.get_invocation(run_id=run_id)
         if llm_invocation is None or not isinstance(
             llm_invocation,
-            LLMInvocation,  # pyright: ignore[reportDeprecated]
+            LLMInvocation,
         ):
             # If the invocation does not exist, we cannot set attributes or end it
             return
 
         error_otel = Error(message=str(error), type=type(error))
-        llm_invocation = self._telemetry_handler.fail_llm(  # pyright: ignore[reportDeprecated]
+        llm_invocation = self._telemetry_handler.fail_llm(
             invocation=llm_invocation, error=error_otel
         )
         if llm_invocation.span and not llm_invocation.span.is_recording():

util/opentelemetry-util-genai/src/opentelemetry/util/genai/_inference_invocation.py

@@ -17,8 +17,6 @@
 from dataclasses import asdict, dataclass, field
 from typing import Any
 
-from typing_extensions import deprecated
-
 from opentelemetry._logs import Logger, LogRecord
 from opentelemetry.semconv._incubating.attributes import (
     gen_ai_attributes as GenAI,
@@ -254,7 +252,6 @@ def _emit_event(self) -> None:
         )
 
 
-@deprecated("LLMInvocation is deprecated. Use InferenceInvocation instead.")
 @dataclass
 class LLMInvocation:
     """Deprecated. Use InferenceInvocation instead.

util/opentelemetry-util-genai/src/opentelemetry/util/genai/handler.py

@@ -51,8 +51,6 @@
 from contextlib import contextmanager
 from typing import Iterator
 
-from typing_extensions import deprecated
-
 from opentelemetry._logs import (
     LoggerProvider,
     get_logger,
@@ -132,9 +130,6 @@ def start_inference(
             server_port=server_port,
         )
 
-    @deprecated(
-        "handler.start_llm() is deprecated. Use handler.start_inference() instead."
-    )
     def start_llm(self, invocation: LLMInvocation) -> LLMInvocation:  # pyright: ignore[reportDeprecated]
         """Start an LLM invocation.
 
@@ -208,10 +203,7 @@ def start_workflow(
             self._tracer, self._metrics_recorder, self._logger, name
         )
 
-    @deprecated(
-        "handler.stop_llm() is deprecated. Use handler.start_inference()  and then ``inference.stop()`` instead."
-    )
-    def stop_llm(self, invocation: LLMInvocation) -> LLMInvocation:  # pylint: disable=no-self-use  # pyright: ignore[reportDeprecated]
+    def stop_llm(self, invocation: LLMInvocation) -> LLMInvocation:  # pylint: disable=no-self-use
         """Finalize an LLM invocation successfully and end its span.
 
         .. deprecated::
@@ -222,14 +214,11 @@ def stop_llm(self, invocation: LLMInvocation) -> LLMInvocation:  # pylint: disab
             invocation._inference_invocation.stop()
         return invocation
 
-    @deprecated(
-        "handler.fail_llm() is deprecated. Use handler.start_inference()  and then ``inference.fail()`` instead."
-    )
     def fail_llm(  # pylint: disable=no-self-use
         self,
-        invocation: LLMInvocation,  # pyright: ignore[reportDeprecated]
+        invocation: LLMInvocation,
         error: Error,
-    ) -> LLMInvocation:  # pyright: ignore[reportDeprecated]
+    ) -> LLMInvocation:
         """Fail an LLM invocation and end its span with error status.
 
         .. deprecated::

util/opentelemetry-util-genai/src/opentelemetry/util/genai/types.py

@@ -20,7 +20,7 @@
 
 if TYPE_CHECKING:
     from opentelemetry.util.genai._inference_invocation import (  # pylint: disable=useless-import-alias
-        LLMInvocation as LLMInvocation,  # noqa: PLC0414  # pyright: ignore[reportDeprecated]
+        LLMInvocation as LLMInvocation,  # noqa: PLC0414
     )
     from opentelemetry.util.genai._invocation import (  # pylint: disable=useless-import-alias
         GenAIInvocation as GenAIInvocation,  # noqa: PLC0414
@@ -248,8 +248,8 @@ def __getattr__(name: str) -> object:
         return _inv.GenAIInvocation
     if name == "LLMInvocation":
         from opentelemetry.util.genai._inference_invocation import (  # noqa: PLC0415  # pylint: disable=import-outside-toplevel
-            LLMInvocation,  # pyright: ignore[reportDeprecated]
+            LLMInvocation,
         )
 
-        return LLMInvocation  # pyright: ignore[reportDeprecated]
+        return (LLMInvocation,)
     raise AttributeError(f"module {__name__!r} has no attribute {name!r}")