threading issue

Author: liustve

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

@@ -492,30 +492,31 @@ def test_customize_logs_exporter_sigv4(self):
             _customize_logs_exporter(OTLPGrpcLogExporter(), Resource.get_empty()), OTLPGrpcLogExporter
         )
 
-    @patch('amazon.opentelemetry.distro.aws_opentelemetry_configurator.LoggingHandler')
-    @patch('amazon.opentelemetry.distro.aws_opentelemetry_configurator.getLogger')
-    @patch(
-            "amazon.opentelemetry.distro.aws_opentelemetry_configurator._customize_logs_exporter"
-        )
-    def test_init_logging(self, mock_customize_logs_exporter, mock_get_logger, mock_logging_handler):
+    @patch("amazon.opentelemetry.distro.aws_opentelemetry_configurator.LoggingHandler")
+    @patch("amazon.opentelemetry.distro.aws_opentelemetry_configurator.getLogger")
+    @patch("amazon.opentelemetry.distro.aws_opentelemetry_configurator._customize_logs_exporter")
+    @patch("amazon.opentelemetry.distro.aws_opentelemetry_configurator.LoggerProvider")
+    @patch("amazon.opentelemetry.distro.aws_opentelemetry_configurator.BatchLogRecordProcessor")
+    def test_init_logging(self, mock_batch_processor, mock_logger_provider, 
+                        mock_customize_logs_exporter, mock_get_logger, mock_logging_handler):
+        # Create mock objects
+        mock_logger_provider.return_value = MagicMock()
+        mock_get_logger.return_value = MagicMock()
+        mock_logging_handler.return_value = MagicMock()
+        mock_batch_processor.return_value = MagicMock()
+        
+        captured_exporter = None
+
         def capture_exporter(*args, **kwargs):
             nonlocal captured_exporter
             result = _customize_logs_exporter(*args, **kwargs)
             captured_exporter = result
             return result
-        
-        captured_exporter = None
-        
-        mock_logger_instance = MagicMock()
-        mock_get_logger.return_value = mock_logger_instance
-        
-        mock_handler_instance = MagicMock()
-        mock_logging_handler.return_value = mock_handler_instance
 
+        mock_logging_handler.return_value = MagicMock()
         mock_customize_logs_exporter = MagicMock()
         mock_customize_logs_exporter.side_effect = capture_exporter
 
-
         test_cases = [
             [{"otlp": OTLPLogExporter}, OTLPLogExporter],
             [{}, OTLPLogExporter],
@@ -524,18 +525,12 @@ def capture_exporter(*args, **kwargs):
 
         os.environ[OTEL_EXPORTER_OTLP_LOGS_ENDPOINT] = "https://logs.us-east-1.amazonaws.com/v1/logs"
 
-        with patch(
-            "amazon.opentelemetry.distro.aws_opentelemetry_configurator._customize_logs_exporter"
-        ) as mock_customize_logs_exporter:
-
-            mock_customize_logs_exporter.side_effect = capture_exporter
-
-            for tc in test_cases:
-                exporter_dict = tc[0]
-                expected_exporter = tc[1]
-                _init_logging(exporter_dict, Resource.get_empty())
+        for tc in test_cases:
+            exporter_dict = tc[0]
+            expected_exporter = tc[1]
+            _init_logging(exporter_dict, Resource.get_empty())
 
-                self.assertIsInstance(captured_exporter, expected_exporter)
+            self.assertIsInstance(captured_exporter, expected_exporter)
 
         os.environ.pop(OTEL_EXPORTER_OTLP_LOGS_ENDPOINT)