diff --git a/dd-java-agent/agent-crashtracking/src/main/resources/datadog/crashtracking/notify_oome.sh b/dd-java-agent/agent-crashtracking/src/main/resources/datadog/crashtracking/notify_oome.sh index 4623e157cb2..05371504b03 100644 --- a/dd-java-agent/agent-crashtracking/src/main/resources/datadog/crashtracking/notify_oome.sh +++ b/dd-java-agent/agent-crashtracking/src/main/resources/datadog/crashtracking/notify_oome.sh @@ -54,6 +54,9 @@ echo "PID: $PID" unset JDK_JAVA_OPTIONS unset JAVA_TOOL_OPTIONS unset _JAVA_OPTIONS +# Prevent the instrumentation injector from re-injecting the agent into the child JVM +unset LD_PRELOAD +unset DYLD_INSERT_LIBRARIES # Execute the Java command with the loaded values "$config_java_home/bin/java" -Ddd.dogstatsd.start-delay=0 -jar "$config_agent" sendOomeEvent "$config_tags" diff --git a/dd-java-agent/agent-crashtracking/src/main/resources/datadog/crashtracking/upload_crash.sh b/dd-java-agent/agent-crashtracking/src/main/resources/datadog/crashtracking/upload_crash.sh index 42b1fde286a..37abd608f06 100644 --- a/dd-java-agent/agent-crashtracking/src/main/resources/datadog/crashtracking/upload_crash.sh +++ b/dd-java-agent/agent-crashtracking/src/main/resources/datadog/crashtracking/upload_crash.sh @@ -11,6 +11,9 @@ if [ -z "$1" ]; then unset JDK_JAVA_OPTIONS unset JAVA_TOOL_OPTIONS unset _JAVA_OPTIONS + # Prevent the instrumentation injector from re-injecting the agent into the child JVM + unset LD_PRELOAD + unset DYLD_INSERT_LIBRARIES "!JAVA_HOME!/bin/java" -jar "!AGENT_JAR!" uploadCrash "!JAVA_ERROR_FILE!" if [ $? -eq 0 ]; then @@ -129,6 +132,9 @@ echo "PID: $PID" unset JDK_JAVA_OPTIONS unset JAVA_TOOL_OPTIONS unset _JAVA_OPTIONS +# Prevent the instrumentation injector from re-injecting the agent into the child JVM +unset LD_PRELOAD +unset DYLD_INSERT_LIBRARIES # Execute the Java command with the loaded values "$config_java_home/bin/java" -jar "$config_agent" uploadCrash -c "$configFile" "$config_hs_err"