fix is disable metrics

Author: anafalcao

Diff for: aws_lambda_powertools/metrics/provider/cloudwatch_emf/cloudwatch.py

@@ -93,13 +93,12 @@ def is_metrics_disabled() -> bool:
         """Checks if metrics have been disabled via POWERTOOLS_METRICS_DISABLED"""
         if constants.METRICS_DISABLED_ENV not in os.environ:
             return False
-        
+
         is_disabled = resolve_truthy_env_var_choice(env=os.getenv(constants.METRICS_DISABLED_ENV))
         if is_disabled:
             logger.debug("Metrics have been disabled via env var POWERTOOLS_METRICS_DISABLED")
         return bool(is_disabled)
 
-
     def add_metric(
         self,
         name: str,
@@ -141,8 +140,7 @@ def add_metric(
         MetricResolutionError
             When metric resolution is not supported by CloudWatch
         """
-        if self.metrics_disabled:
-            return
+
         if not isinstance(value, numbers.Number):
             raise MetricValueError(f"{value} is not a valid number")
 
@@ -284,8 +282,7 @@ def add_dimension(self, name: str, value: str) -> None:
         value : str
             Dimension value
         """
-        if self.metrics_disabled:
-            return
+
         logger.debug(f"Adding dimension: {name}:{value}")
         if len(self.dimension_set) == MAX_DIMENSIONS:
             raise SchemaValidationError(
@@ -334,8 +331,6 @@ def add_metadata(self, key: str, value: Any) -> None:
         value : any
             Metadata value
         """
-        if self.metrics_disabled:
-            return
         logger.debug(f"Adding metadata: {key}:{value}")
 
         # Cast key to str according to EMF spec
@@ -388,8 +383,6 @@ def flush_metrics(self, raise_on_empty_metrics: bool = False) -> None:
         raise_on_empty_metrics : bool, optional
             raise exception if no metrics are emitted, by default False
         """
-        if self.metrics_disabled:
-            return
         if not raise_on_empty_metrics and not self.metric_set:
             warnings.warn(
                 "No application metrics to publish. The cold-start metric may be published if enabled. "

Diff for: aws_lambda_powertools/metrics/provider/datadog/datadog.py

@@ -72,7 +72,7 @@ def is_metrics_disabled() -> bool:
         """Checks if metrics have been disabled via POWERTOOLS_METRICS_DISABLED"""
         if constants.METRICS_DISABLED_ENV not in os.environ:
             return False
-        
+
         is_disabled = resolve_truthy_env_var_choice(env=os.getenv(constants.METRICS_DISABLED_ENV))
         if is_disabled:
             logger.debug("Metrics have been disabled via env var POWERTOOLS_METRICS_DISABLED")
@@ -111,8 +111,6 @@ def add_metric(
             >>>     sales='sam'
             >>> )
         """
-        if self.metrics_disabled:
-            return
         # validating metric name
         if not self._validate_datadog_metric_name(name):
             docs = "https://docs.datadoghq.com/metrics/custom_metrics/#naming-custom-metrics"
@@ -193,8 +191,7 @@ def flush_metrics(self, raise_on_empty_metrics: bool = False) -> None:
         raise_on_empty_metrics : bool, optional
             raise exception if no metrics are emitted, by default False
         """
-        if self.metrics_disabled:
-            return
+
         if not raise_on_empty_metrics and len(self.metric_set) == 0:
             warnings.warn(
                 "No application metrics to publish. The cold-start metric may be published if enabled. "

Diff for: tests/functional/metrics/required_dependencies/test_metrics_cloudwatch_emf.py

@@ -1331,12 +1331,12 @@ def lambda_handler(evt, ctx):
         )
 
 
-def test_metrics_disabled_with_env_var(monkeypatch):
+def test_metrics_disabled_with_env_var(monkeypatch, namespace):
     # GIVEN environment variable is set to disable metrics
     monkeypatch.setenv("POWERTOOLS_METRICS_DISABLED", "true")
 
     # WHEN metrics is initialized and adding metrics
-    metrics = Metrics()
+    metrics = Metrics(namespace=namespace)
     metrics.add_metric(name="test_metric", unit="Count", value=1)
 
     # WHEN flushing metrics
@@ -1346,10 +1346,10 @@ def test_metrics_disabled_with_env_var(monkeypatch):
     assert metrics_output is None
 
 
-def test_metrics_disabled_persists_after_flush(monkeypatch):
+def test_metrics_disabled_persists_after_flush(monkeypatch, namespace):
     # GIVEN environment variable is set to disable metrics
     monkeypatch.setenv("POWERTOOLS_METRICS_DISABLED", "true")
-    metrics = Metrics()
+    metrics = Metrics(namespace=namespace)
 
     # WHEN multiple operations are performed with flush in between
     metrics.add_metric(name="metric1", unit="Count", value=1)