more lint

Author: lmolkova

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

@@ -211,7 +211,7 @@ def start_workflow(
     @deprecated(
         "handler.stop_llm() is deprecated. Use invocation.stop() instead."
     )
-    def stop_llm(self, invocation: LLMInvocation) -> LLMInvocation:  # pyright: ignore[reportDeprecated]
+    def stop_llm(self, invocation: LLMInvocation) -> LLMInvocation:  # pylint: disable=no-self-use  # pyright: ignore[reportDeprecated]
         """Finalize an LLM invocation successfully and end its span.
 
         .. deprecated::
@@ -223,7 +223,7 @@ def stop_llm(self, invocation: LLMInvocation) -> LLMInvocation:  # pyright: igno
     @deprecated(
         "handler.fail_llm() is deprecated. Use invocation.fail(error) instead."
     )
-    def fail_llm(
+    def fail_llm(  # pylint: disable=no-self-use
         self,
         invocation: LLMInvocation,  # pyright: ignore[reportDeprecated]
         error: Error,

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

@@ -24,7 +24,12 @@
     gen_ai_attributes as GenAI,
 )
 from opentelemetry.semconv.attributes import server_attributes
-from opentelemetry.trace import INVALID_SPAN, SpanKind, Tracer
+from opentelemetry.trace import (
+    INVALID_SPAN,
+    SpanKind,
+    Tracer,
+    set_span_in_context,
+)
 from opentelemetry.util.genai.metrics import InvocationMetricsRecorder
 from opentelemetry.util.genai.types import (
     Error,
@@ -216,7 +221,7 @@ def _get_metric_attributes(self) -> dict[str, Any]:
         return attrs
 
     def _get_metric_token_counts(self) -> dict[str, int]:
-        counts = {}
+        counts: dict[str, int] = {}
         if self.input_tokens is not None:
             counts[GenAI.GenAiTokenTypeValues.INPUT.value] = self.input_tokens
         if self.output_tokens is not None:
@@ -319,14 +324,15 @@ def __init__(  # pylint: disable=too-many-locals
         # Old-style: data container, started later via handler.start_llm()
         # _tracer/_metrics_recorder/_logger are set by _start_with_handler() in that case
         self._operation_name = GenAI.GenAiOperationNameValues.CHAT.value
-        self._tracer = None  # type: ignore[assignment]
-        self._metrics_recorder = None  # type: ignore[assignment]
-        self._logger = None  # type: ignore[assignment]
+        self._tracer = None  # type: ignore[assignment]  # pyright: ignore[reportUnnecessaryTypeIgnoreComment]
+        self._metrics_recorder = None
+        self._logger = None
         self.attributes = {} if attributes is None else attributes
         self.metric_attributes = (
             {} if metric_attributes is None else metric_attributes
         )
         self.span = INVALID_SPAN
+        self._span_context = set_span_in_context(INVALID_SPAN)
         self._span_kind = SpanKind.CLIENT
         self._context_token = None
         self._monotonic_start_s = None
@@ -360,7 +366,7 @@ def __init__(  # pylint: disable=too-many-locals
         )
 
     @property
-    def invocation(self) -> "LLMInvocation | None":
+    def invocation(self) -> "LLMInvocation | None":  # pyright: ignore[reportDeprecated]
         """Returns self once started, None before handler.start_llm() is called."""
         return self if self._context_token is not None else None
 

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

@@ -19,6 +19,9 @@
 from typing_extensions import deprecated
 
 from opentelemetry._logs import Logger
+from opentelemetry.semconv._incubating.attributes import (
+    gen_ai_attributes as GenAI,
+)
 from opentelemetry.trace import Tracer
 from opentelemetry.util.genai.metrics import InvocationMetricsRecorder
 from opentelemetry.util.genai.types import Error, GenAIInvocation
@@ -80,6 +83,18 @@ def __init__(
     def _apply_finish(self, error: Error | None = None) -> None:
         if error is not None:
             self._apply_error_attributes(error)
+        optional_attrs = (
+            (GenAI.GEN_AI_TOOL_NAME, self.name),
+            (GenAI.GEN_AI_TOOL_CALL_ID, self.tool_call_id),
+            (GenAI.GEN_AI_TOOL_TYPE, self.tool_type),
+            (GenAI.GEN_AI_TOOL_DESCRIPTION, self.tool_description),
+        )
+        attributes: dict[str, Any] = {
+            GenAI.GEN_AI_OPERATION_NAME: self._operation_name,
+            **{k: v for k, v in optional_attrs if v is not None},
+        }
+        attributes.update(self.attributes)
+        self.span.set_attributes(attributes)
 
 
 @deprecated("ToolCall is deprecated. Use ToolInvocation instead.")

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

@@ -307,7 +307,7 @@ def _get_metric_attributes(self) -> dict[str, Any]:
         """Return low-cardinality attributes for metric recording."""
         return dict(self.metric_attributes)
 
-    def _get_metric_token_counts(self) -> dict[str, int]:
+    def _get_metric_token_counts(self) -> dict[str, int]:  # pylint: disable=no-self-use
         """Return {token_type: count} for token histogram recording."""
         return {}