Start flushing logs

Author: leandrodamascena

aws_lambda_powertools/logging/logger.py

@@ -457,15 +457,20 @@ def decorate(event, context, *args, **kwargs):
 
         return decorate
 
-    def _add_log_line_to_buffer(self, level, msg, filename, line, function, **kwargs):
+    def _add_log_line_to_buffer(self, log_record: dict[str, Any]):
         # Initial implementation, will always cache
-        self._buffer_cache.add("XRAY_ID", msg)
-
-        return True
+        # Add logic for "empty"
+        tracer_id = os.getenv(constants.XRAY_TRACE_ID_ENV, None)
+        if tracer_id:
+            self._buffer_cache.add(tracer_id, log_record)
 
     def flush_buffer(self):
-        ## INITIAL IMPLEMENTATION
-        self._logger.debug("Buffer was flushed")
+        # Initial logic
+        tracer_id = os.getenv(constants.XRAY_TRACE_ID_ENV, None)
+        for item in self._buffer_cache.get(tracer_id):
+            self._logger.debug(item["msg"])
+
+        self._buffer_cache.clear()
 
     def debug(
         self,
@@ -493,7 +498,7 @@ def debug(
 
         log_record = _create_buffer_record(level="DEBUG", msg=msg, args=args, **kwargs)
 
-        self._add_log_line_to_buffer(**log_record)
+        self._add_log_line_to_buffer(log_record)
 
     def info(
         self,
@@ -532,7 +537,7 @@ def info(
 
         log_record: dict[str, Any] = _create_buffer_record(level="INFO", msg=msg, args=args, **kwargs)
 
-        self._add_log_line_to_buffer(**log_record)
+        self._add_log_line_to_buffer(log_record)
 
     def warning(
         self,
@@ -571,7 +576,7 @@ def warning(
 
         log_record = _create_buffer_record(level="WARNING", msg=msg, args=args, **kwargs)
 
-        self._add_log_line_to_buffer(**log_record)
+        self._add_log_line_to_buffer(log_record)
 
     def error(
         self,

tests/functional/logger/required_dependencies/test_powertools_logger_buffer.py

@@ -10,6 +10,7 @@
 
 from aws_lambda_powertools import Logger
 from aws_lambda_powertools.logging.buffer import LoggerBufferConfig
+from aws_lambda_powertools.shared import constants
 
 
 @pytest.fixture
@@ -95,8 +96,9 @@ def test_logger_buffer_is_never_buffered_with_error_new(stdout, service_name):
 
 
 @pytest.mark.parametrize("log_level", ["CRITICAL", "ERROR"])
-def test_logger_buffer_is_flushed_when_an_error_happens(stdout, service_name, log_level):
+def test_logger_buffer_is_flushed_when_an_error_happens(stdout, service_name, log_level, monkeypatch):
     # GIVEN: A logger configured with buffer
+    monkeypatch.setenv(constants.XRAY_TRACE_ID_ENV, "1234")
     logger_buffer_config = LoggerBufferConfig(max_size=10240, minimum_log_level="DEBUG", flush_on_error=True)
     logger = Logger(level="DEBUG", service=service_name, stream=stdout, logger_buffer=logger_buffer_config)
 
@@ -115,7 +117,8 @@ def test_logger_buffer_is_flushed_when_an_error_happens(stdout, service_name, lo
 
     # THEN: We expect the log record is not buffered
     log = capture_multiple_logging_statements_output(stdout)
-    assert "Buffer was flushed" == log[0]["message"]
+    assert "this log line will be flushed" == log[0]["message"]
+    assert "this log line will be flushed too" == log[1]["message"]
 
 
 @pytest.mark.parametrize("log_level", ["CRITICAL", "ERROR"])