more lint

Author: lmolkova

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

@@ -52,14 +52,19 @@ def __init__(
         metric_attributes: dict[str, Any] | None = None,
     ) -> None:
         """Use handler.start_embedding(provider) or handler.embedding(provider) instead of calling this directly."""
+        _operation_name = GenAI.GenAiOperationNameValues.EMBEDDINGS.value
         super().__init__(
             tracer,
             metrics_recorder,
             logger,
+            operation_name=_operation_name,
+            span_name=f"{_operation_name} {request_model}"
+            if request_model
+            else _operation_name,
+            span_kind=SpanKind.CLIENT,
             attributes=attributes,
             metric_attributes=metric_attributes,
         )
-        self._operation_name = GenAI.GenAiOperationNameValues.EMBEDDINGS.value
         self.provider = provider  # e.g., azure.ai.openai, openai, aws.bedrock
         self.request_model = request_model
         self.server_address = server_address
@@ -70,12 +75,6 @@ def __init__(
         self.input_tokens = input_tokens
         self.dimension_count = dimension_count
         self.response_model_name = response_model_name
-        self._span_name = (
-            f"{self._operation_name} {request_model}"
-            if request_model
-            else self._operation_name
-        )
-        self._span_kind = SpanKind.CLIENT
         self._start()
 
     def _get_metric_attributes(self) -> dict[str, Any]:

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

@@ -83,14 +83,19 @@ def __init__(  # pylint: disable=too-many-locals
         metric_attributes: dict[str, Any] | None = None,
     ) -> None:
         """Use handler.start_inference(provider) or handler.inference(provider) instead of calling this directly."""
+        _operation_name = GenAI.GenAiOperationNameValues.CHAT.value
         super().__init__(
             tracer,
             metrics_recorder,
             logger,
+            operation_name=_operation_name,
+            span_name=f"{_operation_name} {request_model}"
+            if request_model
+            else _operation_name,
+            span_kind=SpanKind.CLIENT,
             attributes=attributes,
             metric_attributes=metric_attributes,
         )
-        self._operation_name = GenAI.GenAiOperationNameValues.CHAT.value
         self.provider = provider
         self.request_model = request_model
         self.input_messages: list[InputMessage] = (
@@ -116,12 +121,6 @@ def __init__(  # pylint: disable=too-many-locals
         self.seed = seed
         self.server_address = server_address
         self.server_port = server_port
-        self._span_name = (
-            f"{self._operation_name} {request_model}"
-            if request_model
-            else self._operation_name
-        )
-        self._span_kind = SpanKind.CLIENT
         self._start()
 
     def _get_message_attributes(self, *, for_span: bool) -> dict[str, Any]:
@@ -237,7 +236,7 @@ def _apply_finish(self, error: Error | None = None) -> None:
         attributes.update(self._get_message_attributes(for_span=True))
         attributes.update(self.attributes)
         self.span.set_attributes(attributes)
-        self._metrics_recorder.record(self)
+        self._metrics_recorder.record(self)  # pyright: ignore[reportOptionalMemberAccess]
         self._emit_event()
 
     def _emit_event(self) -> None:
@@ -252,7 +251,7 @@ def _emit_event(self) -> None:
         attributes = self._get_attributes()
         attributes.update(self._get_message_attributes(for_span=False))
         attributes.update(self.attributes)
-        self._logger.emit(
+        self._logger.emit(  # pyright: ignore[reportOptionalMemberAccess]
             LogRecord(
                 event_name="gen_ai.client.inference.operation.details",
                 attributes=attributes,
@@ -296,8 +295,8 @@ def __init__(  # pylint: disable=too-many-locals
         if tracer is not None:
             super().__init__(
                 tracer,
-                metrics_recorder,
-                logger,
+                metrics_recorder,  # pyright: ignore[reportArgumentType]
+                logger,  # pyright: ignore[reportArgumentType]
                 provider,
                 request_model=request_model,
                 input_messages=input_messages,
@@ -324,7 +323,7 @@ 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]  # pyright: ignore[reportUnnecessaryTypeIgnoreComment]
+        self._tracer = None
         self._metrics_recorder = None
         self._logger = None
         self.attributes = {} if attributes is None else attributes

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

@@ -63,21 +63,22 @@ def __init__(
         metric_attributes: dict[str, Any] | None = None,
     ) -> None:
         """Use handler.start_tool(name) or handler.tool(name) instead of calling this directly."""
+        _operation_name = GenAI.GenAiOperationNameValues.EXECUTE_TOOL.value
         super().__init__(
             tracer,
             metrics_recorder,
             logger,
+            operation_name=_operation_name,
+            span_name=f"{_operation_name} {name}" if name else _operation_name,
             attributes=attributes,
             metric_attributes=metric_attributes,
         )
-        self._operation_name = "execute_tool"
         self.name = name
         self.arguments = arguments
         self.tool_call_id = tool_call_id
         self.tool_type = tool_type
         self.tool_description = tool_description
         self.tool_result = tool_result
-        self._span_name = f"execute_tool {name}" if name else "execute_tool"
         self._start()
 
     def _apply_finish(self, error: Error | None = None) -> None:

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

@@ -271,13 +271,16 @@ def __init__(
         metrics_recorder: InvocationMetricsRecorder | None = None,
         logger: Logger | None = None,
         *,
+        operation_name: str,
+        span_name: str,
+        span_kind: SpanKind = SpanKind.CLIENT,
         attributes: dict[str, Any] | None = None,
         metric_attributes: dict[str, Any] | None = None,
     ) -> None:
         self._tracer = tracer
         self._metrics_recorder = metrics_recorder
         self._logger = logger
-        self._operation_name: str = ""
+        self._operation_name: str = operation_name
         self.attributes: dict[str, Any] = (
             {} if attributes is None else attributes
         )
@@ -288,8 +291,8 @@ def __init__(
         """Additional attributes to set on metrics. Must be low cardinality. Not set on spans or events."""
         self.span: Span = _INVALID_SPAN
         self._span_context: Context
-        self._span_name: str = ""
-        self._span_kind: SpanKind = SpanKind.CLIENT
+        self._span_name: str = span_name
+        self._span_kind: SpanKind = span_kind
         self._context_token: ContextToken | None = None
         self._monotonic_start_s: float | None = None
 

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

@@ -12,8 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from __future__ import annotations
-
 import json
 import logging
 import os

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

@@ -60,25 +60,24 @@ def __init__(
         metric_attributes: dict[str, Any] | None = None,
     ) -> None:
         """Use handler.start_workflow(name) or handler.workflow(name) instead of calling this directly."""
+        _operation_name = "invoke_workflow"
         super().__init__(
             tracer,
             metrics_recorder,
             logger,
+            operation_name=_operation_name,
+            span_name=f"{_operation_name} {name}" if name else _operation_name,
+            span_kind=SpanKind.INTERNAL,
             attributes=attributes,
             metric_attributes=metric_attributes,
         )
-        self._operation_name = "invoke_workflow"
         self.name = name
         self.input_messages: list[InputMessage] = (
             [] if input_messages is None else input_messages
         )
         self.output_messages: list[OutputMessage] = (
             [] if output_messages is None else output_messages
         )
-        self._span_name = (
-            f"invoke_workflow {name}" if name else "invoke_workflow"
-        )
-        self._span_kind = SpanKind.INTERNAL
         self._start()
 
     def _get_messages_for_span(self) -> dict[str, Any]:

util/opentelemetry-util-genai/tests/test_handler_metrics.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-# pylint: disable=too-many-function-args,unexpected-keyword-arg
 from typing import Any, Dict, List
 from unittest.mock import patch
 

util/opentelemetry-util-genai/tests/test_toolcall.py

@@ -73,7 +73,7 @@ def test_toolcall_operation_name():
     """ToolInvocation operation_name is fixed to execute_tool"""
     handler = _make_handler()
     tc = handler.start_tool("my_tool")
-    assert tc.operation_name == "execute_tool"
+    assert tc._operation_name == "execute_tool"
     tc.stop()