Adding initial logic + test

Author: leandrodamascena

aws_lambda_powertools/logging/buffer/config.py

@@ -12,7 +12,7 @@ class LoggerBufferConfig:
     """
 
     # Define class-level constant for valid log levels
-    VALID_LOG_LEVELS: list[str] = ["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"]
+    VALID_LOG_LEVELS: list[str] = ["DEBUG", "INFO", "WARNING"]
 
     def __init__(
         self,

aws_lambda_powertools/logging/buffer/functions.py

@@ -0,0 +1,42 @@
+from __future__ import annotations
+
+import inspect
+import time
+from typing import Any
+
+
+def _create_buffer_record(level: str, msg: object, args: object, **kwargs) -> dict[str, Any]:
+    caller_frame = inspect.stack()[2]
+    timestamp = time.time()
+
+    return {
+        "level": level.upper(),
+        "msg": msg,
+        "args": args,
+        "filename": caller_frame.filename,
+        "line": caller_frame.lineno,
+        "function": caller_frame.function,
+        "extra_kwargs": kwargs or {},
+        "timestamp": timestamp,
+    }
+
+
+def _resolve_buffer_log_level(buffer_log_level, current_log_level):
+    # Define log level mapping
+    log_levels = {
+        "DEBUG": 10,
+        "INFO": 20,
+        "WARNING": 30,
+        "ERROR": 40,
+        "CRITICAL": 50,
+    }
+
+    # Convert string levels to numeric if needed
+    buffer_level_num = log_levels.get(buffer_log_level.upper())
+    current_level_num = log_levels.get(current_log_level.upper())
+
+    # Compare numeric levels
+    if buffer_level_num < current_level_num:
+        return True
+
+    return False

aws_lambda_powertools/logging/logger.py

@@ -12,12 +12,12 @@
 import os
 import random
 import sys
-import time
 import warnings
 from contextlib import contextmanager
 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.constants import (
     LOGGER_ATTRIBUTE_PRECONFIGURED,
 )
@@ -459,12 +459,12 @@ def decorate(event, context, *args, **kwargs):
         return decorate
 
     def _add_log_to_buffer(self, level, msg, filename, line, function, **kwargs):
-        if self._buffer_cache:
-            return False
+        # Initial implementation, will always cache
+        self._buffer_cache.add("XRAY_ID", msg)
 
         return True
 
-    def info(
+    def debug(
         self,
         msg: object,
         *args: object,
@@ -477,20 +477,9 @@ def info(
         extra = extra or {}
         extra = {**extra, **kwargs}
 
-        if self._logger_buffer:
-            caller_frame = inspect.stack()[1]
-            record = {
-                "level": "INFO",
-                "msg": msg % args if args else msg,
-                "filename": caller_frame.filename,
-                "line": caller_frame.lineno,
-                "function": caller_frame.function,
-                "extra_kwargs": kwargs,
-                "timestamp": time.time(),
-            }
-            return self._add_log_to_buffer(**record)
-        else:
-            return self._logger.info(
+        # Buffer is not active, flushing
+        if not self._logger_buffer:
+            return self._logger.debug(
                 msg,
                 *args,
                 exc_info=exc_info,
@@ -499,7 +488,11 @@ def info(
                 extra=extra,
             )
 
-    def error(
+        log_record = _create_buffer_record(level="DEBUG", msg=msg, args=args, **kwargs)
+
+        self._add_log_to_buffer(**log_record)
+
+    def info(
         self,
         msg: object,
         *args: object,
@@ -512,20 +505,36 @@ def error(
         extra = extra or {}
         extra = {**extra, **kwargs}
 
-        return self._logger.error(
-            msg,
-            *args,
-            exc_info=exc_info,
-            stack_info=stack_info,
-            stacklevel=stacklevel,
-            extra=extra,
-        )
+        # Buffer is not active, flushing
+        if not self._logger_buffer:
+            return self._logger.info(
+                msg,
+                *args,
+                exc_info=exc_info,
+                stack_info=stack_info,
+                stacklevel=stacklevel,
+                extra=extra,
+            )
 
-    def exception(
+        if _resolve_buffer_log_level(self._logger_buffer.minimum_log_level, "INFO"):
+            return self._logger.info(
+                msg,
+                *args,
+                exc_info=exc_info,
+                stack_info=stack_info,
+                stacklevel=stacklevel,
+                extra=extra,
+            )
+
+        log_record: dict[str, Any] = _create_buffer_record(level="INFO", msg=msg, args=args, **kwargs)
+
+        self._add_log_to_buffer(**log_record)
+
+    def warning(
         self,
         msg: object,
         *args: object,
-        exc_info: logging._ExcInfoType = True,
+        exc_info: logging._ExcInfoType = None,
         stack_info: bool = False,
         stacklevel: int = 2,
         extra: Mapping[str, object] | None = None,
@@ -534,16 +543,32 @@ def exception(
         extra = extra or {}
         extra = {**extra, **kwargs}
 
-        return self._logger.exception(
-            msg,
-            *args,
-            exc_info=exc_info,
-            stack_info=stack_info,
-            stacklevel=stacklevel,
-            extra=extra,
-        )
+        # Buffer is not active, flushing
+        if not self._logger_buffer:
+            return self._logger.warning(
+                msg,
+                *args,
+                exc_info=exc_info,
+                stack_info=stack_info,
+                stacklevel=stacklevel,
+                extra=extra,
+            )
 
-    def critical(
+        if _resolve_buffer_log_level(self._logger_buffer.minimum_log_level, "WARNING"):
+            return self._logger.warning(
+                msg,
+                *args,
+                exc_info=exc_info,
+                stack_info=stack_info,
+                stacklevel=stacklevel,
+                extra=extra,
+            )
+
+        log_record = _create_buffer_record(level="WARNING", msg=msg, args=args, **kwargs)
+
+        self._add_log_to_buffer(**log_record)
+
+    def error(
         self,
         msg: object,
         *args: object,
@@ -556,7 +581,7 @@ def critical(
         extra = extra or {}
         extra = {**extra, **kwargs}
 
-        return self._logger.critical(
+        return self._logger.error(
             msg,
             *args,
             exc_info=exc_info,
@@ -565,7 +590,7 @@ def critical(
             extra=extra,
         )
 
-    def warning(
+    def critical(
         self,
         msg: object,
         *args: object,
@@ -578,7 +603,7 @@ def warning(
         extra = extra or {}
         extra = {**extra, **kwargs}
 
-        return self._logger.warning(
+        return self._logger.critical(
             msg,
             *args,
             exc_info=exc_info,
@@ -587,11 +612,11 @@ def warning(
             extra=extra,
         )
 
-    def debug(
+    def exception(
         self,
         msg: object,
         *args: object,
-        exc_info: logging._ExcInfoType = None,
+        exc_info: logging._ExcInfoType = True,
         stack_info: bool = False,
         stacklevel: int = 2,
         extra: Mapping[str, object] | None = None,
@@ -600,7 +625,7 @@ def debug(
         extra = extra or {}
         extra = {**extra, **kwargs}
 
-        return self._logger.debug(
+        return self._logger.exception(
             msg,
             *args,
             exc_info=exc_info,