Fix merge breakage

Author: jbachorik

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Agent.java

@@ -726,7 +726,7 @@ private static synchronized void installDatadogTracer(
   }
 
   private static void startCrashTracking() {
-    if (Platform.isJavaVersionAtLeast(9)) {
+    if (isJavaVersionAtLeast(9)) {
       // it is safe to initialize crashtracking early
       // since it can take 100ms+ to initialize the native library we will defer the initialization
       // ... unless we request early start with the debug config flag

dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/Initializer.java

@@ -7,8 +7,8 @@
 
 import com.datadoghq.profiler.JVMAccess;
 import com.sun.management.HotSpotDiagnosticMXBean;
+import datadog.environment.OperatingSystem;
 import datadog.libs.ddprof.DdprofLibraryLoader;
-import datadog.trace.api.Platform;
 import datadog.trace.util.PidHelper;
 import datadog.trace.util.TempLocationManager;
 import java.io.BufferedWriter;
@@ -108,12 +108,12 @@ public static boolean initialize(boolean forceJmx) {
   }
 
   static InputStream getCrashUploaderTemplate() {
-    String name = Platform.isWindows() ? "upload_crash.bat" : "upload_crash.sh";
+    String name = OperatingSystem.isWindows() ? "upload_crash.bat" : "upload_crash.sh";
     return CrashUploader.class.getResourceAsStream(name);
   }
 
   static InputStream getOomeNotifierTemplate() {
-    String name = Platform.isWindows() ? "notify_oome.bat" : "notify_oome.sh";
+    String name = OperatingSystem.isWindows() ? "notify_oome.bat" : "notify_oome.sh";
     return OOMENotifier.class.getResourceAsStream(name);
   }
 
@@ -339,7 +339,7 @@ private static String getScript(String scriptName) {
   }
 
   private static String getScriptFileName(String scriptName) {
-    return scriptName + "." + (Platform.isWindows() ? "bat" : "sh");
+    return scriptName + "." + (OperatingSystem.isWindows() ? "bat" : "sh");
   }
 
   private static void logInitializationError(String msg, Throwable t) {

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

@@ -7,11 +7,12 @@
 import static org.junit.jupiter.api.Assumptions.assumeFalse;
 import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
+import com.datadoghq.profiler.Platform;
 import com.squareup.moshi.JsonAdapter;
 import com.squareup.moshi.Moshi;
-import datadog.libs.ddprof.DdprofLibraryLoader;
 import datadog.environment.JavaVirtualMachine;
 import datadog.environment.OperatingSystem;
+import datadog.libs.ddprof.DdprofLibraryLoader;
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -141,7 +142,7 @@ private static String getExtension() {
 
   @Test
   void testAutoInjection() throws Exception {
-    assumeTrue(Platform.isLinux()); // we support only linux ATM
+    assumeTrue(OperatingSystem.isLinux()); // we support only linux ATM
 
     ProcessBuilder pb =
         new ProcessBuilder(