Skip to content

Commit 1ac6cc0

Browse files
authored
Delete deprecated property for disabling kafka metrics (#13803)
1 parent 1e18f22 commit 1ac6cc0

File tree

2 files changed

+3
-13
lines changed
  • instrumentation/kafka
    • kafka-clients/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/v0_11/metrics

2 files changed

+3
-13
lines changed

instrumentation/kafka/README.md

-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,3 @@
44
|-----------------------------------------------------------| ------- |---------|--------------------------------------------------------------------------------------------------------------------------------|
55
| `otel.instrumentation.kafka.experimental-span-attributes` | Boolean | `false` | Enable the capture of experimental span attributes. |
66
| `otel.instrumentation.kafka.producer-propagation.enabled` | Boolean | `true` | Enable context propagation for kafka message producer. |
7-
| `otel.instrumentation.kafka.metric-reporter.enabled` | Boolean | `true` | Enable kafka consumer and producer metrics. **Deprecated**, disable instrumentation with name `kafka-clients-metrics` instead. |

instrumentation/kafka/kafka-clients/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/v0_11/metrics/KafkaMetricsUtil.java

+3-12
Original file line numberDiff line numberDiff line change
@@ -9,27 +9,18 @@
99
import io.opentelemetry.instrumentation.kafkaclients.common.v0_11.internal.MetricsReporterList;
1010
import io.opentelemetry.instrumentation.kafkaclients.common.v0_11.internal.OpenTelemetryMetricsReporter;
1111
import io.opentelemetry.instrumentation.kafkaclients.common.v0_11.internal.OpenTelemetrySupplier;
12-
import io.opentelemetry.javaagent.bootstrap.internal.AgentInstrumentationConfig;
13-
import io.opentelemetry.javaagent.bootstrap.internal.DeprecatedConfigProperties;
1412
import java.util.List;
1513
import java.util.Map;
1614
import org.apache.kafka.clients.CommonClientConfigs;
1715

1816
public final class KafkaMetricsUtil {
1917
private static final String INSTRUMENTATION_NAME = "io.opentelemetry.kafka-clients-0.11";
20-
private static final boolean METRICS_ENABLED =
21-
DeprecatedConfigProperties.getBoolean(
22-
AgentInstrumentationConfig.get(),
23-
"otel.instrumentation.kafka.metric-reporter.enabled",
24-
"otel.instrumentation.kafka-clients-metrics.enabled",
25-
true);
2618

2719
@SuppressWarnings("unchecked")
2820
public static void enhanceConfig(Map<? super String, Object> config) {
29-
// skip enhancing configuration when metrics are disabled or when we have already enhanced it
30-
if (!METRICS_ENABLED
31-
|| config.get(OpenTelemetryMetricsReporter.CONFIG_KEY_OPENTELEMETRY_INSTRUMENTATION_NAME)
32-
!= null) {
21+
// skip enhancing configuration when we have already enhanced it
22+
if (config.get(OpenTelemetryMetricsReporter.CONFIG_KEY_OPENTELEMETRY_INSTRUMENTATION_NAME)
23+
!= null) {
3324
return;
3425
}
3526
config.merge(

0 commit comments

Comments
 (0)