up

Author: trask

instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/main/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/internal/KafkaConsumerTelemetry.java

@@ -40,12 +40,23 @@ public KafkaConsumerTelemetry(
     this.consumerProcessInstrumenter = consumerProcessInstrumenter;
   }
 
-  // this getter is needed for the deprecated wrap() methods in KafkaTelemetry
-  public Instrumenter<KafkaProcessRequest, Void> getConsumerProcessInstrumenter() {
-    return consumerProcessInstrumenter;
+  public <K, V> ConsumerRecords<K, V> addTracing(
+      ConsumerRecords<K, V> consumerRecords, KafkaConsumerContext consumerContext) {
+    if (consumerRecords.isEmpty()) {
+      return consumerRecords;
+    }
+
+    Map<TopicPartition, List<ConsumerRecord<K, V>>> records = new LinkedHashMap<>();
+    for (TopicPartition partition : consumerRecords.partitions()) {
+      List<ConsumerRecord<K, V>> list = consumerRecords.records(partition);
+      if (list != null && !list.isEmpty()) {
+        list = TracingList.wrap(list, consumerProcessInstrumenter, () -> true, consumerContext);
+      }
+      records.put(partition, list);
+    }
+    return new ConsumerRecords<>(records);
   }
 
-  // this overload is needed for the deprecated wrap() methods in KafkaTelemetry
   public <K, V> Context buildAndFinishSpan(
       ConsumerRecords<K, V> records, Consumer<K, V> consumer, Timer timer) {
     return buildAndFinishSpan(
@@ -78,21 +89,4 @@ public <K, V> Context buildAndFinishSpan(
     // https://github.com/open-telemetry/semantic-conventions/blob/main/docs/messaging/messaging-spans.md#batch-receiving
     return context;
   }
-
-  public <K, V> ConsumerRecords<K, V> addTracing(
-      ConsumerRecords<K, V> consumerRecords, KafkaConsumerContext consumerContext) {
-    if (consumerRecords.isEmpty()) {
-      return consumerRecords;
-    }
-
-    Map<TopicPartition, List<ConsumerRecord<K, V>>> records = new LinkedHashMap<>();
-    for (TopicPartition partition : consumerRecords.partitions()) {
-      List<ConsumerRecord<K, V>> list = consumerRecords.records(partition);
-      if (list != null && !list.isEmpty()) {
-        list = TracingList.wrap(list, consumerProcessInstrumenter, () -> true, consumerContext);
-      }
-      records.put(partition, list);
-    }
-    return new ConsumerRecords<>(records);
-  }
 }

instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/main/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/internal/KafkaProducerTelemetry.java

@@ -47,19 +47,6 @@ public KafkaProducerTelemetry(
     this.producerPropagationEnabled = producerPropagationEnabled;
   }
 
-  // these getters are needed for the deprecated wrap() methods in KafkaTelemetry
-  public TextMapPropagator getPropagator() {
-    return propagator;
-  }
-
-  public Instrumenter<KafkaProducerRequest, RecordMetadata> getProducerInstrumenter() {
-    return producerInstrumenter;
-  }
-
-  public TextMapSetter<Headers> getSetter() {
-    return SETTER;
-  }
-
   /**
    * Build and inject span into record.
    *