use flushMetrics in captureColdStartMetric

Author: humanzz

powertools-metrics/src/main/java/software/amazon/lambda/powertools/metrics/internal/EmfMetricsLogger.java

@@ -179,45 +179,16 @@ public void flush() {
     public void captureColdStartMetric(Context context,
             software.amazon.lambda.powertools.metrics.model.DimensionSet dimensions) {
         if (isColdStart()) {
-            if (isMetricsDisabled()) {
-                LOGGER.debug("Metrics are disabled, skipping cold start metric capture");
-                return;
-            }
-
-            Validator.validateNamespace(namespace);
-
-            software.amazon.cloudwatchlogs.emf.logger.MetricsLogger coldStartLogger = new software.amazon.cloudwatchlogs.emf.logger.MetricsLogger();
-
-            try {
-                coldStartLogger.setNamespace(namespace);
-            } catch (Exception e) {
-                LOGGER.error("Namespace cannot be set for cold start metrics due to an error in EMF", e);
-            }
-
-            coldStartLogger.putMetric(COLD_START_METRIC, 1, Unit.COUNT);
-
-            // Set dimensions if provided
-            if (dimensions != null) {
-                DimensionSet emfDimensionSet = new DimensionSet();
-                dimensions.getDimensions().forEach((key, val) -> {
-                    try {
-                        emfDimensionSet.addDimension(key, val);
-                    } catch (Exception e) {
-                        // Ignore dimension errors
-                    }
-                });
-                coldStartLogger.setDimensions(emfDimensionSet);
-            }
-
-            // Add request ID from context if available
-            if (context != null && context.getAwsRequestId() != null) {
-                coldStartLogger.putProperty(REQUEST_ID_PROPERTY, context.getAwsRequestId());
-            }
-
-            // Add trace ID using the standard logic
-            getXrayTraceId().ifPresent(traceId -> coldStartLogger.putProperty(TRACE_ID_PROPERTY, traceId));
-
-            coldStartLogger.flush();
+            flushMetrics(metrics -> {
+                if (context != null && context.getAwsRequestId() != null) {
+                    metrics.addProperty(REQUEST_ID_PROPERTY, context.getAwsRequestId());
+                }
+                getXrayTraceId().ifPresent(traceId -> metrics.addProperty(TRACE_ID_PROPERTY, traceId));
+                if (dimensions != null) {
+                    metrics.setDefaultDimensions(dimensions);
+                }
+                metrics.addMetric(COLD_START_METRIC, 1, MetricUnit.COUNT);
+            });
         }
     }
 

powertools-metrics/src/main/java/software/amazon/lambda/powertools/metrics/internal/LambdaMetricsAspect.java

@@ -107,40 +107,40 @@ public Object around(ProceedingJoinPoint pjp,
         return pjp.proceed(proceedArgs);
     }
 
-    private void captureColdStartMetricIfEnabled(Context extractedContext, FlushMetrics metrics) {
+    private void captureColdStartMetricIfEnabled(Context extractedContext, FlushMetrics flushMetrics) {
         if (extractedContext == null) {
             return;
         }
 
-        Metrics metricsInstance = MetricsFactory.getMetricsInstance();
+        Metrics metrics = MetricsFactory.getMetricsInstance();
         // This can be null e.g. during unit tests when mocking the Lambda context
         if (extractedContext.getAwsRequestId() != null) {
-            metricsInstance.addProperty(REQUEST_ID_PROPERTY, extractedContext.getAwsRequestId());
+            metrics.addProperty(REQUEST_ID_PROPERTY, extractedContext.getAwsRequestId());
         }
 
         // Only capture cold start metrics if enabled on annotation
-        if (metrics.captureColdStart()) {
+        if (flushMetrics.captureColdStart()) {
             // Get function name from annotation or context
-            String funcName = functionName(metrics, extractedContext);
+            String funcName = functionName(flushMetrics, extractedContext);
 
-            DimensionSet coldStartDimensions = new DimensionSet();
+            DimensionSet dimensionSet = new DimensionSet();
 
             // Get service name from metrics instance default dimensions or fallback
-            String serviceName = metricsInstance.getDefaultDimensions().getDimensions().getOrDefault(
+            String serviceName = metrics.getDefaultDimensions().getDimensions().getOrDefault(
                     SERVICE_DIMENSION,
-                    serviceNameWithFallback(metrics));
+                    serviceNameWithFallback(flushMetrics));
 
             // Only add service if it is not undefined
             if (!LambdaConstants.SERVICE_UNDEFINED.equals(serviceName)) {
-                coldStartDimensions.addDimension(SERVICE_DIMENSION, serviceName);
+                dimensionSet.addDimension(SERVICE_DIMENSION, serviceName);
             }
 
             // Add function name
             if (funcName != null) {
-                coldStartDimensions.addDimension("FunctionName", funcName);
+                dimensionSet.addDimension("FunctionName", funcName);
             }
 
-            metricsInstance.captureColdStartMetric(extractedContext, coldStartDimensions);
+            metrics.captureColdStartMetric(extractedContext, dimensionSet);
         }
     }
 }