Fixes

Author: xrmx

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

@@ -214,7 +214,8 @@ def _init_tracing(
     sampler: Sampler | None = None,
     resource: Resource | None = None,
     exporter_args_map: ExporterArgsMap | None = None,
-    processor: Type[SpanProcessor] | None = None,
+    span_processors: Sequence[Type[SpanProcessor]] | None = None,
+    export_processor: Type[SpanProcessor] | None = None,
 ):
     provider = TracerProvider(
         id_generator=id_generator,
@@ -224,11 +225,16 @@ def _init_tracing(
     set_tracer_provider(provider)
 
     exporter_args_map = exporter_args_map or {}
-    span_processor = processor or BatchSpanProcessor
+    span_processors = span_processors or []
+    export_processor = export_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)
+
         provider.add_span_processor(
-            span_processor(exporter_class(**exporter_args))
+            export_processor(exporter_class(**exporter_args))
         )
 
 
@@ -262,17 +268,24 @@ def _init_logging(
     resource: Resource | None = None,
     setup_logging_handler: bool = True,
     exporter_args_map: ExporterArgsMap | None = None,
-    processor: Type[LogRecordProcessor] | None = None,
+    log_record_processors: Sequence[Type[LogRecordProcessor]] | None = None,
+    export_processor: Type[LogRecordProcessor] | None = None,
 ):
     provider = LoggerProvider(resource=resource)
     set_logger_provider(provider)
 
     exporter_args_map = exporter_args_map or {}
-    log_record_processor = processor or BatchLogRecordProcessor
+
+    log_record_processors = log_record_processors or []
+    export_processor = export_processor or BatchLogRecordProcessor
     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(
-            log_record_processor(exporter_class(**exporter_args))
+            export_processor(exporter_class(**exporter_args))
         )
 
     # silence warnings from internal users until we drop the deprecated Events API
@@ -437,8 +450,10 @@ def _initialize_components(
     id_generator: IdGenerator | None = None,
     setup_logging_handler: bool | None = None,
     exporter_args_map: ExporterArgsMap | None = None,
-    span_processor: Type[SpanProcessor] | None = None,
-    log_record_processor: Type[LogRecordProcessor] | None = None,
+    span_processors: Sequence[Type[SpanProcessor]] | None = None,
+    trace_export_processor: Type[SpanProcessor] | None = None,
+    log_record_processors: Sequence[Type[LogRecordProcessor]] | None = None,
+    log_export_processor: Type[LogRecordProcessor] | None = None,
 ):
     # pylint: disable=too-many-locals
     if trace_exporter_names is None:
@@ -475,7 +490,8 @@ def _initialize_components(
         sampler=sampler,
         resource=resource,
         exporter_args_map=exporter_args_map,
-        processor=span_processor,
+        span_processors=span_processors,
+        export_processor=trace_export_processor,
     )
     _init_metrics(
         metric_exporters, resource, exporter_args_map=exporter_args_map
@@ -494,7 +510,8 @@ def _initialize_components(
         resource,
         setup_logging_handler,
         exporter_args_map=exporter_args_map,
-        processor=log_record_processor,
+        log_record_processors=log_record_processors,
+        export_processor=log_export_processor,
     )
 
 

opentelemetry-sdk/tests/test_configurator.py

@@ -48,7 +48,7 @@
 from opentelemetry.sdk._logs import LoggingHandler
 from opentelemetry.sdk._logs._internal.export import LogRecordExporter
 from opentelemetry.sdk._logs.export import (
-    ConsoleLogRecordExporter
+    ConsoleLogRecordExporter,
     SimpleLogRecordProcessor,
 )
 from opentelemetry.sdk.environment_variables import (
@@ -402,11 +402,11 @@ def test_trace_init_exporter_uses_exporter_args_map(self):
         exporter = provider.processor.exporter
         self.assertEqual(exporter.compression, "gzip")
 
-    def test_trace_init_custom_span_processor(self):
+    def test_trace_init_custom_export_span_processor(self):
         _init_tracing(
             {"otlp": OTLPSpanExporter},
             id_generator=RandomIdGenerator(),
-            processor=SimpleSpanProcessor,
+            export_processor=SimpleSpanProcessor,
         )
 
         provider = self.set_provider_mock.call_args[0][0]
@@ -722,13 +722,13 @@ def test_logging_init_exporter_uses_exporter_args_map(self):
             provider = self.set_provider_mock.call_args[0][0]
             self.assertEqual(provider.processor.exporter.compression, "gzip")
 
-    def test_logging_init_custom_log_record_processor(self):
+    def test_logging_init_custom_export_log_record_processor(self):
         with ResetGlobalLoggingState():
             resource = Resource.create({})
             _init_logging(
                 {"otlp": DummyOTLPLogExporter},
                 resource=resource,
-                processor=SimpleLogRecordProcessor,
+                export_processor=SimpleLogRecordProcessor,
             )
             provider = self.set_provider_mock.call_args[0][0]
             self.assertIsInstance(provider.processor, SimpleLogRecordProcessor)
@@ -769,7 +769,12 @@ def test_logging_init_disable_default(self, logging_mock, tracing_mock):
         _initialize_components(auto_instrumentation_version="auto-version")
         self.assertEqual(tracing_mock.call_count, 1)
         logging_mock.assert_called_once_with(
-            mock.ANY, mock.ANY, False, exporter_args_map=None, processor=None
+            mock.ANY,
+            mock.ANY,
+            False,
+            exporter_args_map=None,
+            log_record_processors=None,
+            export_processor=None,
         )
 
     @patch.dict(
@@ -789,7 +794,8 @@ def test_logging_init_enable_env(self, logging_mock, tracing_mock):
             mock.ANY,
             True,
             exporter_args_map=None,
-            processor=None,
+            log_record_processors=None,
+            export_processor=None,
         )
         self.assertEqual(tracing_mock.call_count, 1)
 
@@ -874,8 +880,10 @@ def test_initialize_components_kwargs(
             "id_generator": "TEST_GENERATOR",
             "setup_logging_handler": True,
             "exporter_args_map": {1: {"compression": "gzip"}},
-            "log_record_processor": SimpleLogRecordProcessor,
-            "span_processor": SimpleSpanProcessor,
+            "log_export_processor": SimpleLogRecordProcessor,
+            "trace_export_processor": SimpleSpanProcessor,
+            "log_record_processors": [],
+            "span_processors": [],
         }
         _initialize_components(**kwargs)
 
@@ -910,7 +918,8 @@ def test_initialize_components_kwargs(
             sampler="TEST_SAMPLER",
             resource="TEST_RESOURCE",
             exporter_args_map={1: {"compression": "gzip"}},
-            processor=SimpleSpanProcessor,
+            span_processors=[],
+            export_processor=SimpleSpanProcessor,
         )
         metrics_mock.assert_called_once_with(
             "TEST_METRICS_EXPORTERS_DICT",
@@ -922,7 +931,8 @@ def test_initialize_components_kwargs(
             "TEST_RESOURCE",
             True,
             exporter_args_map={1: {"compression": "gzip"}},
-            processor=SimpleLogRecordProcessor,
+            log_record_processors=[],
+            export_processor=SimpleLogRecordProcessor,
         )
 
     def test_basicConfig_works_with_otel_handler(self):