Add additional test for session.id filtering validation

Author: mxiamxia

aws-opentelemetry-distro/pyproject.toml

@@ -26,7 +26,6 @@ classifiers = [
 dependencies = [
   "opentelemetry-api == 1.27.0",
   "opentelemetry-sdk == 1.27.0",
-  "opentelemetry-processor-baggage == 0.48b0",
   "opentelemetry-exporter-otlp-proto-grpc == 1.27.0",
   "opentelemetry-exporter-otlp-proto-http == 1.27.0",
   "opentelemetry-propagator-b3 == 1.27.0",
@@ -35,6 +34,7 @@ dependencies = [
   "opentelemetry-sdk-extension-aws == 2.0.2",
   "opentelemetry-propagator-aws-xray == 1.0.1",
   "opentelemetry-distro == 0.48b0",
+  "opentelemetry-processor-baggage == 0.48b0",
   "opentelemetry-propagator-ot-trace == 0.48b0",
   "opentelemetry-instrumentation == 0.48b0",
   "opentelemetry-instrumentation-aws-lambda == 0.48b0",

aws-opentelemetry-distro/src/amazon/opentelemetry/distro/aws_opentelemetry_configurator.py

@@ -411,9 +411,10 @@ def _customize_span_processors(provider: TracerProvider, resource: Resource) ->
     # Add session.id baggage attribute to span attributes to support AI Agent use cases
     # enabling session ID tracking in spans.
     if is_agent_observability_enabled():
+
         def session_id_predicate(baggage_key: str) -> bool:
             return baggage_key == "session.id"
-        
+
         provider.add_span_processor(BaggageSpanProcessor(session_id_predicate))
 
     if not _is_application_signals_enabled():

aws-opentelemetry-distro/tests/amazon/opentelemetry/distro/test_aws_opentelementry_configurator.py

@@ -364,6 +364,50 @@ def test_customize_span_processors_with_agent_observability(self):
         # Clean up
         os.environ.pop("AGENT_OBSERVABILITY_ENABLED", None)
 
+    def test_baggage_span_processor_session_id_filtering(self):
+        """Test that BaggageSpanProcessor only set session.id filter by default"""
+
+        # Set up agent observability
+        os.environ["AGENT_OBSERVABILITY_ENABLED"] = "true"
+
+        # Create a new tracer provider for this test
+        tracer_provider = TracerProvider()
+
+        # Add our span processors
+        _customize_span_processors(tracer_provider, Resource.get_empty())
+
+        # Verify that the BaggageSpanProcessor was added
+        # The _active_span_processor is a composite processor containing all processors
+        active_processor = tracer_provider._active_span_processor
+
+        # Check if it's a composite processor with multiple processors
+        if hasattr(active_processor, "_span_processors"):
+            processors = active_processor._span_processors
+        else:
+            # If it's a single processor, wrap it in a list
+            processors = [active_processor]
+
+        baggage_processors = [
+            processor for processor in processors if processor.__class__.__name__ == "BaggageSpanProcessor"
+        ]
+        self.assertEqual(len(baggage_processors), 1)
+
+        # Verify the predicate function only accepts session.id
+        baggage_processor = baggage_processors[0]
+        predicate = baggage_processor._baggage_key_predicate
+
+        # Test the predicate function directly
+        self.assertTrue(predicate("session.id"))
+        self.assertFalse(predicate("user.id"))
+        self.assertFalse(predicate("request.id"))
+        self.assertFalse(predicate("other.key"))
+        self.assertFalse(predicate(""))
+        self.assertFalse(predicate("session"))
+        self.assertFalse(predicate("id"))
+
+        # Clean up
+        os.environ.pop("AGENT_OBSERVABILITY_ENABLED", None)
+
     def test_customize_span_exporter_sigv4(self):
 
         traces_good_endpoints = [