apply _lifecycle_context and error handling

Author: etserend

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

@@ -32,7 +32,6 @@
 from opentelemetry.trace.propagation import set_span_in_context
 from opentelemetry.trace.status import Status, StatusCode
 from opentelemetry.util.genai.types import (
-    AgentCreation,
     AgentInvocation,
     EmbeddingInvocation,
     Error,
@@ -174,9 +173,7 @@ def _get_llm_messages_attributes_for_span(
         ),
         (
             GenAI.GEN_AI_TOOL_DEFINITIONS,
-            gen_ai_json_dumps(tool_definitions)
-            if tool_definitions
-            else None,
+            gen_ai_json_dumps(tool_definitions) if tool_definitions else None,
         ),
     )
 
@@ -524,24 +521,6 @@ def _apply_agent_finish_attributes(
         span.set_attributes(attributes)
 
 
-def _apply_creation_finish_attributes(
-    span: Span, creation: AgentCreation
-) -> None:
-    """Apply attributes common to agent creation finish() paths."""
-    span.update_name(_get_base_agent_span_name(creation))
-
-    attributes: dict[str, Any] = {}
-    attributes.update(_get_base_agent_common_attributes(creation))
-
-    attributes.update(
-        _get_system_instructions_for_span(creation.system_instruction)
-    )
-    attributes.update(creation.attributes)
-
-    if attributes:
-        span.set_attributes(attributes)
-
-
 __all__ = [
     "_apply_llm_finish_attributes",
     "_apply_error_attributes",
@@ -558,7 +537,6 @@ def _apply_creation_finish_attributes(
     "_get_base_agent_common_attributes",
     "_get_base_agent_span_name",
     "_apply_agent_finish_attributes",
-    "_apply_creation_finish_attributes",
     "_get_system_instructions_for_span",
     "_get_agent_common_attributes",
     "_get_agent_request_attributes",

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

@@ -314,23 +314,22 @@ class EmbeddingInvocation(GenAIInvocation):
 @dataclass
 class _BaseAgent(GenAIInvocation):
     """
-    Shared base class for agent lifecycle types (AgentInvocation, AgentCreation).
+    Shared base class for agent lifecycle types.
 
     Contains fields common to all agent operations: identity, provider,
     model, system instructions, server info, and telemetry plumbing.
 
     Follows semconv for GenAI agent spans:
     https://github.com/open-telemetry/semantic-conventions/blob/main/docs/gen-ai/gen-ai-agent-spans.md
 
-    Do not instantiate directly — use AgentInvocation or AgentCreation.
+    Do not instantiate directly — use AgentInvocation.
     """
 
     agent_name: str | None = None
     agent_id: str | None = None
     agent_description: str | None = None
     agent_version: str | None = None
 
-    operation_name: str = ""
     provider: str | None = None
 
     request_model: str | None = None
@@ -351,21 +350,6 @@ class _BaseAgent(GenAIInvocation):
     monotonic_start_s: float | None = None
 
 
-@dataclass
-class AgentCreation(_BaseAgent):
-    """
-    Represents agent creation/initialization (create_agent operation).
-
-    Follows semconv for GenAI agent spans:
-    https://github.com/open-telemetry/semantic-conventions/blob/main/docs/gen-ai/gen-ai-agent-spans.md#create-agent-span
-
-    When creating an AgentCreation object, only update the data attributes.
-    The span and context_token attributes are set by the TelemetryHandler.
-    """
-
-    operation_name: str = "create_agent"
-
-
 @dataclass
 class AgentInvocation(_BaseAgent):
     """
@@ -378,7 +362,7 @@ class AgentInvocation(_BaseAgent):
     The span and context_token attributes are set by the TelemetryHandler.
     """
 
-    operation_name: str = "invoke_agent"
+    operation_name: str = GenAI.GenAiOperationNameValues.INVOKE_AGENT.value
     conversation_id: str | None = None
     data_source_id: str | None = None
     output_type: str | None = None
@@ -408,8 +392,6 @@ class AgentInvocation(_BaseAgent):
     )
     tool_definitions: list[dict[str, Any]] | None = None
 
-    is_remote: bool = True
-
     metric_attributes: dict[str, Any] = field(
         default_factory=_new_str_any_dict
     )

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

@@ -38,7 +38,6 @@ def _make_handler(self) -> TelemetryHandler:
 
 
 class TestAgentInvocationHandler(_AgentTestBase):
-
     def test_start_stop_creates_span(self) -> None:
         handler = self._make_handler()
         invocation = AgentInvocation(
@@ -59,31 +58,18 @@ def test_start_stop_creates_span(self) -> None:
         self.assertEqual(
             span.attributes[GenAI.GEN_AI_AGENT_NAME], "Math Tutor"
         )
-        self.assertEqual(
-            span.attributes[GenAI.GEN_AI_PROVIDER_NAME], "openai"
-        )
-        self.assertEqual(
-            span.attributes[GenAI.GEN_AI_REQUEST_MODEL], "gpt-4"
-        )
+        self.assertEqual(span.attributes[GenAI.GEN_AI_PROVIDER_NAME], "openai")
+        self.assertEqual(span.attributes[GenAI.GEN_AI_REQUEST_MODEL], "gpt-4")
 
     def test_span_kind_client_by_default(self) -> None:
         handler = self._make_handler()
-        invocation = AgentInvocation(agent_name="Agent", is_remote=True)
+        invocation = AgentInvocation(agent_name="Agent")
         handler.start_agent(invocation)
         handler.stop_agent(invocation)
         self.assertEqual(
             self.span_exporter.get_finished_spans()[0].kind, SpanKind.CLIENT
         )
 
-    def test_span_kind_internal_for_local(self) -> None:
-        handler = self._make_handler()
-        invocation = AgentInvocation(agent_name="Agent", is_remote=False)
-        handler.start_agent(invocation)
-        handler.stop_agent(invocation)
-        self.assertEqual(
-            self.span_exporter.get_finished_spans()[0].kind, SpanKind.INTERNAL
-        )
-
     def test_all_attributes(self) -> None:
         handler = self._make_handler()
         invocation = AgentInvocation(
@@ -114,9 +100,7 @@ def test_all_attributes(self) -> None:
         attrs = self.span_exporter.get_finished_spans()[0].attributes
         self.assertEqual(attrs[GenAI.GEN_AI_AGENT_NAME], "Full Agent")
         self.assertEqual(attrs[GenAI.GEN_AI_AGENT_ID], "agent-123")
-        self.assertEqual(
-            attrs[GenAI.GEN_AI_AGENT_DESCRIPTION], "A test agent"
-        )
+        self.assertEqual(attrs[GenAI.GEN_AI_AGENT_DESCRIPTION], "A test agent")
         self.assertEqual(attrs[GenAI.GEN_AI_RESPONSE_MODEL], "gpt-4-0613")
         self.assertEqual(attrs[GenAI.GEN_AI_RESPONSE_ID], "resp-abc")
         self.assertEqual(attrs[GenAI.GEN_AI_USAGE_INPUT_TOKENS], 100)
@@ -142,9 +126,7 @@ def test_cache_token_attributes(self) -> None:
         self.assertEqual(
             attrs[GenAI.GEN_AI_USAGE_CACHE_CREATION_INPUT_TOKENS], 25
         )
-        self.assertEqual(
-            attrs[GenAI.GEN_AI_USAGE_CACHE_READ_INPUT_TOKENS], 50
-        )
+        self.assertEqual(attrs[GenAI.GEN_AI_USAGE_CACHE_READ_INPUT_TOKENS], 50)
 
     def test_fail_sets_error_status(self) -> None:
         handler = self._make_handler()
@@ -179,8 +161,9 @@ def test_context_manager_error(self) -> None:
                 raise ValueError("test error")
 
         self.assertEqual(
-            self.span_exporter.get_finished_spans()[0]
-            .attributes.get("error.type"),
+            self.span_exporter.get_finished_spans()[0].attributes.get(
+                "error.type"
+            ),
             "ValueError",
         )
 
@@ -209,14 +192,12 @@ def test_fail_without_start_is_noop(self) -> None:
 
 
 class TestAgentInvocationType(TestCase):
-
     def test_defaults(self) -> None:
         inv = AgentInvocation()
         self.assertEqual(inv.operation_name, "invoke_agent")
         self.assertIsNone(inv.agent_name)
         self.assertIsNone(inv.provider)
         self.assertIsNone(inv.request_model)
-        self.assertTrue(inv.is_remote)
         self.assertEqual(inv.input_messages, [])
         self.assertEqual(inv.output_messages, [])
         self.assertIsNone(inv.tool_definitions)