cleanup

Author: randomanderson

dd-java-agent/agent-crashtracking/src/main/java/com/datadog/crashtracking/OOMENotifier.java

@@ -4,6 +4,7 @@
 
 import datadog.trace.api.StatsDClient;
 import de.thetaphi.forbiddenapis.SuppressForbidden;
+import java.util.concurrent.locks.LockSupport;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -12,7 +13,7 @@ public final class OOMENotifier {
 
   // This method is called via CLI so we don't need to be paranoid about the forbiddend APIs
   @SuppressForbidden
-  public static void sendOomeEvent(String taglist) throws Exception {
+  public static void sendOomeEvent(String taglist) {
     try (StatsDClient client =
         statsDClientManager().statsDClient(null, null, null, null, null, false)) {
       String[] tags = taglist.split(",");
@@ -23,7 +24,7 @@ public static void sendOomeEvent(String taglist) throws Exception {
           "Java process encountered out of memory error",
           tags);
       log.info("OOME event sent");
-      Thread.sleep(2 * 1000); // wait 2s to allow statsd client flushing the event
+      LockSupport.parkNanos(2_000_000_000L); // wait 2s to allow statsd client flushing the event
     }
   }
 }

dd-smoke-tests/crashtracking/src/test/java/datadog/smoketest/CrashtrackingSmokeTest.java

@@ -37,22 +37,22 @@
  * that ships with OS X by default.
  */
 public class CrashtrackingSmokeTest {
-  private static final long DATA_TIMEOUT_MS = 25 * 1000;
-  private static Path LOG_FILE_DIR;
+  private static final long DATA_TIMEOUT_MS = 10 * 1000;
+  private static final OutputThreads OUTPUT = new OutputThreads();
+  private static final Path LOG_FILE_DIR =
+      Paths.get(System.getProperty("datadog.smoketest.builddir"), "reports");
+
   private MockWebServer tracingServer;
   private TestUDPServer udpServer;
-  private BlockingQueue<CrashTelemetryData> crashEvents = new LinkedBlockingQueue<>();
+  private final BlockingQueue<CrashTelemetryData> crashEvents = new LinkedBlockingQueue<>();
 
   @BeforeAll
   static void setupAll() {
     // Only Hotspot based implementation are supported
     assumeFalse(Platform.isJ9());
-
-    LOG_FILE_DIR = Paths.get(System.getProperty("datadog.smoketest.builddir"), "reports");
   }
 
   private Path tempDir;
-  private static OutputThreads outputThreads = new OutputThreads();
 
   @BeforeEach
   void setup() throws Exception {
@@ -65,7 +65,9 @@ void setup() throws Exception {
     tracingServer.setDispatcher(
         new Dispatcher() {
           @Override
-          public MockResponse dispatch(final RecordedRequest request) throws InterruptedException {
+          public MockResponse dispatch(final RecordedRequest request) {
+            System.out.println("URL ====== " + request.getPath());
+
             String data = request.getBody().readString(StandardCharsets.UTF_8);
 
             if ("/telemetry/proxy/api/v2/apmtelemetry".equals(request.getPath())) {
@@ -82,7 +84,7 @@ public MockResponse dispatch(final RecordedRequest request) throws InterruptedEx
                 System.out.println("Unable to parse " + e);
               }
             }
-            System.out.println("URL ====== " + request.getPath());
+
             System.out.println(data);
 
             return new MockResponse().setResponseCode(200);
@@ -92,9 +94,7 @@ public MockResponse dispatch(final RecordedRequest request) throws InterruptedEx
     udpServer = new TestUDPServer();
     udpServer.start();
 
-    synchronized (outputThreads.testLogMessages) {
-      outputThreads.testLogMessages.clear();
-    }
+    OUTPUT.clearMessages();
   }
 
   @AfterEach
@@ -110,7 +110,7 @@ void teardown() throws Exception {
 
   @AfterAll
   static void shutdown() {
-    outputThreads.close();
+    OUTPUT.close();
   }
 
   private static String javaPath() {
@@ -159,8 +159,7 @@ void testCrashTracking() throws Exception {
     pb.environment().put("DD_TRACE_AGENT_PORT", String.valueOf(tracingServer.getPort()));
 
     Process p = pb.start();
-    outputThreads.captureOutput(
-        p, LOG_FILE_DIR.resolve("testProcess.testCrashTracking.log").toFile());
+    OUTPUT.captureOutput(p, LOG_FILE_DIR.resolve("testProcess.testCrashTracking.log").toFile());
 
     assertNotEquals(0, p.waitFor(), "Application should have crashed");
     assertCrashData();
@@ -195,7 +194,7 @@ void testCrashTrackingLegacy() throws Exception {
     pb.environment().put("DD_TRACE_AGENT_PORT", String.valueOf(tracingServer.getPort()));
 
     Process p = pb.start();
-    outputThreads.captureOutput(
+    OUTPUT.captureOutput(
         p, LOG_FILE_DIR.resolve("testProcess.testCrashTrackingLegacy.log").toFile());
 
     assertNotEquals(0, p.waitFor(), "Application should have crashed");
@@ -227,12 +226,10 @@ void testOomeTracking() throws Exception {
                 "-jar",
                 appShadowJar(),
                 script.toString()));
+    pb.environment().put("DD_DOGSTATSD_PORT", String.valueOf(udpServer.getPort()));
 
     Process p = pb.start();
-    outputThreads.captureOutput(
-        p, LOG_FILE_DIR.resolve("testProcess.testOomeTracking.log").toFile());
-    pb.environment().put("DD_DOGSTATSD_PORT", String.valueOf(udpServer.getPort()));
-    System.out.println("Set port to: " + pb.environment().get("DD_DOGSTATSD_PORT"));
+    OUTPUT.captureOutput(p, LOG_FILE_DIR.resolve("testProcess.testOomeTracking.log").toFile());
 
     assertNotEquals(0, p.waitFor(), "Application should have crashed");
     assertOOMEvent();
@@ -264,11 +261,8 @@ void testCombineTracking() throws Exception {
     pb.environment().put("DD_TRACE_AGENT_PORT", String.valueOf(tracingServer.getPort()));
     pb.environment().put("DD_DOGSTATSD_PORT", String.valueOf(udpServer.getPort()));
 
-    System.out.println("Set port to: " + pb.environment().get("DD_DOGSTATSD_PORT"));
-
     Process p = pb.start();
-    outputThreads.captureOutput(
-        p, LOG_FILE_DIR.resolve("testProcess.testCombineTracking.log").toFile());
+    OUTPUT.captureOutput(p, LOG_FILE_DIR.resolve("testProcess.testCombineTracking.log").toFile());
 
     assertNotEquals(0, p.waitFor(), "Application should have crashed");
 

dd-smoke-tests/src/main/java/datadog/smoketest/OutputThreads.java

@@ -167,4 +167,10 @@ public boolean processTestLogLines(Function<String, Boolean> checker) throws Tim
       }
     }
   }
+
+  public void clearMessages() {
+    synchronized (testLogMessages) {
+      testLogMessages.clear();
+    }
+  }
 }