Fix post-merge issue

Author: jbachorik

dd-java-agent/agent-profiling/profiling-controller-ddprof/src/test/java/com/datadog/profiling/controller/ddprof/DatadogProfilerOngoingRecordingTest.java

@@ -7,7 +7,6 @@
 import datadog.trace.api.profiling.RecordingData;
 import java.time.Instant;
 import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -34,8 +33,8 @@ public class DatadogProfilerOngoingRecordingTest {
   public static void setupAll() {
     // If the profiler couldn't be loaded, the reason why is saved.
     // This test assumes the profiler could be loaded.
-    Assume.assumeNoException(
-        "profiler not available", DdprofLibraryLoader.javaProfiler().getReasonNotLoaded());
+    assertDoesNotThrow(
+        () -> DdprofLibraryLoader.jvmAccess().getReasonNotLoaded(), "Profiler not available");
   }
 
   @BeforeEach

dd-java-agent/agent-profiling/profiling-ddprof/src/test/java/com/datadog/profiling/ddprof/DatadogProfilerRecordingTest.java

@@ -1,8 +1,10 @@
 package com.datadog.profiling.ddprof;
 
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 import datadog.environment.OperatingSystem;
 import datadog.libs.ddprof.DdprofLibraryLoader;
@@ -23,13 +25,13 @@ class DatadogProfilerRecordingTest {
 
   @BeforeEach
   void setup() throws Exception {
-    Assume.assumeTrue(OperatingSystem.isLinux());
-    Assume.assumeNoException(
-        "Profiler not available", DdprofLibraryLoader.jvmAccess().getReasonNotLoaded());
+    assumeTrue(OperatingSystem.isLinux());
+    assertDoesNotThrow(
+        () -> DdprofLibraryLoader.jvmAccess().getReasonNotLoaded(), "Profiler not available");
     profiler = DatadogProfiler.newInstance(ConfigProvider.getInstance());
     Assumptions.assumeFalse(profiler.isActive());
     recording = (DatadogProfilerRecording) profiler.start();
-    Assumptions.assumeTrue(recording != null);
+    assumeTrue(recording != null);
   }
 
   @AfterEach
@@ -43,26 +45,26 @@ void shutdown() {
 
   @Test
   void testClose() throws Exception {
-    Assume.assumeNoException(
-        "Profiler not available", DdprofLibraryLoader.javaProfiler().getReasonNotLoaded());
+    assertDoesNotThrow(
+        () -> DdprofLibraryLoader.jvmAccess().getReasonNotLoaded(), "Profiler not available");
     assertTrue(Files.exists(recording.getRecordingFile()));
     recording.close();
     assertFalse(Files.exists(recording.getRecordingFile()));
   }
 
   @Test
   void testStop() throws Exception {
-    Assume.assumeNoException(
-        "Profiler not available", DdprofLibraryLoader.javaProfiler().getReasonNotLoaded());
+    assertDoesNotThrow(
+        () -> DdprofLibraryLoader.jvmAccess().getReasonNotLoaded(), "Profiler not available");
     RecordingData data = recording.stop();
     assertNotNull(data);
     assertTrue(Files.exists(recording.getRecordingFile()));
   }
 
   @Test
   void testSnapshot() throws Exception {
-    Assume.assumeNoException(
-        "Profiler not available", DdprofLibraryLoader.javaProfiler().getReasonNotLoaded());
+    assertDoesNotThrow(
+        () -> DdprofLibraryLoader.jvmAccess().getReasonNotLoaded(), "Profiler not available");
     RecordingData data = recording.snapshot(Instant.now());
     assertNotNull(data);
     assertTrue(Files.exists(recording.getRecordingFile()));

dd-java-agent/agent-profiling/profiling-ddprof/src/test/java/com/datadog/profiling/ddprof/DatadogProfilerTest.java

@@ -1,6 +1,7 @@
 package com.datadog.profiling.ddprof;
 
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -42,8 +43,8 @@ public void setup() {
 
   @Test
   void test() throws Exception {
-    Assume.assumeNoException(
-        "Profiler not available", DdprofLibraryLoader.javaProfiler().getReasonNotLoaded());
+    assertDoesNotThrow(
+        () -> DdprofLibraryLoader.jvmAccess().getReasonNotLoaded(), "Profiler not available");
     DatadogProfiler profiler = DatadogProfiler.newInstance(ConfigProvider.getInstance());
     assertFalse(profiler.enabledModes().isEmpty());
 
@@ -76,8 +77,8 @@ void test() throws Exception {
   @ParameterizedTest
   @MethodSource("profilingModes")
   void testStartCmd(boolean cpu, boolean wall, boolean alloc, boolean memleak) throws Exception {
-    Assume.assumeNoException(
-        "Profiler not available", DdprofLibraryLoader.javaProfiler().getReasonNotLoaded());
+    assertDoesNotThrow(
+        () -> DdprofLibraryLoader.jvmAccess().getReasonNotLoaded(), "Profiler not available");
     DatadogProfiler profiler =
         DatadogProfiler.newInstance(configProvider(cpu, wall, alloc, memleak));
 

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

@@ -180,7 +180,8 @@ void testCrashTracking() throws Exception {
     String onErrorArg =
         !Platform.isLinux()
             ? "-XX:OnError=" + onErrorValue
-            : ""; // on Linux we can automatically inject the arg
+            : "-Ddd.crashtracking.debug.autoconfig.enable=true"; // on Linux we can automatically
+    // inject the arg
     List<String> processArgs = new ArrayList<>();
     processArgs.add(javaPath());
     processArgs.add("-javaagent:" + agentShadowJar());
@@ -256,7 +257,8 @@ void testOomeTracking() throws Exception {
     String onOOMEArg =
         !Platform.isLinux()
             ? "-XX:OnOutOfMemoryError=" + onErrorValue
-            : ""; // on Linux we can automatically inject the arg
+            : "-Ddd.crashtracking.debug.autoconfig.enable=true"; // on Linux we can automatically
+    // inject the arg
 
     List<String> processArgs = new ArrayList<>();
     processArgs.add(javaPath());