log4j-appender-2.17

Author: SylvainJuge

instrumentation/log4j/log4j-appender-2.17/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/appender/v2_17/Log4jAppenderInstrumentation.java

@@ -69,25 +69,25 @@ public void transform(TypeTransformer transformer) {
   public static class LogAdvice {
 
     @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void methodEnter(
+    public static CallDepth methodEnter(
         @Advice.This Logger logger,
         @Advice.Argument(0) Level level,
         @Advice.Argument(1) Marker marker,
         @Advice.Argument(2) String loggerClassName,
         @Advice.Argument(3) StackTraceElement location,
         @Advice.Argument(4) Message message,
-        @Advice.Argument(5) Throwable t,
-        @Advice.Local("otelCallDepth") CallDepth callDepth) {
+        @Advice.Argument(5) Throwable t) {
       // need to track call depth across all loggers in order to avoid double capture when one
       // logging framework delegates to another
-      callDepth = CallDepth.forClass(LoggerProvider.class);
+      CallDepth callDepth = CallDepth.forClass(LoggerProvider.class);
       if (callDepth.getAndIncrement() == 0) {
         Log4jHelper.capture(logger, loggerClassName, location, level, marker, message, t);
       }
+      return callDepth;
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void methodExit(@Advice.Local("otelCallDepth") CallDepth callDepth) {
+    public static void methodExit(@Advice.Enter CallDepth callDepth) {
       callDepth.decrementAndGet();
     }
   }
@@ -96,24 +96,24 @@ public static void methodExit(@Advice.Local("otelCallDepth") CallDepth callDepth
   public static class LogMessageAdvice {
 
     @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void methodEnter(
+    public static CallDepth methodEnter(
         @Advice.This Logger logger,
         @Advice.Argument(0) String loggerClassName,
         @Advice.Argument(1) Level level,
         @Advice.Argument(2) Marker marker,
         @Advice.Argument(3) Message message,
-        @Advice.Argument(4) Throwable t,
-        @Advice.Local("otelCallDepth") CallDepth callDepth) {
+        @Advice.Argument(4) Throwable t) {
       // need to track call depth across all loggers in order to avoid double capture when one
       // logging framework delegates to another
-      callDepth = CallDepth.forClass(LoggerProvider.class);
+      CallDepth callDepth = CallDepth.forClass(LoggerProvider.class);
       if (callDepth.getAndIncrement() == 0) {
         Log4jHelper.capture(logger, loggerClassName, null, level, marker, message, t);
       }
+      return callDepth;
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void methodExit(@Advice.Local("otelCallDepth") CallDepth callDepth) {
+    public static void methodExit(@Advice.Enter CallDepth callDepth) {
       callDepth.decrementAndGet();
     }
   }

instrumentation/log4j/log4j-appender-2.17/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/appender/v2_17/Log4jAppenderInstrumentationModule.java

@@ -10,10 +10,12 @@
 import com.google.auto.service.AutoService;
 import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
+import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule;
 import java.util.List;
 
 @AutoService(InstrumentationModule.class)
-public class Log4jAppenderInstrumentationModule extends InstrumentationModule {
+public class Log4jAppenderInstrumentationModule extends InstrumentationModule
+    implements ExperimentalInstrumentationModule {
 
   public Log4jAppenderInstrumentationModule() {
     super("log4j-appender", "log4j-appender-2.17");
@@ -23,4 +25,9 @@ public Log4jAppenderInstrumentationModule() {
   public List<TypeInstrumentation> typeInstrumentations() {
     return singletonList(new Log4jAppenderInstrumentation());
   }
+
+  @Override
+  public boolean isIndyReady() {
+    return true;
+  }
 }