Skip to content

Commit be85182

Browse files
SylvainJugeSylvainJuge
authored
reuse semconv incubating attributes in test code (#12992)
1 parent 3c94040 commit be85182

File tree

11 files changed

+68
-91
lines changed

11 files changed

+68
-91
lines changed

‎instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientAttributesExtractorTest.java

+6-7
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
99
import static org.assertj.core.api.Assertions.entry;
1010

11-
import io.opentelemetry.api.common.AttributeKey;
1211
import io.opentelemetry.api.common.Attributes;
1312
import io.opentelemetry.api.common.AttributesBuilder;
1413
import io.opentelemetry.context.Context;
@@ -90,9 +89,9 @@ void shouldExtractAllAvailableAttributes() {
9089
entry(DbIncubatingAttributes.DB_CONNECTION_STRING, "mydb:///potatoes"),
9190
entry(DbIncubatingAttributes.DB_STATEMENT, "SELECT * FROM potato"),
9291
entry(DbIncubatingAttributes.DB_OPERATION, "SELECT"),
93-
entry(AttributeKey.stringKey("db.namespace"), "potatoes"),
94-
entry(AttributeKey.stringKey("db.query.text"), "SELECT * FROM potato"),
95-
entry(AttributeKey.stringKey("db.operation.name"), "SELECT"));
92+
entry(DbIncubatingAttributes.DB_NAMESPACE, "potatoes"),
93+
entry(DbIncubatingAttributes.DB_QUERY_TEXT, "SELECT * FROM potato"),
94+
entry(DbIncubatingAttributes.DB_OPERATION_NAME, "SELECT"));
9695
} else if (SemconvStability.emitOldDatabaseSemconv()) {
9796
assertThat(startAttributes.build())
9897
.containsOnly(
@@ -106,9 +105,9 @@ void shouldExtractAllAvailableAttributes() {
106105
assertThat(startAttributes.build())
107106
.containsOnly(
108107
entry(DbIncubatingAttributes.DB_SYSTEM, "myDb"),
109-
entry(AttributeKey.stringKey("db.namespace"), "potatoes"),
110-
entry(AttributeKey.stringKey("db.query.text"), "SELECT * FROM potato"),
111-
entry(AttributeKey.stringKey("db.operation.name"), "SELECT"));
108+
entry(DbIncubatingAttributes.DB_NAMESPACE, "potatoes"),
109+
entry(DbIncubatingAttributes.DB_QUERY_TEXT, "SELECT * FROM potato"),
110+
entry(DbIncubatingAttributes.DB_OPERATION_NAME, "SELECT"));
112111
}
113112

114113
assertThat(endAttributes.build().isEmpty()).isTrue();

‎instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/SqlClientAttributesExtractorTest.java

+18-19
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
package io.opentelemetry.instrumentation.api.incubator.semconv.db;
77

8-
import static io.opentelemetry.api.common.AttributeKey.stringKey;
98
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
109
import static org.assertj.core.api.Assertions.entry;
1110

@@ -88,10 +87,10 @@ void shouldExtractAllAttributes() {
8887
entry(DbIncubatingAttributes.DB_STATEMENT, "SELECT * FROM potato WHERE id=?"),
8988
entry(DbIncubatingAttributes.DB_OPERATION, "SELECT"),
9089
entry(DbIncubatingAttributes.DB_SQL_TABLE, "potato"),
91-
entry(stringKey("db.namespace"), "potatoes"),
92-
entry(stringKey("db.query.text"), "SELECT * FROM potato WHERE id=?"),
93-
entry(stringKey("db.operation.name"), "SELECT"),
94-
entry(stringKey("db.collection.name"), "potato"));
90+
entry(DbIncubatingAttributes.DB_NAMESPACE, "potatoes"),
91+
entry(DbIncubatingAttributes.DB_QUERY_TEXT, "SELECT * FROM potato WHERE id=?"),
92+
entry(DbIncubatingAttributes.DB_OPERATION_NAME, "SELECT"),
93+
entry(DbIncubatingAttributes.DB_COLLECTION_NAME, "potato"));
9594
} else if (SemconvStability.emitOldDatabaseSemconv()) {
9695
assertThat(startAttributes.build())
9796
.containsOnly(
@@ -106,10 +105,10 @@ void shouldExtractAllAttributes() {
106105
assertThat(startAttributes.build())
107106
.containsOnly(
108107
entry(DbIncubatingAttributes.DB_SYSTEM, "myDb"),
109-
entry(stringKey("db.namespace"), "potatoes"),
110-
entry(stringKey("db.query.text"), "SELECT * FROM potato WHERE id=?"),
111-
entry(stringKey("db.operation.name"), "SELECT"),
112-
entry(stringKey("db.collection.name"), "potato"));
108+
entry(DbIncubatingAttributes.DB_NAMESPACE, "potatoes"),
109+
entry(DbIncubatingAttributes.DB_QUERY_TEXT, "SELECT * FROM potato WHERE id=?"),
110+
entry(DbIncubatingAttributes.DB_OPERATION_NAME, "SELECT"),
111+
entry(DbIncubatingAttributes.DB_COLLECTION_NAME, "potato"));
113112
}
114113

115114
assertThat(endAttributes.build().isEmpty()).isTrue();
@@ -136,8 +135,8 @@ void shouldNotExtractTableIfAttributeIsNotSet() {
136135
.containsOnly(
137136
entry(DbIncubatingAttributes.DB_STATEMENT, "SELECT *"),
138137
entry(DbIncubatingAttributes.DB_OPERATION, "SELECT"),
139-
entry(stringKey("db.query.text"), "SELECT *"),
140-
entry(stringKey("db.operation.name"), "SELECT"));
138+
entry(DbIncubatingAttributes.DB_QUERY_TEXT, "SELECT *"),
139+
entry(DbIncubatingAttributes.DB_OPERATION_NAME, "SELECT"));
141140
} else if (SemconvStability.emitOldDatabaseSemconv()) {
142141
assertThat(attributes.build())
143142
.containsOnly(
@@ -146,8 +145,8 @@ void shouldNotExtractTableIfAttributeIsNotSet() {
146145
} else if (SemconvStability.emitStableDatabaseSemconv()) {
147146
assertThat(attributes.build())
148147
.containsOnly(
149-
entry(stringKey("db.query.text"), "SELECT *"),
150-
entry(stringKey("db.operation.name"), "SELECT"));
148+
entry(DbIncubatingAttributes.DB_QUERY_TEXT, "SELECT *"),
149+
entry(DbIncubatingAttributes.DB_OPERATION_NAME, "SELECT"));
151150
}
152151
}
153152

