revert: restore original span processor

Author: nagkumar91

instrumentation-genai/opentelemetry-instrumentation-openai-agents-v2/src/opentelemetry/instrumentation/openai_agents/span_processor.py

@@ -80,8 +80,6 @@ def _enum_values(enum_cls) -> dict[str, str]:
 
 
 class GenAIProvider:
-    """String constants for known GenAI provider names."""
-
     OPENAI = _PROVIDER_VALUES["OPENAI"]
     GCP_GEN_AI = _PROVIDER_VALUES["GCP_GEN_AI"]
     GCP_VERTEX_AI = _PROVIDER_VALUES["GCP_VERTEX_AI"]
@@ -105,8 +103,6 @@ class GenAIProvider:
 
 
 class GenAIOperationName:
-    """Normalized GenAI operation names used by the processor."""
-
     CHAT = _OPERATION_VALUES["CHAT"]
     GENERATE_CONTENT = _OPERATION_VALUES["GENERATE_CONTENT"]
     TEXT_COMPLETION = _OPERATION_VALUES["TEXT_COMPLETION"]
@@ -133,17 +129,13 @@ class GenAIOperationName:
 
 
 class GenAIOutputType:
-    """Supported GenAI output types normalized by the processor."""
-
     TEXT = _OUTPUT_VALUES["TEXT"]
     JSON = _OUTPUT_VALUES["JSON"]
     IMAGE = _OUTPUT_VALUES["IMAGE"]
     SPEECH = _OUTPUT_VALUES["SPEECH"]
 
 
 class GenAIToolType:
-    """Canonical tool type values for tool spans."""
-
     FUNCTION = "function"
     EXTENSION = "extension"
     DATASTORE = "datastore"
@@ -152,16 +144,13 @@ class GenAIToolType:
 
 
 class GenAIEvaluationAttributes:
-    """Attribute names used to describe GenAI evaluation metadata."""
-
     NAME = "gen_ai.evaluation.name"
     SCORE_VALUE = "gen_ai.evaluation.score.value"
     SCORE_LABEL = "gen_ai.evaluation.score.label"
     EXPLANATION = "gen_ai.evaluation.explanation"
 
 
 def _attr(name: str, fallback: str) -> str:
-    """Return semantic attribute name with fallback for older SDK versions."""
     return getattr(GenAIAttributes, name, fallback)
 
 
@@ -319,15 +308,13 @@ class ContentCaptureMode(Enum):
 
     @property
     def capture_in_span(self) -> bool:
-        """Return True when content should be captured on span attributes."""
         return self in (
             ContentCaptureMode.SPAN_ONLY,
             ContentCaptureMode.SPAN_AND_EVENT,
         )
 
     @property
     def capture_in_event(self) -> bool:
-        """Return True when content should be captured on span events."""
         return self in (
             ContentCaptureMode.EVENT_ONLY,
             ContentCaptureMode.SPAN_AND_EVENT,
@@ -397,14 +384,21 @@ def _get_span_status(span: Span[Any]) -> Status:
     return Status(StatusCode.OK)
 
 
+_SPAN_NAME_BASE_OVERRIDES: dict[str, str] = {
+    GenAIOperationName.SPEECH: "speech",
+    GenAIOperationName.GUARDRAIL: "guardrail",
+    GenAIOperationName.HANDOFF: "handoff",
+}
+
+
 def get_span_name(
     operation_name: str,
     model: Optional[str] = None,
     agent_name: Optional[str] = None,
     tool_name: Optional[str] = None,
 ) -> str:
     """Generate spec-compliant span name based on operation type."""
-    base_name = operation_name
+    base_name = _SPAN_NAME_BASE_OVERRIDES.get(operation_name, operation_name)
 
     if operation_name in {
         GenAIOperationName.CHAT,
@@ -440,6 +434,7 @@ def __init__(
         include_sensitive_data: bool = True,
         content_mode: ContentCaptureMode = ContentCaptureMode.SPAN_AND_EVENT,
         base_url: Optional[str] = None,
+        emit_legacy: bool = True,
         agent_name: Optional[str] = None,
         agent_id: Optional[str] = None,
         agent_description: Optional[str] = None,
@@ -456,28 +451,16 @@ def __init__(
         """Initialize processor with metrics support.
 
         Args:
-            tracer: Optional OpenTelemetry tracer.
-            system_name: Provider name (openai/azure.ai.inference/etc.).
-            include_sensitive_data: Include model/tool IO when True.
-            content_mode: Control where message content is captured.
-            base_url: API endpoint for server.address/port.
-            agent_name: Name of the agent (can be overridden by env var).
-            agent_id: ID of the agent (can be overridden by env var).
-            agent_description: Description of the agent (can be overridden by
-                env var).
-            server_address: Server address (can be overridden by env var or
-                base_url).
-            server_port: Server port (can be overridden by env var or base_url).
-            metrics_enabled: Enable GenAI metrics when True.
-            agent_name_default: Fallback agent name when span data omits one.
-            agent_id_default: Fallback agent id when span data omits one.
-            agent_description_default: Fallback agent description when span data
-                omits one.
-            base_url_default: Default API endpoint when not supplied explicitly.
-            server_address_default: Default server address when not supplied
-                explicitly.
-            server_port_default: Default server port when not supplied
-                explicitly.
+            tracer: Optional OpenTelemetry tracer
+            system_name: Provider name (openai/azure.ai.inference/etc.)
+            include_sensitive_data: Include model/tool IO when True
+            base_url: API endpoint for server.address/port
+            emit_legacy: Also emit deprecated attribute names
+            agent_name: Name of the agent (can be overridden by env var)
+            agent_id: ID of the agent (can be overridden by env var)
+            agent_description: Description of the agent (can be overridden by env var)
+            server_address: Server address (can be overridden by env var or base_url)
+            server_port: Server port (can be overridden by env var or base_url)
         """
         self._tracer = tracer
         self.system_name = normalize_provider(system_name) or system_name
@@ -487,6 +470,8 @@ def __init__(
         )
         effective_base_url = base_url or base_url_default
         self.base_url = effective_base_url
+        # Legacy emission removed; parameter retained for compatibility but unused
+        self.emit_legacy = False
 
         # Agent information - prefer explicit overrides; otherwise defer to span data
         self.agent_name = agent_name
@@ -1083,7 +1068,6 @@ def _build_content_payload(self, span: Span[Any]) -> ContentPayload:
         elif _is_instance_of(span_data, FunctionSpanData) and capture_tools:
 
             def _serialize_tool_value(value: Any) -> Optional[str]:
-                """Serialize tool payloads while preserving JSON structures."""
                 if value is None:
                     return None
                 if isinstance(value, (dict, list)):
@@ -1799,7 +1783,6 @@ def _merge_content_sequence(
         return result
 
     def _clone_message(self, message: Any) -> Any:
-        """Return a deep copy of normalized message content."""
         if isinstance(message, dict):
             return {
                 key: self._clone_message(value)
@@ -1812,7 +1795,6 @@ def _clone_message(self, message: Any) -> Any:
         return message
 
     def _is_placeholder_message(self, message: Any) -> bool:
-        """Return True when message only contains redacted placeholder text."""
         if not isinstance(message, dict):
             return False
         parts = message.get("parts")