unify handler start/stop/fail

Author: etserend

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

@@ -35,7 +35,6 @@
     AgentCreation,
     AgentInvocation,
     Error,
-    GenAIInvocation,
     InputMessage,
     LLMInvocation,
     MessagePart,
@@ -72,17 +71,9 @@ def _get_llm_common_attributes(
     }
 
 
-def _get_span_name(
-    invocation: GenAIInvocation,
-) -> str:
-    """Get the span name for a GenAI invocation."""
-    request_model = getattr(invocation, "request_model", None) or ""
-    return f"{invocation.operation_name} {request_model}".strip()
-
-
 def _get_llm_span_name(invocation: LLMInvocation) -> str:
     """Get the span name for an LLM invocation."""
-    return _get_span_name(invocation)
+    return f"{invocation.operation_name} {invocation.request_model}".strip()
 
 
 def _get_llm_messages_attributes_for_span(
@@ -266,8 +257,18 @@ def _get_request_attributes(
 def _get_llm_request_attributes(
     invocation: LLMInvocation,
 ) -> dict[str, Any]:
-    """Get GenAI request semantic convention attributes for LLM invocations."""
-    return _get_request_attributes(invocation)
+    """Get GenAI request semantic convention attributes."""
+    optional_attrs = (
+        (GenAI.GEN_AI_REQUEST_TEMPERATURE, invocation.temperature),
+        (GenAI.GEN_AI_REQUEST_TOP_P, invocation.top_p),
+        (GenAI.GEN_AI_REQUEST_FREQUENCY_PENALTY, invocation.frequency_penalty),
+        (GenAI.GEN_AI_REQUEST_PRESENCE_PENALTY, invocation.presence_penalty),
+        (GenAI.GEN_AI_REQUEST_MAX_TOKENS, invocation.max_tokens),
+        (GenAI.GEN_AI_REQUEST_STOP_SEQUENCES, invocation.stop_sequences),
+        (GenAI.GEN_AI_REQUEST_SEED, invocation.seed),
+    )
+
+    return {key: value for key, value in optional_attrs if value is not None}
 
 
 def _get_response_attributes(
@@ -305,8 +306,36 @@ def _get_response_attributes(
 def _get_llm_response_attributes(
     invocation: LLMInvocation,
 ) -> dict[str, Any]:
-    """Get GenAI response semantic convention attributes for LLM invocations."""
-    return _get_response_attributes(invocation)
+    """Get GenAI response semantic convention attributes."""
+    finish_reasons: list[str] | None
+    if invocation.finish_reasons is not None:
+        finish_reasons = invocation.finish_reasons
+    elif invocation.output_messages:
+        finish_reasons = [
+            message.finish_reason
+            for message in invocation.output_messages
+            if message.finish_reason
+        ]
+    else:
+        finish_reasons = None
+
+    # De-duplicate finish reasons
+    unique_finish_reasons = (
+        sorted(set(finish_reasons)) if finish_reasons else None
+    )
+
+    optional_attrs = (
+        (
+            GenAI.GEN_AI_RESPONSE_FINISH_REASONS,
+            unique_finish_reasons if unique_finish_reasons else None,
+        ),
+        (GenAI.GEN_AI_RESPONSE_MODEL, invocation.response_model_name),
+        (GenAI.GEN_AI_RESPONSE_ID, invocation.response_id),
+        (GenAI.GEN_AI_USAGE_INPUT_TOKENS, invocation.input_tokens),
+        (GenAI.GEN_AI_USAGE_OUTPUT_TOKENS, invocation.output_tokens),
+    )
+
+    return {key: value for key, value in optional_attrs if value is not None}
 
 
 def _get_base_agent_common_attributes(
@@ -440,7 +469,6 @@ def _apply_creation_finish_attributes(
     "_apply_llm_finish_attributes",
     "_apply_error_attributes",
     "_get_llm_common_attributes",
-    "_get_span_name",
     "_get_request_attributes",
     "_get_llm_request_attributes",
     "_get_response_attributes",