From aba76c35bce03de76106d47ae9ee4e6ad95ad79b Mon Sep 17 00:00:00 2001 From: Saquib Jawed <138011435+saquibjawedbit@users.noreply.github.com> Date: Sun, 15 Nov 2026 22:11:45 +0530 Subject: [PATCH] fix(logger): keep string messages that are valid JSON scalars as strings --- aws_lambda_powertools/logging/formatter.py | 8 +++-- .../test_logger_powertools_formatter.py | 32 +++++++++++++++++++ 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/aws_lambda_powertools/logging/formatter.py b/aws_lambda_powertools/logging/formatter.py index 5830e2f39ea..168997111dd 100644 --- a/aws_lambda_powertools/logging/formatter.py +++ b/aws_lambda_powertools/logging/formatter.py @@ -357,9 +357,13 @@ def _extract_log_message(self, log_record: logging.LogRecord) -> dict[str, Any] if isinstance(message, str): # could be a JSON string try: - message = self.json_deserializer(message) + decoded = self.json_deserializer(message) except (json.decoder.JSONDecodeError, TypeError, ValueError): - pass + return message + + # only JSON objects and arrays become structured output; scalars like "null" or "123" stay strings + if isinstance(decoded, (dict, list)): + return decoded return message diff --git a/tests/functional/logger/required_dependencies/test_logger_powertools_formatter.py b/tests/functional/logger/required_dependencies/test_logger_powertools_formatter.py index c824290c76f..12dffacd36e 100644 --- a/tests/functional/logger/required_dependencies/test_logger_powertools_formatter.py +++ b/tests/functional/logger/required_dependencies/test_logger_powertools_formatter.py @@ -122,6 +122,38 @@ def test_with_json_message(stdout, service_name): assert msg == log_dict["message"] +@pytest.mark.parametrize("msg", ["null", "true", "123", "1e3", '"quoted"', "NaN"]) +def test_with_json_scalar_string_message_stays_string(stdout, service_name, msg): + # GIVEN a logger with default settings + logger = Logger(service=service_name, stream=stdout) + + # WHEN logging a string that is also a valid JSON scalar + logger.info(msg) + + # THEN the message is kept as the original string + log_dict = json.loads(stdout.getvalue()) + assert log_dict["message"] == msg + + +@pytest.mark.parametrize( + "msg, expected", + [ + ('{"order_id": 123, "items": ["a", "b"]}', {"order_id": 123, "items": ["a", "b"]}), + ('["a", "b"]', ["a", "b"]), + ], +) +def test_with_json_object_or_array_string_message_is_decoded(stdout, service_name, msg, expected): + # GIVEN a logger with default settings + logger = Logger(service=service_name, stream=stdout) + + # WHEN logging a string that is a JSON object or array + logger.info(msg) + + # THEN the message is decoded into structured output + log_dict = json.loads(stdout.getvalue()) + assert log_dict["message"] == expected + + def test_with_unserializable_value_in_message(stdout, service_name): logger = Logger(service=service_name, level="DEBUG", stream=stdout)