Skip to content

Commit a474d87

Browse files
committed
use stringArrayKey and asList from static import
1 parent aef5119 commit a474d87

File tree

4 files changed

+13
-7
lines changed

4 files changed

+13
-7
lines changed

instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/main/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/TracingConsumerInterceptor.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@
55

66
package io.opentelemetry.instrumentation.kafkaclients.v2_6;
77

8+
import static java.util.Collections.emptyList;
9+
810
import com.google.errorprone.annotations.CanIgnoreReturnValue;
911
import io.opentelemetry.api.GlobalOpenTelemetry;
1012
import io.opentelemetry.context.Context;
1113
import io.opentelemetry.instrumentation.api.internal.ConfigPropertiesUtil;
1214
import io.opentelemetry.instrumentation.api.internal.Timer;
1315
import io.opentelemetry.instrumentation.kafkaclients.common.v0_11.internal.KafkaConsumerContext;
1416
import io.opentelemetry.instrumentation.kafkaclients.common.v0_11.internal.KafkaConsumerContextUtil;
15-
import java.util.ArrayList;
1617
import java.util.Map;
1718
import java.util.Objects;
1819
import org.apache.kafka.clients.consumer.ConsumerConfig;
@@ -35,7 +36,7 @@ public class TracingConsumerInterceptor<K, V> implements ConsumerInterceptor<K,
3536
"otel.instrumentation.messaging.experimental.receive-telemetry.enabled", false))
3637
.setCapturedHeaders(
3738
ConfigPropertiesUtil.getList(
38-
"otel.instrumentation.messaging.experimental.capture-headers", new ArrayList<>()))
39+
"otel.instrumentation.messaging.experimental.capture-headers", emptyList()))
3940
.build();
4041

4142
private String consumerGroup;

instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/main/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/TracingProducerInterceptor.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@
55

66
package io.opentelemetry.instrumentation.kafkaclients.v2_6;
77

8+
import static java.util.Collections.emptyList;
9+
810
import com.google.errorprone.annotations.CanIgnoreReturnValue;
911
import io.opentelemetry.api.GlobalOpenTelemetry;
1012
import io.opentelemetry.instrumentation.api.internal.ConfigPropertiesUtil;
11-
import java.util.ArrayList;
1213
import java.util.Map;
1314
import java.util.Objects;
1415
import javax.annotation.Nullable;
@@ -28,7 +29,7 @@ public class TracingProducerInterceptor<K, V> implements ProducerInterceptor<K,
2829
KafkaTelemetry.builder(GlobalOpenTelemetry.get())
2930
.setCapturedHeaders(
3031
ConfigPropertiesUtil.getList(
31-
"otel.instrumentation.messaging.experimental.capture-headers", new ArrayList<>()))
32+
"otel.instrumentation.messaging.experimental.capture-headers", emptyList()))
3233
.build();
3334

3435
@Nullable private String clientId;

instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/test/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/InterceptorsTest.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
package io.opentelemetry.instrumentation.kafkaclients.v2_6;
77

8+
import static io.opentelemetry.api.common.AttributeKey.stringArrayKey;
89
import static io.opentelemetry.instrumentation.testing.util.TelemetryDataUtil.orderByRootSpanName;
910
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
1011
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies;
@@ -16,6 +17,7 @@
1617
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE;
1718
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_OPERATION;
1819
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_SYSTEM;
20+
import static java.util.Arrays.asList;
1921
import static org.assertj.core.api.Assertions.assertThat;
2022

2123
import io.opentelemetry.api.common.AttributeKey;
@@ -45,8 +47,8 @@ void assertTraces() {
4547
.hasParent(trace.getSpan(0))
4648
.hasAttributesSatisfyingExactly(
4749
equalTo(
48-
AttributeKey.stringArrayKey("messaging.header.baggage"),
49-
Arrays.asList(
50+
stringArrayKey("messaging.header.baggage"),
51+
asList(
5052
"test-baggage-key-1=test-baggage-value-1",
5153
"test-baggage-key-2=test-baggage-value-2")),
5254
equalTo(MESSAGING_SYSTEM, "kafka"),

instrumentation/kafka/kafka-clients/kafka-clients-2.6/metadata.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ configurations:
66
type: list
77
default: ''
88
- name: otel.instrumentation.messaging.experimental.receive-telemetry.enabled
9-
description: Enables experimental receive telemetry for Kafka instrumentation.
9+
description: >
10+
Enables experimental receive telemetry, which will cause consumers to start a new trace, with
11+
only a span link connecting it to the producer trace.
1012
type: boolean
1113
default: false

0 commit comments

Comments
 (0)