Review fixes for kafka-clients-common-0.11:library (open-telemetry#18133)

otelbot[bot] · trask · web-flow · commit 513607096c86 · 2026-04-22T05:06:39.000Z
Co-authored-by: otelbot &lt;197425009+otelbot@users.noreply.github.com&gt;
Co-authored-by: Trask Stalnaker &lt;trask.stalnaker@gmail.com&gt;
diff --git a/instrumentation/kafka/kafka-clients/kafka-clients-common-0.11/library/src/main/java/io/opentelemetry/instrumentation/kafkaclients/common/v0_11/internal/KafkaUtil.java b/instrumentation/kafka/kafka-clients/kafka-clients-common-0.11/library/src/main/java/io/opentelemetry/instrumentation/kafkaclients/common/v0_11/internal/KafkaUtil.java
@@ -102,13 +102,10 @@ private static String extractConsumerGroup(Consumer<?, ?> consumer) {
     if (GET_GROUP_METADATA == null || GET_GROUP_ID == null) {
       return null;
     }
-    if (consumer == null) {
-      return null;
-    }
     try {
       Object metadata = GET_GROUP_METADATA.invoke(consumer);
       return (String) GET_GROUP_ID.invoke(metadata);
-    } catch (Throwable e) {
+    } catch (Throwable t) {
       return null;
     }
   }
@@ -127,9 +124,7 @@ private static String extractClientId(Consumer<?, ?> consumer) {
 
   @Nullable
   public static String extractBootstrapServers(Producer<?, ?> producer) {
-    if (PRODUCER_CONFIG_FIELD == null
-        || producer == null
-        || !KafkaProducer.class.equals(producer.getClass())) {
+    if (PRODUCER_CONFIG_FIELD == null || !KafkaProducer.class.equals(producer.getClass())) {
       return null;
     }
     try {

Original file line number	Diff line number	Diff line change
`@@ -102,13 +102,10 @@ private static String extractConsumerGroup(Consumer<?, ?> consumer) {`
`102`	`102`	`if (GET_GROUP_METADATA == null \|\| GET_GROUP_ID == null) {`
`103`	`103`	`return null;`
`104`	`104`	`}`
`105`		`- if (consumer == null) {`
`106`		`- return null;`
`107`		`- }`
`108`	`105`	`try {`
`109`	`106`	`Object metadata = GET_GROUP_METADATA.invoke(consumer);`
`110`	`107`	`return (String) GET_GROUP_ID.invoke(metadata);`
`111`		`- } catch (Throwable e) {`
	`108`	`+ } catch (Throwable t) {`
`112`	`109`	`return null;`
`113`	`110`	`}`
`114`	`111`	`}`
`@@ -127,9 +124,7 @@ private static String extractClientId(Consumer<?, ?> consumer) {`
`127`	`124`
`128`	`125`	`@Nullable`
`129`	`126`	`public static String extractBootstrapServers(Producer<?, ?> producer) {`
`130`		`- if (PRODUCER_CONFIG_FIELD == null`
`131`		`- \|\| producer == null`
`132`		`- \|\| !KafkaProducer.class.equals(producer.getClass())) {`
	`127`	`+ if (PRODUCER_CONFIG_FIELD == null \|\| !KafkaProducer.class.equals(producer.getClass())) {`
`133`	`128`	`return null;`
`134`	`129`	`}`
`135`	`130`	`try {`