Merge branch 'develop' into ci-bump-12026246999

Author: anafalcao

.github/workflows/on_closed_issues.yml

@@ -21,7 +21,7 @@ jobs:
       permissions:
           issues: write  # comment on issues
       steps:
-          - uses: aws-actions/closed-issue-message@80edfc24bdf1283400eb04d20a8a605ae8bf7d48
+          - uses: aws-powertools/actions/.github/actions/close-issue-message@428c1934f4b22c0984ff4a39b66c2f70765bbed6
             with:
                 repo-token: "${{ secrets.GITHUB_TOKEN }}"
                 message: |

CHANGELOG.md

@@ -27,41 +27,44 @@
 ## Maintenance
 
 * **ci:** new pre-release 3.3.1a4 ([#5612](https://github.com/aws-powertools/powertools-lambda-python/issues/5612))
+* **ci:** revert closed issue action update ([#5637](https://github.com/aws-powertools/powertools-lambda-python/issues/5637))
+* **ci:** new pre-release 3.3.1a5 ([#5639](https://github.com/aws-powertools/powertools-lambda-python/issues/5639))
+* **ci:** replace closed-issue-message action with powertools action ([#5641](https://github.com/aws-powertools/powertools-lambda-python/issues/5641))
 * **ci:** new pre-release 3.3.1a0 ([#5565](https://github.com/aws-powertools/powertools-lambda-python/issues/5565))
 * **ci:** new pre-release 3.3.1a1 ([#5577](https://github.com/aws-powertools/powertools-lambda-python/issues/5577))
 * **ci:** remove poetry cache in quality check pipeline ([#5626](https://github.com/aws-powertools/powertools-lambda-python/issues/5626))
 * **ci:** new pre-release 3.3.1a2 ([#5585](https://github.com/aws-powertools/powertools-lambda-python/issues/5585))
 * **ci:** new pre-release 3.3.1a3 ([#5598](https://github.com/aws-powertools/powertools-lambda-python/issues/5598))
 * **deps:** bump codecov/codecov-action from 5.0.2 to 5.0.3 ([#5592](https://github.com/aws-powertools/powertools-lambda-python/issues/5592))
-* **deps:** bump datadog-lambda from 6.102.0 to 6.104.0 ([#5631](https://github.com/aws-powertools/powertools-lambda-python/issues/5631))
+* **deps:** bump pydantic from 2.10.0 to 2.10.1 ([#5632](https://github.com/aws-powertools/powertools-lambda-python/issues/5632))
 * **deps:** bump actions/dependency-review-action from 4.4.0 to 4.5.0 ([#5616](https://github.com/aws-powertools/powertools-lambda-python/issues/5616))
 * **deps:** bump codecov/codecov-action from 5.0.3 to 5.0.7 ([#5617](https://github.com/aws-powertools/powertools-lambda-python/issues/5617))
 * **deps:** bump squidfunk/mkdocs-material from `ce587cb` to `ef0b45e` in /docs ([#5603](https://github.com/aws-powertools/powertools-lambda-python/issues/5603))
 * **deps:** bump aws-actions/closed-issue-message from 80edfc24bdf1283400eb04d20a8a605ae8bf7d48 to 37548691e7cc75ba58f85c9f873f9eee43590449 ([#5606](https://github.com/aws-powertools/powertools-lambda-python/issues/5606))
-* **deps:** bump aws-encryption-sdk from 3.3.0 to 4.0.0 ([#5564](https://github.com/aws-powertools/powertools-lambda-python/issues/5564))
+* **deps:** bump codecov/codecov-action from 4.6.0 to 5.0.2 ([#5567](https://github.com/aws-powertools/powertools-lambda-python/issues/5567))
 * **deps:** bump pydantic from 2.9.2 to 2.10.0 ([#5611](https://github.com/aws-powertools/powertools-lambda-python/issues/5611))
+* **deps:** bump aws-encryption-sdk from 3.3.0 to 4.0.0 ([#5564](https://github.com/aws-powertools/powertools-lambda-python/issues/5564))
 * **deps:** bump datadog-lambda from 6.101.0 to 6.102.0 ([#5570](https://github.com/aws-powertools/powertools-lambda-python/issues/5570))
-* **deps:** bump pydantic from 2.10.0 to 2.10.1 ([#5632](https://github.com/aws-powertools/powertools-lambda-python/issues/5632))
-* **deps:** bump codecov/codecov-action from 4.6.0 to 5.0.2 ([#5567](https://github.com/aws-powertools/powertools-lambda-python/issues/5567))
-* **deps-dev:** bump boto3-stubs from 1.35.64 to 1.35.67 ([#5621](https://github.com/aws-powertools/powertools-lambda-python/issues/5621))
+* **deps:** bump datadog-lambda from 6.102.0 to 6.104.0 ([#5631](https://github.com/aws-powertools/powertools-lambda-python/issues/5631))
+* **deps-dev:** bump aws-cdk from 2.167.2 to 2.169.0 ([#5618](https://github.com/aws-powertools/powertools-lambda-python/issues/5618))
 * **deps-dev:** bump aws-cdk-lib from 2.167.1 to 2.167.2 ([#5596](https://github.com/aws-powertools/powertools-lambda-python/issues/5596))
-* **deps-dev:** bump cdklabs-generative-ai-cdk-constructs from 0.1.281 to 0.1.282 ([#5594](https://github.com/aws-powertools/powertools-lambda-python/issues/5594))
+* **deps-dev:** bump boto3-stubs from 1.35.64 to 1.35.67 ([#5621](https://github.com/aws-powertools/powertools-lambda-python/issues/5621))
 * **deps-dev:** bump boto3-stubs from 1.35.63 to 1.35.64 ([#5582](https://github.com/aws-powertools/powertools-lambda-python/issues/5582))
-* **deps-dev:** bump aws-cdk from 2.167.1 to 2.167.2 ([#5593](https://github.com/aws-powertools/powertools-lambda-python/issues/5593))
+* **deps-dev:** bump mkdocs-material from 9.5.44 to 9.5.45 ([#5610](https://github.com/aws-powertools/powertools-lambda-python/issues/5610))
 * **deps-dev:** bump aws-cdk-aws-lambda-python-alpha from 2.167.0a0 to 2.167.1a0 ([#5583](https://github.com/aws-powertools/powertools-lambda-python/issues/5583))
+* **deps-dev:** bump aws-cdk from 2.167.1 to 2.167.2 ([#5593](https://github.com/aws-powertools/powertools-lambda-python/issues/5593))
 * **deps-dev:** bump cfn-lint from 1.19.0 to 1.20.0 ([#5595](https://github.com/aws-powertools/powertools-lambda-python/issues/5595))
+* **deps-dev:** bump cdklabs-generative-ai-cdk-constructs from 0.1.281 to 0.1.282 ([#5594](https://github.com/aws-powertools/powertools-lambda-python/issues/5594))
 * **deps-dev:** bump aws-cdk-lib from 2.167.2 to 2.170.0 ([#5622](https://github.com/aws-powertools/powertools-lambda-python/issues/5622))
-* **deps-dev:** bump aws-cdk-aws-lambda-python-alpha from 2.167.1a0 to 2.167.2a0 ([#5619](https://github.com/aws-powertools/powertools-lambda-python/issues/5619))
-* **deps-dev:** bump ruff from 0.7.3 to 0.7.4 ([#5569](https://github.com/aws-powertools/powertools-lambda-python/issues/5569))
 * **deps-dev:** bump boto3-stubs from 1.35.60 to 1.35.63 ([#5581](https://github.com/aws-powertools/powertools-lambda-python/issues/5581))
-* **deps-dev:** bump mkdocs-material from 9.5.44 to 9.5.45 ([#5610](https://github.com/aws-powertools/powertools-lambda-python/issues/5610))
-* **deps-dev:** bump aws-cdk from 2.167.0 to 2.167.1 ([#5572](https://github.com/aws-powertools/powertools-lambda-python/issues/5572))
 * **deps-dev:** bump sentry-sdk from 2.18.0 to 2.19.0 ([#5633](https://github.com/aws-powertools/powertools-lambda-python/issues/5633))
-* **deps-dev:** bump aws-cdk-aws-lambda-python-alpha from 2.167.2a0 to 2.170.0a0 ([#5629](https://github.com/aws-powertools/powertools-lambda-python/issues/5629))
-* **deps-dev:** bump aws-cdk-lib from 2.167.0 to 2.167.1 ([#5568](https://github.com/aws-powertools/powertools-lambda-python/issues/5568))
+* **deps-dev:** bump aws-cdk from 2.167.0 to 2.167.1 ([#5572](https://github.com/aws-powertools/powertools-lambda-python/issues/5572))
 * **deps-dev:** bump cdklabs-generative-ai-cdk-constructs from 0.1.282 to 0.1.284 ([#5607](https://github.com/aws-powertools/powertools-lambda-python/issues/5607))
+* **deps-dev:** bump ruff from 0.7.3 to 0.7.4 ([#5569](https://github.com/aws-powertools/powertools-lambda-python/issues/5569))
+* **deps-dev:** bump aws-cdk-lib from 2.167.0 to 2.167.1 ([#5568](https://github.com/aws-powertools/powertools-lambda-python/issues/5568))
 * **deps-dev:** bump aws-cdk from 2.169.0 to 2.170.0 ([#5628](https://github.com/aws-powertools/powertools-lambda-python/issues/5628))
-* **deps-dev:** bump aws-cdk from 2.167.2 to 2.169.0 ([#5618](https://github.com/aws-powertools/powertools-lambda-python/issues/5618))
+* **deps-dev:** bump aws-cdk-aws-lambda-python-alpha from 2.167.2a0 to 2.170.0a0 ([#5629](https://github.com/aws-powertools/powertools-lambda-python/issues/5629))
+* **deps-dev:** bump aws-cdk-aws-lambda-python-alpha from 2.167.1a0 to 2.167.2a0 ([#5619](https://github.com/aws-powertools/powertools-lambda-python/issues/5619))
 * **layers:** balance Python 3.13 layers in GovCloud partition ([#5579](https://github.com/aws-powertools/powertools-lambda-python/issues/5579))
 
 

aws_lambda_powertools/logging/formatter.py

@@ -222,7 +222,7 @@ def formatTime(self, record: logging.LogRecord, datefmt: str | None = None) -> s
         # NOTE: Python `time.strftime` doesn't provide msec directives
         # so we create a custom one (%F) and replace logging record_ts
         # Reason 2 is that std logging doesn't support msec after TZ
-        msecs = "%03d" % record.msecs
+        msecs = "%03d" % record.msecs  # noqa UP031
 
         # Datetime format codes is a superset of time format codes
         # therefore we only honour them if explicitly asked
@@ -425,7 +425,9 @@ def _strip_none_records(records: dict[str, Any]) -> dict[str, Any]:
 RESERVED_FORMATTER_CUSTOM_KEYS: list[str] = inspect.getfullargspec(LambdaPowertoolsFormatter).args[1:]
 
 # ContextVar for thread local keys
-THREAD_LOCAL_KEYS: ContextVar[dict[str, Any]] = ContextVar("THREAD_LOCAL_KEYS", default={})
+default_contextvar: dict[str, Any] = {}
+
+THREAD_LOCAL_KEYS: ContextVar[dict[str, Any]] = ContextVar("THREAD_LOCAL_KEYS", default=default_contextvar)
 
 
 def _get_context() -> ContextVar[dict[str, Any]]:

aws_lambda_powertools/metrics/provider/cloudwatch_emf/cloudwatch.py

@@ -22,6 +22,8 @@
 from aws_lambda_powertools.metrics.provider.cloudwatch_emf.metric_properties import MetricResolution, MetricUnit
 from aws_lambda_powertools.shared import constants
 from aws_lambda_powertools.shared.functions import resolve_env_var_choice
+from aws_lambda_powertools.warnings import PowertoolsUserWarning
+
 
 if TYPE_CHECKING:
     from aws_lambda_powertools.metrics.provider.cloudwatch_emf.types import CloudWatchEMFOutput
@@ -278,14 +280,22 @@ def add_dimension(self, name: str, value: str) -> None:
         if not name.strip() or not value.strip():
             warnings.warn(
                 f"The dimension {name} doesn't meet the requirements and won't be added. "
-                "Ensure the dimension name and value are non empty strings",
+                "Ensure the dimension name and value are non-empty strings",
+                category=PowertoolsUserWarning,
                 stacklevel=2,
             )
-        else:
-            # Cast value to str according to EMF spec
-            # Majority of values are expected to be string already, so
-            # checking before casting improves performance in most cases
-            self.dimension_set[name] = value
+            return
+
+        if name in self.dimension_set or name in self.default_dimensions:
+            warnings.warn(
+                f"Dimension '{name}' has already been added. The previous value will be overwritten.",
+                category=PowertoolsUserWarning,
+                stacklevel=2,
+            )
+
+        self.dimension_set[name] = value
+
+
 
     def add_metadata(self, key: str, value: Any) -> None:
         """Adds high cardinal metadata for metrics object
@@ -294,7 +304,7 @@ def add_metadata(self, key: str, value: Any) -> None:
         Instead, this will be searchable through logs.
 
         If you're looking to add metadata to filter metrics, then
-        use add_dimensions method.
+        use add_dimension method.
 
         Example
         -------

poetry.lock

@@ -115,7 +115,7 @@ types-python-dateutil = "^2.8.19.6"
 aws-cdk-aws-appsync-alpha = "^2.59.0a0"
 httpx = ">=0.23.3,<0.28.0"
 sentry-sdk = ">=1.22.2,<3.0.0"
-ruff = ">=0.5.1,<0.7.5"
+ruff = ">=0.5.1,<0.8.1"
 retry2 = "^0.9.5"
 pytest-socket = ">=0.6,<0.8"
 types-redis = "^4.6.0.7"

pyproject.toml

@@ -6,6 +6,7 @@
 import random
 import re
 import string
+import sys
 import time
 from collections import namedtuple
 from threading import Thread
@@ -453,6 +454,7 @@ def send_thread_message_with_key(message, keys):
     assert logs[3].get("exampleThread2Key") is None
 
 
+@pytest.mark.skipif(sys.version_info >= (3, 13), reason="Test temporarily disabled for Python 3.13+")
 def test_thread_safe_remove_key(service_name, stdout):
     logger = Logger(
         service=service_name,
@@ -469,6 +471,7 @@ def send_message_with_key_and_without(message, keys):
     Thread(target=send_message_with_key_and_without, args=("msg", thread1_keys)).start()
 
     logs = capture_logging_output(stdout)
+    print(logs)
 
     assert logs[0].get("exampleThread1Key") == "thread1"
     assert logs[1].get("exampleThread1Key") is None

tests/functional/logger/required_dependencies/test_logger_powertools_formatter.py

@@ -1,4 +1,5 @@
 import pytest
+import warnings
 
 from aws_lambda_powertools.metrics.functions import (
     extract_cloudwatch_metric_resolution_value,
@@ -9,6 +10,18 @@
     MetricUnitError,
 )
 from aws_lambda_powertools.metrics.provider.cloudwatch_emf.metric_properties import MetricResolution, MetricUnit
+from aws_lambda_powertools.metrics import Metrics
+from aws_lambda_powertools.warnings import PowertoolsUserWarning
+
+@pytest.fixture
+def warning_catcher(monkeypatch):
+    caught_warnings = []
+
+    def custom_warn(message, category=None, stacklevel=1, source=None):
+        caught_warnings.append(PowertoolsUserWarning(message))
+
+    monkeypatch.setattr(warnings, 'warn', custom_warn)
+    return caught_warnings
 
 
 def test_extract_invalid_cloudwatch_metric_resolution_value():
@@ -61,3 +74,31 @@ def test_extract_valid_cloudwatch_metric_unit_value():
 
     # THEN value must be extracted
     assert extracted_unit_value == unit
+
+
+def test_add_dimension_overwrite_warning(warning_catcher):
+    """
+    Adds a dimension and then tries to add another with the same name 
+    but a different value. Verifies if the dimension is updated with 
+    the new value and  warning is issued when an existing dimension 
+    is overwritten.
+    """
+    metrics = Metrics(namespace="TestNamespace")
+    
+    # GIVEN default dimension
+    dimension_name = "test-dimension"
+    value1 = "test-value-1"
+    value2 = "test-value-2"
+
+    # WHEN adding the same dimension twice with different values
+    metrics.add_dimension(dimension_name, value1)
+    metrics.add_dimension(dimension_name, value2)
+
+    # THEN the dimension should be updated with the new value
+    assert metrics._dimensions[dimension_name] == value2
+
+    # AND a warning should be issued with the exact message
+    expected_warning = f"Dimension '{dimension_name}' has already been added. The previous value will be overwritten."
+    assert any(str(w) == expected_warning for w in warning_catcher)
+
+