GraalVM support

.github/workflows/aws-lambda-java-runtime-interface-client.yml

@@ -29,4 +29,3 @@ jobs:
     - name: Run 'pr' target
       working-directory: ./aws-lambda-java-runtime-interface-client
       run: make pr
-

.gitignore

@@ -21,4 +21,7 @@ dependency-reduced-pom.xml
 .gradle
 .settings
 .classpath
-.project
+.project
+
+#MacOS
+.DS_Store

aws-lambda-java-core/pom.xml

@@ -43,6 +43,15 @@
     </repository>
   </distributionManagement>
 
+  <dependencies>
+    <dependency>
+      <groupId>org.graalvm.sdk</groupId>
+      <artifactId>graal-sdk</artifactId>
+      <version>21.1.0</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+
   <profiles>
     <profile>
       <id>dev</id>

aws-lambda-java-core/src/main/java/com/amazonaws/services/lambda/runtime/graalvm/LambdaCoreGraalVMFeature.java

@@ -0,0 +1,59 @@
+package com.amazonaws.services.lambda.runtime.graalvm;
+
+import com.amazonaws.services.lambda.runtime.LambdaRuntime;
+import com.amazonaws.services.lambda.runtime.LambdaRuntimeInternal;
+import org.graalvm.nativeimage.hosted.Feature;
+import org.graalvm.nativeimage.hosted.RuntimeReflection;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * This class programmatically registers classes, methods and fields
+ * to be added to an application when used with GraalVM native-image.
+ *
+ * These specific classes are registered because GraalVM can't detect
+ * them during static analysis.
+ *
+ * @see <a href="https://www.graalvm.org/reference-manual/native-image/">GraalVM native-image</a>
+ */
+public class LambdaCoreGraalVMFeature implements Feature {
+
+    private static final Set<Class> classesForReflectConfig = new HashSet<>();
+
+    static {
+        classesForReflectConfig.add(LambdaRuntime.class);
+        classesForReflectConfig.add(LambdaRuntimeInternal.class);
+    }
+
+    @Override
+    public void beforeAnalysis(BeforeAnalysisAccess access) {
+        for (Class aClass : classesForReflectConfig) {
+            registerClass(aClass);
+            registerMethods(aClass);
+            registerFields(aClass);
+        }
+    }
+
+    private void registerMethods(Class<?> cl) {
+        for (Method method : cl.getDeclaredMethods()) {
+            RuntimeReflection.register(method);
+        }
+    }
+
+    private void registerFields(Class<?> cl) {
+        for (Field field : cl.getDeclaredFields()) {
+            RuntimeReflection.register(field);
+        }
+    }
+
+    private void registerClass(Class<?> cl) {
+        RuntimeReflection.register(cl);
+        for (Constructor<?> constructor : cl.getDeclaredConstructors()) {
+            RuntimeReflection.register(constructor);
+        }
+    }
+}

aws-lambda-java-core/src/main/resources/META-INF/native-image/com/amazonaws/aws-lambda-java-core/native-image.properties

@@ -0,0 +1 @@
+Args = --features=com.amazonaws.services.lambda.runtime.graalvm.LambdaCoreGraalVMFeature

aws-lambda-java-core/src/main/resources/META-INF/native-image/com/amazonaws/aws-lambda-java-core/reflect-config.json

@@ -0,0 +1,13 @@
+[
+{
+  "name":"com.amazonaws.services.lambda.runtime.LambdaRuntime",
+  "methods":[{"name":"<init>","parameterTypes":[] }],
+  "fields":[{"name":"logger"}],
+  "allPublicMethods":true
+},
+{
+  "name":"com.amazonaws.services.lambda.runtime.LambdaRuntimeInternal",
+  "methods":[{"name":"<init>","parameterTypes":[] }],
+  "allPublicMethods":true
+}
+]

aws-lambda-java-events/pom.xml

@@ -50,6 +50,13 @@
       <version>2.6</version>
     </dependency>
 
