Skip to content
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

Jump to bottom

avoid loading application log4j plugins #1214

Merged
merged 2 commits into from
Jun 5, 2020
Merged

avoid loading application log4j plugins #1214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae8096c
avoid loading application log4j plugins
SylvainJuge Jun 3, 2020
cb5a694
update changelog
SylvainJuge Jun 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
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 @@ -43,6 +43,7 @@ The latter uses https://github.com/elastic/ecs-logging-java[ecs-logging-java] to
* Fix `NumberFormatException` when parsing Ingres/Actian JDBC connection strings - {pull}1198[#1198]
* Prevent agent from overriding JVM configured truststore when not using HTTPS for communication with APM server - {pull}1203[#1203]
* Fix `java.lang.IllegalStateException` with `jps` JVM when using continuous runtime attach - {pull}1205[1205]
* Fix agent trying to load log4j2 plugins from application {pull}1214[1214]

[[release-notes-1.x]]
=== Java Agent version 1.x
Expand Down
5 changes: 5 additions & 0 deletions elastic-apm-agent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,11 @@
<pattern>Log4j-</pattern>
<shadedPattern>ElasticApmLog4j-</shadedPattern>
</relocation>
<relocation>
<!-- makes sure that direct link to resources in meta-inf are also relocated, otherwise will load log4j plugins from app -->
<pattern>META-INF/org/apache/logging</pattern>
<shadedPattern>META-INF/co/elastic/apm/agent/shaded/logging</shadedPattern>
</relocation>

<relocation>
<pattern>org.stagemonitor</pattern>
Expand Down