Span processors should be added once

Author: xrmx

opentelemetry-sdk/src/opentelemetry/sdk/_configuration/__init__.py

@@ -233,14 +233,14 @@ def _init_tracing(
     set_tracer_provider(provider)
 
     exporter_args_map = exporter_args_map or {}
-    span_processors = span_processors or []
     export_processor = export_span_processor or BatchSpanProcessor
-    for _, exporter_class in exporters.items():
-        exporter_args = exporter_args_map.get(exporter_class, {})
 
-        for span_processor in span_processors:
-            provider.add_span_processor(span_processor)
+    span_processors = span_processors or []
+    for span_processor in span_processors:
+        provider.add_span_processor(span_processor)
 
+    for _, exporter_class in exporters.items():
+        exporter_args = exporter_args_map.get(exporter_class, {})
         provider.add_span_processor(
             export_processor(exporter_class(**exporter_args))
         )
@@ -284,15 +284,14 @@ def _init_logging(
     set_logger_provider(provider)
 
     exporter_args_map = exporter_args_map or {}
+    export_processor = export_log_record_processor or BatchLogRecordProcessor
 
     log_record_processors = log_record_processors or []
-    export_processor = export_log_record_processor or BatchLogRecordProcessor
+    for log_record_processor in log_record_processors:
+        provider.add_log_record_processor(log_record_processor)
+
     for _, exporter_class in exporters.items():
         exporter_args = exporter_args_map.get(exporter_class, {})
-
-        for log_record_processor in log_record_processors:
-            provider.add_log_record_processor(log_record_processor)
-
         provider.add_log_record_processor(
             export_processor(exporter_class(**exporter_args))
         )

opentelemetry-sdk/tests/test_configurator.py

@@ -45,7 +45,7 @@
     _initialize_components,
     _OTelSDKConfigurator,
 )
-from opentelemetry.sdk._logs import LoggingHandler
+from opentelemetry.sdk._logs import LoggingHandler, LogRecordProcessor
 from opentelemetry.sdk._logs._internal.export import LogRecordExporter
 from opentelemetry.sdk._logs.export import (
     ConsoleLogRecordExporter,
@@ -65,6 +65,7 @@
 )
 from opentelemetry.sdk.metrics.view import Aggregation
 from opentelemetry.sdk.resources import SERVICE_NAME, Resource
+from opentelemetry.sdk.trace import SpanProcessor
 from opentelemetry.sdk.trace.export import (
     ConsoleSpanExporter,
     SimpleSpanProcessor,
@@ -88,23 +89,23 @@ class Provider:
     def __init__(self, resource=None, sampler=None, id_generator=None):
         self.sampler = sampler
         self.id_generator = id_generator
-        self.processor = None
+        self.processors = []
         self.resource = resource or Resource.create({})
 
     def add_span_processor(self, processor):
-        self.processor = processor
+        self.processors.append(processor)
 
 
 class DummyLoggerProvider:
     def __init__(self, resource=None):
         self.resource = resource
-        self.processor = DummyLogRecordProcessor(DummyOTLPLogExporter())
+        self.processors = []
 
     def add_log_record_processor(self, processor):
-        self.processor = processor
+        self.processors.append(processor)
 
     def get_logger(self, name, *args, **kwargs):
-        return DummyLogger(name, self.resource, self.processor)
+        return DummyLogger(name, self.resource, self.processors)
 
     def force_flush(self, *args, **kwargs):
         pass
@@ -115,10 +116,10 @@ class DummyMeterProvider(MeterProvider):
 
 
 class DummyLogger:
-    def __init__(self, name, resource, processor):
+    def __init__(self, name, resource, processors):
         self.name = name
         self.resource = resource
-        self.processor = processor
+        self.processors = processors
 
     def emit(
         self,
@@ -133,7 +134,8 @@ def emit(
         attributes=None,
         event_name=None,
     ):
-        self.processor.emit(record)
+        for processor in self.processors:
+            processor.emit(record)
 
 
 class DummyLogRecordProcessor:
@@ -357,10 +359,11 @@ def test_trace_init_default(self):
         provider = self.set_provider_mock.call_args[0][0]
         self.assertIsInstance(provider, Provider)
         self.assertIsInstance(provider.id_generator, RandomIdGenerator)
-        self.assertIsInstance(provider.processor, Processor)
-        self.assertIsInstance(provider.processor.exporter, Exporter)
+        self.assertEqual(len(provider.processors), 1)
+        self.assertIsInstance(provider.processors[0], Processor)
+        self.assertIsInstance(provider.processors[0].exporter, Exporter)
         self.assertEqual(
-            provider.processor.exporter.service_name, "my-test-service"
+            provider.processors[0].exporter.service_name, "my-test-service"
         )
         self.assertEqual(
             provider.resource.attributes.get("telemetry.auto.version"),
@@ -380,8 +383,11 @@ def test_trace_init_otlp(self):
         provider = self.set_provider_mock.call_args[0][0]
         self.assertIsInstance(provider, Provider)
         self.assertIsInstance(provider.id_generator, RandomIdGenerator)
-        self.assertIsInstance(provider.processor, Processor)
-        self.assertIsInstance(provider.processor.exporter, OTLPSpanExporter)
+        self.assertEqual(len(provider.processors), 1)
+        self.assertIsInstance(provider.processors[0], Processor)
+        self.assertIsInstance(
+            provider.processors[0].exporter, OTLPSpanExporter
+        )
         self.assertIsInstance(provider.resource, Resource)
         self.assertEqual(
             provider.resource.attributes.get("service.name"),
@@ -399,18 +405,25 @@ def test_trace_init_exporter_uses_exporter_args_map(self):
         )
 
         provider = self.set_provider_mock.call_args[0][0]
-        exporter = provider.processor.exporter
+        self.assertEqual(len(provider.processors), 1)
+        exporter = provider.processors[0].exporter
         self.assertEqual(exporter.compression, "gzip")
 
-    def test_trace_init_custom_export_span_processor(self):
+    def test_trace_init_custom_span_processors(self):
+        span_processor = mock.Mock(spec=SpanProcessor)
         _init_tracing(
             {"otlp": OTLPSpanExporter},
             id_generator=RandomIdGenerator(),
+            span_processors=[span_processor],
             export_span_processor=SimpleSpanProcessor,
         )
 
         provider = self.set_provider_mock.call_args[0][0]
-        self.assertTrue(isinstance(provider.processor, SimpleSpanProcessor))
+        self.assertEqual(len(provider.processors), 2)
+        self.assertEqual(provider.processors[0], span_processor)
+        self.assertTrue(
+            isinstance(provider.processors[1], SimpleSpanProcessor)
+        )
 
     @patch.dict(environ, {OTEL_PYTHON_ID_GENERATOR: "custom_id_generator"})
     @patch("opentelemetry.sdk._configuration.IdGenerator", new=IdGenerator)
@@ -700,12 +713,16 @@ def test_logging_init_exporter(self):
                 provider.resource.attributes.get("service.name"),
                 "otlp-service",
             )
-            self.assertIsInstance(provider.processor, DummyLogRecordProcessor)
+            self.assertEqual(len(provider.processors), 1)
+            self.assertIsInstance(
+                provider.processors[0], DummyLogRecordProcessor
+            )
             self.assertIsInstance(
-                provider.processor.exporter, DummyOTLPLogExporter
+                provider.processors[0].exporter, DummyOTLPLogExporter
             )
             getLogger(__name__).error("hello")
-            self.assertTrue(provider.processor.exporter.export_called)
+            self.assertEqual(len(provider.processors), 1)
+            self.assertTrue(provider.processors[0].exporter.export_called)
 
     def test_logging_init_exporter_uses_exporter_args_map(self):
         with ResetGlobalLoggingState():
@@ -720,18 +737,27 @@ def test_logging_init_exporter_uses_exporter_args_map(self):
             )
             self.assertEqual(self.set_provider_mock.call_count, 1)
             provider = self.set_provider_mock.call_args[0][0]
-            self.assertEqual(provider.processor.exporter.compression, "gzip")
+            self.assertEqual(len(provider.processors), 1)
+            self.assertEqual(
+                provider.processors[0].exporter.compression, "gzip"
+            )
 
-    def test_logging_init_custom_export_log_record_processor(self):
+    def test_logging_init_custom_log_record_processors(self):
+        log_record_processor = mock.Mock(spec=LogRecordProcessor)
         with ResetGlobalLoggingState():
             resource = Resource.create({})
             _init_logging(
                 {"otlp": DummyOTLPLogExporter},
                 resource=resource,
+                log_record_processors=[log_record_processor],
                 export_log_record_processor=SimpleLogRecordProcessor,
             )
             provider = self.set_provider_mock.call_args[0][0]
-            self.assertIsInstance(provider.processor, SimpleLogRecordProcessor)
+            self.assertEqual(len(provider.processors), 2)
+            self.assertEqual(provider.processors[0], log_record_processor)
+            self.assertIsInstance(
+                provider.processors[1], SimpleLogRecordProcessor
+            )
 
     @patch.dict(
         environ,
@@ -752,12 +778,13 @@ def test_logging_init_exporter_without_handler_setup(self):
             provider.resource.attributes.get("service.name"),
             "otlp-service",
         )
-        self.assertIsInstance(provider.processor, DummyLogRecordProcessor)
+        self.assertEqual(len(provider.processors), 1)
+        self.assertIsInstance(provider.processors[0], DummyLogRecordProcessor)
         self.assertIsInstance(
-            provider.processor.exporter, DummyOTLPLogExporter
+            provider.processors[0].exporter, DummyOTLPLogExporter
         )
         getLogger(__name__).error("hello")
-        self.assertFalse(provider.processor.exporter.export_called)
+        self.assertFalse(provider.processors[0].exporter.export_called)
 
     @patch.dict(
         environ,