Skip to content

Security Manager log file fallback #2581

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

Merged
SylvainJuge merged 5 commits into from
Apr 28, 2022
Merged

Security Manager log file fallback #2581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3156611
add fallback when log not writeable due to SM
SylvainJuge Apr 12, 2022
fa83a60
Merge branch 'main' of github.com:elastic/apm-agent-java into securit…
SylvainJuge Apr 25, 2022
9aee23a
update changelog
SylvainJuge Apr 25, 2022
1d74252
Merge branch 'main' of github.com:elastic/apm-agent-java into securit…
SylvainJuge Apr 27, 2022
e93e3fa
Merge branch 'main' of github.com:elastic/apm-agent-java into securit…
SylvainJuge Apr 28, 2022
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
1 change: 1 addition & 0 deletions CHANGELOG.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ endif::[]
===== Bug fixes
* Fixed multiple dropped stats types in a transaction producing invalid JSON: {pull}2589[#2589]
* Fixed NoClassDefFoundError when using OTel bridge and span.*current() : {pull}2596[#2596]
* Fallback to standard output when Security Manager prevents writing to log file - {pull}2581[#2581]

[[release-notes-1.x]]
=== Java Agent version 1.x
Expand Down
18 changes: 13 additions & 5 deletions apm-agent-core/src/main/java/co/elastic/apm/agent/logging/Log4j2ConfigurationFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,12 +91,20 @@ static String getActualLogFile(@Nullable String agentHome, String logFile) {
logFile = logFile.replace(AGENT_HOME_PLACEHOLDER, agentHome);
}
}
logFile = new File(logFile).getAbsolutePath();
final File logDir = new File(logFile).getParentFile();
if (!logDir.exists()) {
logDir.mkdirs();

boolean canWrite;
try {
logFile = new File(logFile).getAbsolutePath();
final File logDir = new File(logFile).getParentFile();
if (!logDir.exists()) {
logDir.mkdirs();
}
canWrite = logDir.canWrite();
} catch (SecurityException e) {
canWrite = false;
}
if (!logDir.canWrite()) {

if(!canWrite){
System.err.println("[elastic-apm-agent] WARN Log file " + logFile + " is not writable. Falling back to System.out.");
return SYSTEM_OUT;
}
Expand Down