Skip to content

Commit 53f2fdd

Browse files
SylvainJugeSylvainJuge
committed
some messagging attributes
1 parent 0745c67 commit 53f2fdd

File tree

15 files changed

+28
-60
lines changed

15 files changed

+28
-60
lines changed

‎instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/messaging/MessagingAttributesExtractorTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ void shouldExtractAllAvailableAttributes(
8989
entry(MessagingIncubatingAttributes.MESSAGING_MESSAGE_CONVERSATION_ID, "42"));
9090
expectedEntries.add(entry(MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE, 100L));
9191
expectedEntries.add(entry(MessagingIncubatingAttributes.MESSAGING_MESSAGE_ENVELOPE_SIZE, 120L));
92-
expectedEntries.add(entry(AttributeKey.stringKey("messaging.client_id"), "43"));
92+
expectedEntries.add(entry(MessagingIncubatingAttributes.MESSAGING_CLIENT_ID, "43"));
9393
expectedEntries.add(
9494
entry(MessagingIncubatingAttributes.MESSAGING_OPERATION, operation.operationName()));
9595

‎instrumentation/apache-shenyu-2.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apacheshenyu/v2_4/ShenYuRouteTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
import io.opentelemetry.api.trace.SpanKind;
1212
import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
1313
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
14+
import io.opentelemetry.semconv.HttpAttributes;
1415
import java.lang.reflect.InvocationTargetException;
1516
import java.lang.reflect.Method;
16-
import io.opentelemetry.semconv.HttpAttributes;
1717
import org.apache.shenyu.common.dto.MetaData;
1818
import org.junit.jupiter.api.BeforeAll;
1919
import org.junit.jupiter.api.Test;

