Skip to content

Fix NoSuchMethodError in Log4j 2.7 log correlation #4600

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

Open
Anshuman-Prakash wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix NoSuchMethodError in Log4j 2.7 log correlation #4600

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
1 change: 1 addition & 0 deletions CHANGELOG.next-release.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ This file contains all changes which are not released yet.

# Fixes
<!--FIXES-START-->
* Fix `NoSuchMethodError` in Log4j 2.7 log correlation, which called `ThreadContext.removeAll` that is only available since Log4j 2.8 - [#4593](https://github.com/elastic/apm-agent-java/issues/4593)

<!--FIXES-END-->
# Features and enhancements
Expand Down
4 changes: 2 additions & 2 deletions ...4j2-plugin-tests/src/test/java/co/elastic/apm/agent/log4j2/Log4j2InstrumentationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
public class Log4j2InstrumentationTest {

@ParameterizedTest
@ValueSource(strings = {"2.6", "2.17.1", "2.24.0"})
@ValueSource(strings = {"2.6", "2.7", "2.17.1", "2.24.0"})
public void testInstrumentation(String version) throws Exception {
List<String> dependencies = List.of(
"org.apache.logging.log4j:log4j-core:" + version,
Expand All @@ -43,7 +43,7 @@ public void testInstrumentation(String version) throws Exception {
}

@ParameterizedTest
@ValueSource(strings = {"2.6", "2.17.1", "2.24.0"})
@ValueSource(strings = {"2.6", "2.7", "2.17.1", "2.24.0"})
public void testErrorCapture(String version) throws Exception {
List<String> dependencies = List.of(
"org.apache.logging.log4j:log4j-core:" + version,
Expand Down
7 changes: 5 additions & 2 deletions ...c/main/java/co/elastic/apm/agent/log4j2/correlation/Log4j2_7PlusLogCorrelationHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@
import java.util.Map;

/**
* Using {@link ThreadContext#putAll(Map)} that is available since 2.7 for improved efficiency
* Using {@link ThreadContext#putAll(Map)} that is available since 2.7 for improved efficiency.
* Keys are removed one by one, as {@link ThreadContext#removeAll(Iterable)} is only available since 2.8.
*/
public class Log4j2_7PlusLogCorrelationHelper extends AbstractLogCorrelationHelper {

Expand All @@ -44,6 +45,8 @@ protected boolean addToMdc() {

@Override
protected void removeFromMdc() {
ThreadContext.removeAll(CorrelationIdMapAdapter.allKeys());
for (String key : CorrelationIdMapAdapter.allKeys()) {
ThreadContext.remove(key);
}
}
}
Loading