+    <dependency>
+      <groupId>org.graalvm.sdk</groupId>
+      <artifactId>graal-sdk</artifactId>
+      <version>21.1.0</version>
+      <scope>provided</scope>
+    </dependency>
+
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-engine</artifactId>
@@ -68,6 +75,12 @@
       <version>2.22.0</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>io.github.classgraph</groupId>
+      <artifactId>classgraph</artifactId>
+      <version>4.8.110</version>
+      <scope>test</scope>
+    </dependency>
 
     <dependency>
       <groupId>org.projectlombok</groupId>

aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/graalvm/LambdaEventsGraalVMFeature.java

@@ -0,0 +1,107 @@
+package com.amazonaws.services.lambda.runtime.graalvm;
+
+import org.graalvm.nativeimage.hosted.Feature;
+import org.graalvm.nativeimage.hosted.RuntimeReflection;
+
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.List;
+
+/**
+ * The aws-lambda-java-events library supports GraalVM by containing a reflect-config.json file. This is located
+ * src/main/resources/META-INF/native-image/com.amazonaws/aws-lambda-java-events/reflect-config.json
+ *
+ * This config is used by the GraalVM native-image tool in order to load the required classes and methods into the
+ * native binary it creates.
+ *
+ * Any event or response class added to this library needs to be added to this config file.
+ *
+ * This implementation of Feature does that by iterating through the events package and registering
+ * them for runtime reflection.
+ */
+public class LambdaEventsGraalVMFeature implements Feature {
+
+    public static final String EVENTS_PACKAGE_NAME = "com.amazonaws.services.lambda.runtime.events";
+
+    public static List<Class<?>> getClasses(String packageName)
+            throws ClassNotFoundException, IOException {
+        ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+        assert classLoader != null;
+        String path = packageName.replace('.', '/');
+        Enumeration<URL> resources = classLoader.getResources(path);
+        List<File> dirs = new ArrayList<>();
+        while (resources.hasMoreElements()) {
+            URL resource = resources.nextElement();
+            dirs.add(new File(resource.getFile()));
+        }
+        ArrayList<Class<?>> classes = new ArrayList<>();
+        for (File directory : dirs) {
+            classes.addAll(findClasses(directory, packageName));
+        }
+        return classes;
+    }
+
+    private static List<Class<?>> findClasses(File directory, String packageName) throws ClassNotFoundException {
+        List<Class<?>> classes = new ArrayList<>();
+        if (!directory.exists()) {
+            return classes;
+        }
+        File[] files = directory.listFiles();
+        if(files == null){
+            return classes;
+        }
+        for (File file : files) {
+            String fileName = file.getName();
+            if (file.isDirectory()) {
+                assert !fileName.contains(".");
+                classes.addAll(findClasses(file, packageName + "." + fileName));
+            } else if (fileName.endsWith(".class")) {
+                classes.add(Class.forName(packageName + '.' + fileName.substring(0, fileName.length() - ".class".length())));
+            }
+        }
+        return classes;
+    }
+
+    @Override
+    public void beforeAnalysis(BeforeAnalysisAccess access) {
+        try {
+            List<Class<?>> classes = getClasses(EVENTS_PACKAGE_NAME);
+            for (Class<?> cl : classes) {
+                System.out.println("Registering class:"+cl.getName());
+                registerClass(cl);
+                registerMethods(cl);
+                registerFields(cl);
+            }
+        } catch (ClassNotFoundException | IOException e) {
+            e.printStackTrace();
+            System.err.println("Failed to automatically load classes from "+ LambdaEventsGraalVMFeature.class.getName());
+            System.exit(1);
+        }
+    }
+
+    private void registerMethods(Class<?> cl) {
+        for (Method method : cl.getDeclaredMethods()) {
+            RuntimeReflection.register(method);
+        }
+    }
+
+    private void registerFields(Class<?> cl) {
+        for (Field field : cl.getDeclaredFields()) {
+            RuntimeReflection.register(field);
+        }
+    }
+
+    private void registerClass(Class<?> cl) {
+        RuntimeReflection.register(cl);
+        for (Constructor<?> constructor : cl.getDeclaredConstructors()) {
+            RuntimeReflection.register(constructor);
+        }
+        System.out.printf("\tAdding constructors for %s%n", cl.getName());
+    }
+}