‎instrumentation/kafka/kafka-clients/kafka-clients-0.11/testing/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaClientBaseTest.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,6 @@ public abstract class KafkaClientBaseTest {
6363
private static final Logger logger = LoggerFactory.getLogger(KafkaClientBaseTest.class);
6464

6565
protected static final String SHARED_TOPIC = "shared.topic";
66-
protected static final AttributeKey<String> MESSAGING_CLIENT_ID =
67-
AttributeKey.stringKey("messaging.client_id");
6866

6967
private KafkaContainer kafka;
7068
protected Producer<Integer, String> producer;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
99
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies;
10+
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_CLIENT_ID;
1011
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME;
1112
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_DESTINATION_PARTITION_ID;
1213
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_KAFKA_CONSUMER_GROUP;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
1010
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies;
1111
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_BATCH_MESSAGE_COUNT;
12+
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_CLIENT_ID;
1213
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME;
1314
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_DESTINATION_PARTITION_ID;
1415
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_KAFKA_CONSUMER_GROUP;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
99
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies;
10+
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_CLIENT_ID;
1011
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME;
1112
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_DESTINATION_PARTITION_ID;
1213
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_KAFKA_CONSUMER_GROUP;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
99
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies;
1010
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_BATCH_MESSAGE_COUNT;
11+
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_CLIENT_ID;
1112
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME;
1213
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_DESTINATION_PARTITION_ID;
1314
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_KAFKA_CONSUMER_GROUP;

‎instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/KafkaStreamsBaseTest.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import static java.util.Collections.singleton;
1010

1111
import com.google.common.collect.ImmutableMap;
12-
import io.opentelemetry.api.common.AttributeKey;
1312
import io.opentelemetry.api.trace.propagation.W3CTraceContextPropagator;
1413
import io.opentelemetry.context.Context;
1514
import io.opentelemetry.context.propagation.TextMapGetter;
@@ -49,8 +48,6 @@ abstract class KafkaStreamsBaseTest {
4948
@RegisterExtension
5049
static final InstrumentationExtension testing = AgentInstrumentationExtension.create();
5150

52-
protected static final AttributeKey<String> MESSAGING_CLIENT_ID =
53-
AttributeKey.stringKey("messaging.client_id");
5451
protected static final String STREAM_PENDING = "test.pending";
5552
protected static final String STREAM_PROCESSED = "test.processed";
5653

‎instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/KafkaStreamsDefaultTest.java‎

Lines changed: 8 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
1111
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies;
1212
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_BATCH_MESSAGE_COUNT;
13+
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_CLIENT_ID;
1314
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME;
1415
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_DESTINATION_PARTITION_ID;
1516
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_KAFKA_CONSUMER_GROUP;
@@ -18,6 +19,7 @@
1819
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE;
1920
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_OPERATION;
2021
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_SYSTEM;
22+
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MessagingSystemIncubatingValues.KAFKA;
2123
import static java.util.Arrays.asList;
2224
import static org.assertj.core.api.Assertions.assertThat;
2325

@@ -28,7 +30,6 @@
2830
import io.opentelemetry.sdk.testing.assertj.AttributeAssertion;
2931
import io.opentelemetry.sdk.trace.data.LinkData;
3032
import io.opentelemetry.sdk.trace.data.SpanData;
31-
import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes;
3233
import java.time.Duration;
3334
import java.util.ArrayList;
3435
import java.util.List;
@@ -111,9 +112,7 @@ void testKafkaProduceAndConsumeWithStreamsInBetween() throws Exception {
111112
.hasKind(SpanKind.PRODUCER)
112113
.hasNoParent()
113114
.hasAttributesSatisfyingExactly(
114-
equalTo(
115-
MESSAGING_SYSTEM,
116-
MessagingIncubatingAttributes.MessagingSystemIncubatingValues.KAFKA),
115+
equalTo(MESSAGING_SYSTEM, KAFKA),
117116
equalTo(MESSAGING_DESTINATION_NAME, STREAM_PENDING),
118117
equalTo(MESSAGING_OPERATION, "publish"),
119118
satisfies(MESSAGING_CLIENT_ID, k -> k.startsWith("producer")),
@@ -131,10 +130,7 @@ void testKafkaProduceAndConsumeWithStreamsInBetween() throws Exception {
131130
List<AttributeAssertion> assertions =
132131
new ArrayList<>(
133132
asList(
134-
equalTo(
135-
MESSAGING_SYSTEM,
136-
MessagingIncubatingAttributes.MessagingSystemIncubatingValues
137-
.KAFKA),
133+
equalTo(MESSAGING_SYSTEM, KAFKA),
138134
equalTo(MESSAGING_DESTINATION_NAME, STREAM_PENDING),
139135
equalTo(MESSAGING_OPERATION, "receive"),
140136
satisfies(MESSAGING_CLIENT_ID, k -> k.endsWith("consumer")),
@@ -152,10 +148,7 @@ void testKafkaProduceAndConsumeWithStreamsInBetween() throws Exception {
152148
List<AttributeAssertion> assertions =
153149
new ArrayList<>(
154150
asList(
155-
equalTo(
156-
MESSAGING_SYSTEM,
157-
MessagingIncubatingAttributes.MessagingSystemIncubatingValues
158-
.KAFKA),
151+
equalTo(MESSAGING_SYSTEM, KAFKA),
159152
equalTo(MESSAGING_DESTINATION_NAME, STREAM_PENDING),
160153
equalTo(MESSAGING_OPERATION, "process"),
161154
satisfies(MESSAGING_CLIENT_ID, k -> k.endsWith("consumer")),
@@ -186,9 +179,7 @@ void testKafkaProduceAndConsumeWithStreamsInBetween() throws Exception {
186179
.hasTraceId(receivedContext.getTraceId())
187180
.hasSpanId(receivedContext.getSpanId())
188181
.hasAttributesSatisfyingExactly(
189-
equalTo(
190-
MESSAGING_SYSTEM,
191-
MessagingIncubatingAttributes.MessagingSystemIncubatingValues.KAFKA),
182+
equalTo(MESSAGING_SYSTEM, KAFKA),
192183
equalTo(MESSAGING_DESTINATION_NAME, STREAM_PROCESSED),
193184
equalTo(MESSAGING_OPERATION, "publish"),
194185
satisfies(MESSAGING_CLIENT_ID, k -> k.endsWith("producer")),
@@ -206,10 +197,7 @@ void testKafkaProduceAndConsumeWithStreamsInBetween() throws Exception {
206197
List<AttributeAssertion> assertions =
207198
new ArrayList<>(
208199
asList(
209-
equalTo(
210-
MESSAGING_SYSTEM,
211-
MessagingIncubatingAttributes.MessagingSystemIncubatingValues
212-
.KAFKA),
200+
equalTo(MESSAGING_SYSTEM, KAFKA),
213201
equalTo(MESSAGING_DESTINATION_NAME, STREAM_PROCESSED),
214202
equalTo(MESSAGING_OPERATION, "receive"),
215203
satisfies(MESSAGING_CLIENT_ID, k -> k.startsWith("consumer")),
@@ -227,10 +215,7 @@ void testKafkaProduceAndConsumeWithStreamsInBetween() throws Exception {
227215
List<AttributeAssertion> assertions =
228216
new ArrayList<>(
229217
asList(
230-
equalTo(
231-
MESSAGING_SYSTEM,
232-
MessagingIncubatingAttributes.MessagingSystemIncubatingValues
233-
.KAFKA),
218+
equalTo(MESSAGING_SYSTEM, KAFKA),
234219
equalTo(MESSAGING_DESTINATION_NAME, STREAM_PROCESSED),
235220
equalTo(MESSAGING_OPERATION, "process"),
236221
satisfies(MESSAGING_CLIENT_ID, k -> k.startsWith("consumer")),

‎instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/KafkaStreamsSuppressReceiveSpansTest.java‎

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import static io.opentelemetry.api.common.AttributeKey.stringKey;
1010
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
1111
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies;
12+
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_CLIENT_ID;
1213
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME;
1314
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_DESTINATION_PARTITION_ID;
1415
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_KAFKA_CONSUMER_GROUP;
@@ -17,6 +18,7 @@
1718
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE;
1819
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_OPERATION;
1920
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_SYSTEM;
21+
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MessagingSystemIncubatingValues.KAFKA;
2022
import static java.util.Arrays.asList;
2123
import static org.assertj.core.api.Assertions.assertThat;
2224

@@ -25,7 +27,6 @@
2527
import io.opentelemetry.api.trace.SpanKind;
2628
import io.opentelemetry.sdk.testing.assertj.AttributeAssertion;
2729
import io.opentelemetry.sdk.trace.data.SpanData;
28-
import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes;
2930
import java.time.Duration;
3031
import java.util.ArrayList;
3132
import java.util.List;
@@ -101,10 +102,7 @@ void testKafkaProduceAndConsumeWithStreamsInBetween() throws Exception {
101102
.hasKind(SpanKind.PRODUCER)
102103
.hasNoParent()
103104
.hasAttributesSatisfyingExactly(
104-
equalTo(
105-
MESSAGING_SYSTEM,
106-
MessagingIncubatingAttributes.MessagingSystemIncubatingValues
107-
.KAFKA),
105+
equalTo(MESSAGING_SYSTEM, KAFKA),
108106
equalTo(MESSAGING_DESTINATION_NAME, STREAM_PENDING),
109107
equalTo(MESSAGING_OPERATION, "publish"),
110108
equalTo(MESSAGING_CLIENT_ID, "producer-1"),
@@ -118,10 +116,7 @@ void testKafkaProduceAndConsumeWithStreamsInBetween() throws Exception {
118116
List<AttributeAssertion> assertions =
119117
new ArrayList<>(
120118
asList(
121-
equalTo(
122-
MESSAGING_SYSTEM,
123-
MessagingIncubatingAttributes.MessagingSystemIncubatingValues
124-
.KAFKA),
119+
equalTo(MESSAGING_SYSTEM, KAFKA),
125120
equalTo(MESSAGING_DESTINATION_NAME, STREAM_PENDING),
126121
equalTo(MESSAGING_OPERATION, "process"),
127122
satisfies(MESSAGING_CLIENT_ID, k -> k.endsWith("consumer")),
@@ -153,9 +148,7 @@ void testKafkaProduceAndConsumeWithStreamsInBetween() throws Exception {
153148
.hasTraceId(receivedContext.getTraceId())
154149
.hasSpanId(receivedContext.getSpanId())
155150
.hasAttributesSatisfyingExactly(
156-
equalTo(
157-
MESSAGING_SYSTEM,
158-
MessagingIncubatingAttributes.MessagingSystemIncubatingValues.KAFKA),
151+
equalTo(MESSAGING_SYSTEM, KAFKA),
159152
equalTo(MESSAGING_DESTINATION_NAME, STREAM_PROCESSED),
160153
equalTo(MESSAGING_OPERATION, "publish"),
161154
satisfies(MESSAGING_CLIENT_ID, k -> k.isInstanceOf(String.class)),
@@ -169,10 +162,7 @@ void testKafkaProduceAndConsumeWithStreamsInBetween() throws Exception {
169162
List<AttributeAssertion> assertions =
170163
new ArrayList<>(
171164
asList(
172-
equalTo(
173-
MESSAGING_SYSTEM,
174-
MessagingIncubatingAttributes.MessagingSystemIncubatingValues
175-
.KAFKA),
165+
equalTo(MESSAGING_SYSTEM, KAFKA),
176166
equalTo(MESSAGING_DESTINATION_NAME, STREAM_PROCESSED),
177167
equalTo(MESSAGING_OPERATION, "process"),
178168
satisfies(MESSAGING_CLIENT_ID, k -> k.startsWith("consumer")),

0 commit comments

Comments
 (0)