diffs = new ArrayList<>();
+ JsonNodeUtils.diffNodes("", expected, actual, diffs);
+ assertEquals(1, diffs.size());
+ assertTrue(diffs.get(0).startsWith("CHANGED .s"));
+ }
+}
diff --git a/aws-lambda-java-tests/src/test/java/com/amazonaws/services/lambda/runtime/tests/LambdaEventAssertTest.java b/aws-lambda-java-tests/src/test/java/com/amazonaws/services/lambda/runtime/tests/LambdaEventAssertTest.java
new file mode 100644
index 000000000..63067f8b2
--- /dev/null
+++ b/aws-lambda-java-tests/src/test/java/com/amazonaws/services/lambda/runtime/tests/LambdaEventAssertTest.java
@@ -0,0 +1,71 @@
+package com.amazonaws.services.lambda.runtime.tests;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+public class LambdaEventAssertTest {
+ /**
+ * Demonstrates the completeness check: the fixture has a field
+ * ({@code unknownField}) that {@code PartialPojo} does not capture,
+ * so it gets silently dropped during deserialization.
+ */
+ @Test
+ void shouldFailWhenFieldIsDropped() {
+ AssertionError error = assertThrows(AssertionError.class,
+ () -> LambdaEventAssert.assertSerializationRoundTrip(
+ "partial_pojo.json", PartialPojo.class));
+
+ assertTrue(error.getMessage().contains("PartialPojo"),
+ "Error message should name the failing class");
+ }
+
+ /**
+ * Demonstrates the stability check: the getter mutates state on each
+ * call, so the first and second round-trips produce different JSON.
+ */
+ @Test
+ void shouldFailWhenSerializationIsUnstable() {
+ AssertionError error = assertThrows(AssertionError.class,
+ () -> LambdaEventAssert.assertSerializationRoundTrip(
+ "unstable_pojo.json", UnstablePojo.class));
+
+ assertTrue(error.getMessage().contains("UnstablePojo"),
+ "Error message should name the failing class");
+ }
+
+ /** POJO that only captures {@code name}, silently dropping any other fields. */
+ public static class PartialPojo {
+ private String name;
+
+ public PartialPojo() {
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+ }
+
+ /**
+ * POJO with a getter that appends a suffix, making serialization
+ * non-idempotent.
+ */
+ public static class UnstablePojo {
+ private String name;
+
+ public UnstablePojo() {
+ }
+
+ public String getName() {
+ return name == null ? null : name + "_x";
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+ }
+}
diff --git a/aws-lambda-java-tests/src/test/java/com/amazonaws/services/lambda/runtime/tests/ResponseEventSerializationRoundTripTest.java b/aws-lambda-java-tests/src/test/java/com/amazonaws/services/lambda/runtime/tests/ResponseEventSerializationRoundTripTest.java
new file mode 100644
index 000000000..e700b0d01
--- /dev/null
+++ b/aws-lambda-java-tests/src/test/java/com/amazonaws/services/lambda/runtime/tests/ResponseEventSerializationRoundTripTest.java
@@ -0,0 +1,59 @@
+/* Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. */
+package com.amazonaws.services.lambda.runtime.tests;
+
+import com.amazonaws.services.lambda.runtime.events.*;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.stream.Stream;
+
+/**
+ * Verifies serialization round-trip fidelity for Lambda response event types.
+ *
+ * Response events are POJOs that Lambda functions return to the RIC, which
+ * serializes them to JSON via {@code EventHandlerLoader.getSerializer()}.
+ * None of these types are registered in {@code SUPPORTED_EVENTS}, so they
+ * go through the bare Jackson path ({@code JacksonFactory.getInstance()
+ * .getSerializer(type)}).
+ *
+ * Although the RIC only calls {@code toJson()} on response types (never
+ * {@code fromJson()}), the round-trip test is a stricter check: if a response
+ * type survives JSON → POJO → JSON → POJO → JSON, it
+ * certainly survives the production POJO → JSON path.
+ *
+ * @see SerializationRoundTripTest for registered input events
+ * @see UnregisteredEventSerializationRoundTripTest for unregistered input events
+ */
+@SuppressWarnings("deprecation") // APIGatewayV2ProxyResponseEvent is deprecated
+public class ResponseEventSerializationRoundTripTest {
+
+ @ParameterizedTest(name = "{0}")
+ @MethodSource("passingCases")
+ void roundTrip(String displayName, String fixture, Class eventClass) {
+ LambdaEventAssert.assertSerializationRoundTrip(fixture, eventClass);
+ }
+
+ private static Stream passingCases() {
+ return Stream.of(
+ // API Gateway responses
+ args(APIGatewayProxyResponseEvent.class, "response/apigw_proxy_response.json"),
+ args(APIGatewayV2HTTPResponse.class, "response/apigw_v2_http_response.json"),
+ args(APIGatewayV2WebSocketResponse.class, "response/apigw_v2_websocket_response.json"),
+ args(APIGatewayV2ProxyResponseEvent.class, "response/apigw_v2_websocket_response.json"),
+ // ALB response
+ args(ApplicationLoadBalancerResponseEvent.class, "response/alb_response.json"),
+ // S3 Batch response
+ args(S3BatchResponse.class, "response/s3_batch_response.json"),
+ // SQS Batch response
+ args(SQSBatchResponse.class, "response/sqs_batch_response.json"),
+ // Simple IAM Policy response (HTTP API)
+ args(SimpleIAMPolicyResponse.class, "response/simple_iam_policy_response.json"),
+ // MSK Firehose response
+ args(MSKFirehoseResponse.class, "response/msk_firehose_response.json"));
+ }
+
+ private static Arguments args(Class clazz, String fixture) {
+ return Arguments.of(clazz.getSimpleName(), fixture, clazz);
+ }
+}
diff --git a/aws-lambda-java-tests/src/test/java/com/amazonaws/services/lambda/runtime/tests/SerializationRoundTripTest.java b/aws-lambda-java-tests/src/test/java/com/amazonaws/services/lambda/runtime/tests/SerializationRoundTripTest.java
new file mode 100644
index 000000000..3eab8fec0
--- /dev/null
+++ b/aws-lambda-java-tests/src/test/java/com/amazonaws/services/lambda/runtime/tests/SerializationRoundTripTest.java
@@ -0,0 +1,108 @@
+/* Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. */
+package com.amazonaws.services.lambda.runtime.tests;
+
+import com.amazonaws.services.lambda.runtime.events.*;
+import com.amazonaws.services.lambda.runtime.events.models.s3.S3EventNotification;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.stream.Stream;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+ * Verifies serialization round-trip fidelity for events that are registered in
+ * {@code LambdaEventSerializers.SUPPORTED_EVENTS}.
+ *
+ * Registered events go through the full customized serialization path in the
+ * Runtime Interface Client (RIC): {@code EventHandlerLoader.getSerializer()}
+ * detects them via {@code isLambdaSupportedEvent()} and delegates to
+ * {@code LambdaEventSerializers.serializerFor()}, which applies Jackson mixins,
+ * {@code DateModule}/{@code DateTimeModule}, and naming strategies.
+ *
+ * Each case feeds a JSON fixture through
+ * {@link LambdaEventAssert#assertSerializationRoundTrip} which performs two
+ * consecutive round-trips and compares the original JSON tree against the
+ * final output.
+ *
+ * @see UnregisteredEventSerializationRoundTripTest for events not in SUPPORTED_EVENTS
+ */
+public class SerializationRoundTripTest {
+
+ @ParameterizedTest(name = "{0}")
+ @MethodSource("passingCases")
+ void roundTrip(String displayName, String fixture, Class eventClass) {
+ LambdaEventAssert.assertSerializationRoundTrip(fixture, eventClass);
+ }
+
+ @ParameterizedTest(name = "{0} (known failure)")
+ @MethodSource("knownFailureCases")
+ void roundTripKnownFailures(String displayName, String fixture, Class eventClass) {
+ assertThrows(Throwable.class,
+ () -> LambdaEventAssert.assertSerializationRoundTrip(fixture, eventClass),
+ displayName + " was expected to fail but passed — move it to passingCases()");
+ }
+
+ private static Stream passingCases() {
+ return Stream.of(
+ args(CloudFormationCustomResourceEvent.class, "cloudformation_event.json"),
+ args(CloudWatchLogsEvent.class, "cloudwatchlogs_event.json"),
+ args(CodeCommitEvent.class, "codecommit_event.json"),
+ args(ConfigEvent.class, "config_event.json"),
+ args(DynamodbEvent.class, "ddb/dynamo_event_roundtrip.json"),
+ args(KinesisEvent.class, "kinesis/kinesis_event_roundtrip.json"),
+ args(KinesisFirehoseEvent.class, "firehose_event.json"),
+ args(LambdaDestinationEvent.class, "lambda_destination_event.json"),
+ args(ScheduledEvent.class, "cloudwatch_event.json"),
+ args(SecretsManagerRotationEvent.class, "secrets_rotation_event.json"),
+ args(SNSEvent.class, "sns_event.json"),
+ args(LexEvent.class, "lex_event_roundtrip.json"),
+ args(ConnectEvent.class, "connect_event.json"),
+ args(SQSEvent.class, "sqs/sqs_event_nobody.json"),
+ args(APIGatewayProxyRequestEvent.class, "apigw_rest_event.json"),
+ args(CloudFrontEvent.class, "cloudfront_event.json"),
+ args(S3Event.class, "s3_event.json"),
+ args(S3EventNotification.class, "s3_event.json"),
+ args(APIGatewayV2HTTPEvent.class, "apigw_http_event.json"),
+ args(APIGatewayCustomAuthorizerEvent.class, "apigw_auth.json"),
+ args(ApplicationLoadBalancerRequestEvent.class, "elb_event.json"),
+ args(CloudWatchCompositeAlarmEvent.class, "cloudwatch_composite_alarm.json"),
+ args(CloudWatchMetricAlarmEvent.class, "cloudwatch_metric_alarm.json"),
+ args(CognitoUserPoolPreTokenGenerationEventV2.class, "cognito_user_pool_pre_token_generation_event_v2.json"),
+ args(KafkaEvent.class, "kafka_event_roundtrip.json"),
+ args(MSKFirehoseEvent.class, "msk_firehose_event_roundtrip.json"),
+ args(RabbitMQEvent.class, "rabbitmq_event_roundtrip.json"),
+ args(S3BatchEventV2.class, "s3_batch_event_v2.json"),
+ args(IoTButtonEvent.class, "iot_button_event.json"),
+ args(CognitoEvent.class, "cognito_sync_event.json"),
+ args(DynamodbTimeWindowEvent.class, "ddb/dynamo_time_window_event.json"),
+ args(KinesisTimeWindowEvent.class, "kinesis/kinesis_time_window_event.json"));
+ }
+
+ private static Stream knownFailureCases() {
+ return Stream.of(
+ // APIGatewayV2CustomAuthorizerEvent has two serialization issues:
+ // 1. getTime() parses the raw string "12/Mar/2020:19:03:58 +0000" into a
+ // DateTime via dd/MMM/yyyy formatter. Jackson serializes as ISO-8601, but
+ // the formatter cannot parse ISO-8601 back on the second round-trip.
+ // The time field is effectively mandatory (getTime() throws NPE if null),
+ // and the date format change is inherent to how the serialization works.
+ // 2. getTimeEpoch() converts long to Instant; Jackson serializes as decimal
+ // seconds (e.g. 1583348638.390000000) instead of the original long.
+ // Both transformations are lossy; coercion captured in EventLoaderTest.
+ args(APIGatewayV2CustomAuthorizerEvent.class, "apigw_auth_v2.json"),
+ // ActiveMQEvent has one serialization issue:
+ // Destination.physicalName (camelCase) vs JSON "physicalname" (lowercase) —
+ // ACCEPT_CASE_INSENSITIVE_PROPERTIES is disabled in JacksonFactory so the
+ // field is silently dropped during deserialization.
+ // Fix: create an ActiveMQEventMixin with a DestinationMixin that maps
+ // @JsonProperty("physicalname") to getPhysicalName()/setPhysicalName(),
+ // then register it in LambdaEventSerializers MIXIN_MAP and NESTED_CLASS_MAP.
+ args(ActiveMQEvent.class, "mq_event.json"));
+ }
+
+ private static Arguments args(Class clazz, String fixture) {
+ return Arguments.of(clazz.getSimpleName(), fixture, clazz);
+ }
+}
diff --git a/aws-lambda-java-tests/src/test/java/com/amazonaws/services/lambda/runtime/tests/UnregisteredEventSerializationRoundTripTest.java b/aws-lambda-java-tests/src/test/java/com/amazonaws/services/lambda/runtime/tests/UnregisteredEventSerializationRoundTripTest.java
new file mode 100644
index 000000000..12ad818e4
--- /dev/null
+++ b/aws-lambda-java-tests/src/test/java/com/amazonaws/services/lambda/runtime/tests/UnregisteredEventSerializationRoundTripTest.java
@@ -0,0 +1,90 @@
+/* Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. */
+package com.amazonaws.services.lambda.runtime.tests;
+
+import com.amazonaws.services.lambda.runtime.events.*;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.stream.Stream;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+ * Verifies serialization round-trip fidelity for events that are NOT registered
+ * in {@code LambdaEventSerializers.SUPPORTED_EVENTS}.
+ *
+ * In the Runtime Interface Client (RIC), when a handler's event type is not
+ * in {@code SUPPORTED_EVENTS}, {@code EventHandlerLoader.getSerializer()} falls
+ * through to {@code JacksonFactory.getInstance().getSerializer(type)} — a bare
+ * {@code PojoSerializer} backed by Jackson without any mixins or naming
+ * strategies. However, {@code LambdaEventSerializers.serializerFor()} (used by
+ * this test) unconditionally registers {@code DateModule} and
+ * {@code DateTimeModule}, so Joda/java.time types are still handled. For most
+ * unregistered events this makes no practical difference because they don't
+ * contain Joda DateTime fields.
+ *
+ * @see SerializationRoundTripTest for events registered in SUPPORTED_EVENTS
+ */
+@SuppressWarnings("deprecation") // APIGatewayV2ProxyRequestEvent is deprecated
+public class UnregisteredEventSerializationRoundTripTest {
+
+ @ParameterizedTest(name = "{0}")
+ @MethodSource("passingCases")
+ void roundTrip(String displayName, String fixture, Class eventClass) {
+ LambdaEventAssert.assertSerializationRoundTrip(fixture, eventClass);
+ }
+
+ @ParameterizedTest(name = "{0} (known failure)")
+ @MethodSource("knownFailureCases")
+ void roundTripKnownFailures(String displayName, String fixture, Class eventClass) {
+ assertThrows(Throwable.class,
+ () -> LambdaEventAssert.assertSerializationRoundTrip(fixture, eventClass),
+ displayName + " was expected to fail but passed — move it to passingCases()");
+ }
+
+ private static Stream passingCases() {
+ return Stream.of(
+ // S3 Batch
+ args(S3BatchEvent.class, "s3_batch_event.json"),
+ // AppSync
+ args(AppSyncLambdaAuthorizerEvent.class, "appsync_authorizer_event.json"),
+ args(AppSyncLambdaAuthorizerResponse.class, "appsync_authorizer_response.json"),
+ // TimeWindow response
+ args(TimeWindowEventResponse.class, "time_window_event_response.json"),
+ // Cognito UserPool triggers
+ args(CognitoUserPoolPreSignUpEvent.class, "cognito/cognito_userpool_presignup.json"),
+ args(CognitoUserPoolPostConfirmationEvent.class, "cognito/cognito_userpool_postconfirmation.json"),
+ args(CognitoUserPoolPreAuthenticationEvent.class, "cognito/cognito_userpool_preauthentication.json"),
+ args(CognitoUserPoolPostAuthenticationEvent.class, "cognito/cognito_userpool_postauthentication.json"),
+ args(CognitoUserPoolDefineAuthChallengeEvent.class, "cognito/cognito_userpool_define_auth_challenge.json"),
+ args(CognitoUserPoolCreateAuthChallengeEvent.class, "cognito/cognito_userpool_create_auth_challenge.json"),
+ args(CognitoUserPoolVerifyAuthChallengeResponseEvent.class, "cognito/cognito_userpool_verify_auth_challenge.json"),
+ args(CognitoUserPoolMigrateUserEvent.class, "cognito/cognito_userpool_migrate_user.json"),
+ args(CognitoUserPoolCustomMessageEvent.class, "cognito/cognito_userpool_custom_message.json"),
+ args(CognitoUserPoolPreTokenGenerationEvent.class, "cognito/cognito_userpool_pre_token_generation.json"),
+ // Kinesis Analytics
+ args(KinesisAnalyticsFirehoseInputPreprocessingEvent.class, "kinesis/kinesis_analytics_firehose_input_preprocessing.json"),
+ args(KinesisAnalyticsStreamsInputPreprocessingEvent.class, "kinesis/kinesis_analytics_streams_input_preprocessing.json"),
+ args(KinesisAnalyticsInputPreprocessingResponse.class, "kinesis/kinesis_analytics_input_preprocessing_response.json"),
+ args(KinesisAnalyticsOutputDeliveryEvent.class, "kinesis/kinesis_analytics_output_delivery.json"),
+ args(KinesisAnalyticsOutputDeliveryResponse.class, "kinesis/kinesis_analytics_output_delivery_response.json"),
+ // API Gateway V2 WebSocket
+ args(APIGatewayV2WebSocketEvent.class, "apigw_websocket_event.json"),
+ args(APIGatewayV2ProxyRequestEvent.class, "apigw_websocket_event.json"));
+ }
+
+ private static Stream knownFailureCases() {
+ return Stream.of(
+ // S3ObjectLambdaEvent: Lombok generates getXAmzRequestId() for field
+ // "xAmzRequestId". With USE_STD_BEAN_NAMING, Jackson derives the property
+ // name as "XAmzRequestId" (capital X), so the original "xAmzRequestId" key
+ // is silently dropped during deserialization.
+ // Fix: add @JsonProperty("xAmzRequestId") on the field or getter.
+ args(S3ObjectLambdaEvent.class, "s3_object_lambda_event.json"));
+ }
+
+ private static Arguments args(Class clazz, String fixture) {
+ return Arguments.of(clazz.getSimpleName(), fixture, clazz);
+ }
+}
diff --git a/aws-lambda-java-tests/src/test/resources/apigw_http_event.json b/aws-lambda-java-tests/src/test/resources/apigw_http_event.json
index 88f4e5b4b..91954656c 100644
--- a/aws-lambda-java-tests/src/test/resources/apigw_http_event.json
+++ b/aws-lambda-java-tests/src/test/resources/apigw_http_event.json
@@ -18,18 +18,6 @@
"requestContext": {
"accountId": "123456789012",
"apiId": "api-id",
- "authentication": {
- "clientCert": {
- "clientCertPem": "CERT_CONTENT",
- "subjectDN": "www.example.com",
- "issuerDN": "Example issuer",
- "serialNumber": "a1:a1:a1:a1:a1:a1:a1:a1:a1:a1:a1:a1:a1:a1:a1:a1",
- "validity": {
- "notBefore": "May 28 12:30:02 2019 GMT",
- "notAfter": "Aug 5 09:36:04 2021 GMT"
- }
- }
- },
"authorizer": {
"jwt": {
"claims": {
diff --git a/aws-lambda-java-tests/src/test/resources/apigw_rest_event.json b/aws-lambda-java-tests/src/test/resources/apigw_rest_event.json
index 28f10c221..a139ccbe8 100644
--- a/aws-lambda-java-tests/src/test/resources/apigw_rest_event.json
+++ b/aws-lambda-java-tests/src/test/resources/apigw_rest_event.json
@@ -14,19 +14,22 @@
"Header2": [
"value1",
"value2"
+ ],
+ "Header3": [
+ "value1,value2"
]
},
"queryStringParameters": {
"parameter1": "value1",
- "parameter2": "value"
+ "parameter2": "value2"
},
"multiValueQueryStringParameters": {
"parameter1": [
- "value1",
- "value2"
+ "value1"
],
"parameter2": [
- "value"
+ "value1",
+ "value2"
]
},
"requestContext": {
@@ -52,17 +55,7 @@
"sourceIp": "IP",
"user": null,
"userAgent": "user-agent",
- "userArn": null,
- "clientCert": {
- "clientCertPem": "CERT_CONTENT",
- "subjectDN": "www.example.com",
- "issuerDN": "Example issuer",
- "serialNumber": "a1:a1:a1:a1:a1:a1:a1:a1:a1:a1:a1:a1:a1:a1:a1:a1",
- "validity": {
- "notBefore": "May 28 12:30:02 2019 GMT",
- "notAfter": "Aug 5 09:36:04 2021 GMT"
- }
- }
+ "userArn": null
},
"path": "/my/path",
"protocol": "HTTP/1.1",
@@ -76,5 +69,5 @@
"pathParameters": null,
"stageVariables": null,
"body": "Hello from Lambda!",
- "isBase64Encoded": true
+ "isBase64Encoded": false
}
\ No newline at end of file
diff --git a/aws-lambda-java-tests/src/test/resources/apigw_websocket_event.json b/aws-lambda-java-tests/src/test/resources/apigw_websocket_event.json
new file mode 100644
index 000000000..a47fc3a94
--- /dev/null
+++ b/aws-lambda-java-tests/src/test/resources/apigw_websocket_event.json
@@ -0,0 +1,88 @@
+{
+ "resource": "/",
+ "path": "/",
+ "httpMethod": "GET",
+ "headers": {
+ "Host": "abcdef1234.execute-api.us-east-1.amazonaws.com",
+ "Sec-WebSocket-Extensions": "permessage-deflate",
+ "Sec-WebSocket-Key": "dGhlIHNhbXBsZSBub25jZQ==",
+ "Sec-WebSocket-Version": "13",
+ "X-Forwarded-For": "192.0.2.1",
+ "X-Forwarded-Port": "443",
+ "X-Forwarded-Proto": "https"
+ },
+ "multiValueHeaders": {
+ "Host": [
+ "abcdef1234.execute-api.us-east-1.amazonaws.com"
+ ],
+ "Sec-WebSocket-Extensions": [
+ "permessage-deflate"
+ ],
+ "Sec-WebSocket-Key": [
+ "dGhlIHNhbXBsZSBub25jZQ=="
+ ],
+ "Sec-WebSocket-Version": [
+ "13"
+ ],
+ "X-Forwarded-For": [
+ "192.0.2.1"
+ ],
+ "X-Forwarded-Port": [
+ "443"
+ ],
+ "X-Forwarded-Proto": [
+ "https"
+ ]
+ },
+ "queryStringParameters": {
+ "param1": "value1"
+ },
+ "multiValueQueryStringParameters": {
+ "param1": [
+ "value1"
+ ]
+ },
+ "pathParameters": {
+ "proxy": "path/to/resource"
+ },
+ "stageVariables": {
+ "stageVar1": "value1"
+ },
+ "requestContext": {
+ "accountId": "123456789012",
+ "resourceId": "abcdef",
+ "stage": "prod",
+ "requestId": "abc-def-ghi",
+ "identity": {
+ "cognitoIdentityPoolId": "us-east-1:id-pool",
+ "accountId": "123456789012",
+ "cognitoIdentityId": "us-east-1:identity-id",
+ "caller": "caller-id",
+ "apiKey": "api-key-id",
+ "sourceIp": "192.0.2.1",
+ "cognitoAuthenticationType": "authenticated",
+ "cognitoAuthenticationProvider": "provider",
+ "userArn": "arn:aws:iam::123456789012:user/testuser",
+ "userAgent": "Mozilla/5.0",
+ "user": "testuser",
+ "accessKey": "AKIAIOSFODNN7EXAMPLE"
+ },
+ "resourcePath": "/",
+ "httpMethod": "GET",
+ "apiId": "abcdef1234",
+ "connectedAt": 1583348638390,
+ "connectionId": "abc123=",
+ "domainName": "abcdef1234.execute-api.us-east-1.amazonaws.com",
+ "eventType": "CONNECT",
+ "extendedRequestId": "abc123=",
+ "integrationLatency": "100",
+ "messageDirection": "IN",
+ "messageId": "msg-001",
+ "requestTime": "09/Apr/2020:18:03:58 +0000",
+ "requestTimeEpoch": 1583348638390,
+ "routeKey": "$connect",
+ "status": "200"
+ },
+ "body": "request body",
+ "isBase64Encoded": false
+}
\ No newline at end of file
diff --git a/aws-lambda-java-tests/src/test/resources/appsync_authorizer_event.json b/aws-lambda-java-tests/src/test/resources/appsync_authorizer_event.json
new file mode 100644
index 000000000..494a500f3
--- /dev/null
+++ b/aws-lambda-java-tests/src/test/resources/appsync_authorizer_event.json
@@ -0,0 +1,15 @@
+{
+ "authorizationToken": "BE9DC5E3-D410-4733-AF76-70178092E681",
+ "requestContext": {
+ "apiId": "giy7kumfmvcqvbedntjwjvagii",
+ "accountId": "254688921111",
+ "requestId": "b80ed838-14c6-4500-b4c3-b694c7bef086",
+ "queryDocument": "mutation MyNewTask($desc: String!) {\n createTask(description: $desc) {\n id\n }\n}\n",
+ "operationName": "MyNewTask",
+ "variables": {}
+ },
+ "requestHeaders": {
+ "host": "giy7kumfmvcqvbedntjwjvagii.appsync-api.us-east-1.amazonaws.com",
+ "content-type": "application/json"
+ }
+}
\ No newline at end of file
diff --git a/aws-lambda-java-tests/src/test/resources/appsync_authorizer_response.json b/aws-lambda-java-tests/src/test/resources/appsync_authorizer_response.json
new file mode 100644
index 000000000..1216ad51d
--- /dev/null
+++ b/aws-lambda-java-tests/src/test/resources/appsync_authorizer_response.json
@@ -0,0 +1,11 @@
+{
+ "isAuthorized": true,
+ "resolverContext": {
+ "name": "Foo Man",
+ "balance": "100"
+ },
+ "deniedFields": [
+ "Mutation.createEvent"
+ ],
+ "ttlOverride": 15
+}
\ No newline at end of file
diff --git a/aws-lambda-java-tests/src/test/resources/cloudfront_event.json b/aws-lambda-java-tests/src/test/resources/cloudfront_event.json
index 7485310e9..bf4625d06 100644
--- a/aws-lambda-java-tests/src/test/resources/cloudfront_event.json
+++ b/aws-lambda-java-tests/src/test/resources/cloudfront_event.json
@@ -7,7 +7,6 @@
},
"request": {
"uri": "/test",
- "querystring": "auth=test&foo=bar",
"method": "GET",
"clientIp": "2001:cdba::3257:9652",
"headers": {
diff --git a/aws-lambda-java-tests/src/test/resources/cognito/cognito_userpool_create_auth_challenge.json b/aws-lambda-java-tests/src/test/resources/cognito/cognito_userpool_create_auth_challenge.json
new file mode 100644
index 000000000..495b41475
--- /dev/null
+++ b/aws-lambda-java-tests/src/test/resources/cognito/cognito_userpool_create_auth_challenge.json
@@ -0,0 +1,37 @@
+{
+ "version": "1",
+ "triggerSource": "CreateAuthChallenge_Authentication",
+ "region": "us-east-1",
+ "userPoolId": "us-east-1_uPoolId",
+ "userName": "testuser",
+ "callerContext": {
+ "awsSdkVersion": "2.0.0",
+ "clientId": "abcdefg1234567"
+ },
+ "request": {
+ "userAttributes": {
+ "email": "user@example.com"
+ },
+ "clientMetadata": {
+ "meta1": "value1"
+ },
+ "challengeName": "CUSTOM_CHALLENGE",
+ "session": [
+ {
+ "challengeName": "PASSWORD_VERIFIER",
+ "challengeResult": true,
+ "challengeMetadata": "metadata1"
+ }
+ ],
+ "userNotFound": false
+ },
+ "response": {
+ "publicChallengeParameters": {
+ "captchaUrl": "url/123.jpg"
+ },
+ "privateChallengeParameters": {
+ "answer": "5"
+ },
+ "challengeMetadata": "CAPTCHA_CHALLENGE"
+ }
+}
\ No newline at end of file
diff --git a/aws-lambda-java-tests/src/test/resources/cognito/cognito_userpool_custom_message.json b/aws-lambda-java-tests/src/test/resources/cognito/cognito_userpool_custom_message.json
new file mode 100644
index 000000000..aa7a53a83
--- /dev/null
+++ b/aws-lambda-java-tests/src/test/resources/cognito/cognito_userpool_custom_message.json
@@ -0,0 +1,28 @@
+{
+ "version": "1",
+ "triggerSource": "CustomMessage_SignUp",
+ "region": "us-east-1",
+ "userPoolId": "us-east-1_uPoolId",
+ "userName": "testuser",
+ "callerContext": {
+ "awsSdkVersion": "2.0.0",
+ "clientId": "abcdefg1234567"
+ },
+ "request": {
+ "userAttributes": {
+ "email": "user@example.com",
+ "phone_number_verified": "true",
+ "email_verified": "true"
+ },
+ "clientMetadata": {
+ "meta1": "value1"
+ },
+ "codeParameter": "####",
+ "usernameParameter": "testuser"
+ },
+ "response": {
+ "smsMessage": "Your code is ####",
+ "emailMessage": "Your code is ####",
+ "emailSubject": "Welcome"
+ }
+}
\ No newline at end of file
diff --git a/aws-lambda-java-tests/src/test/resources/cognito/cognito_userpool_define_auth_challenge.json b/aws-lambda-java-tests/src/test/resources/cognito/cognito_userpool_define_auth_challenge.json
new file mode 100644
index 000000000..e320b71d1
--- /dev/null
+++ b/aws-lambda-java-tests/src/test/resources/cognito/cognito_userpool_define_auth_challenge.json
@@ -0,0 +1,32 @@
+{
+ "version": "1",
+ "triggerSource": "DefineAuthChallenge_Authentication",
+ "region": "us-east-1",
+ "userPoolId": "us-east-1_uPoolId",
+ "userName": "testuser",
+ "callerContext": {
+ "awsSdkVersion": "2.0.0",
+ "clientId": "abcdefg1234567"
+ },
+ "request": {
+ "userAttributes": {
+ "email": "user@example.com"
+ },
+ "clientMetadata": {
+ "meta1": "value1"
+ },
+ "session": [
+ {
+ "challengeName": "PASSWORD_VERIFIER",
+ "challengeResult": true,
+ "challengeMetadata": "metadata1"
+ }
+ ],
+ "userNotFound": false
+ },
+ "response": {
+ "challengeName": "CUSTOM_CHALLENGE",
+ "issueTokens": false,
+ "failAuthentication": false
+ }
+}
\ No newline at end of file
diff --git a/aws-lambda-java-tests/src/test/resources/cognito/cognito_userpool_migrate_user.json b/aws-lambda-java-tests/src/test/resources/cognito/cognito_userpool_migrate_user.json
new file mode 100644
index 000000000..2897ae063
--- /dev/null
+++ b/aws-lambda-java-tests/src/test/resources/cognito/cognito_userpool_migrate_user.json
@@ -0,0 +1,35 @@
+{
+ "version": "1",
+ "triggerSource": "UserMigration_Authentication",
+ "region": "us-east-1",
+ "userPoolId": "us-east-1_uPoolId",
+ "userName": "testuser",
+ "callerContext": {
+ "awsSdkVersion": "2.0.0",
+ "clientId": "abcdefg1234567"
+ },
+ "request": {
+ "userAttributes": {
+ "email": "user@example.com"
+ },
+ "validationData": {
+ "key1": "val1"
+ },
+ "clientMetadata": {
+ "meta1": "value1"
+ },
+ "userName": "testuser",
+ "password": "test-password"
+ },
+ "response": {
+ "userAttributes": {
+ "email": "user@example.com"
+ },
+ "finalUserStatus": "CONFIRMED",
+ "messageAction": "SUPPRESS",
+ "desiredDeliveryMediums": [
+ "EMAIL"
+ ],
+ "forceAliasCreation": false
+ }
+}
\ No newline at end of file
diff --git a/aws-lambda-java-tests/src/test/resources/cognito/cognito_userpool_postauthentication.json b/aws-lambda-java-tests/src/test/resources/cognito/cognito_userpool_postauthentication.json
new file mode 100644
index 000000000..f41084d54
--- /dev/null
+++ b/aws-lambda-java-tests/src/test/resources/cognito/cognito_userpool_postauthentication.json
@@ -0,0 +1,20 @@
+{
+ "version": "1",
+ "triggerSource": "PostAuthentication_Authentication",
+ "region": "us-east-1",
+ "userPoolId": "us-east-1_uPoolId",
+ "userName": "testuser",
+ "callerContext": {
+ "awsSdkVersion": "2.0.0",
+ "clientId": "abcdefg1234567"
+ },
+ "request": {
+ "userAttributes": {
+ "email": "user@example.com"
+ },
+ "clientMetadata": {
+ "meta1": "value1"
+ },
+ "newDeviceUsed": false
+ }
+}
\ No newline at end of file
diff --git a/aws-lambda-java-tests/src/test/resources/cognito/cognito_userpool_postconfirmation.json b/aws-lambda-java-tests/src/test/resources/cognito/cognito_userpool_postconfirmation.json
new file mode 100644
index 000000000..ecf63c7d3
--- /dev/null
+++ b/aws-lambda-java-tests/src/test/resources/cognito/cognito_userpool_postconfirmation.json
@@ -0,0 +1,20 @@
+{
+ "version": "1",
+ "triggerSource": "PostConfirmation_ConfirmSignUp",
+ "region": "us-east-1",
+ "userPoolId": "us-east-1_uPoolId",
+ "userName": "testuser",
+ "callerContext": {
+ "awsSdkVersion": "2.0.0",
+ "clientId": "abcdefg1234567"
+ },
+ "request": {
+ "userAttributes": {
+ "email": "user@example.com",
+ "email_verified": "true"
+ },
+ "clientMetadata": {
+ "meta1": "value1"
+ }
+ }
+}
\ No newline at end of file
diff --git a/aws-lambda-java-tests/src/test/resources/cognito/cognito_userpool_pre_token_generation.json b/aws-lambda-java-tests/src/test/resources/cognito/cognito_userpool_pre_token_generation.json
new file mode 100644
index 000000000..f81ffb902
--- /dev/null
+++ b/aws-lambda-java-tests/src/test/resources/cognito/cognito_userpool_pre_token_generation.json
@@ -0,0 +1,48 @@
+{
+ "version": "1",
+ "triggerSource": "TokenGeneration_HostedAuth",
+ "region": "us-east-1",
+ "userPoolId": "us-east-1_uPoolId",
+ "userName": "testuser",
+ "callerContext": {
+ "awsSdkVersion": "2.0.0",
+ "clientId": "abcdefg1234567"
+ },
+ "request": {
+ "userAttributes": {
+ "email": "user@example.com"
+ },
+ "clientMetadata": {
+ "meta1": "value1"
+ },
+ "groupConfiguration": {
+ "groupsToOverride": [
+ "group1",
+ "group2"
+ ],
+ "iamRolesToOverride": [
+ "arn:aws:iam::123456789012:role/role1"
+ ],
+ "preferredRole": "arn:aws:iam::123456789012:role/role1"
+ }
+ },
+ "response": {
+ "claimsOverrideDetails": {
+ "claimsToAddOrOverride": {
+ "custom:myattr": "myvalue"
+ },
+ "claimsToSuppress": [
+ "email"
+ ],
+ "groupOverrideDetails": {
+ "groupsToOverride": [
+ "group1"
+ ],
+ "iamRolesToOverride": [
+ "arn:aws:iam::123456789012:role/role1"
+ ],
+ "preferredRole": "arn:aws:iam::123456789012:role/role1"
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/aws-lambda-java-tests/src/test/resources/cognito/cognito_userpool_preauthentication.json b/aws-lambda-java-tests/src/test/resources/cognito/cognito_userpool_preauthentication.json
new file mode 100644
index 000000000..1402c4684
--- /dev/null
+++ b/aws-lambda-java-tests/src/test/resources/cognito/cognito_userpool_preauthentication.json
@@ -0,0 +1,20 @@
+{
+ "version": "1",
+ "triggerSource": "PreAuthentication_Authentication",
+ "region": "us-east-1",
+ "userPoolId": "us-east-1_uPoolId",
+ "userName": "testuser",
+ "callerContext": {
+ "awsSdkVersion": "2.0.0",
+ "clientId": "abcdefg1234567"
+ },
+ "request": {
+ "userAttributes": {
+ "email": "user@example.com"
+ },
+ "validationData": {
+ "key1": "val1"
+ },
+ "userNotFound": false
+ }
+}
\ No newline at end of file
diff --git a/aws-lambda-java-tests/src/test/resources/cognito/cognito_userpool_presignup.json b/aws-lambda-java-tests/src/test/resources/cognito/cognito_userpool_presignup.json
new file mode 100644
index 000000000..0d1f0936a
--- /dev/null
+++ b/aws-lambda-java-tests/src/test/resources/cognito/cognito_userpool_presignup.json
@@ -0,0 +1,27 @@
+{
+ "version": "1",
+ "triggerSource": "PreSignUp_SignUp",
+ "region": "us-east-1",
+ "userPoolId": "us-east-1_uPoolId",
+ "userName": "testuser",
+ "callerContext": {
+ "awsSdkVersion": "2.0.0",
+ "clientId": "abcdefg1234567"
+ },
+ "request": {
+ "userAttributes": {
+ "email": "user@example.com"
+ },
+ "validationData": {
+ "key1": "val1"
+ },
+ "clientMetadata": {
+ "meta1": "value1"
+ }
+ },
+ "response": {
+ "autoConfirmUser": false,
+ "autoVerifyPhone": false,
+ "autoVerifyEmail": false
+ }
+}
\ No newline at end of file
diff --git a/aws-lambda-java-tests/src/test/resources/cognito/cognito_userpool_verify_auth_challenge.json b/aws-lambda-java-tests/src/test/resources/cognito/cognito_userpool_verify_auth_challenge.json
new file mode 100644
index 000000000..ef14c4ddf
--- /dev/null
+++ b/aws-lambda-java-tests/src/test/resources/cognito/cognito_userpool_verify_auth_challenge.json
@@ -0,0 +1,27 @@
+{
+ "version": "1",
+ "triggerSource": "VerifyAuthChallengeResponse_Authentication",
+ "region": "us-east-1",
+ "userPoolId": "us-east-1_uPoolId",
+ "userName": "testuser",
+ "callerContext": {
+ "awsSdkVersion": "2.0.0",
+ "clientId": "abcdefg1234567"
+ },
+ "request": {
+ "userAttributes": {
+ "email": "user@example.com"
+ },
+ "clientMetadata": {
+ "meta1": "value1"
+ },
+ "privateChallengeParameters": {
+ "answer": "5"
+ },
+ "challengeAnswer": "5",
+ "userNotFound": false
+ },
+ "response": {
+ "answerCorrect": true
+ }
+}
\ No newline at end of file
diff --git a/aws-lambda-java-tests/src/test/resources/cognito_sync_event.json b/aws-lambda-java-tests/src/test/resources/cognito_sync_event.json
new file mode 100644
index 000000000..6edf1c246
--- /dev/null
+++ b/aws-lambda-java-tests/src/test/resources/cognito_sync_event.json
@@ -0,0 +1,20 @@
+{
+ "version": 2,
+ "eventType": "SyncTrigger",
+ "region": "us-east-1",
+ "identityPoolId": "us-east-1:example-identity-pool-id",
+ "identityId": "us-east-1:example-identity-id",
+ "datasetName": "SampleDataset",
+ "datasetRecords": {
+ "SampleKey1": {
+ "oldValue": "oldValue1",
+ "newValue": "newValue1",
+ "op": "replace"
+ },
+ "SampleKey2": {
+ "oldValue": "oldValue2",
+ "newValue": "newValue2",
+ "op": "replace"
+ }
+ }
+}
\ No newline at end of file
diff --git a/aws-lambda-java-tests/src/test/resources/cognito_user_pool_pre_token_generation_event_v2.json b/aws-lambda-java-tests/src/test/resources/cognito_user_pool_pre_token_generation_event_v2.json
index 43f8e0f7d..eb46b8cb3 100644
--- a/aws-lambda-java-tests/src/test/resources/cognito_user_pool_pre_token_generation_event_v2.json
+++ b/aws-lambda-java-tests/src/test/resources/cognito_user_pool_pre_token_generation_event_v2.json
@@ -21,13 +21,19 @@
"groupConfiguration": {
"groupsToOverride": ["group-1", "group-2", "group-3"],
"iamRolesToOverride": ["arn:aws:iam::123456789012:role/sns_caller1", "arn:aws:iam::123456789012:role/sns_caller2", "arn:aws:iam::123456789012:role/sns_caller3"],
- "preferredRole": ["arn:aws:iam::123456789012:role/sns_caller"]
+ "preferredRole": "arn:aws:iam::123456789012:role/sns_caller"
},
"scopes": [
"aws.cognito.signin.user.admin", "openid", "email", "phone"
]
},
"response": {
- "claimsAndScopeOverrideDetails": []
+ "claimsAndScopeOverrideDetails": {
+ "groupOverrideDetails": {
+ "groupsToOverride": ["group-99", "group-98"],
+ "iamRolesToOverride": ["arn:aws:iam::123456789012:role/sns_caller99", "arn:aws:iam::123456789012:role/sns_caller98"],
+ "preferredRole": "arn:aws:iam::123456789012:role/sns_caller_99"
+ }
+ }
}
}
\ No newline at end of file
diff --git a/aws-lambda-java-tests/src/test/resources/connect_event.json b/aws-lambda-java-tests/src/test/resources/connect_event.json
index a9e04f7f8..4ce17a657 100644
--- a/aws-lambda-java-tests/src/test/resources/connect_event.json
+++ b/aws-lambda-java-tests/src/test/resources/connect_event.json
@@ -12,17 +12,11 @@
"InitialContactId": "6ca32fbd-8f92-46af-92a5-6b0f970f0efe",
"InitiationMethod": "API",
"InstanceARN": "arn:aws:connect:eu-central-1:123456789012:instance/9308c2a1-9bc6-4cea-8290-6c0b4a6d38fa",
- "MediaStreams": {
- "Customer": {
- "Audio": {
- "StartFragmentNumber": "91343852333181432392682062622220590765191907586",
- "StartTimestamp": "1565781909613",
- "StreamARN": "arn:aws:kinesisvideo:eu-central-1:123456789012:stream/connect-contact-a3d73b84-ce0e-479a-a9dc-5637c9d30ac9/1565272947806"
- }
- }
- },
"PreviousContactId": "4ca32fbd-8f92-46af-92a5-6b0f970f0efe",
- "Queue": null,
+ "Queue": {
+ "Name": "SampleQueue",
+ "ARN": "arn:aws:connect:eu-central-1:123456789012:instance/9308c2a1-9bc6-4cea-8290-6c0b4a6d38fa"
+ },
"SystemEndpoint": {
"Address": "+21234567890",
"Type": "TELEPHONE_NUMBER"
diff --git a/aws-lambda-java-tests/src/test/resources/ddb/dynamo_event_roundtrip.json b/aws-lambda-java-tests/src/test/resources/ddb/dynamo_event_roundtrip.json
new file mode 100644
index 000000000..10d963c3c
--- /dev/null
+++ b/aws-lambda-java-tests/src/test/resources/ddb/dynamo_event_roundtrip.json
@@ -0,0 +1,97 @@
+{
+ "Records": [
+ {
+ "eventID": "c4ca4238a0b923820dcc509a6f75849b",
+ "eventName": "INSERT",
+ "eventVersion": "1.1",
+ "eventSource": "aws:dynamodb",
+ "awsRegion": "eu-central-1",
+ "dynamodb": {
+ "Keys": {
+ "Id": {
+ "N": "101"
+ }
+ },
+ "NewImage": {
+ "Message": {
+ "S": "New item!"
+ },
+ "Id": {
+ "N": "101"
+ }
+ },
+ "ApproximateCreationDateTime": 1.4285376E9,
+ "SequenceNumber": "4421584500000000017450439091",
+ "SizeBytes": 26,
+ "StreamViewType": "NEW_AND_OLD_IMAGES"
+ },
+ "eventSourceARN": "arn:aws:dynamodb:eu-central-1:123456789012:table/ExampleTableWithStream/stream/2015-06-27T00:48:05.899",
+ "userIdentity": {
+ "principalId": "dynamodb.amazonaws.com",
+ "type": "Service"
+ }
+ },
+ {
+ "eventID": "c81e728d9d4c2f636f067f89cc14862c",
+ "eventName": "MODIFY",
+ "eventVersion": "1.1",
+ "eventSource": "aws:dynamodb",
+ "awsRegion": "eu-central-1",
+ "dynamodb": {
+ "Keys": {
+ "Id": {
+ "N": "101"
+ }
+ },
+ "NewImage": {
+ "Message": {
+ "S": "This item has changed"
+ },
+ "Id": {
+ "N": "101"
+ }
+ },
+ "OldImage": {
+ "Message": {
+ "S": "New item!"
+ },
+ "Id": {
+ "N": "101"
+ }
+ },
+ "ApproximateCreationDateTime": 1.635734407123E9,
+ "SequenceNumber": "4421584500000000017450439092",
+ "SizeBytes": 59,
+ "StreamViewType": "NEW_AND_OLD_IMAGES"
+ },
+ "eventSourceARN": "arn:aws:dynamodb:eu-central-1:123456789012:table/ExampleTableWithStream/stream/2015-06-27T00:48:05.899"
+ },
+ {
+ "eventID": "eccbc87e4b5ce2fe28308fd9f2a7baf3",
+ "eventName": "REMOVE",
+ "eventVersion": "1.1",
+ "eventSource": "aws:dynamodb",
+ "awsRegion": "eu-central-1",
+ "dynamodb": {
+ "Keys": {
+ "Id": {
+ "N": "101"
+ }
+ },
+ "OldImage": {
+ "Message": {
+ "S": "This item has changed"
+ },
+ "Id": {
+ "N": "101"
+ }
+ },
+ "ApproximateCreationDateTime": 1.4285376E9,
+ "SequenceNumber": "4421584500000000017450439093",
+ "SizeBytes": 38,
+ "StreamViewType": "NEW_AND_OLD_IMAGES"
+ },
+ "eventSourceARN": "arn:aws:dynamodb:eu-central-1:123456789012:table/ExampleTableWithStream/stream/2015-06-27T00:48:05.899"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/aws-lambda-java-tests/src/test/resources/ddb/dynamo_time_window_event.json b/aws-lambda-java-tests/src/test/resources/ddb/dynamo_time_window_event.json
new file mode 100644
index 000000000..d931acb80
--- /dev/null
+++ b/aws-lambda-java-tests/src/test/resources/ddb/dynamo_time_window_event.json
@@ -0,0 +1,75 @@
+{
+ "Records": [
+ {
+ "eventID": "1",
+ "eventName": "INSERT",
+ "eventVersion": "1.0",
+ "eventSource": "aws:dynamodb",
+ "awsRegion": "us-east-1",
+ "dynamodb": {
+ "Keys": {
+ "Id": {
+ "N": "101"
+ }
+ },
+ "NewImage": {
+ "Message": {
+ "S": "New item!"
+ },
+ "Id": {
+ "N": "101"
+ }
+ },
+ "SequenceNumber": "111",
+ "SizeBytes": 26,
+ "StreamViewType": "NEW_AND_OLD_IMAGES"
+ },
+ "eventSourceARN": "arn:aws:dynamodb:us-east-1:123456789012:table/ExampleTableWithStream/stream/2015-06-27T00:48:05.899"
+ },
+ {
+ "eventID": "2",
+ "eventName": "MODIFY",
+ "eventVersion": "1.0",
+ "eventSource": "aws:dynamodb",
+ "awsRegion": "us-east-1",
+ "dynamodb": {
+ "Keys": {
+ "Id": {
+ "N": "101"
+ }
+ },
+ "NewImage": {
+ "Message": {
+ "S": "This item has changed"
+ },
+ "Id": {
+ "N": "101"
+ }
+ },
+ "OldImage": {
+ "Message": {
+ "S": "New item!"
+ },
+ "Id": {
+ "N": "101"
+ }
+ },
+ "SequenceNumber": "222",
+ "SizeBytes": 59,
+ "StreamViewType": "NEW_AND_OLD_IMAGES"
+ },
+ "eventSourceARN": "arn:aws:dynamodb:us-east-1:123456789012:table/ExampleTableWithStream/stream/2015-06-27T00:48:05.899"
+ }
+ ],
+ "window": {
+ "start": "2020-07-30T17:00:00Z",
+ "end": "2020-07-30T17:05:00Z"
+ },
+ "state": {
+ "1": "state1"
+ },
+ "shardId": "shard123456789",
+ "eventSourceARN": "arn:aws:dynamodb:us-east-1:123456789012:table/ExampleTableWithStream/stream/2015-06-27T00:48:05.899",
+ "isFinalInvokeForWindow": false,
+ "isWindowTerminatedEarly": false
+}
\ No newline at end of file
diff --git a/aws-lambda-java-tests/src/test/resources/iot_button_event.json b/aws-lambda-java-tests/src/test/resources/iot_button_event.json
new file mode 100644
index 000000000..8dc82826b
--- /dev/null
+++ b/aws-lambda-java-tests/src/test/resources/iot_button_event.json
@@ -0,0 +1,5 @@
+{
+ "serialNumber": "G030JF055364XVRB",
+ "clickType": "SINGLE",
+ "batteryVoltage": "2000mV"
+}
\ No newline at end of file
diff --git a/aws-lambda-java-tests/src/test/resources/kafka_event_roundtrip.json b/aws-lambda-java-tests/src/test/resources/kafka_event_roundtrip.json
new file mode 100644
index 000000000..d9f682e5f
--- /dev/null
+++ b/aws-lambda-java-tests/src/test/resources/kafka_event_roundtrip.json
@@ -0,0 +1,22 @@
+{
+ "eventSource": "aws:kafka",
+ "eventSourceArn": "arn:aws:kafka:us-east-1:123456789012:cluster/vpc-3432434/4834-3547-3455-9872-7929",
+ "bootstrapServers": "b-2.demo-cluster-1.a1bcde.c1.kafka.us-east-1.amazonaws.com:9092,b-1.demo-cluster-1.a1bcde.c1.kafka.us-east-1.amazonaws.com:9092",
+ "records": {
+ "mytopic-01": [
+ {
+ "topic": "mytopic",
+ "partition": 0,
+ "offset": 15,
+ "timestamp": 1596480920837,
+ "timestampType": "CREATE_TIME",
+ "value": "SGVsbG8gZnJvbSBLYWZrYSAhIQ==",
+ "headers": [
+ {
+ "headerKey": "aGVhZGVyVmFsdWU="
+ }
+ ]
+ }
+ ]
+ }
+}
\ No newline at end of file
diff --git a/aws-lambda-java-tests/src/test/resources/kinesis/kinesis_analytics_firehose_input_preprocessing.json b/aws-lambda-java-tests/src/test/resources/kinesis/kinesis_analytics_firehose_input_preprocessing.json
new file mode 100644
index 000000000..8c6cfe514
--- /dev/null
+++ b/aws-lambda-java-tests/src/test/resources/kinesis/kinesis_analytics_firehose_input_preprocessing.json
@@ -0,0 +1,14 @@
+{
+ "invocationId": "invocationIdExample",
+ "applicationArn": "arn:aws:kinesisanalytics:us-east-1:123456789012:application/my-app",
+ "streamArn": "arn:aws:firehose:us-east-1:123456789012:deliverystream/my-stream",
+ "records": [
+ {
+ "recordId": "49546986683135544286507457936321625675700192471156785154",
+ "kinesisFirehoseRecordMetadata": {
+ "approximateArrivalTimestamp": 1583348638390
+ },
+ "data": "SGVsbG8gV29ybGQ="
+ }
+ ]
+}
\ No newline at end of file
diff --git a/aws-lambda-java-tests/src/test/resources/kinesis/kinesis_analytics_input_preprocessing_response.json b/aws-lambda-java-tests/src/test/resources/kinesis/kinesis_analytics_input_preprocessing_response.json
new file mode 100644
index 000000000..f5be190ec
--- /dev/null
+++ b/aws-lambda-java-tests/src/test/resources/kinesis/kinesis_analytics_input_preprocessing_response.json
@@ -0,0 +1,9 @@
+{
+ "records": [
+ {
+ "recordId": "49546986683135544286507457936321625675700192471156785154",
+ "result": "Ok",
+ "data": "SGVsbG8gV29ybGQ="
+ }
+ ]
+}
\ No newline at end of file
diff --git a/aws-lambda-java-tests/src/test/resources/kinesis/kinesis_analytics_output_delivery.json b/aws-lambda-java-tests/src/test/resources/kinesis/kinesis_analytics_output_delivery.json
new file mode 100644
index 000000000..573b6baba
--- /dev/null
+++ b/aws-lambda-java-tests/src/test/resources/kinesis/kinesis_analytics_output_delivery.json
@@ -0,0 +1,13 @@
+{
+ "invocationId": "invocationIdExample",
+ "applicationArn": "arn:aws:kinesisanalytics:us-east-1:123456789012:application/my-app",
+ "records": [
+ {
+ "recordId": "49546986683135544286507457936321625675700192471156785154",
+ "lambdaDeliveryRecordMetadata": {
+ "retryHint": 0
+ },
+ "data": "SGVsbG8gV29ybGQ="
+ }
+ ]
+}
\ No newline at end of file
diff --git a/aws-lambda-java-tests/src/test/resources/kinesis/kinesis_analytics_output_delivery_response.json b/aws-lambda-java-tests/src/test/resources/kinesis/kinesis_analytics_output_delivery_response.json
new file mode 100644
index 000000000..56ddaa194
--- /dev/null
+++ b/aws-lambda-java-tests/src/test/resources/kinesis/kinesis_analytics_output_delivery_response.json
@@ -0,0 +1,8 @@
+{
+ "records": [
+ {
+ "recordId": "49546986683135544286507457936321625675700192471156785154",
+ "result": "Ok"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/aws-lambda-java-tests/src/test/resources/kinesis/kinesis_analytics_streams_input_preprocessing.json b/aws-lambda-java-tests/src/test/resources/kinesis/kinesis_analytics_streams_input_preprocessing.json
new file mode 100644
index 000000000..4ae8f3705
--- /dev/null
+++ b/aws-lambda-java-tests/src/test/resources/kinesis/kinesis_analytics_streams_input_preprocessing.json
@@ -0,0 +1,17 @@
+{
+ "invocationId": "invocationIdExample",
+ "applicationArn": "arn:aws:kinesisanalytics:us-east-1:123456789012:application/my-app",
+ "streamArn": "arn:aws:kinesis:us-east-1:123456789012:stream/my-stream",
+ "records": [
+ {
+ "recordId": "49546986683135544286507457936321625675700192471156785154",
+ "kinesisStreamRecordMetadata": {
+ "sequenceNumber": "49546986683135544286507457936321625675700192471156785154",
+ "partitionKey": "partKey",
+ "shardId": "shardId-000000000000",
+ "approximateArrivalTimestamp": 1583348638390
+ },
+ "data": "SGVsbG8gV29ybGQ="
+ }
+ ]
+}
\ No newline at end of file
diff --git a/aws-lambda-java-tests/src/test/resources/kinesis/kinesis_event_roundtrip.json b/aws-lambda-java-tests/src/test/resources/kinesis/kinesis_event_roundtrip.json
new file mode 100644
index 000000000..e2081ef2b
--- /dev/null
+++ b/aws-lambda-java-tests/src/test/resources/kinesis/kinesis_event_roundtrip.json
@@ -0,0 +1,21 @@
+{
+ "Records": [
+ {
+ "kinesis": {
+ "partitionKey": "partitionKey-03",
+ "kinesisSchemaVersion": "1.0",
+ "data": "SGVsbG8sIHRoaXMgaXMgYSB0ZXN0IDEyMy4=",
+ "sequenceNumber": "49545115243490985018280067714973144582180062593244200961",
+ "approximateArrivalTimestamp": 1.4285376E9,
+ "encryptionType": "NONE"
+ },
+ "eventSource": "aws:kinesis",
+ "eventID": "shardId-000000000000:49545115243490985018280067714973144582180062593244200961",
+ "invokeIdentityArn": "arn:aws:iam::EXAMPLE",
+ "eventVersion": "1.0",
+ "eventName": "aws:kinesis:record",
+ "eventSourceARN": "arn:aws:kinesis:EXAMPLE",
+ "awsRegion": "eu-central-1"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/aws-lambda-java-tests/src/test/resources/kinesis/kinesis_time_window_event.json b/aws-lambda-java-tests/src/test/resources/kinesis/kinesis_time_window_event.json
new file mode 100644
index 000000000..2d6283c58
--- /dev/null
+++ b/aws-lambda-java-tests/src/test/resources/kinesis/kinesis_time_window_event.json
@@ -0,0 +1,32 @@
+{
+ "Records": [
+ {
+ "kinesis": {
+ "kinesisSchemaVersion": "1.0",
+ "partitionKey": "1",
+ "sequenceNumber": "49590338271490256608559692538361571095921575989136588898",
+ "data": "SGVsbG8sIHRoaXMgaXMgYSB0ZXN0Lg==",
+ "approximateArrivalTimestamp": 1.607497475E9
+ },
+ "eventSource": "aws:kinesis",
+ "eventVersion": "1.0",
+ "eventID": "shardId-000000000006:49590338271490256608559692538361571095921575989136588898",
+ "eventName": "aws:kinesis:record",
+ "invokeIdentityArn": "arn:aws:iam::123456789012:role/lambda-kinesis-role",
+ "awsRegion": "us-east-1",
+ "eventSourceARN": "arn:aws:kinesis:us-east-1:123456789012:stream/lambda-stream"
+ }
+ ],
+ "window": {
+ "start": "2020-12-09T07:04:00Z",
+ "end": "2020-12-09T07:06:00Z"
+ },
+ "state": {
+ "1": "282",
+ "2": "715"
+ },
+ "shardId": "shardId-000000000006",
+ "eventSourceARN": "arn:aws:kinesis:us-east-1:123456789012:stream/lambda-stream",
+ "isFinalInvokeForWindow": false,
+ "isWindowTerminatedEarly": false
+}
\ No newline at end of file
diff --git a/aws-lambda-java-tests/src/test/resources/lex_event_roundtrip.json b/aws-lambda-java-tests/src/test/resources/lex_event_roundtrip.json
new file mode 100644
index 000000000..be065eb3f
--- /dev/null
+++ b/aws-lambda-java-tests/src/test/resources/lex_event_roundtrip.json
@@ -0,0 +1,24 @@
+{
+ "messageVersion": "1.0",
+ "invocationSource": "DialogCodeHook",
+ "userId": "John",
+ "sessionAttributes": {
+ "key": "value"
+ },
+ "bot": {
+ "name": "BookTrip",
+ "alias": "$LATEST",
+ "version": "$LATEST"
+ },
+ "outputDialogMode": "Text",
+ "currentIntent": {
+ "name": "BookHotel",
+ "slots": {
+ "Location": "Chicago",
+ "CheckInDate": "2030-11-08",
+ "Nights": "4",
+ "RoomType": "queen"
+ },
+ "confirmationStatus": "None"
+ }
+}
\ No newline at end of file
diff --git a/aws-lambda-java-tests/src/test/resources/mq_event.json b/aws-lambda-java-tests/src/test/resources/mq_event.json
index 6505a22d4..8b12af72e 100644
--- a/aws-lambda-java-tests/src/test/resources/mq_event.json
+++ b/aws-lambda-java-tests/src/test/resources/mq_event.json
@@ -5,15 +5,17 @@
{
"messageID": "ID:b-9bcfa592-423a-4942-879d-eb284b418fc8-1.mq.us-west-2.amazonaws.com-37557-1234520418293-4:1:1:1:1",
"messageType": "jms/text-message",
- "data": "QUJDOkFBQUE=",
- "connectionId": "myJMSCoID",
+ "timestamp": 1598827811958,
+ "deliveryMode": 0,
"redelivered": false,
+ "expiration": 0,
+ "priority": 0,
+ "data": "QUJDOkFBQUE=",
+ "brokerInTime": 1598827811958,
+ "brokerOutTime": 1598827811959,
"destination": {
"physicalname": "testQueue"
},
- "timestamp": 1598827811958,
- "brokerInTime": 1598827811958,
- "brokerOutTime": 1598827811959,
"properties": {
"testKey": "testValue"
}
@@ -21,15 +23,17 @@
{
"messageID": "ID:b-8bcfa572-428a-4642-879d-eb284b418fc8-1.mq.us-west-2.amazonaws.com-37557-1234520418293-4:1:1:1:1",
"messageType": "jms/bytes-message",
+ "timestamp": 1598827811958,
+ "deliveryMode": 0,
+ "redelivered": false,
+ "expiration": 0,
+ "priority": 0,
"data": "3DTOOW7crj51prgVLQaGQ82S48k=",
- "connectionId": "myJMSCoID1",
- "persistent": false,
+ "brokerInTime": 1598827811958,
+ "brokerOutTime": 1598827811959,
"destination": {
"physicalname": "testQueue"
},
- "timestamp": 1598827811958,
- "brokerInTime": 1598827811958,
- "brokerOutTime": 1598827811959,
"properties": {
"testKey": "testValue"
}
diff --git a/aws-lambda-java-tests/src/test/resources/msk_firehose_event.json b/aws-lambda-java-tests/src/test/resources/msk_firehose_event.json
index 6b839912d..140908250 100644
--- a/aws-lambda-java-tests/src/test/resources/msk_firehose_event.json
+++ b/aws-lambda-java-tests/src/test/resources/msk_firehose_event.json
@@ -15,4 +15,4 @@
"kafkaRecordValue": "eyJOYW1lIjoiSGVsbG8gV29ybGQifQ=="
}
]
-}
+}
\ No newline at end of file
diff --git a/aws-lambda-java-tests/src/test/resources/msk_firehose_event_roundtrip.json b/aws-lambda-java-tests/src/test/resources/msk_firehose_event_roundtrip.json
new file mode 100644
index 000000000..81b0a9c81
--- /dev/null
+++ b/aws-lambda-java-tests/src/test/resources/msk_firehose_event_roundtrip.json
@@ -0,0 +1,18 @@
+{
+ "invocationId": "12345621-4787-0000-a418-36e56Example",
+ "sourceMSKArn": "arn:aws:kafka:EXAMPLE",
+ "deliveryStreamArn": "arn:aws:firehose:EXAMPLE",
+ "region": "us-east-1",
+ "records": [
+ {
+ "recordId": "00000000000000000000000000000000000000000000000000000000000000",
+ "approximateArrivalTimestamp": 1716369573887,
+ "mskRecordMetadata": {
+ "offset": "0",
+ "partitionId": "1",
+ "approximateArrivalTimestamp": "1716369573887"
+ },
+ "kafkaRecordValue": "eyJOYW1lIjoiSGVsbG8gV29ybGQifQ=="
+ }
+ ]
+}
\ No newline at end of file
diff --git a/aws-lambda-java-tests/src/test/resources/partial_pojo.json b/aws-lambda-java-tests/src/test/resources/partial_pojo.json
new file mode 100644
index 000000000..398218039
--- /dev/null
+++ b/aws-lambda-java-tests/src/test/resources/partial_pojo.json
@@ -0,0 +1,4 @@
+{
+ "name": "test",
+ "unknownField": "this will be dropped"
+}
\ No newline at end of file
diff --git a/aws-lambda-java-tests/src/test/resources/rabbitmq_event_roundtrip.json b/aws-lambda-java-tests/src/test/resources/rabbitmq_event_roundtrip.json
new file mode 100644
index 000000000..44edf2f0a
--- /dev/null
+++ b/aws-lambda-java-tests/src/test/resources/rabbitmq_event_roundtrip.json
@@ -0,0 +1,51 @@
+{
+ "eventSource": "aws:rmq",
+ "eventSourceArn": "arn:aws:mq:us-west-2:112556298976:broker:test:b-9bcfa592-423a-4942-879d-eb284b418fc8",
+ "rmqMessagesByQueue": {
+ "test::/": [
+ {
+ "basicProperties": {
+ "contentType": "text/plain",
+ "contentEncoding": null,
+ "headers": {
+ "header1": {
+ "bytes": [
+ 118,
+ 97,
+ 108,
+ 117,
+ 101,
+ 49
+ ]
+ },
+ "header2": {
+ "bytes": [
+ 118,
+ 97,
+ 108,
+ 117,
+ 101,
+ 50
+ ]
+ },
+ "numberInHeader": 10
+ },
+ "deliveryMode": 1,
+ "priority": 34,
+ "correlationId": null,
+ "replyTo": null,
+ "expiration": 60000,
+ "messageId": null,
+ "timestamp": "Jan 1, 1970, 12:33:41 AM",
+ "type": null,
+ "userId": "AIDACKCEVSQ6C2EXAMPLE",
+ "appId": null,
+ "clusterId": null,
+ "bodySize": 80
+ },
+ "redelivered": false,
+ "data": "eyJ0aW1lb3V0IjowLCJkYXRhIjoiQ1pybWYwR3c4T3Y0YnFMUXhENEUifQ=="
+ }
+ ]
+ }
+}
\ No newline at end of file
diff --git a/aws-lambda-java-tests/src/test/resources/response/alb_response.json b/aws-lambda-java-tests/src/test/resources/response/alb_response.json
new file mode 100644
index 000000000..355eb193a
--- /dev/null
+++ b/aws-lambda-java-tests/src/test/resources/response/alb_response.json
@@ -0,0 +1,15 @@
+{
+ "statusCode": 200,
+ "statusDescription": "200 OK",
+ "headers": {
+ "Content-Type": "text/html"
+ },
+ "multiValueHeaders": {
+ "Set-Cookie": [
+ "cookie1=value1",
+ "cookie2=value2"
+ ]
+ },
+ "body": "Hello",
+ "isBase64Encoded": false
+}
\ No newline at end of file
diff --git a/aws-lambda-java-tests/src/test/resources/response/apigw_proxy_response.json b/aws-lambda-java-tests/src/test/resources/response/apigw_proxy_response.json
new file mode 100644
index 000000000..640ccdc5c
--- /dev/null
+++ b/aws-lambda-java-tests/src/test/resources/response/apigw_proxy_response.json
@@ -0,0 +1,15 @@
+{
+ "statusCode": 200,
+ "headers": {
+ "Content-Type": "application/json",
+ "X-Custom-Header": "custom-value"
+ },
+ "multiValueHeaders": {
+ "Set-Cookie": [
+ "cookie1=value1",
+ "cookie2=value2"
+ ]
+ },
+ "body": "{\"message\":\"Hello from Lambda\"}",
+ "isBase64Encoded": false
+}
\ No newline at end of file
diff --git a/aws-lambda-java-tests/src/test/resources/response/apigw_v2_http_response.json b/aws-lambda-java-tests/src/test/resources/response/apigw_v2_http_response.json
new file mode 100644
index 000000000..c39236650
--- /dev/null
+++ b/aws-lambda-java-tests/src/test/resources/response/apigw_v2_http_response.json
@@ -0,0 +1,16 @@
+{
+ "statusCode": 200,
+ "headers": {
+ "Content-Type": "application/json"
+ },
+ "multiValueHeaders": {
+ "Set-Cookie": [
+ "cookie1=value1"
+ ]
+ },
+ "cookies": [
+ "session=abc123; Secure; HttpOnly"
+ ],
+ "body": "{\"message\":\"OK\"}",
+ "isBase64Encoded": false
+}
\ No newline at end of file
diff --git a/aws-lambda-java-tests/src/test/resources/response/apigw_v2_websocket_response.json b/aws-lambda-java-tests/src/test/resources/response/apigw_v2_websocket_response.json
new file mode 100644
index 000000000..08392e890
--- /dev/null
+++ b/aws-lambda-java-tests/src/test/resources/response/apigw_v2_websocket_response.json
@@ -0,0 +1,14 @@
+{
+ "statusCode": 200,
+ "headers": {
+ "Content-Type": "application/json"
+ },
+ "multiValueHeaders": {
+ "X-Custom": [
+ "val1",
+ "val2"
+ ]
+ },
+ "body": "{\"action\":\"sendmessage\",\"data\":\"hello\"}",
+ "isBase64Encoded": false
+}
\ No newline at end of file
diff --git a/aws-lambda-java-tests/src/test/resources/response/msk_firehose_response.json b/aws-lambda-java-tests/src/test/resources/response/msk_firehose_response.json
new file mode 100644
index 000000000..9ac497624
--- /dev/null
+++ b/aws-lambda-java-tests/src/test/resources/response/msk_firehose_response.json
@@ -0,0 +1,9 @@
+{
+ "records": [
+ {
+ "recordId": "record-1",
+ "result": "Ok",
+ "kafkaRecordValue": "dHJhbnNmb3JtZWQgZGF0YQ=="
+ }
+ ]
+}
\ No newline at end of file
diff --git a/aws-lambda-java-tests/src/test/resources/response/s3_batch_response.json b/aws-lambda-java-tests/src/test/resources/response/s3_batch_response.json
new file mode 100644
index 000000000..e63439d84
--- /dev/null
+++ b/aws-lambda-java-tests/src/test/resources/response/s3_batch_response.json
@@ -0,0 +1,12 @@
+{
+ "invocationSchemaVersion": "1.0",
+ "treatMissingKeysAs": "PermanentFailure",
+ "invocationId": "YXNkbGZqYWRmaiBhc2RmdW9hZHNmZGpmaGFzbGtkaGZza2RmaAo",
+ "results": [
+ {
+ "taskId": "dGFza2lkZ29lc2hlcmUK",
+ "resultCode": "Succeeded",
+ "resultString": "Successfully processed"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/aws-lambda-java-tests/src/test/resources/response/simple_iam_policy_response.json b/aws-lambda-java-tests/src/test/resources/response/simple_iam_policy_response.json
new file mode 100644
index 000000000..5f23b6405
--- /dev/null
+++ b/aws-lambda-java-tests/src/test/resources/response/simple_iam_policy_response.json
@@ -0,0 +1,7 @@
+{
+ "isAuthorized": true,
+ "context": {
+ "userId": "user-123",
+ "scope": "read:all"
+ }
+}
\ No newline at end of file
diff --git a/aws-lambda-java-tests/src/test/resources/response/sqs_batch_response.json b/aws-lambda-java-tests/src/test/resources/response/sqs_batch_response.json
new file mode 100644
index 000000000..5ef2de697
--- /dev/null
+++ b/aws-lambda-java-tests/src/test/resources/response/sqs_batch_response.json
@@ -0,0 +1,7 @@
+{
+ "batchItemFailures": [
+ {
+ "itemIdentifier": "059f36b4-87a3-44ab-83d2-661975830a7d"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/aws-lambda-java-tests/src/test/resources/s3_batch_event.json b/aws-lambda-java-tests/src/test/resources/s3_batch_event.json
new file mode 100644
index 000000000..a70af0fdd
--- /dev/null
+++ b/aws-lambda-java-tests/src/test/resources/s3_batch_event.json
@@ -0,0 +1,15 @@
+{
+ "invocationSchemaVersion": "1.0",
+ "invocationId": "YXNkbGZqYWRmaiBhc2RmdW9hZHNmZGpmaGFzbGtkaGZza2RmaAo",
+ "job": {
+ "id": "f3cc4f60-61f6-4a2b-8a21-d07600c373ce"
+ },
+ "tasks": [
+ {
+ "taskId": "dGFza2lkZ29lc2hlcmUK",
+ "s3Key": "customerImage1.jpg",
+ "s3VersionId": "1",
+ "s3BucketArn": "arn:aws:s3:::amzn-s3-demo-bucket"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/aws-lambda-java-tests/src/test/resources/s3_event.json b/aws-lambda-java-tests/src/test/resources/s3_event.json
index 89e0bd312..73f59d072 100644
--- a/aws-lambda-java-tests/src/test/resources/s3_event.json
+++ b/aws-lambda-java-tests/src/test/resources/s3_event.json
@@ -28,8 +28,10 @@
},
"object": {
"key": "test/key",
+ "urlDecodedKey": "test/key",
"size": 1024,
"eTag": "0123456789abcdef0123456789abcdef",
+ "versionId": "",
"sequencer": "0A1B2C3D4E5F678901"
}
}
diff --git a/aws-lambda-java-tests/src/test/resources/s3_object_lambda_event.json b/aws-lambda-java-tests/src/test/resources/s3_object_lambda_event.json
new file mode 100644
index 000000000..db996e71c
--- /dev/null
+++ b/aws-lambda-java-tests/src/test/resources/s3_object_lambda_event.json
@@ -0,0 +1,29 @@
+{
+ "xAmzRequestId": "requestId",
+ "getObjectContext": {
+ "inputS3Url": "https://my-s3-ap-111122223333.s3-accesspoint.us-east-1.amazonaws.com/example?X-Amz-Security-Token=snip",
+ "outputRoute": "io-use1-001",
+ "outputToken": "OutputToken"
+ },
+ "configuration": {
+ "accessPointArn": "arn:aws:s3-object-lambda:us-east-1:111122223333:accesspoint/example-object-lambda-ap",
+ "supportingAccessPointArn": "arn:aws:s3:us-east-1:111122223333:accesspoint/example-ap",
+ "payload": "{}"
+ },
+ "userRequest": {
+ "url": "https://object-lambda-111122223333.s3-object-lambda.us-east-1.amazonaws.com/example",
+ "headers": {
+ "Host": "object-lambda-111122223333.s3-object-lambda.us-east-1.amazonaws.com",
+ "Accept-Encoding": "identity",
+ "X-Amz-Content-SHA256": "e3b0c44298fc1example"
+ }
+ },
+ "userIdentity": {
+ "type": "AssumedRole",
+ "principalId": "principalId",
+ "arn": "arn:aws:sts::111122223333:assumed-role/Admin/example",
+ "accountId": "111122223333",
+ "accessKeyId": "accessKeyId"
+ },
+ "protocolVersion": "1.00"
+}
\ No newline at end of file
diff --git a/aws-lambda-java-tests/src/test/resources/secrets_rotation_event.json b/aws-lambda-java-tests/src/test/resources/secrets_rotation_event.json
index 38440fac9..e8d80b573 100644
--- a/aws-lambda-java-tests/src/test/resources/secrets_rotation_event.json
+++ b/aws-lambda-java-tests/src/test/resources/secrets_rotation_event.json
@@ -1,5 +1,6 @@
{
"Step" : "CreateSecret",
"SecretId" : "arn:aws:secretsmanager:eu-central-1:123456789012:secret:/powertools/secretparam-xBPaJ5",
- "ClientRequestToken" : "123e4567-e89b-12d3-a456-426614174000"
+ "ClientRequestToken" : "123e4567-e89b-12d3-a456-426614174000",
+ "RotationToken": "8a4cc1ac-82ea-47c7-bd9f-aeb370b1b6a6"
}
\ No newline at end of file
diff --git a/aws-lambda-java-tests/src/test/resources/time_window_event_response.json b/aws-lambda-java-tests/src/test/resources/time_window_event_response.json
new file mode 100644
index 000000000..3c77b3784
--- /dev/null
+++ b/aws-lambda-java-tests/src/test/resources/time_window_event_response.json
@@ -0,0 +1,10 @@
+{
+ "state": {
+ "totalAmount": "500"
+ },
+ "batchItemFailures": [
+ {
+ "itemIdentifier": "49590338271490256608559692538361571095921575989136588898"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/aws-lambda-java-tests/src/test/resources/unstable_pojo.json b/aws-lambda-java-tests/src/test/resources/unstable_pojo.json
new file mode 100644
index 000000000..19db9a1cc
--- /dev/null
+++ b/aws-lambda-java-tests/src/test/resources/unstable_pojo.json
@@ -0,0 +1,3 @@
+{
+ "name": "test"
+}
\ No newline at end of file
diff --git a/experimental/aws-lambda-java-profiler/.gitignore b/experimental/aws-lambda-java-profiler/.gitignore
new file mode 100644
index 000000000..4c3fb86d5
--- /dev/null
+++ b/experimental/aws-lambda-java-profiler/.gitignore
@@ -0,0 +1,3 @@
+*.zip
+/.idea/
+/target/
diff --git a/experimental/aws-lambda-java-profiler/.mvn/wrapper/maven-wrapper.properties b/experimental/aws-lambda-java-profiler/.mvn/wrapper/maven-wrapper.properties
new file mode 100644
index 000000000..48a56c99a
--- /dev/null
+++ b/experimental/aws-lambda-java-profiler/.mvn/wrapper/maven-wrapper.properties
@@ -0,0 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+wrapperVersion=3.3.2
+distributionType=only-script
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip
diff --git a/experimental/aws-lambda-java-profiler/README.md b/experimental/aws-lambda-java-profiler/README.md
new file mode 100644
index 000000000..c15c22791
--- /dev/null
+++ b/experimental/aws-lambda-java-profiler/README.md
@@ -0,0 +1,133 @@
+
+ 
+
+
+AWS Lambda Profiler Extension for Java
+
+The Lambda profiler extension allows you to profile your Java functions invoke by invoke, with high fidelity, and no
+code changes. It uses the [async-profiler](https://github.com/async-profiler/async-profiler) project to produce
+profiling data and automatically uploads the data as HTML flame graphs to S3.
+
+
+ 
+
+
+## Current status
+**This is an alpha release and not yet ready for production use.** We're especially interested in early feedback on usability, features, performance, and compatibility. Please send feedback by opening a [GitHub issue](https://github.com/aws/aws-lambda-java-libs/issues/new).
+
+The profiler has been tested with Lambda managed runtimes for Java 17 and Java 21.
+
+## How to use the Lambda Profiler
+
+To use the profiler you need to
+
+1. Build the extension in this repo
+2. Deploy it as a Lambda Layer and attach the layer to your function
+3. Create an S3 bucket for the results, or reuse an existing one
+4. Give your function permission to write to the bucket
+5. Configure the required environment variables.
+
+The above assumes you're using the ZIP deployment method with managed runtimes. If you deploy your functions as container images instead, you will need to include the profiler in your Dockerfile at `/opt/extensions/` rather than using a Lambda layer.
+
+### Quick Start
+
+The following [Quick Start](#quick-start) gives AWS CLI commands you can run to get started (MacOS/Linux). There are also [examples](examples) using infrastructure as code for you to refer to.
+
+1. Clone the repo
+
+ ```bash
+ git clone https://github.com/aws/aws-lambda-java-libs
+ ```
+
+2. Build the extension
+
+ ```bash
+ cd aws-lambda-java-libs/experimental/aws-lambda-java-profiler/extension
+ ./build_layer.sh
+ ```
+
+3. Run the `update-function.sh` script which will create a new S3 bucket, Lambda layer and all the configuration required.
+
+ ```bash
+ cd ..
+ ./update-function.sh YOUR_FUNCTION_NAME
+ ```
+
+4. Invoke your function and review the flame graph in S3 using your browser.
+
+### Configuration
+
+#### Required Environment Variables
+
+| Name | Value |
+|-----------------------------------------|-----------------------------------------------------------------------------------------------|
+| AWS_LAMBDA_PROFILER_RESULTS_BUCKET_NAME | Your unique bucket name |
+| JAVA_TOOL_OPTIONS | -XX:+UnlockDiagnosticVMOptions -XX:+DebugNonSafepoints -javaagent:/opt/profiler-extension.jar |
+
+#### Optional Environment Variables
+
+| Name | Default Value | Options |
+|------------------------------------------|-----------------------------------------------------------|--------------------------------|
+| AWS_LAMBDA_PROFILER_START_COMMAND | start,event=wall,interval=1us | |
+| AWS_LAMBDA_PROFILER_STOP_COMMAND | stop,file=%s,include=*AWSLambda.main,include=start_thread | file=%s is required |
+| AWS_LAMBDA_PROFILER_DEBUG | false | true - to enable debug logging |
+| AWS_LAMBDA_PROFILER_COMMUNICATION_PORT | 1234 | a valid port number |
+
+### How does it work?
+
+In `/src` is the code for a Java agent. It's entry point `AgentEntry.premain()` is executed as the runtime starts up.
+The environment variable `JAVA_TOOL_OPTIONS` is used to specify which `.jar` file the agent is in. The `MANIFEST.MF` file is used to specify the pre-main class.
+
+When the agent is constructed, it starts the profiler and registers itself as a Lambda extension for `INVOKE` request.
+
+A new thread is created to handle calling `/next` and uploading the results of the profiler to S3. The bucket to upload
+the result to is configurable using an environment variable.
+
+### Custom Parameters for the Profiler
+
+Users can configure the profiler output by setting environment variables.
+
+```
+# Example: Output as JFR format instead of HTML
+AWS_LAMBDA_PROFILER_START_COMMAND="start,event=wall,interval=1us,file=/tmp/profile.jfr"
+AWS_LAMBDA_PROFILER_STOP_COMMAND="stop,file=%s"
+```
+
+Defaults are the following:
+
+```
+AWS_LAMBDA_PROFILER_START_COMMAND="start,event=wall,interval=1us"
+AWS_LAMBDA_PROFILER_STOP_COMMAND="stop,file=%s,include=*AWSLambda.main,include=start_thread"
+```
+
+See [async-profiler's ProfilerOptions](https://github.com/async-profiler/async-profiler/blob/master/docs/ProfilerOptions.md) for all available profiler parameters.
+
+### Troubleshooting
+
+- Ensure the Lambda function execution role has the necessary permissions to write to the S3 bucket.
+- Verify that the environment variables are set correctly in your Lambda function configuration.
+- Check CloudWatch logs for any error messages from the extension.
+- The profiler extension uses dependencies such as `com.amazonaws:aws-lambda-java-core`, `com.amazonaws:aws-lambda-java-events` and `software.amazon.awssdk:s3`. If you're using the same dependencies in your Lambda function, make sure that the versions match those used by the extension as mismatched versions can lead to compatibility issues.
+
+## Contributing
+
+Contributions to improve the Java profiler extension are welcome. Please see [CONTRIBUTING.md](../../CONTRIBUTING.md) for more information on how to report bugs or submit pull requests.
+
+Issues or contributions to the [async-profiler](https://github.com/async-profiler/async-profiler) itself should be submitted to that project.
+
+### Security
+
+If you discover a potential security issue in this project we ask that you notify AWS Security via our [vulnerability reporting page](http://aws.amazon.com/security/vulnerability-reporting/). Please do **not** create a public GitHub issue.
+
+### Code of conduct
+
+This project has adopted the [Amazon Open Source Code of Conduct](https://aws.github.io/code-of-conduct). See [CODE_OF_CONDUCT.md](doc/CODE_OF_CONDUCT.md) for more details.
+
+## License
+
+This project is licensed under the [Apache 2.0](../../LICENSE) License. It uses the following projects:
+
+- [async-profiler](https://github.com/async-profiler/async-profiler) (Apache 2.0 license)
+- [AWS SDK for Java 2.0](https://github.com/aws/aws-sdk-java-v2) (Apache 2.0 license)
+- Other libraries in this repository (Apache 2.0 license)
+
diff --git a/experimental/aws-lambda-java-profiler/RELEASE.CHANGELOG.md b/experimental/aws-lambda-java-profiler/RELEASE.CHANGELOG.md
new file mode 100644
index 000000000..f2f14ae48
--- /dev/null
+++ b/experimental/aws-lambda-java-profiler/RELEASE.CHANGELOG.md
@@ -0,0 +1,7 @@
+### March 31, 2025
+`0.1.1` [link to tag](https://github.com/aws/aws-lambda-java-libs/releases/tag/profiler-extension-0.1.1)
+- fix: use PROFILER_STOP_COMMAND in Shutdown hooks ([#537](https://github.com/aws/aws-lambda-java-libs/pull/537))
+
+### March 18, 2025
+`0.1.0` [link to tag](https://github.com/aws/aws-lambda-java-libs/releases/tag/profiler-extension-0.1.0)
+- Initial release
\ No newline at end of file
diff --git a/experimental/aws-lambda-java-profiler/docs/Arch_AWS-Lambda_64.svg b/experimental/aws-lambda-java-profiler/docs/Arch_AWS-Lambda_64.svg
new file mode 100644
index 000000000..496ef0e72
--- /dev/null
+++ b/experimental/aws-lambda-java-profiler/docs/Arch_AWS-Lambda_64.svg
@@ -0,0 +1,18 @@
+
+
\ No newline at end of file
diff --git a/experimental/aws-lambda-java-profiler/docs/example-cold-start-flame-graph-small.png b/experimental/aws-lambda-java-profiler/docs/example-cold-start-flame-graph-small.png
new file mode 100644
index 000000000..81ae8cba3
Binary files /dev/null and b/experimental/aws-lambda-java-profiler/docs/example-cold-start-flame-graph-small.png differ
diff --git a/experimental/aws-lambda-java-profiler/docs/example-cold-start-flame-graph.png b/experimental/aws-lambda-java-profiler/docs/example-cold-start-flame-graph.png
new file mode 100644
index 000000000..26d11c310
Binary files /dev/null and b/experimental/aws-lambda-java-profiler/docs/example-cold-start-flame-graph.png differ
diff --git a/experimental/aws-lambda-java-profiler/examples/cdk/.gitignore b/experimental/aws-lambda-java-profiler/examples/cdk/.gitignore
new file mode 100644
index 000000000..1db21f162
--- /dev/null
+++ b/experimental/aws-lambda-java-profiler/examples/cdk/.gitignore
@@ -0,0 +1,13 @@
+.classpath.txt
+target
+.classpath
+.project
+.idea
+.settings
+.vscode
+*.iml
+
+# CDK asset staging directory
+.cdk.staging
+cdk.out
+
diff --git a/experimental/aws-lambda-java-profiler/examples/cdk/README.md b/experimental/aws-lambda-java-profiler/examples/cdk/README.md
new file mode 100644
index 000000000..516ef71a2
--- /dev/null
+++ b/experimental/aws-lambda-java-profiler/examples/cdk/README.md
@@ -0,0 +1,18 @@
+# Welcome to your CDK Java project!
+
+This is a blank project for CDK development with Java.
+
+The `cdk.json` file tells the CDK Toolkit how to execute your app.
+
+It is a [Maven](https://maven.apache.org/) based project, so you can open this project with any Maven compatible Java IDE to build and run tests.
+
+## Useful commands
+
+ * `mvn package` compile and run tests
+ * `cdk ls` list all stacks in the app
+ * `cdk synth` emits the synthesized CloudFormation template
+ * `cdk deploy` deploy this stack to your default AWS account/region
+ * `cdk diff` compare deployed stack with current state
+ * `cdk docs` open CDK documentation
+
+Enjoy!
diff --git a/experimental/aws-lambda-java-profiler/examples/cdk/cdk.json b/experimental/aws-lambda-java-profiler/examples/cdk/cdk.json
new file mode 100644
index 000000000..e94ff8512
--- /dev/null
+++ b/experimental/aws-lambda-java-profiler/examples/cdk/cdk.json
@@ -0,0 +1,68 @@
+{
+ "app": "mvn -e -q compile exec:java",
+ "watch": {
+ "include": [
+ "**"
+ ],
+ "exclude": [
+ "README.md",
+ "cdk*.json",
+ "target",
+ "pom.xml",
+ "src/test"
+ ]
+ },
+ "context": {
+ "@aws-cdk/aws-lambda:recognizeLayerVersion": true,
+ "@aws-cdk/core:checkSecretUsage": true,
+ "@aws-cdk/core:target-partitions": [
+ "aws",
+ "aws-cn"
+ ],
+ "@aws-cdk-containers/ecs-service-extensions:enableDefaultLogDriver": true,
+ "@aws-cdk/aws-ec2:uniqueImdsv2TemplateName": true,
+ "@aws-cdk/aws-ecs:arnFormatIncludesClusterName": true,
+ "@aws-cdk/aws-iam:minimizePolicies": true,
+ "@aws-cdk/core:validateSnapshotRemovalPolicy": true,
+ "@aws-cdk/aws-codepipeline:crossAccountKeyAliasStackSafeResourceName": true,
+ "@aws-cdk/aws-s3:createDefaultLoggingPolicy": true,
+ "@aws-cdk/aws-sns-subscriptions:restrictSqsDescryption": true,
+ "@aws-cdk/aws-apigateway:disableCloudWatchRole": true,
+ "@aws-cdk/core:enablePartitionLiterals": true,
+ "@aws-cdk/aws-events:eventsTargetQueueSameAccount": true,
+ "@aws-cdk/aws-ecs:disableExplicitDeploymentControllerForCircuitBreaker": true,
+ "@aws-cdk/aws-iam:importedRoleStackSafeDefaultPolicyName": true,
+ "@aws-cdk/aws-s3:serverAccessLogsUseBucketPolicy": true,
+ "@aws-cdk/aws-route53-patters:useCertificate": true,
+ "@aws-cdk/customresources:installLatestAwsSdkDefault": false,
+ "@aws-cdk/aws-rds:databaseProxyUniqueResourceName": true,
+ "@aws-cdk/aws-codedeploy:removeAlarmsFromDeploymentGroup": true,
+ "@aws-cdk/aws-apigateway:authorizerChangeDeploymentLogicalId": true,
+ "@aws-cdk/aws-ec2:launchTemplateDefaultUserData": true,
+ "@aws-cdk/aws-secretsmanager:useAttachedSecretResourcePolicyForSecretTargetAttachments": true,
+ "@aws-cdk/aws-redshift:columnId": true,
+ "@aws-cdk/aws-stepfunctions-tasks:enableEmrServicePolicyV2": true,
+ "@aws-cdk/aws-ec2:restrictDefaultSecurityGroup": true,
+ "@aws-cdk/aws-apigateway:requestValidatorUniqueId": true,
+ "@aws-cdk/aws-kms:aliasNameRef": true,
+ "@aws-cdk/aws-autoscaling:generateLaunchTemplateInsteadOfLaunchConfig": true,
+ "@aws-cdk/core:includePrefixInUniqueNameGeneration": true,
+ "@aws-cdk/aws-efs:denyAnonymousAccess": true,
+ "@aws-cdk/aws-opensearchservice:enableOpensearchMultiAzWithStandby": true,
+ "@aws-cdk/aws-lambda-nodejs:useLatestRuntimeVersion": true,
+ "@aws-cdk/aws-efs:mountTargetOrderInsensitiveLogicalId": true,
+ "@aws-cdk/aws-rds:auroraClusterChangeScopeOfInstanceParameterGroupWithEachParameters": true,
+ "@aws-cdk/aws-appsync:useArnForSourceApiAssociationIdentifier": true,
+ "@aws-cdk/aws-rds:preventRenderingDeprecatedCredentials": true,
+ "@aws-cdk/aws-codepipeline-actions:useNewDefaultBranchForCodeCommitSource": true,
+ "@aws-cdk/aws-cloudwatch-actions:changeLambdaPermissionLogicalIdForLambdaAction": true,
+ "@aws-cdk/aws-codepipeline:crossAccountKeysDefaultValueToFalse": true,
+ "@aws-cdk/aws-codepipeline:defaultPipelineTypeToV2": true,
+ "@aws-cdk/aws-kms:reduceCrossAccountRegionPolicyScope": true,
+ "@aws-cdk/aws-eks:nodegroupNameAttribute": true,
+ "@aws-cdk/aws-ec2:ebsDefaultGp3Volume": true,
+ "@aws-cdk/aws-ecs:removeDefaultDeploymentAlarm": true,
+ "@aws-cdk/custom-resources:logApiResponseDataPropertyTrueDefault": false,
+ "@aws-cdk/aws-s3:keepNotificationInImportedBucket": false
+ }
+}
diff --git a/experimental/aws-lambda-java-profiler/examples/cdk/pom.xml b/experimental/aws-lambda-java-profiler/examples/cdk/pom.xml
new file mode 100644
index 000000000..4b46f4e2b
--- /dev/null
+++ b/experimental/aws-lambda-java-profiler/examples/cdk/pom.xml
@@ -0,0 +1,59 @@
+
+
+ 4.0.0
+
+ com.myorg
+ example-cdk-profiler-layer
+ 0.1
+
+
+ UTF-8
+ 2.155.0
+ [10.0.0,11.0.0)
+ 5.12.2
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+ 3.11.0
+
+ 17
+
+
+
+
+ org.codehaus.mojo
+ exec-maven-plugin
+ 3.1.0
+
+ com.myorg.InfraApp
+
+
+
+
+
+
+
+ software.amazon.awscdk
+ aws-cdk-lib
+ ${cdk.version}
+
+
+
+ software.constructs
+ constructs
+ ${constructs.version}
+
+
+
+ org.junit.jupiter
+ junit-jupiter
+ ${junit.version}
+ test
+
+
+
diff --git a/experimental/aws-lambda-java-profiler/examples/cdk/src/main/java/com/myorg/InfraApp.java b/experimental/aws-lambda-java-profiler/examples/cdk/src/main/java/com/myorg/InfraApp.java
new file mode 100644
index 000000000..1232c1b8b
--- /dev/null
+++ b/experimental/aws-lambda-java-profiler/examples/cdk/src/main/java/com/myorg/InfraApp.java
@@ -0,0 +1,42 @@
+package com.myorg;
+
+import software.amazon.awscdk.App;
+import software.amazon.awscdk.Environment;
+import software.amazon.awscdk.StackProps;
+
+import java.util.Arrays;
+
+public class InfraApp {
+ public static void main(final String[] args) {
+ App app = new App();
+
+ new InfraStack(app, "InfraStack", StackProps.builder()
+ // If you don't specify 'env', this stack will be environment-agnostic.
+ // Account/Region-dependent features and context lookups will not work,
+ // but a single synthesized template can be deployed anywhere.
+
+ // Uncomment the next block to specialize this stack for the AWS Account
+ // and Region that are implied by the current CLI configuration.
+ /*
+ .env(Environment.builder()
+ .account(System.getenv("CDK_DEFAULT_ACCOUNT"))
+ .region(System.getenv("CDK_DEFAULT_REGION"))
+ .build())
+ */
+
+ // Uncomment the next block if you know exactly what Account and Region you
+ // want to deploy the stack to.
+ /*
+ .env(Environment.builder()
+ .account("123456789012")
+ .region("us-east-1")
+ .build())
+ */
+
+ // For more information, see https://docs.aws.amazon.com/cdk/latest/guide/environments.html
+ .build());
+
+ app.synth();
+ }
+}
+
diff --git a/experimental/aws-lambda-java-profiler/examples/cdk/src/main/java/com/myorg/InfraStack.java b/experimental/aws-lambda-java-profiler/examples/cdk/src/main/java/com/myorg/InfraStack.java
new file mode 100644
index 000000000..79773e39e
--- /dev/null
+++ b/experimental/aws-lambda-java-profiler/examples/cdk/src/main/java/com/myorg/InfraStack.java
@@ -0,0 +1,53 @@
+package com.myorg;
+
+import software.amazon.awscdk.Duration;
+import software.amazon.awscdk.services.lambda.Code;
+import software.amazon.awscdk.services.lambda.Function;
+import software.amazon.awscdk.services.lambda.LayerVersion;
+import software.amazon.awscdk.services.s3.Bucket;
+import software.constructs.Construct;
+import software.amazon.awscdk.Stack;
+import software.amazon.awscdk.StackProps;
+
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+import static software.amazon.awscdk.services.lambda.Architecture.*;
+import static software.amazon.awscdk.services.lambda.Runtime.*;
+
+public class InfraStack extends Stack {
+ public InfraStack(final Construct scope, final String id) {
+ this(scope, id, null);
+ }
+
+ public InfraStack(final Construct scope, final String id, final StackProps props) {
+ super(scope, id, props);
+
+ var resultsBucketName = UUID.randomUUID().toString();
+ var resultsBucket = Bucket.Builder.create(this, "profiler-results-bucket")
+ .bucketName(resultsBucketName)
+ .build();
+
+ var layerVersion = LayerVersion.Builder.create(this, "async-profiler-layer")
+ .compatibleArchitectures(List.of(ARM_64, X86_64))
+ .compatibleRuntimes(List.of(JAVA_11, JAVA_17, JAVA_21))
+ .code(Code.fromAsset("../../target/extension.zip"))
+ .build();
+
+ var environmentVariables = Map.of("JAVA_TOOL_OPTIONS", "-XX:+UnlockDiagnosticVMOptions -XX:+DebugNonSafepoints -javaagent:/opt/profiler.jar",
+ "AWS_LAMBDA_PROFILER_RESULTS_BUCKET_NAME", resultsBucketName);
+
+ var function = Function.Builder.create(this, "example-profiler-function")
+ .runtime(JAVA_21)
+ .handler("helloworld.App")
+ .code(Code.fromAsset("../function/profiling-example/target/Helloworld-1.0.jar"))
+ .memorySize(2048)
+ .layers(List.of(layerVersion))
+ .environment(environmentVariables)
+ .timeout(Duration.seconds(30))
+ .build();
+
+ resultsBucket.grantPut(function);
+ }
+}
diff --git a/experimental/aws-lambda-java-profiler/examples/function/profiling-example/pom.xml b/experimental/aws-lambda-java-profiler/examples/function/profiling-example/pom.xml
new file mode 100644
index 000000000..ac1001009
--- /dev/null
+++ b/experimental/aws-lambda-java-profiler/examples/function/profiling-example/pom.xml
@@ -0,0 +1,63 @@
+
+ 4.0.0
+ helloworld
+ HelloWorld
+ 1.0
+ jar
+ A sample Hello World created for SAM CLI.
+
+ 21
+ 21
+
+
+
+
+ com.amazonaws
+ aws-lambda-java-core
+ 1.2.2
+
+
+ com.amazonaws
+ aws-lambda-java-events
+ 3.11.0
+
+
+ com.hkupty.penna
+ penna-core
+ 0.8.0
+
+
+ org.slf4j
+ slf4j-api
+ 2.0.13
+
+
+
+ junit
+ junit
+ 4.13.2
+ test
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-shade-plugin
+ 3.6.1
+
+
+
+
+ package
+
+ shade
+
+
+
+
+
+
+
diff --git a/experimental/aws-lambda-java-profiler/examples/function/profiling-example/src/main/java/helloworld/App.java b/experimental/aws-lambda-java-profiler/examples/function/profiling-example/src/main/java/helloworld/App.java
new file mode 100644
index 000000000..c58f55a1f
--- /dev/null
+++ b/experimental/aws-lambda-java-profiler/examples/function/profiling-example/src/main/java/helloworld/App.java
@@ -0,0 +1,53 @@
+package helloworld;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import com.amazonaws.services.lambda.runtime.Context;
+import com.amazonaws.services.lambda.runtime.RequestHandler;
+import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
+import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyResponseEvent;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Handler for requests to Lambda function.
+ */
+public class App implements RequestHandler {
+
+ private static Logger logger = LoggerFactory.getLogger(App.class);
+
+ public APIGatewayProxyResponseEvent handleRequest(final APIGatewayProxyRequestEvent input, final Context context) {
+ Map headers = new HashMap<>();
+ headers.put("Content-Type", "application/json");
+ headers.put("X-Custom-Header", "application/json");
+
+ APIGatewayProxyResponseEvent response = new APIGatewayProxyResponseEvent()
+ .withHeaders(headers);
+ try {
+ final String pageContents = this.getPageContents("https://checkip.amazonaws.com");
+ String output = String.format("{ \"message\": \"hello world\", \"location\": \"%s\" }", pageContents);
+ logger.info(output);
+
+ return response
+ .withStatusCode(200)
+ .withBody(output);
+ } catch (IOException e) {
+ return response
+ .withBody("{}")
+ .withStatusCode(500);
+ }
+ }
+
+ private String getPageContents(String address) throws IOException{
+ URL url = new URL(address);
+ try(BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()))) {
+ return br.lines().collect(Collectors.joining(System.lineSeparator()));
+ }
+ }
+}
diff --git a/experimental/aws-lambda-java-profiler/examples/function/profiling-example/src/test/java/helloworld/AppTest.java b/experimental/aws-lambda-java-profiler/examples/function/profiling-example/src/test/java/helloworld/AppTest.java
new file mode 100644
index 000000000..240323bb7
--- /dev/null
+++ b/experimental/aws-lambda-java-profiler/examples/function/profiling-example/src/test/java/helloworld/AppTest.java
@@ -0,0 +1,22 @@
+package helloworld;
+
+import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyResponseEvent;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import org.junit.Test;
+
+public class AppTest {
+ @Test
+ public void successfulResponse() {
+ App app = new App();
+ APIGatewayProxyResponseEvent result = app.handleRequest(null, null);
+ assertEquals(200, result.getStatusCode().intValue());
+ assertEquals("application/json", result.getHeaders().get("Content-Type"));
+ String content = result.getBody();
+ assertNotNull(content);
+ assertTrue(content.contains("\"message\""));
+ assertTrue(content.contains("\"hello world\""));
+ assertTrue(content.contains("\"location\""));
+ }
+}
diff --git a/experimental/aws-lambda-java-profiler/extension/build.gradle b/experimental/aws-lambda-java-profiler/extension/build.gradle
new file mode 100644
index 000000000..387bb3528
--- /dev/null
+++ b/experimental/aws-lambda-java-profiler/extension/build.gradle
@@ -0,0 +1,34 @@
+plugins {
+ id 'java'
+ id "com.gradleup.shadow" version "8.3.3"
+}
+
+repositories {
+ mavenCentral()
+}
+
+sourceCompatibility = 11
+targetCompatibility = 11
+
+dependencies {
+ implementation 'com.amazonaws:aws-lambda-java-core:1.2.3'
+ implementation 'com.amazonaws:aws-lambda-java-events:3.11.5'
+ implementation("tools.profiler:async-profiler:3.0")
+ implementation("software.amazon.awssdk:s3:2.31.2") {
+ exclude group: 'software.amazon.awssdk', module: 'netty-nio-client'
+ }
+}
+
+jar {
+ manifest {
+ attributes 'Main-Class': 'com.amazonaws.services.lambda.extension.ExtensionMain'
+ attributes 'Premain-Class': 'com.amazonaws.services.lambda.extension.PreMain'
+ attributes 'Can-Redefine-Class': true
+ }
+}
+
+shadowJar {
+ archiveFileName = "profiler-extension.jar"
+}
+
+build.dependsOn jar
diff --git a/experimental/aws-lambda-java-profiler/extension/build_layer.sh b/experimental/aws-lambda-java-profiler/extension/build_layer.sh
new file mode 100755
index 000000000..cfb381cff
--- /dev/null
+++ b/experimental/aws-lambda-java-profiler/extension/build_layer.sh
@@ -0,0 +1,13 @@
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# SPDX-License-Identifier: MIT-0
+
+./gradlew :shadowJar
+
+chmod +x extensions/profiler-extension
+archive="extension.zip"
+if [ -f "$archive" ] ; then
+ rm "$archive"
+fi
+
+zip "$archive" -j build/libs/profiler-extension.jar
+zip "$archive" extensions/*
\ No newline at end of file
diff --git a/experimental/aws-lambda-java-profiler/extension/extensions/profiler-extension b/experimental/aws-lambda-java-profiler/extension/extensions/profiler-extension
new file mode 100755
index 000000000..ef9a5e47c
--- /dev/null
+++ b/experimental/aws-lambda-java-profiler/extension/extensions/profiler-extension
@@ -0,0 +1,6 @@
+#!/bin/bash
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# SPDX-License-Identifier: MIT-0
+
+set -euo pipefail
+exec -- java -jar /opt/profiler-extension.jar
\ No newline at end of file
diff --git a/experimental/aws-lambda-java-profiler/extension/gradle/wrapper/gradle-wrapper.jar b/experimental/aws-lambda-java-profiler/extension/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 000000000..a4b76b953
Binary files /dev/null and b/experimental/aws-lambda-java-profiler/extension/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/experimental/aws-lambda-java-profiler/extension/gradle/wrapper/gradle-wrapper.properties b/experimental/aws-lambda-java-profiler/extension/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000..df97d72b8
--- /dev/null
+++ b/experimental/aws-lambda-java-profiler/extension/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,7 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/experimental/aws-lambda-java-profiler/extension/gradlew b/experimental/aws-lambda-java-profiler/extension/gradlew
new file mode 100755
index 000000000..f5feea6d6
--- /dev/null
+++ b/experimental/aws-lambda-java-profiler/extension/gradlew
@@ -0,0 +1,252 @@
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+##############################################################################
+#
+# Gradle start up script for POSIX generated by Gradle.
+#
+# Important for running:
+#
+# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+# noncompliant, but you have some other compliant shell such as ksh or
+# bash, then to run this script, type that shell name before the whole
+# command line, like:
+#
+# ksh Gradle
+#
+# Busybox and similar reduced shells will NOT work, because this script
+# requires all of these POSIX shell features:
+# * functions;
+# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+# * compound commands having a testable exit status, especially «case»;
+# * various built-in commands including «command», «set», and «ulimit».
+#
+# Important for patching:
+#
+# (2) This script targets any POSIX shell, so it avoids extensions provided
+# by Bash, Ksh, etc; in particular arrays are avoided.
+#
+# The "traditional" practice of packing multiple parameters into a
+# space-separated string is a well documented source of bugs and security
+# problems, so this is (mostly) avoided, by progressively accumulating
+# options in "$@", and eventually passing that to Java.
+#
+# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+# see the in-line comments for details.
+#
+# There are tweaks for specific operating systems such as AIX, CygWin,
+# Darwin, MinGW, and NonStop.
+#
+# (3) This script is generated from the Groovy template
+# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+# within the Gradle project.
+#
+# You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+ APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
+ [ -h "$app_path" ]
+do
+ ls=$( ls -ld "$app_path" )
+ link=${ls#*' -> '}
+ case $link in #(
+ /*) app_path=$link ;; #(
+ *) app_path=$APP_HOME$link ;;
+ esac
+done
+
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+ echo "$*"
+} >&2
+
+die () {
+ echo
+ echo "$*"
+ echo
+ exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in #(
+ CYGWIN* ) cygwin=true ;; #(
+ Darwin* ) darwin=true ;; #(
+ MSYS* | MINGW* ) msys=true ;; #(
+ NONSTOP* ) nonstop=true ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD=$JAVA_HOME/jre/sh/java
+ else
+ JAVACMD=$JAVA_HOME/bin/java
+ fi
+ if [ ! -x "$JAVACMD" ] ; then
+ die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+ fi
+else
+ JAVACMD=java
+ if ! command -v java >/dev/null 2>&1
+ then
+ die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+ fi
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+ case $MAX_FD in #(
+ max*)
+ # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+ # shellcheck disable=SC2039,SC3045
+ MAX_FD=$( ulimit -H -n ) ||
+ warn "Could not query maximum file descriptor limit"
+ esac
+ case $MAX_FD in #(
+ '' | soft) :;; #(
+ *)
+ # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+ # shellcheck disable=SC2039,SC3045
+ ulimit -n "$MAX_FD" ||
+ warn "Could not set maximum file descriptor limit to $MAX_FD"
+ esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+# * args from the command line
+# * the main class name
+# * -classpath
+# * -D...appname settings
+# * --module-path (only if needed)
+# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+ APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+ CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+ JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+ # Now convert the arguments - kludge to limit ourselves to /bin/sh
+ for arg do
+ if
+ case $arg in #(
+ -*) false ;; # don't mess with options #(
+ /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
+ [ -e "$t" ] ;; #(
+ *) false ;;
+ esac
+ then
+ arg=$( cygpath --path --ignore --mixed "$arg" )
+ fi
+ # Roll the args list around exactly as many times as the number of
+ # args, so each arg winds up back in the position where it started, but
+ # possibly modified.
+ #
+ # NB: a `for` loop captures its iteration list before it begins, so
+ # changing the positional parameters here affects neither the number of
+ # iterations, nor the values presented in `arg`.
+ shift # remove old arg
+ set -- "$@" "$arg" # push replacement arg
+ done
+fi
+
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+# and any embedded shellness will be escaped.
+# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+# treated as '${Hostname}' itself on the command line.
+
+set -- \
+ "-Dorg.gradle.appname=$APP_BASE_NAME" \
+ -classpath "$CLASSPATH" \
+ org.gradle.wrapper.GradleWrapperMain \
+ "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+ die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+# set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+ printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+ xargs -n1 |
+ sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+ tr '\n' ' '
+ )" '"$@"'
+
+exec "$JAVACMD" "$@"
diff --git a/experimental/aws-lambda-java-profiler/extension/gradlew.bat b/experimental/aws-lambda-java-profiler/extension/gradlew.bat
new file mode 100644
index 000000000..9b42019c7
--- /dev/null
+++ b/experimental/aws-lambda-java-profiler/extension/gradlew.bat
@@ -0,0 +1,94 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/experimental/aws-lambda-java-profiler/extension/src/main/java/com/amazonaws/services/lambda/extension/Constants.java b/experimental/aws-lambda-java-profiler/extension/src/main/java/com/amazonaws/services/lambda/extension/Constants.java
new file mode 100644
index 000000000..f9ca3010c
--- /dev/null
+++ b/experimental/aws-lambda-java-profiler/extension/src/main/java/com/amazonaws/services/lambda/extension/Constants.java
@@ -0,0 +1,29 @@
+package com.amazonaws.services.lambda.extension;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class Constants {
+
+ private static final String DEFAULT_AWS_LAMBDA_PROFILER_START_COMMAND =
+ "start,event=wall,interval=1us";
+ private static final String DEFAULT_AWS_LAMBDA_PROFILER_STOP_COMMAND =
+ "stop,file=%s,include=*AWSLambda.main,include=start_thread";
+ public static final String PROFILER_START_COMMAND =
+ System.getenv().getOrDefault(
+ "AWS_LAMBDA_PROFILER_START_COMMAND",
+ DEFAULT_AWS_LAMBDA_PROFILER_START_COMMAND
+ );
+ public static final String PROFILER_STOP_COMMAND =
+ System.getenv().getOrDefault(
+ "AWS_LAMBDA_PROFILER_STOP_COMMAND",
+ DEFAULT_AWS_LAMBDA_PROFILER_STOP_COMMAND
+ );
+
+ public static String getFilePathFromEnv(){
+ Pattern pattern = Pattern.compile("file=([^,]+)");
+ Matcher matcher = pattern.matcher(PROFILER_START_COMMAND);
+
+ return matcher.find() ? matcher.group(1) : "/tmp/profiling-data-%s.html";
+ }
+}
diff --git a/experimental/aws-lambda-java-profiler/extension/src/main/java/com/amazonaws/services/lambda/extension/ExtensionClient.java b/experimental/aws-lambda-java-profiler/extension/src/main/java/com/amazonaws/services/lambda/extension/ExtensionClient.java
new file mode 100644
index 000000000..60c13a811
--- /dev/null
+++ b/experimental/aws-lambda-java-profiler/extension/src/main/java/com/amazonaws/services/lambda/extension/ExtensionClient.java
@@ -0,0 +1,73 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: MIT-0
+package com.amazonaws.services.lambda.extension;
+
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.util.Optional;
+
+/**
+ * Utility class that takes care of registration of extension, fetching the next event, initializing
+ * and exiting with error
+ */
+public class ExtensionClient {
+ private static final String EXTENSION_NAME = "profiler-extension";
+ private static final String BASEURL = String
+ .format("http://%s/2020-01-01/extension", System.getenv("AWS_LAMBDA_RUNTIME_API"));
+ private static final String BODY = "{" +
+ " \"events\": [" +
+ " \"INVOKE\"," +
+ " \"SHUTDOWN\"" +
+ " ]" +
+ " }";
+ private static final String LAMBDA_EXTENSION_IDENTIFIER = "Lambda-Extension-Identifier";
+ private static final HttpClient client = HttpClient.newBuilder().build();
+
+ public static String registerExtension() {
+ final String registerUrl = String.format("%s/register", BASEURL);
+ HttpRequest request = HttpRequest.newBuilder()
+ .POST(HttpRequest.BodyPublishers.ofString(BODY))
+ .header("Content-Type", "application/json")
+ .header("Lambda-Extension-Name", EXTENSION_NAME)
+ .uri(URI.create(registerUrl))
+ .build();
+ try {
+ HttpResponse response = client.send(request, HttpResponse.BodyHandlers.ofString());
+ // Get extension ID from the response headers
+ Optional lambdaExtensionHeader = response.headers().firstValue("lambda-extension-identifier");
+ if (lambdaExtensionHeader.isPresent()) {
+ return lambdaExtensionHeader.get();
+ }
+ }
+ catch (Exception e) {
+ Logger.error("could not register the extension");
+ e.printStackTrace();
+ }
+ throw new RuntimeException("Error while registering extension");
+ }
+
+ public static String getNext(final String extensionId) {
+ try {
+ final String nextEventUrl = String.format("%s/event/next", BASEURL);
+ HttpRequest request = HttpRequest.newBuilder()
+ .GET()
+ .header(LAMBDA_EXTENSION_IDENTIFIER, extensionId)
+ .uri(URI.create(nextEventUrl))
+ .build();
+ HttpResponse response = client.send(request, HttpResponse.BodyHandlers.ofString());
+ if (response.statusCode() == 200) {
+ return response.body();
+ } else {
+ Logger.error("invalid status code returned while processing event = " + response.statusCode());
+ }
+ }
+ catch (Exception e) {
+ Logger.error("could not get /next event");
+ e.printStackTrace();
+ }
+
+ return null;
+ }
+}
diff --git a/experimental/aws-lambda-java-profiler/extension/src/main/java/com/amazonaws/services/lambda/extension/ExtensionMain.java b/experimental/aws-lambda-java-profiler/extension/src/main/java/com/amazonaws/services/lambda/extension/ExtensionMain.java
new file mode 100644
index 000000000..18115a9fd
--- /dev/null
+++ b/experimental/aws-lambda-java-profiler/extension/src/main/java/com/amazonaws/services/lambda/extension/ExtensionMain.java
@@ -0,0 +1,136 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: MIT-0
+package com.amazonaws.services.lambda.extension;
+
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.net.URI;
+import java.util.UUID;
+
+public class ExtensionMain {
+
+ private static final HttpClient client = HttpClient.newBuilder().build();
+ private static String previousFileSuffix = null;
+ private static boolean coldstart = true;
+ private static final String REQUEST_ID = "requestId";
+ private static final String EVENT_TYPE = "eventType";
+ private static final String INTERNAL_COMMUNICATION_PORT = System.getenv().getOrDefault("AWS_LAMBDA_PROFILER_COMMUNICATION_PORT", "1234");
+ public static final String HEADER_NAME = "X-FileName";
+
+ private static S3Manager s3Manager;
+
+ public static void main(String[] args) {
+ final String extension = ExtensionClient.registerExtension();
+ Logger.debug("Extension registration complete, extensionID: " + extension);
+ s3Manager = new S3Manager();
+ while (true) {
+ try {
+ String response = ExtensionClient.getNext(extension);
+ if (response != null && !response.isEmpty()) {
+ final String eventType = extractInfo(EVENT_TYPE, response);
+ Logger.debug("eventType = " + eventType);
+ if (eventType != null) {
+ switch (eventType) {
+ case "INVOKE":
+ handleInvoke(response);
+ break;
+ case "SHUTDOWN":
+ handleShutDown();
+ break;
+ default:
+ Logger.error("invalid event type received " + eventType);
+ }
+ }
+ }
+ } catch (Exception e) {
+ Logger.error("error while processing extension -" + e.getMessage());
+ e.printStackTrace();
+ }
+ }
+ }
+
+ private static void handleShutDown() {
+ Logger.debug("handling SHUTDOWN event, flushing the last profile");
+ try {
+ // no need to stop the profiler as it has been stopped by the shutdown hook
+ s3Manager.upload(previousFileSuffix, true);
+ } catch (Exception e) {
+ Logger.error("could not upload the file");
+ throw e;
+ }
+ System.exit(0);
+ }
+
+ public static void handleInvoke(String payload) {
+ final String requestId = extractInfo(REQUEST_ID, payload);
+ final String randomSuffix = UUID.randomUUID().toString().substring(0,5);
+ Logger.debug("handling INVOKE event, requestID = " + requestId);
+ if (!coldstart) {
+ try {
+ stopProfiler(previousFileSuffix);
+ s3Manager.upload(previousFileSuffix, false);
+ startProfiler();
+ } catch (Exception e) {
+ Logger.error("could not start the profiler");
+ throw e;
+ }
+ }
+ coldstart = false;
+ previousFileSuffix = extractInfo(REQUEST_ID, payload) + "-" + randomSuffix;
+ }
+
+ private static String extractInfo(String info, String jsonString) {
+ String prefix = "\"" + info + "\":\"";
+ String suffix = "\"";
+
+ int startIndex = jsonString.indexOf(prefix);
+ if (startIndex == -1) {
+ return null; // requestId not found
+ }
+
+ startIndex += prefix.length();
+ int endIndex = jsonString.indexOf(suffix, startIndex);
+
+ if (endIndex == -1) {
+ return null; // Malformed JSON
+ }
+
+ return jsonString.substring(startIndex, endIndex);
+ }
+
+ private static void startProfiler() {
+ try {
+ String url = String.format("http://localhost:%s/profiler/start", INTERNAL_COMMUNICATION_PORT);
+ HttpRequest request = HttpRequest.newBuilder()
+ .GET()
+ .uri(URI.create(url))
+ .build();
+ HttpResponse response = client.send(request, HttpResponse.BodyHandlers.ofString());
+ if (response.statusCode() == 200) {
+ Logger.debug("profiler successfully started");
+ }
+ } catch(Exception e) {
+ Logger.error("could not start the profiler");
+ e.printStackTrace();
+ }
+ }
+
+ private static void stopProfiler(String fileNameSuffix) {
+ try {
+ String url = String.format("http://localhost:%s/profiler/stop", INTERNAL_COMMUNICATION_PORT);
+ HttpRequest request = HttpRequest.newBuilder()
+ .GET()
+ .setHeader(HEADER_NAME, fileNameSuffix)
+ .uri(URI.create(url))
+ .build();
+ HttpResponse response = client.send(request, HttpResponse.BodyHandlers.ofString());
+ if (response.statusCode() == 200) {
+ Logger.debug("profiler successfully stopped");
+ }
+ } catch(Exception e) {
+ Logger.error("could not stop the profiler");
+ e.printStackTrace();
+ }
+ }
+}
diff --git a/experimental/aws-lambda-java-profiler/extension/src/main/java/com/amazonaws/services/lambda/extension/Logger.java b/experimental/aws-lambda-java-profiler/extension/src/main/java/com/amazonaws/services/lambda/extension/Logger.java
new file mode 100644
index 000000000..e064da101
--- /dev/null
+++ b/experimental/aws-lambda-java-profiler/extension/src/main/java/com/amazonaws/services/lambda/extension/Logger.java
@@ -0,0 +1,25 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: MIT-0
+package com.amazonaws.services.lambda.extension;
+
+public class Logger {
+
+ private static final boolean IS_DEBUG_ENABLED = initializeDebugFlag();
+ private static final String PREFIX = "[PROFILER] ";
+
+ private static boolean initializeDebugFlag() {
+ String envValue = System.getenv("AWS_LAMBDA_PROFILER_DEBUG");
+ return "true".equalsIgnoreCase(envValue) || "1".equals(envValue);
+ }
+
+ public static void debug(String message) {
+ if(IS_DEBUG_ENABLED) {
+ System.out.println(PREFIX + message);
+ }
+ }
+
+ public static void error(String message) {
+ System.out.println(PREFIX + message);
+ }
+
+}
\ No newline at end of file
diff --git a/experimental/aws-lambda-java-profiler/extension/src/main/java/com/amazonaws/services/lambda/extension/PreMain.java b/experimental/aws-lambda-java-profiler/extension/src/main/java/com/amazonaws/services/lambda/extension/PreMain.java
new file mode 100644
index 000000000..2a84eb641
--- /dev/null
+++ b/experimental/aws-lambda-java-profiler/extension/src/main/java/com/amazonaws/services/lambda/extension/PreMain.java
@@ -0,0 +1,131 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: MIT-0
+package com.amazonaws.services.lambda.extension;
+
+import com.sun.net.httpserver.HttpExchange;
+import com.sun.net.httpserver.HttpHandler;
+import com.sun.net.httpserver.HttpServer;
+import java.io.File;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.lang.instrument.Instrumentation;
+import java.net.InetSocketAddress;
+import java.nio.charset.StandardCharsets;
+import one.profiler.AsyncProfiler;
+
+import static com.amazonaws.services.lambda.extension.Constants.PROFILER_START_COMMAND;
+import static com.amazonaws.services.lambda.extension.Constants.PROFILER_STOP_COMMAND;
+
+public class PreMain {
+
+
+ private static final String INTERNAL_COMMUNICATION_PORT =
+ System.getenv().getOrDefault(
+ "AWS_LAMBDA_PROFILER_COMMUNICATION_PORT",
+ "1234"
+ );
+
+
+ private String filepath;
+
+ public static void premain(String agentArgs, Instrumentation inst) {
+ Logger.debug("premain is starting");
+ if (!createFileIfNotExist("/tmp/aws-lambda-java-profiler")) {
+ Logger.debug("starting the profiler for coldstart");
+ startProfiler();
+ registerShutdownHook();
+ try {
+ Integer port = Integer.parseInt(INTERNAL_COMMUNICATION_PORT);
+ Logger.debug("using profile communication port = " + port);
+ HttpServer server = HttpServer.create(
+ new InetSocketAddress(port),
+ 0
+ );
+ server.createContext("/profiler/start", new StartProfiler());
+ server.createContext("/profiler/stop", new StopProfiler());
+ server.setExecutor(null); // Use the default executor
+ server.start();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ }
+
+ private static boolean createFileIfNotExist(String filePath) {
+ File file = new File(filePath);
+ try {
+ return file.createNewFile();
+ } catch (IOException e) {
+ System.out.println(e);
+ return false;
+ }
+ }
+
+ public static class StopProfiler implements HttpHandler {
+
+ @Override
+ public void handle(HttpExchange exchange) throws IOException {
+ Logger.debug("hit /profiler/stop");
+ final String fileName = exchange
+ .getRequestHeaders()
+ .getFirst(ExtensionMain.HEADER_NAME);
+ stopProfiler(fileName);
+ String response = "ok";
+ exchange.sendResponseHeaders(200, response.length());
+ try (OutputStream os = exchange.getResponseBody()) {
+ os.write(response.getBytes(StandardCharsets.UTF_8));
+ }
+ }
+ }
+
+ public static class StartProfiler implements HttpHandler {
+
+ @Override
+ public void handle(HttpExchange exchange) throws IOException {
+ Logger.debug("hit /profiler/start");
+ startProfiler();
+ String response = "ok";
+ exchange.sendResponseHeaders(200, response.length());
+ try (OutputStream os = exchange.getResponseBody()) {
+ os.write(response.getBytes(StandardCharsets.UTF_8));
+ }
+ }
+ }
+
+ public static void stopProfiler(String fileNameSuffix) {
+ try {
+ final String fileName = String.format(
+ Constants.getFilePathFromEnv(),
+ fileNameSuffix
+ );
+ Logger.debug(
+ "stopping the profiler with filename = " + fileName
+ );
+ AsyncProfiler.getInstance().execute(
+ String.format(PROFILER_STOP_COMMAND, fileName)
+ );
+ } catch (Exception e) {
+ Logger.error("could not stop the profiler");
+ e.printStackTrace();
+ }
+ }
+
+ public static void startProfiler() {
+ try {
+ Logger.debug(
+ "starting the profiler with command = " + PROFILER_START_COMMAND
+ );
+ AsyncProfiler.getInstance().execute(PROFILER_START_COMMAND);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ public static void registerShutdownHook() {
+ Logger.debug("registering shutdown hook wit command = " + PROFILER_STOP_COMMAND);
+ Thread shutdownHook = new Thread(
+ new ShutdownHook(PROFILER_STOP_COMMAND)
+ );
+ Runtime.getRuntime().addShutdownHook(shutdownHook);
+ }
+}
diff --git a/experimental/aws-lambda-java-profiler/extension/src/main/java/com/amazonaws/services/lambda/extension/S3Manager.java b/experimental/aws-lambda-java-profiler/extension/src/main/java/com/amazonaws/services/lambda/extension/S3Manager.java
new file mode 100644
index 000000000..0e31a2421
--- /dev/null
+++ b/experimental/aws-lambda-java-profiler/extension/src/main/java/com/amazonaws/services/lambda/extension/S3Manager.java
@@ -0,0 +1,66 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: MIT-0
+package com.amazonaws.services.lambda.extension;
+
+import java.io.File;
+import java.time.format.DateTimeFormatter;
+import java.time.LocalDate;
+
+import software.amazon.awssdk.core.sync.RequestBody;
+import software.amazon.awssdk.services.s3.S3Client;
+import software.amazon.awssdk.services.s3.model.PutObjectRequest;
+import software.amazon.awssdk.services.s3.model.PutObjectResponse;
+
+public class S3Manager {
+
+ private static final String RESULTS_BUCKET = "AWS_LAMBDA_PROFILER_RESULTS_BUCKET_NAME";
+ private static final String FUNCTION_NAME = System.getenv().getOrDefault("AWS_LAMBDA_FUNCTION_NAME", "function");
+ private S3Client s3Client;
+ private String bucketName;
+
+ public S3Manager() {
+ final String bucketName = System.getenv(RESULTS_BUCKET);
+ Logger.debug("creating S3Manager with bucketName = " + bucketName);
+ if (null == bucketName || bucketName.isEmpty()) {
+ throw new IllegalArgumentException("please set the bucket name using AWS_LAMBDA_PROFILER_RESULTS_BUCKET_NAME environment variable");
+ }
+ this.s3Client = S3Client.builder().build();
+ this.bucketName = bucketName;
+ Logger.debug("S3Manager successfully created");
+ }
+
+ public void upload(String fileName, boolean isShutDownEvent) {
+ try {
+ final String suffix = isShutDownEvent ? "shutdown" : fileName;
+ final String key = buildKey(FUNCTION_NAME, fileName);
+ Logger.debug("uploading profile to key = " + key);
+ PutObjectRequest putObjectRequest = PutObjectRequest.builder()
+ .bucket(bucketName)
+ .key(key)
+ .build();
+ File file = new File(String.format(Constants.getFilePathFromEnv(), suffix));
+ if (file.exists()) {
+ Logger.debug("file size is " + file.length());
+ RequestBody requestBody = RequestBody.fromFile(file);
+ PutObjectResponse response = s3Client.putObject(putObjectRequest, requestBody);
+ Logger.debug("profile uploaded successfully. ETag: " + response.eTag());
+ if(file.delete()) {
+ Logger.debug("file deleted");
+ }
+ } else {
+ throw new IllegalArgumentException("could not find the profile to upload");
+ }
+ } catch (Exception e) {
+ Logger.error("could not upload the profile");
+ e.printStackTrace();
+ }
+ }
+
+ private String buildKey(String functionName, String fileName) {
+ final LocalDate currentDate = LocalDate.now();
+ final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy/MM/dd");
+ final String formattedDate = currentDate.format(formatter);
+ return String.format("%s/%s/%s", formattedDate, functionName, fileName);
+ }
+
+}
\ No newline at end of file
diff --git a/experimental/aws-lambda-java-profiler/extension/src/main/java/com/amazonaws/services/lambda/extension/ShutdownHook.java b/experimental/aws-lambda-java-profiler/extension/src/main/java/com/amazonaws/services/lambda/extension/ShutdownHook.java
new file mode 100644
index 000000000..a36584bc1
--- /dev/null
+++ b/experimental/aws-lambda-java-profiler/extension/src/main/java/com/amazonaws/services/lambda/extension/ShutdownHook.java
@@ -0,0 +1,26 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: MIT-0
+package com.amazonaws.services.lambda.extension;
+
+import one.profiler.AsyncProfiler;
+
+public class ShutdownHook implements Runnable {
+
+ private String stopCommand;
+
+ public ShutdownHook(String stopCommand) {
+ this.stopCommand = stopCommand;
+ }
+
+ @Override
+ public void run() {
+ Logger.debug("running ShutdownHook");
+ try {
+ final String fileName = "/tmp/profiling-data-shutdown.html";
+ Logger.debug("stopping the profiler");
+ AsyncProfiler.getInstance().execute(String.format(this.stopCommand, fileName));
+ } catch (Exception e) {
+ Logger.error("could not stop the profiler");
+ }
+ }
+}
\ No newline at end of file
diff --git a/experimental/aws-lambda-java-profiler/integration_tests/cleanup.sh b/experimental/aws-lambda-java-profiler/integration_tests/cleanup.sh
new file mode 100755
index 000000000..d58142a04
--- /dev/null
+++ b/experimental/aws-lambda-java-profiler/integration_tests/cleanup.sh
@@ -0,0 +1,45 @@
+#!/bin/bash
+
+# Set variables
+LAYER_ARN=$(cat /tmp/layer_arn)
+FUNCTION_NAME="aws-lambda-java-profiler-function-${GITHUB_RUN_ID}"
+ROLE_NAME="aws-lambda-java-profiler-role-${GITHUB_RUN_ID}"
+
+# Function to check if a command was successful
+check_success() {
+ if [ $? -eq 0 ]; then
+ echo "Success: $1"
+ else
+ echo "Error: Failed to $1"
+ exit 1
+ fi
+}
+
+# Delete Lambda Layer
+echo "Deleting Lambda Layer..."
+aws lambda delete-layer-version --layer-name $(echo $LAYER_ARN | cut -d: -f7) --version-number $(echo $LAYER_ARN | cut -d: -f8)
+check_success "delete Lambda Layer"
+
+# Delete Lambda Function
+echo "Deleting Lambda Function..."
+aws lambda delete-function --function-name $FUNCTION_NAME
+check_success "delete Lambda Function"
+
+# Delete IAM Role
+echo "Deleting IAM Role..."
+# First, detach all policies from the role
+for policy in $(aws iam list-attached-role-policies --role-name $ROLE_NAME --query 'AttachedPolicies[*].PolicyArn' --output text); do
+ aws iam detach-role-policy --role-name $ROLE_NAME --policy-arn $policy
+ check_success "detach policy $policy from role $ROLE_NAME"
+done
+
+# Remove s3 inline policy
+aws iam delete-role-policy --role-name $ROLE_NAME --policy-name "s3PutObject"
+check_success "deleted inline policy"
+
+
+# Then delete the role
+aws iam delete-role --role-name $ROLE_NAME
+check_success "delete IAM Role"
+
+echo "All deletions completed successfully."
\ No newline at end of file
diff --git a/experimental/aws-lambda-java-profiler/integration_tests/create_bucket.sh b/experimental/aws-lambda-java-profiler/integration_tests/create_bucket.sh
new file mode 100755
index 000000000..0ba50b732
--- /dev/null
+++ b/experimental/aws-lambda-java-profiler/integration_tests/create_bucket.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+PROFILER_RESULTS_BUCKET_NAME="aws-lambda-java-profiler-bucket-${GITHUB_RUN_ID}"
+
+# Create the S3 bucket
+aws s3 mb s3://"$PROFILER_RESULTS_BUCKET_NAME"
+
+# Check if the bucket was created successfully
+if [ $? -eq 0 ]; then
+ echo "Bucket '$PROFILER_RESULTS_BUCKET_NAME' created successfully."
+else
+ echo "Error: Failed to create bucket '$PROFILER_RESULTS_BUCKET_NAME'."
+ exit 1
+fi
\ No newline at end of file
diff --git a/experimental/aws-lambda-java-profiler/integration_tests/create_function.sh b/experimental/aws-lambda-java-profiler/integration_tests/create_function.sh
new file mode 100755
index 000000000..12ba1cb2b
--- /dev/null
+++ b/experimental/aws-lambda-java-profiler/integration_tests/create_function.sh
@@ -0,0 +1,85 @@
+#!/bin/bash
+
+# Set variables
+FUNCTION_NAME="aws-lambda-java-profiler-function-${GITHUB_RUN_ID}"
+FUNCTION_NAME_CUSTOM_PROFILER_OPTIONS="aws-lambda-java-profiler-function-custom-${GITHUB_RUN_ID}"
+ROLE_NAME="aws-lambda-java-profiler-role-${GITHUB_RUN_ID}"
+HANDLER="helloworld.Handler::handleRequest"
+RUNTIME="java21"
+LAYER_ARN=$(cat /tmp/layer_arn)
+
+JAVA_TOOL_OPTIONS="-XX:+UnlockDiagnosticVMOptions -XX:+DebugNonSafepoints -javaagent:/opt/profiler-extension.jar"
+AWS_LAMBDA_PROFILER_RESULTS_BUCKET_NAME="aws-lambda-java-profiler-bucket-${GITHUB_RUN_ID}"
+AWS_LAMBDA_PROFILER_START_COMMAND="start,event=wall,interval=1us,file=/tmp/profile.jfr"
+AWS_LAMBDA_PROFILER_STOP_COMMAND="stop,file=%s"
+
+# Compile the Hello World project
+cd integration_tests/helloworld
+gradle :buildZip
+cd ../..
+
+# Create IAM role for Lambda
+ROLE_ARN=$(aws iam create-role \
+ --role-name $ROLE_NAME \
+ --assume-role-policy-document '{"Version": "2012-10-17","Statement": [{ "Effect": "Allow", "Principal": {"Service": "lambda.amazonaws.com"}, "Action": "sts:AssumeRole"}]}' \
+ --query 'Role.Arn' \
+ --output text)
+
+# Attach basic Lambda execution policy to the role
+aws iam attach-role-policy \
+ --role-name $ROLE_NAME \
+ --policy-arn arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole
+
+# Attach s3:PutObject policy to the role so we can upload profiles
+POLICY_DOCUMENT=$(cat < $new_filename"
+ else
+ echo "No change: $filename"
+ fi
+ fi
+done
+
+echo "All files processed."
\ No newline at end of file
diff --git a/experimental/aws-lambda-java-profiler/integration_tests/helloworld/build.gradle b/experimental/aws-lambda-java-profiler/integration_tests/helloworld/build.gradle
new file mode 100644
index 000000000..79ffa030a
--- /dev/null
+++ b/experimental/aws-lambda-java-profiler/integration_tests/helloworld/build.gradle
@@ -0,0 +1,32 @@
+plugins {
+ id 'java'
+}
+
+repositories {
+ mavenCentral()
+}
+
+java {
+ sourceCompatibility = JavaVersion.VERSION_21
+ targetCompatibility = JavaVersion.VERSION_21
+}
+
+dependencies {
+ implementation (
+ 'com.amazonaws:aws-lambda-java-core:1.2.3',
+ 'com.amazonaws:aws-lambda-java-events:3.11.0',
+ 'org.slf4j:slf4j-api:2.0.13'
+ )
+}
+
+task buildZip(type: Zip) {
+ archiveBaseName = "code"
+ from compileJava
+ from processResources
+ into('lib') {
+ from configurations.runtimeClasspath
+ }
+}
+
+
+build.dependsOn buildZip
\ No newline at end of file
diff --git a/experimental/aws-lambda-java-profiler/integration_tests/helloworld/src/main/java/helloworld/Handler.java b/experimental/aws-lambda-java-profiler/integration_tests/helloworld/src/main/java/helloworld/Handler.java
new file mode 100644
index 000000000..a29cae18e
--- /dev/null
+++ b/experimental/aws-lambda-java-profiler/integration_tests/helloworld/src/main/java/helloworld/Handler.java
@@ -0,0 +1,53 @@
+package helloworld;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+
+import java.util.stream.Collectors;
+import java.util.ArrayList;
+import java.util.List;
+import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyResponseEvent;
+import com.amazonaws.services.lambda.runtime.Context;
+
+import com.amazonaws.services.lambda.runtime.RequestHandler;
+import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class Handler implements RequestHandler {
+
+ public APIGatewayProxyResponseEvent handleRequest(final APIGatewayProxyRequestEvent input, final Context context) {
+ long start = System.currentTimeMillis();
+ List result = slowRecursiveFunction(0, 5);
+ long end = System.currentTimeMillis();
+ long duration = end - start;
+
+ System.out.println("Function execution time: " + duration + " ms");
+ System.out.println("Result size: " + result.size());
+ System.out.println("First few elements: " + result.subList(0, Math.min(10, result.size())));
+
+ return new APIGatewayProxyResponseEvent()
+ .withStatusCode(200)
+ .withBody("ok");
+
+ }
+
+ private static List slowRecursiveFunction(int n, int depth) {
+ List result = new ArrayList<>();
+ if (depth == 0) {
+ return result;
+ }
+ long startTime = System.currentTimeMillis();
+ while (System.currentTimeMillis() - startTime < 100) {
+ // nothing to do here
+ }
+ result.add(n);
+ result.addAll(slowRecursiveFunction(n + 2, depth - 1));
+ return result;
+ }
+}
diff --git a/experimental/aws-lambda-java-profiler/integration_tests/helloworld/src/main/resources/wrapper.sh b/experimental/aws-lambda-java-profiler/integration_tests/helloworld/src/main/resources/wrapper.sh
new file mode 100644
index 000000000..b54b77673
--- /dev/null
+++ b/experimental/aws-lambda-java-profiler/integration_tests/helloworld/src/main/resources/wrapper.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# the path to the interpreter and all of the originally intended arguments
+args=("$@")
+
+# the extra options to pass to the interpreter
+echo "${args[@]}"
+
+# start the runtime with the extra options
+exec "${args[@]}"
\ No newline at end of file
diff --git a/experimental/aws-lambda-java-profiler/integration_tests/invoke_function.sh b/experimental/aws-lambda-java-profiler/integration_tests/invoke_function.sh
new file mode 100755
index 000000000..39b0dd885
--- /dev/null
+++ b/experimental/aws-lambda-java-profiler/integration_tests/invoke_function.sh
@@ -0,0 +1,74 @@
+#!/bin/bash
+
+# Set variables
+FUNCTION_NAME="aws-lambda-java-profiler-function-${GITHUB_RUN_ID}"
+PAYLOAD='{"key": "value"}'
+
+echo "Invoking Lambda function: $FUNCTION_NAME"
+
+# Invoke the Lambda function synchronously and capture the response
+RESPONSE=$(aws lambda invoke \
+ --function-name "$FUNCTION_NAME" \
+ --payload "$PAYLOAD" \
+ --cli-binary-format raw-in-base64-out \
+ --log-type Tail \
+ output.json)
+
+# Extract the status code and log result from the response
+STATUS_CODE=$(echo "$RESPONSE" | jq -r '.StatusCode')
+LOG_RESULT=$(echo "$RESPONSE" | jq -r '.LogResult')
+
+echo "Function invocation completed with status code: $STATUS_CODE"
+
+# Decode and display the logs
+if [ -n "$LOG_RESULT" ]; then
+ echo "Function logs:"
+ echo "$LOG_RESULT" | base64 --decode
+else
+ echo "No logs available."
+fi
+
+# Display the function output
+echo "Function output:"
+cat output.json
+
+echo "$LOG_RESULT" | base64 --decode | grep "starting the profiler for coldstart" || { echo "ERROR: Profiler did not start for coldstart"; exit 1; }
+echo "$LOG_RESULT" | base64 --decode | grep -v "uploading" || { echo "ERROR: Unexpected upload detected on cold start"; exit 1; }
+
+# Clean up the output file
+rm output.json
+
+
+# Invoke it a second time for warm start
+echo "Invoking Lambda function: $FUNCTION_NAME"
+
+# Invoke the Lambda function synchronously and capture the response
+RESPONSE=$(aws lambda invoke \
+ --function-name "$FUNCTION_NAME" \
+ --payload "$PAYLOAD" \
+ --cli-binary-format raw-in-base64-out \
+ --log-type Tail \
+ output.json)
+
+# Extract the status code and log result from the response
+STATUS_CODE=$(echo "$RESPONSE" | jq -r '.StatusCode')
+LOG_RESULT=$(echo "$RESPONSE" | jq -r '.LogResult')
+
+echo "Function invocation completed with status code: $STATUS_CODE"
+
+# Decode and display the logs
+if [ -n "$LOG_RESULT" ]; then
+ echo "Function logs:"
+ echo "$LOG_RESULT" | base64 --decode
+else
+ echo "No logs available."
+fi
+
+# Display the function output
+echo "Function output:"
+cat output.json
+
+echo "$LOG_RESULT" | base64 --decode | grep "uploading" || { echo "ERROR: Upload not detected on warm start"; exit 1; }
+
+# Clean up the output file
+rm output.json
diff --git a/experimental/aws-lambda-java-profiler/integration_tests/invoke_function_custom_options.sh b/experimental/aws-lambda-java-profiler/integration_tests/invoke_function_custom_options.sh
new file mode 100755
index 000000000..6cf927ae0
--- /dev/null
+++ b/experimental/aws-lambda-java-profiler/integration_tests/invoke_function_custom_options.sh
@@ -0,0 +1,86 @@
+#!/bin/bash
+
+# Set variables
+FUNCTION_NAME_CUSTOM_PROFILER_OPTIONS="aws-lambda-java-profiler-function-custom-${GITHUB_RUN_ID}"
+PAYLOAD='{"key": "value"}'
+
+# Expected profiler commands (should match create_function.sh)
+EXPECTED_START_COMMAND="start,event=wall,interval=1us,file=/tmp/profile.jfr"
+EXPECTED_STOP_COMMAND="stop,file=%s"
+
+echo "Invoking Lambda function with custom profiler options: $FUNCTION_NAME_CUSTOM_PROFILER_OPTIONS"
+
+# Invoke the Lambda function synchronously and capture the response
+RESPONSE=$(aws lambda invoke \
+ --function-name "$FUNCTION_NAME_CUSTOM_PROFILER_OPTIONS" \
+ --payload "$PAYLOAD" \
+ --cli-binary-format raw-in-base64-out \
+ --log-type Tail \
+ output.json)
+
+# Extract the status code and log result from the response
+STATUS_CODE=$(echo "$RESPONSE" | jq -r '.StatusCode')
+LOG_RESULT=$(echo "$RESPONSE" | jq -r '.LogResult')
+
+echo "Function invocation completed with status code: $STATUS_CODE"
+
+# Decode and display the logs
+if [ -n "$LOG_RESULT" ]; then
+ echo "Function logs:"
+ echo "$LOG_RESULT" | base64 --decode
+else
+ echo "No logs available."
+fi
+
+# Display the function output
+echo "Function output:"
+cat output.json
+
+# Verify profiler started
+echo "$LOG_RESULT" | base64 --decode | grep "starting the profiler for coldstart" || { echo "ERROR: Profiler did not start for coldstart"; exit 1; }
+
+# Verify custom start command is being used
+echo "$LOG_RESULT" | base64 --decode | grep "$EXPECTED_START_COMMAND" || { echo "ERROR: Expected start command not found: $EXPECTED_START_COMMAND"; exit 1; }
+echo "$LOG_RESULT" | base64 --decode | grep "$EXPECTED_STOP_COMMAND" || { echo "ERROR: Expected stop command not found: $EXPECTED_STOP_COMMAND"; exit 1; }
+
+# Verify no upload on cold start
+echo "$LOG_RESULT" | base64 --decode | grep -v "uploading" || { echo "ERROR: Unexpected upload detected on cold start"; exit 1; }
+
+# Clean up the output file
+rm output.json
+
+
+# Invoke it a second time for warm start
+echo "Invoking Lambda function (warm start): $FUNCTION_NAME_CUSTOM_PROFILER_OPTIONS"
+
+# Invoke the Lambda function synchronously and capture the response
+RESPONSE=$(aws lambda invoke \
+ --function-name "$FUNCTION_NAME_CUSTOM_PROFILER_OPTIONS" \
+ --payload "$PAYLOAD" \
+ --cli-binary-format raw-in-base64-out \
+ --log-type Tail \
+ output.json)
+
+# Extract the status code and log result from the response
+STATUS_CODE=$(echo "$RESPONSE" | jq -r '.StatusCode')
+LOG_RESULT=$(echo "$RESPONSE" | jq -r '.LogResult')
+
+echo "Function invocation completed with status code: $STATUS_CODE"
+
+# Decode and display the logs
+if [ -n "$LOG_RESULT" ]; then
+ echo "Function logs:"
+ echo "$LOG_RESULT" | base64 --decode
+else
+ echo "No logs available."
+fi
+
+# Display the function output
+echo "Function output:"
+cat output.json
+
+# Verify upload happens on warm start
+echo "$LOG_RESULT" | base64 --decode | grep "uploading" || { echo "ERROR: Upload not detected on warm start"; exit 1; }
+
+# Clean up the output file
+rm output.json
diff --git a/experimental/aws-lambda-java-profiler/integration_tests/publish_layer.sh b/experimental/aws-lambda-java-profiler/integration_tests/publish_layer.sh
new file mode 100755
index 000000000..879944e8e
--- /dev/null
+++ b/experimental/aws-lambda-java-profiler/integration_tests/publish_layer.sh
@@ -0,0 +1,42 @@
+#!/bin/bash
+
+# Set variables
+LAYER_NAME="aws-lambda-java-profiler-test"
+DESCRIPTION="AWS Lambda Java Profiler Test Layer"
+ZIP_FILE="./extension/extension.zip"
+RUNTIME="java21"
+ARCHITECTURE="x86_64"
+
+# Check if AWS CLI is installed
+if ! command -v aws &> /dev/null; then
+ echo "AWS CLI is not installed. Please install it first."
+ exit 1
+fi
+
+# Check if the ZIP file exists
+if [ ! -f "$ZIP_FILE" ]; then
+ echo "ZIP file $ZIP_FILE not found. Please make sure it exists."
+ exit 1
+fi
+
+# Publish the layer
+echo "Publishing layer $LAYER_NAME..."
+RESPONSE=$(aws lambda publish-layer-version \
+ --layer-name "$LAYER_NAME" \
+ --description "$DESCRIPTION" \
+ --zip-file "fileb://$ZIP_FILE" \
+ --compatible-runtimes "$RUNTIME" \
+ --compatible-architectures "$ARCHITECTURE")
+
+# Check if the layer was published successfully
+if [ $? -eq 0 ]; then
+ LAYER_VERSION=$(echo $RESPONSE | jq -r '.Version')
+ LAYER_ARN=$(echo $RESPONSE | jq -r '.LayerVersionArn')
+ echo "Layer published successfully!"
+ echo "Layer Version: $LAYER_VERSION"
+ echo "Layer ARN: $LAYER_ARN"
+ echo $LAYER_ARN > /tmp/layer_arn
+else
+ echo "Failed to publish layer. Please check your AWS credentials and permissions."
+ exit 1
+fi
\ No newline at end of file
diff --git a/experimental/aws-lambda-java-profiler/update-function.sh b/experimental/aws-lambda-java-profiler/update-function.sh
new file mode 100755
index 000000000..e849246a6
--- /dev/null
+++ b/experimental/aws-lambda-java-profiler/update-function.sh
@@ -0,0 +1,93 @@
+#!/bin/bash
+
+# Check if a function name was provided
+if [ $# -eq 0 ]; then
+ echo "Please provide a function name as an argument."
+ echo "Usage: $0 "
+ exit 1
+fi
+
+FUNCTION_NAME="$1"
+
+# Generate a random lowercase S3 bucket name
+RANDOM_SUFFIX=$(uuidgen | tr '[:upper:]' '[:lower:]' | cut -d'-' -f1)
+BUCKET_NAME="my-bucket-${RANDOM_SUFFIX}"
+echo "Generated bucket name: $BUCKET_NAME"
+
+# Create the S3 bucket with the random name
+aws s3 mb "s3://$BUCKET_NAME"
+
+# Create a Lambda layer
+aws lambda publish-layer-version \
+ --layer-name profiler-layer \
+ --description "Profiler Layer" \
+ --license-info "MIT" \
+ --zip-file fileb://extension/extension.zip \
+ --compatible-runtimes java11 java17 java21 \
+ --compatible-architectures "arm64" "x86_64"
+
+# Assign the layer to the function
+aws lambda update-function-configuration \
+ --function-name "$FUNCTION_NAME" \
+ --layers $(aws lambda list-layer-versions --layer-name profiler-layer --query 'LayerVersions[0].LayerVersionArn' --output text)
+
+# Wait for the function to be updated
+aws lambda wait function-updated \
+ --function-name "$FUNCTION_NAME"
+
+# Get existing environment variables (handle null case)
+EXISTING_VARS=$(aws lambda get-function-configuration --function-name "$FUNCTION_NAME" --query "Environment.Variables" --output json 2>/dev/null)
+if [[ -z "$EXISTING_VARS" || "$EXISTING_VARS" == "null" ]]; then
+ EXISTING_VARS="{}"
+fi
+
+# Define new environment variables in JSON format
+NEW_VARS=$(jq -n --arg bucket "$BUCKET_NAME" \
+ --arg java_opts "-XX:+UnlockDiagnosticVMOptions -XX:+DebugNonSafepoints -javaagent:/opt/profiler-extension.jar" \
+ '{AWS_LAMBDA_PROFILER_RESULTS_BUCKET_NAME: $bucket, JAVA_TOOL_OPTIONS: $java_opts}')
+
+# Merge existing and new variables (compact JSON output)
+UPDATED_VARS=$(echo "$EXISTING_VARS" | jq -c --argjson new_vars "$NEW_VARS" '. + $new_vars')
+
+# Convert JSON to "Key=Value" format for AWS CLI
+ENV_VARS_FORMATTED=$(echo "$UPDATED_VARS" | jq -r 'to_entries | map("\(.key)=\(.value)") | join(",")')
+
+# Update Lambda function with correct format
+aws lambda update-function-configuration \
+ --function-name "$FUNCTION_NAME" \
+ --environment "Variables={$ENV_VARS_FORMATTED}"
+
+# Update the function's permissions to write to the S3 bucket
+# Get the function's execution role
+ROLE_NAME=$(aws lambda get-function --function-name "$FUNCTION_NAME" --query 'Configuration.Role' --output text | awk -F'/' '{print $NF}')
+
+# Create a policy document
+cat << EOF > s3-write-policy.json
+{
+ "Version": "2012-10-17",
+ "Statement": [
+ {
+ "Effect": "Allow",
+ "Action": [
+ "s3:PutObject"
+ ],
+ "Resource": [
+ "arn:aws:s3:::$BUCKET_NAME",
+ "arn:aws:s3:::$BUCKET_NAME/*"
+ ]
+ }
+ ]
+}
+EOF
+
+# Attach the policy to the role
+aws iam put-role-policy \
+ --role-name "$ROLE_NAME" \
+ --policy-name S3WriteAccess \
+ --policy-document file://s3-write-policy.json
+
+echo "Setup completed for function $FUNCTION_NAME with S3 bucket $BUCKET_NAME"
+echo "S3 write permissions added to the function's execution role"
+
+# Clean up temporary files
+rm s3-write-policy.json
diff --git a/samples/custom-serialization/fastJson/HelloWorldFunction/pom.xml b/samples/custom-serialization/fastJson/HelloWorldFunction/pom.xml
index fde6b6254..2a963ca21 100644
--- a/samples/custom-serialization/fastJson/HelloWorldFunction/pom.xml
+++ b/samples/custom-serialization/fastJson/HelloWorldFunction/pom.xml
@@ -20,7 +20,7 @@
com.amazonaws
aws-lambda-java-events
- 3.14.0
+ 3.16.0
@@ -35,7 +35,7 @@
org.apache.maven.plugins
maven-shade-plugin
- 3.2.4
+ 3.6.1
diff --git a/samples/custom-serialization/gson/HelloWorldFunction/pom.xml b/samples/custom-serialization/gson/HelloWorldFunction/pom.xml
index 56327d99f..47d04926a 100644
--- a/samples/custom-serialization/gson/HelloWorldFunction/pom.xml
+++ b/samples/custom-serialization/gson/HelloWorldFunction/pom.xml
@@ -20,7 +20,7 @@
com.amazonaws
aws-lambda-java-events
- 3.14.0
+ 3.16.0
com.google.code.gson
@@ -34,7 +34,7 @@
org.apache.maven.plugins
maven-shade-plugin
- 3.2.4
+ 3.6.1
diff --git a/samples/custom-serialization/jackson-jr/HelloWorldFunction/build.gradle b/samples/custom-serialization/jackson-jr/HelloWorldFunction/build.gradle
index 71c89b7ac..480abfded 100644
--- a/samples/custom-serialization/jackson-jr/HelloWorldFunction/build.gradle
+++ b/samples/custom-serialization/jackson-jr/HelloWorldFunction/build.gradle
@@ -14,5 +14,7 @@ dependencies {
implementation 'com.fasterxml.jackson.core:jackson-annotations:2.15.2'
}
-sourceCompatibility = 21
-targetCompatibility = 21
+java {
+ sourceCompatibility = JavaVersion.VERSION_21
+ targetCompatibility = JavaVersion.VERSION_21
+}
diff --git a/samples/custom-serialization/moshi/HelloWorldFunction/pom.xml b/samples/custom-serialization/moshi/HelloWorldFunction/pom.xml
index abbf69681..60277f10b 100644
--- a/samples/custom-serialization/moshi/HelloWorldFunction/pom.xml
+++ b/samples/custom-serialization/moshi/HelloWorldFunction/pom.xml
@@ -20,7 +20,7 @@
com.amazonaws
aws-lambda-java-events
- 3.14.0
+ 3.16.0
@@ -35,7 +35,7 @@
org.apache.maven.plugins
maven-shade-plugin
- 3.2.4
+ 3.6.1
diff --git a/samples/custom-serialization/request-stream-handler/HelloWorldFunction/pom.xml b/samples/custom-serialization/request-stream-handler/HelloWorldFunction/pom.xml
index 234dd6eb5..15e16439d 100644
--- a/samples/custom-serialization/request-stream-handler/HelloWorldFunction/pom.xml
+++ b/samples/custom-serialization/request-stream-handler/HelloWorldFunction/pom.xml
@@ -20,7 +20,7 @@
com.amazonaws
aws-lambda-java-events
- 3.14.0
+ 3.16.0
com.google.code.gson
@@ -34,7 +34,7 @@
org.apache.maven.plugins
maven-shade-plugin
- 3.2.4
+ 3.6.1
diff --git a/samples/kinesis-firehose-event-handler/pom.xml b/samples/kinesis-firehose-event-handler/pom.xml
index d7b04fbc4..0db8ed83a 100644
--- a/samples/kinesis-firehose-event-handler/pom.xml
+++ b/samples/kinesis-firehose-event-handler/pom.xml
@@ -35,6 +35,9 @@
1.8
1.8
UTF-8
+ 5.12.2
+ 3.5.4
+
@@ -46,13 +49,13 @@
com.amazonaws
aws-lambda-java-events
- 3.14.0
+ 3.16.0
org.junit.jupiter
junit-jupiter
- RELEASE
+ ${junit-jupiter.version}
test
@@ -68,7 +71,10 @@
org.apache.maven.plugins
maven-surefire-plugin
- 2.22.2
+ ${maven-surefire-plugin.version}
+
+ true
+
+