aws-lambda-java-events/src/main/resources/META-INF/native-image/com.amazonaws/aws-lambda-java-events/native-image.properties

@@ -0,0 +1,3 @@
+Args = --enable-all-security-services \
+--enable-url-protocols=http,https \
+--features=com.amazonaws.services.lambda.runtime.graalvm.LambdaEventsGraalVMFeature

aws-lambda-java-events/src/test/java/com/amazonaws/services/lambda/runtime/events/graalvm/LambdaEventsGraalVMFeatureTest.java

@@ -0,0 +1,43 @@
+package com.amazonaws.services.lambda.runtime.events.graalvm;
+
+import com.amazonaws.services.lambda.runtime.graalvm.LambdaEventsGraalVMFeature;
+import io.github.classgraph.ClassGraph;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.DynamicTest;
+import org.junit.jupiter.api.TestFactory;
+
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.stream.Stream;
+
+import static com.amazonaws.services.lambda.runtime.graalvm.LambdaEventsGraalVMFeature.EVENTS_PACKAGE_NAME;
+
+/**
+ * The aws-lambda-java-events library supports GraalVM by containing a reflect-config.json file. This is located
+ * src/main/resources/META-INF/native-image/com.amazonaws/aws-lambda-java-events/reflect-config.json
+ *
+ * This config is used by the GraalVM native-image tool in order to load the required classes and methods into the
+ * native binary it creates.
+ *
+ * Any event or response class added to this library needs to be added to this config file.
+ *
+ * This test asserts that all the classes are included.
+ */
+public class LambdaEventsGraalVMFeatureTest {
+
+    @TestFactory
+    public Stream<DynamicTest> testEventClassesAreFound() throws IOException, ClassNotFoundException {
+
+        Set<Class<?>> eventClassNames = new HashSet<>(LambdaEventsGraalVMFeature.getClasses(EVENTS_PACKAGE_NAME));
+
+        return new ClassGraph()
+                .enableClassInfo()
+                .acceptPackages(EVENTS_PACKAGE_NAME)
+                .scan().getAllClasses().stream()
+                .map(classInfo -> DynamicTest.dynamicTest("Test " + classInfo.getSimpleName(), () -> {
+                    Class<?> eventClass = classInfo.loadClass();
+                    Assertions.assertTrue(eventClassNames.contains(eventClass));
+                }));
+    }
+}

aws-lambda-java-runtime-interface-client/.gitignore

@@ -1 +1,2 @@
 compile-flags.txt
+codebuild.*

aws-lambda-java-runtime-interface-client/Makefile

@@ -5,7 +5,7 @@ target:
 
 .PHONY: test
 test:
-	mvn test
+	mvn test -q
 
 .PHONY: setup-codebuild-agent
 setup-codebuild-agent:
@@ -16,6 +16,11 @@ test-smoke: setup-codebuild-agent
 	CODEBUILD_IMAGE_TAG=codebuild-agent test/integration/codebuild-local/test_one.sh test/integration/codebuild/buildspec.os.alpine.yml alpine 3.12 corretto11
 	CODEBUILD_IMAGE_TAG=codebuild-agent test/integration/codebuild-local/test_one.sh test/integration/codebuild/buildspec.os.amazoncorretto.yml amazoncorretto amazoncorretto 11
 
+.PHONY: test-graalvm
+test-graalvm:
+	docker build --progress=plain -t codebuild-agent - < test/integration/codebuild-local/Dockerfile.graalvm-agent
+	CODEBUILD_IMAGE_TAG=codebuild-agent test/integration/codebuild-local/test_one.sh test/integration/codebuild-graalvm/buildspec.os.amazoncorretto.yml amazoncorretto amazoncorretto 11
+
 .PHONY: test-integ
 test-integ: setup-codebuild-agent
 	CODEBUILD_IMAGE_TAG=codebuild-agent test/integration/codebuild-local/test_all.sh test/integration/codebuild
@@ -30,7 +35,7 @@ pr: test test-smoke
 
 .PHONY: build
 build: 
-	mvn clean install
+	mvn clean install -q
 
 define HELP_MESSAGE