From c81e95647504d4b5cae23648abe789421497fb49 Mon Sep 17 00:00:00 2001
From: Jerome Van Der Linden <jeromevdl@gmail.com>
Date: Wed, 8 Nov 2023 17:02:16 +0100
Subject: [PATCH] fix #1500

---
 .../powertools/metrics/MetricsUtils.java      |  8 +++--
 .../powertools/metrics/MetricsLoggerTest.java | 31 +++++++++++++++++++
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/powertools-metrics/src/main/java/software/amazon/lambda/powertools/metrics/MetricsUtils.java b/powertools-metrics/src/main/java/software/amazon/lambda/powertools/metrics/MetricsUtils.java
index 09517d46e..7891b22ec 100644
--- a/powertools-metrics/src/main/java/software/amazon/lambda/powertools/metrics/MetricsUtils.java
+++ b/powertools-metrics/src/main/java/software/amazon/lambda/powertools/metrics/MetricsUtils.java
@@ -178,8 +178,12 @@ private static void captureRequestAndTraceId(MetricsLogger metricsLogger) {
 
     private static String defaultNameSpace() {
         MetricsContext context = MetricsLoggerHelper.metricsContext();
-        return "aws-embedded-metrics".equals(context.getNamespace()) ?
-                SystemWrapper.getenv("POWERTOOLS_METRICS_NAMESPACE") : context.getNamespace();
+        if ("aws-embedded-metrics".equals(context.getNamespace())) {
+            String namespace = SystemWrapper.getenv("POWERTOOLS_METRICS_NAMESPACE");
+            return namespace != null ? namespace : "aws-embedded-metrics";
+        } else {
+            return context.getNamespace();
+        }
     }
 
     private static Optional<String> awsRequestId() {
diff --git a/powertools-metrics/src/test/java/software/amazon/lambda/powertools/metrics/MetricsLoggerTest.java b/powertools-metrics/src/test/java/software/amazon/lambda/powertools/metrics/MetricsLoggerTest.java
index 16a068849..ce9d63cfd 100644
--- a/powertools-metrics/src/test/java/software/amazon/lambda/powertools/metrics/MetricsLoggerTest.java
+++ b/powertools-metrics/src/test/java/software/amazon/lambda/powertools/metrics/MetricsLoggerTest.java
@@ -112,6 +112,37 @@ void singleMetricsCaptureUtility() {
                                 .containsEntry("Dimension1", "Value1")
                                 .containsKey("_aws")
                                 .containsEntry("xray_trace_id", "1-5759e988-bd862e3fe1be46a994272793");
+
+                        Map<String, Object> aws = (Map<String, Object>) logAsJson.get("_aws");
+
+                        assertThat(aws.get("CloudWatchMetrics"))
+                                .asString()
+                                .contains("Namespace=test");
+                    });
+        }
+    }
+
+    @Test
+    void singleMetricsCaptureUtilityWithNullNamespace() {
+        try (MockedStatic<SystemWrapper> mocked = mockStatic(SystemWrapper.class);
+             MockedStatic<software.amazon.lambda.powertools.core.internal.SystemWrapper> internalWrapper = mockStatic(
+                     software.amazon.lambda.powertools.core.internal.SystemWrapper.class)) {
+            mocked.when(() -> SystemWrapper.getenv("AWS_EMF_ENVIRONMENT")).thenReturn("Lambda");
+            // POWERTOOLS_METRICS_NAMESPACE is not defined
+
+            MetricsUtils.withSingleMetric("Metric1", 1, Unit.COUNT,
+                    metricsLogger -> metricsLogger.setDimensions(DimensionSet.of("Dimension1", "Value1")));
+
+            assertThat(out.toString())
+                    .satisfies(s ->
+                    {
+                        Map<String, Object> logAsJson = readAsJson(s);
+
+                        Map<String, Object> aws = (Map<String, Object>) logAsJson.get("_aws");
+
+                        assertThat(aws.get("CloudWatchMetrics"))
+                                .asString()
+                                .contains("Namespace=aws-embedded-metrics");
                     });
         }
     }