Fixing logic to handle log flush

Author: leandrodamascena

aws_lambda_powertools/logging/buffer/functions.py

@@ -21,7 +21,7 @@ def _create_buffer_record(level: str, msg: object, args: object, **kwargs) -> di
     }
 
 
-def _resolve_buffer_log_level(buffer_log_level, current_log_level):
+def _check_minimum_buffer_log_level(buffer_log_level, current_log_level):
     # Define log level mapping
     log_levels = {
         "DEBUG": 10,
@@ -36,7 +36,7 @@ def _resolve_buffer_log_level(buffer_log_level, current_log_level):
     current_level_num = log_levels.get(current_log_level.upper())
 
     # Compare numeric levels
-    if buffer_level_num <= current_level_num:
+    if buffer_level_num < current_level_num:
         return True
 
     return False

aws_lambda_powertools/logging/logger.py

@@ -17,7 +17,7 @@
 from typing import IO, TYPE_CHECKING, Any, Callable, Generator, Iterable, Mapping, TypeVar, overload
 
 from aws_lambda_powertools.logging.buffer.cache import LoggerBufferCache
-from aws_lambda_powertools.logging.buffer.functions import _create_buffer_record, _resolve_buffer_log_level
+from aws_lambda_powertools.logging.buffer.functions import _check_minimum_buffer_log_level, _create_buffer_record
 from aws_lambda_powertools.logging.constants import (
     LOGGER_ATTRIBUTE_PRECONFIGURED,
 )
@@ -86,7 +86,7 @@ class Logger:
     ----------
     service : str, optional
         service name to be appended in logs, by default "service_undefined"
-    level : Literal["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"], int optional
+    level : str, int optional
         The level to set. Can be a string representing the level name: 'DEBUG', 'INFO', 'WARNING', 'ERROR', 'CRITICAL'
         or an integer representing the level value: 10 for 'DEBUG', 20 for 'INFO', 30 for 'WARNING', 40 for 'ERROR', 50 for 'CRITICAL'.
         by default "INFO"
@@ -457,7 +457,7 @@ def decorate(event, context, *args, **kwargs):
 
         return decorate
 
-    def _add_log_to_buffer(self, level, msg, filename, line, function, **kwargs):
+    def _add_log_line_to_buffer(self, level, msg, filename, line, function, **kwargs):
         # Initial implementation, will always cache
         self._buffer_cache.add("XRAY_ID", msg)
 
@@ -493,7 +493,7 @@ def debug(
 
         log_record = _create_buffer_record(level="DEBUG", msg=msg, args=args, **kwargs)
 
-        self._add_log_to_buffer(**log_record)
+        self._add_log_line_to_buffer(**log_record)
 
     def info(
         self,
@@ -520,7 +520,7 @@ def info(
             )
 
         # Buffer log level is higher than this log level and we need to flush
-        if _resolve_buffer_log_level(self._logger_buffer.minimum_log_level, "INFO"):
+        if _check_minimum_buffer_log_level(self._logger_buffer.minimum_log_level, "INFO"):
             return self._logger.info(
                 msg,
                 *args,
@@ -532,7 +532,7 @@ def info(
 
         log_record: dict[str, Any] = _create_buffer_record(level="INFO", msg=msg, args=args, **kwargs)
 
-        self._add_log_to_buffer(**log_record)
+        self._add_log_line_to_buffer(**log_record)
 
     def warning(
         self,
@@ -559,7 +559,7 @@ def warning(
             )
 
         # Buffer log level is higher than this log level and we need to flush
-        if _resolve_buffer_log_level(self._logger_buffer.minimum_log_level, "WARNING"):
+        if _check_minimum_buffer_log_level(self._logger_buffer.minimum_log_level, "WARNING"):
             return self._logger.warning(
                 msg,
                 *args,
@@ -571,7 +571,7 @@ def warning(
 
         log_record = _create_buffer_record(level="WARNING", msg=msg, args=args, **kwargs)
 
-        self._add_log_to_buffer(**log_record)
+        self._add_log_line_to_buffer(**log_record)
 
     def error(
         self,

tests/unit/logger/required_dependencies/test_logger_buffer_functions.py

@@ -1,36 +1,29 @@
-from aws_lambda_powertools.logging.buffer.functions import _resolve_buffer_log_level
+from aws_lambda_powertools.logging.buffer.functions import _check_minimum_buffer_log_level
 
 
 def test_resolve_buffer_log_level_comparison():
     # Test cases where buffer level is lower than current level (should return True)
-    assert _resolve_buffer_log_level("DEBUG", "INFO") is True
-    assert _resolve_buffer_log_level("DEBUG", "WARNING") is True
-    assert _resolve_buffer_log_level("DEBUG", "ERROR") is True
-    assert _resolve_buffer_log_level("INFO", "WARNING") is True
-    assert _resolve_buffer_log_level("INFO", "ERROR") is True
-    assert _resolve_buffer_log_level("WARNING", "ERROR") is True
-
-    # Test cases where buffer level is equal to current level (should return True)
-    assert _resolve_buffer_log_level("INFO", "INFO") is True
-    assert _resolve_buffer_log_level("DEBUG", "DEBUG") is True
-    assert _resolve_buffer_log_level("WARNING", "WARNING") is True
-    assert _resolve_buffer_log_level("ERROR", "ERROR") is True
-    assert _resolve_buffer_log_level("CRITICAL", "CRITICAL") is True
+    assert _check_minimum_buffer_log_level("DEBUG", "INFO") is True
+    assert _check_minimum_buffer_log_level("DEBUG", "WARNING") is True
+    assert _check_minimum_buffer_log_level("DEBUG", "ERROR") is True
+    assert _check_minimum_buffer_log_level("INFO", "WARNING") is True
+    assert _check_minimum_buffer_log_level("INFO", "ERROR") is True
+    assert _check_minimum_buffer_log_level("WARNING", "ERROR") is True
 
     # Test cases where buffer level is higher than current level (should return False)
-    assert _resolve_buffer_log_level("ERROR", "DEBUG") is False
-    assert _resolve_buffer_log_level("CRITICAL", "INFO") is False
-    assert _resolve_buffer_log_level("ERROR", "WARNING") is False
+    assert _check_minimum_buffer_log_level("ERROR", "DEBUG") is False
+    assert _check_minimum_buffer_log_level("CRITICAL", "INFO") is False
+    assert _check_minimum_buffer_log_level("ERROR", "WARNING") is False
 
 
 def test_resolve_buffer_log_level_case_insensitivity():
     # Test case insensitivity
-    assert _resolve_buffer_log_level("debug", "INFO") is True
-    assert _resolve_buffer_log_level("DEBUG", "info") is True
-    assert _resolve_buffer_log_level("Debug", "Info") is True
+    assert _check_minimum_buffer_log_level("debug", "INFO") is True
+    assert _check_minimum_buffer_log_level("DEBUG", "info") is True
+    assert _check_minimum_buffer_log_level("Debug", "Info") is True
 
 
 def test_resolve_buffer_log_level_edge_cases():
     # Additional edge cases
-    assert _resolve_buffer_log_level("DEBUG", "CRITICAL") is True
-    assert _resolve_buffer_log_level("CRITICAL", "DEBUG") is False
+    assert _check_minimum_buffer_log_level("DEBUG", "CRITICAL") is True
+    assert _check_minimum_buffer_log_level("CRITICAL", "DEBUG") is False