Skip to content

Move invokedynamic and log4j isThreadContextMapInheritable from jvm.options to code #18296

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Oct 15, 2025
Merged

Move invokedynamic and log4j isThreadContextMapInheritable from jvm.options to code #18296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
14f3c4d
Set jruby.compile.invokedynamic, log4j2.isThreadContextMapInheritable…
estolfo Oct 9, 2025
561b5f0
Add invokedynamic to build.gradle settings
estolfo Oct 9, 2025
c3cd48b
Java 11 is no longer supported so don't test for it
estolfo Oct 9, 2025
2030954
Update build.gradle
estolfo Oct 10, 2025
852f97a
test not including log4j setting in build.gradle
estolfo Oct 10, 2025
94e72d6
Revert "test not including log4j setting in build.gradle"
estolfo Oct 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,8 @@ allprojects {
tasks.withType(Test) {
// Add Exports to enable tests to run in JDK17
jvmArgs = [
"-Djruby.compile.invokedynamic=true",
"-Dlog4j2.isThreadContextMapInheritable=true",
"--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
"--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED",
"--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED",
Expand Down
6 changes: 0 additions & 6 deletions config/jvm.options
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,6 @@
# use our provided JNA always versus the system one
#-Djna.nosys=true

# Turn on JRuby invokedynamic
-Djruby.compile.invokedynamic=true

## heap dumps

# generate a heap dump when an allocation from the Java heap fails
Expand All @@ -60,9 +57,6 @@
# Entropy source for randomness
-Djava.security.egd=file:/dev/urandom

# Copy the logging context from parent threads to children
-Dlog4j2.isThreadContextMapInheritable=true

# FasterXML/jackson defaults
#
# Sets the maximum string length (in chars or bytes, depending on input context).
Expand Down
2 changes: 2 additions & 0 deletions tools/jvm-options-parser/src/main/java/org/logstash/launchers/JvmOptionsParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,9 @@ public class JvmOptionsParser {

private static final String[] MANDATORY_JVM_OPTIONS = new String[]{
"-Djruby.regexp.interruptible=true",
"-Djruby.compile.invokedynamic=true",
"-Djdk.io.File.enableADS=true",
"-Dlog4j2.isThreadContextMapInheritable=true",
"16-:--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
"16-:--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED",
"16-:--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED",
Expand Down
4 changes: 4 additions & 0 deletions tools/jvm-options-parser/src/test/java/org/logstash/launchers/JvmOptionsParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,10 @@ public void testAlwaysMandatoryJvmPresent() {
JvmOptionsParser.getMandatoryJvmOptions(11).contains("-Djruby.regexp.interruptible=true"));
assertTrue("Contains regexp interruptible for Java 17",
JvmOptionsParser.getMandatoryJvmOptions(17).contains("-Djruby.regexp.interruptible=true"));
assertTrue("Contains compile invokedynamic for Java 17",
JvmOptionsParser.getMandatoryJvmOptions(17).contains("-Djruby.compile.invokedynamic=true"));
assertTrue("Contains log4j2 isThreadContextMapInheritable for Java 17",
JvmOptionsParser.getMandatoryJvmOptions(17).contains("-Dlog4j2.isThreadContextMapInheritable=true"));

}

Expand Down