Skip to content
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

ci: Fix infrastructure deployment and assertions in end-to-end tests. #1816

Open
wants to merge 5 commits into
base: v2
Choose a base branch
from
Open

ci: Fix infrastructure deployment and assertions in end-to-end tests. #1816

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
efb884c
Fix CDK Stack creation in e2e tests.
phipag Mar 28, 2025
3b50767
Fix timezone problem in MetricsE2ET.java.
phipag Mar 31, 2025
758ffc6
Fix tracing E2E tests.
phipag Apr 1, 2025
37ebad5
Consistently use UTC time in MetricsE2ET.
phipag Apr 2, 2025
e43ef44
Fix LargeMessageE2ET. Initialize ExtendedSQSClient with correct regio…
phipag Apr 2, 2025
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
2 changes: 1 addition & 1 deletion ...-tests/handlers/tracing/src/main/java/software/amazon/lambda/powertools/e2e/Function.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,4 @@ private String buildMessage(String message, String funcName) {
}
return String.format("%s (%s)", message, funcName);
}
}
}
6 changes: 3 additions & 3 deletions powertools-e2e-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
<properties>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<constructs.version>10.3.0</constructs.version>
<cdk.version>2.162.1</cdk.version>
<constructs.version>10.4.2</constructs.version>
<cdk.version>2.186.0</cdk.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -231,4 +231,4 @@
</profile>
</profiles>

</project>
</project>
99 changes: 51 additions & 48 deletions powertools-e2e-tests/src/test/java/software/amazon/lambda/powertools/LargeMessageE2ET.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
import static org.assertj.core.api.Assertions.assertThat;
import static software.amazon.lambda.powertools.testutils.Infrastructure.FUNCTION_NAME_OUTPUT;

import com.amazon.sqs.javamessaging.AmazonSQSExtendedClient;
import com.amazon.sqs.javamessaging.ExtendedClientConfiguration;
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
Expand All @@ -14,6 +12,7 @@
import java.util.Map;
import java.util.UUID;
import java.util.concurrent.TimeUnit;

import org.apache.commons.io.IOUtils;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.AfterEach;
Expand All @@ -22,6 +21,10 @@
import org.junit.jupiter.api.Timeout;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import com.amazon.sqs.javamessaging.AmazonSQSExtendedClient;
import com.amazon.sqs.javamessaging.ExtendedClientConfiguration;

