Skip to content

Commit f2d21ae

Browse files
nayeem-kamalmcculls
nayeem-kamal
and
mcculls
authored
Reenable kafka 3.8 by default (#8007)
And add aliases to disambiguate the old and new Kafka instrumentations --------- Co-authored-by: Stuart McCulloch <[email protected]>
1 parent 565afcd commit f2d21ae

16 files changed

+12
-65
lines changed

‎dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/ConsumerCoordinatorInstrumentation.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public final class ConsumerCoordinatorInstrumentation extends InstrumenterModule
3131
implements Instrumenter.ForSingleType {
3232

3333
public ConsumerCoordinatorInstrumentation() {
34-
super("kafka");
34+
super("kafka", "kafka-0.11");
3535
}
3636

3737
@Override

‎dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInfoInstrumentation.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public final class KafkaConsumerInfoInstrumentation extends InstrumenterModule.T
4343
implements Instrumenter.ForSingleType {
4444

4545
public KafkaConsumerInfoInstrumentation() {
46-
super("kafka");
46+
super("kafka", "kafka-0.11");
4747
}
4848

4949
@Override

‎dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInstrumentation.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public final class KafkaConsumerInstrumentation extends InstrumenterModule.Traci
3030
implements Instrumenter.ForSingleType {
3131

3232
public KafkaConsumerInstrumentation() {
33-
super("kafka");
33+
super("kafka", "kafka-0.11");
3434
}
3535

3636
@Override

‎dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerInstrumentation.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public final class KafkaProducerInstrumentation extends InstrumenterModule.Traci
4949
implements Instrumenter.ForSingleType {
5050

5151
public KafkaProducerInstrumentation() {
52-
super("kafka");
52+
super("kafka", "kafka-0.11");
5353
}
5454

5555
@Override

‎dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/MetadataInstrumentation.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public class MetadataInstrumentation extends InstrumenterModule.Tracing
2626
implements Instrumenter.ForTypeHierarchy {
2727

2828
public MetadataInstrumentation() {
29-
super("kafka");
29+
super("kafka", "kafka-0.11");
3030
}
3131

3232
@Override

‎dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/ConsumerCoordinatorInstrumentation.java

+1-7
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import com.google.auto.service.AutoService;
88
import datadog.trace.agent.tooling.Instrumenter;
99
import datadog.trace.agent.tooling.InstrumenterModule;
10-
import datadog.trace.api.Config;
1110
import java.util.HashMap;
1211
import java.util.Map;
1312
import net.bytebuddy.matcher.ElementMatcher;
@@ -17,12 +16,7 @@ public final class ConsumerCoordinatorInstrumentation extends InstrumenterModule
1716
implements Instrumenter.ForSingleType {
1817

1918
public ConsumerCoordinatorInstrumentation() {
20-
super("kafka");
21-
}
22-
23-
@Override
24-
public boolean isEnabled() {
25-
return super.isEnabled() && Config.get().isExperimentalKafkaEnabled();
19+
super("kafka", "kafka-3.8");
2620
}
2721

2822
@Override

‎dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/KafkaConsumerInfoInstrumentation.java

+1-7
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import com.google.auto.service.AutoService;
1515
import datadog.trace.agent.tooling.Instrumenter;
1616
import datadog.trace.agent.tooling.InstrumenterModule;
17-
import datadog.trace.api.Config;
1817
import java.util.HashMap;
1918
import java.util.Map;
2019
import net.bytebuddy.description.type.TypeDescription;
@@ -29,12 +28,7 @@ public final class KafkaConsumerInfoInstrumentation extends InstrumenterModule.T
2928
implements Instrumenter.ForTypeHierarchy {
3029

3130
public KafkaConsumerInfoInstrumentation() {
32-
super("kafka");
33-
}
34-
35-
@Override
36-
public boolean isEnabled() {
37-
return super.isEnabled() && Config.get().isExperimentalKafkaEnabled();
31+
super("kafka", "kafka-3.8");
3832
}
3933

4034
@Override

‎dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/KafkaConsumerInstrumentation.java

+1-7
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import com.google.auto.service.AutoService;
1212
import datadog.trace.agent.tooling.Instrumenter;
1313
import datadog.trace.agent.tooling.InstrumenterModule;
14-
import datadog.trace.api.Config;
1514
import java.util.Collections;
1615
import java.util.HashMap;
1716
import java.util.Iterator;
@@ -24,12 +23,7 @@ public final class KafkaConsumerInstrumentation extends InstrumenterModule.Traci
2423
implements Instrumenter.ForSingleType {
2524

2625
public KafkaConsumerInstrumentation() {
27-
super("kafka");
28-
}
29-
30-
@Override
31-
public boolean isEnabled() {
32-
return super.isEnabled() && Config.get().isExperimentalKafkaEnabled();
26+
super("kafka", "kafka-3.8");
3327
}
3428

3529
@Override

‎dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/KafkaProducerInstrumentation.java

+1-7
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import com.google.auto.service.AutoService;
1212
import datadog.trace.agent.tooling.Instrumenter;
1313
import datadog.trace.agent.tooling.InstrumenterModule;
14-
import datadog.trace.api.Config;
1514
import java.util.Map;
1615
import net.bytebuddy.matcher.ElementMatcher;
1716

@@ -20,12 +19,7 @@ public final class KafkaProducerInstrumentation extends InstrumenterModule.Traci
2019
implements Instrumenter.ForSingleType {
2120

2221
public KafkaProducerInstrumentation() {
23-
super("kafka");
24-
}
25-
26-
@Override
27-
public boolean isEnabled() {
28-
return super.isEnabled() && Config.get().isExperimentalKafkaEnabled();
22+
super("kafka", "kafka-3.8");
2923
}
3024

3125
@Override

‎dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/LegacyKafkaConsumerInfoInstrumentation.java

+1-7
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import com.google.auto.service.AutoService;
1515
import datadog.trace.agent.tooling.Instrumenter;
1616
import datadog.trace.agent.tooling.InstrumenterModule;
17-
import datadog.trace.api.Config;
1817
import java.util.HashMap;
1918
import java.util.Map;
2019
import net.bytebuddy.description.type.TypeDescription;
@@ -29,12 +28,7 @@ public final class LegacyKafkaConsumerInfoInstrumentation extends InstrumenterMo
2928
implements Instrumenter.ForTypeHierarchy {
3029

3130
public LegacyKafkaConsumerInfoInstrumentation() {
32-
super("kafka");
33-
}
34-
35-
@Override
36-
public boolean isEnabled() {
37-
return super.isEnabled() && Config.get().isExperimentalKafkaEnabled();
31+
super("kafka", "kafka-3.8");
3832
}
3933

4034
@Override

‎dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/MetadataInstrumentation.java

+1-7
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import com.google.auto.service.AutoService;
1111
import datadog.trace.agent.tooling.Instrumenter;
1212
import datadog.trace.agent.tooling.InstrumenterModule;
13-
import datadog.trace.api.Config;
1413
import java.util.Map;
1514
import net.bytebuddy.description.type.TypeDescription;
1615
import net.bytebuddy.matcher.ElementMatcher;
@@ -20,12 +19,7 @@ public class MetadataInstrumentation extends InstrumenterModule.Tracing
2019
implements Instrumenter.ForTypeHierarchy {
2120

2221
public MetadataInstrumentation() {
23-
super("kafka");
24-
}
25-
26-
@Override
27-
public boolean isEnabled() {
28-
return super.isEnabled() && Config.get().isExperimentalKafkaEnabled();
22+
super("kafka", "kafka-3.8");
2923
}
3024

3125
@Override

‎dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/OffsetCommitCallbackInvokerInstrumentation.java

+1-7
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,14 @@
66

77
import datadog.trace.agent.tooling.Instrumenter;
88
import datadog.trace.agent.tooling.InstrumenterModule;
9-
import datadog.trace.api.Config;
109
import net.bytebuddy.matcher.ElementMatcher;
1110

1211
// new - this instrumentation is completely new.
1312
// the purpose of this class is to provide us with information on consumer group and cluster ID
1413
public class OffsetCommitCallbackInvokerInstrumentation extends InstrumenterModule.Tracing
1514
implements Instrumenter.ForSingleType {
1615
public OffsetCommitCallbackInvokerInstrumentation() {
17-
super("kafka");
18-
}
19-
20-
@Override
21-
public boolean isEnabled() {
22-
return super.isEnabled() && Config.get().isExperimentalKafkaEnabled();
16+
super("kafka", "kafka-3.8");
2317
}
2418

2519
@Override

‎dd-java-agent/instrumentation/kafka-clients-3.8/src/test/groovy/KafkaClientCustomPropagationConfigTest.groovy

-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ class KafkaClientCustomPropagationConfigTest extends AgentTestRunner {
5252
super.configurePreAgent()
5353

5454
injectSysConfig("dd.kafka.e2e.duration.enabled", "true")
55-
injectSysConfig("dd.trace.experimental.kafka.enabled","true")
5655
}
5756

5857
@Flaky

‎dd-java-agent/instrumentation/kafka-clients-3.8/src/test/groovy/KafkaClientTestBase.groovy

-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ abstract class KafkaClientTestBase extends VersionedNamingTestBase {
6666
super.configurePreAgent()
6767

6868
injectSysConfig("dd.kafka.e2e.duration.enabled", "true")
69-
injectSysConfig("dd.trace.experimental.kafka.enabled","true")
7069
}
7170

7271
public static final LinkedHashMap<String, String> PRODUCER_PATHWAY_EDGE_TAGS

‎dd-trace-api/src/main/java/datadog/trace/api/config/TraceInstrumentationConfig.java

-2
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,5 @@ public final class TraceInstrumentationConfig {
159159
/** If set, the instrumentation will set its resource name on the local root too. */
160160
public static final String AXIS_PROMOTE_RESOURCE_NAME = "trace.axis.promote.resource-name";
161161

162-
public static final String EXPERIMENTAL_KAFKA_ENABLED = "trace.experimental.kafka.enabled";
163-
164162
private TraceInstrumentationConfig() {}
165163
}

‎internal-api/src/main/java/datadog/trace/api/Config.java

-7
Original file line numberDiff line numberDiff line change
@@ -414,8 +414,6 @@ public static String getHostName() {
414414
private final boolean kafkaClientPropagationEnabled;
415415
private final Set<String> kafkaClientPropagationDisabledTopics;
416416
private final boolean kafkaClientBase64DecodingEnabled;
417-
// enable the Kafka-3.8 instrumentation manually until testing issues are resolved.
418-
private final boolean experimentalKafkaEnabled;
419417

420418
private final boolean jmsPropagationEnabled;
421419
private final Set<String> jmsPropagationDisabledTopics;
@@ -1569,7 +1567,6 @@ PROFILING_DATADOG_PROFILER_ENABLED, isDatadogProfilerSafeInCurrentEnvironment())
15691567
tryMakeImmutableSet(configProvider.getList(KAFKA_CLIENT_PROPAGATION_DISABLED_TOPICS));
15701568
kafkaClientBase64DecodingEnabled =
15711569
configProvider.getBoolean(KAFKA_CLIENT_BASE64_DECODING_ENABLED, false);
1572-
experimentalKafkaEnabled = configProvider.getBoolean(EXPERIMENTAL_KAFKA_ENABLED, false);
15731570
jmsPropagationEnabled = isPropagationEnabled(true, "jms");
15741571
jmsPropagationDisabledTopics =
15751572
tryMakeImmutableSet(configProvider.getList(JMS_PROPAGATION_DISABLED_TOPICS));
@@ -3055,10 +3052,6 @@ public boolean isKafkaClientBase64DecodingEnabled() {
30553052
return kafkaClientBase64DecodingEnabled;
30563053
}
30573054

3058-
public boolean isExperimentalKafkaEnabled() {
3059-
return experimentalKafkaEnabled;
3060-
}
3061-
30623055
public boolean isRabbitPropagationEnabled() {
30633056
return rabbitPropagationEnabled;
30643057
}

0 commit comments

Comments
 (0)