More refactor

Author: leandrodamascena

aws_lambda_powertools/logging/buffer/cache.py

@@ -189,7 +189,7 @@ def clear(self, key: str | None = None) -> None:
         else:
             self.cache.clear()
 
-    def has_evicted(self, key: str) -> bool:
+    def has_items_evicted(self, key: str) -> bool:
         """
         Check if a specific key's cache has evicted items.
 

aws_lambda_powertools/logging/constants.py

@@ -3,5 +3,3 @@
 # logger.init attribute is set when Logger has been configured
 LOGGER_ATTRIBUTE_PRECONFIGURED = "init"
 LOGGER_ATTRIBUTE_HANDLER = "logger_handler"
-
-LOGGER_BUFFER_FIRST_INVOKE = "FIRST_INVOKE"

aws_lambda_powertools/logging/logger.py

@@ -22,7 +22,6 @@
     LOGGER_ATTRIBUTE_HANDLER,
     LOGGER_ATTRIBUTE_POWERTOOLS_HANDLER,
     LOGGER_ATTRIBUTE_PRECONFIGURED,
-    LOGGER_BUFFER_FIRST_INVOKE,
 )
 from aws_lambda_powertools.logging.exceptions import (
     InvalidBufferItem,
@@ -528,7 +527,7 @@ def _add_log_record_to_buffer(
         exc_info: logging._ExcInfoType = None,
         stack_info: bool = False,
         extra: Mapping[str, object] | None = None,
-    ):
+    ) -> None:
         """
         Add log record to buffer with intelligent tracer ID handling.
 
@@ -558,33 +557,23 @@ def _add_log_record_to_buffer(
         between different tracer contexts.
         """
         # Determine tracer ID, defaulting to first invoke marker
-        tracer_id = get_tracer_id() or LOGGER_BUFFER_FIRST_INVOKE
+        tracer_id = get_tracer_id()
 
         try:
-            # Create log record for buffering
-            log_record: dict[str, Any] = _create_buffer_record(level=level, msg=msg, args=args, extra=extra)
-
-            # Migrate log records from first invoke to current tracer context
-            if tracer_id != LOGGER_BUFFER_FIRST_INVOKE and self._buffer_cache.get(LOGGER_BUFFER_FIRST_INVOKE):
-                # Retrieve first invoke log records
-                first_invoke_items = self._buffer_cache.get(LOGGER_BUFFER_FIRST_INVOKE)
-
-                # Transfer log records to current tracer context
-                for item in first_invoke_items:
-                    self._buffer_cache.add(tracer_id, item)
-
-                # Clear first invoke buffer
-                self._buffer_cache.clear(LOGGER_BUFFER_FIRST_INVOKE)
-
-            # Add current log record to buffer
-            self._buffer_cache.add(tracer_id, log_record)
+            if tracer_id:
+                log_record: dict[str, Any] = _create_buffer_record(level=level, msg=msg, args=args, extra=extra)
+                self._buffer_cache.add(tracer_id, log_record)
         except InvalidBufferItem as exc:
-            # Wrap and re-raise buffer addition error
-            raise InvalidBufferItem("Cannot add item to the buffer") from exc
+            # Wrap and re-raise buffer addition error as warning
+            warnings.warn(
+                message=f"Cannot add item to the buffer: {str(exc)}",
+                category=PowertoolsUserWarning,
+                stacklevel=3,
+            )
 
-    def flush_buffer(self):
+    def flush_buffer(self) -> None:
         """
-        Flush all buffered log records associated with current trace ID.
+        Flush all buffered log records associated with current execution.
 
         Notes
         -----
@@ -599,10 +588,22 @@ def flush_buffer(self):
         will be propagated to caller
         """
         tracer_id = get_tracer_id()
-        for log_line in self._buffer_cache.get(tracer_id):
+
+        # Flushing log without a tracer id? Return
+        if not tracer_id:
+            return
+
+        # is buffer empty? return
+        buffer = self._buffer_cache.get(tracer_id)
+        if not buffer:
+            return
+
+        # Process log records
+        for log_line in buffer:
             self._create_and_flush_log_record(log_line)
 
-        if self._buffer_cache.has_evicted(tracer_id):
+        # Has items evicted?
+        if self._buffer_cache.has_items_evicted(tracer_id):
             warnings.warn(
                 message="Some logs are not displayed because they were evicted from the buffer. "
                 "Increase buffer size to store more logs in the buffer",

tests/unit/logger/required_dependencies/test_logger_buffer_cache.py

@@ -38,7 +38,7 @@ def test_add_multiple_items_same_key():
     # THEN items are stored sequentially
     assert len(logger_cache.get("key1")) == 2
     assert logger_cache.get("key1") == ["item1", "item2"]
-    assert logger_cache.has_evicted("key1") is False
+    assert logger_cache.has_items_evicted("key1") is False
 
 
 def test_cache_size_limit_single_key():
@@ -53,7 +53,7 @@ def test_cache_size_limit_single_key():
     # THEN cache maintains size limit for a single key
     assert len(logger_cache.get("key1")) > 0
     assert logger_cache.get_current_size("key1") <= 10
-    assert logger_cache.has_evicted("key1") is True
+    assert logger_cache.has_items_evicted("key1") is True
 
 
 def test_item_larger_than_cache():