feat(v2): Add GraalVM reachability metadata for core utilities

examples/powertools-examples-core-utilities/sam-graalvm/README.md

@@ -11,19 +11,19 @@ This file defines the Lambda function to be deployed as well as API Gateway for
  - Set the environment to use GraalVM
 
 ```shell 
-      export JAVA_HOME=<path to GraalVM>
-````
+export JAVA_HOME=<path to GraalVM>
+```
 
 ## Build the sample application
 
 - Build the Docker image that will be used as the environment for SAM build:
 ```shell
-       docker build --platform linux/amd64 . -t powertools-examples-core-sam-graalvm
+docker build --platform linux/amd64 . -t powertools-examples-core-sam-graalvm
 ```
 
 - Build the SAM project using the docker image
 ```shell
-    sam build --use-container --build-image powertools-examples-core-sam-graalvm
+sam build --use-container --build-image powertools-examples-core-sam-graalvm
 
 ```
 #### [Optional] Building with -SNAPSHOT versions of PowerTools

pom.xml

@@ -67,7 +67,7 @@
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
         <maven.deploy.plugin.version>3.1.2</maven.deploy.plugin.version>
-        <log4j.version>2.24.0</log4j.version>
+        <log4j.version>2.24.3</log4j.version>
         <slf4j.version>2.0.7</slf4j.version>
         <jackson.version>2.17.2</jackson.version>
         <aws.sdk.version>2.28.1</aws.sdk.version>

powertools-common/pom.xml

@@ -56,6 +56,11 @@
             <artifactId>junit-jupiter-engine</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.junit-pioneer</groupId>
+            <artifactId>junit-pioneer</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
@@ -90,7 +95,10 @@
                         <artifactId>maven-surefire-plugin</artifactId>
                         <version>3.2.3</version>
                         <configuration>
-                            <argLine>-Dmockito.mock.maker=subclass -Dorg.graalvm.nativeimage.imagecode=agent -agentlib:native-image-agent=config-output-dir=src/main/resources/META-INF/native-image/software.amazon.lambda/powertools-common,experimental-class-define-support</argLine>
+                            <argLine>-Dmockito.mock.maker=subclass -Dorg.graalvm.nativeimage.imagecode=agent -agentlib:native-image-agent=config-output-dir=src/main/resources/META-INF/native-image/software.amazon.lambda/powertools-common,experimental-class-define-support
+                                --add-opens java.base/java.util=ALL-UNNAMED
+                                --add-opens java.base/java.lang=ALL-UNNAMED
+                            </argLine>
                         </configuration>
                     </plugin>
                 </plugins>
@@ -123,20 +131,16 @@
                             </execution>
                         </executions>
                         <configuration>
-                            <agent>
-                                <enabled>true</enabled>
-                                <defaultMode>Standard</defaultMode>
-                            </agent>
                             <imageName>powertools-common</imageName>
                             <buildArgs>
+                                <buildArg>--add-opens java.base/java.util=ALL-UNNAMED</buildArg>
+                                <buildArg>--add-opens java.base/java.lang=ALL-UNNAMED</buildArg>
                                 <buildArg>--no-fallback</buildArg>
                                 <buildArg>-Dorg.graalvm.nativeimage.imagecode=agent</buildArg>
                                 <buildArg>-H:ClassInitialization=net.bytebuddy.ClassFileVersion:rerun</buildArg>
                                 <buildArg>-H:ClassInitialization=net.bytebuddy.utility.dispatcher.JavaDispatcher:rerun</buildArg>
                                 <buildArg>-H:ClassInitialization=net.bytebuddy.utility.Invoker$Dispatcher:rerun</buildArg>
                                 <buildArg>-H:ClassInitialization=net.bytebuddy.utility.GraalImageCode:rerun</buildArg>
-                                <buildArg>-H:IncludeResources=version.properties</buildArg>
-                                <buildArg>-H:IncludeResources=unreadable.properties</buildArg>
                                 <buildArg>--initialize-at-build-time=org.slf4j.simple.SimpleLogger</buildArg>
                                 <buildArg>--initialize-at-build-time=org.slf4j.LoggerFactory</buildArg>
                                 <buildArg>--initialize-at-build-time=org.junit.Ignore</buildArg>