import software.amazon.awssdk.http.SdkHttpClient;
import software.amazon.awssdk.http.urlconnection.UrlConnectionHttpClient;
import software.amazon.awssdk.regions.Region;
Expand Down Expand Up @@ -101,21 +104,20 @@ public void reset() {
@Test
public void bigSQSMessageOffloadedToS3_shouldLoadFromS3() throws IOException, InterruptedException {
// given
final ExtendedClientConfiguration extendedClientConfig =
new ExtendedClientConfiguration()
.withPayloadSupportEnabled(s3Client, bucketName);
AmazonSQSExtendedClient client =
new AmazonSQSExtendedClient(SqsClient.builder().httpClient(httpClient).build(), extendedClientConfig);
InputStream inputStream = this.getClass().getResourceAsStream("/large_sqs_message.txt");
String bigMessage = IOUtils.toString(inputStream, StandardCharsets.UTF_8);

// when
client.sendMessage(SendMessageRequest
.builder()
.queueUrl(queueUrl)
.messageBody(bigMessage)
.build());

final ExtendedClientConfiguration extendedClientConfig = new ExtendedClientConfiguration()
.withPayloadSupportEnabled(s3Client, bucketName);
try (AmazonSQSExtendedClient client = new AmazonSQSExtendedClient(
SqsClient.builder().region(region).httpClient(httpClient).build(), extendedClientConfig)) {
InputStream inputStream = this.getClass().getResourceAsStream("/large_sqs_message.txt");
String bigMessage = IOUtils.toString(inputStream, StandardCharsets.UTF_8);

// when
client.sendMessage(SendMessageRequest
.builder()
.queueUrl(queueUrl)
.messageBody(bigMessage)
.build());
}
Thread.sleep(30000); // wait for function to be executed

// then
Expand All @@ -137,36 +139,37 @@ public void bigSQSMessageOffloadedToS3_shouldLoadFromS3() throws IOException, In
@Test
public void smallSQSMessage_shouldNotReadFromS3() throws IOException, InterruptedException {
// given
final ExtendedClientConfiguration extendedClientConfig =
new ExtendedClientConfiguration()
.withPayloadSupportEnabled(s3Client, bucketName);
AmazonSQSExtendedClient client =
new AmazonSQSExtendedClient(SqsClient.builder().httpClient(httpClient).build(), extendedClientConfig);
String message = "Hello World";

// when
client.sendMessage(SendMessageRequest
.builder()
.queueUrl(queueUrl)
.messageBody(message)
.build());

Thread.sleep(30000); // wait for function to be executed

// then
QueryRequest request = QueryRequest
.builder()
.tableName(tableName)
.keyConditionExpression("functionName = :func")
.expressionAttributeValues(
Collections.singletonMap(":func", AttributeValue.builder().s(functionName).build()))
.build();
QueryResponse response = dynamoDbClient.query(request);
List<Map<String, AttributeValue>> items = response.items();
assertThat(items).hasSize(1);
messageId = items.get(0).get("id").s();
assertThat(Integer.valueOf(items.get(0).get("bodySize").n())).isEqualTo(
message.getBytes(StandardCharsets.UTF_8).length);
assertThat(items.get(0).get("bodyMD5").s()).isEqualTo("b10a8db164e0754105b7a99be72e3fe5");
final ExtendedClientConfiguration extendedClientConfig = new ExtendedClientConfiguration()
.withPayloadSupportEnabled(s3Client, bucketName);
try (AmazonSQSExtendedClient client = new AmazonSQSExtendedClient(
SqsClient.builder().region(region).httpClient(httpClient).build(),
extendedClientConfig)) {
String message = "Hello World";

// when
client.sendMessage(SendMessageRequest
.builder()
.queueUrl(queueUrl)
.messageBody(message)
.build());

Thread.sleep(30000); // wait for function to be executed

// then
QueryRequest request = QueryRequest
.builder()
.tableName(tableName)
.keyConditionExpression("functionName = :func")
.expressionAttributeValues(
Collections.singletonMap(":func", AttributeValue.builder().s(functionName).build()))
.build();
QueryResponse response = dynamoDbClient.query(request);
List<Map<String, AttributeValue>> items = response.items();
assertThat(items).hasSize(1);
messageId = items.get(0).get("id").s();
assertThat(Integer.valueOf(items.get(0).get("bodySize").n())).isEqualTo(
message.getBytes(StandardCharsets.UTF_8).length);
assertThat(items.get(0).get("bodyMD5").s()).isEqualTo("b10a8db164e0754105b7a99be72e3fe5");
}
}
}
67 changes: 31 additions & 36 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,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;
Expand All @@ -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;
Expand All @@ -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();
Expand All @@ -71,60 +72,54 @@ public static void tearDown() {
public void test_recordMetrics() {
// GIVEN

Instant currentTimeTruncatedToMinutes =
LocalDateTime.now().truncatedTo(ChronoUnit.MINUTES).toInstant(ZoneOffset.UTC);
Instant currentTimeTruncatedToMinutes = Instant.now(Clock.systemUTC()).truncatedTo(ChronoUnit.MINUTES);
String event1 = "{ \"metrics\": {\"orders\": 1, \"products\": 4}, \"dimensions\": { \"Environment\": \"test\"}, \"highResolution\": \"false\"}";

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);


}
}
66 changes: 41 additions & 25 deletions powertools-e2e-tests/src/test/java/software/amazon/lambda/powertools/TracingE2ET.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,15 @@
import static software.amazon.lambda.powertools.testutils.Infrastructure.FUNCTION_NAME_OUTPUT;
import static software.amazon.lambda.powertools.testutils.lambda.LambdaInvoker.invokeFunction;

