bump aws-lambda-java-runtime-interface-client to 2.5.1

Author: sigpwned

lambda-exec-wrapper.sh

@@ -19,12 +19,37 @@
 #   com.amazonaws.services.lambda.runtime.api.client.AWSLambda
 #   com.sigpwned.lambdainternals.App::handleRequest
 
+# Example Java17 CLI a/o Oct 2024:
+# /var/lang/bin/java
+#   -XX:MaxHeapSize=445645k
+#   -javaagent:/var/runtime/lib/Log4jHotPatch.jar=log4jFixerVerbose=false
+#   -XX:+UseSerialGC
+#   -Xshare:on
+#   -XX:SharedArchiveFile=/var/lang/lib/server/runtime.jsa
+#   -XX:+TieredCompilation
+#   -XX:TieredStopAtLevel=1
+#   --add-opens=java.base/java.io=ALL-UNNAMED
+#   -Dorg.crac.Core.Compat=com.amazonaws.services.lambda.crac
+#   -XX:+ErrorFileToStderr
+#   -Dcom.amazonaws.services.lambda.runtime.api.client.runtimeapi.NativeClient.JNI=/var/runtime/lib/jni/libaws-lambda-jni.linux-x86_64.so
+#   -classpath
+#   /var/runtime/lib/aws-lambda-java-core-1.2.3.jar:/var/runtime/lib/aws-lambda-java-runtime-interface-client-2.5.1-linux-x86_64.jar:/var/runtime/lib/aws-lambda-java-serialization-1.1.5.jar
+#   com.amazonaws.services.lambda.runtime.api.client.AWSLambda
+#   com.sigpwned.lambdainternals.App::handleRequest
+
+# To check or update the above command line, run the lambdainternals Lambda
+# Function in AWS account product-humangraphics-prod (382363607278). That
+# implementation comes from the following GitHub repo:
+# https://github.com/sigpwned/the-lambda-iceberg-dissecting-the-official-java-runtimes  
+
 # Dump our env
 env 
 
 # Unpack our tmpdump, if we have one
+# Remember, /opt/humangraphics is where this custom layer ("humangraphics")
+# be unpacked.
 pushd /tmp
-/var/lang/bin/java -classpath /var/runtime/lib/aws-lambda-java-core-1.2.3.jar:/var/runtime/lib/aws-lambda-java-runtime-interface-client-2.5.0-linux-x86_64.jar:/var/runtime/lib/aws-lambda-java-serialization-1.1.5.jar:/opt/humangraphics io.humangraphics.backend.lambda.TmpDump "s3://$HUMANGRAPHICS_BUCKET/tmpdump/$AWS_LAMBDA_FUNCTION_NAME.zip"
+/var/lang/bin/java -classpath /var/runtime/lib/aws-lambda-java-core-1.2.3.jar:/var/runtime/lib/aws-lambda-java-runtime-interface-client-2.5.1-linux-x86_64.jar:/var/runtime/lib/aws-lambda-java-serialization-1.1.5.jar:/opt/humangraphics io.humangraphics.backend.lambda.TmpDump "s3://$HUMANGRAPHICS_BUCKET/tmpdump/$AWS_LAMBDA_FUNCTION_NAME.zip"
 popd
 
 # Grab our args
@@ -36,15 +61,14 @@ do
   if [ ${ARGS[$i]} = "-classpath" ]
   then
     # Add /var/task, /opt/humangraphics to the classpath so ServiceLoader works
+    #
+    # Reading the original AWSLambda suggests that we should add /opt/java too.
+    # Consulting CustomerClassLoader indicates we ACTUALLY need to add all JARs
+    # in /var/task/lib and /opt/java/lib.
+    #
+    # Checking the actual lambda container reveals there are no such JARs. So,
+    # the below will do.
     ARGS[$i+1]="${ARGS[$i+1]}:/var/task:/opt/humangraphics"
-  elif [ ${ARGS[$i]} = "-XX:+TieredCompilation" ]
-  then
-    # We actually do NOT want tiered compilation, thank you
-    ARGS[$i]="-XX:-TieredCompilation"
-  elif [ ${ARGS[$i]} = "-XX:TieredStopAtLevel=1" ]
-  then
-    # We don't want this, so skip it.
-    continue
   elif [ ${ARGS[$i]} = "com.amazonaws.services.lambda.runtime.api.client.AWSLambda" ]
   then
     # We want our entry point, not theirs, thank you

pom.xml

