Skip to content

KafkaConsumerConfig event support for Kafka 3.7+ #2358

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jtduffy merged 1 commit into from
May 14, 2025
Merged

KafkaConsumerConfig event support for Kafka 3.7+ #2358

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions ....0/src/main/java/org/apache/kafka/kafka/common/config/AbstractConfig_Instrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
import com.newrelic.api.agent.weaver.Weaver;
import com.nr.instrumentation.kafka.config.ConfigEmitter;
import org.apache.kafka.clients.CommonClientConfigs;
import org.apache.kafka.clients.admin.KafkaAdminClient;
import org.apache.kafka.clients.consumer.KafkaConsumer;
import org.apache.kafka.clients.producer.KafkaProducer;
import org.apache.kafka.common.config.AbstractConfig;
import org.apache.kafka.common.config.ConfigDef;

Expand Down Expand Up @@ -43,9 +40,17 @@ public class AbstractConfig_Instrumentation {
@NewField
private static final Map<String, String> clientClassesToClientTypes = new HashMap<>();
static {
clientClassesToClientTypes.put(KafkaProducer.class.getName(), "producer");
clientClassesToClientTypes.put(KafkaConsumer.class.getName(), "consumer");
clientClassesToClientTypes.put(KafkaAdminClient.class.getName(), "admin");
clientClassesToClientTypes.put("org.apache.kafka.clients.producer.KafkaProducer", "producer");

final String consumer = "consumer";
clientClassesToClientTypes.put("org.apache.kafka.clients.consumer.KafkaConsumer", consumer); // 0.9 (maybe?) -> 3.6.2
// 3.7+ introduced a delegated consumer model, with the delegate class constructors
// now being the ones calling logUnused()
clientClassesToClientTypes.put("org.apache.kafka.clients.consumer.internals.LegacyKafkaConsumer", consumer); // 3.7 - 3.8
clientClassesToClientTypes.put("org.apache.kafka.clients.consumer.internals.ClassicKafkaConsumer", consumer); // 3.9
clientClassesToClientTypes.put("org.apache.kafka.clients.consumer.internals.AsyncKafkaConsumer", consumer); // 3.7+

clientClassesToClientTypes.put("org.apache.kafka.clients.admin.AdminClient", "admin");
}

private final Map<String, ?> originals = Weaver.callOriginal();
Expand Down
Loading