Skip to content

Commit cbf9330

Browse files
committed
Simplify GraalVM config for powertools-metrics, powertools-serialization, powertools-tracing.
1 parent 572f2bf commit cbf9330

3 files changed

Lines changed: 17 additions & 27 deletions

File tree

powertools-metrics/pom.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,8 @@
128128
<groupId>org.apache.maven.plugins</groupId>
129129
<artifactId>maven-surefire-plugin</artifactId>
130130
<configuration>
131-
<argLine>-Xlog:class+load=info:classesloaded.txt
131+
<argLine>
132+
-Xlog:class+load=info:classesloaded.txt
132133
--add-opens java.base/java.util=ALL-UNNAMED
133134
--add-opens java.base/java.lang=ALL-UNNAMED
134135
</argLine>
@@ -145,7 +146,8 @@
145146
<groupId>org.apache.maven.plugins</groupId>
146147
<artifactId>maven-surefire-plugin</artifactId>
147148
<configuration>
148-
<argLine>-Dorg.graalvm.nativeimage.imagecode=agent
149+
<argLine>
150+
-Dorg.graalvm.nativeimage.imagecode=agent
149151
-agentlib:native-image-agent=config-output-dir=src/main/resources/META-INF/native-image/software.amazon.lambda/powertools-metrics,experimental-class-define-support
150152
--add-opens java.base/java.util=ALL-UNNAMED
151153
--add-opens java.base/java.lang=ALL-UNNAMED
@@ -179,13 +181,11 @@
179181
<buildArg>--add-opens java.base/java.util=ALL-UNNAMED</buildArg>
180182
<buildArg>--add-opens java.base/java.lang=ALL-UNNAMED</buildArg>
181183
<buildArg>--no-fallback</buildArg>
182-
<buildArg>-Dorg.graalvm.nativeimage.imagecode=agent</buildArg>
183-
<buildArg>--initialize-at-build-time=org.slf4j.simple.SimpleLogger</buildArg>
184-
<buildArg>--initialize-at-build-time=org.slf4j.LoggerFactory</buildArg>
185-
<buildArg>--initialize-at-build-time=org.junit.Ignore</buildArg>
186-
<buildArg>--initialize-at-build-time=java.lang.annotation.Annotation</buildArg>
187-
<buildArg>--initialize-at-build-time=org.junit.runners.model.FrameworkField</buildArg>
188184
<buildArg>--verbose</buildArg>
185+
<buildArg>--native-image-info</buildArg>
186+
<buildArg>-H:+UnlockExperimentalVMOptions</buildArg>
187+
<buildArg>-H:Log=registerResource:5</buildArg>
188+
<buildArg>-H:+ReportExceptionStackTraces</buildArg>
189189
</buildArgs>
190190
</configuration>
191191
</plugin>

powertools-serialization/pom.xml

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -132,20 +132,16 @@
132132
</execution>
133133
</executions>
134134
<configuration>
135-
<agent>
136-
<enabled>true</enabled>
137-
<defaultMode>Standard</defaultMode>
138-
</agent>
139135
<imageName>powertools-serialization</imageName>
140136
<buildArgs>
137+
<buildArg>--add-opens java.base/java.util=ALL-UNNAMED</buildArg>
138+
<buildArg>--add-opens java.base/java.lang=ALL-UNNAMED</buildArg>
141139
<buildArg>--no-fallback</buildArg>
142-
<buildArg>-Dorg.graalvm.nativeimage.imagecode=agent</buildArg>
143-
<buildArg>--initialize-at-build-time=org.slf4j.simple.SimpleLogger</buildArg>
144-
<buildArg>--initialize-at-build-time=org.slf4j.LoggerFactory</buildArg>
145-
<buildArg>--initialize-at-build-time=org.junit.Ignore</buildArg>
146-
<buildArg>--initialize-at-build-time=java.lang.annotation.Annotation</buildArg>
147-
<buildArg>--initialize-at-build-time=org.junit.runners.model.FrameworkField</buildArg>
148140
<buildArg>--verbose</buildArg>
141+
<buildArg>--native-image-info</buildArg>
142+
<buildArg>-H:+UnlockExperimentalVMOptions</buildArg>
143+
<buildArg>-H:Log=registerResource:5</buildArg>
144+
<buildArg>-H:+ReportExceptionStackTraces</buildArg>
149145
</buildArgs>
150146
</configuration>
151147
</plugin>

powertools-tracing/pom.xml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,8 @@
130130
<artifactId>maven-surefire-plugin</artifactId>
131131
<version>3.5.3</version>
132132
<configuration>
133-
<argLine>-Dorg.graalvm.nativeimage.imagecode=agent
133+
<argLine>
134+
-Dorg.graalvm.nativeimage.imagecode=agent
134135
-agentlib:native-image-agent=config-output-dir=src/main/resources/META-INF/native-image/software.amazon.lambda/powertools-tracing,experimental-class-define-support
135136
--add-opens java.base/java.util=ALL-UNNAMED
136137
--add-opens java.base/java.lang=ALL-UNNAMED
@@ -165,18 +166,11 @@
165166
<buildArg>--add-opens java.base/java.lang=ALL-UNNAMED</buildArg>
166167
<buildArg>--enable-url-protocols=http</buildArg>
167168
<buildArg>--no-fallback</buildArg>
168-
<buildArg>-Dorg.graalvm.nativeimage.imagecode=agent</buildArg>
169-
<buildArg>-H:IncludeResources=version.properties</buildArg>
170-
<buildArg>-H:IncludeResources=unreadable.properties</buildArg>
171-
<buildArg>--initialize-at-build-time=org.slf4j.simple.SimpleLogger</buildArg>
172-
<buildArg>--initialize-at-build-time=org.slf4j.LoggerFactory</buildArg>
173-
<buildArg>--initialize-at-build-time=org.junit.Ignore</buildArg>
174-
<buildArg>--initialize-at-build-time=java.lang.annotation.Annotation</buildArg>
175-
<buildArg>--initialize-at-build-time=org.junit.runners.model.FrameworkField</buildArg>
176169
<buildArg>--verbose</buildArg>
177170
<buildArg>--native-image-info</buildArg>
178171
<buildArg>-H:+UnlockExperimentalVMOptions</buildArg>
179172
<buildArg>-H:Log=registerResource:5</buildArg>
173+
<buildArg>-H:+ReportExceptionStackTraces</buildArg>
180174
</buildArgs>
181175
</configuration>
182176
</plugin>

0 commit comments

Comments
 (0)