@@ -176,9 +175,9 @@ void shouldExtractTableToSpecifiedKey() {
176175
entry(DbIncubatingAttributes.DB_STATEMENT, "SELECT * FROM table"),
177176
entry(DbIncubatingAttributes.DB_OPERATION, "SELECT"),
178177
entry(DbIncubatingAttributes.DB_CASSANDRA_TABLE, "table"),
179-
entry(stringKey("db.query.text"), "SELECT * FROM table"),
180-
entry(stringKey("db.operation.name"), "SELECT"),
181-
entry(stringKey("db.collection.name"), "table"));
178+
entry(DbIncubatingAttributes.DB_QUERY_TEXT, "SELECT * FROM table"),
179+
entry(DbIncubatingAttributes.DB_OPERATION_NAME, "SELECT"),
180+
entry(DbIncubatingAttributes.DB_COLLECTION_NAME, "table"));
182181
} else if (SemconvStability.emitOldDatabaseSemconv()) {
183182
assertThat(attributes.build())
184183
.containsOnly(
@@ -188,9 +187,9 @@ void shouldExtractTableToSpecifiedKey() {
188187
} else if (SemconvStability.emitStableDatabaseSemconv()) {
189188
assertThat(attributes.build())
190189
.containsOnly(
191-
entry(stringKey("db.query.text"), "SELECT * FROM table"),
192-
entry(stringKey("db.operation.name"), "SELECT"),
193-
entry(stringKey("db.collection.name"), "table"));
190+
entry(DbIncubatingAttributes.DB_QUERY_TEXT, "SELECT * FROM table"),
191+
entry(DbIncubatingAttributes.DB_OPERATION_NAME, "SELECT"),
192+
entry(DbIncubatingAttributes.DB_COLLECTION_NAME, "table"));
194193
}
195194
}
196195

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
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;
1617
import org.apache.shenyu.common.dto.MetaData;
@@ -111,7 +112,7 @@ void testUpdateRouter() {
111112
span.hasName("GET /a/b/c")
112113
.hasKind(SpanKind.SERVER)
113114
.hasAttributesSatisfying(
114-
equalTo(AttributeKey.stringKey("http.route"), "/a/b/c"),
115+
equalTo(HttpAttributes.HTTP_ROUTE, "/a/b/c"),
115116
equalTo(META_ID_ATTRIBUTE, "123"),
116117
equalTo(META_ENABLED_ATTRIBUTE, true),
117118
equalTo(METHOD_NAME_ATTRIBUTE, "hello"),

‎instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/apiclient/ElasticsearchClientTest.java

+5-3
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
import co.elastic.clients.json.jackson.JacksonJsonpMapper;
2424
import co.elastic.clients.transport.ElasticsearchTransport;
2525
import co.elastic.clients.transport.rest_client.RestClientTransport;
26-
import io.opentelemetry.api.common.AttributeKey;
2726
import io.opentelemetry.api.trace.SpanKind;
2827
import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
2928
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
29+
import io.opentelemetry.semconv.incubating.DbIncubatingAttributes;
3030
import java.io.IOException;
3131
import java.util.concurrent.CountDownLatch;
3232
import java.util.concurrent.TimeUnit;
@@ -139,10 +139,12 @@ public void elasticsearchIndex() throws IOException {
139139
URL_FULL,
140140
httpHost.toURI() + "/test-index/_doc/test-id?timeout=10s"),
141141
equalTo(
142-
AttributeKey.stringKey("db.elasticsearch.path_parts.index"),
142+
DbIncubatingAttributes.DB_ELASTICSEARCH_PATH_PARTS.getAttributeKey(
143+
"index"),
143144
"test-index"),
144145
equalTo(
145-
AttributeKey.stringKey("db.elasticsearch.path_parts.id"),
146+
DbIncubatingAttributes.DB_ELASTICSEARCH_PATH_PARTS.getAttributeKey(
147+
"id"),
146148
"test-id")),
147149
span ->
148150
span.hasName("PUT")

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

+7-23
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE;
1919
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_OPERATION;
2020
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_SYSTEM;
21+
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MessagingSystemIncubatingValues.KAFKA;
2122
import static java.util.Arrays.asList;
2223
import static org.assertj.core.api.Assertions.assertThat;
2324

@@ -28,7 +29,6 @@
2829
import io.opentelemetry.sdk.testing.assertj.AttributeAssertion;
2930
import io.opentelemetry.sdk.trace.data.LinkData;
3031
import io.opentelemetry.sdk.trace.data.SpanData;
31-
import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes;
3232
import java.time.Duration;
3333
import java.util.ArrayList;
3434
import java.util.List;
@@ -111,9 +111,7 @@ void testKafkaProduceAndConsumeWithStreamsInBetween() throws Exception {
111111
.hasKind(SpanKind.PRODUCER)
112112
.hasNoParent()
113113
.hasAttributesSatisfyingExactly(
114-
equalTo(
115-
MESSAGING_SYSTEM,
116-
MessagingIncubatingAttributes.MessagingSystemIncubatingValues.KAFKA),
114+
equalTo(MESSAGING_SYSTEM, KAFKA),
117115
equalTo(MESSAGING_DESTINATION_NAME, STREAM_PENDING),
118116
equalTo(MESSAGING_OPERATION, "publish"),
119117
satisfies(MESSAGING_CLIENT_ID, k -> k.startsWith("producer")),
@@ -131,10 +129,7 @@ void testKafkaProduceAndConsumeWithStreamsInBetween() throws Exception {
131129
List<AttributeAssertion> assertions =
132130
new ArrayList<>(
133131
asList(
134-
equalTo(
135-
MESSAGING_SYSTEM,
136-
MessagingIncubatingAttributes.MessagingSystemIncubatingValues
137-
.KAFKA),
132+
equalTo(MESSAGING_SYSTEM, KAFKA),
138133
equalTo(MESSAGING_DESTINATION_NAME, STREAM_PENDING),
139134
equalTo(MESSAGING_OPERATION, "receive"),
140135
satisfies(MESSAGING_CLIENT_ID, k -> k.endsWith("consumer")),
@@ -152,10 +147,7 @@ void testKafkaProduceAndConsumeWithStreamsInBetween() throws Exception {
152147
List<AttributeAssertion> assertions =
153148
new ArrayList<>(
154149
asList(
155-
equalTo(
156-
MESSAGING_SYSTEM,
157-
MessagingIncubatingAttributes.MessagingSystemIncubatingValues
158-
.KAFKA),
150+
equalTo(MESSAGING_SYSTEM, KAFKA),
159151
equalTo(MESSAGING_DESTINATION_NAME, STREAM_PENDING),
160152
equalTo(MESSAGING_OPERATION, "process"),
161153
satisfies(MESSAGING_CLIENT_ID, k -> k.endsWith("consumer")),
@@ -186,9 +178,7 @@ void testKafkaProduceAndConsumeWithStreamsInBetween() throws Exception {
186178
.hasTraceId(receivedContext.getTraceId())
187179
.hasSpanId(receivedContext.getSpanId())
188180
.hasAttributesSatisfyingExactly(
189-
equalTo(
190-
MESSAGING_SYSTEM,
191-
MessagingIncubatingAttributes.MessagingSystemIncubatingValues.KAFKA),
181+
equalTo(MESSAGING_SYSTEM, KAFKA),
192182
equalTo(MESSAGING_DESTINATION_NAME, STREAM_PROCESSED),
193183
equalTo(MESSAGING_OPERATION, "publish"),
194184
satisfies(MESSAGING_CLIENT_ID, k -> k.endsWith("producer")),
@@ -206,10 +196,7 @@ void testKafkaProduceAndConsumeWithStreamsInBetween() throws Exception {
206196
List<AttributeAssertion> assertions =
207197
new ArrayList<>(
208198
asList(
209-
equalTo(
210-
MESSAGING_SYSTEM,
211-
MessagingIncubatingAttributes.MessagingSystemIncubatingValues
212-
.KAFKA),
199+
equalTo(MESSAGING_SYSTEM, KAFKA),
213200
equalTo(MESSAGING_DESTINATION_NAME, STREAM_PROCESSED),
214201
equalTo(MESSAGING_OPERATION, "receive"),
215202
satisfies(MESSAGING_CLIENT_ID, k -> k.startsWith("consumer")),
@@ -227,10 +214,7 @@ void testKafkaProduceAndConsumeWithStreamsInBetween() throws Exception {
227214
List<AttributeAssertion> assertions =
228215
new ArrayList<>(
229216
asList(
230-
equalTo(
231-
MESSAGING_SYSTEM,
232-
MessagingIncubatingAttributes.MessagingSystemIncubatingValues
233-
.KAFKA),
217+
equalTo(MESSAGING_SYSTEM, KAFKA),
234218
equalTo(MESSAGING_DESTINATION_NAME, STREAM_PROCESSED),
235219
equalTo(MESSAGING_OPERATION, "process"),
236220
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

+5-16
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE;
1818
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_OPERATION;
1919
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_SYSTEM;
20+
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MessagingSystemIncubatingValues.KAFKA;
2021
import static java.util.Arrays.asList;
2122
import static org.assertj.core.api.Assertions.assertThat;
2223

@@ -25,7 +26,6 @@
2526
import io.opentelemetry.api.trace.SpanKind;
2627
import io.opentelemetry.sdk.testing.assertj.AttributeAssertion;
2728
import io.opentelemetry.sdk.trace.data.SpanData;
28-
import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes;
2929
import java.time.Duration;
3030
import java.util.ArrayList;
3131
import java.util.List;
@@ -101,10 +101,7 @@ void testKafkaProduceAndConsumeWithStreamsInBetween() throws Exception {
101101
.hasKind(SpanKind.PRODUCER)
102102
.hasNoParent()
103103
.hasAttributesSatisfyingExactly(
104-
equalTo(
105-
MESSAGING_SYSTEM,
106-
MessagingIncubatingAttributes.MessagingSystemIncubatingValues
107-
.KAFKA),
104+
equalTo(MESSAGING_SYSTEM, KAFKA),
108105
equalTo(MESSAGING_DESTINATION_NAME, STREAM_PENDING),
109106
equalTo(MESSAGING_OPERATION, "publish"),
110107
equalTo(MESSAGING_CLIENT_ID, "producer-1"),
@@ -118,10 +115,7 @@ void testKafkaProduceAndConsumeWithStreamsInBetween() throws Exception {
118115
List<AttributeAssertion> assertions =
119116
new ArrayList<>(
120117
asList(
121-
equalTo(
122-
MESSAGING_SYSTEM,
123-
MessagingIncubatingAttributes.MessagingSystemIncubatingValues
124-
.KAFKA),
118+
equalTo(MESSAGING_SYSTEM, KAFKA),
125119
equalTo(MESSAGING_DESTINATION_NAME, STREAM_PENDING),
126120
equalTo(MESSAGING_OPERATION, "process"),
127121
satisfies(MESSAGING_CLIENT_ID, k -> k.endsWith("consumer")),
@@ -153,9 +147,7 @@ void testKafkaProduceAndConsumeWithStreamsInBetween() throws Exception {
153147
.hasTraceId(receivedContext.getTraceId())
154148
.hasSpanId(receivedContext.getSpanId())
155149
.hasAttributesSatisfyingExactly(
156-
equalTo(
157-
MESSAGING_SYSTEM,
158-
MessagingIncubatingAttributes.MessagingSystemIncubatingValues.KAFKA),
150+
equalTo(MESSAGING_SYSTEM, KAFKA),
159151
equalTo(MESSAGING_DESTINATION_NAME, STREAM_PROCESSED),
160152
equalTo(MESSAGING_OPERATION, "publish"),
161153
satisfies(MESSAGING_CLIENT_ID, k -> k.isInstanceOf(String.class)),
@@ -169,10 +161,7 @@ void testKafkaProduceAndConsumeWithStreamsInBetween() throws Exception {
169161
List<AttributeAssertion> assertions =
170162
new ArrayList<>(
171163
asList(
172-
equalTo(
173-
MESSAGING_SYSTEM,
174-
MessagingIncubatingAttributes.MessagingSystemIncubatingValues
175-
.KAFKA),
164+
equalTo(MESSAGING_SYSTEM, KAFKA),
176165
equalTo(MESSAGING_DESTINATION_NAME, STREAM_PROCESSED),
177166
equalTo(MESSAGING_OPERATION, "process"),
178167
satisfies(MESSAGING_CLIENT_ID, k -> k.startsWith("consumer")),

‎instrumentation/powerjob-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/powerjob/v4_0/PowerJobBasicProcessorTest.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
1919
import io.opentelemetry.sdk.testing.assertj.AttributeAssertion;
2020
import io.opentelemetry.sdk.trace.data.StatusData;
21+
import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes;
2122
import java.util.ArrayList;
2223
import java.util.List;
2324
import javax.sql.DataSource;
@@ -342,8 +343,8 @@ private static List<AttributeAssertion> attributeAssertions(
342343
List<AttributeAssertion> attributeAssertions =
343344
new ArrayList<>(
344345
asList(
345-
equalTo(AttributeKey.stringKey("code.namespace"), codeNamespace),
346-
equalTo(AttributeKey.stringKey("code.function"), "process"),
346+
equalTo(CodeIncubatingAttributes.CODE_NAMESPACE, codeNamespace),
347+
equalTo(CodeIncubatingAttributes.CODE_FUNCTION, "process"),
347348
equalTo(AttributeKey.stringKey("job.system"), "powerjob"),
348349
equalTo(AttributeKey.longKey("scheduling.powerjob.job.id"), jobId),
349350
equalTo(AttributeKey.stringKey("scheduling.powerjob.job.type"), jobType)));

0 commit comments

Comments
 (0)