Keep using one warning

Author: xrmx

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

@@ -15,12 +15,7 @@
 
 from opentelemetry.sdk._logs._internal import (
     LogData,
-    LogLimitsInitDeprecatedWarning,
-    LogRecordInitDeprecatedWarning,
-    LogDataInitDeprecatedWarning,
-    LogRecordContextDeprecatedWarning,
-    InMemoryLogExporterDeprecatedWarning,
-    ConsoleLogExporterDeprecatedWarning,
+    LogDeprecatedInitWarning,
     LogDroppedAttributesWarning,
     Logger,
     LoggerProvider,
@@ -38,11 +33,6 @@
     "LogLimits",
     "LogRecord",
     "LogRecordProcessor",
-    "LogLimitsInitDeprecatedWarning",
-    "LogRecordInitDeprecatedWarning",
+    "LogDeprecatedInitWarning",
     "LogDroppedAttributesWarning",
-    "LogDataInitDeprecatedWarning",
-    "LogRecordContextDeprecatedWarning",
-    "InMemoryLogExporterDeprecatedWarning",
-    "ConsoleLogExporterDeprecatedWarning",
 ]

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

@@ -84,76 +84,16 @@ class LogDroppedAttributesWarning(UserWarning):
 warnings.simplefilter("once", LogDroppedAttributesWarning)
 
 
