feat(env): Migrate crash tracking to environment component

Author: PerfectSlayer

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

@@ -12,6 +12,7 @@
 import datadog.common.version.VersionInfo;
 import datadog.communication.http.OkHttpUtils;
 import datadog.crashtracking.dto.CrashLog;
+import datadog.environment.SystemProperties;
 import datadog.trace.api.Config;
 import datadog.trace.api.DDTags;
 import datadog.trace.bootstrap.config.provider.ConfigProvider;
@@ -302,7 +303,9 @@ private RequestBody makeTelemetryRequestBody(@Nonnull String content) throws IOE
         writer.beginObject();
         writer.name("env").value(config.getEnv());
         writer.name("language_name").value("jvm");
-        writer.name("language_version").value(System.getProperty("java.version", "unknown"));
+        writer
+            .name("language_version")
+            .value(SystemProperties.getOrDefault("java.version", "unknown"));
         writer.name("service_name").value(config.getServiceName());
         writer.name("service_version").value(config.getVersion());
         writer.name("tracer_version").value(VersionInfo.VERSION);

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

@@ -11,6 +11,7 @@
 import static java.nio.file.attribute.PosixFilePermissions.fromString;
 import static java.util.Locale.ROOT;
 
+import datadog.environment.SystemProperties;
 import datadog.trace.util.PidHelper;
 import datadog.trace.util.Strings;
 import java.io.BufferedReader;
@@ -36,7 +37,7 @@ static void initialize(String onErrorVal, String onErrorFile) {
       return;
     }
     if (onErrorFile == null || onErrorFile.isEmpty()) {
-      onErrorFile = System.getProperty("user.dir") + "/hs_err_pid" + PidHelper.getPid() + ".log";
+      onErrorFile = SystemProperties.get("user.dir") + "/hs_err_pid" + PidHelper.getPid() + ".log";
       LOG.debug("No -XX:ErrorFile value, defaulting to {}", onErrorFile);
     } else {
       onErrorFile = Strings.replace(onErrorFile, "%p", PidHelper.getPid());
@@ -120,7 +121,7 @@ private static void writeCrashUploaderScript(
 
   private static String template(String line, String execClass, String crashFile) {
     line = Strings.replace(line, "!AGENT_JAR!", execClass);
-    line = Strings.replace(line, "!JAVA_HOME!", System.getProperty("java.home"));
+    line = Strings.replace(line, "!JAVA_HOME!", SystemProperties.get("java.home"));
     if (crashFile != null) {
       line = Strings.replace(line, "!JAVA_ERROR_FILE!", crashFile);
     }

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

@@ -8,6 +8,7 @@
 import com.datadoghq.profiler.JVMAccess;
 import com.sun.management.HotSpotDiagnosticMXBean;
 import datadog.environment.OperatingSystem;
+import datadog.environment.SystemProperties;
 import datadog.libs.ddprof.DdprofLibraryLoader;
 import datadog.trace.util.PidHelper;
 import datadog.trace.util.TempLocationManager;
@@ -162,7 +163,7 @@ static void writeConfig(Path scriptPath, String... entries) {
         bw.write(entries[i + 1]);
         bw.newLine();
       }
-      bw.write("java_home=" + System.getProperty("java.home"));
+      bw.write("java_home=" + SystemProperties.get("java.home"));
       bw.newLine();
 
       Runtime.getRuntime()

dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/parsers/HotspotCrashLogParser.java

@@ -11,6 +11,7 @@
 import datadog.crashtracking.dto.SemanticVersion;
 import datadog.crashtracking.dto.StackFrame;
 import datadog.crashtracking.dto.StackTrace;
+import datadog.environment.SystemProperties;
 import java.time.OffsetDateTime;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
@@ -214,10 +215,10 @@ public CrashLog parse(String crashLog) {
     Metadata metadata = new Metadata("dd-trace-java", VersionInfo.VERSION, "java", null);
     OSInfo osInfo =
         new OSInfo(
-            System.getProperty("os.arch"),
-            System.getProperty("sun.arch.data.model"),
-            System.getProperty("os.name"),
-            SemanticVersion.of(System.getProperty("os.version")));
+            SystemProperties.get("os.arch"),
+            SystemProperties.get("sun.arch.data.model"),
+            SystemProperties.get("os.name"),
+            SemanticVersion.of(SystemProperties.get("os.version")));
     ProcInfo procInfo = pid != null ? new ProcInfo(pid) : null;
     return new CrashLog(false, datetime, error, metadata, osInfo, procInfo);
   }

dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/CrashUploaderTest.java

@@ -8,6 +8,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import datadog.common.version.VersionInfo;
 import datadog.crashtracking.dto.CrashLog;
+import datadog.environment.SystemProperties;
 import datadog.trace.api.Config;
 import datadog.trace.bootstrap.config.provider.ConfigProvider;
 import java.io.BufferedReader;
@@ -184,7 +185,7 @@ public void testTelemetryHappyPath(String log) throws Exception {
     assertEquals(ENV, event.get("application").get("env").asText());
     assertEquals("jvm", event.get("application").get("language_name").asText());
     assertEquals(
-        System.getProperty("java.version", "unknown"),
+        SystemProperties.getOrDefault("java.version", "unknown"),
         event.get("application").get("language_version").asText());
     assertEquals(SERVICE, event.get("application").get("service_name").asText());
     assertEquals(VERSION, event.get("application").get("service_version").asText());