Remove UNSET value, only use None as Default value

Author: giongto35

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

@@ -104,7 +104,7 @@ class LogLimits:
     This class does not enforce any limits itself. It only provides a way to read limits from env,
     default values and from user provided arguments.
 
-    All limit arguments must be either a non-negative integer, ``None`` or ``LogLimits.UNSET``.
+    All limit arguments must be either a non-negative integer or ``None``.
 
     - All limit arguments are optional.
     - If a limit argument is not set, the class will try to read its value from the corresponding
@@ -126,8 +126,6 @@ class LogLimits:
             the specified length will be truncated.
     """
 
-    UNSET = -1
-
     def __init__(
         self,
         max_attributes: int | None = None,
@@ -156,9 +154,6 @@ def __repr__(self):
     def _from_env_if_absent(
         cls, value: int | None, env_var: str, default: int | None = None
     ) -> int | None:
-        if value == cls.UNSET:
-            value = None  # continue to read the limit from env
-
         err_msg = "{} must be a non-negative integer but got {}"
 
         # if no value is provided for the limit, try to load it from env
@@ -181,12 +176,6 @@ def _from_env_if_absent(
         return value
 
 
-_UnsetLogLimits = LogLimits(
-    max_attributes=LogLimits.UNSET,
-    max_attribute_length=LogLimits.UNSET,
-)
-
-
 class LogRecord(APILogRecord):
     """A LogRecord instance represents an event being logged.
 
@@ -206,7 +195,7 @@ def __init__(
         body: AnyValue | None = None,
         resource: Resource | None = None,
         attributes: _ExtendedAttributes | None = None,
-        limits: LogLimits | None = _UnsetLogLimits,
+        limits: LogLimits | None = None,
         event_name: str | None = None,
     ): ...
 
