Skip to content

Commit dfc80be

Browse files
authored
Guard against null logback events (#11960)
Guard against null logback events Co-authored-by: andrea.marziali <andrea.marziali@datadoghq.com>
1 parent d80a30e commit dfc80be

1 file changed

Lines changed: 6 additions & 0 deletions

File tree

dd-java-agent/instrumentation/logback-1.0/src/main/java/datadog/trace/instrumentation/logback/LogbackLoggerInstrumentation.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,9 @@ public void methodAdvice(MethodTransformer transformer) {
7474
public static class CallAppendersAdvice {
7575
@Advice.OnMethodEnter(suppress = Throwable.class)
7676
public static void onEnter(@Advice.Argument(0) ILoggingEvent event) {
77+
if (event == null) {
78+
return;
79+
}
7780
AgentSpan span = activeSpan();
7881

7982
if (span != null && traceConfig(span).isLogsInjectionEnabled()) {
@@ -86,6 +89,9 @@ public static void onEnter(@Advice.Argument(0) ILoggingEvent event) {
8689
public static class CallAppendersAdvice2 {
8790
@Advice.OnMethodEnter(suppress = Throwable.class)
8891
public static void onEnter(@Advice.Argument(0) ILoggingEvent event) {
92+
if (event == null) {
93+
return;
94+
}
8995
LogsIntakeHelper.log(event);
9096
}
9197
}

0 commit comments

Comments
 (0)