import java.util.Collections;
import java.util.Map;
import java.util.UUID;
import java.util.concurrent.TimeUnit;

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.tracing.SegmentDocument.SubSegment;
Expand All @@ -45,7 +46,9 @@ public static void setup() {
.testName(TracingE2ET.class.getSimpleName())
.pathToFunction("tracing")
.tracing(true)
.environmentVariables(Collections.singletonMap("POWERTOOLS_SERVICE_NAME", service))
.environmentVariables(
Map.of("POWERTOOLS_SERVICE_NAME", service,
"POWERTOOLS_TRACER_CAPTURE_RESPONSE", "true"))
.build();
Map<String, String> outputs = infrastructure.deploy();
functionName = outputs.get(FUNCTION_NAME_OUTPUT);
Expand All @@ -61,45 +64,58 @@ public static void tearDown() {
@Test
public void test_tracing() {
// GIVEN
String message = "Hello World";
String event = String.format("{\"message\":\"%s\"}", message);
String result = String.format("%s (%s)", message, functionName);
final String message = "Hello World";
final String event = String.format("{\"message\":\"%s\"}", message);
final String result = String.format("%s (%s)", message, functionName);

// WHEN
InvocationResult invocationResult = invokeFunction(functionName, event);
final InvocationResult invocationResult = invokeFunction(functionName, event);

// THEN
Trace trace = TraceFetcher.builder()
final Trace trace = TraceFetcher.builder()
.start(invocationResult.getStart())
.end(invocationResult.getEnd())
.functionName(functionName)
.build()
.fetchTrace();

assertThat(trace.getSubsegments()).hasSize(1);
SubSegment handleRequest = trace.getSubsegments().get(0);
assertThat(handleRequest.getName()).isEqualTo("## handleRequest");
assertThat(handleRequest.getAnnotations()).hasSize(2);
assertThat(handleRequest.getAnnotations().get("ColdStart")).isEqualTo(true);
assertThat(handleRequest.getAnnotations().get("Service")).isEqualTo(service);
assertThat(handleRequest.getMetadata()).hasSize(1);
Map<String, Object> metadata = (Map<String, Object>) handleRequest.getMetadata().get(service);
assertThat(metadata.get("handleRequest response")).isEqualTo(result);
assertThat(handleRequest.getSubsegments()).hasSize(2);

SubSegment sub = handleRequest.getSubsegments().get(0);
assertThat(trace.getSubsegments()).hasSize(2);

// We need to filter segments based on name because they are not returned in-order from the X-Ray API
// The Init segment is created by default for Lambda functions in X-Ray
final SubSegment initSegment = trace.getSubsegments().stream()
.filter(subSegment -> subSegment.getName().equals("Init"))
.findFirst().orElse(null);
assertThat(initSegment.getName()).isEqualTo("Init");
assertThat(initSegment.getAnnotations()).isNull();

final SubSegment handleRequestSegment = trace.getSubsegments().stream()
.filter(subSegment -> subSegment.getName().equals("## handleRequest"))
.findFirst().orElse(null);
assertThat(handleRequestSegment.getName()).isEqualTo("## handleRequest");
assertThat(handleRequestSegment.getAnnotations()).hasSize(2);
assertThat(handleRequestSegment.getAnnotations()).containsEntry("ColdStart", true);
assertThat(handleRequestSegment.getAnnotations()).containsEntry("Service", service);
assertThat(handleRequestSegment.getMetadata()).hasSize(1);
final Map<String, Object> metadata = (Map<String, Object>) handleRequestSegment.getMetadata().get(service);
assertThat(metadata).containsEntry("handleRequest response", result);
assertThat(handleRequestSegment.getSubsegments()).hasSize(2);

SubSegment sub = handleRequestSegment.getSubsegments().get(0);
assertThat(sub.getName()).isIn("## internal_stuff", "## buildMessage");

sub = handleRequest.getSubsegments().get(1);
sub = handleRequestSegment.getSubsegments().get(1);
assertThat(sub.getName()).isIn("## internal_stuff", "## buildMessage");

SubSegment buildMessage = handleRequest.getSubsegments().stream()
.filter(subSegment -> subSegment.getName().equals("## buildMessage")).findFirst().orElse(null);
SubSegment buildMessage = handleRequestSegment.getSubsegments().stream()
.filter(subSegment -> subSegment.getName().equals("## buildMessage"))
.findFirst().orElse(null);
assertThat(buildMessage).isNotNull();
assertThat(buildMessage.getAnnotations()).hasSize(1);
assertThat(buildMessage.getAnnotations().get("message")).isEqualTo(message);
assertThat(buildMessage.getAnnotations()).containsEntry("message", message);
assertThat(buildMessage.getMetadata()).hasSize(1);
metadata = (Map<String, Object>) buildMessage.getMetadata().get(service);
assertThat(metadata.get("buildMessage response")).isEqualTo(result);
final Map<String, Object> buildMessageSegmentMetadata = (Map<String, Object>) buildMessage.getMetadata()
.get(service);
assertThat(buildMessageSegmentMetadata).containsEntry("buildMessage response", result);
}
}
Loading
Loading