TEMP

Author: mcculls

dd-smoke-tests/log-injection/src/main/java/datadog/smoketest/loginjection/BaseApplication.java

@@ -15,10 +15,6 @@ public abstract class BaseApplication {
   public abstract void doLog(String message);
 
   public void run() throws InterruptedException {
-    if (!waitForCondition(() -> null != getLogInjectionEnabled())) {
-      throw new RuntimeException("Logs injection config was never initalized");
-    }
-
     doLog("BEFORE FIRST SPAN");
 
     firstTracedMethod();

dd-smoke-tests/log-injection/src/test/groovy/datadog/smoketest/LogInjectionSmokeTest.groovy

@@ -64,8 +64,10 @@ abstract class LogInjectionSmokeTest extends AbstractSmokeTest {
 
     assert new File(loggingJar).isFile()
 
-    outputLogFile = File.createTempFile("logTest", ".log")
-    outputJsonLogFile = File.createTempFile("logTest", ".log")
+    outputLogFile = new File(buildDirectory + "/reports/logTest"+System.nanoTime() + ".log")
+    outputLogFile.createNewFile()
+    outputJsonLogFile = new File(buildDirectory + "/reports/logTestJson"+System.nanoTime() + ".log")
+    outputJsonLogFile.createNewFile()
 
     List<String> command = new ArrayList<>()
     command.add(javaPath())
@@ -143,8 +145,8 @@ abstract class LogInjectionSmokeTest extends AbstractSmokeTest {
   abstract backend()
 
   def cleanupSpec() {
-    outputLogFile?.delete()
-    outputJsonLogFile?.delete()
+    // outputLogFile?.delete()
+    // outputJsonLogFile?.delete()
   }
 
   def assertRawLogLinesWithoutInjection(List<String> logLines, String firstTraceId, String firstSpanId, String secondTraceId, String secondSpanId,