Use Java home of the crashed process to launch crash uploader

Author: jbachorik

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

@@ -90,6 +90,9 @@ static void writeConfig(Path scriptPath, String... entries) {
         bw.write(entries[i + 1]);
         bw.newLine();
       }
+      bw.write("java_home=" + System.getProperty("java.home"));
+      bw.newLine();
+
       Runtime.getRuntime()
           .addShutdownHook(
               new Thread(

dd-java-agent/agent-crashtracking/src/main/resources/com/datadog/crashtracking/notify_oome.bat

@@ -31,10 +31,11 @@ for /f "tokens=1,2 delims=: " %%a in (%configFile%.cfg) do (
 :: Debug: Print the loaded values (Optional)
 echo Agent Jar: %agent%
 echo Tags: %tags%
+echo JAVA_HOME: %java_home%
 echo PID: %PID%
 
 :: Execute the Java command with the loaded values
-java -Ddd.dogstatsd.start-delay=0 -jar "%agent%" sendOomeEvent "%tags%"
+%java_home%\bin\java -Ddd.dogstatsd.start-delay=0 -jar "%agent%" sendOomeEvent "%tags%"
 set RC=%ERRORLEVEL%
 del "%configFile%" :: Clean up the configuration file
 if %RC% EQU 0 (

dd-java-agent/agent-crashtracking/src/main/resources/com/datadog/crashtracking/notify_oome.sh

@@ -27,18 +27,19 @@ while IFS="=" read -r key value; do
 done < "$configFile"
 
 # Exiting early if configuration is missing
-if [ -z "${config_agent}" ] || [ -z "${config_tags}" ]; then
+if [ -z "${config_agent}" ] || [ -z "${config_tags}" ] || [ -z "${config_java_home}" ]; then
     echo "Error: Missing configuration"
     exit 1
 fi
 
 # Debug: Print the loaded values (Optional)
 echo "Agent Jar: ${config_agent}"
 echo "Tags: ${config_tags}"
+echo "JAVA_HOME: ${config_java_home}"
 echo "PID: $PID"
 
 # Execute the Java command with the loaded values
-java -Ddd.dogstatsd.start-delay=0 -jar "${config_agent}" sendOomeEvent "${config_tags}"
+${config_java_home}/bin/java -Ddd.dogstatsd.start-delay=0 -jar "${config_agent}" sendOomeEvent "${config_tags}"
 RC=$?
 rm -f "${configFile}" # Remove the configuration file
 

dd-java-agent/agent-crashtracking/src/main/resources/com/datadog/crashtracking/upload_crash.bat

@@ -1,9 +1,50 @@
 @echo off
 setlocal enabledelayedexpansion
 
+REM ========================================================
+REM Function: ensureJava
+REM Usage: call :ensureJava path\to\hs_err_file.txt
+REM If 'java' is not found in PATH, extract JAVA_HOME from the
+REM hs_err file and update PATH accordingly.
+REM ========================================================
+:ensureJava
+    REM Check if java is available
+    where java >nul 2>&1
+    if %ERRORLEVEL%==0 (
+        REM Java found; nothing to do.
+        goto :EOF
+    )
+
+    REM Java not found; try to extract JAVA_HOME from the hs_err file passed as parameter.
+    if "%~1"=="" (
+        echo Error: No hs_err file provided.
+        exit /b 1
+    )
+
+    REM Use findstr to locate the line with JAVA_HOME.
+    for /f "tokens=2 delims==" %%A in ('findstr "JAVA_HOME" "%~1"') do (
+        set "JAVA_HOME=%%A"
+    )
+
+    REM Check if JAVA_HOME was found
+    if not defined JAVA_HOME (
+        echo Error: Java executable not found. Cannot upload error file.
+        exit /b 1
+    )
+
+    REM Optionally, remove any surrounding quotes or spaces:
+    set "JAVA_HOME=%JAVA_HOME:"=%"
+    for /f "tokens=* delims= " %%A in ("%JAVA_HOME%") do set "JAVA_HOME=%%A"
+
+    REM Prepend JAVA_HOME\bin to PATH
+    set "PATH=%JAVA_HOME%\bin;%PATH%"
+    goto :EOF
+
+
 :: Check if PID is provided
 if "%1"=="" (
     echo "Error: No PID provided. Running in legacy mode."
+    call :ensureJava "!JAVA_ERROR_FILE!"
     java -jar "!AGENT_JAR!" uploadCrash "!JAVA_ERROR_FILE!"
     if %ERRORLEVEL% EQU 0 (
         echo "Uploaded error file \"!JAVA_ERROR_FILE!\""
@@ -38,10 +79,11 @@ for /f "tokens=1,2 delims=: " %%a in (%configFile%.cfg) do (
 :: Debug: Print the loaded values (Optional)
 echo Agent Jar: %agent%
 echo Error Log: %hs_err%
+echo JAVA_HOME: %java_home%
 echo PID: %PID%
 
 :: Execute the Java command with the loaded values
-java -jar "%agent%" uploadCrash "%hs_err%"
+%java_home%\bin\java -jar "%agent%" uploadCrash "%hs_err%"
 set RC=%ERRORLEVEL%
 del "%configFile%" :: Clean up the configuration file
 if %RC% EQU 0 (

dd-java-agent/agent-crashtracking/src/main/resources/com/datadog/crashtracking/upload_crash.sh

@@ -2,9 +2,27 @@
 
 set +e # Disable exit on error
 
+function ensureJava() {
+  # Check if Java is available
+  if [ -z "$(which java)" ]; then
+    # Extract the JAVA_HOME from the provided hs_err file
+    JAVA_HOME=$(grep "JAVA_HOME" "$1")
+    if [ -n "$JAVA_HOME" ]; then
+      JAVA_HOME=$(cut -f2 -d '=' <<< "$JAVA_HOME")
+      export JAVA_HOME
+      export PATH=$JAVA_HOME/bin:$PATH
+    else
+      echo "Error: Java executable not found. Can not upload error file."
+      exit 1
+    fi
+  fi
+}
+
 # Check if PID is provided
 if [ -z "$1" ]; then
   echo "Warn: No PID provided. Running in legacy mode."
+  ensureJava "!JAVA_ERROR_FILE!"
+
   java -jar "!AGENT_JAR!" uploadCrash "!JAVA_ERROR_FILE!"
   if [ $? -eq 0 ]; then
     echo "Error file !JAVA_ERROR_FILE! was uploaded successfully"
@@ -35,18 +53,19 @@ while IFS="=" read -r key value; do
 done < "$configFile"
 
 # Exiting early if configuration is missing
-if [ -z "${config_agent}" ] || [ -z "${config_hs_err}" ]; then
+if [ -z "${config_agent}" ] || [ -z "${config_hs_err}" ] || [ -z "${config_java_home}" ]; then
     echo "Error: Missing configuration"
     exit 1
 fi
 
 # Debug: Print the loaded values (Optional)
 echo "Agent Jar: ${config_agent}"
 echo "Error Log: ${config_hs_err}"
+echo "JAVA_HOME: ${config_java_home}"
 echo "PID: $PID"
 
 # Execute the Java command with the loaded values
-java -jar "${config_agent}" uploadCrash "${config_hs_err}"
+${config_java_home}/bin/java -jar "${config_agent}" uploadCrash "${config_hs_err}"
 RC=$?
 rm -f "${configFile}" # Remove the configuration file
 

dd-java-agent/agent-crashtracking/src/test/java/com/datadog/crashtracking/ScriptInitializerTest.java

@@ -65,6 +65,8 @@ void testCrashUploaderInitializationSuccess(String target, String pidArg)
     assertFalse(lines.isEmpty(), "File " + file + " is expected to be non-empty");
     // sanity to check the crash log file was properly replaced in the script
     assertTrue(lines.stream().anyMatch(l -> l.contains(hsErrFile)));
+    // sanity to check the java home was properly captured
+    assertTrue(lines.stream().anyMatch(l -> l.contains("java_home")));
   }
 
   @Test
@@ -96,6 +98,8 @@ void testOomeNotifierInitializationSuccess(String target) throws IOException {
     assertFalse(lines.isEmpty(), "File " + file + " is expected to be non-empty");
     // sanity to check the placeholder was properly replaced
     assertTrue(lines.stream().anyMatch(l -> !l.contains("!TAGS!")));
+    // sanity to check the java home was properly captured
+    assertTrue(lines.stream().anyMatch(l -> l.contains("java_home")));
   }
 
   @Test