default to gzip compression

Author: liustve

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

@@ -180,14 +180,14 @@ def _init_logging(
     # Provides a default OTLP log exporter when none is specified.
     # This is the behavior for the logs exporters for other languages.
     if not exporters:
-        exporters.setdefault("otlp", OTLPLogExporter)
+        exporters = {"otlp": OTLPLogExporter}
 
     provider = LoggerProvider(resource=resource)
     set_logger_provider(provider)
 
     for _, exporter_class in exporters.items():
         exporter_args: Dict[str, any] = {}
-        log_exporter = _customize_logs_exporter(exporter_class(**exporter_args))
+        log_exporter = _customize_logs_exporter(exporter_class(**exporter_args), resource)
         provider.add_log_record_processor(BatchLogRecordProcessor(exporter=log_exporter))
 
     handler = LoggingHandler(level=NOTSET, logger_provider=provider)
@@ -376,7 +376,7 @@ def _customize_span_exporter(span_exporter: SpanExporter, resource: Resource) ->
     return AwsMetricAttributesSpanExporterBuilder(span_exporter, resource).build()
 
 
-def _customize_logs_exporter(log_exporter: LogExporter) -> LogExporter:
+def _customize_logs_exporter(log_exporter: LogExporter, resource: Resource) -> LogExporter:
     logs_endpoint = os.environ.get(OTEL_EXPORTER_OTLP_LOGS_ENDPOINT)
 
     if is_aws_otlp_endpoint(logs_endpoint, "logs"):
@@ -548,7 +548,7 @@ def validate_logs_headers() -> bool:
             split = pair.split("=", 1)
             key = split[0]
             value = split[1]
-            if (key == AWS_OTLP_LOGS_GROUP_HEADER or key == AWS_OTLP_LOGS_STREAM_HEADER) and value:
+            if key in (AWS_OTLP_LOGS_GROUP_HEADER, AWS_OTLP_LOGS_STREAM_HEADER) and value:
                 filtered_log_headers_count += 1
 
     if filtered_log_headers_count != 2:

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

@@ -376,22 +376,20 @@ def test_customize_span_exporter_sigv4(self):
             self.customize_exporter_test(
                 config,
                 _customize_span_exporter,
+                OTLPSpanExporter(),
                 OTLPSpanExporter,
                 AwsAuthSession,
                 Compression.NoCompression,
-                OTLPSpanExporter(),
-                Resource.get_empty(),
             )
 
         for config in bad_configs:
             self.customize_exporter_test(
                 config,
                 _customize_span_exporter,
+                OTLPSpanExporter(),
                 OTLPSpanExporter,
                 Session,
                 Compression.NoCompression,
-                OTLPSpanExporter(),
-                Resource.get_empty(),
             )
 
         self.assertIsInstance(
@@ -482,17 +480,35 @@ def test_customize_logs_exporter_sigv4(self):
 
         for config in good_configs:
             self.customize_exporter_test(
-                config, _customize_logs_exporter, OTLPLogExporter, AwsAuthSession, Compression.Gzip, OTLPLogExporter()
+                config, _customize_logs_exporter, OTLPLogExporter(), OTLPLogExporter, AwsAuthSession, Compression.Gzip
             )
 
         for config in bad_configs:
             self.customize_exporter_test(
-                config, _customize_logs_exporter, OTLPLogExporter, Session, Compression.NoCompression, OTLPLogExporter()
+                config, _customize_logs_exporter, OTLPLogExporter(), OTLPLogExporter, Session, Compression.NoCompression
             )
 
-        self.assertIsInstance(_customize_logs_exporter(OTLPGrpcLogExporter()), OTLPGrpcLogExporter)
+        self.assertIsInstance(
+            _customize_logs_exporter(OTLPGrpcLogExporter(), Resource.get_empty()), 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("amazon.opentelemetry.distro.aws_opentelemetry_configurator._customize_logs_exporter")
+    @patch("amazon.opentelemetry.distro.aws_opentelemetry_configurator.LoggerProvider", return_value=MagicMock())
+    @patch(
+        "amazon.opentelemetry.distro.aws_opentelemetry_configurator.BatchLogRecordProcessor", return_value=MagicMock()
+    )
+    def test_init_logging(
+        self,
+        mock_batch_processor,
+        mock_logger_provider,
+        mock_customize_logs_exporter,
+        mock_get_logger,
+        mock_logging_handler,
+    ):
 
-    def test_init_logging(self):
         captured_exporter = None
 
         def capture_exporter(*args, **kwargs):
@@ -501,6 +517,8 @@ def capture_exporter(*args, **kwargs):
             captured_exporter = result
             return result
 
+        mock_customize_logs_exporter.side_effect = capture_exporter
+
         test_cases = [
             [{"otlp": OTLPLogExporter}, OTLPLogExporter],
             [{}, OTLPLogExporter],
@@ -509,18 +527,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)
 
@@ -664,13 +676,19 @@ def test_customize_metric_exporter(self):
         os.environ.pop("OTEL_METRIC_EXPORT_INTERVAL", None)
 
     def customize_exporter_test(
-        self, config, executor, expected_exporter_type, expected_session, expected_compression, *args
+        self,
+        config,
+        executor,
+        default_exporter,
+        expected_exporter_type,
+        expected_session,
+        expected_compression,
     ):
         for key, value in config.items():
             os.environ[key] = value
 
         try:
-            result = executor(*args)
+            result = executor(default_exporter, Resource.get_empty())
             self.assertIsInstance(result, expected_exporter_type)
             self.assertIsInstance(result._session, expected_session)
             self.assertEqual(result._compression, expected_compression)