From deb29b93152c64e3bf42b5d45ead834ebd2a93ab Mon Sep 17 00:00:00 2001 From: Haegan McGarry Date: Wed, 4 Nov 2026 10:46:00 -0800 Subject: [PATCH] fix(logger): copy thread-local keys in thread_safe_remove_keys remove_context_keys popped keys out of the dict held by the THREAD_LOCAL_KEYS ContextVar in place. asyncio tasks and asyncio.to_thread run in a copy of the caller's context, and that copy points at the same dict, so removing a key in one of them removed it for the caller and every other task that copied it. thread_safe_append_keys and thread_safe_clear_keys already set a new dict. thread_safe_remove_keys now does the same. --- aws_lambda_powertools/logging/formatter.py | 3 ++- .../test_logger_powertools_formatter.py | 27 +++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/aws_lambda_powertools/logging/formatter.py b/aws_lambda_powertools/logging/formatter.py index a14e94d9494..5830e2f39ea 100644 --- a/aws_lambda_powertools/logging/formatter.py +++ b/aws_lambda_powertools/logging/formatter.py @@ -490,7 +490,8 @@ def set_context_keys(**kwargs: dict[str, Any]) -> None: def remove_context_keys(keys: Iterable[str]) -> None: context = _get_context() - context_values = context.get() + # Copy instead of mutating in place: asyncio tasks and copied contexts share this dict object + context_values = dict(context.get()) for k in keys: context_values.pop(k, None) 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 3e68de252b1..c824290c76f 100644 --- a/tests/functional/logger/required_dependencies/test_logger_powertools_formatter.py +++ b/tests/functional/logger/required_dependencies/test_logger_powertools_formatter.py @@ -2,6 +2,7 @@ from __future__ import annotations +import asyncio import io import json import os @@ -486,6 +487,32 @@ def send_message_with_key_and_without(message, keys): assert logs[1].get("exampleThread1Key") is None +def test_thread_safe_remove_keys_does_not_affect_tasks_sharing_the_context(service_name, stdout): + logger = Logger( + service=service_name, + stream=stdout, + ) + + async def process_order(): + await asyncio.sleep(0) + logger.info("processing order") + + async def main(): + logger.thread_safe_append_keys(order_id="order-1") + task = asyncio.create_task(process_order()) # the task runs in a copy of the current context + logger.thread_safe_remove_keys(["order_id"]) + await task + logger.info("caller after removing the key") + + asyncio.run(main()) + + logs = capture_logging_output(stdout) + + assert logs[0].get("message") == "processing order" + assert logs[0].get("order_id") == "order-1" + assert logs[1].get("order_id") is None + + def test_thread_safe_clear_key(service_name, stdout): logger = Logger( service=service_name,