update attribute

Author: etserend

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

@@ -50,31 +50,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"
-)
-_GEN_AI_CONVERSATION_ID = _agent_attr(
-    "GEN_AI_CONVERSATION_ID", "gen_ai.conversation.id"
-)
-_GEN_AI_DATA_SOURCE_ID = _agent_attr(
-    "GEN_AI_DATA_SOURCE_ID", "gen_ai.data_source.id"
-)
-_GEN_AI_OUTPUT_TYPE = _agent_attr("GEN_AI_OUTPUT_TYPE", "gen_ai.output.type")
-_GEN_AI_TOOL_DEFINITIONS = _agent_attr(
-    "GEN_AI_TOOL_DEFINITIONS", "gen_ai.tool.definitions"
-)
-
-
 def _get_llm_common_attributes(
     invocation: LLMInvocation,
 ) -> dict[str, Any]:
@@ -314,10 +289,10 @@ def _get_base_agent_common_attributes(
     optional_attrs = (
         (GenAI.GEN_AI_REQUEST_MODEL, agent.request_model),
         (GenAI.GEN_AI_PROVIDER_NAME, agent.provider),
-        (_GEN_AI_AGENT_NAME, agent.agent_name),
-        (_GEN_AI_AGENT_ID, agent.agent_id),
-        (_GEN_AI_AGENT_DESCRIPTION, agent.agent_description),
-        (_GEN_AI_AGENT_VERSION, agent.agent_version),
+        (GenAI.GEN_AI_AGENT_NAME, agent.agent_name),
+        (GenAI.GEN_AI_AGENT_ID, agent.agent_id),
+        (GenAI.GEN_AI_AGENT_DESCRIPTION, agent.agent_description),
+        ("gen_ai.agent.version", agent.agent_version),
         (server_attributes.SERVER_ADDRESS, agent.server_address),
         (server_attributes.SERVER_PORT, agent.server_port),
     )
@@ -343,9 +318,9 @@ def _get_agent_common_attributes(
 
     # Invoke-specific conditionally required attributes
     invoke_attrs = (
-        (_GEN_AI_CONVERSATION_ID, invocation.conversation_id),
-        (_GEN_AI_DATA_SOURCE_ID, invocation.data_source_id),
-        (_GEN_AI_OUTPUT_TYPE, invocation.output_type),
+        (GenAI.GEN_AI_CONVERSATION_ID, invocation.conversation_id),
+        (GenAI.GEN_AI_DATA_SOURCE_ID, invocation.data_source_id),
+        (GenAI.GEN_AI_OUTPUT_TYPE, invocation.output_type),
     )
     attrs.update(
         {key: value for key, value in invoke_attrs if value is not None}
@@ -444,7 +419,7 @@ def _get_agent_messages_attributes_for_span(
             else None,
         ),
         (
-            _GEN_AI_TOOL_DEFINITIONS,
+            GenAI.GEN_AI_TOOL_DEFINITIONS,
             gen_ai_json_dumps(tool_definitions)
             if tool_definitions
             else None,