Skip to content

Commit c21dcfd

Browse files
nayeem-kamalnayeem-kamal
committed
reenable kafka 3.8
1 parent b5db502 commit c21dcfd

File tree

11 files changed

+0
-53
lines changed

11 files changed

+0
-53
lines changed

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

-6
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;
@@ -20,11 +19,6 @@ public ConsumerCoordinatorInstrumentation() {
2019
super("kafka");
2120
}
2221

23-
@Override
24-
public boolean isEnabled() {
25-
return super.isEnabled() && Config.get().isExperimentalKafkaEnabled();
26-
}
27-
2822
@Override
2923
public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
3024
return hasClassNamed("org.apache.kafka.clients.MetadataRecoveryStrategy"); // since 3.8

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

-6
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;
@@ -32,11 +31,6 @@ public KafkaConsumerInfoInstrumentation() {
3231
super("kafka");
3332
}
3433

35-
@Override
36-
public boolean isEnabled() {
37-
return super.isEnabled() && Config.get().isExperimentalKafkaEnabled();
38-
}
39-
4034
@Override
4135
public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
4236
return hasClassNamed("org.apache.kafka.clients.MetadataRecoveryStrategy"); // since 3.8

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

-6
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;
@@ -27,11 +26,6 @@ public KafkaConsumerInstrumentation() {
2726
super("kafka");
2827
}
2928

30-
@Override
31-
public boolean isEnabled() {
32-
return super.isEnabled() && Config.get().isExperimentalKafkaEnabled();
33-
}
34-
3529
@Override
3630
public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
3731
return hasClassNamed("org.apache.kafka.clients.MetadataRecoveryStrategy"); // since 3.8

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

-6
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

@@ -23,11 +22,6 @@ public KafkaProducerInstrumentation() {
2322
super("kafka");
2423
}
2524

26-
@Override
27-
public boolean isEnabled() {
28-
return super.isEnabled() && Config.get().isExperimentalKafkaEnabled();
29-
}
30-
3125
@Override
3226
public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
3327
return hasClassNamed("org.apache.kafka.clients.MetadataRecoveryStrategy"); // since 3.8

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

-6
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;
@@ -32,11 +31,6 @@ public LegacyKafkaConsumerInfoInstrumentation() {
3231
super("kafka");
3332
}
3433

35-
@Override
36-
public boolean isEnabled() {
37-
return super.isEnabled() && Config.get().isExperimentalKafkaEnabled();
38-
}
39-
4034
@Override
4135
public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
4236
return hasClassNamed("org.apache.kafka.clients.MetadataRecoveryStrategy"); // since 3.8

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

-6
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;
@@ -23,11 +22,6 @@ public MetadataInstrumentation() {
2322
super("kafka");
2423
}
2524

26-
@Override
27-
public boolean isEnabled() {
28-
return super.isEnabled() && Config.get().isExperimentalKafkaEnabled();
29-
}
30-
3125
@Override
3226
public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
3327
return hasClassNamed("org.apache.kafka.clients.MetadataRecoveryStrategy"); // since 3.8

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

-6
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
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.
@@ -17,11 +16,6 @@ public OffsetCommitCallbackInvokerInstrumentation() {
1716
super("kafka");
1817
}
1918

20-
@Override
21-
public boolean isEnabled() {
22-
return super.isEnabled() && Config.get().isExperimentalKafkaEnabled();
23-
}
24-
2519
@Override
2620
public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
2721
return hasClassNamed("org.apache.kafka.clients.MetadataRecoveryStrategy"); // since 3.8

‎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)