@@ -73,14 +73,14 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-compress</artifactId>
-            <version>1.24.0</version>
+            <version>1.27.1</version>
         </dependency>
         <!-- These are all provided by the lambda container: -->
         <!-- https://docs.aws.amazon.com/lambda/latest/dg/lambda-java.html -->
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-lambda-java-runtime-interface-client</artifactId>
-            <version>2.5.0</version>
+            <version>2.5.1</version>
             <scope>provided</scope>
         </dependency>
         <!-- For testing -->

src/main/java/io/humangraphics/backend/lambda/thirdparty/com/amazonaws/services/lambda/runtime/api/client/AWSLambda.java

@@ -27,13 +27,13 @@
 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.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.LambdaOutputStream;
 import com.amazonaws.services.lambda.runtime.api.client.util.UnsafeUtil;
 import com.amazonaws.services.lambda.runtime.logging.LogFormat;
@@ -54,6 +54,8 @@
  */
 public class AWSLambda {
 
+  protected static ClassLoader customerClassLoader;
+
   private static final String TRUST_STORE_PROPERTY = "javax.net.ssl.trustStore";
 
   private static final String JAVA_SECURITY_PROPERTIES = "java.security.properties";
@@ -75,8 +77,6 @@ public class AWSLambda {
   private static final String AWS_LAMBDA_INITIALIZATION_TYPE =
       System.getenv(ReservedRuntimeEnvironmentVariables.AWS_LAMBDA_INITIALIZATION_TYPE);
 
-  protected static ClassLoader customerClassLoader;
-
   private static LambdaRuntimeApiClient runtimeClient;
 
   static {
@@ -218,16 +218,13 @@ private static void startRuntime(String handler, LambdaContextLogger lambdaLogge
     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.
-
-
-    // aboothe 20240620 just use the system class loader. This allows us to load code from the
-    // ServiceLoader, which we otherwise could not do using the custom class loader.
+    // classes are loaded from the system classloader.
     //
     // customerClassLoader =
     // new CustomerClassLoader(taskRoot, libRoot, ClassLoader.getSystemClassLoader());
-    //
+
+    // aboothe 20240620 just use the system class loader. This allows us to load code from the
+    // ServiceLoader, which we otherwise could not do using the custom class loader.
     customerClassLoader = ClassLoader.getSystemClassLoader();
 
     Thread.currentThread().setContextClassLoader(customerClassLoader);
@@ -239,7 +236,8 @@ private static void startRuntime(String handler, LambdaContextLogger lambdaLogge
     } catch (UserFault userFault) {
       lambdaLogger.log(userFault.reportableError(),
           lambdaLogger.getLogFormat() == LogFormat.JSON ? LogLevel.ERROR : LogLevel.UNDEFINED);
-      LambdaError error = LambdaErrorConverter.fromUserFault(userFault);
+      LambdaError error = new LambdaError(LambdaErrorConverter.fromUserFault(userFault),
+          RapidErrorType.BadFunctionCode);
       runtimeClient.reportInitError(error);
       System.exit(1);
       return;
@@ -261,23 +259,23 @@ private static void startRuntime(String handler, LambdaContextLogger lambdaLogge
       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
+        // clear interrupted flag in case if it was set by user's code
+        boolean ignored = Thread.interrupted();
       } catch (UserFault f) {
         shouldExit = f.fatal;
         userFault = f;
         UserFault.filterStackTrace(f);
-
-        LambdaError error = LambdaErrorConverter.fromUserFault(f);
+        LambdaError error =
+            new LambdaError(LambdaErrorConverter.fromUserFault(f), RapidErrorType.BadFunctionCode);
         runtimeClient.reportInvocationError(request.getId(), error);
       } catch (Throwable t) {
         shouldExit = t instanceof VirtualMachineError || t instanceof IOError;
         UserFault.filterStackTrace(t);
         userFault = UserFault.makeUserFault(t);
 
-        LambdaError error = LambdaErrorConverter.fromThrowable(t);
-        XRayErrorCause xRayErrorCause = XRayErrorCauseConverter.fromThrowable(t);
-        runtimeClient.reportInvocationError(request.getId(), error, xRayErrorCause);
+        LambdaError error = new LambdaError(LambdaErrorConverter.fromThrowable(t),
+            XRayErrorCauseConverter.fromThrowable(t), RapidErrorType.UserException);
+        runtimeClient.reportInvocationError(request.getId(), error);
       } finally {
         if (userFault != null) {
           lambdaLogger.log(userFault.reportableError(),
@@ -293,16 +291,16 @@ static void onInitComplete(final LambdaContextLogger lambdaLogger) throws IOExce
       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);
     }
   }