Consistently use UTC time in MetricsE2ET.

Author: phipag

powertools-e2e-tests/src/test/java/software/amazon/lambda/powertools/MetricsE2ET.java

@@ -18,9 +18,8 @@
 import static software.amazon.lambda.powertools.testutils.Infrastructure.FUNCTION_NAME_OUTPUT;
 import static software.amazon.lambda.powertools.testutils.lambda.LambdaInvoker.invokeFunction;
 
+import java.time.Clock;
 import java.time.Instant;
-import java.time.LocalDateTime;
-import java.time.ZoneOffset;
 import java.time.temporal.ChronoUnit;
 import java.util.Collections;
 import java.util.List;
@@ -29,10 +28,12 @@
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Timeout;
+
 import software.amazon.lambda.powertools.testutils.Infrastructure;
 import software.amazon.lambda.powertools.testutils.lambda.InvocationResult;
 import software.amazon.lambda.powertools.testutils.metrics.MetricsFetcher;
@@ -51,9 +52,9 @@ public static void setup() {
                 .pathToFunction("metrics")
                 .environmentVariables(
                         Stream.of(new String[][] {
-                                        {"POWERTOOLS_METRICS_NAMESPACE", namespace},
-                                        {"POWERTOOLS_SERVICE_NAME", service}
-                                })
+                                { "POWERTOOLS_METRICS_NAMESPACE", namespace },
+                                { "POWERTOOLS_SERVICE_NAME", service }
+                        })
                                 .collect(Collectors.toMap(data -> data[0], data -> data[1])))
                 .build();
         Map<String, String> outputs = infrastructure.deploy();
@@ -71,58 +72,54 @@ public static void tearDown() {
     public void test_recordMetrics() {
         // GIVEN
 
-        Instant currentTimeTruncatedToMinutes = Instant.now().truncatedTo(ChronoUnit.MINUTES);
-        String event1 =
-                "{ \"metrics\": {\"orders\": 1, \"products\": 4}, \"dimensions\": { \"Environment\": \"test\"}, \"highResolution\": \"false\"}";
+        Instant currentTimeTruncatedToMinutes = Instant.now(Clock.systemUTC()).truncatedTo(ChronoUnit.MINUTES);
+        String event1 = "{ \"metrics\": {\"orders\": 1, \"products\": 4}, \"dimensions\": { \"Environment\": \"test\"}, \"highResolution\": \"false\"}";
 
-        String event2 =
-                "{ \"metrics\": {\"orders\": 1, \"products\": 8}, \"dimensions\": { \"Environment\": \"test\"}, \"highResolution\": \"true\"}";
+        String event2 = "{ \"metrics\": {\"orders\": 1, \"products\": 8}, \"dimensions\": { \"Environment\": \"test\"}, \"highResolution\": \"true\"}";
         // WHEN
         InvocationResult invocationResult = invokeFunction(functionName, event1);
 
         invokeFunction(functionName, event2);
 
         // THEN
         MetricsFetcher metricsFetcher = new MetricsFetcher();
-        List<Double> coldStart =
-                metricsFetcher.fetchMetrics(invocationResult.getStart(), invocationResult.getEnd(), 60, namespace,
-                        "ColdStart", Stream.of(new String[][] {
-                                {"FunctionName", functionName},
-                                {"Service", service}}
-                        ).collect(Collectors.toMap(data -> data[0], data -> data[1])));
+        List<Double> coldStart = metricsFetcher.fetchMetrics(invocationResult.getStart(), invocationResult.getEnd(), 60,
+                namespace,
+                "ColdStart", Stream.of(new String[][] {
+                        { "FunctionName", functionName },
+                        { "Service", service } }).collect(Collectors.toMap(data -> data[0], data -> data[1])));
         assertThat(coldStart.get(0)).isEqualTo(1);
-        List<Double> orderMetrics =
-                metricsFetcher.fetchMetrics(invocationResult.getStart(), invocationResult.getEnd(), 60, namespace,
-                        "orders", Collections.singletonMap("Environment", "test"));
+        List<Double> orderMetrics = metricsFetcher.fetchMetrics(invocationResult.getStart(), invocationResult.getEnd(),
+                60, namespace,
+                "orders", Collections.singletonMap("Environment", "test"));
         assertThat(orderMetrics.get(0)).isEqualTo(2);
-        List<Double> productMetrics =
-                metricsFetcher.fetchMetrics(invocationResult.getStart(), invocationResult.getEnd(), 60, namespace,
-                        "products", Collections.singletonMap("Environment", "test"));
+        List<Double> productMetrics = metricsFetcher.fetchMetrics(invocationResult.getStart(),
+                invocationResult.getEnd(), 60, namespace,
+                "products", Collections.singletonMap("Environment", "test"));
 
-        //        When searching across a 1 minute time period with a period of 60 we find both metrics and the sum is 12
+        // When searching across a 1 minute time period with a period of 60 we find both metrics and the sum is 12
 
         assertThat(productMetrics.get(0)).isEqualTo(12);
 
-        orderMetrics =
-                metricsFetcher.fetchMetrics(invocationResult.getStart(), invocationResult.getEnd(), 60, namespace,
-                        "orders", Collections.singletonMap("Service", service));
+        orderMetrics = metricsFetcher.fetchMetrics(invocationResult.getStart(), invocationResult.getEnd(), 60,
+                namespace,
+                "orders", Collections.singletonMap("Service", service));
         assertThat(orderMetrics.get(0)).isEqualTo(2);
-        productMetrics =
-                metricsFetcher.fetchMetrics(invocationResult.getStart(), invocationResult.getEnd(), 60, namespace,
-                        "products", Collections.singletonMap("Service", service));
+        productMetrics = metricsFetcher.fetchMetrics(invocationResult.getStart(), invocationResult.getEnd(), 60,
+                namespace,
+                "products", Collections.singletonMap("Service", service));
         assertThat(productMetrics.get(0)).isEqualTo(12);
 
         Instant searchStartTime = currentTimeTruncatedToMinutes.plusSeconds(15);
         Instant searchEndTime = currentTimeTruncatedToMinutes.plusSeconds(45);
 
-        List<Double> productMetricDataResult =
-                metricsFetcher.fetchMetrics(searchStartTime, searchEndTime, 1, namespace,
-                        "products", Collections.singletonMap("Environment", "test"));
+        List<Double> productMetricDataResult = metricsFetcher.fetchMetrics(searchStartTime, searchEndTime, 1, namespace,
+                "products", Collections.singletonMap("Environment", "test"));
 
-//  We are searching across the time period the metric was created but with a period of 1 second.  Only the high resolution metric will be available at this point
+        // We are searching across the time period the metric was created but with a period of 1 second. Only the high
+        // resolution metric will be available at this point
 
         assertThat(productMetricDataResult.get(0)).isEqualTo(8);
 
-
     }
 }