Fix suppression logic: check current span instead of parent, remove unused span_processor param

Co-authored-by: nikhilNava <211831449+nikhilNava@users.noreply.github.com>

Author: Copilot

libraries/microsoft-agents-a365-observability-core/microsoft_agents_a365/observability/core/config.py

@@ -167,7 +167,7 @@ def _configure_internal(
 
         # Create BatchSpanProcessor with optimized settings
         batch_processor = BatchSpanProcessor(exporter, **batch_processor_kwargs)
-        agent_processor = SpanProcessor(suppress_invoke_agent_input=suppress_invoke_agent_input)
+        agent_processor = SpanProcessor()
 
         tracer_provider.add_span_processor(batch_processor)
         tracer_provider.add_span_processor(agent_processor)

libraries/microsoft-agents-a365-observability-core/microsoft_agents_a365/observability/core/exporters/agent365_exporter.py

@@ -225,22 +225,13 @@ def _post_with_retries(self, url: str, body: str, headers: dict[str, str]) -> bo
     # ------------- Payload mapping ------------------
 
     def _build_export_request(self, spans: Sequence[ReadableSpan]) -> dict[str, Any]:
-        # Build a map of span IDs to their operation names for parent lookups
-        span_operation_map = {}
-        if self._suppress_invoke_agent_input:
-            for sp in spans:
-                attrs = sp.attributes or {}
-                operation_name = attrs.get(GEN_AI_OPERATION_NAME_KEY)
-                if operation_name:
-                    span_operation_map[sp.context.span_id] = operation_name
-        
         # Group by instrumentation scope (name, version)
         scope_map: dict[tuple[str, str | None], list[dict[str, Any]]] = {}
 
         for sp in spans:
             scope = sp.instrumentation_scope
             scope_key = (scope.name, scope.version)
-            scope_map.setdefault(scope_key, []).append(self._map_span(sp, span_operation_map))
+            scope_map.setdefault(scope_key, []).append(self._map_span(sp))
 
         scope_spans: list[dict[str, Any]] = []
         for (name, version), mapped_spans in scope_map.items():
@@ -269,7 +260,7 @@ def _build_export_request(self, spans: Sequence[ReadableSpan]) -> dict[str, Any]
             ]
         }
 
-    def _map_span(self, sp: ReadableSpan, span_operation_map: dict[int, str] = None) -> dict[str, Any]:
+    def _map_span(self, sp: ReadableSpan) -> dict[str, Any]:
         ctx = sp.context
 
         parent_span_id = None
@@ -279,14 +270,18 @@ def _map_span(self, sp: ReadableSpan, span_operation_map: dict[int, str] = None)
         # attributes
         attrs = dict(sp.attributes or {})
 
-        # Suppress input messages if configured and parent is an InvokeAgent span
-        if self._suppress_invoke_agent_input and span_operation_map:
-            # Check if parent span is an InvokeAgent span
-            if sp.parent is not None and sp.parent.span_id != 0:
-                parent_operation = span_operation_map.get(sp.parent.span_id)
-                if parent_operation == INVOKE_AGENT_OPERATION_NAME:
-                    # Remove input messages attribute
-                    attrs.pop(GEN_AI_INPUT_MESSAGES_KEY, None)
+        # Suppress input messages if configured and current span is an InvokeAgent span
+        if self._suppress_invoke_agent_input:
+            # Check if current span is an InvokeAgent span by:
+            # 1. Span name starts with "invoke_agent"
+            # 2. Has attribute gen_ai.operation.name set to INVOKE_AGENT_OPERATION_NAME
+            operation_name = attrs.get(GEN_AI_OPERATION_NAME_KEY)
+            if (
+                sp.name.startswith(INVOKE_AGENT_OPERATION_NAME)
+                and operation_name == INVOKE_AGENT_OPERATION_NAME
+            ):
+                # Remove input messages attribute
+                attrs.pop(GEN_AI_INPUT_MESSAGES_KEY, None)
 
         # events
         events = []

libraries/microsoft-agents-a365-observability-core/microsoft_agents_a365/observability/core/trace_processor/span_processor.py

@@ -24,15 +24,8 @@
 class SpanProcessor(BaseSpanProcessor):
     """Span processor that propagates every baggage key/value to span attributes."""
 
-    def __init__(self, suppress_invoke_agent_input: bool = False):
-        """Initialize the span processor.
-        
-        Args:
-            suppress_invoke_agent_input: If True, suppress input messages for spans 
-                that are children of InvokeAgent spans.
-        """
+    def __init__(self):
         super().__init__()
-        self._suppress_invoke_agent_input = suppress_invoke_agent_input
 
     def on_start(self, span, parent_context=None):
         ctx = parent_context or context.get_current()
@@ -88,9 +81,4 @@ def on_start(self, span, parent_context=None):
         return super().on_start(span, parent_context)
 
     def on_end(self, span):
-        """Called when a span ends.
-        
-        Note: Input suppression for InvokeAgent scopes is handled by the exporter,
-        not in this processor, because span attributes cannot be removed after they're set.
-        """
         super().on_end(span)

tests/observability/extensions/openai/test_prompt_suppression.py

@@ -3,39 +3,11 @@
 import unittest
 
 from microsoft_agents_a365.observability.core.exporters.agent365_exporter import _Agent365Exporter
-from microsoft_agents_a365.observability.core.trace_processor.span_processor import SpanProcessor
 
 
 class TestPromptSuppressionConfiguration(unittest.TestCase):
     """Unit tests for prompt suppression configuration in the core SDK."""
 
-    def test_span_processor_default_suppression_is_false(self):
-        """Test that the default value for suppress_invoke_agent_input is False in SpanProcessor."""
-        processor = SpanProcessor()
-
-        self.assertFalse(
-            processor._suppress_invoke_agent_input,
-            "Default value for suppress_invoke_agent_input should be False",
-        )
-
-    def test_span_processor_can_enable_suppression(self):
-        """Test that suppression can be enabled via SpanProcessor constructor."""
-        processor = SpanProcessor(suppress_invoke_agent_input=True)
-
-        self.assertTrue(
-            processor._suppress_invoke_agent_input,
-            "suppress_invoke_agent_input should be True when explicitly set",
-        )
-
-    def test_span_processor_can_disable_suppression(self):
-        """Test that suppression can be explicitly disabled via SpanProcessor constructor."""
-        processor = SpanProcessor(suppress_invoke_agent_input=False)
-
-        self.assertFalse(
-            processor._suppress_invoke_agent_input,
-            "suppress_invoke_agent_input should be False when explicitly set",
-        )
-
     def test_exporter_default_suppression_is_false(self):
         """Test that the default value for suppress_invoke_agent_input is False in exporter."""
         exporter = _Agent365Exporter(token_resolver=lambda x, y: "test")