Skip to content

chore(e2e): widen CloudWatch query window in MetricsE2ET to fix flaky test #2460

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
phipag merged 3 commits into from
Apr 9, 2026
+16 −15
Merged

chore(e2e): widen CloudWatch query window in MetricsE2ET to fix flaky test #2460

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
38c7a4d
fix: widen CloudWatch query window in MetricsE2ET to fix flaky test
phipag Apr 9, 2026
e32dc78
fix: also pad high-resolution metric query window
phipag Apr 9, 2026
a9eab07
fix: assert high-res metric value is present instead of summing
phipag Apr 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 16 additions & 15 deletions powertools-e2e-tests/src/test/java/software/amazon/lambda/powertools/MetricsE2ET.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
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.temporal.ChronoUnit;
import java.util.Collections;
Expand Down Expand Up @@ -74,7 +73,6 @@ static void tearDown() {
void test_recordMetrics() {
// GIVEN

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\"}";
Expand All @@ -84,46 +82,49 @@ void test_recordMetrics() {
invokeFunction(functionName, event2);

// THEN
// Pad the query window to address CloudWatch eventual consistency:
// metric timestamps can shift by up to a minute during batch processing.
Instant paddedStart = invocationResult.getStart().minus(1, ChronoUnit.MINUTES);
Instant paddedEnd = invocationResult.getEnd().plus(2, ChronoUnit.MINUTES);

MetricsFetcher metricsFetcher = new MetricsFetcher();
List<Double> coldStart = metricsFetcher.fetchMetrics(invocationResult.getStart(), invocationResult.getEnd(), 60,
List<Double> coldStart = metricsFetcher.fetchMetrics(paddedStart, paddedEnd, 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 = RetryUtils.withRetry(() -> {
List<Double> metrics = metricsFetcher.fetchMetrics(invocationResult.getStart(), invocationResult.getEnd(),
List<Double> metrics = metricsFetcher.fetchMetrics(paddedStart, paddedEnd,
60, NAMESPACE, "orders", Collections.singletonMap("Environment", "test"));
if (metrics.get(0) != 2.0) {
throw new DataNotReadyException("Expected 2.0 orders but got " + metrics.get(0));
}
return metrics;
}, "orderMetricsRetry", DataNotReadyException.class).get();
assertThat(orderMetrics.get(0)).isEqualTo(2);
List<Double> productMetrics = metricsFetcher.fetchMetrics(invocationResult.getStart(),
invocationResult.getEnd(), 60, NAMESPACE,
List<Double> productMetrics = metricsFetcher.fetchMetrics(paddedStart,
paddedEnd, 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
assertThat(productMetrics.get(0)).isEqualTo(12);

orderMetrics = metricsFetcher.fetchMetrics(invocationResult.getStart(), invocationResult.getEnd(), 60,
orderMetrics = metricsFetcher.fetchMetrics(paddedStart, paddedEnd, 60,
NAMESPACE,
"orders", Collections.singletonMap("Service", SERVICE));
assertThat(orderMetrics.get(0)).isEqualTo(2);
productMetrics = metricsFetcher.fetchMetrics(invocationResult.getStart(), invocationResult.getEnd(), 60,
productMetrics = metricsFetcher.fetchMetrics(paddedStart, paddedEnd, 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,
List<Double> productMetricDataResult = metricsFetcher.fetchMetrics(paddedStart,
paddedEnd, 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
assertThat(productMetricDataResult.get(0)).isEqualTo(8);
// With a period of 1 second and a padded window, both standard (4) and high resolution (8)
// metrics may appear as separate 1-second buckets. Verify the high resolution value is present.
assertThat(productMetricDataResult).contains(8.0);
}
}
Loading