Skip to content
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

Replace JAVA_TOOL_OPTIONS by jvm.options OpenLiberty server configuration file #8031

Merged
merged 1 commit into from
Nov 29, 2024
Merged

Replace JAVA_TOOL_OPTIONS by jvm.options OpenLiberty server configuration file #8031

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
61 changes: 45 additions & 16 deletions ...ot-openliberty-20/src/test/groovy/datadog/smoketest/SpringBootOpenLibertySmokeTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@ import okhttp3.Request
import spock.lang.Requires
import spock.lang.Shared

import java.util.stream.Collectors
import java.nio.file.FileSystems
import java.nio.file.Files
import java.nio.file.Path
import java.nio.file.Paths

// This test currently fails on IBM JVMs
@Requires({ !Platform.isJ9() })
Expand All @@ -21,33 +24,59 @@ class SpringBootOpenLibertySmokeTest extends AbstractServerSmokeTest {

@Override
ProcessBuilder createProcessBuilder() {
List<String> command = new ArrayList<>()
command.add(javaPath())

command.addAll((String[]) ["-jar", openLibertyShadowJar, "--server.port=${httpPort}"])

List<String> envParams = new ArrayList<>()
envParams.addAll(defaultJavaProperties)
envParams.addAll(
"-Ddd.writer.type=MultiWriter:TraceStructureWriter:${output.getAbsolutePath()},DDAgentWriter",
// Make a copy of the OpenLiberty runnable JAR before injecting JVM configuration
def applicationJar = copyApplicationJar().toAbsolutePath().toString()

List<String> command = [
javaPath(),
"-jar",
applicationJar,
"--server.port=${httpPort}" as String
]

List<String> jvmOptions = new ArrayList<>()
jvmOptions.addAll(defaultJavaProperties)
jvmOptions.addAll(
"-Ddd.writer.type=MultiWriter:TraceStructureWriter:${output.getAbsolutePath()},DDAgentWriter" as String,
"-Ddd.jmxfetch.enabled=false",
"-Ddd.appsec.enabled=true",
"-Ddatadog.slf4j.simpleLogger.defaultLogLevel=debug",
"-Dorg.slf4j.simpleLogger.defaultLogLevel=debug",
"-Ddd.iast.enabled=true", "-Ddd.iast.request-sampling=100",
"-Ddd.iast.enabled=true",
"-Ddd.iast.request-sampling=100",
"-Ddd.integration.spring-boot.enabled=true"
)


String javaToolOptions = envParams.stream().collect(Collectors.joining(" "))

injectOpenLibertyJvmOptions(applicationJar, jvmOptions)

ProcessBuilder processBuilder = new ProcessBuilder(command)
processBuilder.environment().put("JAVA_TOOL_OPTIONS", javaToolOptions)
processBuilder.environment().put('WLP_JAR_EXTRACT_ROOT', 'application')
processBuilder.directory(new File(buildDirectory))
return processBuilder
}

Path copyApplicationJar() {
def applicationJar = Paths.get(openLibertyShadowJar)
def randomId = System.nanoTime()
def uniqueName = applicationJar.fileName.toString()
uniqueName = uniqueName.substring(0, uniqueName.length() - 4) + "-${randomId}.jar"
def specificationJar = applicationJar.parent.parent.resolve(uniqueName)
Files.copy(applicationJar, specificationJar)
return specificationJar
}

void injectOpenLibertyJvmOptions(String applicationJar, List<String> options) {
def appUri = URI.create("jar:file:$applicationJar")
try (def fs = FileSystems.newFileSystem(appUri, [:])) {
def jvmOptionFile = fs.getPath( 'wlp', 'usr', 'servers', 'defaultServer', 'jvm.options')
try (def writer = Files.newBufferedWriter(jvmOptionFile)) {
options.each {
writer.write(it)
writer.newLine()
}
}
}
}

@Override
File createTemporaryFile() {
return new File("${buildDirectory}/tmp/springboot-openliberty.out")
Expand Down
65 changes: 45 additions & 20 deletions ...y-20/src/test/groovy/datadog/smoketest/SpringBootOpenLibertySmokeVulnerabilityTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,54 +1,79 @@
package datadog.smoketest


import datadog.trace.api.Platform
import datadog.trace.test.agent.decoder.DecodedSpan
import okhttp3.Request
import spock.lang.Requires
import spock.lang.Shared
import spock.util.concurrent.PollingConditions

import java.nio.file.FileSystems
import java.nio.file.Files
import java.nio.file.Path
import java.nio.file.Paths
import java.util.function.Function
import java.util.stream.Collectors

// This test currently fails on IBM JVMs
@Requires({ !Platform.isJ9() })
class SpringBootOpenLibertySmokeVulnerabilityTest extends AbstractServerSmokeTest {

@Shared
int totalInvocations = 100

@Shared
String openLibertyShadowJar = System.getProperty("datadog.smoketest.openliberty.jar.path")

@Override
ProcessBuilder createProcessBuilder() {
List<String> command = new ArrayList<>()
command.add(javaPath())

command.addAll((String[]) ["-jar", openLibertyShadowJar, "--server.port=${httpPort}"])

List<String> envParams = new ArrayList<>()
envParams.addAll(defaultJavaProperties)
envParams.addAll(
"-Ddd.writer.type=MultiWriter:TraceStructureWriter:${output.getAbsolutePath()},DDAgentWriter",
// Make a copy of the OpenLiberty runnable JAR before injecting JVM configuration
def applicationJar = copyApplicationJar().toAbsolutePath().toString()

List<String> command = [
javaPath(),
"-jar",
applicationJar,
"--server.port=${httpPort}" as String
]

List<String> jvmOptions = new ArrayList<>()
jvmOptions.addAll(defaultJavaProperties)
jvmOptions.addAll(
"-Ddd.writer.type=MultiWriter:TraceStructureWriter:${output.getAbsolutePath()},DDAgentWriter" as String,
"-Ddd.jmxfetch.enabled=false",
"-Ddd.appsec.enabled=true",
"-Ddatadog.slf4j.simpleLogger.defaultLogLevel=debug",
"-Dorg.slf4j.simpleLogger.defaultLogLevel=debug",
"-Ddd.iast.enabled=true", "-Ddd.iast.request-sampling=100"
"-Ddd.iast.enabled=true",
"-Ddd.iast.request-sampling=100"
)


String javaToolOptions = envParams.stream().collect(Collectors.joining(" "))

injectOpenLibertyJvmOptions(applicationJar, jvmOptions)

ProcessBuilder processBuilder = new ProcessBuilder(command)
processBuilder.environment().put("JAVA_TOOL_OPTIONS", javaToolOptions)
processBuilder.environment().put('WLP_JAR_EXTRACT_ROOT', 'application')
processBuilder.directory(new File(buildDirectory))
return processBuilder
}

Path copyApplicationJar() {
def applicationJar = Paths.get(openLibertyShadowJar)
def randomId = System.nanoTime()
def uniqueName = applicationJar.fileName.toString()
uniqueName = uniqueName.substring(0, uniqueName.length() - 4) + "-${randomId}.jar"
def specificationJar = applicationJar.parent.parent.resolve(uniqueName)
Files.copy(applicationJar, specificationJar)
return specificationJar
}

void injectOpenLibertyJvmOptions(String applicationJar, List<String> options) {
def appUri = URI.create("jar:file:$applicationJar")
try (def fs = FileSystems.newFileSystem(appUri, [:])) {
def jvmOptionFile = fs.getPath( 'wlp', 'usr', 'servers', 'defaultServer', 'jvm.options')
try (def writer = Files.newBufferedWriter(jvmOptionFile)) {
options.each {
writer.write(it)
writer.newLine()
}
}
}
}

@Override
File createTemporaryFile() {
return new File("${buildDirectory}/tmp/springboot-openliberty.out")
Expand Down
59 changes: 43 additions & 16 deletions ...ot-openliberty-23/src/test/groovy/datadog/smoketest/SpringBootOpenLibertySmokeTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@ import okhttp3.Request
import spock.lang.Requires
import spock.lang.Shared

import java.util.stream.Collectors
import java.nio.file.FileSystems
import java.nio.file.Files
import java.nio.file.Path
import java.nio.file.Paths

// This test currently fails on IBM JVMs
@Requires({ !Platform.isJ9() })
Expand All @@ -21,15 +24,20 @@ class SpringBootOpenLibertySmokeTest extends AbstractServerSmokeTest {

@Override
ProcessBuilder createProcessBuilder() {
List<String> command = new ArrayList<>()
command.add(javaPath())

command.addAll((String[]) ["-jar", openLibertyShadowJar, "--server.port=${httpPort}"])

List<String> envParams = new ArrayList<>()
envParams.addAll(defaultJavaProperties)
envParams.addAll([
"-Ddd.writer.type=MultiWriter:TraceStructureWriter:${output.getAbsolutePath()}:includeService,DDAgentWriter",
// Make a copy of the OpenLiberty runnable JAR before injecting JVM configuration
def applicationJar = copyApplicationJar().toAbsolutePath().toString()

List<String> command = [
javaPath(),
"-jar",
applicationJar,
"--server.port=${httpPort}" as String
]

List<String> jvmOptions = new ArrayList<>()
jvmOptions.addAll(defaultJavaProperties)
jvmOptions.addAll([
"-Ddd.writer.type=MultiWriter:TraceStructureWriter:${output.getAbsolutePath()}:includeService,DDAgentWriter" as String,
"-Ddd.jmxfetch.enabled=false",
"-Ddd.appsec.enabled=true",
"-Ddatadog.slf4j.simpleLogger.defaultLogLevel=debug",
Expand All @@ -38,18 +46,37 @@ class SpringBootOpenLibertySmokeTest extends AbstractServerSmokeTest {
"-Ddd.iast.request-sampling=100",
"-Ddd.integration.spring-boot.enabled=true"
])


String javaToolOptions = envParams.stream().collect(Collectors.joining(" "))

injectOpenLibertyJvmOptions(applicationJar, jvmOptions)

ProcessBuilder processBuilder = new ProcessBuilder(command)
System.err.println(javaToolOptions)
processBuilder.environment().put("JAVA_TOOL_OPTIONS", javaToolOptions)
processBuilder.environment().put('WLP_JAR_EXTRACT_ROOT', 'application')
processBuilder.directory(new File(buildDirectory))
return processBuilder
}

Path copyApplicationJar() {
def applicationJar = Paths.get(openLibertyShadowJar)
def randomId = System.nanoTime()
def uniqueName = applicationJar.fileName.toString()
uniqueName = uniqueName.substring(0, uniqueName.length() - 4) + "-${randomId}.jar"
def specificationJar = applicationJar.parent.parent.resolve(uniqueName)
Files.copy(applicationJar, specificationJar)
return specificationJar
}

void injectOpenLibertyJvmOptions(String applicationJar, List<String> options) {
def appUri = URI.create("jar:file:$applicationJar")
try (def fs = FileSystems.newFileSystem(appUri, [:])) {
def jvmOptionFile = fs.getPath( 'wlp', 'usr', 'servers', 'defaultServer', 'jvm.options')
try (def writer = Files.newBufferedWriter(jvmOptionFile)) {
options.each {
writer.write(it)
writer.newLine()
}
}
}
}

@Override
def inferServiceName() {
false // will use spring properties
Expand Down
61 changes: 43 additions & 18 deletions ...y-23/src/test/groovy/datadog/smoketest/SpringBootOpenLibertySmokeVulnerabilityTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,47 +8,72 @@ import spock.lang.Requires
import spock.lang.Shared
import spock.util.concurrent.PollingConditions

import java.nio.file.FileSystems
import java.nio.file.Files
import java.nio.file.Path
import java.nio.file.Paths
import java.util.function.Function
import java.util.stream.Collectors

// This test currently fails on IBM JVMs
@Requires({ !Platform.isJ9() })
class SpringBootOpenLibertySmokeVulnerabilityTest extends AbstractServerSmokeTest {

@Shared
int totalInvocations = 100

@Shared
String openLibertyShadowJar = System.getProperty("datadog.smoketest.openliberty.jar.path")

@Override
ProcessBuilder createProcessBuilder() {
List<String> command = new ArrayList<>()
command.add(javaPath())

command.addAll((String[]) ["-jar", openLibertyShadowJar, "--server.port=${httpPort}"])

List<String> envParams = new ArrayList<>()
envParams.addAll(defaultJavaProperties)
envParams.addAll(
"-Ddd.writer.type=MultiWriter:TraceStructureWriter:${output.getAbsolutePath()},DDAgentWriter",
// Make a copy of the OpenLiberty runnable JAR before injecting JVM configuration
def applicationJar = copyApplicationJar().toAbsolutePath().toString()

List<String> command = [
javaPath(),
"-jar",
applicationJar,
"--server.port=${httpPort}" as String
]

List<String> jvmOptions = new ArrayList<>()
jvmOptions.addAll(defaultJavaProperties)
jvmOptions.addAll(
"-Ddd.writer.type=MultiWriter:TraceStructureWriter:${output.getAbsolutePath()},DDAgentWriter" as String,
"-Ddd.jmxfetch.enabled=false",
"-Ddd.appsec.enabled=true",
"-Ddatadog.slf4j.simpleLogger.defaultLogLevel=debug",
"-Dorg.slf4j.simpleLogger.defaultLogLevel=debug",
"-Ddd.iast.enabled=true", "-Ddd.iast.request-sampling=100"
)


String javaToolOptions = envParams.stream().collect(Collectors.joining(" "))

injectOpenLibertyJvmOptions(applicationJar, jvmOptions)

ProcessBuilder processBuilder = new ProcessBuilder(command)
processBuilder.environment().put("JAVA_TOOL_OPTIONS", javaToolOptions)
processBuilder.environment().put('WLP_JAR_EXTRACT_ROOT', 'application')
processBuilder.directory(new File(buildDirectory))
return processBuilder
}

Path copyApplicationJar() {
def applicationJar = Paths.get(openLibertyShadowJar)
def randomId = System.nanoTime()
def uniqueName = applicationJar.fileName.toString()
uniqueName = uniqueName.substring(0, uniqueName.length() - 4) + "-${randomId}.jar"
def specificationJar = applicationJar.parent.parent.resolve(uniqueName)
Files.copy(applicationJar, specificationJar)
return specificationJar
}

void injectOpenLibertyJvmOptions(String applicationJar, List<String> options) {
def appUri = URI.create("jar:file:$applicationJar")
try (def fs = FileSystems.newFileSystem(appUri, [:])) {
def jvmOptionFile = fs.getPath( 'wlp', 'usr', 'servers', 'defaultServer', 'jvm.options')
try (def writer = Files.newBufferedWriter(jvmOptionFile)) {
options.each {
writer.write(it)
writer.newLine()
}
}
}
}

@Override
File createTemporaryFile() {
return new File("${buildDirectory}/tmp/springboot-openliberty.out")
Expand Down
Loading