-class LogLimitsInitDeprecatedWarning(UserWarning):
-    """Custom warning to indicate deprecated LogLimits init was used.
+class LogDeprecatedInitWarning(UserWarning):
+    """Custom warning to indicate that deprecated and soon to be deprecated Log classes was used.
 
     This class is used to filter and handle these specific warnings separately
     from other warnings, ensuring that they are only shown once without
     interfering with default user warnings.
     """
 
 
-warnings.simplefilter("once", LogLimitsInitDeprecatedWarning)
-
-
-class LogRecordInitDeprecatedWarning(UserWarning):
-    """Custom warning to indicate deprecated LogRecord init was used.
-
-    This class is used to filter and handle these specific warnings separately
-    from other warnings, ensuring that they are only shown once without
-    interfering with default user warnings.
-    """
-
-
-warnings.simplefilter("once", LogRecordInitDeprecatedWarning)
-
-
-class LogDataInitDeprecatedWarning(UserWarning):
-    """Custom warning to indicate deprecated LogData init was used.
-
-    This class is used to filter and handle these specific warnings separately
-    from other warnings, ensuring that they are only shown once without
-    interfering with default user warnings.
-    """
-
-
-warnings.simplefilter("once", LogDataInitDeprecatedWarning)
-
-
-class LogRecordContextDeprecatedWarning(UserWarning):
-    """Custom warning to indicate LogRecord was initialized without using context.
-
-    This class is used to filter and handle these specific warnings separately
-    from other warnings, ensuring that they are only shown once without
-    interfering with default user warnings.
-    """
-
-
-warnings.simplefilter("once", LogRecordContextDeprecatedWarning)
-
-
-class InMemoryLogExporterDeprecatedWarning(UserWarning):
-    """Custom warning to indicate InMemoryLogExporter is deprecated.
-
-    This class is used to filter and handle these specific warnings separately
-    from other warnings, ensuring that they are only shown once without
-    interfering with default user warnings.
-    """
-
-
-warnings.simplefilter("once", LogRecordContextDeprecatedWarning)
-
-
-class ConsoleLogExporterDeprecatedWarning(UserWarning):
-    """Custom warning to indicate ConsoleLogExporter is deprecated.
-
-    This class is used to filter and handle these specific warnings separately
-    from other warnings, ensuring that they are only shown once without
-    interfering with default user warnings.
-    """
-
-
-warnings.simplefilter("once", ConsoleLogExporterDeprecatedWarning)
+warnings.simplefilter("once", LogDeprecatedInitWarning)
 
 
 class LogLimits:
@@ -209,7 +149,7 @@ def __init__(
 
         warnings.warn(
             "LogLimits will be deprecated in 1.39.0 and then renamed to LogRecordLimits",
-            LogLimitsInitDeprecatedWarning,
+            LogDeprecatedInitWarning,
             stacklevel=0,
         )
 
@@ -302,7 +242,7 @@ def __init__(  # pylint:disable=too-many-locals
     ):
         warnings.warn(
             "LogRecord will be substituted in 1.39.0 by ReadWriteLogRecord and ReadableLogRecord",
-            LogRecordInitDeprecatedWarning,
+            LogDeprecatedInitWarning,
             stacklevel=0,
         )
         if not context:
@@ -311,7 +251,7 @@ def __init__(  # pylint:disable=too-many-locals
             if trace_id or span_id or trace_flags:
                 warnings.warn(
                     "LogRecord init with `trace_id`, `span_id`, and/or `trace_flags` is deprecated since 1.35.0. Use `context` instead.",
-                    LogRecordContextDeprecatedWarning,
+                    LogDeprecatedInitWarning,
                     stacklevel=2,
                 )
 
@@ -431,7 +371,7 @@ def __init__(
     ):
         warnings.warn(
             "LogData will be substituted in 1.39.0 by ReadWriteLogRecord and ReadableLogRecord",
-            LogDataInitDeprecatedWarning,
+            LogDeprecatedInitWarning,
             stacklevel=0,
         )
         self.log_record = log_record

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

@@ -29,7 +29,7 @@
 )
 from opentelemetry.sdk._logs import (
     LogData,
-    ConsoleLogExporterDeprecatedWarning,
+    LogDeprecatedInitWarning,
     LogRecord,
     LogRecordProcessor,
 )
@@ -101,7 +101,7 @@ def __init__(
 
         warnings.warn(
             "ConsoleLogExporter will be deprecated in 1.39.0 and then renamed to ConsoleLogRecordExporter",
-            ConsoleLogExporterDeprecatedWarning,
+            LogDeprecatedInitWarning,
             stacklevel=0,
         )
 

opentelemetry-sdk/src/opentelemetry/sdk/_logs/_internal/export/in_memory_log_exporter.py

@@ -16,7 +16,7 @@
 import typing
 import warnings
 
-from opentelemetry.sdk._logs import LogData, InMemoryLogExporterDeprecatedWarning
+from opentelemetry.sdk._logs import LogData, LogDeprecatedInitWarning
 from opentelemetry.sdk._logs.export import LogExporter, LogExportResult
 
 
@@ -35,7 +35,7 @@ def __init__(self):
 
         warnings.warn(
             "InMemoryLogExporter will be deprecated in 1.39.0 and then renamed to InMemoryLogRecordExporter",
-            InMemoryLogExporterDeprecatedWarning,
+            LogDeprecatedInitWarning,
             stacklevel=0,
         )
 

opentelemetry-sdk/tests/logs/test_export.py

@@ -27,9 +27,8 @@
 from opentelemetry._logs import SeverityNumber
 from opentelemetry.sdk import trace
 from opentelemetry.sdk._logs import (
-    ConsoleLogExporterDeprecatedWarning,
-    InMemoryLogExporterDeprecatedWarning,
     LogData,
+    LogDeprecatedInitWarning,
     LoggerProvider,
     LoggingHandler,
     LogRecord,
@@ -657,19 +656,17 @@ def test_console_log_exporter_deprecated_warning(self):
             warnings.simplefilter("always")
             ConsoleLogExporter()
 
-        # Check that at least one ConsoleLogExporterDeprecatedWarning was emitted
+        # Check that at least one LogDeprecatedInitWarning, was emitted
         console_warnings = [
-            w
-            for w in cw
-            if isinstance(w.message, ConsoleLogExporterDeprecatedWarning)
+            w for w in cw if isinstance(w.message, LogDeprecatedInitWarning)
         ]
         self.assertGreater(
             len(console_warnings),
             0,
-            "Expected at least one ConsoleLogExporterDeprecatedWarning",
+            "Expected at least one LogDeprecatedInitWarning",
         )
 
-        # Check the message content of the ConsoleLogExporterDeprecatedWarning
+        # Check the message content of the warning
         warning_message = str(console_warnings[0].message)
         self.assertIn(
             "ConsoleLogExporter will be deprecated in 1.39.0 and then renamed to ConsoleLogRecordExporter",
@@ -683,16 +680,14 @@ def test_console_log_exporter_deprecated_warning_once(self):
             for _ in range(10):
                 ConsoleLogExporter()
 
-        # Check that exactly one ConsoleLogExporterDeprecatedWarning was emitted
+        # Check that exactly one LogDeprecatedInitWarning was emitted
         console_warnings = [
-            w
-            for w in cw
-            if isinstance(w.message, ConsoleLogExporterDeprecatedWarning)
+            w for w in cw if isinstance(w.message, LogDeprecatedInitWarning)
         ]
         self.assertEqual(
             len(console_warnings),
             1,
-            "Expected exactly one ConsoleLogExporterDeprecatedWarning due to simplefilter('once')",
+            "Expected exactly one LogDeprecatedInitWarning due to simplefilter('once')",
         )
 
         # Check the message content
@@ -710,19 +705,17 @@ def test_in_memory_log_exporter_deprecated_warning(self):
             warnings.simplefilter("always")
             InMemoryLogExporter()
 
-        # Check that at least one InMemoryLogExporterDeprecatedWarning was emitted
+        # Check that at least one LogDeprecatedInitWarning was emitted
         in_memory_warnings = [
-            w
-            for w in cw
-            if isinstance(w.message, InMemoryLogExporterDeprecatedWarning)
+            w for w in cw if isinstance(w.message, LogDeprecatedInitWarning)
         ]
         self.assertGreater(
             len(in_memory_warnings),
             0,
-            "Expected at least one InMemoryLogExporterDeprecatedWarning",
+            "Expected at least one LogDeprecatedInitWarning",
         )
 
-        # Check the message content of the InMemoryLogExporterDeprecatedWarning
+        # Check the message content of the warning
         warning_message = str(in_memory_warnings[0].message)
         self.assertIn(
             "InMemoryLogExporter will be deprecated in 1.39.0 and then renamed to InMemoryLogRecordExporter",
@@ -736,16 +729,14 @@ def test_in_memory_log_exporter_deprecated_warning_once(self):
             for _ in range(10):
                 InMemoryLogExporter()
 
-        # Check that exactly one InMemoryLogExporterDeprecatedWarning was emitted
+        # Check that exactly one LogDeprecatedInitWarning was emitted
         in_memory_warnings = [
-            w
-            for w in cw
-            if isinstance(w.message, InMemoryLogExporterDeprecatedWarning)
+            w for w in cw if isinstance(w.message, LogDeprecatedInitWarning)
         ]
         self.assertEqual(
             len(in_memory_warnings),
             1,
-            "Expected exactly one InMemoryLogExporterDeprecatedWarning due to simplefilter('once')",
+            "Expected exactly one LogDeprecatedInitWarning due to simplefilter('once')",
         )
 
         # Check the message content

opentelemetry-sdk/tests/logs/test_log_limits.py

@@ -16,7 +16,7 @@
 import warnings
 from unittest.mock import patch
 
-from opentelemetry.sdk._logs import LogLimits, LogLimitsInitDeprecatedWarning
+from opentelemetry.sdk._logs import LogDeprecatedInitWarning, LogLimits
 from opentelemetry.sdk._logs._internal import (
     _DEFAULT_OTEL_ATTRIBUTE_COUNT_LIMIT,
 )
@@ -79,7 +79,7 @@ def test_log_limits_init_deprecated_warning(self):
             LogLimits()
 
         self.assertEqual(len(cw), 1)
-        self.assertIsInstance(cw[-1].message, LogLimitsInitDeprecatedWarning)
+        self.assertIsInstance(cw[-1].message, LogDeprecatedInitWarning)
         self.assertIn(
             "LogLimits will be deprecated in 1.39.0 and then renamed to LogRecordLimits",
             str(cw[-1].message),
@@ -92,7 +92,7 @@ def test_log_limits_init_deprecated_warning_with_params(self):
             LogLimits(max_attributes=10, max_attribute_length=100)
 
         self.assertEqual(len(cw), 1)
-        self.assertIsInstance(cw[-1].message, LogLimitsInitDeprecatedWarning)
+        self.assertIsInstance(cw[-1].message, LogDeprecatedInitWarning)
         self.assertIn(
             "LogLimits will be deprecated in 1.39.0 and then renamed to LogRecordLimits",
             str(cw[-1].message),
@@ -106,7 +106,7 @@ def test_log_limits_init_deprecated_warning_once(self):
                 LogLimits()
 
         self.assertEqual(len(cw), 1)
-        self.assertIsInstance(cw[-1].message, LogLimitsInitDeprecatedWarning)
+        self.assertIsInstance(cw[-1].message, LogDeprecatedInitWarning)
         self.assertIn(
             "LogLimits will be deprecated in 1.39.0 and then renamed to LogRecordLimits",
             str(cw[-1].message),