Move to kafka-clients-2.6.

open-telemetry · Sep 30, 2021 · 0912ff3 · 0912ff3
1 parent c697ba6
commit 0912ff3
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 22 deletions.
diff --git a/...brary/src/main/java/io/opentelemetry/instrumentation/kafkaclients/KafkaTracingHolder.java b/...brary/src/main/java/io/opentelemetry/instrumentation/kafkaclients/KafkaTracingHolder.java
diff --git a/...fka-clients-0.11/library/build.gradle.kts → ...afka-clients-2.6/library/build.gradle.kts b/...fka-clients-0.11/library/build.gradle.kts → ...afka-clients-2.6/library/build.gradle.kts
@@ -2,15 +2,13 @@ plugins {
   id("otel.library-instrumentation")
 }
 
-val versions: Map<String, String> by project
-
 dependencies {
   implementation(project(":instrumentation:kafka-clients:kafka-clients-common:library"))
-  library("org.apache.kafka:kafka-clients:2.8.1")
+  library("org.apache.kafka:kafka-clients:2.6.0")
 
   testImplementation(project(":instrumentation:kafka-clients:kafka-clients-0.11:testing"))
 
-  testImplementation("org.testcontainers:kafka:${versions["org.testcontainers"]}")
+  testImplementation("org.testcontainers:kafka")
 }
 
 tasks {

diff --git a/...umentation/kafkaclients/KafkaTracing.java → ...umentation/kafkaclients/KafkaTracing.java b/...umentation/kafkaclients/KafkaTracing.java → ...umentation/kafkaclients/KafkaTracing.java
diff --git a/...ion/kafkaclients/KafkaTracingBuilder.java → ...ion/kafkaclients/KafkaTracingBuilder.java b/...ion/kafkaclients/KafkaTracingBuilder.java → ...ion/kafkaclients/KafkaTracingBuilder.java
diff --git a/...ntation/kafkaclients/TracingConsumer.java → ...ntation/kafkaclients/TracingConsumer.java b/...ntation/kafkaclients/TracingConsumer.java → ...ntation/kafkaclients/TracingConsumer.java
diff --git a/...kaclients/TracingConsumerInterceptor.java → ...kaclients/TracingConsumerInterceptor.java b/...kaclients/TracingConsumerInterceptor.java → ...kaclients/TracingConsumerInterceptor.java
@@ -5,14 +5,21 @@
 
 package io.opentelemetry.instrumentation.kafkaclients;
 
+import io.opentelemetry.api.GlobalOpenTelemetry;
 import java.util.Map;
 import org.apache.kafka.clients.consumer.ConsumerInterceptor;
 import org.apache.kafka.clients.consumer.ConsumerRecords;
 import org.apache.kafka.clients.consumer.OffsetAndMetadata;
 import org.apache.kafka.common.TopicPartition;
 
-public class TracingConsumerInterceptor<K, V> extends KafkaTracingHolder
-    implements ConsumerInterceptor<K, V> {
+/**
+ * A ConsumerInterceptor that adds tracing capability. Add this interceptor's class name or class
+ * via ConsumerConfig.INTERCEPTOR_CLASSES_CONFIG property to your Consumer's properties to get it
+ * instantiated and used. See more details on ConsumerInterceptor usage in its Javadoc.
+ */
+public class TracingConsumerInterceptor<K, V> implements ConsumerInterceptor<K, V> {
+
+  private static final KafkaTracing tracing = KafkaTracing.create(GlobalOpenTelemetry.get());
 
   @Override
   public ConsumerRecords<K, V> onConsume(ConsumerRecords<K, V> records) {

diff --git a/...ntation/kafkaclients/TracingProducer.java → ...ntation/kafkaclients/TracingProducer.java b/...ntation/kafkaclients/TracingProducer.java → ...ntation/kafkaclients/TracingProducer.java
diff --git a/...kaclients/TracingProducerInterceptor.java → ...kaclients/TracingProducerInterceptor.java b/...kaclients/TracingProducerInterceptor.java → ...kaclients/TracingProducerInterceptor.java
@@ -5,13 +5,21 @@
 
 package io.opentelemetry.instrumentation.kafkaclients;
 
+import io.opentelemetry.api.GlobalOpenTelemetry;
 import java.util.Map;
 import org.apache.kafka.clients.producer.ProducerInterceptor;
 import org.apache.kafka.clients.producer.ProducerRecord;
 import org.apache.kafka.clients.producer.RecordMetadata;
 
-public class TracingProducerInterceptor<K, V> extends KafkaTracingHolder
-    implements ProducerInterceptor<K, V> {
+/**
+ * A ProducerInterceptor that adds tracing capability. Add this interceptor's class name or class
+ * via ProducerConfig.INTERCEPTOR_CLASSES_CONFIG property to your Producer's properties to get it
+ * instantiated and used. See more details on ProducerInterceptor usage in its Javadoc.
+ */
+public class TracingProducerInterceptor<K, V> implements ProducerInterceptor<K, V> {
+
+  private static final KafkaTracing tracing = KafkaTracing.create(GlobalOpenTelemetry.get());
+
   @Override
   public ProducerRecord<K, V> onSend(ProducerRecord<K, V> producerRecord) {
     tracing.buildAndInjectSpan(producerRecord);

diff --git a/...tion/kafkaclients/InterceptorsTest.groovy → ...tion/kafkaclients/InterceptorsTest.groovy b/...tion/kafkaclients/InterceptorsTest.groovy → ...tion/kafkaclients/InterceptorsTest.groovy
diff --git a/...entation/kafkaclients/WrappersTest.groovy → ...entation/kafkaclients/WrappersTest.groovy b/...entation/kafkaclients/WrappersTest.groovy → ...entation/kafkaclients/WrappersTest.groovy
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -218,8 +218,8 @@ include(":instrumentation:jsf:mojarra-1.2:javaagent")
 include(":instrumentation:jsf:myfaces-1.2:javaagent")
 include(":instrumentation:jsp-2.3:javaagent")
 include(":instrumentation:kafka-clients:kafka-clients-0.11:javaagent")
-include(":instrumentation:kafka-clients:kafka-clients-0.11:library")
 include(":instrumentation:kafka-clients:kafka-clients-0.11:testing")
+include(":instrumentation:kafka-clients:kafka-clients-2.6:library")
 include(":instrumentation:kafka-clients:kafka-clients-common:library")
 include(":instrumentation:kafka-streams-0.11:javaagent")
 include(":instrumentation:kotlinx-coroutines:javaagent")