diff --git a/instrumentation/kafka-clients/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/KafkaConsumerInstrumentation.java b/instrumentation/kafka-clients/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/KafkaConsumerInstrumentation.java index a5d763e815..b69822cbb0 100644 --- a/instrumentation/kafka-clients/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/KafkaConsumerInstrumentation.java +++ b/instrumentation/kafka-clients/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/KafkaConsumerInstrumentation.java @@ -61,7 +61,7 @@ public class KafkaConsumerInstrumentation implements TypeInstrumentation { public static void wrap( @Advice.Return(readOnly = false) Iterable> iterable) { if (iterable != null) { - iterable = new TracingIterable(iterable, consumerInstrumenter()); + iterable = new TracingIterable(iterable); } } } @@ -72,7 +72,7 @@ public class KafkaConsumerInstrumentation implements TypeInstrumentation { @Advice.OnMethodExit(suppress = Throwable.class) public static void wrap(@Advice.Return(readOnly = false) List> iterable) { if (iterable != null) { - iterable = new TracingList(iterable, consumerInstrumenter()); + iterable = new TracingList(iterable); } } } diff --git a/instrumentation/kafka-clients/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/TracingIterable.java b/instrumentation/kafka-clients/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/TracingIterable.java index 676011593e..1660c6ec85 100644 --- a/instrumentation/kafka-clients/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/TracingIterable.java +++ b/instrumentation/kafka-clients/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/TracingIterable.java @@ -5,20 +5,17 @@ package io.opentelemetry.javaagent.instrumentation.kafkaclients; -import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; +import static io.opentelemetry.javaagent.instrumentation.kafkaclients.KafkaSingletons.consumerInstrumenter; + import java.util.Iterator; import org.apache.kafka.clients.consumer.ConsumerRecord; public class TracingIterable implements Iterable> { private final Iterable> delegate; - private final Instrumenter, Void> instrumenter; private boolean firstIterator = true; - public TracingIterable( - Iterable> delegate, - Instrumenter, Void> instrumenter) { + public TracingIterable(Iterable> delegate) { this.delegate = delegate; - this.instrumenter = instrumenter; } @Override @@ -28,7 +25,7 @@ public class TracingIterable implements Iterable> { // However, this is not thread-safe, but usually the first (hopefully only) traversal of // ConsumerRecords is performed in the same thread that called poll() if (firstIterator) { - it = new TracingIterator(delegate.iterator(), instrumenter); + it = new TracingIterator(delegate.iterator(), consumerInstrumenter()); firstIterator = false; } else { it = delegate.iterator(); diff --git a/instrumentation/kafka-clients/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/TracingList.java b/instrumentation/kafka-clients/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/TracingList.java index c87be3058c..7a92951b8b 100644 --- a/instrumentation/kafka-clients/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/TracingList.java +++ b/instrumentation/kafka-clients/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/TracingList.java @@ -5,7 +5,6 @@ package io.opentelemetry.javaagent.instrumentation.kafkaclients; -import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; import java.util.Collection; import java.util.List; import java.util.ListIterator; @@ -14,9 +13,8 @@ import org.apache.kafka.clients.consumer.ConsumerRecord; public class TracingList extends TracingIterable implements List> { private final List> delegate; - public TracingList( - List> delegate, Instrumenter, Void> instrumenter) { - super(delegate, instrumenter); + public TracingList(List> delegate) { + super(delegate); this.delegate = delegate; }