powertools-common/src/main/java/software/amazon/lambda/powertools/common/internal/UserAgentConfigurator.java

@@ -16,9 +16,8 @@
 
 import static software.amazon.lambda.powertools.common.internal.SystemWrapper.getenv;
 
-import java.io.FileInputStream;
 import java.io.IOException;
-import java.net.URL;
+import java.io.InputStream;
 import java.util.Properties;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -66,11 +65,12 @@ static String getProjectVersion() {
      */
     static String getVersionFromProperties(String propertyFileName, String versionKey) {
 
-        URL propertiesFileURI = Thread.currentThread().getContextClassLoader().getResource(propertyFileName);
-        if (propertiesFileURI != null) {
-            try (FileInputStream fis = new FileInputStream(propertiesFileURI.getPath())) {
+        InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(propertyFileName);
+
+        if (is != null) {
+            try {
                 Properties properties = new Properties();
-                properties.load(fis);
+                properties.load(is);
                 String version = properties.getProperty(versionKey);
                 if (version != null && !version.isEmpty()) {
                     return version;

powertools-common/src/main/resources/META-INF/native-image/software.amazon.lambda/powertools-common/reflect-config.json

@@ -59,6 +59,10 @@
   "queryAllDeclaredConstructors":true,
   "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"clone","parameterTypes":[] }, {"name":"getClass","parameterTypes":[] }, {"name":"toString","parameterTypes":[] }]
 },
+{
+  "name":"java.lang.ProcessEnvironment",
+  "fields":[{"name":"theCaseInsensitiveEnvironment"}, {"name":"theEnvironment"}]
+},
 {
   "name":"java.lang.ProcessHandle",
   "methods":[{"name":"current","parameterTypes":[] }, {"name":"pid","parameterTypes":[] }]
@@ -132,6 +136,10 @@
   "name":"java.security.AccessController",
   "methods":[{"name":"doPrivileged","parameterTypes":["java.security.PrivilegedAction"] }, {"name":"doPrivileged","parameterTypes":["java.security.PrivilegedExceptionAction"] }]
 },
+{
+  "name":"java.util.Collections$UnmodifiableMap",
+  "fields":[{"name":"m"}]
+},
 {
   "name":"java.util.concurrent.ForkJoinTask",
   "fields":[{"name":"aux"}, {"name":"status"}]

powertools-common/src/test/java/software/amazon/lambda/powertools/common/internal/LambdaHandlerProcessorTest.java

@@ -17,9 +17,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.mockStatic;
 import static org.mockito.Mockito.when;
-import static software.amazon.lambda.powertools.common.internal.SystemWrapper.getenv;
 
 import com.amazonaws.services.lambda.runtime.Context;
 import com.amazonaws.services.lambda.runtime.RequestHandler;
@@ -30,7 +28,8 @@
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.Signature;
 import org.junit.jupiter.api.Test;
-import org.mockito.MockedStatic;
+import org.junitpioneer.jupiter.ClearEnvironmentVariable;
+import org.junitpioneer.jupiter.SetEnvironmentVariable;
 
 class LambdaHandlerProcessorTest {
 
@@ -139,27 +138,23 @@ void placedOnStreamHandler_shouldInvalidateOnTypeOfArgs_invalidContextArg() {
     }
 
     @Test
+    @SetEnvironmentVariable(key = LambdaConstants.X_AMZN_TRACE_ID, value = "Root=1-5759e988-bd862e3fe1be46a994272793;Parent=53995c3f42cd8ad8;Sampled=1\"")
     void getXrayTraceId_present() {
         String traceID = "Root=1-5759e988-bd862e3fe1be46a994272793;Parent=53995c3f42cd8ad8;Sampled=1\"";
-        try (MockedStatic<SystemWrapper> mockedSystemWrapper = mockStatic(SystemWrapper.class)) {
-            mockedSystemWrapper.when(() -> getenv(LambdaConstants.X_AMZN_TRACE_ID)).thenReturn(traceID);
 
-            Optional xRayTraceId = LambdaHandlerProcessor.getXrayTraceId();
+        Optional xRayTraceId = LambdaHandlerProcessor.getXrayTraceId();
 
-            assertThat(xRayTraceId.isPresent()).isTrue();
-            assertThat(traceID.split(";")[0].replace(LambdaConstants.ROOT_EQUALS, "")).isEqualTo(xRayTraceId.get());
-        }
+        assertThat(xRayTraceId.isPresent()).isTrue();
+        assertThat(traceID.split(";")[0].replace(LambdaConstants.ROOT_EQUALS, "")).isEqualTo(xRayTraceId.get());
     }
 
     @Test
+    @ClearEnvironmentVariable(key = LambdaConstants.X_AMZN_TRACE_ID)
     void getXrayTraceId_notPresent() {
-        try (MockedStatic<SystemWrapper> mockedSystemWrapper = mockStatic(SystemWrapper.class)) {
-            mockedSystemWrapper.when(() -> getenv(LambdaConstants.X_AMZN_TRACE_ID)).thenReturn(null);
 
-            boolean isXRayTraceIdPresent = LambdaHandlerProcessor.getXrayTraceId().isPresent();
+        boolean isXRayTraceIdPresent = LambdaHandlerProcessor.getXrayTraceId().isPresent();
 
-            assertThat(isXRayTraceIdPresent).isFalse();
-        }
+        assertThat(isXRayTraceIdPresent).isFalse();
     }
 
     @Test
@@ -209,37 +204,28 @@ void isColdStart_coldStartDone() {
     }
 
     @Test
+    @SetEnvironmentVariable(key = LambdaConstants.AWS_SAM_LOCAL, value = "true")
     void isSamLocal() {
-        try (MockedStatic<SystemWrapper> mockedSystemWrapper = mockStatic(SystemWrapper.class)) {
-            mockedSystemWrapper.when(() -> getenv(LambdaConstants.AWS_SAM_LOCAL)).thenReturn("true");
 
-            boolean isSamLocal = LambdaHandlerProcessor.isSamLocal();
+        boolean isSamLocal = LambdaHandlerProcessor.isSamLocal();
 
-            assertThat(isSamLocal).isTrue();
-        }
+        assertThat(isSamLocal).isTrue();
     }
 
     @Test
+    @SetEnvironmentVariable(key = LambdaConstants.POWERTOOLS_SERVICE_NAME, value = "MyService")
     void serviceName() {
-        try (MockedStatic<SystemWrapper> mockedSystemWrapper = mockStatic(SystemWrapper.class)) {
-            String expectedServiceName = "MyService";
-            mockedSystemWrapper.when(() -> getenv(LambdaConstants.POWERTOOLS_SERVICE_NAME))
-                    .thenReturn(expectedServiceName);
+        String expectedServiceName = "MyService";
+        String actualServiceName = LambdaHandlerProcessor.serviceName();
 
-            String actualServiceName = LambdaHandlerProcessor.serviceName();
-
-            assertThat(actualServiceName).isEqualTo(expectedServiceName);
-        }
+        assertThat(actualServiceName).isEqualTo(expectedServiceName);
     }
 
     @Test
+    @ClearEnvironmentVariable(key = LambdaConstants.POWERTOOLS_SERVICE_NAME)
     void serviceName_Undefined() {
         LambdaHandlerProcessor.resetServiceName();
-        try (MockedStatic<SystemWrapper> mockedSystemWrapper = mockStatic(SystemWrapper.class)) {
-            mockedSystemWrapper.when(() -> getenv(LambdaConstants.POWERTOOLS_SERVICE_NAME)).thenReturn(null);
-
-            assertThat(LambdaHandlerProcessor.serviceName()).isEqualTo(LambdaConstants.SERVICE_UNDEFINED);
-        }
+        assertThat(LambdaHandlerProcessor.serviceName()).isEqualTo(LambdaConstants.SERVICE_UNDEFINED);
     }
 
     private ProceedingJoinPoint mockRequestHandlerPjp(Class handlerClass, Object[] handlerArgs) {

powertools-common/src/test/java/software/amazon/lambda/powertools/common/internal/UserAgentConfiguratorTest.java

@@ -15,19 +15,16 @@
 package software.amazon.lambda.powertools.common.internal;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mockStatic;
 import static software.amazon.lambda.powertools.common.internal.UserAgentConfigurator.AWS_EXECUTION_ENV;
 import static software.amazon.lambda.powertools.common.internal.UserAgentConfigurator.VERSION_KEY;
 import static software.amazon.lambda.powertools.common.internal.UserAgentConfigurator.VERSION_PROPERTIES_FILENAME;
 import static software.amazon.lambda.powertools.common.internal.UserAgentConfigurator.getVersionFromProperties;
-import static software.amazon.lambda.powertools.common.internal.SystemWrapper.getenv;
-
 
 import java.io.File;
 import java.util.Objects;
 import java.util.regex.Pattern;
 import org.junit.jupiter.api.Test;
-import org.mockito.MockedStatic;
+import org.junitpioneer.jupiter.SetEnvironmentVariable;
 
 class UserAgentConfiguratorTest {
 
@@ -110,15 +107,13 @@ void testGetUserAgent_NullFeature() {
     }
 
     @Test
+    @SetEnvironmentVariable(key = AWS_EXECUTION_ENV, value = "AWS_Lambda_java8")
     void testGetUserAgent_SetAWSExecutionEnv() {
-        try (MockedStatic<SystemWrapper> mockedSystemWrapper = mockStatic(SystemWrapper.class)) {
-            mockedSystemWrapper.when(() -> getenv(AWS_EXECUTION_ENV)).thenReturn("AWS_Lambda_java8");
-            String userAgent = UserAgentConfigurator.getUserAgent("test-feature");
-
-            assertThat(userAgent)
-                    .isNotNull()
-                    .isEqualTo("PT/test-feature/" + VERSION + " PTEnv/AWS_Lambda_java8");
-        }
+        String userAgent = UserAgentConfigurator.getUserAgent("test-feature");
+
+        assertThat(userAgent)
+                .isNotNull()
+                .isEqualTo("PT/test-feature/" + VERSION + " PTEnv/AWS_Lambda_java8");
     }
 
 }

powertools-logging/pom.xml

@@ -67,6 +67,11 @@
             <artifactId>junit-jupiter-engine</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.junit-pioneer</groupId>
+            <artifactId>junit-pioneer</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
@@ -116,7 +121,10 @@
                         <artifactId>maven-surefire-plugin</artifactId>
                         <version>3.2.3</version>
                         <configuration>
-                            <argLine>-Dmockito.mock.maker=subclass -Dorg.graalvm.nativeimage.imagecode=agent -agentlib:native-image-agent=config-output-dir=src/main/resources/META-INF/native-image/software.amazon.lambda/powertools-logging,experimental-class-define-support</argLine>
+                            <argLine>-Dmockito.mock.maker=subclass -Dorg.graalvm.nativeimage.imagecode=agent -agentlib:native-image-agent=config-output-dir=src/main/resources/META-INF/native-image/software.amazon.lambda/powertools-logging,experimental-class-define-support
+                                --add-opens java.base/java.util=ALL-UNNAMED
+                                --add-opens java.base/java.lang=ALL-UNNAMED
+                            </argLine>
                         </configuration>
                     </plugin>
                 </plugins>
@@ -149,12 +157,10 @@
                             </execution>
                         </executions>
                         <configuration>
-                            <agent>
-                                <enabled>true</enabled>
-                                <defaultMode>Standard</defaultMode>
-                            </agent>
                             <imageName>powertools-logging</imageName>
                             <buildArgs>
+                                <buildArg>--add-opens java.base/java.util=ALL-UNNAMED</buildArg>
+                                <buildArg>--add-opens java.base/java.lang=ALL-UNNAMED</buildArg>
                                 <buildArg>--no-fallback</buildArg>
                                 <buildArg>-Dorg.graalvm.nativeimage.imagecode=agent</buildArg>
                                 <buildArg>-H:ClassInitialization=net.bytebuddy.ClassFileVersion:rerun</buildArg>

powertools-logging/powertools-logging-log4j/pom.xml

@@ -51,6 +51,11 @@
             <artifactId>junit-jupiter-engine</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.junit-pioneer</groupId>
+            <artifactId>junit-pioneer</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
@@ -100,7 +105,10 @@
                         <artifactId>maven-surefire-plugin</artifactId>
                         <version>3.2.3</version>
                         <configuration>
-                            <argLine>-Dmockito.mock.maker=subclass -Dorg.graalvm.nativeimage.imagecode=agent -agentlib:native-image-agent=config-output-dir=src/main/resources/META-INF/native-image/software.amazon.lambda/powertools-logging-log4j,experimental-class-define-support</argLine>
+                            <argLine>-Dmockito.mock.maker=subclass -Dorg.graalvm.nativeimage.imagecode=agent -agentlib:native-image-agent=config-output-dir=src/main/resources/META-INF/native-image/software.amazon.lambda/powertools-logging-log4j,experimental-class-define-support
+                                --add-opens java.base/java.util=ALL-UNNAMED
+                                --add-opens java.base/java.lang=ALL-UNNAMED
+                            </argLine>
                         </configuration>
                     </plugin>
                 </plugins>
@@ -133,12 +141,10 @@
                             </execution>
                         </executions>
                         <configuration>
-                            <agent>
-                                <enabled>true</enabled>
-                                <defaultMode>Standard</defaultMode>
-                            </agent>
                             <imageName>powertools-logging-log4j</imageName>
                             <buildArgs>
+                                <buildArg>--add-opens java.base/java.util=ALL-UNNAMED</buildArg>
+                                <buildArg>--add-opens java.base/java.lang=ALL-UNNAMED</buildArg>
                                 <buildArg>--no-fallback</buildArg>
                                 <buildArg>-Dorg.graalvm.nativeimage.imagecode=agent</buildArg>
                                 <buildArg>-H:ClassInitialization=net.bytebuddy.ClassFileVersion:rerun</buildArg>

powertools-logging/powertools-logging-log4j/src/main/resources/META-INF/native-image/software.amazon.lambda/powertools-logging-log4j/reflect-config.json

@@ -107,6 +107,10 @@
   "queryAllDeclaredConstructors":true,
   "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"clone","parameterTypes":[] }, {"name":"getClass","parameterTypes":[] }, {"name":"toString","parameterTypes":[] }]
 },
+{
+  "name":"java.lang.ProcessEnvironment",
+  "fields":[{"name":"theCaseInsensitiveEnvironment"}, {"name":"theEnvironment"}]
+},
 {
   "name":"java.lang.ProcessHandle",
   "methods":[{"name":"current","parameterTypes":[] }, {"name":"pid","parameterTypes":[] }]
@@ -198,6 +202,10 @@
 {
   "name":"java.sql.Time"
 },
+{
+  "name":"java.util.Collections$UnmodifiableMap",
+  "fields":[{"name":"m"}]
+},
 {
   "name":"java.util.concurrent.ForkJoinTask",
   "fields":[{"name":"aux"}, {"name":"status"}]
@@ -1120,15 +1128,6 @@
   "queryAllDeclaredMethods":true,
   "methods":[{"name":"getInstance","parameterTypes":[] }]
 },
-{
-  "name":"org.apache.logging.log4j.layout.template.json.resolver.PowertoolsResolverTest",
-  "allDeclaredFields":true,
-  "allDeclaredClasses":true,
-  "queryAllDeclaredMethods":true,
-  "queryAllPublicMethods":true,
-  "queryAllDeclaredConstructors":true,
-  "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"shouldResolveAccountId","parameterTypes":[] }, {"name":"shouldResolveColdStart","parameterTypes":[] }, {"name":"shouldResolveFunctionStringInfo","parameterTypes":["software.amazon.lambda.powertools.logging.internal.PowertoolsLoggedFields"] }, {"name":"shouldResolveMemorySize","parameterTypes":[] }, {"name":"shouldResolveSamplingRate","parameterTypes":[] }, {"name":"unknownField_shouldThrowException","parameterTypes":[] }]
-},
 {
   "name":"org.apache.logging.log4j.layout.template.json.resolver.SourceResolverFactory",
   "queryAllDeclaredMethods":true,