log4j-context-data

Author: SylvainJuge

instrumentation/log4j/log4j-context-data/log4j-context-data-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/contextdata/v2_7/ContextDataInjectorFactoryInstrumentation.java

@@ -14,8 +14,8 @@
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
 import net.bytebuddy.asm.Advice;
+import net.bytebuddy.asm.Advice.AssignReturned;
 import net.bytebuddy.description.type.TypeDescription;
-import net.bytebuddy.implementation.bytecode.assign.Assigner;
 import net.bytebuddy.matcher.ElementMatcher;
 import org.apache.logging.log4j.core.ContextDataInjector;
 
@@ -39,11 +39,10 @@ public void transform(TypeTransformer transformer) {
   @SuppressWarnings("unused")
   public static class CreateInjectorAdvice {
 
+    @AssignReturned.ToReturned
     @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void onExit(
-        @Advice.Return(typing = Assigner.Typing.DYNAMIC, readOnly = false)
-            ContextDataInjector injector) {
-      injector = new SpanDecoratingContextDataInjector(injector);
+    public static ContextDataInjector onExit(@Advice.Return ContextDataInjector injector) {
+      return new SpanDecoratingContextDataInjector(injector);
     }
   }
 }

instrumentation/log4j/log4j-context-data/log4j-context-data-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/contextdata/v2_7/Log4j27InstrumentationModule.java

@@ -12,11 +12,13 @@
 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;
 import net.bytebuddy.matcher.ElementMatcher;
 
 @AutoService(InstrumentationModule.class)
-public class Log4j27InstrumentationModule extends InstrumentationModule {
+public class Log4j27InstrumentationModule extends InstrumentationModule
+    implements ExperimentalInstrumentationModule {
   public Log4j27InstrumentationModule() {
     super("log4j-context-data", "log4j-context-data-2.7");
   }
@@ -40,4 +42,9 @@ public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
   public List<TypeInstrumentation> typeInstrumentations() {
     return singletonList(new ContextDataInjectorFactoryInstrumentation());
   }
+
+  @Override
+  public boolean isIndyReady() {
+    return true;
+  }
 }