diff --git a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientAttributesExtractorTest.java b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientAttributesExtractorTest.java index 4836a85e359c..bb5f7e3a7c3c 100644 --- a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientAttributesExtractorTest.java +++ b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientAttributesExtractorTest.java @@ -8,7 +8,6 @@ import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat; import static org.assertj.core.api.Assertions.entry; -import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.context.Context; @@ -90,9 +89,9 @@ void shouldExtractAllAvailableAttributes() { entry(DbIncubatingAttributes.DB_CONNECTION_STRING, "mydb:///potatoes"), entry(DbIncubatingAttributes.DB_STATEMENT, "SELECT * FROM potato"), entry(DbIncubatingAttributes.DB_OPERATION, "SELECT"), - entry(AttributeKey.stringKey("db.namespace"), "potatoes"), - entry(AttributeKey.stringKey("db.query.text"), "SELECT * FROM potato"), - entry(AttributeKey.stringKey("db.operation.name"), "SELECT")); + entry(DbIncubatingAttributes.DB_NAMESPACE, "potatoes"), + entry(DbIncubatingAttributes.DB_QUERY_TEXT, "SELECT * FROM potato"), + entry(DbIncubatingAttributes.DB_OPERATION_NAME, "SELECT")); } else if (SemconvStability.emitOldDatabaseSemconv()) { assertThat(startAttributes.build()) .containsOnly( @@ -106,9 +105,9 @@ void shouldExtractAllAvailableAttributes() { assertThat(startAttributes.build()) .containsOnly( entry(DbIncubatingAttributes.DB_SYSTEM, "myDb"), - entry(AttributeKey.stringKey("db.namespace"), "potatoes"), - entry(AttributeKey.stringKey("db.query.text"), "SELECT * FROM potato"), - entry(AttributeKey.stringKey("db.operation.name"), "SELECT")); + entry(DbIncubatingAttributes.DB_NAMESPACE, "potatoes"), + entry(DbIncubatingAttributes.DB_QUERY_TEXT, "SELECT * FROM potato"), + entry(DbIncubatingAttributes.DB_OPERATION_NAME, "SELECT")); } assertThat(endAttributes.build().isEmpty()).isTrue(); diff --git a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/SqlClientAttributesExtractorTest.java b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/SqlClientAttributesExtractorTest.java index f0b31197a3e2..0400bee30bc9 100644 --- a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/SqlClientAttributesExtractorTest.java +++ b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/SqlClientAttributesExtractorTest.java @@ -5,7 +5,6 @@ package io.opentelemetry.instrumentation.api.incubator.semconv.db; -import static io.opentelemetry.api.common.AttributeKey.stringKey; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat; import static org.assertj.core.api.Assertions.entry; @@ -88,10 +87,10 @@ void shouldExtractAllAttributes() { entry(DbIncubatingAttributes.DB_STATEMENT, "SELECT * FROM potato WHERE id=?"), entry(DbIncubatingAttributes.DB_OPERATION, "SELECT"), entry(DbIncubatingAttributes.DB_SQL_TABLE, "potato"), - entry(stringKey("db.namespace"), "potatoes"), - entry(stringKey("db.query.text"), "SELECT * FROM potato WHERE id=?"), - entry(stringKey("db.operation.name"), "SELECT"), - entry(stringKey("db.collection.name"), "potato")); + entry(DbIncubatingAttributes.DB_NAMESPACE, "potatoes"), + entry(DbIncubatingAttributes.DB_QUERY_TEXT, "SELECT * FROM potato WHERE id=?"), + entry(DbIncubatingAttributes.DB_OPERATION_NAME, "SELECT"), + entry(DbIncubatingAttributes.DB_COLLECTION_NAME, "potato")); } else if (SemconvStability.emitOldDatabaseSemconv()) { assertThat(startAttributes.build()) .containsOnly( @@ -106,10 +105,10 @@ void shouldExtractAllAttributes() { assertThat(startAttributes.build()) .containsOnly( entry(DbIncubatingAttributes.DB_SYSTEM, "myDb"), - entry(stringKey("db.namespace"), "potatoes"), - entry(stringKey("db.query.text"), "SELECT * FROM potato WHERE id=?"), - entry(stringKey("db.operation.name"), "SELECT"), - entry(stringKey("db.collection.name"), "potato")); + entry(DbIncubatingAttributes.DB_NAMESPACE, "potatoes"), + entry(DbIncubatingAttributes.DB_QUERY_TEXT, "SELECT * FROM potato WHERE id=?"), + entry(DbIncubatingAttributes.DB_OPERATION_NAME, "SELECT"), + entry(DbIncubatingAttributes.DB_COLLECTION_NAME, "potato")); } assertThat(endAttributes.build().isEmpty()).isTrue(); @@ -136,8 +135,8 @@ void shouldNotExtractTableIfAttributeIsNotSet() { .containsOnly( entry(DbIncubatingAttributes.DB_STATEMENT, "SELECT *"), entry(DbIncubatingAttributes.DB_OPERATION, "SELECT"), - entry(stringKey("db.query.text"), "SELECT *"), - entry(stringKey("db.operation.name"), "SELECT")); + entry(DbIncubatingAttributes.DB_QUERY_TEXT, "SELECT *"), + entry(DbIncubatingAttributes.DB_OPERATION_NAME, "SELECT")); } else if (SemconvStability.emitOldDatabaseSemconv()) { assertThat(attributes.build()) .containsOnly( @@ -146,8 +145,8 @@ void shouldNotExtractTableIfAttributeIsNotSet() { } else if (SemconvStability.emitStableDatabaseSemconv()) { assertThat(attributes.build()) .containsOnly( - entry(stringKey("db.query.text"), "SELECT *"), - entry(stringKey("db.operation.name"), "SELECT")); + entry(DbIncubatingAttributes.DB_QUERY_TEXT, "SELECT *"), + entry(DbIncubatingAttributes.DB_OPERATION_NAME, "SELECT")); } } @@ -176,9 +175,9 @@ void shouldExtractTableToSpecifiedKey() { entry(DbIncubatingAttributes.DB_STATEMENT, "SELECT * FROM table"), entry(DbIncubatingAttributes.DB_OPERATION, "SELECT"), entry(DbIncubatingAttributes.DB_CASSANDRA_TABLE, "table"), - entry(stringKey("db.query.text"), "SELECT * FROM table"), - entry(stringKey("db.operation.name"), "SELECT"), - entry(stringKey("db.collection.name"), "table")); + entry(DbIncubatingAttributes.DB_QUERY_TEXT, "SELECT * FROM table"), + entry(DbIncubatingAttributes.DB_OPERATION_NAME, "SELECT"), + entry(DbIncubatingAttributes.DB_COLLECTION_NAME, "table")); } else if (SemconvStability.emitOldDatabaseSemconv()) { assertThat(attributes.build()) .containsOnly( @@ -188,9 +187,9 @@ void shouldExtractTableToSpecifiedKey() { } else if (SemconvStability.emitStableDatabaseSemconv()) { assertThat(attributes.build()) .containsOnly( - entry(stringKey("db.query.text"), "SELECT * FROM table"), - entry(stringKey("db.operation.name"), "SELECT"), - entry(stringKey("db.collection.name"), "table")); + entry(DbIncubatingAttributes.DB_QUERY_TEXT, "SELECT * FROM table"), + entry(DbIncubatingAttributes.DB_OPERATION_NAME, "SELECT"), + entry(DbIncubatingAttributes.DB_COLLECTION_NAME, "table")); } } diff --git a/instrumentation/apache-shenyu-2.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apacheshenyu/v2_4/ShenYuRouteTest.java b/instrumentation/apache-shenyu-2.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apacheshenyu/v2_4/ShenYuRouteTest.java index 06cd346e8f03..af4fc5be6d82 100644 --- a/instrumentation/apache-shenyu-2.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apacheshenyu/v2_4/ShenYuRouteTest.java +++ b/instrumentation/apache-shenyu-2.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apacheshenyu/v2_4/ShenYuRouteTest.java @@ -11,6 +11,7 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; +import io.opentelemetry.semconv.HttpAttributes; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import org.apache.shenyu.common.dto.MetaData; @@ -111,7 +112,7 @@ void testUpdateRouter() { span.hasName("GET /a/b/c") .hasKind(SpanKind.SERVER) .hasAttributesSatisfying( - equalTo(AttributeKey.stringKey("http.route"), "/a/b/c"), + equalTo(HttpAttributes.HTTP_ROUTE, "/a/b/c"), equalTo(META_ID_ATTRIBUTE, "123"), equalTo(META_ENABLED_ATTRIBUTE, true), equalTo(METHOD_NAME_ATTRIBUTE, "hello"), diff --git a/instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/apiclient/ElasticsearchClientTest.java b/instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/apiclient/ElasticsearchClientTest.java index d60200b6cd62..7e2298ac2c5f 100644 --- a/instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/apiclient/ElasticsearchClientTest.java +++ b/instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/apiclient/ElasticsearchClientTest.java @@ -23,10 +23,10 @@ import co.elastic.clients.json.jackson.JacksonJsonpMapper; import co.elastic.clients.transport.ElasticsearchTransport; import co.elastic.clients.transport.rest_client.RestClientTransport; -import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import java.io.IOException; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -139,10 +139,12 @@ public void elasticsearchIndex() throws IOException { URL_FULL, httpHost.toURI() + "/test-index/_doc/test-id?timeout=10s"), equalTo( - AttributeKey.stringKey("db.elasticsearch.path_parts.index"), + DbIncubatingAttributes.DB_ELASTICSEARCH_PATH_PARTS.getAttributeKey( + "index"), "test-index"), equalTo( - AttributeKey.stringKey("db.elasticsearch.path_parts.id"), + DbIncubatingAttributes.DB_ELASTICSEARCH_PATH_PARTS.getAttributeKey( + "id"), "test-id")), span -> span.hasName("PUT") diff --git a/instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/KafkaStreamsDefaultTest.java b/instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/KafkaStreamsDefaultTest.java index 943f2448b8a8..f486bd56ced7 100644 --- a/instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/KafkaStreamsDefaultTest.java +++ b/instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/KafkaStreamsDefaultTest.java @@ -18,6 +18,7 @@ import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE; import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_OPERATION; import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_SYSTEM; +import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MessagingSystemIncubatingValues.KAFKA; import static java.util.Arrays.asList; import static org.assertj.core.api.Assertions.assertThat; @@ -28,7 +29,6 @@ import io.opentelemetry.sdk.testing.assertj.AttributeAssertion; import io.opentelemetry.sdk.trace.data.LinkData; import io.opentelemetry.sdk.trace.data.SpanData; -import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import java.time.Duration; import java.util.ArrayList; import java.util.List; @@ -111,9 +111,7 @@ void testKafkaProduceAndConsumeWithStreamsInBetween() throws Exception { .hasKind(SpanKind.PRODUCER) .hasNoParent() .hasAttributesSatisfyingExactly( - equalTo( - MESSAGING_SYSTEM, - MessagingIncubatingAttributes.MessagingSystemIncubatingValues.KAFKA), + equalTo(MESSAGING_SYSTEM, KAFKA), equalTo(MESSAGING_DESTINATION_NAME, STREAM_PENDING), equalTo(MESSAGING_OPERATION, "publish"), satisfies(MESSAGING_CLIENT_ID, k -> k.startsWith("producer")), @@ -131,10 +129,7 @@ void testKafkaProduceAndConsumeWithStreamsInBetween() throws Exception { List assertions = new ArrayList<>( asList( - equalTo( - MESSAGING_SYSTEM, - MessagingIncubatingAttributes.MessagingSystemIncubatingValues - .KAFKA), + equalTo(MESSAGING_SYSTEM, KAFKA), equalTo(MESSAGING_DESTINATION_NAME, STREAM_PENDING), equalTo(MESSAGING_OPERATION, "receive"), satisfies(MESSAGING_CLIENT_ID, k -> k.endsWith("consumer")), @@ -152,10 +147,7 @@ void testKafkaProduceAndConsumeWithStreamsInBetween() throws Exception { List assertions = new ArrayList<>( asList( - equalTo( - MESSAGING_SYSTEM, - MessagingIncubatingAttributes.MessagingSystemIncubatingValues - .KAFKA), + equalTo(MESSAGING_SYSTEM, KAFKA), equalTo(MESSAGING_DESTINATION_NAME, STREAM_PENDING), equalTo(MESSAGING_OPERATION, "process"), satisfies(MESSAGING_CLIENT_ID, k -> k.endsWith("consumer")), @@ -186,9 +178,7 @@ void testKafkaProduceAndConsumeWithStreamsInBetween() throws Exception { .hasTraceId(receivedContext.getTraceId()) .hasSpanId(receivedContext.getSpanId()) .hasAttributesSatisfyingExactly( - equalTo( - MESSAGING_SYSTEM, - MessagingIncubatingAttributes.MessagingSystemIncubatingValues.KAFKA), + equalTo(MESSAGING_SYSTEM, KAFKA), equalTo(MESSAGING_DESTINATION_NAME, STREAM_PROCESSED), equalTo(MESSAGING_OPERATION, "publish"), satisfies(MESSAGING_CLIENT_ID, k -> k.endsWith("producer")), @@ -206,10 +196,7 @@ void testKafkaProduceAndConsumeWithStreamsInBetween() throws Exception { List assertions = new ArrayList<>( asList( - equalTo( - MESSAGING_SYSTEM, - MessagingIncubatingAttributes.MessagingSystemIncubatingValues - .KAFKA), + equalTo(MESSAGING_SYSTEM, KAFKA), equalTo(MESSAGING_DESTINATION_NAME, STREAM_PROCESSED), equalTo(MESSAGING_OPERATION, "receive"), satisfies(MESSAGING_CLIENT_ID, k -> k.startsWith("consumer")), @@ -227,10 +214,7 @@ void testKafkaProduceAndConsumeWithStreamsInBetween() throws Exception { List assertions = new ArrayList<>( asList( - equalTo( - MESSAGING_SYSTEM, - MessagingIncubatingAttributes.MessagingSystemIncubatingValues - .KAFKA), + equalTo(MESSAGING_SYSTEM, KAFKA), equalTo(MESSAGING_DESTINATION_NAME, STREAM_PROCESSED), equalTo(MESSAGING_OPERATION, "process"), satisfies(MESSAGING_CLIENT_ID, k -> k.startsWith("consumer")), diff --git a/instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/KafkaStreamsSuppressReceiveSpansTest.java b/instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/KafkaStreamsSuppressReceiveSpansTest.java index 0afa69dbecff..59e1a943e450 100644 --- a/instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/KafkaStreamsSuppressReceiveSpansTest.java +++ b/instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/KafkaStreamsSuppressReceiveSpansTest.java @@ -17,6 +17,7 @@ import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE; import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_OPERATION; import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_SYSTEM; +import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MessagingSystemIncubatingValues.KAFKA; import static java.util.Arrays.asList; import static org.assertj.core.api.Assertions.assertThat; @@ -25,7 +26,6 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.sdk.testing.assertj.AttributeAssertion; import io.opentelemetry.sdk.trace.data.SpanData; -import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import java.time.Duration; import java.util.ArrayList; import java.util.List; @@ -101,10 +101,7 @@ void testKafkaProduceAndConsumeWithStreamsInBetween() throws Exception { .hasKind(SpanKind.PRODUCER) .hasNoParent() .hasAttributesSatisfyingExactly( - equalTo( - MESSAGING_SYSTEM, - MessagingIncubatingAttributes.MessagingSystemIncubatingValues - .KAFKA), + equalTo(MESSAGING_SYSTEM, KAFKA), equalTo(MESSAGING_DESTINATION_NAME, STREAM_PENDING), equalTo(MESSAGING_OPERATION, "publish"), equalTo(MESSAGING_CLIENT_ID, "producer-1"), @@ -118,10 +115,7 @@ void testKafkaProduceAndConsumeWithStreamsInBetween() throws Exception { List assertions = new ArrayList<>( asList( - equalTo( - MESSAGING_SYSTEM, - MessagingIncubatingAttributes.MessagingSystemIncubatingValues - .KAFKA), + equalTo(MESSAGING_SYSTEM, KAFKA), equalTo(MESSAGING_DESTINATION_NAME, STREAM_PENDING), equalTo(MESSAGING_OPERATION, "process"), satisfies(MESSAGING_CLIENT_ID, k -> k.endsWith("consumer")), @@ -153,9 +147,7 @@ void testKafkaProduceAndConsumeWithStreamsInBetween() throws Exception { .hasTraceId(receivedContext.getTraceId()) .hasSpanId(receivedContext.getSpanId()) .hasAttributesSatisfyingExactly( - equalTo( - MESSAGING_SYSTEM, - MessagingIncubatingAttributes.MessagingSystemIncubatingValues.KAFKA), + equalTo(MESSAGING_SYSTEM, KAFKA), equalTo(MESSAGING_DESTINATION_NAME, STREAM_PROCESSED), equalTo(MESSAGING_OPERATION, "publish"), satisfies(MESSAGING_CLIENT_ID, k -> k.isInstanceOf(String.class)), @@ -169,10 +161,7 @@ void testKafkaProduceAndConsumeWithStreamsInBetween() throws Exception { List assertions = new ArrayList<>( asList( - equalTo( - MESSAGING_SYSTEM, - MessagingIncubatingAttributes.MessagingSystemIncubatingValues - .KAFKA), + equalTo(MESSAGING_SYSTEM, KAFKA), equalTo(MESSAGING_DESTINATION_NAME, STREAM_PROCESSED), equalTo(MESSAGING_OPERATION, "process"), satisfies(MESSAGING_CLIENT_ID, k -> k.startsWith("consumer")), diff --git a/instrumentation/powerjob-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/powerjob/v4_0/PowerJobBasicProcessorTest.java b/instrumentation/powerjob-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/powerjob/v4_0/PowerJobBasicProcessorTest.java index 6783ee585e3c..cf00072088ad 100644 --- a/instrumentation/powerjob-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/powerjob/v4_0/PowerJobBasicProcessorTest.java +++ b/instrumentation/powerjob-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/powerjob/v4_0/PowerJobBasicProcessorTest.java @@ -18,6 +18,7 @@ import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.sdk.testing.assertj.AttributeAssertion; import io.opentelemetry.sdk.trace.data.StatusData; +import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes; import java.util.ArrayList; import java.util.List; import javax.sql.DataSource; @@ -342,8 +343,8 @@ private static List attributeAssertions( List attributeAssertions = new ArrayList<>( asList( - equalTo(AttributeKey.stringKey("code.namespace"), codeNamespace), - equalTo(AttributeKey.stringKey("code.function"), "process"), + equalTo(CodeIncubatingAttributes.CODE_NAMESPACE, codeNamespace), + equalTo(CodeIncubatingAttributes.CODE_FUNCTION, "process"), equalTo(AttributeKey.stringKey("job.system"), "powerjob"), equalTo(AttributeKey.longKey("scheduling.powerjob.job.id"), jobId), equalTo(AttributeKey.stringKey("scheduling.powerjob.job.type"), jobType))); diff --git a/instrumentation/vertx/vertx-kafka-client-3.6/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/kafka/v3_6/AbstractVertxKafkaTest.java b/instrumentation/vertx/vertx-kafka-client-3.6/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/kafka/v3_6/AbstractVertxKafkaTest.java index 986b6e964b96..c20ff15fab8e 100644 --- a/instrumentation/vertx/vertx-kafka-client-3.6/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/kafka/v3_6/AbstractVertxKafkaTest.java +++ b/instrumentation/vertx/vertx-kafka-client-3.6/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/kafka/v3_6/AbstractVertxKafkaTest.java @@ -16,6 +16,7 @@ import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE; import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_OPERATION; import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_SYSTEM; +import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MessagingSystemIncubatingValues.KAFKA; import static org.junit.jupiter.api.Assertions.assertTrue; import io.opentelemetry.api.common.AttributeKey; @@ -58,6 +59,9 @@ public abstract class AbstractVertxKafkaTest { private static final Logger logger = LoggerFactory.getLogger(AbstractVertxKafkaTest.class); + private static final AttributeKey MESSAGING_CLIENT_ID = + AttributeKey.stringKey("messaging.client_id"); + @RegisterExtension protected static final InstrumentationExtension testing = AgentInstrumentationExtension.create(); @@ -209,12 +213,10 @@ protected static List sendAttributes( List assertions = new ArrayList<>( Arrays.asList( - equalTo(MESSAGING_SYSTEM, "kafka"), + equalTo(MESSAGING_SYSTEM, KAFKA), equalTo(MESSAGING_DESTINATION_NAME, record.topic()), equalTo(MESSAGING_OPERATION, "publish"), - satisfies( - AttributeKey.stringKey("messaging.client_id"), - stringAssert -> stringAssert.startsWith("producer")), + satisfies(MESSAGING_CLIENT_ID, stringAssert -> stringAssert.startsWith("producer")), satisfies(MESSAGING_DESTINATION_PARTITION_ID, AbstractStringAssert::isNotEmpty), satisfies(MESSAGING_KAFKA_MESSAGE_OFFSET, AbstractLongAssert::isNotNegative))); String messageKey = record.key(); @@ -237,12 +239,10 @@ private static List batchConsumerAttributes(String topic, St List assertions = new ArrayList<>( Arrays.asList( - equalTo(MESSAGING_SYSTEM, "kafka"), + equalTo(MESSAGING_SYSTEM, KAFKA), equalTo(MESSAGING_DESTINATION_NAME, topic), equalTo(MESSAGING_OPERATION, operation), - satisfies( - AttributeKey.stringKey("messaging.client_id"), - stringAssert -> stringAssert.startsWith("consumer")), + satisfies(MESSAGING_CLIENT_ID, stringAssert -> stringAssert.startsWith("consumer")), satisfies(MESSAGING_BATCH_MESSAGE_COUNT, AbstractLongAssert::isPositive))); // consumer group is not available in version 0.11 if (Boolean.getBoolean("testLatestDeps")) { @@ -257,12 +257,10 @@ protected static List processAttributes( List assertions = new ArrayList<>( Arrays.asList( - equalTo(MESSAGING_SYSTEM, "kafka"), + equalTo(MESSAGING_SYSTEM, KAFKA), equalTo(MESSAGING_DESTINATION_NAME, record.topic()), equalTo(MESSAGING_OPERATION, "process"), - satisfies( - AttributeKey.stringKey("messaging.client_id"), - stringAssert -> stringAssert.startsWith("consumer")), + satisfies(MESSAGING_CLIENT_ID, stringAssert -> stringAssert.startsWith("consumer")), satisfies(MESSAGING_DESTINATION_PARTITION_ID, AbstractStringAssert::isNotEmpty), satisfies(MESSAGING_KAFKA_MESSAGE_OFFSET, AbstractLongAssert::isNotNegative))); if (Boolean.getBoolean("otel.instrumentation.kafka.experimental-span-attributes")) { diff --git a/instrumentation/vertx/vertx-redis-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/redis/VertxRedisClientTest.java b/instrumentation/vertx/vertx-redis-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/redis/VertxRedisClientTest.java index b9fe12edad39..116e62b1efe3 100644 --- a/instrumentation/vertx/vertx-redis-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/redis/VertxRedisClientTest.java +++ b/instrumentation/vertx/vertx-redis-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/redis/VertxRedisClientTest.java @@ -17,11 +17,11 @@ import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SYSTEM; import static org.assertj.core.api.Assertions.assertThat; -import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.sdk.testing.assertj.AttributeAssertion; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import io.vertx.core.Vertx; import io.vertx.redis.client.Redis; import io.vertx.redis.client.RedisAPI; @@ -212,9 +212,9 @@ private static AttributeAssertion[] redisSpanAttributes(String operation, String if (emitStableDatabaseSemconv()) { return new AttributeAssertion[] { equalTo(DB_SYSTEM, "redis"), - equalTo(AttributeKey.stringKey("db.query.text"), statement), - equalTo(AttributeKey.stringKey("db.operation.name"), operation), - equalTo(AttributeKey.stringKey("db.namespace"), "1"), + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, statement), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, operation), + equalTo(DbIncubatingAttributes.DB_NAMESPACE, "1"), equalTo(SERVER_ADDRESS, host), equalTo(SERVER_PORT, port), equalTo(NETWORK_PEER_PORT, port), diff --git a/instrumentation/xxl-job/xxl-job-common/testing/src/main/java/io/opentelemetry/instrumentation/xxljob/AbstractXxlJobTest.java b/instrumentation/xxl-job/xxl-job-common/testing/src/main/java/io/opentelemetry/instrumentation/xxljob/AbstractXxlJobTest.java index c8f7766e58e2..64d115812e6e 100644 --- a/instrumentation/xxl-job/xxl-job-common/testing/src/main/java/io/opentelemetry/instrumentation/xxljob/AbstractXxlJobTest.java +++ b/instrumentation/xxl-job/xxl-job-common/testing/src/main/java/io/opentelemetry/instrumentation/xxljob/AbstractXxlJobTest.java @@ -19,6 +19,7 @@ import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.sdk.testing.assertj.AttributeAssertion; import io.opentelemetry.sdk.trace.data.StatusData; +import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes; import java.util.ArrayList; import java.util.List; import org.junit.jupiter.api.Assumptions; @@ -147,8 +148,8 @@ private static void checkXxlJob( String codeFunction) { List attributeAssertions = new ArrayList<>(); attributeAssertions.addAll(attributeAssertions(glueType)); - attributeAssertions.add(equalTo(AttributeKey.stringKey("code.namespace"), codeNamespace)); - attributeAssertions.add(equalTo(AttributeKey.stringKey("code.function"), codeFunction)); + attributeAssertions.add(equalTo(CodeIncubatingAttributes.CODE_NAMESPACE, codeNamespace)); + attributeAssertions.add(equalTo(CodeIncubatingAttributes.CODE_FUNCTION, codeFunction)); checkXxlJob(spanName, statusData, attributeAssertions); } diff --git a/smoke-tests-otel-starter/spring-boot-common/src/main/java/io/opentelemetry/spring/smoketest/AbstractKafkaSpringStarterSmokeTest.java b/smoke-tests-otel-starter/spring-boot-common/src/main/java/io/opentelemetry/spring/smoketest/AbstractKafkaSpringStarterSmokeTest.java index 23de51869650..f92feb482367 100644 --- a/smoke-tests-otel-starter/spring-boot-common/src/main/java/io/opentelemetry/spring/smoketest/AbstractKafkaSpringStarterSmokeTest.java +++ b/smoke-tests-otel-starter/spring-boot-common/src/main/java/io/opentelemetry/spring/smoketest/AbstractKafkaSpringStarterSmokeTest.java @@ -28,6 +28,9 @@ abstract class AbstractKafkaSpringStarterSmokeTest extends AbstractSpringStarter @Autowired protected KafkaTemplate kafkaTemplate; + private static final AttributeKey MESSAGING_CLIENT_ID = + AttributeKey.stringKey("messaging.client_id"); + @SuppressWarnings("deprecation") // using deprecated semconv @Test void shouldInstrumentProducerAndConsumer() { @@ -63,7 +66,7 @@ void shouldInstrumentProducerAndConsumer() { "testTopic"), equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), satisfies( - AttributeKey.stringKey("messaging.client_id"), + MESSAGING_CLIENT_ID, stringAssert -> stringAssert.startsWith("producer")), satisfies( MessagingIncubatingAttributes.MESSAGING_DESTINATION_PARTITION_ID, @@ -101,7 +104,7 @@ void shouldInstrumentProducerAndConsumer() { AttributeKey.longKey("kafka.record.queue_time_ms"), AbstractLongAssert::isNotNegative), satisfies( - AttributeKey.stringKey("messaging.client_id"), + MESSAGING_CLIENT_ID, stringAssert -> stringAssert.startsWith("consumer"))), span -> span.hasName("consumer").hasParent(trace.getSpan(2)))); }