wip: debug

DataDog · Nov 14, 2024 · e55ca18 · e55ca18
1 parent bf2c393
commit e55ca18
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/...ot-openliberty-20/src/test/groovy/datadog/smoketest/SpringBootOpenLibertySmokeTest.groovy b/...ot-openliberty-20/src/test/groovy/datadog/smoketest/SpringBootOpenLibertySmokeTest.groovy
@@ -28,22 +28,23 @@ class SpringBootOpenLibertySmokeTest extends AbstractServerSmokeTest {
 
     List<String> envParams = new ArrayList<>()
     envParams.addAll(defaultJavaProperties)
-    envParams.addAll(
+    envParams.addAll([
       "-Ddd.writer.type=MultiWriter:TraceStructureWriter:${output.getAbsolutePath()},DDAgentWriter",
       "-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(" "))
 
 
     ProcessBuilder processBuilder = new ProcessBuilder(command)
-    processBuilder.environment().put("JAVA_TOOL_OPTIONS", javaToolOptions)
+    processBuilder.environment().put("JVM_ARGS", javaToolOptions)
     processBuilder.directory(new File(buildDirectory))
     return processBuilder
   }

diff --git a/...y-20/src/test/groovy/datadog/smoketest/SpringBootOpenLibertySmokeVulnerabilityTest.groovy b/...y-20/src/test/groovy/datadog/smoketest/SpringBootOpenLibertySmokeVulnerabilityTest.groovy
@@ -30,28 +30,29 @@ class SpringBootOpenLibertySmokeVulnerabilityTest extends AbstractServerSmokeTes
 
     List<String> envParams = new ArrayList<>()
     envParams.addAll(defaultJavaProperties)
-    envParams.addAll(
+    envParams.addAll([
       "-Ddd.writer.type=MultiWriter:TraceStructureWriter:${output.getAbsolutePath()},DDAgentWriter",
       "-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(" "))
 
 
     ProcessBuilder processBuilder = new ProcessBuilder(command)
-    processBuilder.environment().put("JAVA_TOOL_OPTIONS", javaToolOptions)
+    processBuilder.environment().put("JVM_ARGS", javaToolOptions)
     processBuilder.directory(new File(buildDirectory))
     return processBuilder
   }
 
   @Override
   File createTemporaryFile() {
-    return new File("${buildDirectory}/tmp/springboot-openliberty.out")
+    return new File("${buildDirectory}/tmp/springboot-openliberty-iast.out")
   }
 
   @Override

diff --git a/dd-smoke-tests/src/main/groovy/datadog/smoketest/AbstractServerSmokeTest.groovy b/dd-smoke-tests/src/main/groovy/datadog/smoketest/AbstractServerSmokeTest.groovy
@@ -123,7 +123,7 @@ abstract class AbstractServerSmokeTest extends AbstractSmokeTest {
     return remaining
   }
 
-  @RunLast
+  //@RunLast
   void 'receive telemetry app-started'() {
     when:
     assumeTrue(testTelemetry())
@@ -140,7 +140,7 @@ abstract class AbstractServerSmokeTest extends AbstractSmokeTest {
   }
 
   @SuppressWarnings('UnnecessaryBooleanExpression')
-  @RunLast
+  //@RunLast
   void 'receive telemetry app-dependencies-loaded'() {
     when:
     assumeTrue(testTelemetry())