From b26db2a66815b6f63b93fb2dd2f57ac643d8a61d Mon Sep 17 00:00:00 2001 From: Harsh Raj Singhania Date: Sun, 15 Nov 2026 21:07:13 +0530 Subject: [PATCH 1/3] fix(logger): reject reserved LogRecord attributes in append_keys Raise ValueError when attempting to append keys that collide with reserved LogRecord attributes, preventing silent logging failures. Fixes #8831 --- aws_lambda_powertools/logging/logger.py | 7 +++++ .../required_dependencies/test_logger.py | 30 +++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/aws_lambda_powertools/logging/logger.py b/aws_lambda_powertools/logging/logger.py index 5d2a515d516..5f248e24d43 100644 --- a/aws_lambda_powertools/logging/logger.py +++ b/aws_lambda_powertools/logging/logger.py @@ -30,6 +30,7 @@ from aws_lambda_powertools.logging.filters import SuppressFilter from aws_lambda_powertools.logging.formatter import ( RESERVED_FORMATTER_CUSTOM_KEYS, + RESERVED_LOG_ATTRS, BasePowertoolsFormatter, LambdaPowertoolsFormatter, ) @@ -808,6 +809,9 @@ def exception( ) def append_keys(self, **additional_keys: object) -> None: + for key in additional_keys: + if key in RESERVED_LOG_ATTRS: + raise ValueError(f"Key '{key}' is a reserved LogRecord attribute and cannot be used.") self.registered_formatter.append_keys(**additional_keys) def get_current_keys(self) -> dict[str, Any]: @@ -856,6 +860,9 @@ def clear_state(self) -> None: # They prevent race conditions and ensure data consistency across multiple threads. def thread_safe_append_keys(self, **additional_keys: object) -> None: # Append additional key-value pairs to the context safely in a thread-safe manner. + for key in additional_keys: + if key in RESERVED_LOG_ATTRS: + raise ValueError(f"Key '{key}' is a reserved LogRecord attribute and cannot be used.") self.registered_formatter.thread_safe_append_keys(**additional_keys) def thread_safe_get_current_keys(self) -> dict[str, Any]: diff --git a/tests/functional/logger/required_dependencies/test_logger.py b/tests/functional/logger/required_dependencies/test_logger.py index afc16b6cbfb..aeb913a20c8 100644 --- a/tests/functional/logger/required_dependencies/test_logger.py +++ b/tests/functional/logger/required_dependencies/test_logger.py @@ -1618,3 +1618,33 @@ def handler(event, context): log = capture_logging_output(stdout) assert log["function_name"] == lambda_context.function_name assert log["function_request_id"] == lambda_context.aws_request_id + + +def test_append_keys_rejects_reserved_log_attrs(stdout, service_name): + # GIVEN a Logger is initialized + logger = Logger(service=service_name, stream=stdout) + + # WHEN attempting to append a reserved LogRecord attribute + # THEN it should raise ValueError with clear message + with pytest.raises(ValueError, match="Key 'lineno' is a reserved LogRecord attribute"): + logger.append_keys(lineno=5) + + # AND subsequent logs should still work normally + logger.info("after rejected append") + output = stdout.getvalue() + assert "after rejected append" in output + + +def test_thread_safe_append_keys_rejects_reserved_log_attrs(stdout, service_name): + # GIVEN a Logger is initialized + logger = Logger(service=service_name, stream=stdout) + + # WHEN attempting to append a reserved LogRecord attribute in thread-safe method + # THEN it should raise ValueError + with pytest.raises(ValueError, match="Key 'levelname' is a reserved LogRecord attribute"): + logger.thread_safe_append_keys(levelname="INFO") + + # AND subsequent logs should still work normally + logger.info("after rejected thread-safe append") + output = stdout.getvalue() + assert "after rejected thread-safe append" in output From dd1a247ed3e6861da5684b51fa801d9de4bf373c Mon Sep 17 00:00:00 2001 From: Harsh Raj Singhania <40535627+HarshRajSinghania@users.noreply.github.com> Date: Tue, 17 Nov 2026 11:11:33 +0530 Subject: [PATCH 2/3] fix(logger): check value type for reserved LogRecord attributes --- aws_lambda_powertools/logging/logger.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/aws_lambda_powertools/logging/logger.py b/aws_lambda_powertools/logging/logger.py index 5f248e24d43..638eb323898 100644 --- a/aws_lambda_powertools/logging/logger.py +++ b/aws_lambda_powertools/logging/logger.py @@ -809,9 +809,12 @@ def exception( ) def append_keys(self, **additional_keys: object) -> None: - for key in additional_keys: - if key in RESERVED_LOG_ATTRS: - raise ValueError(f"Key '{key}' is a reserved LogRecord attribute and cannot be used.") + for key, value in additional_keys.items(): + if key in RESERVED_LOG_ATTRS and value and not isinstance(value, str): + raise ValueError( + f"Key '{key}' is a reserved LogRecord attribute and needs a str value, " + f"instead got '{type(value).__name__}'.", + ) self.registered_formatter.append_keys(**additional_keys) def get_current_keys(self) -> dict[str, Any]: @@ -860,9 +863,12 @@ def clear_state(self) -> None: # They prevent race conditions and ensure data consistency across multiple threads. def thread_safe_append_keys(self, **additional_keys: object) -> None: # Append additional key-value pairs to the context safely in a thread-safe manner. - for key in additional_keys: - if key in RESERVED_LOG_ATTRS: - raise ValueError(f"Key '{key}' is a reserved LogRecord attribute and cannot be used.") + for key, value in additional_keys.items(): + if key in RESERVED_LOG_ATTRS and value and not isinstance(value, str): + raise ValueError( + f"Key '{key}' is a reserved LogRecord attribute and needs a str value, " + f"instead got '{type(value).__name__}'.", + ) self.registered_formatter.thread_safe_append_keys(**additional_keys) def thread_safe_get_current_keys(self) -> dict[str, Any]: From a8d4f5e8e640173a1e23a8c38857aceceea9f48b Mon Sep 17 00:00:00 2001 From: Harsh Raj Singhania <40535627+HarshRajSinghania@users.noreply.github.com> Date: Tue, 17 Nov 2026 11:11:35 +0530 Subject: [PATCH 3/3] test(logger): use non-string value for reserved key rejection test --- tests/functional/logger/required_dependencies/test_logger.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/functional/logger/required_dependencies/test_logger.py b/tests/functional/logger/required_dependencies/test_logger.py index aeb913a20c8..bfb77f4dc35 100644 --- a/tests/functional/logger/required_dependencies/test_logger.py +++ b/tests/functional/logger/required_dependencies/test_logger.py @@ -1642,7 +1642,7 @@ def test_thread_safe_append_keys_rejects_reserved_log_attrs(stdout, service_name # WHEN attempting to append a reserved LogRecord attribute in thread-safe method # THEN it should raise ValueError with pytest.raises(ValueError, match="Key 'levelname' is a reserved LogRecord attribute"): - logger.thread_safe_append_keys(levelname="INFO") + logger.thread_safe_append_keys(levelname=20) # AND subsequent logs should still work normally logger.info("after rejected thread-safe append")