use semconv attrs directly

Author: etserend

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

@@ -49,21 +49,6 @@
 )
 
 
-def _agent_attr(name: str, fallback: str) -> str:
-    """Get a semconv attribute, falling back to a string literal if not yet in the package."""
-    return getattr(GenAI, name, fallback)
-
-
-_GEN_AI_AGENT_NAME = _agent_attr("GEN_AI_AGENT_NAME", "gen_ai.agent.name")
-_GEN_AI_AGENT_ID = _agent_attr("GEN_AI_AGENT_ID", "gen_ai.agent.id")
-_GEN_AI_AGENT_DESCRIPTION = _agent_attr(
-    "GEN_AI_AGENT_DESCRIPTION", "gen_ai.agent.description"
-)
-_GEN_AI_AGENT_VERSION = _agent_attr(
-    "GEN_AI_AGENT_VERSION", "gen_ai.agent.version"
-)
-
-
 def _get_llm_common_attributes(
     invocation: LLMInvocation,
 ) -> dict[str, Any]:
@@ -303,10 +288,10 @@ def _get_base_agent_common_attributes(
     optional_attrs = (
         (GenAI.GEN_AI_REQUEST_MODEL, agent.model),
         (GenAI.GEN_AI_PROVIDER_NAME, agent.provider),
-        (_GEN_AI_AGENT_NAME, agent.name),
-        (_GEN_AI_AGENT_ID, agent.agent_id),
-        (_GEN_AI_AGENT_DESCRIPTION, agent.description),
-        (_GEN_AI_AGENT_VERSION, agent.version),
+        (GenAI.GEN_AI_AGENT_NAME, agent.name),
+        (GenAI.GEN_AI_AGENT_ID, agent.agent_id),
+        (GenAI.GEN_AI_AGENT_DESCRIPTION, agent.description),
+        ("gen_ai.agent.version", agent.version),
         (server_attributes.SERVER_ADDRESS, agent.server_address),
         (server_attributes.SERVER_PORT, agent.server_port),
     )
@@ -373,10 +358,6 @@ def _apply_creation_finish_attributes(
     "_get_llm_response_attributes",
     "_get_llm_span_name",
     "_maybe_emit_llm_event",
-    "_GEN_AI_AGENT_NAME",
-    "_GEN_AI_AGENT_ID",
-    "_GEN_AI_AGENT_DESCRIPTION",
-    "_GEN_AI_AGENT_VERSION",
     "_get_base_agent_common_attributes",
     "_get_base_agent_span_name",
     "_apply_creation_finish_attributes",

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

@@ -12,12 +12,6 @@
 )
 from opentelemetry.trace import SpanKind
 from opentelemetry.util.genai.handler import TelemetryHandler
-from opentelemetry.util.genai.span_utils import (
-    _GEN_AI_AGENT_DESCRIPTION,
-    _GEN_AI_AGENT_ID,
-    _GEN_AI_AGENT_NAME,
-    _GEN_AI_AGENT_VERSION,
-)
 from opentelemetry.util.genai.types import (
     AgentCreation,
     Error,
@@ -55,7 +49,7 @@ def test_start_stop_create_agent(self) -> None:
         self.assertEqual(
             span.attributes[GenAI.GEN_AI_OPERATION_NAME], "create_agent"
         )
-        self.assertEqual(span.attributes[_GEN_AI_AGENT_NAME], "New Agent")
+        self.assertEqual(span.attributes[GenAI.GEN_AI_AGENT_NAME], "New Agent")
 
     def test_create_agent_span_kind_is_client(self) -> None:
         handler = self._make_handler()
@@ -85,10 +79,10 @@ def test_create_agent_with_all_base_attributes(self) -> None:
         self.assertEqual(len(spans), 1)
         attrs = spans[0].attributes
         self.assertEqual(attrs[GenAI.GEN_AI_OPERATION_NAME], "create_agent")
-        self.assertEqual(attrs[_GEN_AI_AGENT_NAME], "Full Agent")
-        self.assertEqual(attrs[_GEN_AI_AGENT_ID], "agent-123")
-        self.assertEqual(attrs[_GEN_AI_AGENT_DESCRIPTION], "A test agent")
-        self.assertEqual(attrs[_GEN_AI_AGENT_VERSION], "1.0.0")
+        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["gen_ai.agent.version"], "1.0.0")
         self.assertEqual(attrs[GenAI.GEN_AI_PROVIDER_NAME], "openai")
         self.assertEqual(attrs[GenAI.GEN_AI_REQUEST_MODEL], "gpt-4")