Cleanup deprecation messages and test for them

Author: xrmx

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

@@ -327,9 +327,9 @@ def _init_logging(
 
     if setup_logging_handler:
         warnings.warn(
-            "Setting the OTel Logging handler from the SDK and the "
-            "`OTEL_PYTHON_LOGGING_AUTO_INSTRUMENTATION_ENABLED` are deprecated. "
-            "You should install the opentelemetry-instrumentation-logging",
+            "The `OTEL_PYTHON_LOGGING_AUTO_INSTRUMENTATION_ENABLED` environment variable "
+            "and the `LoggingHandler` in `opentelemetry-sdk` that it controls are deprecated."
+            "Install `opentelemetry-instrumentation-logging` package instead.",
             DeprecationWarning,
         )
 

opentelemetry-sdk/src/opentelemetry/sdk/_logs/_internal/__init__.py

@@ -497,7 +497,8 @@ def __init__(
         self._logger_provider = logger_provider or get_logger_provider()
 
         warnings.warn(
-            "This is deprecated you should use the one in opentelemetry-instrumentation-logging",
+            "`LoggingHandler` in `opentelemetry-sdk` is deprecated. Use the "
+            "handler from `opentelemetry-instrumentation-logging` instead.",
             DeprecationWarning,
         )
 

opentelemetry-sdk/tests/logs/test_handler.py

@@ -38,6 +38,13 @@
 
 # pylint: disable=too-many-public-methods
 class TestLoggingHandler(unittest.TestCase):
+    def test_warns_when_used(self):
+        with self.assertWarnsRegex(
+            DeprecationWarning,
+            "`LoggingHandler` in `opentelemetry-sdk` is deprecated",
+        ):
+            LoggingHandler()
+
     def test_handler_default_log_level(self):
         processor, logger, handler = set_up_test_logging(logging.NOTSET)
 

opentelemetry-sdk/tests/test_configurator.py

@@ -843,6 +843,18 @@ def test_logging_init_exporter_without_handler_setup(self):
         getLogger(__name__).error("hello")
         self.assertFalse(provider.processors[0].exporter.export_called)
 
+    def test_logging_init_with_setup_logging_handler_to_true_warns(self):
+        resource = Resource.create({})
+        with self.assertWarnsRegex(
+            DeprecationWarning,
+            "and the `LoggingHandler` in `opentelemetry-sdk` that it controls are deprecated",
+        ):
+            _init_logging(
+                {"otlp": DummyOTLPLogExporter},
+                resource=resource,
+                setup_logging_handler=True,
+            )
+
     @patch.dict(
         environ,
         {"OTEL_RESOURCE_ATTRIBUTES": "service.name=otlp-service"},