Merge branch 'develop' into refactor/e2e-get-lambda-response

* develop:
  chore: cleanup, add test for single and nested
  fix(parameters): make cache aware of single vs multiple calls
  fix(metrics): proxy service and namespace attrs to provider (aws-powertools#2910)
  chore(deps-dev): bump ruff from 0.0.281 to 0.0.282 (aws-powertools#2905)

Author: heitorlessa

aws_lambda_powertools/metrics/metrics.py

@@ -181,6 +181,26 @@ def clear_default_dimensions(self) -> None:
     def clear_metrics(self) -> None:
         self.provider.clear_metrics()
 
+    # We now allow customers to bring their own instance
+    # of the AmazonCloudWatchEMFProvider provider
+    # So we need to define getter/setter for namespace and service properties
+    # To access these attributes on the provider instance.
+    @property
+    def namespace(self):
+        return self.provider.namespace
+
+    @namespace.setter
+    def namespace(self, namespace):
+        self.provider.namespace = namespace
+
+    @property
+    def service(self):
+        return self.provider.service
+
+    @service.setter
+    def service(self, service):
+        self.provider.service = service
+
 
 # Maintenance: until v3, we can't afford to break customers.
 # AmazonCloudWatchEMFProvider has the exact same functionality (non-singleton)

poetry.lock

@@ -91,7 +91,7 @@ mypy = "^1.1.1"
 types-python-dateutil = "^2.8.19.6"
 httpx = ">=0.23.3,<0.25.0"
 sentry-sdk = "^1.22.2"
-ruff = ">=0.0.272,<0.0.282"
+ruff = ">=0.0.272,<0.0.283"
 retry2 = "^0.9.5"
 
 [tool.coverage.run]

pyproject.toml

@@ -1077,6 +1077,25 @@ def test_clear_default_dimensions(namespace):
     assert not my_metrics.default_dimensions
 
 
+def test_get_and_set_namespace_and_service_properties(namespace, service, metrics, capsys):
+    # GIVEN Metrics instance is initialized without namespace and service
+    my_metrics = Metrics()
+
+    # WHEN we set service and namespace before flushing the metric
+    @my_metrics.log_metrics
+    def lambda_handler(evt, ctx):
+        my_metrics.namespace = namespace
+        my_metrics.service = service
+        for metric in metrics:
+            my_metrics.add_metric(**metric)
+
+    lambda_handler({}, {})
+    invocation = capture_metrics_output(capsys)
+
+    assert service in json.dumps(invocation)
+    assert namespace in json.dumps(invocation)
+
+
 def test_clear_default_dimensions_with_provider(namespace):
     # GIVEN Metrics is initialized with provider and we persist a set of default dimensions
     my_provider = AmazonCloudWatchEMFProvider(namespace=namespace)