kafka

Author: SylvainJuge

instrumentation/spring/spring-kafka-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/kafka/v2_7/AbstractMessageListenerContainerInstrumentation.java

@@ -14,6 +14,7 @@
 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.matcher.ElementMatcher;
 import org.springframework.kafka.listener.RecordInterceptor;
@@ -43,9 +44,11 @@ public void transform(TypeTransformer transformer) {
   @SuppressWarnings("unused")
   public static class GetRecordInterceptorAdvice {
 
+    @AssignReturned.ToReturned
     @Advice.OnMethodExit(suppress = Throwable.class)
-    public static <K, V> void onExit(
-        @Advice.Return(readOnly = false) RecordInterceptor<K, V> interceptor) {
+    public static <K, V> RecordInterceptor<K, V> onExit(
+        @Advice.Return RecordInterceptor<K, V> originalInterceptor) {
+      RecordInterceptor<K, V> interceptor = originalInterceptor;
 
       if (interceptor == null
           || !interceptor
@@ -55,6 +58,7 @@ public static <K, V> void onExit(
                   "io.opentelemetry.instrumentation.spring.kafka.v2_7.InstrumentedRecordInterceptor")) {
         interceptor = telemetry().createRecordInterceptor(interceptor);
       }
+      return interceptor;
     }
   }
 }

instrumentation/spring/spring-kafka-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/kafka/v2_7/ListenerConsumerInstrumentation.java

@@ -19,6 +19,7 @@
 import io.opentelemetry.javaagent.bootstrap.spring.SpringSchedulingTaskTracing;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
+import javax.annotation.Nullable;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
@@ -77,37 +78,53 @@ public static void onExit(@Advice.Enter boolean previousValue) {
   @SuppressWarnings("unused")
   public static class InvokeBatchAdvice {
 
+    public static class AdviceScope {
+      public final KafkaReceiveRequest request;
+      public final Context context;
+      public final Scope scope;
+
+      private AdviceScope(KafkaReceiveRequest request, Context context, Scope scope) {
+        this.request = request;
+        this.context = context;
+        this.scope = scope;
+      }
+
+      @Nullable
+      public static AdviceScope start(ConsumerRecords<?, ?> records, Consumer<?, ?> consumer) {
+        KafkaConsumerContext consumerContext = KafkaConsumerContextUtil.get(records);
+        Context receiveContext = consumerContext.getContext();
+
+        // use the receive CONSUMER span as parent if it's available
+        Context parentContext = receiveContext != null ? receiveContext : Context.current();
+        KafkaReceiveRequest request = KafkaReceiveRequest.create(records, consumer);
+
+        if (!batchProcessInstrumenter().shouldStart(parentContext, request)) {
+          return null;
+        }
+        Context context = batchProcessInstrumenter().start(parentContext, request);
+        return new AdviceScope(request, context, context.makeCurrent());
+      }
+
+      public void close(@Nullable Throwable throwable) {
+        scope.close();
+        batchProcessInstrumenter().end(context, request, null, throwable);
+      }
+    }
+
     @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(
+    public static AdviceScope onEnter(
         @Advice.Argument(0) ConsumerRecords<?, ?> records,
-        @Advice.FieldValue("consumer") Consumer<?, ?> consumer,
-        @Advice.Local("otelRequest") KafkaReceiveRequest request,
-        @Advice.Local("otelContext") Context context,
-        @Advice.Local("otelScope") Scope scope) {
-      KafkaConsumerContext consumerContext = KafkaConsumerContextUtil.get(records);
-      Context receiveContext = consumerContext.getContext();
-
-      // use the receive CONSUMER span as parent if it's available
-      Context parentContext = receiveContext != null ? receiveContext : Context.current();
-
-      request = KafkaReceiveRequest.create(records, consumer);
-      if (batchProcessInstrumenter().shouldStart(parentContext, request)) {
-        context = batchProcessInstrumenter().start(parentContext, request);
-        scope = context.makeCurrent();
-      }
+        @Advice.FieldValue("consumer") Consumer<?, ?> consumer) {
+      return AdviceScope.start(records, consumer);
     }
 
     @Advice.OnMethodExit(suppress = Throwable.class, onThrowable = Throwable.class)
     public static void onExit(
-        @Advice.Thrown Throwable throwable,
-        @Advice.Local("otelRequest") KafkaReceiveRequest request,
-        @Advice.Local("otelContext") Context context,
-        @Advice.Local("otelScope") Scope scope) {
-      if (scope == null) {
-        return;
+        @Advice.Thrown @Nullable Throwable throwable,
+        @Advice.Enter @Nullable AdviceScope adviceScope) {
+      if (adviceScope != null) {
+        adviceScope.close(throwable);
       }
-      scope.close();
-      batchProcessInstrumenter().end(context, request, null, throwable);
     }
   }
 }

instrumentation/spring/spring-kafka-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/kafka/v2_7/SpringKafkaInstrumentationModule.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 SpringKafkaInstrumentationModule extends InstrumentationModule {
+public class SpringKafkaInstrumentationModule extends InstrumentationModule
+    implements ExperimentalInstrumentationModule {
   public SpringKafkaInstrumentationModule() {
     super("spring-kafka", "spring-kafka-2.7");
   }
@@ -24,4 +26,9 @@ public List<TypeInstrumentation> typeInstrumentations() {
         new AbstractMessageListenerContainerInstrumentation(),
         new ListenerConsumerInstrumentation());
   }
+
+  @Override
+  public boolean isIndyReady() {
+    return true;
+  }
 }