change flush buffer warning

Author: anafalcao

aws_lambda_powertools/logging/logger.py

@@ -242,6 +242,8 @@ def __init__(
         buffer_config: LoggerBufferConfig | None = None,
         **kwargs,
     ) -> None:
+        self._buffer_config = buffer_config
+        self._buffer_cache = LoggerBufferCache(max_size_bytes=self._buffer_config.max_bytes) if buffer_config else None
 
         # Used in case of sampling
         self.initial_log_level = self._determine_log_level(level)
@@ -1057,7 +1059,7 @@ def _determine_log_level(self, level: str | int | None) -> str | int:
                 warnings.warn(
                     "Advanced Logging Controls (ALC) Log Level is less verbose than Log Buffering Log Level. "
                     "Buffered logs will be filtered by ALC",
-                    UserWarning,
+                    PowertoolsUserWarning,
                     stacklevel=2,
                 )
 
@@ -1196,6 +1198,23 @@ def flush_buffer(self) -> None:
         """
         tracer_id = get_tracer_id()
 
+        # Check ALC level against buffer level
+        lambda_log_level = self._get_aws_lambda_log_level()
+        if lambda_log_level:
+            # Check if buffer level is less verbose than ALC
+            if (
+                hasattr(self, "_buffer_config")
+                and self._buffer_config
+                and logging.getLevelName(lambda_log_level)
+                > logging.getLevelName(self._buffer_config.buffer_at_verbosity)
+            ):
+                warnings.warn(
+                    "Advanced Logging Controls (ALC) Log Level is less verbose than Log Buffering Log Level. "
+                    "Some logs might be missing",
+                    PowertoolsUserWarning,
+                    stacklevel=2,
+                )
+
         # Flushing log without a tracer id? Return
         if not tracer_id:
             return
@@ -1205,20 +1224,6 @@ def flush_buffer(self) -> None:
         if not buffer:
             return
 
-        # Check ALC level before flushing
-        alc_level = self._get_aws_lambda_log_level()
-        if (
-            alc_level is not None
-            and self._buffer_config
-            and logging.getLevelName(alc_level) > logging.getLevelName(self._buffer_config.buffer_at_verbosity)
-        ):
-            warnings.warn(
-                message="Advanced Logging Controls (ALC) Log Level is less verbose than Log Buffering Log Level." 
-                "Some logs might be missing.",
-                category=UserWarning,
-                stacklevel=2,
-            )
-
         # Process log records
         for log_line in buffer:
             self._create_and_flush_log_record(log_line)

tests/functional/logger/required_dependencies/test_powertools_logger_buffer.py

@@ -527,15 +527,22 @@ def handler(event, context):
     assert not logger._buffer_cache.get("1-67c39786-5908a82a246fb67f3089263f")
 
 
-def test_warning_when_alc_less_verbose_than_buffer(monkeypatch):
+def test_warning_when_alc_less_verbose_than_buffer(stdout, monkeypatch):
     # GIVEN Lambda ALC set to INFO
     monkeypatch.setenv("AWS_LAMBDA_LOG_LEVEL", "INFO")
 
-    # WHEN creating a logger with DEBUG buffer level AND logging a debug message
+    # WHEN creating a logger with DEBUG buffer level
     # THEN a warning should be emitted
-    with pytest.warns(UserWarning, match="Advanced Logging Controls .* Buffered logs will be filtered by ALC"):
+    with pytest.warns(PowertoolsUserWarning, match="Advanced Logging Controls*"):
         logger = Logger(service="test", level="DEBUG", buffer_config=LoggerBufferConfig(buffer_at_verbosity="DEBUG"))
-        logger.debug("This is a debug")
+
+    # AND logging a debug message
+    logger.debug("This is a debug")
+
+    # AND flushing buffer
+    # THEN another warning should be emitted about ALC and buffer level mismatch
+    with pytest.warns(PowertoolsUserWarning, match="Advanced Logging Controls*"):
+        logger.flush_buffer()
 
 
 def test_warning_on_buffer_flush_when_alc_less_verbose(monkeypatch):
@@ -551,6 +558,8 @@ def test_warning_on_buffer_flush_when_alc_less_verbose(monkeypatch):
         logger.flush_buffer()
 
     # THEN appropriate warnings should be emitted
-    assert len(warning_info) == 2
-    assert "Buffered logs will be filtered by ALC" in str(warning_info[0].message)
-    assert "Some logs might be missing" in str(warning_info[1].message)
+    assert any("Some logs might be missing" in str(w.message) for w in warning_info)
+    assert any(
+        "Current log level (DEBUG) does not match AWS Lambda Advanced Logging Controls" in str(w.message)
+        for w in warning_info
+    )