Skip to content

Fix crash tracking initialization on Windows #10042

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
bmermet wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Fix crash tracking initialization on Windows #10042

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions ...ent-crashtracking/src/main/java/datadog/crashtracking/CrashUploaderScriptInitializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import static java.nio.file.attribute.PosixFilePermissions.fromString;
import static java.util.Locale.ROOT;

import datadog.environment.OperatingSystem;
import datadog.environment.SystemProperties;
import datadog.trace.util.PidHelper;
import datadog.trace.util.Strings;
Expand Down Expand Up @@ -63,7 +64,11 @@ private static boolean copyCrashUploaderScript(
Path scriptPath, String onErrorFile, String agentJar) {
Path scriptDirectory = scriptPath.getParent();
try {
Files.createDirectories(scriptDirectory, asFileAttribute(fromString(RWXRWXRWX)));
if (OperatingSystem.isWindows()) {
Files.createDirectories(scriptDirectory);
} else {
Files.createDirectories(scriptDirectory, asFileAttribute(fromString(RWXRWXRWX)));
}
} catch (UnsupportedOperationException e) {
LOG.warn(
SEND_TELEMETRY,
Expand Down Expand Up @@ -109,7 +114,9 @@ private static void writeCrashUploaderScript(
bw.newLine();
}
}
Files.setPosixFilePermissions(scriptPath, fromString(R_XR_XR_X));
if (!OperatingSystem.isWindows()) {
Files.setPosixFilePermissions(scriptPath, fromString(R_XR_XR_X));
}
}
}

Expand Down
13 changes: 10 additions & 3 deletions ...gent-crashtracking/src/main/java/datadog/crashtracking/OOMENotifierScriptInitializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import static java.nio.file.attribute.PosixFilePermissions.asFileAttribute;
import static java.nio.file.attribute.PosixFilePermissions.fromString;

import datadog.environment.OperatingSystem;
import datadog.trace.util.PidHelper;
import java.io.IOException;
import java.nio.file.FileAlreadyExistsException;
Expand Down Expand Up @@ -81,12 +82,16 @@ private static boolean copyOOMEscript(Path scriptPath) {
return false;
}
} else {
Files.createDirectories(scriptDirectory, asFileAttribute(fromString(RWXRWXRWX)));
if (OperatingSystem.isWindows()) {
Files.createDirectories(scriptDirectory);
} else {
Files.createDirectories(scriptDirectory, asFileAttribute(fromString(RWXRWXRWX)));
}
}
} catch (UnsupportedOperationException e) {
LOG.warn(
SEND_TELEMETRY,
"Unsupported permissions '{"
"Unsupported permissions '"
+ RWXRWXRWX
+ "' for {}. OOME notification will not work properly.",
scriptDirectory);
Expand All @@ -107,7 +112,9 @@ private static boolean copyOOMEscript(Path scriptPath) {
if (!Files.exists(scriptPath)) {
Files.copy(getOomeNotifierTemplate(), scriptPath);
}
Files.setPosixFilePermissions(scriptPath, fromString(R_XR_XR_X));
if (!OperatingSystem.isWindows()) {
Files.setPosixFilePermissions(scriptPath, fromString(R_XR_XR_X));
}
} catch (IOException e) {
LOG.warn(
SEND_TELEMETRY,
Expand Down
Loading