dimensions;
+ }
+}
diff --git a/aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/CognitoUserPoolPreTokenGenerationEventV2.java b/aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/CognitoUserPoolPreTokenGenerationEventV2.java
new file mode 100644
index 000000000..9faeb9704
--- /dev/null
+++ b/aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/CognitoUserPoolPreTokenGenerationEventV2.java
@@ -0,0 +1,134 @@
+/* Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. */
+
+package com.amazonaws.services.lambda.runtime.events;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import java.util.Map;
+
+/**
+ * Represent the class for the Cognito User Pool Pre Token Generation Lambda Trigger V2
+ *
+ * See Pre Token Generation Lambda Trigger
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
+@ToString(callSuper = true)
+public class CognitoUserPoolPreTokenGenerationEventV2 extends CognitoUserPoolEvent {
+ /**
+ * The request from the Amazon Cognito service.
+ */
+ private Request request;
+
+ /**
+ * The response from your Lambda trigger.
+ */
+ private Response response;
+
+ @Builder(setterPrefix = "with")
+ public CognitoUserPoolPreTokenGenerationEventV2(
+ String version,
+ String triggerSource,
+ String region,
+ String userPoolId,
+ String userName,
+ CallerContext callerContext,
+ Request request,
+ Response response) {
+ super(version, triggerSource, region, userPoolId, userName, callerContext);
+ this.request = request;
+ this.response = response;
+ }
+
+ @Data
+ @EqualsAndHashCode(callSuper = true)
+ @NoArgsConstructor
+ @ToString(callSuper = true)
+ public static class Request extends CognitoUserPoolEvent.Request {
+
+ private String[] scopes;
+ private GroupConfiguration groupConfiguration;
+ private Map clientMetadata;
+
+ @Builder(setterPrefix = "with")
+ public Request(Map userAttributes, String[] scopes, GroupConfiguration groupConfiguration, Map clientMetadata) {
+ super(userAttributes);
+ this.scopes = scopes;
+ this.groupConfiguration = groupConfiguration;
+ this.clientMetadata = clientMetadata;
+ }
+ }
+
+ @Data
+ @AllArgsConstructor
+ @Builder(setterPrefix = "with")
+ @NoArgsConstructor
+ public static class GroupConfiguration {
+ /**
+ * A list of the group names that are associated with the user that the identity token is issued for.
+ */
+ private String[] groupsToOverride;
+ /**
+ * A list of the current IAM roles associated with these groups.
+ */
+ private String[] iamRolesToOverride;
+ /**
+ * Indicates the preferred IAM role.
+ */
+ private String preferredRole;
+ }
+
+ @Data
+ @AllArgsConstructor
+ @Builder(setterPrefix = "with")
+ @NoArgsConstructor
+ public static class Response {
+ private ClaimsAndScopeOverrideDetails claimsAndScopeOverrideDetails;
+ }
+
+ @Data
+ @AllArgsConstructor
+ @Builder(setterPrefix = "with")
+ @NoArgsConstructor
+ public static class ClaimsAndScopeOverrideDetails {
+ private IdTokenGeneration idTokenGeneration;
+ private AccessTokenGeneration accessTokenGeneration;
+ private GroupOverrideDetails groupOverrideDetails;
+ }
+
+ @Data
+ @AllArgsConstructor
+ @Builder(setterPrefix = "with")
+ @NoArgsConstructor
+ public static class IdTokenGeneration {
+ private Map claimsToAddOrOverride;
+ private String[] claimsToSuppress;
+ }
+
+ @Data
+ @AllArgsConstructor
+ @Builder(setterPrefix = "with")
+ @NoArgsConstructor
+ public static class AccessTokenGeneration {
+ private Map claimsToAddOrOverride;
+ private String[] claimsToSuppress;
+ private String[] scopesToAdd;
+ private String[] scopesToSuppress;
+ }
+
+ @Data
+ @AllArgsConstructor
+ @Builder(setterPrefix = "with")
+ @NoArgsConstructor
+ public static class GroupOverrideDetails {
+ private String[] groupsToOverride;
+ private String[] iamRolesToOverride;
+ private String preferredRole;
+ }
+}
\ No newline at end of file
diff --git a/aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/ConnectEvent.java b/aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/ConnectEvent.java
index 38547ac2a..e94875614 100644
--- a/aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/ConnectEvent.java
+++ b/aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/ConnectEvent.java
@@ -59,7 +59,7 @@ public static class ContactData implements Serializable, Cloneable {
private String initiationMethod;
private String instanceArn;
private String previousContactId;
- private String queue;
+ private Queue queue;
private SystemEndpoint systemEndpoint;
}
@@ -80,4 +80,13 @@ public static class SystemEndpoint implements Serializable, Cloneable {
private String address;
private String type;
}
+ @Data
+ @Builder(setterPrefix = "with")
+ @NoArgsConstructor
+ @AllArgsConstructor
+ public static class Queue implements Serializable, Cloneable {
+ private String name;
+ private String ARN;
+ }
+
}
diff --git a/aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/KafkaEvent.java b/aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/KafkaEvent.java
index dd051d48f..aa6c00de3 100644
--- a/aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/KafkaEvent.java
+++ b/aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/KafkaEvent.java
@@ -43,6 +43,8 @@ public static class KafkaEventRecord {
private String key;
private String value;
private List> headers;
+ private SchemaMetadata keySchemaMetadata;
+ private SchemaMetadata valueSchemaMetadata;
}
@Data
@@ -59,4 +61,13 @@ public String toString() {
return topic + "-" + partition;
}
}
+
+ @Data
+ @AllArgsConstructor
+ @NoArgsConstructor
+ @Builder(setterPrefix = "with")
+ public static class SchemaMetadata {
+ private String schemaId;
+ private String dataFormat;
+ }
}
diff --git a/aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/MSKFirehoseEvent.java b/aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/MSKFirehoseEvent.java
new file mode 100644
index 000000000..1af40ce43
--- /dev/null
+++ b/aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/MSKFirehoseEvent.java
@@ -0,0 +1,51 @@
+/*
+Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+SPDX-License-Identifier: Apache-2.0
+*/
+
+package com.amazonaws.services.lambda.runtime.events;
+
+import java.nio.ByteBuffer;
+import java.util.List;
+import java.util.Map;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder(setterPrefix = "with")
+@NoArgsConstructor
+@AllArgsConstructor
+
+public class MSKFirehoseEvent {
+
+ private String invocationId;
+
+ private String deliveryStreamArn;
+
+ private String sourceMSKArn;
+
+ private String region;
+
+ private List records;
+
+ @Data
+ @Builder(setterPrefix = "with")
+ @NoArgsConstructor
+ @AllArgsConstructor
+ public static class Record {
+
+ private ByteBuffer kafkaRecordValue;
+
+ private String recordId;
+
+ private Long approximateArrivalEpoch;
+
+ private Long approximateArrivalTimestamp;
+
+ private Map mskRecordMetadata;
+
+ }
+}
diff --git a/aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/MSKFirehoseResponse.java b/aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/MSKFirehoseResponse.java
new file mode 100644
index 000000000..18b5aa13f
--- /dev/null
+++ b/aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/MSKFirehoseResponse.java
@@ -0,0 +1,61 @@
+/*
+Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+SPDX-License-Identifier: Apache-2.0
+*/
+
+package com.amazonaws.services.lambda.runtime.events;
+
+import java.nio.ByteBuffer;
+import java.util.List;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * Response model for Amazon Data Firehose Lambda transformation with MSK as a source.
+ * [+] Amazon Data Firehose Data Transformation - Data Transformation and Status Model - ...
+ * OK : Indicates that processing of this item succeeded.
+ * ProcessingFailed : Indicate that the processing of this item failed.
+ * Dropped : Indicates that this item should be silently dropped
+ */
+
+@Data
+@Builder(setterPrefix = "with")
+@NoArgsConstructor
+@AllArgsConstructor
+
+public class MSKFirehoseResponse {
+
+ public enum Result {
+
+ /**
+ * Indicates that processing of this item succeeded.
+ */
+ Ok,
+
+ /**
+ * Indicate that the processing of this item failed
+ */
+ ProcessingFailed,
+
+ /**
+ * Indicates that this item should be silently dropped
+ */
+ Dropped
+ }
+ public List records;
+
+ @Data
+ @NoArgsConstructor
+ @Builder(setterPrefix = "with")
+ @AllArgsConstructor
+
+ public static class Record {
+ public String recordId;
+ public Result result;
+ public ByteBuffer kafkaRecordValue;
+
+ }
+}
diff --git a/aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/S3BatchEventV2.java b/aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/S3BatchEventV2.java
new file mode 100644
index 000000000..e9beb1f41
--- /dev/null
+++ b/aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/S3BatchEventV2.java
@@ -0,0 +1,50 @@
+package com.amazonaws.services.lambda.runtime.events;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Event to represent the payload which is sent to Lambda by S3 Batch to perform a custom
+ * action when using invocation schema version 2.0.
+ *
+ * https://docs.aws.amazon.com/AmazonS3/latest/dev/batch-ops-invoke-lambda.html
+ */
+
+@Data
+@Builder(setterPrefix = "with")
+@NoArgsConstructor
+@AllArgsConstructor
+public class S3BatchEventV2 {
+
+ private String invocationSchemaVersion;
+ private String invocationId;
+ private Job job;
+ private List tasks;
+
+ @Data
+ @Builder(setterPrefix = "with")
+ @NoArgsConstructor
+ @AllArgsConstructor
+ public static class Job {
+
+ private String id;
+ private Map userArguments;
+ }
+
+ @Data
+ @Builder(setterPrefix = "with")
+ @NoArgsConstructor
+ @AllArgsConstructor
+ public static class Task {
+
+ private String taskId;
+ private String s3Key;
+ private String s3VersionId;
+ private String s3Bucket;
+ }
+}
diff --git a/aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/S3BatchResponse.java b/aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/S3BatchResponse.java
index 4fdd12732..d584a31dd 100644
--- a/aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/S3BatchResponse.java
+++ b/aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/S3BatchResponse.java
@@ -62,4 +62,10 @@ public static S3BatchResponseBuilder fromS3BatchEvent(S3BatchEvent s3BatchEvent)
.withInvocationId(s3BatchEvent.getInvocationId())
.withInvocationSchemaVersion(s3BatchEvent.getInvocationSchemaVersion());
}
-}
\ No newline at end of file
+
+ public static S3BatchResponseBuilder fromS3BatchEvent(S3BatchEventV2 s3BatchEvent) {
+ return S3BatchResponse.builder()
+ .withInvocationId(s3BatchEvent.getInvocationId())
+ .withInvocationSchemaVersion(s3BatchEvent.getInvocationSchemaVersion());
+ }
+}
diff --git a/aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/SecretsManagerRotationEvent.java b/aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/SecretsManagerRotationEvent.java
index 4634c5152..3e8df5bce 100644
--- a/aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/SecretsManagerRotationEvent.java
+++ b/aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/SecretsManagerRotationEvent.java
@@ -35,5 +35,6 @@ public class SecretsManagerRotationEvent {
private String step;
private String secretId;
private String clientRequestToken;
+ private String rotationToken;
}
diff --git a/aws-lambda-java-log4j2/README.md b/aws-lambda-java-log4j2/README.md
index b1b739b69..b906ee8f6 100644
--- a/aws-lambda-java-log4j2/README.md
+++ b/aws-lambda-java-log4j2/README.md
@@ -1,5 +1,7 @@
# Using log4j2 with AWS Lambda
+**IMPORTANT: The v1.6.3 release contained a regression (see [#612](https://github.com/aws/aws-lambda-java-libs/issues/612)) resulting in missing logs. Please upgrade to v1.6.4 or later. We apologize for the inconvenience.**
+
### 1. Pull in log4j2 dependencies
Example for Maven pom.xml
@@ -10,22 +12,22 @@ Example for Maven pom.xml
com.amazonaws
aws-lambda-java-log4j2
- 1.6.0
+ 1.6.5
org.apache.logging.log4j
log4j-core
- 2.17.1
+ 2.25.5
org.apache.logging.log4j
log4j-api
- 2.17.1
+ 2.25.5
org.apache.logging.log4j
log4j-layout-template-json
- 2.17.1
+ 2.25.5
....
@@ -39,7 +41,7 @@ If using maven shade plugin, set the plugin configuration as follows
org.apache.maven.plugins
maven-shade-plugin
- 2.4.3
+ 3.6.1
package
@@ -73,7 +75,7 @@ If you are using the [John Rengelman](https://github.com/johnrengelman/shadow) G
dependencies{
...
- implementation group: 'com.amazonaws', name: 'aws-lambda-java-log4j2', version: '1.6.0'
+ implementation group: 'com.amazonaws', name: 'aws-lambda-java-log4j2', version: '1.6.5'
implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: log4jVersion
implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: log4jVersion
}
diff --git a/aws-lambda-java-log4j2/RELEASE.CHANGELOG.md b/aws-lambda-java-log4j2/RELEASE.CHANGELOG.md
index 49535d388..37e7a8760 100644
--- a/aws-lambda-java-log4j2/RELEASE.CHANGELOG.md
+++ b/aws-lambda-java-log4j2/RELEASE.CHANGELOG.md
@@ -1,3 +1,18 @@
+### May 19, 2026
+`1.6.5`:
+- Updated `log4j-core` and `log4j-api` dependencies to `2.25.5`
+
+`1.6.4`:
+- Fix regression in `1.6.3`
+
+### May 13, 2026
+`1.6.3`:
+- Updated `log4j-core` and `log4j-api` dependencies to `2.25.4`
+
+### February 2026
+`1.6.2`:
+- Updated `log4j-core` and `log4j-api` dependencies to `2.25.3`
+
### October 24, 2023
`1.6.0`:
- Log level and log format support
diff --git a/aws-lambda-java-log4j2/pom.xml b/aws-lambda-java-log4j2/pom.xml
index b33300ef2..d136612f7 100644
--- a/aws-lambda-java-log4j2/pom.xml
+++ b/aws-lambda-java-log4j2/pom.xml
@@ -5,7 +5,7 @@
com.amazonaws
aws-lambda-java-log4j2
- 1.6.0
+ 1.6.4-SNAPSHOT
jar
AWS Lambda Java Log4j 2.x Libraries
@@ -22,6 +22,9 @@
https://github.com/aws/aws-lambda-java-libs.git
+ scm:git:https://github.com/aws/aws-lambda-java-libs.git
+ scm:git:https://github.com/aws/aws-lambda-java-libs.git
+ HEAD
@@ -34,7 +37,8 @@
1.8
1.8
- 2.17.1
+ 2.25.5
+ 5.12.2
@@ -60,8 +64,61 @@
log4j-api
${log4j.version}
+
+ org.apache.logging.log4j
+ log4j-layout-template-json
+ ${log4j.version}
+ test
+
+
+ org.junit.jupiter
+ junit-jupiter-engine
+ ${junit-jupiter.version}
+ test
+
+
+
+
+ org.apache.maven.plugins
+ maven-release-plugin
+ 3.1.1
+
+ aws-lambda-java-log4j2-@{project.version}
+ true
+ release
+ deploy
+
+
+
+ org.apache.maven.plugins
+ maven-toolchains-plugin
+ 3.2.0
+
+
+
+
+ [1.8,9)
+
+
+
+
+
+
+ toolchain
+
+
+
+
+
+ maven-surefire-plugin
+ 3.5.2
+
+
+
+
dev
@@ -134,14 +191,13 @@
- org.sonatype.plugins
- nexus-staging-maven-plugin
- 1.6.3
+ org.sonatype.central
+ central-publishing-maven-plugin
+ 0.8.0
true
- sonatype-nexus-staging
- https://aws.oss.sonatype.org/
- false
+ central
+ false
diff --git a/aws-lambda-java-log4j2/src/test/java/com/amazonaws/services/lambda/runtime/log4j2/LambdaAppenderPluginTest.java b/aws-lambda-java-log4j2/src/test/java/com/amazonaws/services/lambda/runtime/log4j2/LambdaAppenderPluginTest.java
new file mode 100644
index 000000000..0bcd057a6
--- /dev/null
+++ b/aws-lambda-java-log4j2/src/test/java/com/amazonaws/services/lambda/runtime/log4j2/LambdaAppenderPluginTest.java
@@ -0,0 +1,86 @@
+/* Copyright 2026 Amazon.com, Inc. or its affiliates. All Rights Reserved. */
+
+package com.amazonaws.services.lambda.runtime.log4j2;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class LambdaAppenderPluginTest {
+
+ private final PrintStream originalOut = System.out;
+ private ByteArrayOutputStream captured;
+
+ @BeforeEach
+ void redirectStdout() throws UnsupportedEncodingException {
+ captured = new ByteArrayOutputStream();
+ System.setOut(new PrintStream(captured, true, StandardCharsets.UTF_8.name()));
+ }
+
+ @AfterEach
+ void restoreStdout() {
+ System.setOut(originalOut);
+ }
+
+ @Test
+ void lambdaAppenderEmitsLogsAtVariousLevels() throws UnsupportedEncodingException {
+ Logger logger = LogManager.getLogger(LambdaAppenderPluginTest.class);
+
+ logger.debug("debug-msg");
+ logger.info("info-msg");
+ logger.warn("warn-msg");
+ logger.error("error-msg");
+
+ String output = captured.toString(StandardCharsets.UTF_8.name());
+
+ // The PatternLayout in src/test/resources/log4j2.xml is "%-5p %c{1} - %m%n",
+ // so each event should appear as " LambdaAppenderPluginTest - ".
+ assertTrue(output.contains("DEBUG LambdaAppenderPluginTest - debug-msg"),
+ "expected DEBUG line in output but got:\n" + output);
+ assertTrue(output.contains("INFO LambdaAppenderPluginTest - info-msg"),
+ "expected INFO line in output but got:\n" + output);
+ assertTrue(output.contains("WARN LambdaAppenderPluginTest - warn-msg"),
+ "expected WARN line in output but got:\n" + output);
+ assertTrue(output.contains("ERROR LambdaAppenderPluginTest - error-msg"),
+ "expected ERROR line in output but got:\n" + output);
+
+ // Sanity check: log4j should not have fallen back to its default
+ // ConsoleAppender / status logger error message.
+ assertFalse(output.contains("ERROR StatusLogger"),
+ "log4j status logger reported an error, output was:\n" + output);
+ }
+
+ @Test
+ void lambdaAppenderEmitsJsonForJsonFormatLogger() throws UnsupportedEncodingException {
+ // The "json-test" logger is configured in src/test/resources/log4j2.xml
+ // with additivity=false to a second LambdaAppender using format="JSON"
+ // and JsonTemplateLayout backed by LambdaLayout.json.
+ Logger logger = LogManager.getLogger("json-test");
+
+ logger.info("json-info-msg");
+ logger.error("json-error-msg");
+
+ String output = captured.toString(StandardCharsets.UTF_8.name());
+
+ assertTrue(output.contains("json-info-msg"),
+ "expected json-info-msg in output but got:\n" + output);
+ assertTrue(output.contains("json-error-msg"),
+ "expected json-error-msg in output but got:\n" + output);
+
+ // Output should look like JSON, not the text PatternLayout from the
+ // root logger — so it must contain JSON field punctuation around the
+ // message rather than the "INFO json-test - ..." text pattern.
+ assertTrue(output.contains("\"message\":\"json-info-msg\""),
+ "expected JSON-encoded message field but got:\n" + output);
+ }
+}
diff --git a/aws-lambda-java-log4j2/src/test/resources/log4j2.xml b/aws-lambda-java-log4j2/src/test/resources/log4j2.xml
new file mode 100644
index 000000000..7b43094e2
--- /dev/null
+++ b/aws-lambda-java-log4j2/src/test/resources/log4j2.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+ %-5p %c{1} - %m%n
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/aws-lambda-java-runtime-interface-client/.gitignore b/aws-lambda-java-runtime-interface-client/.gitignore
index b1e77deb4..f6064106d 100644
--- a/aws-lambda-java-runtime-interface-client/.gitignore
+++ b/aws-lambda-java-runtime-interface-client/.gitignore
@@ -1,2 +1,5 @@
compile-flags.txt
ric-dev-environment/codeartifact-properties.mk
+
+# aws-lambda-cpp prebuilt lib + headers, fetched and staged at build time
+src/main/jni/deps/aws-lambda-cpp/
diff --git a/aws-lambda-java-runtime-interface-client/Dockerfile.rie b/aws-lambda-java-runtime-interface-client/Dockerfile.rie
new file mode 100644
index 000000000..66a01c834
--- /dev/null
+++ b/aws-lambda-java-runtime-interface-client/Dockerfile.rie
@@ -0,0 +1,8 @@
+FROM public.ecr.aws/lambda/java:21
+
+COPY target/aws-lambda-java-runtime-interface-client-*.jar ${LAMBDA_TASK_ROOT}/
+COPY target/aws-lambda-java-core-*.jar ${LAMBDA_TASK_ROOT}/
+COPY target/aws-lambda-java-serialization-*.jar ${LAMBDA_TASK_ROOT}/
+COPY test-handlers/EchoHandler.class ${LAMBDA_TASK_ROOT}/
+
+CMD ["EchoHandler::handleRequest"]
\ No newline at end of file
diff --git a/aws-lambda-java-runtime-interface-client/Makefile b/aws-lambda-java-runtime-interface-client/Makefile
index e57daf3a8..770671c07 100644
--- a/aws-lambda-java-runtime-interface-client/Makefile
+++ b/aws-lambda-java-runtime-interface-client/Makefile
@@ -4,6 +4,13 @@ ARCHITECTURE := $(shell arch)
ARCHITECTURE_ALIAS := $($(shell echo "$(ARCHITECTURE)_ALIAS"))
ARCHITECTURE_ALIAS := $(or $(ARCHITECTURE_ALIAS),amd64) # on any other archs defaulting to amd64
+# Java 8 does not support passing some args (such add --add-opens) so we need to clear them
+ifeq ($(IS_JAVA_8),true)
+ EXTRA_LOAD_ARG := -DargLineForReflectionTestOnly=""
+else
+ EXTRA_LOAD_ARG :=
+endif
+
# This optional module exports MAVEN_REPO_URL, MAVEN_REPO_USERNAME and MAVEN_REPO_PASSWORD environment variables
# making it possible to publish resulting artifacts to a codeartifact maven repository
-include ric-dev-environment/codeartifact-repo.mk
@@ -15,24 +22,38 @@ target:
.PHONY: test
test:
- mvn test
+ mvn test $(EXTRA_LOAD_ARG)
.PHONY: setup-codebuild-agent
setup-codebuild-agent:
- docker build -t codebuild-agent \
+ test/integration/codebuild-local/docker-retry.sh docker build --load -t codebuild-agent \
--build-arg ARCHITECTURE=$(ARCHITECTURE_ALIAS) \
- - < test/integration/codebuild-local/Dockerfile.agent
+ -f test/integration/codebuild-local/Dockerfile.agent \
+ test/integration/codebuild-local
+# Smoke tests are split per-architecture so CI can run each set on a native
+# runner. Running the linux/arm64/v8 combos under QEMU on an x86_64 host makes
+# `mvn install` recompile curl for aarch64 emulated, which takes ~30 minutes.
.PHONY: test-smoke
-test-smoke: setup-codebuild-agent
+test-smoke: test-smoke-x86_64 test-smoke-aarch64
+
+.PHONY: test-smoke-x86_64
+test-smoke-x86_64: setup-codebuild-agent
CODEBUILD_IMAGE_TAG=codebuild-agent test/integration/codebuild-local/test_one.sh test/integration/codebuild/buildspec.os.alpine.yml alpine 3.15 corretto11 linux/amd64
- CODEBUILD_IMAGE_TAG=codebuild-agent test/integration/codebuild-local/test_one.sh test/integration/codebuild/buildspec.os.alpine.yml alpine 3.15 corretto11 linux/arm64/v8
CODEBUILD_IMAGE_TAG=codebuild-agent test/integration/codebuild-local/test_one.sh test/integration/codebuild/buildspec.os.amazoncorretto.yml amazoncorretto amazoncorretto 11 linux/amd64
+
+.PHONY: test-smoke-aarch64
+test-smoke-aarch64: setup-codebuild-agent
+ CODEBUILD_IMAGE_TAG=codebuild-agent test/integration/codebuild-local/test_one.sh test/integration/codebuild/buildspec.os.alpine.yml alpine 3.15 corretto11 linux/arm64/v8
CODEBUILD_IMAGE_TAG=codebuild-agent test/integration/codebuild-local/test_one.sh test/integration/codebuild/buildspec.os.amazoncorretto.yml amazoncorretto amazoncorretto 11 linux/arm64/v8
+# BUILDSPEC can point to the buildspec directory (default, runs every OS) or to a
+# single buildspec file, which is how CI parallelizes the run across OSes.
+BUILDSPEC ?= test/integration/codebuild
+
.PHONY: test-integ
test-integ: setup-codebuild-agent
- CODEBUILD_IMAGE_TAG=codebuild-agent test/integration/codebuild-local/test_all.sh test/integration/codebuild
+ CODEBUILD_IMAGE_TAG=codebuild-agent test/integration/codebuild-local/test_all.sh $(BUILDSPEC)
# Command to run everytime you make changes to verify everything works
.PHONY: dev
@@ -42,13 +63,27 @@ dev: test
.PHONY: pr
pr: test test-smoke
+# Per-architecture PR checks so CI can run each on a native runner (no QEMU).
+.PHONY: pr-x86_64
+pr-x86_64: test test-smoke-x86_64
+
+.PHONY: pr-aarch64
+pr-aarch64: test test-smoke-aarch64
+
.PHONY: build
-build:
- mvn clean install
- mvn install -P linux-x86_64
- mvn install -P linux_musl-x86_64
- mvn install -P linux-aarch64
- mvn install -P linux_musl-aarch64
+build: build-x86_64 build-aarch64
+
+.PHONY: build-x86_64
+build-x86_64:
+ mvn clean install -DmultiArch=false $(EXTRA_LOAD_ARG)
+ mvn install -P linux-x86_64 $(EXTRA_LOAD_ARG)
+ mvn install -P linux_musl-x86_64 $(EXTRA_LOAD_ARG)
+
+.PHONY: build-aarch64
+build-aarch64:
+ mvn clean install -DmultiArch=false $(EXTRA_LOAD_ARG)
+ mvn install -P linux-aarch64 $(EXTRA_LOAD_ARG)
+ mvn install -P linux_musl-aarch64 $(EXTRA_LOAD_ARG)
.PHONY: publish
publish:
@@ -58,6 +93,10 @@ publish:
test-publish:
./ric-dev-environment/test-platform-specific-jar-snapshot.sh
+.PHONY: test-rie
+test-rie:
+ ./scripts/test-rie.sh "EchoHandler::handleRequest"
+
define HELP_MESSAGE
Usage: $ make [TARGETS]
@@ -67,5 +106,5 @@ TARGETS
dev Run all development tests after a change.
pr Perform all checks before submitting a Pull Request.
test Run the Unit tests.
-
+ test-rie Build and test RIC locally with Lambda Runtime Interface Emulator. (Requires building the project first)
endef
diff --git a/aws-lambda-java-runtime-interface-client/README.md b/aws-lambda-java-runtime-interface-client/README.md
index 13f8658f8..a49bf87b4 100644
--- a/aws-lambda-java-runtime-interface-client/README.md
+++ b/aws-lambda-java-runtime-interface-client/README.md
@@ -11,7 +11,7 @@ You can include this package in your preferred base image to make that base imag
### Creating a Docker Image for Lambda with the Runtime Interface Client
-Choose a preferred base image. The Runtime Interface Client is tested on Amazon Linux, Alpine, Ubuntu, Debian, and CentOS. The requirements are that the image is:
+Choose a preferred base image. The Runtime Interface Client is tested on Amazon Linux, Alpine, Ubuntu, and Debian. The requirements are that the image is:
* built for x86_64 and ARM64
* contains Java >= 8
@@ -70,7 +70,7 @@ pom.xml
com.amazonaws
aws-lambda-java-runtime-interface-client
- 2.5.0
+ 2.11.0
@@ -138,6 +138,49 @@ This command invokes the function running in the container image and returns a r
*Alternately, you can also include RIE as a part of your base image. See the AWS documentation on how to [Build RIE into your base image](https://docs.aws.amazon.com/lambda/latest/dg/images-test.html#images-test-alternative).*
+### Automated Local Testing
+
+For developers working on this runtime interface client, we provide an automated testing script that handles RIE setup, dependency management, and Docker orchestration.
+
+*Prerequisites:*
+- Build the project first: `mvn clean install`
+- Docker must be installed and running
+
+*To run automated tests:*
+
+```shell script
+make test-rie
+```
+
+This single command will:
+- Automatically download required dependencies (aws-lambda-java-core, aws-lambda-java-serialization)
+- Build a Docker image with RIE pre-installed
+- Compile and run a test Lambda function (EchoHandler)
+- Execute the function and validate the response
+- Clean up containers automatically
+
+The test uses a simple EchoHandler that returns the input event, making it easy to verify the runtime interface client is working correctly.
+
+## Test Coverage
+
+This project uses JaCoCo for code coverage analysis. To exclude classes from JaCoCo coverage, add them to the `jacoco-maven-plugin` configuration:
+
+```xml
+
+ org.jacoco
+ jacoco-maven-plugin
+
+
+ **/*Exception.class
+ **/dto/*.class
+ **/YourClassName.class
+
+
+
+```
+
+This project excludes by default: exceptions, interfaces, DTOs, constants, and runtime-only classes.
+
### Troubleshooting
While running integration tests, you might encounter the Docker Hub rate limit error with the following body:
@@ -160,7 +203,7 @@ platform-specific JAR by setting the ``.
com.amazonaws
aws-lambda-java-runtime-interface-client
- 2.5.0
+ 2.11.0
linux-x86_64
```
diff --git a/aws-lambda-java-runtime-interface-client/RELEASE.CHANGELOG.md b/aws-lambda-java-runtime-interface-client/RELEASE.CHANGELOG.md
index 1fefd0e23..97d177034 100644
--- a/aws-lambda-java-runtime-interface-client/RELEASE.CHANGELOG.md
+++ b/aws-lambda-java-runtime-interface-client/RELEASE.CHANGELOG.md
@@ -1,3 +1,69 @@
+### July 17, 2026
+`2.12.0`
+- Add `Lambda-Runtime-Invocation-Id` header support for cross-wiring protection. The RIC now echoes the invocation ID received from RAPID on `/next` back on `/response` and `/error`, enabling RAPID to detect and reject stale responses from timed-out invocations.
+
+### May 13, 2026
+`2.11.0`
+- Update aws-lambda-java-serialization dependency to 1.4.1
+
+### March 19, 2026
+`2.10.1`
+- Revert aws-lambda-java-serialization dependency to 1.2.0
+
+### March 12, 2026
+`2.10.0`
+- Update aws-lambda-java-serialization dependency to 1.3.0
+
+### March 12, 2026
+`2.9.0`
+- Update aws-lambda-java-serialization dependency to 1.2.0
+
+### September 22, 2025
+`2.8.7`
+- Remove Minimum and Maximum Limits of AWS_LAMBDA_MAX_CONCURRENCY.
+
+### September 22, 2025
+`2.8.6`
+- Set Multiconcurrent Trace ID using utils-lite.
+
+### September 17, 2025
+`2.8.5`
+- Log errorType and errorMessage from RAPID in C++ Client.
+- Performance Upgrade for Multiconcurrency Mode.
+
+### September 9, 2025
+`2.8.4`
+- Make Trace ID Accessible through Context Object.
+
+### July 19, 2025
+`2.8.3`
+- Ensure EventHandlerLoader Thread Safety.
+
+### June 26, 2025
+`2.8.2`
+- Allow AWS_LAMBDA_MAX_CONCURRENCY to be One. Crash the RIC if it is set to an un-parsable string to an integer or an out of bounds value.
+
+### June 26, 2025
+`2.8.1`
+- Refactoring
+
+### June 26, 2025
+`2.8.0`
+- Refactoring
+
+### May 21, 2025
+`2.7.0`
+- Adding support for multi tenancy ([#540](https://github.com/aws/aws-lambda-java-libs/pull/540))
+
+### August 7, 2024
+`2.6.0`
+- Runtime API client improvements: use Lambda-Runtime-Function-Error-Type for reporting errors in format "Runtime."
+
+### June 28, 2024
+`2.5.1`
+- Runtime API client improvements: fix a DNS cache issue
+- Runtime API client improvements: fix circular exception references causing stackOverflow
+
### March 20, 2024
`2.5.0`
- Runtime API client improvements ([#471](https://github.com/aws/aws-lambda-java-libs/pull/471))
diff --git a/aws-lambda-java-runtime-interface-client/build-tools/checkstyle.xml b/aws-lambda-java-runtime-interface-client/build-tools/checkstyle.xml
new file mode 100644
index 000000000..263834dc4
--- /dev/null
+++ b/aws-lambda-java-runtime-interface-client/build-tools/checkstyle.xml
@@ -0,0 +1,115 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/aws-lambda-java-runtime-interface-client/pom.xml b/aws-lambda-java-runtime-interface-client/pom.xml
index 29d20c8d8..6db41aa36 100644
--- a/aws-lambda-java-runtime-interface-client/pom.xml
+++ b/aws-lambda-java-runtime-interface-client/pom.xml
@@ -1,10 +1,10 @@
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
4.0.0
com.amazonaws
aws-lambda-java-runtime-interface-client
- 2.5.0
+ 2.12.0-SNAPSHOT
jar
AWS Lambda Java Runtime Interface Client
@@ -21,6 +21,9 @@
https://github.com/aws/aws-lambda-java-libs.git
+ scm:git:https://github.com/aws/aws-lambda-java-libs.git
+ scm:git:https://github.com/aws/aws-lambda-java-libs.git
+ HEAD
@@ -34,8 +37,12 @@
UTF-8
UTF-8
- 0.8.8
- 5.9.2
+ 0.8.12
+ 2.4
+ 3.1.1
+ 5.12.2
+ 3.4.0
+ 3.5.4
true
-
-
-
+
+
+
+
+ --add-opens java.base/java.net=ALL-UNNAMED
com.amazonaws
aws-lambda-java-core
- 1.2.3
+ 1.4.0
com.amazonaws
aws-lambda-java-serialization
- 1.1.2
+ 1.4.1
+
+
+ software.amazon.awssdk
+ utils-lite
+ 2.34.0
-
org.junit.jupiter
junit-jupiter-engine
@@ -79,6 +95,18 @@
4.11.0
test
+
+ org.mockito
+ mockito-junit-jupiter
+ 4.11.0
+ test
+
+
+ com.squareup.okhttp3
+ mockwebserver
+ 4.12.0
+ test
+
@@ -90,15 +118,65 @@
+
+ org.apache.maven.plugins
+ maven-release-plugin
+ 3.1.1
+
+ aws-lambda-java-runtime-interface-client-@{project.version}
+ true
+ release
+ deploy
+
+
+
+ org.apache.maven.plugins
+ maven-toolchains-plugin
+ 3.2.0
+
+
+
+
+ [1.8,9)
+
+
+
+
+
+
+ toolchain
+
+
+
+
+
+ maven-install-plugin
+ org.apache.maven.plugins
+ ${maven-install-plugin.version}
+
+
+ maven-deploy-plugin
+ org.apache.maven.plugins
+ ${maven-deploy-plugin.version}
+
maven-surefire-plugin
- 3.0.0-M9
+ ${maven-surefire-plugin.version}
+
+ ${argLineForReflectionTestOnly} ${argLine}
+
org.junit.jupiter
junit-jupiter-engine
${junit-jupiter.version}
+
+ org.junit.platform
+ junit-platform-launcher
+ 1.12.2
+
@@ -110,6 +188,24 @@
maven-antrun-plugin
1.7
+
+ build-jni-lib-for-tests
+ generate-test-sources
+
+ run
+
+
+
+
+
+
+
+
+
+
+
+
build-jni-lib
prepare-package
@@ -119,11 +215,11 @@
-
-
-
-
+ failonerror="true" logError="true">
+
+
+
+
@@ -163,6 +259,24 @@
org.jacoco
jacoco-maven-plugin
${jacoco.maven.plugin.version}
+
+
+
+ **/*Exception.class
+
+ **/Resource.class
+
+ **/dto/*.class
+
+ **/ReservedRuntimeEnvironmentVariables.class
+ **/RapidErrorType.class
+
+ **/FrameType.class
+ **/StructuredLogMessage.class
+
+ **/AWSLambda.class
+
+
default-prepare-agent
@@ -186,12 +300,12 @@
- PACKAGE
+ BUNDLE
LINE
COVEREDRATIO
- 0
+ 0.5
@@ -200,6 +314,26 @@
+
+ org.apache.maven.plugins
+ maven-checkstyle-plugin
+ ${maven-checkstyle-plugin.version}
+
+ build-tools/checkstyle.xml
+ true
+ true
+ true
+
+
+
+ validate
+ validate
+
+ check
+
+
+
+
@@ -276,16 +410,53 @@
- org.sonatype.plugins
- nexus-staging-maven-plugin
- 1.6.3
+ org.sonatype.central
+ central-publishing-maven-plugin
+ 0.8.0
true
- sonatype-nexus-staging
- https://aws.oss.sonatype.org/
- false
+ central
+ false
+
+ org.codehaus.mojo
+ build-helper-maven-plugin
+ 3.4.0
+
+
+ attach-platform-artifacts
+ package
+
+ attach-artifact
+
+
+
+
+ ${project.build.directory}/${project.build.finalName}-linux-x86_64.jar
+ jar
+ linux-x86_64
+
+
+ ${project.build.directory}/${project.build.finalName}-linux-aarch_64.jar
+ jar
+ linux-aarch_64
+
+
+ ${project.build.directory}/${project.build.finalName}-linux_musl-x86_64.jar
+ jar
+ linux_musl-x86_64
+
+
+ ${project.build.directory}/${project.build.finalName}-linux_musl-aarch_64.jar
+ jar
+ linux_musl-aarch_64
+
+
+
+
+
+
diff --git a/aws-lambda-java-runtime-interface-client/ric-dev-environment/publish_snapshot.sh b/aws-lambda-java-runtime-interface-client/ric-dev-environment/publish_snapshot.sh
index cf5969e1f..9d2f9837f 100755
--- a/aws-lambda-java-runtime-interface-client/ric-dev-environment/publish_snapshot.sh
+++ b/aws-lambda-java-runtime-interface-client/ric-dev-environment/publish_snapshot.sh
@@ -18,6 +18,10 @@ else
echo "Already -SNAPSHOT version"
fi
+# get the updated project version
+snapshotProjectVersion=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
+echo "Updated project version is ${snapshotProjectVersion}"
+
CLASSIFIERS_ARRAY=("linux-x86_64" "linux_musl-x86_64" "linux-aarch_64" "linux_musl-aarch_64")
for str in "${CLASSIFIERS_ARRAY[@]}"; do
@@ -36,7 +40,7 @@ mvn -B -X -P ci-repo \
-DgroupId=com.amazonaws \
-DartifactId=aws-lambda-java-runtime-interface-client \
-Dpackaging=jar \
- -Dversion=$projectVersion \
+ -Dversion=$snapshotProjectVersion \
-Dfile=./target/aws-lambda-java-runtime-interface-client-$projectVersion.jar \
-Dfiles=$FILES \
-Dclassifiers=$CLASSIFIERS \
diff --git a/aws-lambda-java-runtime-interface-client/scripts/test-rie.sh b/aws-lambda-java-runtime-interface-client/scripts/test-rie.sh
new file mode 100755
index 000000000..b69c967a1
--- /dev/null
+++ b/aws-lambda-java-runtime-interface-client/scripts/test-rie.sh
@@ -0,0 +1,46 @@
+#!/bin/bash
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+PROJECT_ROOT="$(dirname "$SCRIPT_DIR")"
+SERIALIZATION_ROOT="$(dirname "$PROJECT_ROOT")/aws-lambda-java-serialization"
+
+if ! ls "$PROJECT_ROOT"/target/aws-lambda-java-runtime-interface-client-*.jar >/dev/null 2>&1; then
+ echo "RIC jar not found. Please build the project first with 'mvn package'."
+ exit 1
+fi
+
+IMAGE_TAG="java-ric-rie-test"
+
+HANDLER="${1:-EchoHandler::handleRequest}"
+
+echo "Starting RIE test setup for Java..."
+
+# Build local dependencies if not present
+CORE_ROOT="$(dirname "$PROJECT_ROOT")/aws-lambda-java-core"
+if ! ls "$PROJECT_ROOT"/target/aws-lambda-java-core-*.jar >/dev/null 2>&1; then
+ echo "Building local aws-lambda-java-core..."
+ (cd "$CORE_ROOT" && mvn package -DskipTests)
+ cp "$CORE_ROOT"/target/aws-lambda-java-core-*.jar "$PROJECT_ROOT/target/"
+fi
+
+if ! ls "$PROJECT_ROOT"/target/aws-lambda-java-serialization-*.jar >/dev/null 2>&1; then
+ echo "Building local aws-lambda-java-serialization..."
+ (cd "$SERIALIZATION_ROOT" && mvn package -DskipTests)
+ cp "$SERIALIZATION_ROOT"/target/aws-lambda-java-serialization-*.jar "$PROJECT_ROOT/target/"
+fi
+
+echo "Compiling EchoHandler..."
+javac -source 21 -target 21 -cp "$(ls "$PROJECT_ROOT"/target/aws-lambda-java-runtime-interface-client-*.jar):$(ls "$PROJECT_ROOT"/target/aws-lambda-java-core-*.jar):$(ls "$PROJECT_ROOT"/target/aws-lambda-java-serialization-*.jar)" \
+ -d "$PROJECT_ROOT/test-handlers/" "$PROJECT_ROOT/test-handlers/EchoHandler.java"
+
+echo "Building test Docker image..."
+docker build -t "$IMAGE_TAG" -f "$PROJECT_ROOT/Dockerfile.rie" "$PROJECT_ROOT"
+
+echo "Starting test container on port 9000..."
+echo ""
+echo "In another terminal, invoke with:"
+echo "curl -s -X POST -H 'Content-Type: application/json' \"http://localhost:9000/2015-03-31/functions/function/invocations\" -d '{\"message\":\"test\"}'"
+echo ""
+
+exec docker run -it -p 9000:8080 -e _HANDLER="$HANDLER" "$IMAGE_TAG"
\ No newline at end of file
diff --git a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/crac/CheckpointException.java b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/crac/CheckpointException.java
index 8793bfcba..f802ad5f7 100644
--- a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/crac/CheckpointException.java
+++ b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/crac/CheckpointException.java
@@ -1,12 +1,12 @@
/*
- * Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- */
+Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+SPDX-License-Identifier: Apache-2.0
+*/
package com.amazonaws.services.lambda.crac;
public class CheckpointException extends Exception {
private static final long serialVersionUID = -4956873658083157585L;
public CheckpointException() {
- super();
}
}
diff --git a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/crac/Context.java b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/crac/Context.java
index 2fc22cdd6..d62ef0143 100644
--- a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/crac/Context.java
+++ b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/crac/Context.java
@@ -1,6 +1,7 @@
/*
- * Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- */
+Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+SPDX-License-Identifier: Apache-2.0
+*/
package com.amazonaws.services.lambda.crac;
diff --git a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/crac/ContextImpl.java b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/crac/ContextImpl.java
index ac4bc6480..04b1436a8 100644
--- a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/crac/ContextImpl.java
+++ b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/crac/ContextImpl.java
@@ -1,6 +1,7 @@
/*
- * Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- */
+Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+SPDX-License-Identifier: Apache-2.0
+*/
package com.amazonaws.services.lambda.crac;
@@ -23,25 +24,9 @@ public class ContextImpl extends Context {
@Override
public synchronized void beforeCheckpoint(Context context) throws CheckpointException {
-
- List exceptionsThrown = new ArrayList<>();
- for (Resource resource : getCheckpointQueueReverseOrderOfRegistration()) {
- try {
- resource.beforeCheckpoint(this);
- } catch (CheckpointException e) {
- Collections.addAll(exceptionsThrown, e.getSuppressed());
- } catch (Exception e) {
- exceptionsThrown.add(e);
- }
- }
-
- if (!exceptionsThrown.isEmpty()) {
- CheckpointException checkpointException = new CheckpointException();
- for (Throwable t : exceptionsThrown) {
- checkpointException.addSuppressed(t);
- }
- throw checkpointException;
- }
+ executeBeforeCheckpointHooks();
+ DNSManager.clearCache();
+ System.gc();
}
@Override
@@ -73,18 +58,39 @@ public synchronized void register(Resource resource) {
}
private List getCheckpointQueueReverseOrderOfRegistration() {
- return checkpointQueue.entrySet()
- .stream()
- .sorted((r1, r2) -> (int) (r2.getValue() - r1.getValue()))
- .map(Map.Entry::getKey)
- .collect(Collectors.toList());
+ return checkpointQueue.entrySet().
+ stream().
+ sorted((r1, r2) -> (int) (r2.getValue() - r1.getValue())).
+ map(Map.Entry::getKey).
+ collect(Collectors.toList());
}
private List getCheckpointQueueForwardOrderOfRegistration() {
- return checkpointQueue.entrySet()
- .stream()
- .sorted((r1, r2) -> (int) (r1.getValue() - r2.getValue()))
- .map(Map.Entry::getKey)
- .collect(Collectors.toList());
+ return checkpointQueue.entrySet().
+ stream().
+ sorted((r1, r2) -> (int) (r1.getValue() - r2.getValue())).
+ map(Map.Entry::getKey).
+ collect(Collectors.toList());
+ }
+
+ private void executeBeforeCheckpointHooks() throws CheckpointException {
+ List exceptionsThrown = new ArrayList<>();
+ for (Resource resource : getCheckpointQueueReverseOrderOfRegistration()) {
+ try {
+ resource.beforeCheckpoint(this);
+ } catch (CheckpointException e) {
+ Collections.addAll(exceptionsThrown, e.getSuppressed());
+ } catch (Exception e) {
+ exceptionsThrown.add(e);
+ }
+ }
+
+ if (!exceptionsThrown.isEmpty()) {
+ CheckpointException checkpointException = new CheckpointException();
+ for (Throwable t : exceptionsThrown) {
+ checkpointException.addSuppressed(t);
+ }
+ throw checkpointException;
+ }
}
}
diff --git a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/crac/Core.java b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/crac/Core.java
index b6a7d9e98..7e0b24a2d 100644
--- a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/crac/Core.java
+++ b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/crac/Core.java
@@ -1,6 +1,7 @@
/*
- * Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- */
+Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+SPDX-License-Identifier: Apache-2.0
+*/
package com.amazonaws.services.lambda.crac;
@@ -9,11 +10,11 @@
*/
public final class Core {
+ private static Context globalContext = new ContextImpl();
+
private Core() {
}
- private static Context globalContext = new ContextImpl();
-
public static Context getGlobalContext() {
return globalContext;
}
diff --git a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/crac/DNSManager.java b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/crac/DNSManager.java
new file mode 100644
index 000000000..6c485ec80
--- /dev/null
+++ b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/crac/DNSManager.java
@@ -0,0 +1,10 @@
+/*
+Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+SPDX-License-Identifier: Apache-2.0
+*/
+
+package com.amazonaws.services.lambda.crac;
+
+class DNSManager {
+ static native void clearCache();
+}
diff --git a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/crac/Resource.java b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/crac/Resource.java
index 8c8d91c37..7ef933202 100644
--- a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/crac/Resource.java
+++ b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/crac/Resource.java
@@ -1,6 +1,7 @@
/*
- * Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- */
+Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+SPDX-License-Identifier: Apache-2.0
+*/
package com.amazonaws.services.lambda.crac;
diff --git a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/crac/RestoreException.java b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/crac/RestoreException.java
index d045a0bad..cef38e00f 100644
--- a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/crac/RestoreException.java
+++ b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/crac/RestoreException.java
@@ -1,6 +1,7 @@
/*
- * Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- */
+Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+SPDX-License-Identifier: Apache-2.0
+*/
package com.amazonaws.services.lambda.crac;
@@ -8,6 +9,5 @@ public class RestoreException extends Exception {
private static final long serialVersionUID = -823900409868237860L;
public RestoreException() {
- super();
}
}
diff --git a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/AWSLambda.java b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/AWSLambda.java
index b7c5641a7..b9aa0fd11 100644
--- a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/AWSLambda.java
+++ b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/AWSLambda.java
@@ -2,6 +2,7 @@
Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
SPDX-License-Identifier: Apache-2.0
*/
+
package com.amazonaws.services.lambda.runtime.api.client;
import com.amazonaws.services.lambda.crac.Core;
@@ -11,19 +12,20 @@
import com.amazonaws.services.lambda.runtime.api.client.logging.LambdaContextLogger;
import com.amazonaws.services.lambda.runtime.api.client.logging.LogSink;
import com.amazonaws.services.lambda.runtime.api.client.logging.StdOutLogSink;
+import com.amazonaws.services.lambda.runtime.api.client.runtimeapi.LambdaError;
import com.amazonaws.services.lambda.runtime.api.client.runtimeapi.LambdaRuntimeApiClient;
import com.amazonaws.services.lambda.runtime.api.client.runtimeapi.LambdaRuntimeApiClientImpl;
+import com.amazonaws.services.lambda.runtime.api.client.runtimeapi.LambdaRuntimeClientMaxRetriesExceededException;
+import com.amazonaws.services.lambda.runtime.api.client.runtimeapi.RapidErrorType;
import com.amazonaws.services.lambda.runtime.api.client.runtimeapi.converters.LambdaErrorConverter;
import com.amazonaws.services.lambda.runtime.api.client.runtimeapi.converters.XRayErrorCauseConverter;
import com.amazonaws.services.lambda.runtime.api.client.runtimeapi.dto.InvocationRequest;
-import com.amazonaws.services.lambda.runtime.api.client.runtimeapi.dto.LambdaError;
-import com.amazonaws.services.lambda.runtime.api.client.runtimeapi.dto.XRayErrorCause;
+import com.amazonaws.services.lambda.runtime.api.client.util.ConcurrencyConfig;
import com.amazonaws.services.lambda.runtime.api.client.util.LambdaOutputStream;
import com.amazonaws.services.lambda.runtime.api.client.util.UnsafeUtil;
import com.amazonaws.services.lambda.runtime.logging.LogFormat;
import com.amazonaws.services.lambda.runtime.logging.LogLevel;
import com.amazonaws.services.lambda.runtime.serialization.util.ReflectUtil;
-
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileDescriptor;
@@ -35,7 +37,10 @@
import java.net.URLClassLoader;
import java.security.Security;
import java.util.Properties;
-
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+import software.amazon.awssdk.utilslite.SdkInternalThreadLocal;
/**
* The entrypoint of this class is {@link AWSLambda#startRuntime}. It performs two main tasks:
@@ -50,6 +55,8 @@
*/
public class AWSLambda {
+ private static URLClassLoader customerClassLoader;
+
private static final String TRUST_STORE_PROPERTY = "javax.net.ssl.trustStore";
private static final String JAVA_SECURITY_PROPERTIES = "java.security.properties";
@@ -68,10 +75,8 @@ public class AWSLambda {
private static final String AWS_LAMBDA_INITIALIZATION_TYPE = System.getenv(ReservedRuntimeEnvironmentVariables.AWS_LAMBDA_INITIALIZATION_TYPE);
- protected static URLClassLoader customerClassLoader;
-
- private static LambdaRuntimeApiClient runtimeClient;
-
+ private static final String CONCURRENT_TRACE_ID_KEY = "AWS_LAMBDA_X_TRACE_ID";
+
static {
// Override the disabledAlgorithms setting to match configuration for openjdk8-u181.
// This is to keep DES ciphers around while we deploying security updates.
@@ -138,7 +143,41 @@ private static LambdaRequestHandler findRequestHandler(final String handlerStrin
return requestHandler;
}
- public static void setupRuntimeLogger(LambdaLogger lambdaLogger)
+ private static LambdaRequestHandler getLambdaRequestHandlerObject(String handler, LambdaContextLogger lambdaLogger, LambdaRuntimeApiClient runtimeClient) throws ClassNotFoundException, IOException {
+ UnsafeUtil.disableIllegalAccessWarning();
+
+ System.setOut(new PrintStream(new LambdaOutputStream(System.out), false, "UTF-8"));
+ System.setErr(new PrintStream(new LambdaOutputStream(System.err), false, "UTF-8"));
+ setupRuntimeLogger(lambdaLogger);
+
+ String taskRoot = System.getProperty("user.dir");
+ String libRoot = "/opt/java";
+ // Make system classloader the customer classloader's parent to ensure any aws-lambda-java-core classes
+ // are loaded from the system classloader.
+ customerClassLoader = new CustomerClassLoader(taskRoot, libRoot, ClassLoader.getSystemClassLoader());
+ Thread.currentThread().setContextClassLoader(customerClassLoader);
+
+ // Load the user's handler
+ LambdaRequestHandler requestHandler = null;
+ try {
+ requestHandler = findRequestHandler(handler, customerClassLoader);
+ } catch (UserFault userFault) {
+ lambdaLogger.log(userFault.reportableError(), lambdaLogger.getLogFormat() == LogFormat.JSON ? LogLevel.ERROR : LogLevel.UNDEFINED);
+ LambdaError error = new LambdaError(
+ LambdaErrorConverter.fromUserFault(userFault),
+ RapidErrorType.BadFunctionCode);
+ runtimeClient.reportInitError(error);
+ System.exit(1);
+ }
+
+ if (INIT_TYPE_SNAP_START.equals(AWS_LAMBDA_INITIALIZATION_TYPE)) {
+ onInitComplete(lambdaLogger, runtimeClient);
+ }
+
+ return requestHandler;
+ }
+
+ private static void setupRuntimeLogger(LambdaLogger lambdaLogger)
throws ClassNotFoundException {
ReflectUtil.setStaticField(
Class.forName("com.amazonaws.services.lambda.runtime.LambdaRuntime"),
@@ -177,107 +216,150 @@ private static LogSink createLogSink() {
}
}
- public static void main(String[] args) {
- startRuntime(args[0]);
- }
-
- private static void startRuntime(String handler) {
- try (LogSink logSink = createLogSink()) {
- LambdaContextLogger logger = new LambdaContextLogger(
- logSink,
- LogLevel.fromString(LambdaEnvironment.LAMBDA_LOG_LEVEL),
- LogFormat.fromString(LambdaEnvironment.LAMBDA_LOG_FORMAT)
- );
- startRuntime(handler, logger);
- } catch (Throwable t) {
+ public static void main(String[] args) throws Throwable {
+ try (LambdaContextLogger lambdaLogger = initLogger()) {
+ LambdaRuntimeApiClient runtimeClient = new LambdaRuntimeApiClientImpl(LambdaEnvironment.RUNTIME_API);
+ LambdaRequestHandler lambdaRequestHandler = getLambdaRequestHandlerObject(args[0], lambdaLogger, runtimeClient);
+ ConcurrencyConfig concurrencyConfig = new ConcurrencyConfig(lambdaLogger);
+ startRuntimeLoops(lambdaRequestHandler, lambdaLogger, concurrencyConfig, runtimeClient);
+ } catch (IOException | ClassNotFoundException t) {
throw new Error(t);
}
}
- private static void startRuntime(String handler, LambdaContextLogger lambdaLogger) throws Throwable {
- UnsafeUtil.disableIllegalAccessWarning();
+ private static LambdaContextLogger initLogger() {
+ LogSink logSink = createLogSink();
+ LambdaContextLogger logger = new LambdaContextLogger(
+ logSink,
+ LogLevel.fromString(LambdaEnvironment.LAMBDA_LOG_LEVEL),
+ LogFormat.fromString(LambdaEnvironment.LAMBDA_LOG_FORMAT));
- System.setOut(new PrintStream(new LambdaOutputStream(System.out), false, "UTF-8"));
- System.setErr(new PrintStream(new LambdaOutputStream(System.err), false, "UTF-8"));
- setupRuntimeLogger(lambdaLogger);
+ return logger;
+ }
- runtimeClient = new LambdaRuntimeApiClientImpl(LambdaEnvironment.RUNTIME_API);
+ private static void startRuntimeLoopWithExecutor(LambdaRequestHandler lambdaRequestHandler, LambdaContextLogger lambdaLogger, ExecutorService executorService, LambdaRuntimeApiClient runtimeClient) {
+ executorService.submit(() -> {
+ try {
+ startRuntimeLoop(lambdaRequestHandler, lambdaLogger, runtimeClient, false);
+ } catch (Exception e) {
+ lambdaLogger.log(String.format("Runtime Loop on Thread ID: %s Failed.\n%s", Thread.currentThread().getName(), UserFault.trace(e)), lambdaLogger.getLogFormat() == LogFormat.JSON ? LogLevel.ERROR : LogLevel.UNDEFINED);
+ }
+ });
+ }
- String taskRoot = System.getProperty("user.dir");
- String libRoot = "/opt/java";
- // Make system classloader the customer classloader's parent to ensure any aws-lambda-java-core classes
- // are loaded from the system classloader.
- customerClassLoader = new CustomerClassLoader(taskRoot, libRoot, ClassLoader.getSystemClassLoader());
- Thread.currentThread().setContextClassLoader(customerClassLoader);
+ protected static void startRuntimeLoops(LambdaRequestHandler lambdaRequestHandler, LambdaContextLogger lambdaLogger, ConcurrencyConfig concurrencyConfig, LambdaRuntimeApiClient runtimeClient) throws Exception {
+ if (concurrencyConfig.isMultiConcurrent()) {
+ lambdaLogger.log(concurrencyConfig.getConcurrencyConfigMessage(), lambdaLogger.getLogFormat() == LogFormat.JSON ? LogLevel.INFO : LogLevel.UNDEFINED);
+ ExecutorService platformThreadExecutor = Executors.newFixedThreadPool(concurrencyConfig.getNumberOfPlatformThreads());
+ try {
+ for (int i = 0; i < concurrencyConfig.getNumberOfPlatformThreads(); i++) {
+ startRuntimeLoopWithExecutor(lambdaRequestHandler, lambdaLogger, platformThreadExecutor, runtimeClient);
+ }
+ } finally {
+ platformThreadExecutor.shutdown();
+ try {
+ platformThreadExecutor.awaitTermination(Long.MAX_VALUE, TimeUnit.DAYS);
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ }
+ }
+ } else {
+ startRuntimeLoop(lambdaRequestHandler, lambdaLogger, runtimeClient, true);
+ }
+ }
- // Load the user's handler
- LambdaRequestHandler requestHandler;
- try {
- requestHandler = findRequestHandler(handler, customerClassLoader);
- } catch (UserFault userFault) {
- lambdaLogger.log(userFault.reportableError(), lambdaLogger.getLogFormat() == LogFormat.JSON ? LogLevel.ERROR : LogLevel.UNDEFINED);
- LambdaError error = LambdaErrorConverter.fromUserFault(userFault);
- runtimeClient.reportInitError(error);
- System.exit(1);
- return;
+ private static LambdaError createLambdaErrorFromThrowableOrUserFault(Throwable t) {
+ if (t instanceof UserFault) {
+ return new LambdaError(
+ LambdaErrorConverter.fromUserFault((UserFault) t),
+ RapidErrorType.BadFunctionCode);
+ } else {
+ return new LambdaError(
+ LambdaErrorConverter.fromThrowable(t),
+ XRayErrorCauseConverter.fromThrowable(t),
+ RapidErrorType.UserException);
}
- if (INIT_TYPE_SNAP_START.equals(AWS_LAMBDA_INITIALIZATION_TYPE)) {
- onInitComplete(lambdaLogger);
+ }
+
+ private static void setEnvVarForXrayTraceId(InvocationRequest request) {
+ if (request.getXrayTraceId() != null) {
+ System.setProperty(LAMBDA_TRACE_HEADER_PROP, request.getXrayTraceId());
+ } else {
+ System.clearProperty(LAMBDA_TRACE_HEADER_PROP);
}
+ }
+
+ private static void reportNonLoopTerminatingException(LambdaContextLogger lambdaLogger, Throwable t) {
+ lambdaLogger.log(
+ String.format(
+ "Runtime Loop on Thread ID: %s Faced and Exception. This exception will not stop the runtime loop.\nException:\n%s",
+ Thread.currentThread().getName(), UserFault.trace(t)),
+ lambdaLogger.getLogFormat() == LogFormat.JSON ? LogLevel.ERROR : LogLevel.UNDEFINED);
+ }
+
+ /*
+ * In multiconcurrent mode (exitLoopOnErrors = false), The Runtime Loop will not exit unless LambdaRuntimeClientMaxRetriesExceededException is thrown when calling nextInvocationWithExponentialBackoff.
+ * In normal/sequential mode (exitLoopOnErrors = true), The Runtime Loop will exit if nextInvocation call fails, when UserFault is fatal, or an Error of type VirtualMachineError or IOError is thrown.
+ */
+ private static void startRuntimeLoop(LambdaRequestHandler lambdaRequestHandler, LambdaContextLogger lambdaLogger, LambdaRuntimeApiClient runtimeClient, boolean exitLoopOnErrors) throws Exception {
boolean shouldExit = false;
while (!shouldExit) {
- UserFault userFault = null;
- InvocationRequest request = runtimeClient.nextInvocation();
- if (request.getXrayTraceId() != null) {
- System.setProperty(LAMBDA_TRACE_HEADER_PROP, request.getXrayTraceId());
- } else {
- System.clearProperty(LAMBDA_TRACE_HEADER_PROP);
- }
-
- ByteArrayOutputStream payload;
try {
- payload = requestHandler.call(request);
- runtimeClient.reportInvocationSuccess(request.getId(), payload.toByteArray());
- boolean ignored = Thread.interrupted(); // clear interrupted flag in case if it was set by user's code
- } catch (UserFault f) {
- shouldExit = f.fatal;
- userFault = f;
- UserFault.filterStackTrace(f);
-
- LambdaError error = LambdaErrorConverter.fromUserFault(f);
- runtimeClient.reportInvocationError(request.getId(), error);
- } catch (Throwable t) {
- shouldExit = t instanceof VirtualMachineError || t instanceof IOError;
- UserFault.filterStackTrace(t);
- userFault = UserFault.makeUserFault(t);
+ UserFault userFault = null;
+ InvocationRequest request = exitLoopOnErrors ? runtimeClient.nextInvocation() : runtimeClient.nextInvocationWithExponentialBackoff(lambdaLogger);
+ if (exitLoopOnErrors) {
+ setEnvVarForXrayTraceId(request);
+ } else {
+ SdkInternalThreadLocal.put(CONCURRENT_TRACE_ID_KEY, request.getXrayTraceId());
+ }
- LambdaError error = LambdaErrorConverter.fromThrowable(t);
- XRayErrorCause xRayErrorCause = XRayErrorCauseConverter.fromThrowable(t);
- runtimeClient.reportInvocationError(request.getId(), error, xRayErrorCause);
- } finally {
- if (userFault != null) {
- lambdaLogger.log(userFault.reportableError(), lambdaLogger.getLogFormat() == LogFormat.JSON ? LogLevel.ERROR : LogLevel.UNDEFINED);
+ try {
+ ByteArrayOutputStream payload = lambdaRequestHandler.call(request);
+ runtimeClient.reportInvocationSuccess(request.getId(), payload.toByteArray(), request.getInvocationId());
+ // clear interrupted flag in case if it was set by user's code
+ Thread.interrupted();
+ } catch (Throwable t) {
+ UserFault.filterStackTrace(t);
+ userFault = UserFault.makeUserFault(t);
+ shouldExit = exitLoopOnErrors && (t instanceof VirtualMachineError || t instanceof IOError || userFault.fatal);
+ LambdaError error = createLambdaErrorFromThrowableOrUserFault(t);
+ runtimeClient.reportInvocationError(request.getId(), error, request.getInvocationId());
+ } finally {
+ if (userFault != null) {
+ lambdaLogger.log(userFault.reportableError(), lambdaLogger.getLogFormat() == LogFormat.JSON ? LogLevel.ERROR : LogLevel.UNDEFINED);
+ }
+
+ SdkInternalThreadLocal.remove(CONCURRENT_TRACE_ID_KEY);
+ }
+ } catch (Throwable t) {
+ if (exitLoopOnErrors || t instanceof LambdaRuntimeClientMaxRetriesExceededException) {
+ throw t;
}
+
+ reportNonLoopTerminatingException(lambdaLogger, t);
}
}
}
- static void onInitComplete(final LambdaContextLogger lambdaLogger) throws IOException {
+ private static void onInitComplete(final LambdaContextLogger lambdaLogger, LambdaRuntimeApiClient runtimeClient) throws IOException {
try {
Core.getGlobalContext().beforeCheckpoint(null);
runtimeClient.restoreNext();
} catch (Exception e1) {
logExceptionCloudWatch(lambdaLogger, e1);
- LambdaError error = LambdaErrorConverter.fromThrowable(e1);
- runtimeClient.reportInitError(error);
+ runtimeClient.reportInitError(new LambdaError(
+ LambdaErrorConverter.fromThrowable(e1),
+ RapidErrorType.BeforeCheckpointError));
System.exit(64);
}
+
try {
Core.getGlobalContext().afterRestore(null);
} catch (Exception restoreExc) {
logExceptionCloudWatch(lambdaLogger, restoreExc);
- LambdaError error = LambdaErrorConverter.fromThrowable(restoreExc);
- runtimeClient.reportRestoreError(error);
+ runtimeClient.reportRestoreError(new LambdaError(
+ LambdaErrorConverter.fromThrowable(restoreExc),
+ RapidErrorType.AfterRestoreError));
System.exit(64);
}
}
@@ -287,4 +369,8 @@ private static void logExceptionCloudWatch(LambdaContextLogger lambdaLogger, Exc
UserFault userFault = UserFault.makeUserFault(exc, true);
lambdaLogger.log(userFault.reportableError(), lambdaLogger.getLogFormat() == LogFormat.JSON ? LogLevel.ERROR : LogLevel.UNDEFINED);
}
+
+ protected static URLClassLoader getCustomerClassLoader() {
+ return customerClassLoader;
+ }
}
diff --git a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/ClasspathLoader.java b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/ClasspathLoader.java
index 28f11bbfd..4204f3010 100644
--- a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/ClasspathLoader.java
+++ b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/ClasspathLoader.java
@@ -1,4 +1,7 @@
-/* Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. */
+/*
+Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+SPDX-License-Identifier: Apache-2.0
+*/
package com.amazonaws.services.lambda.runtime.api.client;
diff --git a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/CustomerClassLoader.java b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/CustomerClassLoader.java
index ee554c148..b8aabbf37 100644
--- a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/CustomerClassLoader.java
+++ b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/CustomerClassLoader.java
@@ -1,4 +1,7 @@
-/* Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. */
+/*
+Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+SPDX-License-Identifier: Apache-2.0
+*/
package com.amazonaws.services.lambda.runtime.api.client;
@@ -24,7 +27,8 @@ class CustomerClassLoader extends URLClassLoader {
@Override
public boolean accept(File dir, String name) {
int offset = name.length() - 4;
- if (offset <= 0) { /* must be at least A.jar */
+ // must be at least A.jar
+ if (offset <= 0) {
return false;
} else {
return name.startsWith(".jar", offset);
diff --git a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/EventHandlerLoader.java b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/EventHandlerLoader.java
index 7c23be6e1..f679c217c 100644
--- a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/EventHandlerLoader.java
+++ b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/EventHandlerLoader.java
@@ -1,4 +1,7 @@
-/* Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. */
+/*
+Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+SPDX-License-Identifier: Apache-2.0
+*/
package com.amazonaws.services.lambda.runtime.api.client;
@@ -21,7 +24,6 @@
import com.amazonaws.services.lambda.runtime.serialization.factories.JacksonFactory;
import com.amazonaws.services.lambda.runtime.serialization.util.Functions;
import com.amazonaws.services.lambda.runtime.serialization.util.ReflectUtil;
-
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -42,8 +44,9 @@
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
-
-import static com.amazonaws.services.lambda.runtime.api.client.UserFault.*;
+import static com.amazonaws.services.lambda.runtime.api.client.UserFault.filterStackTrace;
+import static com.amazonaws.services.lambda.runtime.api.client.UserFault.makeUserFault;
+import static com.amazonaws.services.lambda.runtime.api.client.UserFault.trace;
public final class EventHandlerLoader {
private static final byte[] _JsonNull = new byte[]{'n', 'u', 'l', 'l'};
@@ -54,7 +57,41 @@ private enum Platform {
UNKNOWN
}
- private static final EnumMap>> typeCache = new EnumMap<>(Platform.class);
+ private static volatile ThreadLocal> contextSerializer = new ThreadLocal<>();
+ private static volatile ThreadLocal> cognitoSerializer = new ThreadLocal<>();
+
+ private static final ThreadLocal>>> typeCache = ThreadLocal.withInitial(() -> new EnumMap<>(Platform.class));
+
+ private static final Comparator methodPriority = new Comparator() {
+ public int compare(Method lhs, Method rhs) {
+
+ //1. Non bridge methods are preferred over bridge methods.
+ if (!lhs.isBridge() && rhs.isBridge()) {
+ return -1;
+ } else if (!rhs.isBridge() && lhs.isBridge()) {
+ return 1;
+ }
+
+ //2. We prefer longer signatures to shorter signatures. Except we count a method whose last argument is
+ //Context as having 1 more argument than it really does. This is a stupid thing to do, but we
+ //need to keep it for back compat reasons.
+ Class[] lParams = lhs.getParameterTypes();
+ Class[] rParams = rhs.getParameterTypes();
+
+ int lParamCompareLength = lParams.length;
+ int rParamCompareLength = rParams.length;
+
+ if (lastParameterIsContext(lParams)) {
+ ++lParamCompareLength;
+ }
+
+ if (lastParameterIsContext(rParams)) {
+ ++rParamCompareLength;
+ }
+
+ return -Integer.compare(lParamCompareLength, rParamCompareLength);
+ }
+ };
private EventHandlerLoader() {
}
@@ -79,7 +116,7 @@ private static PojoSerializer
+