@@ -492,19 +492,23 @@ def test_customize_logs_exporter_sigv4(self):
492492 _customize_logs_exporter (OTLPGrpcLogExporter (), Resource .get_empty ()), OTLPGrpcLogExporter
493493 )
494494
495- @patch ("amazon.opentelemetry.distro.aws_opentelemetry_configurator.LoggingHandler" )
496- @patch ("amazon.opentelemetry.distro.aws_opentelemetry_configurator.getLogger" )
495+ # Need to patch all of these to prevent some weird multi-threading error with the LogProvider
496+ @patch ("amazon.opentelemetry.distro.aws_opentelemetry_configurator.LoggingHandler" , return_value = MagicMock ())
497+ @patch ("amazon.opentelemetry.distro.aws_opentelemetry_configurator.getLogger" , return_value = MagicMock ())
497498 @patch ("amazon.opentelemetry.distro.aws_opentelemetry_configurator._customize_logs_exporter" )
498- @patch ("amazon.opentelemetry.distro.aws_opentelemetry_configurator.LoggerProvider" )
499- @patch ("amazon.opentelemetry.distro.aws_opentelemetry_configurator.BatchLogRecordProcessor" )
500- def test_init_logging (self , mock_batch_processor , mock_logger_provider ,
501- mock_customize_logs_exporter , mock_get_logger , mock_logging_handler ):
502- # Create mock objects
503- mock_logger_provider .return_value = MagicMock ()
504- mock_get_logger .return_value = MagicMock ()
505- mock_logging_handler .return_value = MagicMock ()
506- mock_batch_processor .return_value = MagicMock ()
507-
499+ @patch ("amazon.opentelemetry.distro.aws_opentelemetry_configurator.LoggerProvider" , return_value = MagicMock ())
500+ @patch (
501+ "amazon.opentelemetry.distro.aws_opentelemetry_configurator.BatchLogRecordProcessor" , return_value = MagicMock ()
502+ )
503+ def test_init_logging (
504+ self ,
505+ mock_batch_processor ,
506+ mock_logger_provider ,
507+ mock_customize_logs_exporter ,
508+ mock_get_logger ,
509+ mock_logging_handler ,
510+ ):
511+
508512 captured_exporter = None
509513
510514 def capture_exporter (* args , ** kwargs ):
@@ -513,8 +517,6 @@ def capture_exporter(*args, **kwargs):
513517 captured_exporter = result
514518 return result
515519
516- mock_logging_handler .return_value = MagicMock ()
517- mock_customize_logs_exporter = MagicMock ()
518520 mock_customize_logs_exporter .side_effect = capture_exporter
519521
520522 test_cases = [
0 commit comments