@@ -226,7 +215,7 @@ def __init__(
         body: AnyValue | None = None,
         resource: Resource | None = None,
         attributes: _ExtendedAttributes | None = None,
-        limits: LogLimits | None = _UnsetLogLimits,
+        limits: LogLimits | None = None,
     ): ...
 
     def __init__(  # pylint:disable=too-many-locals
@@ -242,7 +231,7 @@ def __init__(  # pylint:disable=too-many-locals
         body: AnyValue | None = None,
         resource: Resource | None = None,
         attributes: _ExtendedAttributes | None = None,
-        limits: LogLimits | None = _UnsetLogLimits,
+        limits: LogLimits | None = None,
         event_name: str | None = None,
     ):
         if trace_id or span_id or trace_flags:
@@ -258,6 +247,10 @@ def __init__(  # pylint:disable=too-many-locals
         span = get_current_span(context)
         span_context = span.get_span_context()
 
+        # Use default LogLimits if none provided
+        if limits is None:
+            limits = LogLimits()
+
         super().__init__(
             **{
                 "timestamp": timestamp,
@@ -692,7 +685,7 @@ def __init__(
         multi_log_record_processor: SynchronousMultiLogRecordProcessor
         | ConcurrentMultiLogRecordProcessor
         | None = None,
-        log_limits: LogLimits | None = _UnsetLogLimits,
+        log_limits: LogLimits | None = None,
     ):
         if resource is None:
             self._resource = Resource.create({})
@@ -708,7 +701,7 @@ def __init__(
             self._at_exit_handler = atexit.register(self.shutdown)
         self._logger_cache = {}
         self._logger_cache_lock = Lock()
-        self._log_limits = log_limits
+        self._log_limits = log_limits or LogLimits()
 
     @property
     def resource(self):

opentelemetry-sdk/tests/logs/test_handler.py

@@ -27,7 +27,7 @@
     LoggingHandler,
     LogRecordProcessor,
 )
-from opentelemetry.sdk._logs._internal import LogLimits, _UnsetLogLimits
+from opentelemetry.sdk._logs._internal import LogLimits
 from opentelemetry.sdk.environment_variables import OTEL_ATTRIBUTE_COUNT_LIMIT
 from opentelemetry.semconv._incubating.attributes import code_attributes
 from opentelemetry.semconv.attributes import exception_attributes
@@ -372,99 +372,78 @@ def test_handler_root_logger_with_disabled_sdk_does_not_go_into_recursion_error(
     @patch.dict(os.environ, {OTEL_ATTRIBUTE_COUNT_LIMIT: "3"})
     def test_otel_attribute_count_limit_respected_in_logging_handler(self):
         """Test that OTEL_ATTRIBUTE_COUNT_LIMIT is properly respected by LoggingHandler."""
-        # Store original values to restore later
-        original_max_attributes = _UnsetLogLimits.max_attributes
-        original_max_attribute_length = _UnsetLogLimits.max_attribute_length
-
-        try:
-            # Force _UnsetLogLimits to re-read the environment variable
-            _UnsetLogLimits.max_attributes = (
-                _UnsetLogLimits._from_env_if_absent(
-                    LogLimits.UNSET, OTEL_ATTRIBUTE_COUNT_LIMIT
-                )
-            )
-
-            processor, logger = set_up_test_logging(logging.WARNING)
+        # Create a new LoggerProvider within the patched environment
+        # This will create LogLimits() that reads from the environment variable
+        logger_provider = LoggerProvider()
+        processor = FakeProcessor()
+        logger_provider.add_log_record_processor(processor)
+        logger = logging.getLogger("env_test")
+        handler = LoggingHandler(
+            level=logging.WARNING, logger_provider=logger_provider
+        )
+        logger.addHandler(handler)
 
-            # Create a log record with many extra attributes
-            extra_attrs = {f"custom_attr_{i}": f"value_{i}" for i in range(10)}
+        # Create a log record with many extra attributes
+        extra_attrs = {f"custom_attr_{i}": f"value_{i}" for i in range(10)}
 
-            with self.assertLogs(level=logging.WARNING):
-                logger.warning(
-                    "Test message with many attributes", extra=extra_attrs
-                )
+        with self.assertLogs(level=logging.WARNING):
+            logger.warning(
+                "Test message with many attributes", extra=extra_attrs
+            )
 
-            log_record = processor.get_log_record(0)
+        log_record = processor.get_log_record(0)
 
-            # With OTEL_ATTRIBUTE_COUNT_LIMIT=3, should have exactly 3 attributes
-            total_attrs = len(log_record.attributes)
-            self.assertEqual(
-                total_attrs,
-                3,
-                f"Should have exactly 3 attributes due to limit, got {total_attrs}",
-            )
+        # With OTEL_ATTRIBUTE_COUNT_LIMIT=3, should have exactly 3 attributes
+        total_attrs = len(log_record.attributes)
+        self.assertEqual(
+            total_attrs,
+            3,
+            f"Should have exactly 3 attributes due to limit, got {total_attrs}",
+        )
 
-            # Should have 10 dropped attributes (10 custom + 3 code - 3 kept = 10 dropped)
-            self.assertEqual(
-                log_record.dropped_attributes,
-                10,
-                f"Should have 10 dropped attributes, got {log_record.dropped_attributes}",
-            )
-        finally:
-            # Restore original values
-            _UnsetLogLimits.max_attributes = original_max_attributes
-            _UnsetLogLimits.max_attribute_length = (
-                original_max_attribute_length
-            )
+        # Should have 10 dropped attributes (10 custom + 3 code - 3 kept = 10 dropped)
+        self.assertEqual(
+            log_record.dropped_attributes,
+            10,
+            f"Should have 10 dropped attributes, got {log_record.dropped_attributes}",
+        )
 
     @patch.dict(os.environ, {OTEL_ATTRIBUTE_COUNT_LIMIT: "5"})
     def test_otel_attribute_count_limit_includes_code_attributes(self):
         """Test that OTEL_ATTRIBUTE_COUNT_LIMIT applies to all attributes including code attributes."""
-        # Import _UnsetLogLimits directly
-
-        # Store original values to restore later
-        original_max_attributes = _UnsetLogLimits.max_attributes
-        original_max_attribute_length = _UnsetLogLimits.max_attribute_length
-
-        try:
-            # Force _UnsetLogLimits to re-read the environment variable
-            _UnsetLogLimits.max_attributes = (
-                _UnsetLogLimits._from_env_if_absent(
-                    LogLimits.UNSET, OTEL_ATTRIBUTE_COUNT_LIMIT
-                )
-            )
-
-            # Now proceed with the test
-            processor, logger = set_up_test_logging(logging.WARNING)
+        # Create a new LoggerProvider within the patched environment
+        # This will create LogLimits() that reads from the environment variable
+        logger_provider = LoggerProvider()
+        processor = FakeProcessor()
+        logger_provider.add_log_record_processor(processor)
+        logger = logging.getLogger("env_test_2")
+        handler = LoggingHandler(
+            level=logging.WARNING, logger_provider=logger_provider
+        )
+        logger.addHandler(handler)
 
-            # Create a log record with some extra attributes
-            extra_attrs = {f"user_attr_{i}": f"value_{i}" for i in range(8)}
+        # Create a log record with some extra attributes
+        extra_attrs = {f"user_attr_{i}": f"value_{i}" for i in range(8)}
 
-            with self.assertLogs(level=logging.WARNING):
-                logger.warning("Test message", extra=extra_attrs)
+        with self.assertLogs(level=logging.WARNING):
+            logger.warning("Test message", extra=extra_attrs)
 
-            log_record = processor.get_log_record(0)
+        log_record = processor.get_log_record(0)
 
-            # With OTEL_ATTRIBUTE_COUNT_LIMIT=5, should have exactly 5 attributes
-            total_attrs = len(log_record.attributes)
-            self.assertEqual(
-                total_attrs,
-                5,
-                f"Should have exactly 5 attributes due to limit, got {total_attrs}",
-            )
+        # With OTEL_ATTRIBUTE_COUNT_LIMIT=5, should have exactly 5 attributes
+        total_attrs = len(log_record.attributes)
+        self.assertEqual(
+            total_attrs,
+            5,
+            f"Should have exactly 5 attributes due to limit, got {total_attrs}",
+        )
 
-            # Should have 6 dropped attributes (8 user + 3 code - 5 kept = 6 dropped)
-            self.assertEqual(
-                log_record.dropped_attributes,
-                6,
-                f"Should have 6 dropped attributes, got {log_record.dropped_attributes}",
-            )
-        finally:
-            # Restore original values
-            _UnsetLogLimits.max_attributes = original_max_attributes
-            _UnsetLogLimits.max_attribute_length = (
-                original_max_attribute_length
-            )
+        # Should have 6 dropped attributes (8 user + 3 code - 5 kept = 6 dropped)
+        self.assertEqual(
+            log_record.dropped_attributes,
+            6,
+            f"Should have 6 dropped attributes, got {log_record.dropped_attributes}",
+        )
 
     def test_logging_handler_without_env_var_uses_default_limit(self):
         """Test that without OTEL_ATTRIBUTE_COUNT_LIMIT, default limit (128) should apply."""