Skip to content

Start Datadog appender when doing agentless log submission for Log4j2 #7160

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
nikita-tkachenko-datadog merged 1 commit into from
Jun 11, 2024
Merged

Start Datadog appender when doing agentless log submission for Log4j2 #7160

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
13 changes: 13 additions & 0 deletions ...ntake/src/main/java/datadog/trace/instrumentation/log4j2/LoggerConfigInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@
import datadog.trace.agent.tooling.Instrumenter;
import datadog.trace.agent.tooling.InstrumenterModule;
import datadog.trace.api.Config;
import java.util.Map;
import java.util.Set;
import net.bytebuddy.asm.Advice;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.core.Appender;
import org.apache.logging.log4j.core.config.LoggerConfig;

@AutoService(InstrumenterModule.class)
Expand Down Expand Up @@ -44,7 +46,18 @@ public void methodAdvice(MethodTransformer transformer) {
public static class LoggerConfigConstructorAdvice {
@Advice.OnMethodExit(suppress = Throwable.class)
public static void onExit(@Advice.This LoggerConfig loggerConfig) {
Map<String, Appender> appenders = loggerConfig.getAppenders();
if (appenders != null) {
for (Appender appender : appenders.values()) {
if (appender instanceof DatadogAppender) {
return;
}
}
}

DatadogAppender appender = new DatadogAppender("datadog", null);
appender.start();

Config config = Config.get();
Level level = Level.valueOf(config.getAgentlessLogSubmissionLevel());
loggerConfig.addAppender(appender, level, null);
Expand Down