Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 626485f

Browse files
PerfectSlayerPerfectSlayer
authored
fix(smoke-tests): Fix crash tracking setup (#8037)
1 parent 9f01834 commit 626485f

File tree

13 files changed

+30
-23
lines changed

13 files changed

+30
-23
lines changed

‎dd-smoke-tests/jersey-2/src/test/groovy/datadog/smoketest/Jersey2SmokeTest.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class Jersey2SmokeTest extends AbstractJerseySmokeTest {
2121
if (Platform.isJavaVersionAtLeast(17)) {
2222
command.addAll((String[]) ['--add-opens', 'java.base/java.lang=ALL-UNNAMED'])
2323
}
24-
command.addAll((String[]) ['-jar', jarPath, httpPort])
24+
command.addAll(['-jar', jarPath, Integer.toString(httpPort)])
2525
ProcessBuilder processBuilder = new ProcessBuilder(command)
2626
processBuilder.directory(new File(buildDirectory))
2727
return processBuilder

‎dd-smoke-tests/jersey-3/src/test/groovy/datadog/smoketest/Jersey3SmokeTest.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class Jersey3SmokeTest extends AbstractJerseySmokeTest {
1919
command.add(withSystemProperty('integration.grizzly.enabled', true))
2020
//command.add("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000")
2121
//command.add("-Xdebug")
22-
command.addAll((String[]) ['-jar', jarPath, httpPort])
22+
command.addAll(['-jar', jarPath, Integer.toString(httpPort)])
2323
ProcessBuilder processBuilder = new ProcessBuilder(command)
2424
processBuilder.directory(new File(buildDirectory))
2525
return processBuilder

‎dd-smoke-tests/play-2.4/src/test/groovy/datadog/smoketest/PlayNettySmokeTest.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class PlayNettySmokeTest extends AbstractServerSmokeTest {
4949
new ProcessBuilder("${playDirectory}/bin/${command}")
5050
processBuilder.directory(playDirectory)
5151
processBuilder.environment().put("JAVA_OPTS",
52-
defaultJavaProperties.join(" ")
52+
defaultJavaProperties.collect({ it.replace(' ', '\\ ')}).join(" ")
5353
+ " -Dconfig.file=${playDirectory}/conf/application.conf"
5454
+ " -Dhttp.port=${httpPort}"
5555
+ " -Dhttp.address=127.0.0.1"

‎dd-smoke-tests/play-2.5/src/test/groovy/datadog/smoketest/PlayNettySmokeTest.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class PlayNettySmokeTest extends AbstractServerSmokeTest {
4747
new ProcessBuilder("${playDirectory}/bin/${command}")
4848
processBuilder.directory(playDirectory)
4949
processBuilder.environment().put("JAVA_OPTS",
50-
defaultJavaProperties.join(" ")
50+
defaultJavaProperties.collect({ it.replace(' ', '\\ ')}).join(" ")
5151
+ " -Dconfig.file=${playDirectory}/conf/application.conf"
5252
+ " -Dhttp.port=${httpPort}"
5353
+ " -Dhttp.address=127.0.0.1"

‎dd-smoke-tests/play-2.6/src/test/groovy/datadog/smoketest/PlaySmokeTest.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ abstract class PlaySmokeTest extends AbstractServerSmokeTest {
4747
new ProcessBuilder("${playDirectory}/bin/${command}")
4848
processBuilder.directory(playDirectory)
4949
processBuilder.environment().put("JAVA_OPTS",
50-
defaultJavaProperties.join(" ")
50+
defaultJavaProperties.collect({ it.replace(' ', '\\ ')}).join(" ")
5151
+ " -Dconfig.file=${playDirectory}/conf/application.conf"
5252
+ " -Dhttp.port=${httpPort}"
5353
+ " -Dhttp.address=127.0.0.1"

‎dd-smoke-tests/play-2.7/src/test/groovy/datadog/smoketest/PlaySmokeTest.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ abstract class PlaySmokeTest extends AbstractServerSmokeTest {
4747
new ProcessBuilder("${playDirectory}/bin/${command}")
4848
processBuilder.directory(playDirectory)
4949
processBuilder.environment().put("JAVA_OPTS",
50-
defaultJavaProperties.join(" ")
50+
defaultJavaProperties.collect({ it.replace(' ', '\\ ')}).join(" ")
5151
+ " -Dconfig.file=${playDirectory}/conf/application.conf"
5252
+ " -Dhttp.port=${httpPort}"
5353
+ " -Dhttp.address=127.0.0.1"

‎dd-smoke-tests/play-2.8-otel/src/test/groovy/datadog/smoketest/Play28OTelSmokeTest.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ abstract class Play28OTelSmokeTest extends AbstractServerSmokeTest {
4747
new ProcessBuilder("${playDirectory}/bin/${command}")
4848
processBuilder.directory(playDirectory)
4949
processBuilder.environment().put("JAVA_OPTS",
50-
defaultJavaProperties.join(" ")
50+
defaultJavaProperties.collect({ it.replace(' ', '\\ ')}).join(" ")
5151
+ " -Dconfig.file=${playDirectory}/conf/application.conf"
5252
+ " -Dhttp.port=${httpPort}"
5353
+ " -Dhttp.address=127.0.0.1"

‎dd-smoke-tests/play-2.8-split-routes/src/test/groovy/datadog/smoketest/PlaySmokeTest.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ abstract class PlaySmokeTest extends AbstractServerSmokeTest {
4747
new ProcessBuilder("${playDirectory}/bin/${command}")
4848
processBuilder.directory(playDirectory)
4949
processBuilder.environment().put("JAVA_OPTS",
50-
defaultJavaProperties.join(" ")
50+
defaultJavaProperties.collect({ it.replace(' ', '\\ ')}).join(" ")
5151
+ " -Dconfig.file=${playDirectory}/conf/application.conf"
5252
+ " -Dhttp.port=${httpPort}"
5353
+ " -Dhttp.address=127.0.0.1"

‎dd-smoke-tests/play-2.8/src/test/groovy/datadog/smoketest/PlaySmokeTest.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ abstract class PlaySmokeTest extends AbstractServerSmokeTest {
4747
new ProcessBuilder("${playDirectory}/bin/${command}")
4848
processBuilder.directory(playDirectory)
4949
processBuilder.environment().put("JAVA_OPTS",
50-
defaultJavaProperties.join(" ")
50+
defaultJavaProperties.collect({ it.replace(' ', '\\ ')}).join(" ")
5151
+ " -Dconfig.file=${playDirectory}/conf/application.conf"
5252
+ " -Dhttp.port=${httpPort}"
5353
+ " -Dhttp.address=127.0.0.1"

‎dd-smoke-tests/resteasy/src/test/groovy/smoketest/ResteasySmokeTest.groovy

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package smoketest
22

33
import datadog.smoketest.AbstractIastServerSmokeTest
44
import datadog.trace.api.Platform
5+
import datadog.trace.api.config.IastConfig
56
import okhttp3.Request
67
import spock.lang.IgnoreIf
78

@@ -18,14 +19,14 @@ class ResteasySmokeTest extends AbstractIastServerSmokeTest {
1819
command.add(javaPath())
1920
command.addAll(defaultJavaProperties)
2021
command.addAll([
21-
withSystemProperty(datadog.trace.api.config.IastConfig.IAST_ENABLED, true),
22-
withSystemProperty(datadog.trace.api.config.IastConfig.IAST_DETECTION_MODE, 'FULL'),
23-
withSystemProperty(datadog.trace.api.config.IastConfig.IAST_DEBUG_ENABLED, true)
22+
withSystemProperty(IastConfig.IAST_ENABLED, true),
23+
withSystemProperty(IastConfig.IAST_DETECTION_MODE, 'FULL'),
24+
withSystemProperty(IastConfig.IAST_DEBUG_ENABLED, true)
2425
])
2526
if (Platform.isJavaVersionAtLeast(17)) {
26-
command.addAll((String[]) ["--add-opens", "java.base/java.lang=ALL-UNNAMED"])
27+
command.addAll(["--add-opens", "java.base/java.lang=ALL-UNNAMED"])
2728
}
28-
command.addAll((String[]) ["-jar", jarPath, httpPort])
29+
command.addAll(["-jar", jarPath, Integer.toString(httpPort)])
2930
ProcessBuilder processBuilder = new ProcessBuilder(command)
3031
processBuilder.directory(new File(buildDirectory))
3132
}

‎dd-smoke-tests/springboot-tomcat/src/test/groovy/datadog/smoketest/SpringBootTomcatSmokeTest.groovy

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class SpringBootTomcatSmokeTest extends AbstractServerSmokeTest {
2424
def permissions = new HashSet<>(Files.getPosixFilePermissions(catalinaPath))
2525
permissions.add(PosixFilePermission.OWNER_EXECUTE)
2626
Files.setPosixFilePermissions(catalinaPath, permissions)
27-
} catch (Exception e) {
27+
} catch (Exception ignored) {
2828
// not posix ... continue
2929
}
3030
Files.copy(springBootShadowWar, tomcatDirectory.resolve("webapps/smoke.war"), StandardCopyOption.REPLACE_EXISTING)
@@ -40,9 +40,12 @@ class SpringBootTomcatSmokeTest extends AbstractServerSmokeTest {
4040
ProcessBuilder processBuilder =
4141
new ProcessBuilder("bin/catalina.sh", "run")
4242
processBuilder.directory(tomcatDirectory.toFile())
43-
defaultJavaProperties += "-Ddd.writer.type=TraceStructureWriter:${output.getAbsolutePath()}:includeService:includeResource"
44-
defaultJavaProperties += "-Ddd.integration.spring-boot.enabled=true"
45-
processBuilder.environment().put("CATALINA_OPTS", defaultJavaProperties.join(" "))
43+
List<String> catalinaOpts = [
44+
*defaultJavaProperties,
45+
"-Ddd.writer.type=TraceStructureWriter:${output.getAbsolutePath()}:includeService:includeResource",
46+
"-Ddd.integration.spring-boot.enabled=true"
47+
]
48+
processBuilder.environment().put("CATALINA_OPTS", catalinaOpts.collect({ it.replace(' ', '\\ ')}).join(" "))
4649
return processBuilder
4750
}
4851

‎dd-smoke-tests/src/main/groovy/datadog/smoketest/AbstractSmokeTest.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ abstract class AbstractSmokeTest extends ProcessManager {
198198
// DQH - Nov 2024 - skipping for J9 which doesn't have full crash tracking support
199199
if (testCrashTracking() && !Platform.isJ9()) {
200200
def extension = getScriptExtension()
201-
ret += "-XX:OnError=\"${tmpDir}/dd_crash_uploader.${extension} %p\""
201+
ret += "-XX:OnError=${tmpDir}/dd_crash_uploader.${extension} %p"
202202
// Unlike crash tracking smoke test, keep the default delay; otherwise, otherwise other tests will fail
203203
// ret += "-Ddd.dogstatsd.start-delay=0"
204204
}

‎dd-smoke-tests/wildfly/src/test/groovy/datadog/smoketest/WildflySmokeTest.groovy

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,13 @@ class WildflySmokeTest extends AbstractServerSmokeTest {
2020
ProcessBuilder processBuilder =
2121
new ProcessBuilder("${wildflyDirectory}/bin/standalone.sh")
2222
processBuilder.directory(wildflyDirectory)
23-
processBuilder.environment().put("JAVA_OPTS",
24-
defaultJavaProperties.join(" ")
25-
+ " -Djboss.http.port=${httpPort} -Djboss.https.port=${httpsPort}"
26-
+ " -Djboss.management.http.port=${managementPort}")
23+
List<String> javaOpts = [
24+
*defaultJavaProperties,
25+
"-Djboss.http.port=${httpPort}",
26+
"-Djboss.https.port=${httpsPort}",
27+
"-Djboss.management.http.port=${managementPort}"
28+
]
29+
processBuilder.environment().put("JAVA_OPTS", javaOpts.collect({ it.replace(' ', '\\ ')}).join(' '))
2730
return processBuilder
2831
}
2932

0 commit comments

Comments
 (0)