Clean up

Author: jeremydvoss

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

@@ -492,8 +492,7 @@ class _OTelSDKConfigurator(_BaseConfigurator):
 
     Initializes several crucial OTel SDK components (i.e. TracerProvider,
     MeterProvider, Processors...) according to a default implementation. Other
-    Configurators can subclass and slightly alter
-     this initialization.
+    Configurators can subclass and slightly alter this initialization.
 
     NOTE: This class should not be instantiated nor should it become an entry
     point on the `opentelemetry-sdk` package. Instead, distros should subclass

opentelemetry-sdk/tests/test_configurator.py

@@ -682,16 +682,14 @@ def test_logging_init_exporter(self):
         environ,
         {
             "OTEL_RESOURCE_ATTRIBUTES": "service.name=otlp-service",
-            "OTEL_PYTHON_LOG_LEVEL": "CUSTOM_LOG_LEVEL",
         },
-        clear=True,
     )
-    @patch("opentelemetry.sdk._configuration._get_log_level", return_value=39)
-    def test_logging_init_exporter_level_under(self, log_level_mock):
+    def test_logging_init_exporter_without_handler_setup(self):
         resource = Resource.create({})
         _init_logging(
             {"otlp": DummyOTLPLogExporter},
             resource=resource,
+            setup_logging_handler=False,
         )
         self.assertEqual(self.set_provider_mock.call_count, 1)
         provider = self.set_provider_mock.call_args[0][0]
@@ -706,14 +704,12 @@ def test_logging_init_exporter_level_under(self, log_level_mock):
             provider.processor.exporter, DummyOTLPLogExporter
         )
         getLogger(__name__).error("hello")
-        self.assertTrue(provider.processor.exporter.export_called)
+        self.assertFalse(provider.processor.exporter.export_called)
         root_logger = getLogger()
-        handler_present = False
+        self.assertEqual(root_logger.level, WARNING)
         for handler in root_logger.handlers:
             if isinstance(handler, LoggingHandler):
-                handler_present = True
-                self.assertEqual(handler.level, 39)
-        self.assertTrue(handler_present)
+                self.fail()
 
     @patch.dict(
         environ,
@@ -723,8 +719,8 @@ def test_logging_init_exporter_level_under(self, log_level_mock):
         },
         clear=True,
     )
-    @patch("opentelemetry.sdk._configuration._get_log_level", return_value=41)
-    def test_logging_init_exporter_level_over(self, log_level_mock):
+    @patch("opentelemetry.sdk._configuration._get_log_level", return_value=39)
+    def test_logging_init_exporter_level_under(self, log_level_mock):
         resource = Resource.create({})
         _init_logging(
             {"otlp": DummyOTLPLogExporter},
@@ -743,23 +739,25 @@ def test_logging_init_exporter_level_over(self, log_level_mock):
             provider.processor.exporter, DummyOTLPLogExporter
         )
         getLogger(__name__).error("hello")
-        self.assertFalse(provider.processor.exporter.export_called)
+        self.assertTrue(provider.processor.exporter.export_called)
         root_logger = getLogger()
         handler_present = False
         for handler in root_logger.handlers:
             if isinstance(handler, LoggingHandler):
                 handler_present = True
-                self.assertEqual(handler.level, 41)
+                self.assertEqual(handler.level, 39)
         self.assertTrue(handler_present)
 
     @patch.dict(
         environ,
         {
             "OTEL_RESOURCE_ATTRIBUTES": "service.name=otlp-service",
-            "OTEL_PYTHON_LOG_FORMAT": CUSTOM_LOG_FORMAT,
+            "OTEL_PYTHON_LOG_LEVEL": "CUSTOM_LOG_LEVEL",
         },
+        clear=True,
     )
-    def test_logging_init_exporter_format(self):
+    @patch("opentelemetry.sdk._configuration._get_log_level", return_value=41)
+    def test_logging_init_exporter_level_over(self, log_level_mock):
         resource = Resource.create({})
         _init_logging(
             {"otlp": DummyOTLPLogExporter},
@@ -778,28 +776,27 @@ def test_logging_init_exporter_format(self):
             provider.processor.exporter, DummyOTLPLogExporter
         )
         getLogger(__name__).error("hello")
-        self.assertTrue(provider.processor.exporter.export_called)
+        self.assertFalse(provider.processor.exporter.export_called)
         root_logger = getLogger()
-        self.assertEqual(root_logger.level, WARNING)
         handler_present = False
         for handler in root_logger.handlers:
             if isinstance(handler, LoggingHandler):
-                self.assertEqual(handler.formatter._fmt, CUSTOM_LOG_FORMAT)
                 handler_present = True
+                self.assertEqual(handler.level, 41)
         self.assertTrue(handler_present)
 
     @patch.dict(
         environ,
         {
             "OTEL_RESOURCE_ATTRIBUTES": "service.name=otlp-service",
+            "OTEL_PYTHON_LOG_FORMAT": CUSTOM_LOG_FORMAT,
         },
     )
-    def test_logging_init_exporter_without_handler_setup(self):
+    def test_logging_init_exporter_format(self):
         resource = Resource.create({})
         _init_logging(
             {"otlp": DummyOTLPLogExporter},
             resource=resource,
-            setup_logging_handler=False,
         )
         self.assertEqual(self.set_provider_mock.call_count, 1)
         provider = self.set_provider_mock.call_args[0][0]
@@ -814,12 +811,15 @@ def test_logging_init_exporter_without_handler_setup(self):
             provider.processor.exporter, DummyOTLPLogExporter
         )
         getLogger(__name__).error("hello")
-        self.assertFalse(provider.processor.exporter.export_called)
+        self.assertTrue(provider.processor.exporter.export_called)
         root_logger = getLogger()
         self.assertEqual(root_logger.level, WARNING)
+        handler_present = False
         for handler in root_logger.handlers:
             if isinstance(handler, LoggingHandler):
-                self.fail()
+                self.assertEqual(handler.formatter._fmt, CUSTOM_LOG_FORMAT)
+                handler_present = True
+        self.assertTrue(handler_present)
 
     @patch.dict(environ, {}, clear=True)
     def test_OTEL_PYTHON_LOG_LEVEL_by_name_default(self):