Skip to content

Fix LinkageError in apm-ecs-logging-plugin #2458

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
merged 3 commits into from
Feb 9, 2022
Merged

Fix LinkageError in apm-ecs-logging-plugin #2458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d54738a
Fixed:
tobiasstadler Feb 7, 2022
7f7ce59
Do not try to instrument the bundled `co.elastic.logging.log4j2.EcsLa…
tobiasstadler Feb 8, 2022
dfe0104
Fix not loading `org.slf4j*` from the agent class loader
tobiasstadler Feb 8, 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
2 changes: 1 addition & 1 deletion ...agent-core/src/main/java/co/elastic/apm/agent/bci/classloading/IndyPluginClassLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ agentClassLoader, startsWith("co.elastic.apm.agent").or(startsWith("net.bytebudd
// The list of packages not to load should correspond with matching dependency exclusions from the apm-agent-core in apm-agent-plugins/pom.xml
// As we're using a custom logging facade, plugins don't need to refer to the agent-bundled log4j2 or slf4j.
return new DiscriminatingMultiParentClassLoader(
agentClassLoader, not(startsWith("org.apache.logging.log4j").and(not(startsWith("org.slf4j")))),
agentClassLoader, not(startsWith("org.apache.logging.log4j")).and(not(startsWith("org.slf4j"))).and(not(startsWith("co.elastic.logging.log4j2"))),
targetClassLoader, ElementMatchers.<String>any());
}
}
Expand Down
7 changes: 7 additions & 0 deletions ...ugin/src/main/java/co/elastic/apm/agent/ecs_logging/Log4j2ServiceNameInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
package co.elastic.apm.agent.ecs_logging;

import co.elastic.apm.agent.bci.TracerAwareInstrumentation;
import co.elastic.apm.agent.bci.bytebuddy.CustomElementMatchers;
import co.elastic.apm.agent.configuration.CoreConfiguration;
import co.elastic.apm.agent.configuration.ServiceInfo;
import co.elastic.apm.agent.impl.ElasticApmTracer;
Expand All @@ -33,9 +34,15 @@
import java.util.Collection;

import static net.bytebuddy.matcher.ElementMatchers.named;
import static net.bytebuddy.matcher.ElementMatchers.not;

public class Log4j2ServiceNameInstrumentation extends TracerAwareInstrumentation {

@Override
public ElementMatcher.Junction<ClassLoader> getClassLoaderMatcher() {
return not(CustomElementMatchers.isAgentClassLoader());
}

@Override
public ElementMatcher<? super TypeDescription> getTypeMatcher() {
return named("co.elastic.logging.log4j2.EcsLayout$Builder");
Expand Down