Migrate agent and instrumentations to environment component

dd-java-agent/agent-bootstrap/build.gradle

@@ -22,6 +22,7 @@ dependencies {
   api project(':internal-api:internal-api-9')
   api project(':dd-java-agent:agent-logging')
   api project(':dd-java-agent:agent-debugger:debugger-bootstrap')
+  api project(':components:environment')
   api project(':components:json')
   api libs.slf4j
   // ^ Generally a bad idea for libraries, but we're shadowing.

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

@@ -1,8 +1,8 @@
 package datadog.trace.bootstrap;
 
+import static datadog.environment.JavaVirtualMachine.isJavaVersionAtLeast;
+import static datadog.environment.JavaVirtualMachine.isOracleJDK8;
 import static datadog.trace.api.ConfigDefaults.DEFAULT_STARTUP_LOGS_ENABLED;
-import static datadog.trace.api.Platform.isJavaVersionAtLeast;
-import static datadog.trace.api.Platform.isOracleJDK8;
 import static datadog.trace.bootstrap.Library.WILDFLY;
 import static datadog.trace.bootstrap.Library.detectLibraries;
 import static datadog.trace.util.AgentThreadFactory.AgentThread.JMX_STARTUP;
@@ -12,6 +12,8 @@
 import static datadog.trace.util.Strings.propertyNameToSystemPropertyName;
 import static datadog.trace.util.Strings.toEnvVar;
 
+import datadog.environment.JavaVirtualMachine;
+import datadog.environment.OperatingSystem;
 import datadog.trace.api.Config;
 import datadog.trace.api.Platform;
 import datadog.trace.api.StatsDClientManager;
@@ -873,12 +875,12 @@ private static void startAppSec(SubscriptionService ss, Class<?> scoClass, Objec
 
   private static boolean isSupportedAppSecArch() {
     final String arch = System.getProperty("os.arch");
-    if (Platform.isWindows()) {
+    if (OperatingSystem.isWindows()) {
       // TODO: Windows bindings need to be built for x86
       return "amd64".equals(arch) || "x86_64".equals(arch);
-    } else if (Platform.isMac()) {
+    } else if (OperatingSystem.isMacOs()) {
       return "amd64".equals(arch) || "x86_64".equals(arch) || "aarch64".equals(arch);
-    } else if (Platform.isLinux()) {
+    } else if (OperatingSystem.isLinux()) {
       return "amd64".equals(arch) || "x86_64".equals(arch) || "aarch64".equals(arch);
     }
     // Still return true in other if unexpected cases (e.g. SunOS), and we'll handle loading errors
@@ -997,7 +999,7 @@ private static void stopTelemetry() {
   }
 
   private static void initializeErrorTracking() {
-    if (Platform.isJ9()) {
+    if (JavaVirtualMachine.isJ9()) {
       // TODO currently crash tracking is supported only for HotSpot based JVMs
       return;
     }
@@ -1045,7 +1047,7 @@ public void withTracer(TracerAPI tracer) {
    */
   private static ProfilingContextIntegration createProfilingContextIntegration() {
     if (Config.get().isProfilingEnabled()) {
-      if (Config.get().isDatadogProfilerEnabled() && !Platform.isWindows()) {
+      if (Config.get().isDatadogProfilerEnabled() && !OperatingSystem.isWindows()) {
         try {
           return (ProfilingContextIntegration)
               AGENT_CLASSLOADER

dd-java-agent/agent-builder/src/main/java/datadog/trace/agent/tooling/AgentStrategies.java

@@ -1,11 +1,11 @@
 package datadog.trace.agent.tooling;
 
+import datadog.environment.JavaVirtualMachine;
 import datadog.trace.agent.tooling.bytebuddy.DDClassFileTransformer;
 import datadog.trace.agent.tooling.bytebuddy.DDLocationStrategy;
 import datadog.trace.agent.tooling.bytebuddy.DDOutlinePoolStrategy;
 import datadog.trace.agent.tooling.bytebuddy.DDOutlineTypeStrategy;
 import datadog.trace.agent.tooling.bytebuddy.DDRediscoveryStrategy;
-import datadog.trace.api.Platform;
 import net.bytebuddy.agent.builder.AgentBuilder.ClassFileBufferStrategy;
 import net.bytebuddy.agent.builder.AgentBuilder.LocationStrategy;
 import net.bytebuddy.agent.builder.AgentBuilder.PoolStrategy;
@@ -24,7 +24,7 @@ public class AgentStrategies {
   private static final Logger log = LoggerFactory.getLogger(AgentStrategies.class);
 
   private static TransformerDecorator loadTransformerDecorator() {
-    if (Platform.isJavaVersionAtLeast(9)) {
+    if (JavaVirtualMachine.isJavaVersionAtLeast(9)) {
       try {
         return (TransformerDecorator)
             Instrumenter.class

dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/ipc/ChannelContextTest.groovy

@@ -1,6 +1,6 @@
 package datadog.trace.civisibility.ipc
 
-import datadog.trace.api.Platform
+import datadog.environment.JavaVirtualMachine
 import spock.lang.IgnoreIf
 import spock.lang.Specification
 
@@ -9,7 +9,7 @@ import java.nio.channels.ByteChannel
 import java.util.concurrent.ThreadLocalRandom
 
 @IgnoreIf(reason = "JVM crash with OpenJ9", value = {
-  Platform.isJ9()
+  JavaVirtualMachine.isJ9()
 })
 class ChannelContextTest extends Specification {
 

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

@@ -5,7 +5,7 @@
 import static java.util.Locale.ROOT;
 
 import com.sun.management.HotSpotDiagnosticMXBean;
-import datadog.trace.api.Platform;
+import datadog.environment.OperatingSystem;
 import datadog.trace.util.PidHelper;
 import java.io.BufferedWriter;
 import java.io.IOException;
@@ -36,12 +36,12 @@ public static void initialize() {
   }
 
   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);
   }
 

dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/CapturedSnapshotTest.java

@@ -622,7 +622,7 @@ public void sourceFileProbeGroovy() throws IOException, URISyntaxException {
 
   @Test
   @DisabledIf(
-      value = "datadog.trace.api.Platform#isJ9",
+      value = "datadog.environment.JavaVirtualMachine#isJ9",
       disabledReason = "Issue with J9 when compiling Kotlin code")
   public void sourceFileProbeKotlin() throws IOException, URISyntaxException {
     final String CLASS_NAME = "CapturedSnapshot301";
@@ -652,7 +652,7 @@ public void sourceFileProbeKotlin() throws IOException, URISyntaxException {
 
   @Test
   @DisabledIf(
-      value = "datadog.trace.api.Platform#isJ9",
+      value = "datadog.environment.JavaVirtualMachine#isJ9",
       disabledReason = "Issue with J9 when compiling Kotlin code")
   public void suspendKotlin() throws IOException, URISyntaxException {
     final String CLASS_NAME = "CapturedSnapshot302";
@@ -679,7 +679,7 @@ public void suspendKotlin() throws IOException, URISyntaxException {
 
   @Test
   @DisabledIf(
-      value = "datadog.trace.api.Platform#isJ9",
+      value = "datadog.environment.JavaVirtualMachine#isJ9",
       disabledReason = "Issue with J9 when compiling Kotlin code")
   public void suspendMethodKotlin() {
     final String CLASS_NAME = "CapturedSnapshot302";
@@ -712,7 +712,7 @@ public void suspendMethodKotlin() {
 
   @Test
   @DisabledIf(
-      value = "datadog.trace.api.Platform#isJ9",
+      value = "datadog.environment.JavaVirtualMachine#isJ9",
       disabledReason = "Issue with J9 when compiling Kotlin code")
   public void hoistVarKotlin() {
     final String CLASS_NAME = "CapturedSnapshot303";
@@ -1863,7 +1863,7 @@ public void evaluateAtExitFalse() throws IOException, URISyntaxException {
 
   @Test
   @DisabledIf(
-      value = "datadog.trace.api.Platform#isJ9",
+      value = "datadog.environment.JavaVirtualMachine#isJ9",
       disabledReason = "we cannot get local variable debug info")
   public void uncaughtExceptionConditionLocalVar() throws IOException, URISyntaxException {
     if (Config.get().getDynamicInstrumentationLocalVarHoistingLevel() < 2) {
@@ -1901,7 +1901,7 @@ public void uncaughtExceptionConditionLocalVar() throws IOException, URISyntaxEx
 
   @Test
   @DisabledIf(
-      value = "datadog.trace.api.Platform#isJ9",
+      value = "datadog.environment.JavaVirtualMachine#isJ9",
       disabledReason = "we cannot get local variable debug info")
   public void uncaughtExceptionCaptureLocalVars() throws IOException, URISyntaxException {
     final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot31";
@@ -1925,7 +1925,7 @@ public void uncaughtExceptionCaptureLocalVars() throws IOException, URISyntaxExc
 
   @Test
   @DisabledIf(
-      value = "datadog.trace.api.Platform#isJ9",
+      value = "datadog.environment.JavaVirtualMachine#isJ9",
       disabledReason = "we cannot get local variable debug info")
   public void methodProbeLocalVarsLocalScopes() throws IOException, URISyntaxException {
     final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot31";
@@ -1942,7 +1942,7 @@ public void methodProbeLocalVarsLocalScopes() throws IOException, URISyntaxExcep
 
   @Test
   @DisabledIf(
-      value = "datadog.trace.api.Platform#isJ9",
+      value = "datadog.environment.JavaVirtualMachine#isJ9",
       disabledReason = "we cannot get local variable debug info")
   public void methodProbeLocalVarsDeepScopes() throws IOException, URISyntaxException {
     final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot31";
@@ -1974,7 +1974,7 @@ public void methodProbeLocalVarsDeepScopes() throws IOException, URISyntaxExcept
 
   @Test
   @DisabledIf(
-      value = "datadog.trace.api.Platform#isJ9",
+      value = "datadog.environment.JavaVirtualMachine#isJ9",
       disabledReason = "we cannot get local variable debug info")
   public void methodProbeExceptionLocalVars() throws IOException, URISyntaxException {
     final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot31";
@@ -2008,7 +2008,7 @@ public void methodProbeExceptionLocalVars() throws IOException, URISyntaxExcepti
 
   @Test
   @DisabledIf(
-      value = "datadog.trace.api.Platform#isJ9",
+      value = "datadog.environment.JavaVirtualMachine#isJ9",
       disabledReason = "we cannot get local variable debug info")
   public void overlappingLocalVarSlot() throws IOException, URISyntaxException {
     final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot31";
@@ -2025,7 +2025,7 @@ public void overlappingLocalVarSlot() throws IOException, URISyntaxException {
 
   @Test
   @DisabledIf(
-      value = "datadog.trace.api.Platform#isJ9",
+      value = "datadog.environment.JavaVirtualMachine#isJ9",
       disabledReason = "we cannot get local variable debug info")
   public void duplicateLocalDifferentScope() throws IOException, URISyntaxException {
     final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot31";

dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/SnapshotSerializationTest.java

@@ -104,7 +104,7 @@ public void roundTripProbeDetails() throws IOException {
 
   @Test
   @EnabledForJreRange(min = JRE.JAVA_17)
-  @DisabledIf("datadog.trace.api.Platform#isJ9")
+  @DisabledIf("datadog.environment.JavaVirtualMachine#isJ9")
   public void roundTripCapturedValue() throws IOException, URISyntaxException {
     JsonAdapter<Snapshot> adapter = createSnapshotAdapter();
     Snapshot snapshot = createSnapshot();

dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/StringTemplateBuilderTest.java

@@ -227,7 +227,7 @@ public void argComplexObjectArrayTemplate() {
 
   @Test
   @EnabledForJreRange(min = JRE.JAVA_17)
-  @DisabledIf("datadog.trace.api.Platform#isJ9")
+  @DisabledIf("datadog.environment.JavaVirtualMachine#isJ9")
   public void argInaccessibleFieldTemplate() {
     LogProbe probe = createLogProbe("{obj}");
     StringTemplateBuilder summaryBuilder = new StringTemplateBuilder(probe.getSegments(), LIMITS);

dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/exception/ExceptionProbeInstrumentationTest.java

@@ -208,7 +208,7 @@ public void differentExceptionsSameStack() throws Exception {
 
   @Test
   @DisabledIf(
-      value = "datadog.trace.api.Platform#isJ9",
+      value = "datadog.environment.JavaVirtualMachine#isJ9",
       disabledReason = "Bug in J9: no LocalVariableTable for ClassFileTransformer")
   public void recursive() throws Exception {
     Config config = createConfig();

dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/symbol/SymDBEnablementTest.java

@@ -163,7 +163,9 @@ public void parseLoadedClassFromDirectory()
   }
 
   @Test
-  @DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "Flaky on J9 JVMs")
+  @DisabledIf(
+      value = "datadog.environment.JavaVirtualMachine#isJ9",
+      disabledReason = "Flaky on J9 JVMs")
   public void noDuplicateSymbolExtraction() {
     final String CLASS_NAME_PATH = "com/datadog/debugger/symbol/SymbolExtraction01";
     SymbolSink mockSymbolSink = mock(SymbolSink.class);

dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/symbol/SymbolAggregatorTest.java

@@ -47,7 +47,9 @@ void testScanQueuedJars() {
   }
 
   @Test
-  @DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "Flaky on J9 JVMs")
+  @DisabledIf(
+      value = "datadog.environment.JavaVirtualMachine#isJ9",
+      disabledReason = "Flaky on J9 JVMs")
   void testScopeFilter() {
     ScopeFilter mockFilter = mock(ScopeFilter.class);
     when(mockFilter.filterOut(any())).thenReturn(true);