update configuration and tests

Author: liustve

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

@@ -185,7 +185,7 @@ def _initialize_components(setup_logging_handler: Optional[bool] = None):
 
 def _init_logging(
     exporters: dict[str, Type[LogExporter]],
-    resource: Resource | None = None,
+    resource: Optional[Resource] = None,
     setup_logging_handler: bool = True,
 ):
     provider = LoggerProvider(resource=resource)

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

@@ -496,6 +496,7 @@ def test_customize_span_exporter_sigv4(self):
                 OTLPAwsSpanExporter,
                 AwsAuthSession,
                 Compression.NoCompression,
+                Resource.get_empty(),
             )
 
         for config in bad_configs:
@@ -506,6 +507,7 @@ def test_customize_span_exporter_sigv4(self):
                 OTLPSpanExporter,
                 Session,
                 Compression.NoCompression,
+                Resource.get_empty(),
             )
 
         self.assertIsInstance(
@@ -610,12 +612,12 @@ def test_customize_logs_exporter_sigv4(self):
             )
 
         self.assertIsInstance(
-            _customize_logs_exporter(OTLPGrpcLogExporter(), Resource.get_empty()), OTLPGrpcLogExporter
+            _customize_logs_exporter(OTLPGrpcLogExporter()), OTLPGrpcLogExporter
         )
 
     # Need to patch all of these to prevent some weird multi-threading error with the LogProvider
     @patch("amazon.opentelemetry.distro.aws_opentelemetry_configurator.LoggingHandler", return_value=MagicMock())
-    @patch("amazon.opentelemetry.distro.aws_opentelemetry_configurator.getLogger", return_value=MagicMock())
+    @patch("logging.getLogger", return_value=MagicMock())
     @patch("amazon.opentelemetry.distro.aws_opentelemetry_configurator._customize_logs_exporter")
     @patch("amazon.opentelemetry.distro.aws_opentelemetry_configurator.LoggerProvider", return_value=MagicMock())
     @patch(
@@ -832,12 +834,13 @@ def customize_exporter_test(
         expected_exporter_type,
         expected_session,
         expected_compression,
+        *args
     ):
         for key, value in config.items():
             os.environ[key] = value
 
         try:
-            result = executor(default_exporter, Resource.get_empty())
+            result = executor(default_exporter, *args)
             self.assertIsInstance(result, expected_exporter_type)
             self.assertIsInstance(result._session, expected_session)
             self.assertEqual(result._compression, expected_compression)