Merge branch 'develop' into fix/thread-safe-tests

leandrodamascena · web-flow · commit 2cfef5902c17 · 2025-06-30T10:27:54.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,8 @@
 
 ## Bug Fixes
 
+* **event_source:** fix decode headers with signed bytes ([#6878](https://github.com/aws-powertools/powertools-lambda-python/issues/6878))
+* **logger:** caplog working with parent Logger ([#6847](https://github.com/aws-powertools/powertools-lambda-python/issues/6847))
 * **logger:** fix exception on flush without buffer ([#6794](https://github.com/aws-powertools/powertools-lambda-python/issues/6794))
 
 ## Features
@@ -14,29 +16,31 @@
 
 ## Maintenance
 
-* **ci:** new pre-release 3.15.2a2 ([#6865](https://github.com/aws-powertools/powertools-lambda-python/issues/6865))
+* **ci:** new pre-release 3.15.2a3 ([#6876](https://github.com/aws-powertools/powertools-lambda-python/issues/6876))
 * **ci:** new pre-release 3.15.2a0 ([#6852](https://github.com/aws-powertools/powertools-lambda-python/issues/6852))
 * **ci:** new pre-release 3.15.2a1 ([#6860](https://github.com/aws-powertools/powertools-lambda-python/issues/6860))
-* **ci:** new pre-release 3.15.2a3 ([#6876](https://github.com/aws-powertools/powertools-lambda-python/issues/6876))
+* **ci:** new pre-release 3.15.2a2 ([#6865](https://github.com/aws-powertools/powertools-lambda-python/issues/6865))
+* **ci:** new pre-release 3.15.2a4 ([#6881](https://github.com/aws-powertools/powertools-lambda-python/issues/6881))
 * **ci:** fix command to replace layer number ([#6868](https://github.com/aws-powertools/powertools-lambda-python/issues/6868))
 * **deps:** bump valkey-glide from 1.3.5 to 2.0.1 ([#6871](https://github.com/aws-powertools/powertools-lambda-python/issues/6871))
-* **deps:** bump pydantic-settings from 2.9.1 to 2.10.1 ([#6872](https://github.com/aws-powertools/powertools-lambda-python/issues/6872))
-* **deps:** bump datadog-lambda from 6.110.0 to 6.111.0 ([#6857](https://github.com/aws-powertools/powertools-lambda-python/issues/6857))
 * **deps:** bump redis from 5.3.0 to 6.2.0 ([#6827](https://github.com/aws-powertools/powertools-lambda-python/issues/6827))
+* **deps:** bump pydantic-settings from 2.9.1 to 2.10.1 ([#6872](https://github.com/aws-powertools/powertools-lambda-python/issues/6872))
 * **deps:** bump pydantic from 2.11.5 to 2.11.7 ([#6844](https://github.com/aws-powertools/powertools-lambda-python/issues/6844))
 * **deps:** bump docker/setup-buildx-action from 3.10.0 to 3.11.1 ([#6823](https://github.com/aws-powertools/powertools-lambda-python/issues/6823))
-* **deps-dev:** bump boto3-stubs from 1.38.42 to 1.38.43 ([#6864](https://github.com/aws-powertools/powertools-lambda-python/issues/6864))
+* **deps:** bump datadog-lambda from 6.110.0 to 6.111.0 ([#6857](https://github.com/aws-powertools/powertools-lambda-python/issues/6857))
 * **deps-dev:** bump pytest from 8.4.0 to 8.4.1 ([#6874](https://github.com/aws-powertools/powertools-lambda-python/issues/6874))
+* **deps-dev:** bump boto3-stubs from 1.38.41 to 1.38.42 ([#6858](https://github.com/aws-powertools/powertools-lambda-python/issues/6858))
+* **deps-dev:** bump boto3-stubs from 1.38.43 to 1.38.44 ([#6873](https://github.com/aws-powertools/powertools-lambda-python/issues/6873))
 * **deps-dev:** bump aws-cdk from 2.1019.1 to 2.1019.2 ([#6875](https://github.com/aws-powertools/powertools-lambda-python/issues/6875))
 * **deps-dev:** bump sentry-sdk from 2.29.1 to 2.31.0 ([#6870](https://github.com/aws-powertools/powertools-lambda-python/issues/6870))
 * **deps-dev:** bump aws-cdk from 2.1018.1 to 2.1019.1 ([#6837](https://github.com/aws-powertools/powertools-lambda-python/issues/6837))
 * **deps-dev:** bump mypy from 1.16.0 to 1.16.1 ([#6828](https://github.com/aws-powertools/powertools-lambda-python/issues/6828))
-* **deps-dev:** bump boto3-stubs from 1.38.43 to 1.38.44 ([#6873](https://github.com/aws-powertools/powertools-lambda-python/issues/6873))
+* **deps-dev:** bump bandit from 1.8.3 to 1.8.5 ([#6856](https://github.com/aws-powertools/powertools-lambda-python/issues/6856))
 * **deps-dev:** bump boto3-stubs from 1.38.34 to 1.38.41 ([#6845](https://github.com/aws-powertools/powertools-lambda-python/issues/6845))
 * **deps-dev:** bump aws-cdk-aws-lambda-python-alpha from 2.200.1a0 to 2.202.0a0 ([#6846](https://github.com/aws-powertools/powertools-lambda-python/issues/6846))
+* **deps-dev:** bump boto3-stubs from 1.38.42 to 1.38.43 ([#6864](https://github.com/aws-powertools/powertools-lambda-python/issues/6864))
+* **deps-dev:** bump boto3-stubs from 1.38.44 to 1.38.45 ([#6880](https://github.com/aws-powertools/powertools-lambda-python/issues/6880))
 * **deps-dev:** bump cfn-lint from 1.35.4 to 1.36.1 ([#6855](https://github.com/aws-powertools/powertools-lambda-python/issues/6855))
-* **deps-dev:** bump bandit from 1.8.3 to 1.8.5 ([#6856](https://github.com/aws-powertools/powertools-lambda-python/issues/6856))
-* **deps-dev:** bump boto3-stubs from 1.38.41 to 1.38.42 ([#6858](https://github.com/aws-powertools/powertools-lambda-python/issues/6858))
 
 
 <a name="v3.15.1"></a>
diff --git a/aws_lambda_powertools/logging/logger.py b/aws_lambda_powertools/logging/logger.py
@@ -374,6 +374,9 @@ def _init_logger(
         if not self._is_deduplication_disabled:
             logger.debug("Adding filter in root logger to suppress child logger records to bubble up")
             for handler in logging.root.handlers:
+                # skip suppressing pytest's handler, allowing caplog fixture usage
+                if type(handler).__name__ == "LogCaptureHandler" and type(handler).__module__ == "_pytest.logging":
+                    continue
                 # It'll add a filter to suppress any child logger from self.service
                 # Example: `Logger(service="order")`, where service is Order
                 # It'll reject all loggers starting with `order` e.g. order.checkout, order.shared
diff --git a/aws_lambda_powertools/shared/functions.py b/aws_lambda_powertools/shared/functions.py
@@ -291,3 +291,19 @@ def sanitize_xray_segment_name(name: str) -> str:
 def get_tracer_id() -> str | None:
     xray_trace_id = os.getenv(constants.XRAY_TRACE_ID_ENV)
     return xray_trace_id.split(";")[0].replace("Root=", "") if xray_trace_id else None
+
+
+def decode_header_bytes(byte_list):
+    """
+    Decode a list of byte values that might be signed.
+    If any negative values exist, handle them as signed bytes.
+    Otherwise use the normal bytes construction.
+    """
+    has_negative = any(b < 0 for b in byte_list)
+
+    if not has_negative:
+        # Use normal bytes construction if all values are positive
+        return bytes(byte_list)
+    # Convert signed bytes to unsigned (0-255 range)
+    unsigned_bytes = [(b & 0xFF) for b in byte_list]
+    return bytes(unsigned_bytes)
diff --git a/aws_lambda_powertools/shared/version.py b/aws_lambda_powertools/shared/version.py
@@ -1,3 +1,3 @@
 """Exposes version constant to avoid circular dependencies."""
 
-VERSION = "3.15.2a3"
+VERSION = "3.15.2a4"
diff --git a/aws_lambda_powertools/utilities/data_classes/kafka_event.py b/aws_lambda_powertools/utilities/data_classes/kafka_event.py
@@ -4,6 +4,7 @@
 from functools import cached_property
 from typing import TYPE_CHECKING, Any
 
+from aws_lambda_powertools.shared.functions import decode_header_bytes
 from aws_lambda_powertools.utilities.data_classes.common import CaseInsensitiveDict, DictWrapper
 
 if TYPE_CHECKING:
@@ -110,7 +111,7 @@ def headers(self) -> list[dict[str, list[int]]]:
     @cached_property
     def decoded_headers(self) -> dict[str, bytes]:
         """Decodes the headers as a single dictionary."""
-        return CaseInsensitiveDict((k, bytes(v)) for chunk in self.headers for k, v in chunk.items())
+        return CaseInsensitiveDict((k, decode_header_bytes(v)) for chunk in self.headers for k, v in chunk.items())
 
 
 class KafkaEventBase(DictWrapper):
diff --git a/aws_lambda_powertools/utilities/kafka/consumer_records.py b/aws_lambda_powertools/utilities/kafka/consumer_records.py
@@ -4,6 +4,7 @@
 from functools import cached_property
 from typing import TYPE_CHECKING, Any
 
+from aws_lambda_powertools.shared.functions import decode_header_bytes
 from aws_lambda_powertools.utilities.data_classes.common import CaseInsensitiveDict
 from aws_lambda_powertools.utilities.data_classes.kafka_event import KafkaEventBase, KafkaEventRecordBase
 from aws_lambda_powertools.utilities.kafka.deserializer.deserializer import get_deserializer
@@ -115,7 +116,9 @@ def original_headers(self) -> list[dict[str, list[int]]]:
     @cached_property
     def headers(self) -> dict[str, bytes]:
         """Decodes the headers as a single dictionary."""
-        return CaseInsensitiveDict((k, bytes(v)) for chunk in self.original_headers for k, v in chunk.items())
+        return CaseInsensitiveDict(
+            (k, decode_header_bytes(v)) for chunk in self.original_headers for k, v in chunk.items()
+        )
 
 
 class ConsumerRecords(KafkaEventBase):
diff --git a/aws_lambda_powertools/utilities/parser/models/kafka.py b/aws_lambda_powertools/utilities/parser/models/kafka.py
@@ -3,7 +3,7 @@
 
 from pydantic import BaseModel, field_validator
 
-from aws_lambda_powertools.shared.functions import base64_decode, bytes_to_string
+from aws_lambda_powertools.shared.functions import base64_decode, bytes_to_string, decode_header_bytes
 
 SERVERS_DELIMITER = ","
 
@@ -28,9 +28,7 @@ class KafkaRecordModel(BaseModel):
     # key is optional; only decode if not None
     @field_validator("key", mode="before")
     def decode_key(cls, value):
-        if value is not None:
-            return base64_decode(value)
-        return value
+        return base64_decode(value) if value is not None else value
 
     @field_validator("value", mode="before")
     def data_base64_decode(cls, value):
@@ -41,7 +39,7 @@ def data_base64_decode(cls, value):
     def decode_headers_list(cls, value):
         for header in value:
             for key, values in header.items():
-                header[key] = bytes(values)
+                header[key] = decode_header_bytes(values)
         return value
 
 
@@ -51,7 +49,7 @@ class KafkaBaseEventModel(BaseModel):
 
     @field_validator("bootstrapServers", mode="before")
     def split_servers(cls, value):
-        return None if not value else value.split(SERVERS_DELIMITER)
+        return value.split(SERVERS_DELIMITER) if value else None
 
 
 class KafkaSelfManagedEventModel(KafkaBaseEventModel):
diff --git a/poetry.lock b/poetry.lock
diff --git a/provenance/3.15.2a4/multiple.intoto.jsonl b/provenance/3.15.2a4/multiple.intoto.jsonl
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "aws_lambda_powertools"
-version = "3.15.2a3"
+version = "3.15.2a4"
 description = "Powertools for AWS Lambda (Python) is a developer toolkit to implement Serverless best practices and increase developer velocity."
 authors = ["Amazon Web Services"]
 include = ["aws_lambda_powertools/py.typed", "THIRD-PARTY-LICENSES"]
diff --git a/tests/events/kafkaEventMsk.json b/tests/events/kafkaEventMsk.json
@@ -104,6 +104,28 @@
               "dataFormat": "AVRO",
               "schemaId": "1234"
            }
+        },
+        {
+           "topic":"mymessage-with-unsigned",
+           "partition":0,
+           "offset":15,
+           "timestamp":1545084650987,
+           "timestampType":"CREATE_TIME",
+           "key": null,
+           "value":"eyJrZXkiOiJ2YWx1ZSJ9",
+           "headers":[
+              {
+                 "headerKey":[104, 101, 108, 108, 111, 45, 119, 111, 114, 108, 100, 45, -61, -85]
+              }
+           ],
+           "valueSchemaMetadata": {
+              "dataFormat": "AVRO",
+              "schemaId": "1234"
+           },
+           "keySchemaMetadata": {
+              "dataFormat": "AVRO",
+              "schemaId": "1234"
+           }
         }
      ]
   }
diff --git a/tests/functional/logger/required_dependencies/test_logger.py b/tests/functional/logger/required_dependencies/test_logger.py
@@ -15,6 +15,7 @@
 from typing import TYPE_CHECKING, Any
 
 import pytest
+from _pytest.logging import LogCaptureHandler
 
 from aws_lambda_powertools import Logger
 from aws_lambda_powertools.logging import correlation_paths
@@ -1556,3 +1557,24 @@ def handler(event, context):
     # THEN we must be able to inject context
     log = capture_logging_output(stdout)
     assert request_id == log["correlation_id"]
+
+
+def test_non_preconfigured_logger_with_caplog(caplog, service_name):
+    caplog.set_level("INFO")
+    logger = Logger(service=service_name)
+    logger.info("testing, testing...")
+    pytest_handler_existence = any(isinstance(item, LogCaptureHandler) for item in logger._logger.root.handlers)
+
+    assert pytest_handler_existence is True
+    assert len(caplog.records) == 1
+    assert caplog.records[0].message == "testing, testing..."
+
+
+def test_child_logger_with_caplog(caplog):
+    caplog.set_level("INFO")
+    logger = Logger(child=True)
+    logger.info("testing, testing...")
+    pytest_handler_existence = any(isinstance(item, LogCaptureHandler) for item in logger._logger.root.handlers)
+
+    assert len(caplog.records) == 1
+    assert pytest_handler_existence is True
diff --git a/tests/unit/data_classes/required_dependencies/test_kafka_event.py b/tests/unit/data_classes/required_dependencies/test_kafka_event.py
@@ -21,7 +21,7 @@ def test_kafka_msk_event():
     assert parsed_event.decoded_bootstrap_servers == bootstrap_servers_list
 
     records = list(parsed_event.records)
-    assert len(records) == 3
+    assert len(records) == 4
     record = records[0]
     raw_record = raw_event["records"]["mytopic-0"][0]
     assert record.topic == raw_record["topic"]
@@ -40,9 +40,10 @@ def test_kafka_msk_event():
     assert record.value_schema_metadata.schema_id == raw_record["valueSchemaMetadata"]["schemaId"]
 
     assert parsed_event.record == records[0]
-    for i in range(1, 3):
+    for i in range(1, 4):
         record = records[i]
         assert record.key is None
+        assert record.decoded_headers is not None
 
 
 def test_kafka_self_managed_event():
@@ -90,5 +91,5 @@ def test_kafka_record_property_with_stopiteration_error():
     # WHEN calling record property thrice
     # THEN raise StopIteration
     with pytest.raises(StopIteration):
-        for _ in range(4):
+        for _ in range(5):
             assert parsed_event.record.topic is not None
diff --git a/tests/unit/parser/_pydantic/test_kafka.py b/tests/unit/parser/_pydantic/test_kafka.py
@@ -17,7 +17,7 @@ def test_kafka_msk_event_with_envelope():
     )
     for i in range(3):
         assert parsed_event[i].key == "value"
-    assert len(parsed_event) == 3
+    assert len(parsed_event) == 4
 
 
 def test_kafka_self_managed_event_with_envelope():
@@ -70,7 +70,7 @@ def test_kafka_msk_event():
     assert parsed_event.eventSourceArn == raw_event["eventSourceArn"]
 
     records = list(parsed_event.records["mytopic-0"])
-    assert len(records) == 3
+    assert len(records) == 4
     record: KafkaRecordModel = records[0]
     raw_record = raw_event["records"]["mytopic-0"][0]
     assert record.topic == raw_record["topic"]
@@ -88,6 +88,6 @@ def test_kafka_msk_event():
     assert record.keySchemaMetadata.schemaId == "1234"
     assert record.valueSchemaMetadata.dataFormat == "AVRO"
     assert record.valueSchemaMetadata.schemaId == "1234"
-    for i in range(1, 3):
+    for i in range(1, 4):
         record: KafkaRecordModel = records[i]
         assert record.key is None

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`"""Exposes version constant to avoid circular dependencies."""`
`2`	`2`
`3`		`-VERSION = "3.15.2a3"`
	`3`	`+VERSION = "3.15.2a4"`