Add aliases to disambiguate the old and new Kafka instrumentations

mcculls · mcculls · commit 39229df6d9ed · 2024-11-25T10:11:32.000Z
diff --git a/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/ConsumerCoordinatorInstrumentation.java b/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/ConsumerCoordinatorInstrumentation.java
@@ -31,7 +31,7 @@ public final class ConsumerCoordinatorInstrumentation extends InstrumenterModule
     implements Instrumenter.ForSingleType {
 
   public ConsumerCoordinatorInstrumentation() {
-    super("kafka");
+    super("kafka", "kafka-0.11");
   }
 
   @Override
diff --git a/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInfoInstrumentation.java b/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInfoInstrumentation.java
@@ -43,7 +43,7 @@ public final class KafkaConsumerInfoInstrumentation extends InstrumenterModule.T
     implements Instrumenter.ForSingleType {
 
   public KafkaConsumerInfoInstrumentation() {
-    super("kafka");
+    super("kafka", "kafka-0.11");
   }
 
   @Override
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
@@ -30,7 +30,7 @@ public final class KafkaConsumerInstrumentation extends InstrumenterModule.Traci
     implements Instrumenter.ForSingleType {
 
   public KafkaConsumerInstrumentation() {
-    super("kafka");
+    super("kafka", "kafka-0.11");
   }
 
   @Override
diff --git a/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerInstrumentation.java b/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerInstrumentation.java
@@ -49,7 +49,7 @@ public final class KafkaProducerInstrumentation extends InstrumenterModule.Traci
     implements Instrumenter.ForSingleType {
 
   public KafkaProducerInstrumentation() {
-    super("kafka");
+    super("kafka", "kafka-0.11");
   }
 
   @Override
diff --git a/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/MetadataInstrumentation.java b/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/MetadataInstrumentation.java
@@ -26,7 +26,7 @@ public class MetadataInstrumentation extends InstrumenterModule.Tracing
     implements Instrumenter.ForTypeHierarchy {
 
   public MetadataInstrumentation() {
-    super("kafka");
+    super("kafka", "kafka-0.11");
   }
 
   @Override
diff --git a/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/ConsumerCoordinatorInstrumentation.java b/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/ConsumerCoordinatorInstrumentation.java
@@ -16,7 +16,7 @@ public final class ConsumerCoordinatorInstrumentation extends InstrumenterModule
     implements Instrumenter.ForSingleType {
 
   public ConsumerCoordinatorInstrumentation() {
-    super("kafka");
+    super("kafka", "kafka-3.8");
   }
 
   @Override
diff --git a/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/KafkaConsumerInfoInstrumentation.java b/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/KafkaConsumerInfoInstrumentation.java
@@ -28,7 +28,7 @@ public final class KafkaConsumerInfoInstrumentation extends InstrumenterModule.T
     implements Instrumenter.ForTypeHierarchy {
 
   public KafkaConsumerInfoInstrumentation() {
-    super("kafka");
+    super("kafka", "kafka-3.8");
   }
 
   @Override
diff --git a/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/KafkaConsumerInstrumentation.java b/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/KafkaConsumerInstrumentation.java
@@ -23,7 +23,7 @@ public final class KafkaConsumerInstrumentation extends InstrumenterModule.Traci
     implements Instrumenter.ForSingleType {
 
   public KafkaConsumerInstrumentation() {
-    super("kafka");
+    super("kafka", "kafka-3.8");
   }
 
   @Override
diff --git a/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/KafkaProducerInstrumentation.java b/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/KafkaProducerInstrumentation.java
@@ -19,7 +19,7 @@ public final class KafkaProducerInstrumentation extends InstrumenterModule.Traci
     implements Instrumenter.ForSingleType {
 
   public KafkaProducerInstrumentation() {
-    super("kafka");
+    super("kafka", "kafka-3.8");
   }
 
   @Override
diff --git a/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/LegacyKafkaConsumerInfoInstrumentation.java b/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/LegacyKafkaConsumerInfoInstrumentation.java
@@ -28,7 +28,7 @@ public final class LegacyKafkaConsumerInfoInstrumentation extends InstrumenterMo
     implements Instrumenter.ForTypeHierarchy {
 
   public LegacyKafkaConsumerInfoInstrumentation() {
-    super("kafka");
+    super("kafka", "kafka-3.8");
   }
 
   @Override
diff --git a/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/MetadataInstrumentation.java b/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/MetadataInstrumentation.java
@@ -19,7 +19,7 @@ public class MetadataInstrumentation extends InstrumenterModule.Tracing
     implements Instrumenter.ForTypeHierarchy {
 
   public MetadataInstrumentation() {
-    super("kafka");
+    super("kafka", "kafka-3.8");
   }
 
   @Override
diff --git a/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/OffsetCommitCallbackInvokerInstrumentation.java b/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/OffsetCommitCallbackInvokerInstrumentation.java
@@ -13,7 +13,7 @@
 public class OffsetCommitCallbackInvokerInstrumentation extends InstrumenterModule.Tracing
     implements Instrumenter.ForSingleType {
   public OffsetCommitCallbackInvokerInstrumentation() {
-    super("kafka");
+    super("kafka", "kafka-3.8");
   }
 
   @Override

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public final class ConsumerCoordinatorInstrumentation extends InstrumenterModule`
`31`	`31`	`implements Instrumenter.ForSingleType {`
`32`	`32`
`33`	`33`	`public ConsumerCoordinatorInstrumentation() {`
`34`		`- super("kafka");`
	`34`	`+ super("kafka", "kafka-0.11");`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public final class KafkaConsumerInfoInstrumentation extends InstrumenterModule.T`
`43`	`43`	`implements Instrumenter.ForSingleType {`
`44`	`44`
`45`	`45`	`public KafkaConsumerInfoInstrumentation() {`
`46`		`- super("kafka");`
	`46`	`+ super("kafka", "kafka-0.11");`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public final class KafkaConsumerInstrumentation extends InstrumenterModule.Traci`
`30`	`30`	`implements Instrumenter.ForSingleType {`
`31`	`31`
`32`	`32`	`public KafkaConsumerInstrumentation() {`
`33`		`- super("kafka");`
	`33`	`+ super("kafka", "kafka-0.11");`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public final class KafkaProducerInstrumentation extends InstrumenterModule.Traci`
`49`	`49`	`implements Instrumenter.ForSingleType {`
`50`	`50`
`51`	`51`	`public KafkaProducerInstrumentation() {`
`52`		`- super("kafka");`
	`52`	`+ super("kafka", "kafka-0.11");`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public class MetadataInstrumentation extends InstrumenterModule.Tracing`
`26`	`26`	`implements Instrumenter.ForTypeHierarchy {`
`27`	`27`
`28`	`28`	`public MetadataInstrumentation() {`
`29`		`- super("kafka");`
	`29`	`+ super("kafka", "kafka-0.11");`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public final class ConsumerCoordinatorInstrumentation extends InstrumenterModule`
`16`	`16`	`implements Instrumenter.ForSingleType {`
`17`	`17`
`18`	`18`	`public ConsumerCoordinatorInstrumentation() {`
`19`		`- super("kafka");`
	`19`	`+ super("kafka", "kafka-3.8");`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public final class KafkaConsumerInfoInstrumentation extends InstrumenterModule.T`
`28`	`28`	`implements Instrumenter.ForTypeHierarchy {`
`29`	`29`
`30`	`30`	`public KafkaConsumerInfoInstrumentation() {`
`31`		`- super("kafka");`
	`31`	`+ super("kafka", "kafka-3.8");`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public final class KafkaConsumerInstrumentation extends InstrumenterModule.Traci`
`23`	`23`	`implements Instrumenter.ForSingleType {`
`24`	`24`
`25`	`25`	`public KafkaConsumerInstrumentation() {`
`26`		`- super("kafka");`
	`26`	`+ super("kafka", "kafka-3.8");`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public final class KafkaProducerInstrumentation extends InstrumenterModule.Traci`
`19`	`19`	`implements Instrumenter.ForSingleType {`
`20`	`20`
`21`	`21`	`public KafkaProducerInstrumentation() {`
`22`		`- super("kafka");`
	`22`	`+ super("kafka", "kafka-3.8");`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public final class LegacyKafkaConsumerInfoInstrumentation extends InstrumenterMo`
`28`	`28`	`implements Instrumenter.ForTypeHierarchy {`
`29`	`29`
`30`	`30`	`public LegacyKafkaConsumerInfoInstrumentation() {`
`31`		`- super("kafka");`
	`31`	`+ super("kafka", "kafka-3.8");`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`@Override`