diff --git a/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInstrumentation.java b/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInstrumentation.java index d79e8a084b..2bad26c99e 100644 --- a/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInstrumentation.java +++ b/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInstrumentation.java @@ -1,5 +1,6 @@ package datadog.trace.instrumentation.kafka_clients; +import static datadog.trace.agent.tooling.ByteBuddyElementMatchers.safeHasSuperType; import static datadog.trace.instrumentation.kafka_clients.KafkaDecorator.CONSUMER_DECORATE; import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.isPublic; @@ -55,7 +56,7 @@ public final class KafkaConsumerInstrumentation extends Instrumenter.Default { .and( takesArgument(0, String.class) .or(takesArgument(0, named("org.apache.kafka.common.TopicPartition")))) - .and(returns(Iterable.class)), + .and(returns(safeHasSuperType(named(Iterable.class.getName())))), IterableAdvice.class.getName()); transformers.put( isMethod()