From c7bf725edf288673d033ea52e774f6a3ca705f5b Mon Sep 17 00:00:00 2001 From: Michael Ennen Date: Wed, 7 Apr 2021 13:21:03 -0700 Subject: [PATCH] Set AWS_EXECUTION_ENV to mimic AWS's default java lambda runtime. This makes things like Codeguru Profiler work, see: https://github.com/aws-samples/aws-codeguru-profiler-demo-application/issues/20 --- src/main/groovy/DeployRuntime.groovy | 1 + src/main/java/com/dow/aws/lambda/Bootstrap.java | 3 +++ 2 files changed, 4 insertions(+) diff --git a/src/main/groovy/DeployRuntime.groovy b/src/main/groovy/DeployRuntime.groovy index 26ccfa1..eac21ee 100644 --- a/src/main/groovy/DeployRuntime.groovy +++ b/src/main/groovy/DeployRuntime.groovy @@ -315,6 +315,7 @@ else archiveArg="-XX:SharedArchiveFile" fi JLINK_VM_OPTIONS="$archiveArg=$dynamicArchive -XX:+UseCompressedOops -XX:+UseG1GC -XX:+UseCompressedClassPointers -Xshare:on -Xlog:cds=warning" +export AWS_EXECUTION_ENV=AWS_Lambda_java11 ''') generatedLauncherScript.newWriter().withWriter {w -> w << newText} diff --git a/src/main/java/com/dow/aws/lambda/Bootstrap.java b/src/main/java/com/dow/aws/lambda/Bootstrap.java index eb48aad..3914e30 100644 --- a/src/main/java/com/dow/aws/lambda/Bootstrap.java +++ b/src/main/java/com/dow/aws/lambda/Bootstrap.java @@ -7,6 +7,7 @@ import java.io.File; import java.io.IOException; import java.io.InputStream; +import java.lang.reflect.Field; import java.lang.reflect.Method; import java.net.MalformedURLException; import java.net.URI; @@ -19,7 +20,9 @@ import java.text.MessageFormat; import java.util.ArrayList; import java.util.Collections; +import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.function.Function; import static com.dow.aws.lambda.Bootstrap.ThrowingFunction.unchecked;