Skip to content

Commit 34830b8

Browse files
committed
Claude fix
1 parent 912bdde commit 34830b8

File tree

2 files changed

+19
-5
lines changed

2 files changed

+19
-5
lines changed

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import static java.nio.file.attribute.PosixFilePermissions.fromString;
1212
import static java.util.Locale.ROOT;
1313

14+
import datadog.environment.OperatingSystem;
1415
import datadog.environment.SystemProperties;
1516
import datadog.trace.util.PidHelper;
1617
import datadog.trace.util.Strings;
@@ -63,7 +64,11 @@ private static boolean copyCrashUploaderScript(
6364
Path scriptPath, String onErrorFile, String agentJar) {
6465
Path scriptDirectory = scriptPath.getParent();
6566
try {
66-
Files.createDirectories(scriptDirectory, asFileAttribute(fromString(RWXRWXRWX)));
67+
if (OperatingSystem.isWindows()) {
68+
Files.createDirectories(scriptDirectory);
69+
} else {
70+
Files.createDirectories(scriptDirectory, asFileAttribute(fromString(RWXRWXRWX)));
71+
}
6772
} catch (UnsupportedOperationException e) {
6873
LOG.warn(
6974
SEND_TELEMETRY,
@@ -109,7 +114,9 @@ private static void writeCrashUploaderScript(
109114
bw.newLine();
110115
}
111116
}
112-
Files.setPosixFilePermissions(scriptPath, fromString(R_XR_XR_X));
117+
if (!OperatingSystem.isWindows()) {
118+
Files.setPosixFilePermissions(scriptPath, fromString(R_XR_XR_X));
119+
}
113120
}
114121
}
115122

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

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import static java.nio.file.attribute.PosixFilePermissions.asFileAttribute;
1414
import static java.nio.file.attribute.PosixFilePermissions.fromString;
1515

16+
import datadog.environment.OperatingSystem;
1617
import datadog.trace.util.PidHelper;
1718
import java.io.IOException;
1819
import java.nio.file.FileAlreadyExistsException;
@@ -81,12 +82,16 @@ private static boolean copyOOMEscript(Path scriptPath) {
8182
return false;
8283
}
8384
} else {
84-
Files.createDirectories(scriptDirectory, asFileAttribute(fromString(RWXRWXRWX)));
85+
if (OperatingSystem.isWindows()) {
86+
Files.createDirectories(scriptDirectory);
87+
} else {
88+
Files.createDirectories(scriptDirectory, asFileAttribute(fromString(RWXRWXRWX)));
89+
}
8590
}
8691
} catch (UnsupportedOperationException e) {
8792
LOG.warn(
8893
SEND_TELEMETRY,
89-
"Unsupported permissions '{"
94+
"Unsupported permissions '"
9095
+ RWXRWXRWX
9196
+ "' for {}. OOME notification will not work properly.",
9297
scriptDirectory);
@@ -107,7 +112,9 @@ private static boolean copyOOMEscript(Path scriptPath) {
107112
if (!Files.exists(scriptPath)) {
108113
Files.copy(getOomeNotifierTemplate(), scriptPath);
109114
}
110-
Files.setPosixFilePermissions(scriptPath, fromString(R_XR_XR_X));
115+
if (!OperatingSystem.isWindows()) {
116+
Files.setPosixFilePermissions(scriptPath, fromString(R_XR_XR_X));
117+
}
111118
} catch (IOException e) {
112119
LOG.warn(
113120
SEND_TELEMETRY,

0 commit comments

Comments
 (0)