diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index 146c5b68ca7c..5279fdd40398 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -46,7 +46,7 @@ val asmVersion = "9.7" val jmhVersion = "1.37" val mockitoVersion = "4.11.0" val slf4jVersion = "2.0.13" -val semConvVersion = "1.25.0-alpha" +val semConvVersion = "1.26.0-alpha" val CORE_DEPENDENCIES = listOf( "io.opentelemetry.semconv:opentelemetry-semconv:${semConvVersion}", diff --git a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientAttributesExtractor.java b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientAttributesExtractor.java index 09c8fbc72570..675023f42132 100644 --- a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientAttributesExtractor.java +++ b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientAttributesExtractor.java @@ -25,8 +25,9 @@ public final class DbClientAttributesExtractor REQUEST, RESPONSE, DbClientAttributesGetter> { // copied from DbIncubatingAttributes - private static final AttributeKey DB_STATEMENT = AttributeKey.stringKey("db.statement"); - private static final AttributeKey DB_OPERATION = AttributeKey.stringKey("db.operation"); + private static final AttributeKey DB_QUERY_TEXT = AttributeKey.stringKey("db.query.text"); + private static final AttributeKey DB_OPERATION_NAME = + AttributeKey.stringKey("db.operation.name"); /** Creates the database client attributes extractor with default configuration. */ public static AttributesExtractor create( @@ -42,7 +43,7 @@ public static AttributesExtractor create( public void onStart(AttributesBuilder attributes, Context parentContext, REQUEST request) { super.onStart(attributes, parentContext, request); - internalSet(attributes, DB_STATEMENT, getter.getStatement(request)); - internalSet(attributes, DB_OPERATION, getter.getOperation(request)); + internalSet(attributes, DB_QUERY_TEXT, getter.getStatement(request)); + internalSet(attributes, DB_OPERATION_NAME, getter.getOperation(request)); } } diff --git a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientCommonAttributesExtractor.java b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientCommonAttributesExtractor.java index e3a6614c7660..9ea3ec9ef6aa 100644 --- a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientCommonAttributesExtractor.java +++ b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientCommonAttributesExtractor.java @@ -20,9 +20,8 @@ abstract class DbClientCommonAttributesExtractor< implements AttributesExtractor, SpanKeyProvider { // copied from DbIncubatingAttributes - private static final AttributeKey DB_NAME = AttributeKey.stringKey("db.name"); + private static final AttributeKey DB_NAMESPACE = AttributeKey.stringKey("db.namespace"); private static final AttributeKey DB_SYSTEM = AttributeKey.stringKey("db.system"); - private static final AttributeKey DB_USER = AttributeKey.stringKey("db.user"); private static final AttributeKey DB_CONNECTION_STRING = AttributeKey.stringKey("db.connection_string"); @@ -35,8 +34,7 @@ abstract class DbClientCommonAttributesExtractor< @Override public void onStart(AttributesBuilder attributes, Context parentContext, REQUEST request) { internalSet(attributes, DB_SYSTEM, getter.getSystem(request)); - internalSet(attributes, DB_USER, getter.getUser(request)); - internalSet(attributes, DB_NAME, getter.getName(request)); + internalSet(attributes, DB_NAMESPACE, getter.getName(request)); internalSet(attributes, DB_CONNECTION_STRING, getter.getConnectionString(request)); } diff --git a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/SqlClientAttributesExtractor.java b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/SqlClientAttributesExtractor.java index eacf266333bc..7f03cf0b8c49 100644 --- a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/SqlClientAttributesExtractor.java +++ b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/SqlClientAttributesExtractor.java @@ -27,8 +27,9 @@ public final class SqlClientAttributesExtractor REQUEST, RESPONSE, SqlClientAttributesGetter> { // copied from DbIncubatingAttributes - private static final AttributeKey DB_OPERATION = AttributeKey.stringKey("db.operation"); - private static final AttributeKey DB_STATEMENT = AttributeKey.stringKey("db.statement"); + private static final AttributeKey DB_QUERY_TEXT = AttributeKey.stringKey("db.query.text"); + private static final AttributeKey DB_OPERATION_NAME = + AttributeKey.stringKey("db.operation.name"); /** Creates the SQL client attributes extractor with default configuration. */ public static AttributesExtractor create( @@ -70,9 +71,9 @@ public void onStart(AttributesBuilder attributes, Context parentContext, REQUEST String operation = sanitizedStatement.getOperation(); internalSet( attributes, - DB_STATEMENT, + DB_QUERY_TEXT, statementSanitizationEnabled ? sanitizedStatement.getFullStatement() : rawStatement); - internalSet(attributes, DB_OPERATION, operation); + internalSet(attributes, DB_OPERATION_NAME, operation); if (!SQL_CALL.equals(operation)) { internalSet(attributes, dbTableAttribute, sanitizedStatement.getMainIdentifier()); } diff --git a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/SqlClientAttributesExtractorBuilder.java b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/SqlClientAttributesExtractorBuilder.java index 3e172e3d288e..1a4e392ee144 100644 --- a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/SqlClientAttributesExtractorBuilder.java +++ b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/SqlClientAttributesExtractorBuilder.java @@ -15,10 +15,11 @@ public final class SqlClientAttributesExtractorBuilder { // copied from DbIncubatingAttributes - private static final AttributeKey DB_SQL_TABLE = AttributeKey.stringKey("db.sql.table"); + private static final AttributeKey DB_COLLECTION_NAME = + AttributeKey.stringKey("db.collection.name"); final SqlClientAttributesGetter getter; - AttributeKey dbTableAttribute = DB_SQL_TABLE; + AttributeKey dbTableAttribute = DB_COLLECTION_NAME; boolean statementSanitizationEnabled = true; SqlClientAttributesExtractorBuilder(SqlClientAttributesGetter getter) { diff --git a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/messaging/MessagingAttributesExtractor.java b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/messaging/MessagingAttributesExtractor.java index f49d267f7989..57ae153a6e76 100644 --- a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/messaging/MessagingAttributesExtractor.java +++ b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/messaging/MessagingAttributesExtractor.java @@ -5,6 +5,7 @@ package io.opentelemetry.instrumentation.api.incubator.semconv.messaging; +import static io.opentelemetry.api.common.AttributeKey.stringKey; import static io.opentelemetry.instrumentation.api.internal.AttributesExtractorUtil.internalSet; import io.opentelemetry.api.common.AttributeKey; @@ -31,7 +32,7 @@ public final class MessagingAttributesExtractor private static final AttributeKey MESSAGING_BATCH_MESSAGE_COUNT = AttributeKey.longKey("messaging.batch.message_count"); private static final AttributeKey MESSAGING_CLIENT_ID = - AttributeKey.stringKey("messaging.client_id"); + AttributeKey.stringKey("messaging.client.id"); private static final AttributeKey MESSAGING_DESTINATION_ANONYMOUS = AttributeKey.booleanKey("messaging.destination.anonymous"); private static final AttributeKey MESSAGING_DESTINATION_NAME = @@ -48,8 +49,8 @@ public final class MessagingAttributesExtractor AttributeKey.longKey("messaging.message.envelope.size"); private static final AttributeKey MESSAGING_MESSAGE_ID = AttributeKey.stringKey("messaging.message.id"); - private static final AttributeKey MESSAGING_OPERATION = - AttributeKey.stringKey("messaging.operation"); + private static final AttributeKey MESSAGING_OPERATION_TYPE = + stringKey("messaging.operation.type"); private static final AttributeKey MESSAGING_SYSTEM = AttributeKey.stringKey("messaging.system"); @@ -108,7 +109,7 @@ public void onStart(AttributesBuilder attributes, Context parentContext, REQUEST attributes, MESSAGING_MESSAGE_ENVELOPE_SIZE, getter.getMessageEnvelopeSize(request)); internalSet(attributes, MESSAGING_CLIENT_ID, getter.getClientId(request)); if (operation != null) { - internalSet(attributes, MESSAGING_OPERATION, operation.operationName()); + internalSet(attributes, MESSAGING_OPERATION_TYPE, operation.operationName()); } } diff --git a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/messaging/MessagingMetricsAdvice.java b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/messaging/MessagingMetricsAdvice.java index 8ada61c1683f..1d93bfb87048 100644 --- a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/messaging/MessagingMetricsAdvice.java +++ b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/messaging/MessagingMetricsAdvice.java @@ -25,8 +25,8 @@ final class MessagingMetricsAdvice { AttributeKey.stringKey("messaging.system"); private static final AttributeKey MESSAGING_DESTINATION_NAME = AttributeKey.stringKey("messaging.destination.name"); - private static final AttributeKey MESSAGING_OPERATION = - AttributeKey.stringKey("messaging.operation"); + private static final AttributeKey MESSAGING_OPERATION_TYPE = + AttributeKey.stringKey("messaging.operation.type"); private static final AttributeKey MESSAGING_BATCH_MESSAGE_COUNT = AttributeKey.longKey("messaging.batch.message_count"); @@ -39,7 +39,7 @@ static void applyPublishDurationAdvice(DoubleHistogramBuilder builder) { asList( MESSAGING_SYSTEM, MESSAGING_DESTINATION_NAME, - MESSAGING_OPERATION, + MESSAGING_OPERATION_TYPE, MESSAGING_BATCH_MESSAGE_COUNT, ErrorAttributes.ERROR_TYPE, ServerAttributes.SERVER_PORT, 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 68991d1b813a..2b94aa05ad98 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 @@ -80,11 +80,10 @@ void shouldExtractAllAvailableAttributes() { assertThat(startAttributes.build()) .containsOnly( entry(DbIncubatingAttributes.DB_SYSTEM, "myDb"), - entry(DbIncubatingAttributes.DB_USER, "username"), - entry(DbIncubatingAttributes.DB_NAME, "potatoes"), + entry(DbIncubatingAttributes.DB_NAMESPACE, "potatoes"), entry(DbIncubatingAttributes.DB_CONNECTION_STRING, "mydb:///potatoes"), - entry(DbIncubatingAttributes.DB_STATEMENT, "SELECT * FROM potato"), - entry(DbIncubatingAttributes.DB_OPERATION, "SELECT")); + 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 f782a20b16ff..d6577084441c 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 @@ -76,12 +76,11 @@ void shouldExtractAllAttributes() { assertThat(startAttributes.build()) .containsOnly( entry(DbIncubatingAttributes.DB_SYSTEM, "myDb"), - entry(DbIncubatingAttributes.DB_USER, "username"), - entry(DbIncubatingAttributes.DB_NAME, "potatoes"), + entry(DbIncubatingAttributes.DB_NAMESPACE, "potatoes"), entry(DbIncubatingAttributes.DB_CONNECTION_STRING, "mydb:///potatoes"), - entry(DbIncubatingAttributes.DB_STATEMENT, "SELECT * FROM potato WHERE id=?"), - entry(DbIncubatingAttributes.DB_OPERATION, "SELECT"), - entry(DbIncubatingAttributes.DB_SQL_TABLE, "potato")); + 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(); } @@ -104,8 +103,8 @@ void shouldNotExtractTableIfAttributeIsNotSet() { // then assertThat(attributes.build()) .containsOnly( - entry(DbIncubatingAttributes.DB_STATEMENT, "SELECT *"), - entry(DbIncubatingAttributes.DB_OPERATION, "SELECT")); + entry(DbIncubatingAttributes.DB_QUERY_TEXT, "SELECT *"), + entry(DbIncubatingAttributes.DB_OPERATION_NAME, "SELECT")); } @Test @@ -118,7 +117,7 @@ void shouldExtractTableToSpecifiedKey() { AttributesExtractor, Void> underTest = SqlClientAttributesExtractor., Void>builder(new TestAttributesGetter()) - .setTableAttribute(DbIncubatingAttributes.DB_CASSANDRA_TABLE) + .setTableAttribute(DbIncubatingAttributes.DB_COLLECTION_NAME) .build(); // when @@ -128,9 +127,9 @@ void shouldExtractTableToSpecifiedKey() { // then assertThat(attributes.build()) .containsOnly( - entry(DbIncubatingAttributes.DB_STATEMENT, "SELECT * FROM table"), - entry(DbIncubatingAttributes.DB_OPERATION, "SELECT"), - entry(DbIncubatingAttributes.DB_CASSANDRA_TABLE, "table")); + entry(DbIncubatingAttributes.DB_QUERY_TEXT, "SELECT * FROM table"), + entry(DbIncubatingAttributes.DB_OPERATION_NAME, "SELECT"), + entry(DbIncubatingAttributes.DB_COLLECTION_NAME, "table")); } @Test diff --git a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/messaging/MessagingAttributesExtractorTest.java b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/messaging/MessagingAttributesExtractorTest.java index 395f52fdfdb7..f15ad257ae33 100644 --- a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/messaging/MessagingAttributesExtractorTest.java +++ b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/messaging/MessagingAttributesExtractorTest.java @@ -90,7 +90,7 @@ void shouldExtractAllAvailableAttributes( expectedEntries.add(entry(MessagingIncubatingAttributes.MESSAGING_MESSAGE_ENVELOPE_SIZE, 120L)); expectedEntries.add(entry(MessagingIncubatingAttributes.MESSAGING_CLIENT_ID, "43")); expectedEntries.add( - entry(MessagingIncubatingAttributes.MESSAGING_OPERATION, operation.operationName())); + entry(MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, operation.operationName())); @SuppressWarnings({"unchecked", "rawtypes"}) MapEntry, ?>[] expectedEntriesArr = diff --git a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/messaging/MessagingProducerMetricsTest.java b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/messaging/MessagingProducerMetricsTest.java index 491387253ee9..7965d7ce49a0 100644 --- a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/messaging/MessagingProducerMetricsTest.java +++ b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/messaging/MessagingProducerMetricsTest.java @@ -42,7 +42,7 @@ void collectsMetrics() { .put( MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, "persistent://public/default/topic") - .put(MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish") + .put(MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "publish") .put(ServerAttributes.SERVER_PORT, 6650) .put(ServerAttributes.SERVER_ADDRESS, "localhost") .build(); diff --git a/instrumentation/armeria/armeria-grpc-1.14/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/armeria/grpc/v1_14/ArmeriaGrpcTest.java b/instrumentation/armeria/armeria-grpc-1.14/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/armeria/grpc/v1_14/ArmeriaGrpcTest.java index 2402365b9efa..437d5dd0a5a5 100644 --- a/instrumentation/armeria/armeria-grpc-1.14/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/armeria/grpc/v1_14/ArmeriaGrpcTest.java +++ b/instrumentation/armeria/armeria-grpc-1.14/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/armeria/grpc/v1_14/ArmeriaGrpcTest.java @@ -19,7 +19,6 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.semconv.ServerAttributes; -import io.opentelemetry.semconv.incubating.MessageIncubatingAttributes; import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -87,15 +86,15 @@ void grpcInstrumentation() { event .hasName("message") .hasAttributesSatisfyingExactly( - equalTo(MessageIncubatingAttributes.MESSAGE_TYPE, "SENT"), - equalTo(MessageIncubatingAttributes.MESSAGE_ID, 1L)), + equalTo(RpcIncubatingAttributes.RPC_MESSAGE_TYPE, "SENT"), + equalTo(RpcIncubatingAttributes.RPC_MESSAGE_ID, 1L)), event -> event .hasName("message") .hasAttributesSatisfyingExactly( equalTo( - MessageIncubatingAttributes.MESSAGE_TYPE, "RECEIVED"), - equalTo(MessageIncubatingAttributes.MESSAGE_ID, 2L))), + RpcIncubatingAttributes.RPC_MESSAGE_TYPE, "RECEIVED"), + equalTo(RpcIncubatingAttributes.RPC_MESSAGE_ID, 2L))), span -> span.hasName("example.Greeter/SayHello") .hasKind(SpanKind.SERVER) @@ -115,13 +114,13 @@ void grpcInstrumentation() { .hasName("message") .hasAttributesSatisfyingExactly( equalTo( - MessageIncubatingAttributes.MESSAGE_TYPE, "RECEIVED"), - equalTo(MessageIncubatingAttributes.MESSAGE_ID, 1L)), + RpcIncubatingAttributes.RPC_MESSAGE_TYPE, "RECEIVED"), + equalTo(RpcIncubatingAttributes.RPC_MESSAGE_ID, 1L)), event -> event .hasName("message") .hasAttributesSatisfyingExactly( - equalTo(MessageIncubatingAttributes.MESSAGE_TYPE, "SENT"), - equalTo(MessageIncubatingAttributes.MESSAGE_ID, 2L))))); + equalTo(RpcIncubatingAttributes.RPC_MESSAGE_TYPE, "SENT"), + equalTo(RpcIncubatingAttributes.RPC_MESSAGE_ID, 2L))))); } } diff --git a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/internal/SqsEventAttributesExtractor.java b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/internal/SqsEventAttributesExtractor.java index f8aa3c80e137..75138f1d00a9 100644 --- a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/internal/SqsEventAttributesExtractor.java +++ b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/internal/SqsEventAttributesExtractor.java @@ -5,6 +5,8 @@ package io.opentelemetry.instrumentation.awslambdaevents.v2_2.internal; +import static io.opentelemetry.api.common.AttributeKey.stringKey; + import com.amazonaws.services.lambda.runtime.events.SQSEvent; import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.common.AttributesBuilder; @@ -15,8 +17,8 @@ class SqsEventAttributesExtractor implements AttributesExtractor { // copied from MessagingIncubatingAttributes - private static final AttributeKey MESSAGING_OPERATION = - AttributeKey.stringKey("messaging.operation"); + private static final AttributeKey MESSAGING_OPERATION_TYPE = + stringKey("messaging.operation.type"); private static final AttributeKey MESSAGING_SYSTEM = AttributeKey.stringKey("messaging.system"); // copied from MessagingIncubatingAttributes.MessagingSystemValues @@ -25,7 +27,7 @@ class SqsEventAttributesExtractor implements AttributesExtractor @Override public void onStart(AttributesBuilder attributes, Context parentContext, SQSEvent event) { attributes.put(MESSAGING_SYSTEM, AWS_SQS); - attributes.put(MESSAGING_OPERATION, "process"); + attributes.put(MESSAGING_OPERATION_TYPE, "process"); } @Override diff --git a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/internal/SqsMessageAttributesExtractor.java b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/internal/SqsMessageAttributesExtractor.java index ad6358c34f50..0e9dfee389e5 100644 --- a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/internal/SqsMessageAttributesExtractor.java +++ b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/internal/SqsMessageAttributesExtractor.java @@ -5,6 +5,8 @@ package io.opentelemetry.instrumentation.awslambdaevents.v2_2.internal; +import static io.opentelemetry.api.common.AttributeKey.stringKey; + import com.amazonaws.services.lambda.runtime.events.SQSEvent.SQSMessage; import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.common.AttributesBuilder; @@ -19,8 +21,8 @@ class SqsMessageAttributesExtractor implements AttributesExtractor MESSAGING_MESSAGE_ID = AttributeKey.stringKey("messaging.message.id"); - private static final AttributeKey MESSAGING_OPERATION = - AttributeKey.stringKey("messaging.operation"); + private static final AttributeKey MESSAGING_OPERATION_TYPE = + stringKey("messaging.operation.type"); private static final AttributeKey MESSAGING_SYSTEM = AttributeKey.stringKey("messaging.system"); // copied from MessagingIncubatingAttributes.MessagingSystemValues @@ -29,7 +31,7 @@ class SqsMessageAttributesExtractor implements AttributesExtractor { diff --git a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaSqsMessageHandlerTest.java b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaSqsMessageHandlerTest.java index 49bcbe97e241..8bf7031a8ec8 100644 --- a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaSqsMessageHandlerTest.java +++ b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaSqsMessageHandlerTest.java @@ -89,7 +89,8 @@ void processSpans() { equalTo( MessagingIncubatingAttributes.MESSAGING_SYSTEM, MessagingIncubatingAttributes.MessagingSystemValues.AWS_SQS), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "process")) + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "process")) .hasLinks( LinkData.create( SpanContext.createFromRemoteParent( @@ -111,7 +112,8 @@ void processSpans() { equalTo( MessagingIncubatingAttributes.MESSAGING_SYSTEM, MessagingIncubatingAttributes.MessagingSystemValues.AWS_SQS), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "process"), equalTo(MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, "message1"), equalTo( MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, "queue1")) @@ -130,7 +132,8 @@ void processSpans() { equalTo( MessagingIncubatingAttributes.MESSAGING_SYSTEM, MessagingIncubatingAttributes.MessagingSystemValues.AWS_SQS), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "process"), equalTo(MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, "message2"), equalTo( MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, "queue1")) diff --git a/instrumentation/aws-lambda/aws-lambda-events-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AbstractAwsLambdaSqsEventHandlerTest.java b/instrumentation/aws-lambda/aws-lambda-events-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AbstractAwsLambdaSqsEventHandlerTest.java index c7003983787c..172cc11448d8 100644 --- a/instrumentation/aws-lambda/aws-lambda-events-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AbstractAwsLambdaSqsEventHandlerTest.java +++ b/instrumentation/aws-lambda/aws-lambda-events-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AbstractAwsLambdaSqsEventHandlerTest.java @@ -84,7 +84,8 @@ void sameSource() { MessagingIncubatingAttributes.MESSAGING_SYSTEM, MessagingIncubatingAttributes.MessagingSystemValues.AWS_SQS), equalTo( - MessagingIncubatingAttributes.MESSAGING_OPERATION, "process")) + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, + "process")) .hasLinksSatisfying( links -> assertThat(links) @@ -133,7 +134,8 @@ void differentSource() { MessagingIncubatingAttributes.MESSAGING_SYSTEM, MessagingIncubatingAttributes.MessagingSystemValues.AWS_SQS), equalTo( - MessagingIncubatingAttributes.MESSAGING_OPERATION, "process")) + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, + "process")) .hasLinksSatisfying( links -> assertThat(links) diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/S3TracingTest.groovy b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/S3TracingTest.groovy index 1dea81b84719..bbd9f62fcb3b 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/S3TracingTest.groovy +++ b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/S3TracingTest.groovy @@ -199,7 +199,7 @@ class S3TracingTest extends AgentInstrumentationSpecification { "$ServerAttributes.SERVER_PORT" { it == null || Number } "$MessagingIncubatingAttributes.MESSAGING_SYSTEM" MessagingIncubatingAttributes.MessagingSystemValues.AWS_SQS "$MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME" "s3ToSqsTestQueue" - "$MessagingIncubatingAttributes.MESSAGING_OPERATION" "process" + "$MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE" "process" "$MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID" String "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" } @@ -535,7 +535,7 @@ class S3TracingTest extends AgentInstrumentationSpecification { "$ServerAttributes.SERVER_PORT" { it == null || Number } "$MessagingIncubatingAttributes.MESSAGING_SYSTEM" MessagingIncubatingAttributes.MessagingSystemValues.AWS_SQS "$MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME" "s3ToSnsToSqsTestQueue" - "$MessagingIncubatingAttributes.MESSAGING_OPERATION" "process" + "$MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE" "process" "$MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID" String "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" } diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/SnsTracingTest.groovy b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/SnsTracingTest.groovy index ba6b28fafb59..31da63e4f6e9 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/SnsTracingTest.groovy +++ b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/SnsTracingTest.groovy @@ -190,7 +190,7 @@ class SnsTracingTest extends AgentInstrumentationSpecification { "$ServerAttributes.SERVER_PORT" { it == null || Number } "$MessagingIncubatingAttributes.MESSAGING_SYSTEM" MessagingIncubatingAttributes.MessagingSystemValues.AWS_SQS "$MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME" "snsToSqsTestQueue" - "$MessagingIncubatingAttributes.MESSAGING_OPERATION" "process" + "$MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE" "process" "$MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID" String "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" } diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSqsSuppressReceiveSpansTest.java b/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSqsSuppressReceiveSpansTest.java index 51dc8b4d37e9..b7f47ddc1316 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSqsSuppressReceiveSpansTest.java +++ b/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSqsSuppressReceiveSpansTest.java @@ -133,7 +133,8 @@ void testSimpleSqsProducerConsumerServices() { MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, "testSdkSqs"), equalTo( - MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, + "publish"), satisfies( MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, val -> val.isInstanceOf(String.class)), @@ -163,7 +164,8 @@ void testSimpleSqsProducerConsumerServices() { MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, "testSdkSqs"), equalTo( - MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"), + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, + "process"), satisfies( MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, val -> val.isInstanceOf(String.class)), @@ -242,7 +244,8 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() { MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, "testSdkSqs"), equalTo( - MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, + "publish"), satisfies( MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, val -> val.isInstanceOf(String.class)), @@ -272,7 +275,8 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() { MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, "testSdkSqs"), equalTo( - MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"), + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, + "process"), satisfies( MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, val -> val.isInstanceOf(String.class)), diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSqsTracingTest.java b/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSqsTracingTest.java index 3dd3fe259a3b..212958260a9c 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSqsTracingTest.java +++ b/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSqsTracingTest.java @@ -165,7 +165,8 @@ void testSimpleSqsProducerConsumerServicesCaptureHeaders(boolean testCaptureHead MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, "testSdkSqs"), equalTo( - MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, + "publish"), satisfies( MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, val -> val.isInstanceOf(String.class)), @@ -209,7 +210,8 @@ void testSimpleSqsProducerConsumerServicesCaptureHeaders(boolean testCaptureHead MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, "testSdkSqs"), equalTo( - MessagingIncubatingAttributes.MESSAGING_OPERATION, "receive"), + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, + "receive"), equalTo( MessagingIncubatingAttributes.MESSAGING_BATCH_MESSAGE_COUNT, 1), @@ -251,7 +253,8 @@ void testSimpleSqsProducerConsumerServicesCaptureHeaders(boolean testCaptureHead MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, "testSdkSqs"), equalTo( - MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"), + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, + "process"), satisfies( MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, val -> val.isInstanceOf(String.class)), @@ -342,7 +345,8 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() { MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, "testSdkSqs"), equalTo( - MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, + "publish"), satisfies( MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, val -> val.isInstanceOf(String.class)), @@ -411,7 +415,7 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() { MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, "testSdkSqs"), equalTo( - MessagingIncubatingAttributes.MESSAGING_OPERATION, + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "receive"), equalTo( MessagingIncubatingAttributes @@ -448,7 +452,7 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() { MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, "testSdkSqs"), equalTo( - MessagingIncubatingAttributes.MESSAGING_OPERATION, + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "process"), satisfies( MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/TracingExecutionInterceptor.java b/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/TracingExecutionInterceptor.java index ada21457d45b..7fb9c5cbec29 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/TracingExecutionInterceptor.java +++ b/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/TracingExecutionInterceptor.java @@ -44,7 +44,8 @@ final class TracingExecutionInterceptor implements ExecutionInterceptor { // copied from DbIncubatingAttributes - private static final AttributeKey DB_OPERATION = AttributeKey.stringKey("db.operation"); + private static final AttributeKey DB_OPERATION_NAME = + AttributeKey.stringKey("db.operation.name"); private static final AttributeKey DB_SYSTEM = AttributeKey.stringKey("db.system"); // copied from DbIncubatingAttributes.DbSystemValues private static final String DB_SYSTEM_DYNAMODB = "dynamodb"; @@ -323,7 +324,7 @@ private void populateRequestAttributes( span.setAttribute(DB_SYSTEM, DB_SYSTEM_DYNAMODB); String operation = attributes.getAttribute(SdkExecutionAttribute.OPERATION_NAME); if (operation != null) { - span.setAttribute(DB_OPERATION, operation); + span.setAttribute(DB_OPERATION_NAME, operation); } } } diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientCoreTest.groovy b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientCoreTest.groovy index a73122bc1af9..f4540e50c334 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientCoreTest.groovy +++ b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientCoreTest.groovy @@ -149,7 +149,7 @@ abstract class AbstractAws2ClientCoreTest extends InstrumentationSpecification { "aws.requestId" "$requestId" "aws.table.name" "sometable" "$DbIncubatingAttributes.DB_SYSTEM" "dynamodb" - "$DbIncubatingAttributes.DB_OPERATION" "CreateTable" + "$DbIncubatingAttributes.DB_OPERATION_NAME" "CreateTable" "aws.dynamodb.global_secondary_indexes" "[{\"IndexName\":\"globalIndex\",\"KeySchema\":[{\"AttributeName\":\"attribute\"}],\"ProvisionedThroughput\":{\"ReadCapacityUnits\":10,\"WriteCapacityUnits\":12}},{\"IndexName\":\"globalIndexSecondary\",\"KeySchema\":[{\"AttributeName\":\"attributeSecondary\"}],\"ProvisionedThroughput\":{\"ReadCapacityUnits\":7,\"WriteCapacityUnits\":8}}]" "aws.dynamodb.provisioned_throughput.read_capacity_units" "1" "aws.dynamodb.provisioned_throughput.write_capacity_units" "1" @@ -182,7 +182,7 @@ abstract class AbstractAws2ClientCoreTest extends InstrumentationSpecification { "aws.requestId" "$requestId" "aws.table.name" "sometable" "$DbIncubatingAttributes.DB_SYSTEM" "dynamodb" - "$DbIncubatingAttributes.DB_OPERATION" "Query" + "$DbIncubatingAttributes.DB_OPERATION_NAME" "Query" "aws.dynamodb.limit" "10" "aws.dynamodb.select" "ALL_ATTRIBUTES" } @@ -214,7 +214,7 @@ abstract class AbstractAws2ClientCoreTest extends InstrumentationSpecification { "aws.requestId" "$requestId" "aws.table.name" "sometable" "$DbIncubatingAttributes.DB_SYSTEM" "dynamodb" - "$DbIncubatingAttributes.DB_OPERATION" "${operation}" + "$DbIncubatingAttributes.DB_OPERATION_NAME" "${operation}" } } } diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientTest.groovy b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientTest.groovy index 3241c48640bb..dc1db3660185 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientTest.groovy +++ b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientTest.groovy @@ -143,7 +143,7 @@ abstract class AbstractAws2ClientTest extends AbstractAws2ClientCoreTest { } else if (service == "Sqs" && operation == "SendMessage") { "aws.queue.url" QUEUE_URL "$MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME" "somequeue" - "$MessagingIncubatingAttributes.MESSAGING_OPERATION" "publish" + "$MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE" "publish" "$MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID" String "$MessagingIncubatingAttributes.MESSAGING_SYSTEM" MessagingIncubatingAttributes.MessagingSystemValues.AWS_SQS } else if (service == "Kinesis") { @@ -303,7 +303,7 @@ abstract class AbstractAws2ClientTest extends AbstractAws2ClientCoreTest { } else if (service == "Sqs" && operation == "SendMessage") { "aws.queue.url" QUEUE_URL "$MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME" "somequeue" - "$MessagingIncubatingAttributes.MESSAGING_OPERATION" "publish" + "$MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE" "publish" "$MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID" String "$MessagingIncubatingAttributes.MESSAGING_SYSTEM" MessagingIncubatingAttributes.MessagingSystemValues.AWS_SQS } else if (service == "Kinesis") { diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2SqsSuppressReceiveSpansTest.groovy b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2SqsSuppressReceiveSpansTest.groovy index 6f44c92573d6..6cc42bbb021f 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2SqsSuppressReceiveSpansTest.groovy +++ b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2SqsSuppressReceiveSpansTest.groovy @@ -159,7 +159,7 @@ abstract class AbstractAws2SqsSuppressReceiveSpansTest extends InstrumentationSp "$ServerAttributes.SERVER_PORT" sqsPort "$MessagingIncubatingAttributes.MESSAGING_SYSTEM" MessagingIncubatingAttributes.MessagingSystemValues.AWS_SQS "$MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME" "testSdkSqs" - "$MessagingIncubatingAttributes.MESSAGING_OPERATION" "publish" + "$MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE" "publish" "$MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID" String } } @@ -180,7 +180,7 @@ abstract class AbstractAws2SqsSuppressReceiveSpansTest extends InstrumentationSp "$ServerAttributes.SERVER_PORT" sqsPort "$MessagingIncubatingAttributes.MESSAGING_SYSTEM" MessagingIncubatingAttributes.MessagingSystemValues.AWS_SQS "$MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME" "testSdkSqs" - "$MessagingIncubatingAttributes.MESSAGING_OPERATION" "process" + "$MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE" "process" "$MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID" String } } @@ -331,7 +331,7 @@ abstract class AbstractAws2SqsSuppressReceiveSpansTest extends InstrumentationSp "$ServerAttributes.SERVER_PORT" sqsPort "$MessagingIncubatingAttributes.MESSAGING_SYSTEM" MessagingIncubatingAttributes.MessagingSystemValues.AWS_SQS "$MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME" "testSdkSqs" - "$MessagingIncubatingAttributes.MESSAGING_OPERATION" "publish" + "$MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE" "publish" } } for (int i: 1..(xrayInjectionEnabled ? 3 : 2)) { @@ -353,7 +353,7 @@ abstract class AbstractAws2SqsSuppressReceiveSpansTest extends InstrumentationSp "$ServerAttributes.SERVER_PORT" sqsPort "$MessagingIncubatingAttributes.MESSAGING_SYSTEM" MessagingIncubatingAttributes.MessagingSystemValues.AWS_SQS "$MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME" "testSdkSqs" - "$MessagingIncubatingAttributes.MESSAGING_OPERATION" "process" + "$MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE" "process" "$MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID" String } } @@ -381,7 +381,7 @@ abstract class AbstractAws2SqsSuppressReceiveSpansTest extends InstrumentationSp "$ServerAttributes.SERVER_PORT" sqsPort "$MessagingIncubatingAttributes.MESSAGING_SYSTEM" MessagingIncubatingAttributes.MessagingSystemValues.AWS_SQS "$MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME" "testSdkSqs" - "$MessagingIncubatingAttributes.MESSAGING_OPERATION" "process" + "$MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE" "process" "$MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID" String } } diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientRecordHttpErrorTest.java b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientRecordHttpErrorTest.java index 8c68be58729b..46ecd71033af 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientRecordHttpErrorTest.java +++ b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientRecordHttpErrorTest.java @@ -175,7 +175,7 @@ public void testSendDynamoDbRequestWithRetries() { .containsEntry("aws.requestId", requestId) .containsEntry("aws.table.name", "sometable") .containsEntry(DbIncubatingAttributes.DB_SYSTEM, "dynamodb") - .containsEntry(DbIncubatingAttributes.DB_OPERATION, operation); + .containsEntry(DbIncubatingAttributes.DB_OPERATION_NAME, operation); }); if (isRecordIndividualHttpErrorEnabled()) { span.hasEventsSatisfyingExactly( diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2SqsTracingTest.java b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2SqsTracingTest.java index 39a267222ba0..5f312559f2d8 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2SqsTracingTest.java +++ b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2SqsTracingTest.java @@ -221,7 +221,8 @@ void assertSqsTraces(Boolean withParent, Boolean captureHeaders) { MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, "testSdkSqs"), equalTo( - MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, + "publish"), satisfies( MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, v -> v.isInstanceOf(String.class)))); @@ -305,7 +306,7 @@ void assertSqsTraces(Boolean withParent, Boolean captureHeaders) { MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, "testSdkSqs"), equalTo( - MessagingIncubatingAttributes.MESSAGING_OPERATION, + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "receive"), equalTo( MessagingIncubatingAttributes.MESSAGING_BATCH_MESSAGE_COUNT, @@ -352,7 +353,7 @@ void assertSqsTraces(Boolean withParent, Boolean captureHeaders) { MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, "testSdkSqs"), equalTo( - MessagingIncubatingAttributes.MESSAGING_OPERATION, + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "process"), satisfies( MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, @@ -532,7 +533,8 @@ void testBatchSqsProducerConsumerServicesSync() throws URISyntaxException { MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, "testSdkSqs"), equalTo( - MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"))); + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, + "publish"))); }, trace -> { List> spanAsserts = new ArrayList<>(); @@ -560,7 +562,9 @@ void testBatchSqsProducerConsumerServicesSync() throws URISyntaxException { equalTo( MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, "testSdkSqs"), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "receive"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, + "receive"), equalTo( MessagingIncubatingAttributes.MESSAGING_BATCH_MESSAGE_COUNT, 3))); @@ -609,7 +613,7 @@ void testBatchSqsProducerConsumerServicesSync() throws URISyntaxException { MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, "testSdkSqs"), equalTo( - MessagingIncubatingAttributes.MESSAGING_OPERATION, + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "process"), satisfies( MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, diff --git a/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/DbSpanDecorator.java b/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/DbSpanDecorator.java index 45b368a043f1..997a0ac926f4 100644 --- a/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/DbSpanDecorator.java +++ b/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/DbSpanDecorator.java @@ -125,11 +125,11 @@ public void pre( attributes.put(DbIncubatingAttributes.DB_SYSTEM, system); String statement = getStatement(exchange, endpoint); if (statement != null) { - attributes.put(DbIncubatingAttributes.DB_STATEMENT, statement); + attributes.put(DbIncubatingAttributes.DB_QUERY_TEXT, statement); } String dbName = getDbName(endpoint); if (dbName != null) { - attributes.put(DbIncubatingAttributes.DB_NAME, dbName); + attributes.put(DbIncubatingAttributes.DB_NAMESPACE, dbName); } } } diff --git a/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/KafkaSpanDecorator.java b/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/KafkaSpanDecorator.java index fc6e1fc87113..c478205d68d1 100644 --- a/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/KafkaSpanDecorator.java +++ b/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/KafkaSpanDecorator.java @@ -60,7 +60,7 @@ public void pre( CamelDirection camelDirection) { super.pre(attributes, exchange, endpoint, camelDirection); - attributes.put(MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"); + attributes.put(MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "process"); Integer partition = exchange.getIn().getHeader(PARTITION, Integer.class); if (partition != null) { diff --git a/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/AwsSpanAssertions.java b/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/AwsSpanAssertions.java index b004b676d209..e56d1b5abc78 100644 --- a/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/AwsSpanAssertions.java +++ b/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/AwsSpanAssertions.java @@ -100,17 +100,17 @@ static SpanDataAssert sqs( MessagingIncubatingAttributes.MessagingSystemValues.AWS_SQS))); if (spanName.endsWith("receive")) { attributeAssertions.add( - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "receive")); + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "receive")); } else if (spanName.endsWith("process")) { attributeAssertions.add( - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "process")); + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "process")); attributeAssertions.add( satisfies( MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, val -> assertThat(val).isNotNull())); } else if (spanName.endsWith("publish")) { attributeAssertions.add( - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish")); + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "publish")); attributeAssertions.add( satisfies( MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, diff --git a/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/CassandraTest.java b/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/CassandraTest.java index 4e21f1bff32d..4e77a8fdccd6 100644 --- a/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/CassandraTest.java +++ b/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/CassandraTest.java @@ -116,9 +116,9 @@ void testCassandra() { equalTo( stringKey("camel.uri"), "cql://" + host + ":" + cassandraPort + "/test"), - equalTo(DbIncubatingAttributes.DB_NAME, "test"), + equalTo(DbIncubatingAttributes.DB_NAMESPACE, "test"), equalTo( - DbIncubatingAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_QUERY_TEXT, "select * from test.users where id=? ALLOW FILTERING"), equalTo(DbIncubatingAttributes.DB_SYSTEM, "cassandra")))); } diff --git a/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraSingletons.java b/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraSingletons.java index 841f48fdbc6e..f70a2f80bcbb 100644 --- a/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraSingletons.java +++ b/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraSingletons.java @@ -32,7 +32,7 @@ public final class CassandraSingletons { DbClientSpanNameExtractor.create(attributesGetter)) .addAttributesExtractor( SqlClientAttributesExtractor.builder(attributesGetter) - .setTableAttribute(DbIncubatingAttributes.DB_CASSANDRA_TABLE) + .setTableAttribute(DbIncubatingAttributes.DB_COLLECTION_NAME) .setStatementSanitizationEnabled( AgentCommonConfig.get().isStatementSanitizationEnabled()) .build()) diff --git a/instrumentation/cassandra/cassandra-3.0/javaagent/src/test/java/CassandraClientTest.java b/instrumentation/cassandra/cassandra-3.0/javaagent/src/test/java/CassandraClientTest.java index 7d581375d537..acac200902ac 100644 --- a/instrumentation/cassandra/cassandra-3.0/javaagent/src/test/java/CassandraClientTest.java +++ b/instrumentation/cassandra/cassandra-3.0/javaagent/src/test/java/CassandraClientTest.java @@ -100,7 +100,7 @@ void syncTest(Parameter parameter) { equalTo(NetworkAttributes.NETWORK_PEER_PORT, cassandraPort), equalTo(DbIncubatingAttributes.DB_SYSTEM, "cassandra"), equalTo( - DbIncubatingAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_QUERY_TEXT, "USE " + parameter.keyspace))), trace -> trace.hasSpansSatisfyingExactly( @@ -115,12 +115,14 @@ void syncTest(Parameter parameter) { equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, cassandraIp), equalTo(NetworkAttributes.NETWORK_PEER_PORT, cassandraPort), equalTo(DbIncubatingAttributes.DB_SYSTEM, "cassandra"), - equalTo(DbIncubatingAttributes.DB_NAME, parameter.keyspace), + equalTo(DbIncubatingAttributes.DB_NAMESPACE, parameter.keyspace), equalTo( - DbIncubatingAttributes.DB_STATEMENT, parameter.expectedStatement), - equalTo(DbIncubatingAttributes.DB_OPERATION, parameter.operation), + DbIncubatingAttributes.DB_QUERY_TEXT, + parameter.expectedStatement), equalTo( - DbIncubatingAttributes.DB_CASSANDRA_TABLE, parameter.table)))); + DbIncubatingAttributes.DB_OPERATION_NAME, parameter.operation), + equalTo( + DbIncubatingAttributes.DB_COLLECTION_NAME, parameter.table)))); } else { testing.waitAndAssertTraces( trace -> @@ -137,10 +139,12 @@ void syncTest(Parameter parameter) { equalTo(NetworkAttributes.NETWORK_PEER_PORT, cassandraPort), equalTo(DbIncubatingAttributes.DB_SYSTEM, "cassandra"), equalTo( - DbIncubatingAttributes.DB_STATEMENT, parameter.expectedStatement), - equalTo(DbIncubatingAttributes.DB_OPERATION, parameter.operation), + DbIncubatingAttributes.DB_QUERY_TEXT, + parameter.expectedStatement), + equalTo( + DbIncubatingAttributes.DB_OPERATION_NAME, parameter.operation), equalTo( - DbIncubatingAttributes.DB_CASSANDRA_TABLE, parameter.table)))); + DbIncubatingAttributes.DB_COLLECTION_NAME, parameter.table)))); } session.close(); @@ -178,7 +182,7 @@ void asyncTest(Parameter parameter) { equalTo(NetworkAttributes.NETWORK_PEER_PORT, cassandraPort), equalTo(DbIncubatingAttributes.DB_SYSTEM, "cassandra"), equalTo( - DbIncubatingAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_QUERY_TEXT, "USE " + parameter.keyspace))), trace -> trace.hasSpansSatisfyingExactly( @@ -194,11 +198,13 @@ void asyncTest(Parameter parameter) { equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, cassandraIp), equalTo(NetworkAttributes.NETWORK_PEER_PORT, cassandraPort), equalTo(DbIncubatingAttributes.DB_SYSTEM, "cassandra"), - equalTo(DbIncubatingAttributes.DB_NAME, parameter.keyspace), + equalTo(DbIncubatingAttributes.DB_NAMESPACE, parameter.keyspace), equalTo( - DbIncubatingAttributes.DB_STATEMENT, parameter.expectedStatement), - equalTo(DbIncubatingAttributes.DB_OPERATION, parameter.operation), - equalTo(DbIncubatingAttributes.DB_CASSANDRA_TABLE, parameter.table)), + DbIncubatingAttributes.DB_QUERY_TEXT, + parameter.expectedStatement), + equalTo( + DbIncubatingAttributes.DB_OPERATION_NAME, parameter.operation), + equalTo(DbIncubatingAttributes.DB_COLLECTION_NAME, parameter.table)), span -> span.hasName("callbackListener") .hasKind(SpanKind.INTERNAL) @@ -220,9 +226,11 @@ void asyncTest(Parameter parameter) { equalTo(NetworkAttributes.NETWORK_PEER_PORT, cassandraPort), equalTo(DbIncubatingAttributes.DB_SYSTEM, "cassandra"), equalTo( - DbIncubatingAttributes.DB_STATEMENT, parameter.expectedStatement), - equalTo(DbIncubatingAttributes.DB_OPERATION, parameter.operation), - equalTo(DbIncubatingAttributes.DB_CASSANDRA_TABLE, parameter.table)), + DbIncubatingAttributes.DB_QUERY_TEXT, + parameter.expectedStatement), + equalTo( + DbIncubatingAttributes.DB_OPERATION_NAME, parameter.operation), + equalTo(DbIncubatingAttributes.DB_COLLECTION_NAME, parameter.table)), span -> span.hasName("callbackListener") .hasKind(SpanKind.INTERNAL) diff --git a/instrumentation/cassandra/cassandra-4-common/testing/src/main/java/io/opentelemetry/cassandra/v4/common/AbstractCassandraTest.java b/instrumentation/cassandra/cassandra-4-common/testing/src/main/java/io/opentelemetry/cassandra/v4/common/AbstractCassandraTest.java index 93bdbda788e4..a52b44dfff2e 100644 --- a/instrumentation/cassandra/cassandra-4-common/testing/src/main/java/io/opentelemetry/cassandra/v4/common/AbstractCassandraTest.java +++ b/instrumentation/cassandra/cassandra-4-common/testing/src/main/java/io/opentelemetry/cassandra/v4/common/AbstractCassandraTest.java @@ -16,10 +16,10 @@ import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_CASSANDRA_IDEMPOTENCE; import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_CASSANDRA_PAGE_SIZE; import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_CASSANDRA_SPECULATIVE_EXECUTION_COUNT; -import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_CASSANDRA_TABLE; -import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_NAME; -import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION; -import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_STATEMENT; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_COLLECTION_NAME; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_NAMESPACE; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION_NAME; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_QUERY_TEXT; import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SYSTEM; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Named.named; @@ -113,9 +113,9 @@ void syncTest(Parameter parameter) { equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, cassandraIp), equalTo(NetworkAttributes.NETWORK_PEER_PORT, cassandraPort), equalTo(DB_SYSTEM, "cassandra"), - equalTo(DB_NAME, parameter.keyspace), - equalTo(DB_STATEMENT, parameter.expectedStatement), - equalTo(DB_OPERATION, parameter.operation), + equalTo(DB_NAMESPACE, parameter.keyspace), + equalTo(DB_QUERY_TEXT, parameter.expectedStatement), + equalTo(DB_OPERATION_NAME, parameter.operation), equalTo(DB_CASSANDRA_CONSISTENCY_LEVEL, "LOCAL_ONE"), equalTo(DB_CASSANDRA_COORDINATOR_DC, "datacenter1"), satisfies( @@ -126,7 +126,7 @@ void syncTest(Parameter parameter) { val -> val.isInstanceOf(Boolean.class)), equalTo(DB_CASSANDRA_PAGE_SIZE, 5000), equalTo(DB_CASSANDRA_SPECULATIVE_EXECUTION_COUNT, 0), - equalTo(DB_CASSANDRA_TABLE, parameter.table)))); + equalTo(DB_COLLECTION_NAME, parameter.table)))); session.close(); } @@ -167,9 +167,9 @@ void asyncTest(Parameter parameter) throws Exception { equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, cassandraIp), equalTo(NetworkAttributes.NETWORK_PEER_PORT, cassandraPort), equalTo(DB_SYSTEM, "cassandra"), - equalTo(DB_NAME, parameter.keyspace), - equalTo(DB_STATEMENT, parameter.expectedStatement), - equalTo(DB_OPERATION, parameter.operation), + equalTo(DB_NAMESPACE, parameter.keyspace), + equalTo(DB_QUERY_TEXT, parameter.expectedStatement), + equalTo(DB_OPERATION_NAME, parameter.operation), equalTo(DB_CASSANDRA_CONSISTENCY_LEVEL, "LOCAL_ONE"), equalTo(DB_CASSANDRA_COORDINATOR_DC, "datacenter1"), satisfies( @@ -180,7 +180,7 @@ void asyncTest(Parameter parameter) throws Exception { val -> val.isInstanceOf(Boolean.class)), equalTo(DB_CASSANDRA_PAGE_SIZE, 5000), equalTo(DB_CASSANDRA_SPECULATIVE_EXECUTION_COUNT, 0), - equalTo(DB_CASSANDRA_TABLE, parameter.table)), + equalTo(DB_COLLECTION_NAME, parameter.table)), span -> span.hasName("child") .hasKind(SpanKind.INTERNAL) diff --git a/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraSingletons.java b/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraSingletons.java index 4da5b599d0a6..a12b497c555e 100644 --- a/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraSingletons.java +++ b/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraSingletons.java @@ -31,7 +31,7 @@ public final class CassandraSingletons { DbClientSpanNameExtractor.create(attributesGetter)) .addAttributesExtractor( SqlClientAttributesExtractor.builder(attributesGetter) - .setTableAttribute(DbIncubatingAttributes.DB_CASSANDRA_TABLE) + .setTableAttribute(DbIncubatingAttributes.DB_COLLECTION_NAME) .setStatementSanitizationEnabled( AgentCommonConfig.get().isStatementSanitizationEnabled()) .build()) diff --git a/instrumentation/cassandra/cassandra-4.4/library/src/main/java/io/opentelemetry/instrumentation/cassandra/v4_4/CassandraTelemetryBuilder.java b/instrumentation/cassandra/cassandra-4.4/library/src/main/java/io/opentelemetry/instrumentation/cassandra/v4_4/CassandraTelemetryBuilder.java index 6d39ac2d6f0a..3dd1b4be5c21 100644 --- a/instrumentation/cassandra/cassandra-4.4/library/src/main/java/io/opentelemetry/instrumentation/cassandra/v4_4/CassandraTelemetryBuilder.java +++ b/instrumentation/cassandra/cassandra-4.4/library/src/main/java/io/opentelemetry/instrumentation/cassandra/v4_4/CassandraTelemetryBuilder.java @@ -20,8 +20,8 @@ public class CassandraTelemetryBuilder { private static final String INSTRUMENTATION_NAME = "io.opentelemetry.cassandra-4.4"; // copied from DbIncubatingAttributes - private static final AttributeKey DB_CASSANDRA_TABLE = - AttributeKey.stringKey("db.cassandra.table"); + private static final AttributeKey DB_COLLECTION_NAME = + AttributeKey.stringKey("db.collection.name"); private final OpenTelemetry openTelemetry; @@ -58,7 +58,7 @@ protected Instrumenter createInstrumenter( openTelemetry, INSTRUMENTATION_NAME, DbClientSpanNameExtractor.create(attributesGetter)) .addAttributesExtractor( SqlClientAttributesExtractor.builder(attributesGetter) - .setTableAttribute(DB_CASSANDRA_TABLE) + .setTableAttribute(DB_COLLECTION_NAME) .setStatementSanitizationEnabled(statementSanitizationEnabled) .build()) .addAttributesExtractor( diff --git a/instrumentation/cassandra/cassandra-4.4/testing/src/main/java/io/opentelemetry/testing/cassandra/v4_4/AbstractCassandra44Test.java b/instrumentation/cassandra/cassandra-4.4/testing/src/main/java/io/opentelemetry/testing/cassandra/v4_4/AbstractCassandra44Test.java index bd3357978d36..ec3f5fc76363 100644 --- a/instrumentation/cassandra/cassandra-4.4/testing/src/main/java/io/opentelemetry/testing/cassandra/v4_4/AbstractCassandra44Test.java +++ b/instrumentation/cassandra/cassandra-4.4/testing/src/main/java/io/opentelemetry/testing/cassandra/v4_4/AbstractCassandra44Test.java @@ -16,10 +16,10 @@ import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_CASSANDRA_IDEMPOTENCE; import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_CASSANDRA_PAGE_SIZE; import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_CASSANDRA_SPECULATIVE_EXECUTION_COUNT; -import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_CASSANDRA_TABLE; -import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_NAME; -import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION; -import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_STATEMENT; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_COLLECTION_NAME; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_NAMESPACE; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION_NAME; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_QUERY_TEXT; import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SYSTEM; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Named.named; @@ -70,9 +70,9 @@ void reactiveTest(Parameter parameter) { equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, cassandraIp), equalTo(NetworkAttributes.NETWORK_PEER_PORT, cassandraPort), equalTo(DB_SYSTEM, "cassandra"), - equalTo(DB_NAME, parameter.keyspace), - equalTo(DB_STATEMENT, parameter.expectedStatement), - equalTo(DB_OPERATION, parameter.operation), + equalTo(DB_NAMESPACE, parameter.keyspace), + equalTo(DB_QUERY_TEXT, parameter.expectedStatement), + equalTo(DB_OPERATION_NAME, parameter.operation), equalTo(DB_CASSANDRA_CONSISTENCY_LEVEL, "LOCAL_ONE"), equalTo(DB_CASSANDRA_COORDINATOR_DC, "datacenter1"), satisfies( @@ -83,7 +83,7 @@ void reactiveTest(Parameter parameter) { val -> val.isInstanceOf(Boolean.class)), equalTo(DB_CASSANDRA_PAGE_SIZE, 5000), equalTo(DB_CASSANDRA_SPECULATIVE_EXECUTION_COUNT, 0), - equalTo(DB_CASSANDRA_TABLE, parameter.table)), + equalTo(DB_COLLECTION_NAME, parameter.table)), span -> span.hasName("child") .hasKind(SpanKind.INTERNAL) diff --git a/instrumentation/clickhouse-client-0.5/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/clickhouse/ClickHouseClientTest.java b/instrumentation/clickhouse-client-0.5/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/clickhouse/ClickHouseClientTest.java index 472a00cb4319..0fa2f743c6ab 100644 --- a/instrumentation/clickhouse-client-0.5/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/clickhouse/ClickHouseClientTest.java +++ b/instrumentation/clickhouse-client-0.5/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/clickhouse/ClickHouseClientTest.java @@ -310,10 +310,10 @@ void testParameterizedQueryInput() throws ClickHouseException { private static List attributeAssertions(String statement, String operation) { return asList( equalTo(DbIncubatingAttributes.DB_SYSTEM, DbIncubatingAttributes.DbSystemValues.CLICKHOUSE), - equalTo(DbIncubatingAttributes.DB_NAME, dbName), + equalTo(DbIncubatingAttributes.DB_NAMESPACE, dbName), equalTo(ServerAttributes.SERVER_ADDRESS, host), equalTo(ServerAttributes.SERVER_PORT, port), - equalTo(DbIncubatingAttributes.DB_STATEMENT, statement), - equalTo(DbIncubatingAttributes.DB_OPERATION, operation)); + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, statement), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, operation)); } } diff --git a/instrumentation/couchbase/couchbase-2.6/javaagent/src/test/groovy/CouchbaseSpanUtil.groovy b/instrumentation/couchbase/couchbase-2.6/javaagent/src/test/groovy/CouchbaseSpanUtil.groovy index 0686c76da4b4..bceb6771fcc9 100644 --- a/instrumentation/couchbase/couchbase-2.6/javaagent/src/test/groovy/CouchbaseSpanUtil.groovy +++ b/instrumentation/couchbase/couchbase-2.6/javaagent/src/test/groovy/CouchbaseSpanUtil.groovy @@ -30,9 +30,9 @@ class CouchbaseSpanUtil { } attributes { "$DbIncubatingAttributes.DB_SYSTEM" "couchbase" - "$DbIncubatingAttributes.DB_NAME" bucketName - "$DbIncubatingAttributes.DB_STATEMENT" statement - "$DbIncubatingAttributes.DB_OPERATION"(operation ?: spanName) + "$DbIncubatingAttributes.DB_NAMESPACE" bucketName + "$DbIncubatingAttributes.DB_QUERY_TEXT" statement + "$DbIncubatingAttributes.DB_OPERATION_NAME"(operation ?: spanName) // Because of caching, not all requests hit the server so these attributes may be absent "$NetworkAttributes.NETWORK_TYPE" { it == "ipv4" || it == null } diff --git a/instrumentation/couchbase/couchbase-common/testing/src/main/groovy/util/AbstractCouchbaseTest.groovy b/instrumentation/couchbase/couchbase-common/testing/src/main/groovy/util/AbstractCouchbaseTest.groovy index e669562f1917..d5ca66976589 100644 --- a/instrumentation/couchbase/couchbase-common/testing/src/main/groovy/util/AbstractCouchbaseTest.groovy +++ b/instrumentation/couchbase/couchbase-common/testing/src/main/groovy/util/AbstractCouchbaseTest.groovy @@ -121,9 +121,9 @@ abstract class AbstractCouchbaseTest extends AgentInstrumentationSpecification { } attributes { "$DbIncubatingAttributes.DB_SYSTEM" "couchbase" - "$DbIncubatingAttributes.DB_NAME" bucketName - "$DbIncubatingAttributes.DB_STATEMENT" statement - "$DbIncubatingAttributes.DB_OPERATION"(operation ?: spanName) + "$DbIncubatingAttributes.DB_NAMESPACE" bucketName + "$DbIncubatingAttributes.DB_QUERY_TEXT" statement + "$DbIncubatingAttributes.DB_OPERATION_NAME"(operation ?: spanName) } } } 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 698320035221..d2470e87cecd 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 @@ -90,7 +90,7 @@ public void elasticsearchStatus() throws IOException { .hasNoParent() .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "elasticsearch"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "info"), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "info"), equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(UrlAttributes.URL_FULL, httpHost.toURI() + "/"), equalTo(ServerAttributes.SERVER_ADDRESS, httpHost.getHostName()), @@ -126,7 +126,7 @@ public void elasticsearchIndex() throws IOException { .hasNoParent() .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "elasticsearch"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "index"), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "index"), equalTo(ServerAttributes.SERVER_ADDRESS, httpHost.getHostName()), equalTo(ServerAttributes.SERVER_PORT, httpHost.getPort()), equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "PUT"), @@ -187,7 +187,7 @@ public void elasticsearchStatusAsync() throws Exception { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "elasticsearch"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "info"), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "info"), equalTo(ServerAttributes.SERVER_ADDRESS, httpHost.getHostName()), equalTo(ServerAttributes.SERVER_PORT, httpHost.getPort()), equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/src/test/groovy/Elasticsearch5NodeClientTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/src/test/groovy/Elasticsearch5NodeClientTest.groovy index b18a0c09654a..c232c8d1d09f 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/src/test/groovy/Elasticsearch5NodeClientTest.groovy +++ b/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/src/test/groovy/Elasticsearch5NodeClientTest.groovy @@ -114,7 +114,7 @@ class Elasticsearch5NodeClientTest extends AbstractElasticsearchNodeClientTest { childOf(span(0)) attributes { "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" - "$DbIncubatingAttributes.DB_OPERATION" "ClusterHealthAction" + "$DbIncubatingAttributes.DB_OPERATION_NAME" "ClusterHealthAction" "elasticsearch.action" "ClusterHealthAction" "elasticsearch.request" "ClusterHealthRequest" } @@ -161,7 +161,7 @@ class Elasticsearch5NodeClientTest extends AbstractElasticsearchNodeClientTest { childOf(span(0)) attributes { "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" - "$DbIncubatingAttributes.DB_OPERATION" "GetAction" + "$DbIncubatingAttributes.DB_OPERATION_NAME" "GetAction" "elasticsearch.action" "GetAction" "elasticsearch.request" "GetRequest" "elasticsearch.request.indices" indexName @@ -227,7 +227,7 @@ class Elasticsearch5NodeClientTest extends AbstractElasticsearchNodeClientTest { kind CLIENT attributes { "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" - "$DbIncubatingAttributes.DB_OPERATION" "CreateIndexAction" + "$DbIncubatingAttributes.DB_OPERATION_NAME" "CreateIndexAction" "elasticsearch.action" "CreateIndexAction" "elasticsearch.request" "CreateIndexRequest" "elasticsearch.request.indices" indexName @@ -240,7 +240,7 @@ class Elasticsearch5NodeClientTest extends AbstractElasticsearchNodeClientTest { kind CLIENT attributes { "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" - "$DbIncubatingAttributes.DB_OPERATION" "ClusterHealthAction" + "$DbIncubatingAttributes.DB_OPERATION_NAME" "ClusterHealthAction" "elasticsearch.action" "ClusterHealthAction" "elasticsearch.request" "ClusterHealthRequest" } @@ -252,7 +252,7 @@ class Elasticsearch5NodeClientTest extends AbstractElasticsearchNodeClientTest { kind CLIENT attributes { "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" - "$DbIncubatingAttributes.DB_OPERATION" "GetAction" + "$DbIncubatingAttributes.DB_OPERATION_NAME" "GetAction" "elasticsearch.action" "GetAction" "elasticsearch.request" "GetRequest" "elasticsearch.request.indices" indexName @@ -268,7 +268,7 @@ class Elasticsearch5NodeClientTest extends AbstractElasticsearchNodeClientTest { kind CLIENT attributes { "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" - "$DbIncubatingAttributes.DB_OPERATION" "IndexAction" + "$DbIncubatingAttributes.DB_OPERATION_NAME" "IndexAction" "elasticsearch.action" "IndexAction" "elasticsearch.request" "IndexRequest" "elasticsearch.request.indices" indexName @@ -286,7 +286,7 @@ class Elasticsearch5NodeClientTest extends AbstractElasticsearchNodeClientTest { kind CLIENT attributes { "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" - "$DbIncubatingAttributes.DB_OPERATION" "GetAction" + "$DbIncubatingAttributes.DB_OPERATION_NAME" "GetAction" "elasticsearch.action" "GetAction" "elasticsearch.request" "GetRequest" "elasticsearch.request.indices" indexName diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/src/test/groovy/Elasticsearch5TransportClientTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/src/test/groovy/Elasticsearch5TransportClientTest.groovy index 11728f2c3e45..7e5a81ce10d9 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/src/test/groovy/Elasticsearch5TransportClientTest.groovy +++ b/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/src/test/groovy/Elasticsearch5TransportClientTest.groovy @@ -129,7 +129,7 @@ class Elasticsearch5TransportClientTest extends AbstractElasticsearchTransportCl "$NetworkAttributes.NETWORK_PEER_ADDRESS" tcpPublishAddress.address "$NetworkAttributes.NETWORK_PEER_PORT" tcpPublishAddress.port "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" - "$DbIncubatingAttributes.DB_OPERATION" "ClusterHealthAction" + "$DbIncubatingAttributes.DB_OPERATION_NAME" "ClusterHealthAction" "elasticsearch.action" "ClusterHealthAction" "elasticsearch.request" "ClusterHealthRequest" } @@ -175,7 +175,7 @@ class Elasticsearch5TransportClientTest extends AbstractElasticsearchTransportCl errorEvent RemoteTransportException, String attributes { "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" - "$DbIncubatingAttributes.DB_OPERATION" "GetAction" + "$DbIncubatingAttributes.DB_OPERATION_NAME" "GetAction" "elasticsearch.action" "GetAction" "elasticsearch.request" "GetRequest" "elasticsearch.request.indices" indexName @@ -245,7 +245,7 @@ class Elasticsearch5TransportClientTest extends AbstractElasticsearchTransportCl "$NetworkAttributes.NETWORK_PEER_ADDRESS" tcpPublishAddress.address "$NetworkAttributes.NETWORK_PEER_PORT" tcpPublishAddress.port "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" - "$DbIncubatingAttributes.DB_OPERATION" "CreateIndexAction" + "$DbIncubatingAttributes.DB_OPERATION_NAME" "CreateIndexAction" "elasticsearch.action" "CreateIndexAction" "elasticsearch.request" "CreateIndexRequest" "elasticsearch.request.indices" indexName @@ -260,7 +260,7 @@ class Elasticsearch5TransportClientTest extends AbstractElasticsearchTransportCl "$NetworkAttributes.NETWORK_PEER_ADDRESS" tcpPublishAddress.address "$NetworkAttributes.NETWORK_PEER_PORT" tcpPublishAddress.port "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" - "$DbIncubatingAttributes.DB_OPERATION" "GetAction" + "$DbIncubatingAttributes.DB_OPERATION_NAME" "GetAction" "elasticsearch.action" "GetAction" "elasticsearch.request" "GetRequest" "elasticsearch.request.indices" indexName @@ -276,7 +276,7 @@ class Elasticsearch5TransportClientTest extends AbstractElasticsearchTransportCl kind CLIENT attributes { "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" - "$DbIncubatingAttributes.DB_OPERATION" "PutMappingAction" + "$DbIncubatingAttributes.DB_OPERATION_NAME" "PutMappingAction" "elasticsearch.action" "PutMappingAction" "elasticsearch.request" "PutMappingRequest" } @@ -290,7 +290,7 @@ class Elasticsearch5TransportClientTest extends AbstractElasticsearchTransportCl "$NetworkAttributes.NETWORK_PEER_ADDRESS" tcpPublishAddress.address "$NetworkAttributes.NETWORK_PEER_PORT" tcpPublishAddress.port "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" - "$DbIncubatingAttributes.DB_OPERATION" "IndexAction" + "$DbIncubatingAttributes.DB_OPERATION_NAME" "IndexAction" "elasticsearch.action" "IndexAction" "elasticsearch.request" "IndexRequest" "elasticsearch.request.indices" indexName @@ -310,7 +310,7 @@ class Elasticsearch5TransportClientTest extends AbstractElasticsearchTransportCl "$NetworkAttributes.NETWORK_PEER_ADDRESS" tcpPublishAddress.address "$NetworkAttributes.NETWORK_PEER_PORT" tcpPublishAddress.port "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" - "$DbIncubatingAttributes.DB_OPERATION" "GetAction" + "$DbIncubatingAttributes.DB_OPERATION_NAME" "GetAction" "elasticsearch.action" "GetAction" "elasticsearch.request" "GetRequest" "elasticsearch.request.indices" indexName diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/Elasticsearch53NodeClientTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/Elasticsearch53NodeClientTest.groovy index 81cdeb4376eb..a813b49e27a3 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/Elasticsearch53NodeClientTest.groovy +++ b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/Elasticsearch53NodeClientTest.groovy @@ -117,7 +117,7 @@ class Elasticsearch53NodeClientTest extends AbstractElasticsearchNodeClientTest childOf(span(0)) attributes { "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" - "$DbIncubatingAttributes.DB_OPERATION" "ClusterHealthAction" + "$DbIncubatingAttributes.DB_OPERATION_NAME" "ClusterHealthAction" "elasticsearch.action" "ClusterHealthAction" "elasticsearch.request" "ClusterHealthRequest" } @@ -164,7 +164,7 @@ class Elasticsearch53NodeClientTest extends AbstractElasticsearchNodeClientTest errorEvent IndexNotFoundException, "no such index" attributes { "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" - "$DbIncubatingAttributes.DB_OPERATION" "GetAction" + "$DbIncubatingAttributes.DB_OPERATION_NAME" "GetAction" "elasticsearch.action" "GetAction" "elasticsearch.request" "GetRequest" "elasticsearch.request.indices" indexName @@ -230,7 +230,7 @@ class Elasticsearch53NodeClientTest extends AbstractElasticsearchNodeClientTest kind CLIENT attributes { "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" - "$DbIncubatingAttributes.DB_OPERATION" "CreateIndexAction" + "$DbIncubatingAttributes.DB_OPERATION_NAME" "CreateIndexAction" "elasticsearch.action" "CreateIndexAction" "elasticsearch.request" "CreateIndexRequest" "elasticsearch.request.indices" indexName @@ -243,7 +243,7 @@ class Elasticsearch53NodeClientTest extends AbstractElasticsearchNodeClientTest kind CLIENT attributes { "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" - "$DbIncubatingAttributes.DB_OPERATION" "ClusterHealthAction" + "$DbIncubatingAttributes.DB_OPERATION_NAME" "ClusterHealthAction" "elasticsearch.action" "ClusterHealthAction" "elasticsearch.request" "ClusterHealthRequest" } @@ -255,7 +255,7 @@ class Elasticsearch53NodeClientTest extends AbstractElasticsearchNodeClientTest kind CLIENT attributes { "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" - "$DbIncubatingAttributes.DB_OPERATION" "GetAction" + "$DbIncubatingAttributes.DB_OPERATION_NAME" "GetAction" "elasticsearch.action" "GetAction" "elasticsearch.request" "GetRequest" "elasticsearch.request.indices" indexName @@ -271,7 +271,7 @@ class Elasticsearch53NodeClientTest extends AbstractElasticsearchNodeClientTest kind CLIENT attributes { "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" - "$DbIncubatingAttributes.DB_OPERATION" "IndexAction" + "$DbIncubatingAttributes.DB_OPERATION_NAME" "IndexAction" "elasticsearch.action" "IndexAction" "elasticsearch.request" "IndexRequest" "elasticsearch.request.indices" indexName @@ -290,7 +290,7 @@ class Elasticsearch53NodeClientTest extends AbstractElasticsearchNodeClientTest kind CLIENT attributes { "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" - "$DbIncubatingAttributes.DB_OPERATION" "GetAction" + "$DbIncubatingAttributes.DB_OPERATION_NAME" "GetAction" "elasticsearch.action" "GetAction" "elasticsearch.request" "GetRequest" "elasticsearch.request.indices" indexName diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/Elasticsearch53TransportClientTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/Elasticsearch53TransportClientTest.groovy index ad97aa15b5a5..6ba4abcefec2 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/Elasticsearch53TransportClientTest.groovy +++ b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/Elasticsearch53TransportClientTest.groovy @@ -135,7 +135,7 @@ class Elasticsearch53TransportClientTest extends AbstractElasticsearchTransportC "$NetworkAttributes.NETWORK_PEER_ADDRESS" tcpPublishAddress.address "$NetworkAttributes.NETWORK_PEER_PORT" tcpPublishAddress.port "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" - "$DbIncubatingAttributes.DB_OPERATION" "ClusterHealthAction" + "$DbIncubatingAttributes.DB_OPERATION_NAME" "ClusterHealthAction" "elasticsearch.action" "ClusterHealthAction" "elasticsearch.request" "ClusterHealthRequest" } @@ -180,7 +180,7 @@ class Elasticsearch53TransportClientTest extends AbstractElasticsearchTransportC errorEvent RemoteTransportException, String attributes { "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" - "$DbIncubatingAttributes.DB_OPERATION" "GetAction" + "$DbIncubatingAttributes.DB_OPERATION_NAME" "GetAction" "elasticsearch.action" "GetAction" "elasticsearch.request" "GetRequest" "elasticsearch.request.indices" indexName @@ -250,7 +250,7 @@ class Elasticsearch53TransportClientTest extends AbstractElasticsearchTransportC "$NetworkAttributes.NETWORK_PEER_ADDRESS" tcpPublishAddress.address "$NetworkAttributes.NETWORK_PEER_PORT" tcpPublishAddress.port "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" - "$DbIncubatingAttributes.DB_OPERATION" "CreateIndexAction" + "$DbIncubatingAttributes.DB_OPERATION_NAME" "CreateIndexAction" "elasticsearch.action" "CreateIndexAction" "elasticsearch.request" "CreateIndexRequest" "elasticsearch.request.indices" indexName @@ -265,7 +265,7 @@ class Elasticsearch53TransportClientTest extends AbstractElasticsearchTransportC "$NetworkAttributes.NETWORK_PEER_ADDRESS" tcpPublishAddress.address "$NetworkAttributes.NETWORK_PEER_PORT" tcpPublishAddress.port "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" - "$DbIncubatingAttributes.DB_OPERATION" "GetAction" + "$DbIncubatingAttributes.DB_OPERATION_NAME" "GetAction" "elasticsearch.action" "GetAction" "elasticsearch.request" "GetRequest" "elasticsearch.request.indices" indexName @@ -281,7 +281,7 @@ class Elasticsearch53TransportClientTest extends AbstractElasticsearchTransportC kind CLIENT attributes { "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" - "$DbIncubatingAttributes.DB_OPERATION" "PutMappingAction" + "$DbIncubatingAttributes.DB_OPERATION_NAME" "PutMappingAction" "elasticsearch.action" "PutMappingAction" "elasticsearch.request" "PutMappingRequest" } @@ -295,7 +295,7 @@ class Elasticsearch53TransportClientTest extends AbstractElasticsearchTransportC "$NetworkAttributes.NETWORK_PEER_ADDRESS" tcpPublishAddress.address "$NetworkAttributes.NETWORK_PEER_PORT" tcpPublishAddress.port "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" - "$DbIncubatingAttributes.DB_OPERATION" "IndexAction" + "$DbIncubatingAttributes.DB_OPERATION_NAME" "IndexAction" "elasticsearch.action" "IndexAction" "elasticsearch.request" "IndexRequest" "elasticsearch.request.indices" indexName @@ -316,7 +316,7 @@ class Elasticsearch53TransportClientTest extends AbstractElasticsearchTransportC "$NetworkAttributes.NETWORK_PEER_ADDRESS" tcpPublishAddress.address "$NetworkAttributes.NETWORK_PEER_PORT" tcpPublishAddress.port "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" - "$DbIncubatingAttributes.DB_OPERATION" "GetAction" + "$DbIncubatingAttributes.DB_OPERATION_NAME" "GetAction" "elasticsearch.action" "GetAction" "elasticsearch.request" "GetRequest" "elasticsearch.request.indices" indexName diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/springdata/Elasticsearch53SpringRepositoryTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/springdata/Elasticsearch53SpringRepositoryTest.groovy index d75b13be9bd3..3b7da4cd7ef9 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/springdata/Elasticsearch53SpringRepositoryTest.groovy +++ b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/springdata/Elasticsearch53SpringRepositoryTest.groovy @@ -100,7 +100,7 @@ class Elasticsearch53SpringRepositoryTest extends AgentInstrumentationSpecificat childOf span(0) attributes { "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" - "$DbIncubatingAttributes.DB_OPERATION" "SearchAction" + "$DbIncubatingAttributes.DB_OPERATION_NAME" "SearchAction" "elasticsearch.action" "SearchAction" "elasticsearch.request" "SearchRequest" "elasticsearch.request.indices" indexName @@ -138,7 +138,7 @@ class Elasticsearch53SpringRepositoryTest extends AgentInstrumentationSpecificat childOf span(0) attributes { "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" - "$DbIncubatingAttributes.DB_OPERATION" "IndexAction" + "$DbIncubatingAttributes.DB_OPERATION_NAME" "IndexAction" "elasticsearch.action" "IndexAction" "elasticsearch.request" "IndexRequest" "elasticsearch.request.indices" indexName @@ -156,7 +156,7 @@ class Elasticsearch53SpringRepositoryTest extends AgentInstrumentationSpecificat childOf span(0) attributes { "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" - "$DbIncubatingAttributes.DB_OPERATION" "RefreshAction" + "$DbIncubatingAttributes.DB_OPERATION_NAME" "RefreshAction" "elasticsearch.action" "RefreshAction" "elasticsearch.request" "RefreshRequest" "elasticsearch.request.indices" indexName @@ -189,7 +189,7 @@ class Elasticsearch53SpringRepositoryTest extends AgentInstrumentationSpecificat childOf span(0) attributes { "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" - "$DbIncubatingAttributes.DB_OPERATION" "GetAction" + "$DbIncubatingAttributes.DB_OPERATION_NAME" "GetAction" "elasticsearch.action" "GetAction" "elasticsearch.request" "GetRequest" "elasticsearch.request.indices" indexName @@ -226,7 +226,7 @@ class Elasticsearch53SpringRepositoryTest extends AgentInstrumentationSpecificat childOf span(0) attributes { "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" - "$DbIncubatingAttributes.DB_OPERATION" "IndexAction" + "$DbIncubatingAttributes.DB_OPERATION_NAME" "IndexAction" "elasticsearch.action" "IndexAction" "elasticsearch.request" "IndexRequest" "elasticsearch.request.indices" indexName @@ -244,7 +244,7 @@ class Elasticsearch53SpringRepositoryTest extends AgentInstrumentationSpecificat childOf span(0) attributes { "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" - "$DbIncubatingAttributes.DB_OPERATION" "RefreshAction" + "$DbIncubatingAttributes.DB_OPERATION_NAME" "RefreshAction" "elasticsearch.action" "RefreshAction" "elasticsearch.request" "RefreshRequest" "elasticsearch.request.indices" indexName @@ -269,7 +269,7 @@ class Elasticsearch53SpringRepositoryTest extends AgentInstrumentationSpecificat childOf span(0) attributes { "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" - "$DbIncubatingAttributes.DB_OPERATION" "GetAction" + "$DbIncubatingAttributes.DB_OPERATION_NAME" "GetAction" "elasticsearch.action" "GetAction" "elasticsearch.request" "GetRequest" "elasticsearch.request.indices" indexName @@ -305,7 +305,7 @@ class Elasticsearch53SpringRepositoryTest extends AgentInstrumentationSpecificat childOf span(0) attributes { "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" - "$DbIncubatingAttributes.DB_OPERATION" "DeleteAction" + "$DbIncubatingAttributes.DB_OPERATION_NAME" "DeleteAction" "elasticsearch.action" "DeleteAction" "elasticsearch.request" "DeleteRequest" "elasticsearch.request.indices" indexName @@ -322,7 +322,7 @@ class Elasticsearch53SpringRepositoryTest extends AgentInstrumentationSpecificat childOf span(0) attributes { "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" - "$DbIncubatingAttributes.DB_OPERATION" "RefreshAction" + "$DbIncubatingAttributes.DB_OPERATION_NAME" "RefreshAction" "elasticsearch.action" "RefreshAction" "elasticsearch.request" "RefreshRequest" "elasticsearch.request.indices" indexName @@ -348,7 +348,7 @@ class Elasticsearch53SpringRepositoryTest extends AgentInstrumentationSpecificat childOf span(0) attributes { "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" - "$DbIncubatingAttributes.DB_OPERATION" "SearchAction" + "$DbIncubatingAttributes.DB_OPERATION_NAME" "SearchAction" "elasticsearch.action" "SearchAction" "elasticsearch.request" "SearchRequest" "elasticsearch.request.indices" indexName diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/springdata/Elasticsearch53SpringTemplateTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/springdata/Elasticsearch53SpringTemplateTest.groovy index 009f5e7067ab..bfe8619d83c3 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/springdata/Elasticsearch53SpringTemplateTest.groovy +++ b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/springdata/Elasticsearch53SpringTemplateTest.groovy @@ -104,7 +104,7 @@ class Elasticsearch53SpringTemplateTest extends AgentInstrumentationSpecificatio errorEvent IndexNotFoundException, "no such index" attributes { "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" - "$DbIncubatingAttributes.DB_OPERATION" "RefreshAction" + "$DbIncubatingAttributes.DB_OPERATION_NAME" "RefreshAction" "elasticsearch.action" "RefreshAction" "elasticsearch.request" "RefreshRequest" "elasticsearch.request.indices" indexName @@ -153,7 +153,7 @@ class Elasticsearch53SpringTemplateTest extends AgentInstrumentationSpecificatio kind CLIENT attributes { "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" - "$DbIncubatingAttributes.DB_OPERATION" "CreateIndexAction" + "$DbIncubatingAttributes.DB_OPERATION_NAME" "CreateIndexAction" "elasticsearch.action" "CreateIndexAction" "elasticsearch.request" "CreateIndexRequest" "elasticsearch.request.indices" indexName @@ -166,7 +166,7 @@ class Elasticsearch53SpringTemplateTest extends AgentInstrumentationSpecificatio kind CLIENT attributes { "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" - "$DbIncubatingAttributes.DB_OPERATION" "ClusterHealthAction" + "$DbIncubatingAttributes.DB_OPERATION_NAME" "ClusterHealthAction" "elasticsearch.action" "ClusterHealthAction" "elasticsearch.request" "ClusterHealthRequest" } @@ -178,7 +178,7 @@ class Elasticsearch53SpringTemplateTest extends AgentInstrumentationSpecificatio kind CLIENT attributes { "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" - "$DbIncubatingAttributes.DB_OPERATION" "SearchAction" + "$DbIncubatingAttributes.DB_OPERATION_NAME" "SearchAction" "elasticsearch.action" "SearchAction" "elasticsearch.request" "SearchRequest" "elasticsearch.request.indices" indexName @@ -192,7 +192,7 @@ class Elasticsearch53SpringTemplateTest extends AgentInstrumentationSpecificatio kind CLIENT attributes { "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" - "$DbIncubatingAttributes.DB_OPERATION" "IndexAction" + "$DbIncubatingAttributes.DB_OPERATION_NAME" "IndexAction" "elasticsearch.action" "IndexAction" "elasticsearch.request" "IndexRequest" "elasticsearch.request.indices" indexName @@ -211,7 +211,7 @@ class Elasticsearch53SpringTemplateTest extends AgentInstrumentationSpecificatio kind CLIENT attributes { "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" - "$DbIncubatingAttributes.DB_OPERATION" "RefreshAction" + "$DbIncubatingAttributes.DB_OPERATION_NAME" "RefreshAction" "elasticsearch.action" "RefreshAction" "elasticsearch.request" "RefreshRequest" "elasticsearch.request.indices" indexName @@ -227,7 +227,7 @@ class Elasticsearch53SpringTemplateTest extends AgentInstrumentationSpecificatio kind CLIENT attributes { "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" - "$DbIncubatingAttributes.DB_OPERATION" "SearchAction" + "$DbIncubatingAttributes.DB_OPERATION_NAME" "SearchAction" "elasticsearch.action" "SearchAction" "elasticsearch.request" "SearchRequest" "elasticsearch.request.indices" indexName @@ -304,7 +304,7 @@ class Elasticsearch53SpringTemplateTest extends AgentInstrumentationSpecificatio kind CLIENT attributes { "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" - "$DbIncubatingAttributes.DB_OPERATION" "SearchAction" + "$DbIncubatingAttributes.DB_OPERATION_NAME" "SearchAction" "elasticsearch.action" "SearchAction" "elasticsearch.request" "SearchRequest" "elasticsearch.request.indices" indexName diff --git a/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/test/groovy/Elasticsearch6NodeClientTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/test/groovy/Elasticsearch6NodeClientTest.groovy index 457f4ac68928..b96f9ede97e7 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/test/groovy/Elasticsearch6NodeClientTest.groovy +++ b/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/test/groovy/Elasticsearch6NodeClientTest.groovy @@ -93,7 +93,7 @@ class Elasticsearch6NodeClientTest extends AbstractElasticsearchNodeClientTest { childOf(span(0)) attributes { "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" - "$DbIncubatingAttributes.DB_OPERATION" "ClusterHealthAction" + "$DbIncubatingAttributes.DB_OPERATION_NAME" "ClusterHealthAction" "elasticsearch.action" "ClusterHealthAction" "elasticsearch.request" "ClusterHealthRequest" } @@ -139,7 +139,7 @@ class Elasticsearch6NodeClientTest extends AbstractElasticsearchNodeClientTest { errorEvent IndexNotFoundException, ~/no such index( \[invalid-index])?/ attributes { "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" - "$DbIncubatingAttributes.DB_OPERATION" "GetAction" + "$DbIncubatingAttributes.DB_OPERATION_NAME" "GetAction" "elasticsearch.action" "GetAction" "elasticsearch.request" "GetRequest" "elasticsearch.request.indices" indexName @@ -204,7 +204,7 @@ class Elasticsearch6NodeClientTest extends AbstractElasticsearchNodeClientTest { kind CLIENT attributes { "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" - "$DbIncubatingAttributes.DB_OPERATION" "CreateIndexAction" + "$DbIncubatingAttributes.DB_OPERATION_NAME" "CreateIndexAction" "elasticsearch.action" "CreateIndexAction" "elasticsearch.request" "CreateIndexRequest" "elasticsearch.request.indices" indexName @@ -217,7 +217,7 @@ class Elasticsearch6NodeClientTest extends AbstractElasticsearchNodeClientTest { kind CLIENT attributes { "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" - "$DbIncubatingAttributes.DB_OPERATION" "GetAction" + "$DbIncubatingAttributes.DB_OPERATION_NAME" "GetAction" "elasticsearch.action" "GetAction" "elasticsearch.request" "GetRequest" "elasticsearch.request.indices" indexName @@ -233,7 +233,7 @@ class Elasticsearch6NodeClientTest extends AbstractElasticsearchNodeClientTest { kind CLIENT attributes { "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" - "$DbIncubatingAttributes.DB_OPERATION" "IndexAction" + "$DbIncubatingAttributes.DB_OPERATION_NAME" "IndexAction" "elasticsearch.action" "IndexAction" "elasticsearch.request" "IndexRequest" "elasticsearch.request.indices" indexName @@ -252,7 +252,7 @@ class Elasticsearch6NodeClientTest extends AbstractElasticsearchNodeClientTest { kind CLIENT attributes { "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" - "$DbIncubatingAttributes.DB_OPERATION" "GetAction" + "$DbIncubatingAttributes.DB_OPERATION_NAME" "GetAction" "elasticsearch.action" "GetAction" "elasticsearch.request" "GetRequest" "elasticsearch.request.indices" indexName diff --git a/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/test/groovy/Elasticsearch6TransportClientTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/test/groovy/Elasticsearch6TransportClientTest.groovy index 0fafe46112e4..cc4f095424f9 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/test/groovy/Elasticsearch6TransportClientTest.groovy +++ b/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/test/groovy/Elasticsearch6TransportClientTest.groovy @@ -110,7 +110,7 @@ class Elasticsearch6TransportClientTest extends AbstractElasticsearchTransportCl "$NetworkAttributes.NETWORK_PEER_ADDRESS" tcpPublishAddress.address "$NetworkAttributes.NETWORK_PEER_PORT" tcpPublishAddress.port "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" - "$DbIncubatingAttributes.DB_OPERATION" "ClusterHealthAction" + "$DbIncubatingAttributes.DB_OPERATION_NAME" "ClusterHealthAction" "elasticsearch.action" "ClusterHealthAction" "elasticsearch.request" "ClusterHealthRequest" } @@ -155,7 +155,7 @@ class Elasticsearch6TransportClientTest extends AbstractElasticsearchTransportCl errorEvent RemoteTransportException, String attributes { "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" - "$DbIncubatingAttributes.DB_OPERATION" "GetAction" + "$DbIncubatingAttributes.DB_OPERATION_NAME" "GetAction" "elasticsearch.action" "GetAction" "elasticsearch.request" "GetRequest" "elasticsearch.request.indices" indexName @@ -229,7 +229,7 @@ class Elasticsearch6TransportClientTest extends AbstractElasticsearchTransportCl "$NetworkAttributes.NETWORK_PEER_ADDRESS" tcpPublishAddress.address "$NetworkAttributes.NETWORK_PEER_PORT" tcpPublishAddress.port "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" - "$DbIncubatingAttributes.DB_OPERATION" "CreateIndexAction" + "$DbIncubatingAttributes.DB_OPERATION_NAME" "CreateIndexAction" "elasticsearch.action" "CreateIndexAction" "elasticsearch.request" "CreateIndexRequest" "elasticsearch.request.indices" indexName @@ -245,7 +245,7 @@ class Elasticsearch6TransportClientTest extends AbstractElasticsearchTransportCl "$NetworkAttributes.NETWORK_PEER_ADDRESS" tcpPublishAddress.address "$NetworkAttributes.NETWORK_PEER_PORT" tcpPublishAddress.port "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" - "$DbIncubatingAttributes.DB_OPERATION" "GetAction" + "$DbIncubatingAttributes.DB_OPERATION_NAME" "GetAction" "elasticsearch.action" "GetAction" "elasticsearch.request" "GetRequest" "elasticsearch.request.indices" indexName @@ -261,7 +261,7 @@ class Elasticsearch6TransportClientTest extends AbstractElasticsearchTransportCl kind CLIENT attributes { "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" - "$DbIncubatingAttributes.DB_OPERATION" ~/(Auto)?PutMappingAction/ + "$DbIncubatingAttributes.DB_OPERATION_NAME" ~/(Auto)?PutMappingAction/ "elasticsearch.action" ~/(Auto)?PutMappingAction/ "elasticsearch.request" "PutMappingRequest" } @@ -276,7 +276,7 @@ class Elasticsearch6TransportClientTest extends AbstractElasticsearchTransportCl "$NetworkAttributes.NETWORK_PEER_ADDRESS" tcpPublishAddress.address "$NetworkAttributes.NETWORK_PEER_PORT" tcpPublishAddress.port "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" - "$DbIncubatingAttributes.DB_OPERATION" "IndexAction" + "$DbIncubatingAttributes.DB_OPERATION_NAME" "IndexAction" "elasticsearch.action" "IndexAction" "elasticsearch.request" "IndexRequest" "elasticsearch.request.indices" indexName @@ -298,7 +298,7 @@ class Elasticsearch6TransportClientTest extends AbstractElasticsearchTransportCl "$NetworkAttributes.NETWORK_PEER_ADDRESS" tcpPublishAddress.address "$NetworkAttributes.NETWORK_PEER_PORT" tcpPublishAddress.port "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" - "$DbIncubatingAttributes.DB_OPERATION" "GetAction" + "$DbIncubatingAttributes.DB_OPERATION_NAME" "GetAction" "elasticsearch.action" "GetAction" "elasticsearch.request" "GetRequest" "elasticsearch.request.indices" indexName diff --git a/instrumentation/geode-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/geode/PutGetTest.java b/instrumentation/geode-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/geode/PutGetTest.java index 954ae031785d..b98b4f49173b 100644 --- a/instrumentation/geode-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/geode/PutGetTest.java +++ b/instrumentation/geode-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/geode/PutGetTest.java @@ -133,23 +133,23 @@ void assertGeodeTrace(String verb, String query) { .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "geode"), - equalTo(DbIncubatingAttributes.DB_NAME, "test-region"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "clear")), + equalTo(DbIncubatingAttributes.DB_NAMESPACE, "test-region"), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "clear")), span -> span.hasName("put test-region") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "geode"), - equalTo(DbIncubatingAttributes.DB_NAME, "test-region"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "put")), + equalTo(DbIncubatingAttributes.DB_NAMESPACE, "test-region"), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "put")), span -> span.hasName(verb.concat(" test-region")) .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "geode"), - equalTo(DbIncubatingAttributes.DB_NAME, "test-region"), - equalTo(DbIncubatingAttributes.DB_OPERATION, verb), - equalTo(DbIncubatingAttributes.DB_STATEMENT, query)))); + equalTo(DbIncubatingAttributes.DB_NAMESPACE, "test-region"), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, verb), + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, query)))); } static class Card implements DataSerializable { diff --git a/instrumentation/grpc-1.6/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/TracingClientInterceptor.java b/instrumentation/grpc-1.6/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/TracingClientInterceptor.java index 8790dad4c493..971e4381df5d 100644 --- a/instrumentation/grpc-1.6/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/TracingClientInterceptor.java +++ b/instrumentation/grpc-1.6/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/TracingClientInterceptor.java @@ -27,8 +27,9 @@ final class TracingClientInterceptor implements ClientInterceptor { // copied from MessageIncubatingAttributes - private static final AttributeKey MESSAGE_ID = AttributeKey.longKey("message.id"); - private static final AttributeKey MESSAGE_TYPE = AttributeKey.stringKey("message.type"); + private static final AttributeKey RPC_MESSAGE_ID = AttributeKey.longKey("rpc.message.id"); + private static final AttributeKey RPC_MESSAGE_TYPE = + AttributeKey.stringKey("rpc.message.type"); // copied from MessageIncubatingAttributes.MessageTypeValues private static final String SENT = "SENT"; private static final String RECEIVED = "RECEIVED"; @@ -117,7 +118,8 @@ public void sendMessage(REQUEST message) { } Span span = Span.fromContext(context); Attributes attributes = - Attributes.of(MESSAGE_TYPE, SENT, MESSAGE_ID, MESSAGE_ID_UPDATER.incrementAndGet(this)); + Attributes.of( + RPC_MESSAGE_TYPE, SENT, RPC_MESSAGE_ID, MESSAGE_ID_UPDATER.incrementAndGet(this)); span.addEvent("message", attributes); } @@ -144,9 +146,9 @@ public void onMessage(RESPONSE message) { Span span = Span.fromContext(context); Attributes attributes = Attributes.of( - MESSAGE_TYPE, + RPC_MESSAGE_TYPE, RECEIVED, - MESSAGE_ID, + RPC_MESSAGE_ID, MESSAGE_ID_UPDATER.incrementAndGet(TracingClientCall.this)); span.addEvent("message", attributes); try (Scope ignored = context.makeCurrent()) { diff --git a/instrumentation/grpc-1.6/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/TracingServerInterceptor.java b/instrumentation/grpc-1.6/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/TracingServerInterceptor.java index 241f94188b4d..9efed6c2d367 100644 --- a/instrumentation/grpc-1.6/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/TracingServerInterceptor.java +++ b/instrumentation/grpc-1.6/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/TracingServerInterceptor.java @@ -26,8 +26,9 @@ final class TracingServerInterceptor implements ServerInterceptor { // copied from MessageIncubatingAttributes - private static final AttributeKey MESSAGE_ID = AttributeKey.longKey("message.id"); - private static final AttributeKey MESSAGE_TYPE = AttributeKey.stringKey("message.type"); + private static final AttributeKey RPC_MESSAGE_ID = AttributeKey.longKey("rpc.message.id"); + private static final AttributeKey RPC_MESSAGE_TYPE = + AttributeKey.stringKey("rpc.message.type"); // copied from MessageIncubatingAttributes.MessageTypeValues private static final String SENT = "SENT"; private static final String RECEIVED = "RECEIVED"; @@ -108,7 +109,8 @@ public void sendMessage(RESPONSE message) { } Span span = Span.fromContext(context); Attributes attributes = - Attributes.of(MESSAGE_TYPE, SENT, MESSAGE_ID, MESSAGE_ID_UPDATER.incrementAndGet(this)); + Attributes.of( + RPC_MESSAGE_TYPE, SENT, RPC_MESSAGE_ID, MESSAGE_ID_UPDATER.incrementAndGet(this)); span.addEvent("message", attributes); } @@ -138,9 +140,9 @@ final class TracingServerCallListener public void onMessage(REQUEST message) { Attributes attributes = Attributes.of( - MESSAGE_TYPE, + RPC_MESSAGE_TYPE, RECEIVED, - MESSAGE_ID, + RPC_MESSAGE_ID, MESSAGE_ID_UPDATER.incrementAndGet(TracingServerCall.this)); Span.fromContext(context).addEvent("message", attributes); delegate().onMessage(message); diff --git a/instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcStreamingTest.java b/instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcStreamingTest.java index 9153436ba922..18fc2b72197d 100644 --- a/instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcStreamingTest.java +++ b/instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcStreamingTest.java @@ -27,7 +27,6 @@ import io.opentelemetry.sdk.trace.data.EventData; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.ServerAttributes; -import io.opentelemetry.semconv.incubating.MessageIncubatingAttributes; import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes; import java.util.ArrayList; import java.util.List; @@ -165,13 +164,13 @@ public void onCompleted() { assertThat(attrs) .hasSize(2) .hasEntrySatisfying( - MessageIncubatingAttributes.MESSAGE_TYPE, + RpcIncubatingAttributes.RPC_MESSAGE_TYPE, val -> assertThat(val) .satisfiesAnyOf( v -> assertThat(v).isEqualTo("RECEIVED"), v -> assertThat(v).isEqualTo("SENT"))) - .containsEntry(MessageIncubatingAttributes.MESSAGE_ID, messageId))); + .containsEntry(RpcIncubatingAttributes.RPC_MESSAGE_ID, messageId))); } testing() diff --git a/instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcTest.java b/instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcTest.java index 0e41014eb4c3..9847083fa87e 100644 --- a/instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcTest.java +++ b/instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcTest.java @@ -50,7 +50,6 @@ import io.opentelemetry.sdk.trace.data.StatusData; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.ServerAttributes; -import io.opentelemetry.semconv.incubating.MessageIncubatingAttributes; import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes; import java.util.ArrayList; import java.util.Arrays; @@ -150,16 +149,16 @@ public void sayHello( .hasName("message") .hasAttributesSatisfyingExactly( equalTo( - MessageIncubatingAttributes.MESSAGE_TYPE, "SENT"), - equalTo(MessageIncubatingAttributes.MESSAGE_ID, 1L)), + RpcIncubatingAttributes.RPC_MESSAGE_TYPE, "SENT"), + equalTo(RpcIncubatingAttributes.RPC_MESSAGE_ID, 1L)), event -> event .hasName("message") .hasAttributesSatisfyingExactly( equalTo( - MessageIncubatingAttributes.MESSAGE_TYPE, + RpcIncubatingAttributes.RPC_MESSAGE_TYPE, "RECEIVED"), - equalTo(MessageIncubatingAttributes.MESSAGE_ID, 2L))), + equalTo(RpcIncubatingAttributes.RPC_MESSAGE_ID, 2L))), span -> span.hasName("example.Greeter/SayHello") .hasKind(SpanKind.SERVER) @@ -184,16 +183,16 @@ public void sayHello( .hasName("message") .hasAttributesSatisfyingExactly( equalTo( - MessageIncubatingAttributes.MESSAGE_TYPE, + RpcIncubatingAttributes.RPC_MESSAGE_TYPE, "RECEIVED"), - equalTo(MessageIncubatingAttributes.MESSAGE_ID, 1L)), + equalTo(RpcIncubatingAttributes.RPC_MESSAGE_ID, 1L)), event -> event .hasName("message") .hasAttributesSatisfyingExactly( equalTo( - MessageIncubatingAttributes.MESSAGE_TYPE, "SENT"), - equalTo(MessageIncubatingAttributes.MESSAGE_ID, 2L))))); + RpcIncubatingAttributes.RPC_MESSAGE_TYPE, "SENT"), + equalTo(RpcIncubatingAttributes.RPC_MESSAGE_ID, 2L))))); testing() .waitAndAssertMetrics( "io.opentelemetry.grpc-1.6", @@ -318,16 +317,16 @@ public void sayHello( .hasName("message") .hasAttributesSatisfyingExactly( equalTo( - MessageIncubatingAttributes.MESSAGE_TYPE, "SENT"), - equalTo(MessageIncubatingAttributes.MESSAGE_ID, 1L)), + RpcIncubatingAttributes.RPC_MESSAGE_TYPE, "SENT"), + equalTo(RpcIncubatingAttributes.RPC_MESSAGE_ID, 1L)), event -> event .hasName("message") .hasAttributesSatisfyingExactly( equalTo( - MessageIncubatingAttributes.MESSAGE_TYPE, + RpcIncubatingAttributes.RPC_MESSAGE_TYPE, "RECEIVED"), - equalTo(MessageIncubatingAttributes.MESSAGE_ID, 2L))), + equalTo(RpcIncubatingAttributes.RPC_MESSAGE_ID, 2L))), span -> span.hasName("example.Greeter/SayHello") .hasKind(SpanKind.SERVER) @@ -352,16 +351,16 @@ public void sayHello( .hasName("message") .hasAttributesSatisfyingExactly( equalTo( - MessageIncubatingAttributes.MESSAGE_TYPE, + RpcIncubatingAttributes.RPC_MESSAGE_TYPE, "RECEIVED"), - equalTo(MessageIncubatingAttributes.MESSAGE_ID, 1L)), + equalTo(RpcIncubatingAttributes.RPC_MESSAGE_ID, 1L)), event -> event .hasName("message") .hasAttributesSatisfyingExactly( equalTo( - MessageIncubatingAttributes.MESSAGE_TYPE, "SENT"), - equalTo(MessageIncubatingAttributes.MESSAGE_ID, 2L))), + RpcIncubatingAttributes.RPC_MESSAGE_TYPE, "SENT"), + equalTo(RpcIncubatingAttributes.RPC_MESSAGE_ID, 2L))), span -> span.hasName("child") .hasKind(SpanKind.INTERNAL) @@ -498,16 +497,16 @@ public void onCompleted() { .hasName("message") .hasAttributesSatisfyingExactly( equalTo( - MessageIncubatingAttributes.MESSAGE_TYPE, "SENT"), - equalTo(MessageIncubatingAttributes.MESSAGE_ID, 1L)), + RpcIncubatingAttributes.RPC_MESSAGE_TYPE, "SENT"), + equalTo(RpcIncubatingAttributes.RPC_MESSAGE_ID, 1L)), event -> event .hasName("message") .hasAttributesSatisfyingExactly( equalTo( - MessageIncubatingAttributes.MESSAGE_TYPE, + RpcIncubatingAttributes.RPC_MESSAGE_TYPE, "RECEIVED"), - equalTo(MessageIncubatingAttributes.MESSAGE_ID, 2L))), + equalTo(RpcIncubatingAttributes.RPC_MESSAGE_ID, 2L))), span -> span.hasName("example.Greeter/SayHello") .hasKind(SpanKind.SERVER) @@ -532,16 +531,16 @@ public void onCompleted() { .hasName("message") .hasAttributesSatisfyingExactly( equalTo( - MessageIncubatingAttributes.MESSAGE_TYPE, + RpcIncubatingAttributes.RPC_MESSAGE_TYPE, "RECEIVED"), - equalTo(MessageIncubatingAttributes.MESSAGE_ID, 1L)), + equalTo(RpcIncubatingAttributes.RPC_MESSAGE_ID, 1L)), event -> event .hasName("message") .hasAttributesSatisfyingExactly( equalTo( - MessageIncubatingAttributes.MESSAGE_TYPE, "SENT"), - equalTo(MessageIncubatingAttributes.MESSAGE_ID, 2L))), + RpcIncubatingAttributes.RPC_MESSAGE_TYPE, "SENT"), + equalTo(RpcIncubatingAttributes.RPC_MESSAGE_ID, 2L))), span -> span.hasName("child") .hasKind(SpanKind.INTERNAL) @@ -653,8 +652,8 @@ public void sayHello( .hasName("message") .hasAttributesSatisfyingExactly( equalTo( - MessageIncubatingAttributes.MESSAGE_TYPE, "SENT"), - equalTo(MessageIncubatingAttributes.MESSAGE_ID, 1L))), + RpcIncubatingAttributes.RPC_MESSAGE_TYPE, "SENT"), + equalTo(RpcIncubatingAttributes.RPC_MESSAGE_ID, 1L))), span -> span.hasName("example.Greeter/SayHello") .hasKind(SpanKind.SERVER) @@ -681,8 +680,8 @@ public void sayHello( .hasName("message") .hasAttributesSatisfyingExactly( equalTo( - MessageIncubatingAttributes.MESSAGE_TYPE, "RECEIVED"), - equalTo(MessageIncubatingAttributes.MESSAGE_ID, 1L)); + RpcIncubatingAttributes.RPC_MESSAGE_TYPE, "RECEIVED"), + equalTo(RpcIncubatingAttributes.RPC_MESSAGE_ID, 1L)); if (status.getCause() == null) { assertThat(events).hasSize(1); } else { @@ -805,8 +804,8 @@ public void sayHello( .hasName("message") .hasAttributesSatisfyingExactly( equalTo( - MessageIncubatingAttributes.MESSAGE_TYPE, "SENT"), - equalTo(MessageIncubatingAttributes.MESSAGE_ID, 1L))), + RpcIncubatingAttributes.RPC_MESSAGE_TYPE, "SENT"), + equalTo(RpcIncubatingAttributes.RPC_MESSAGE_ID, 1L))), span -> span.hasName("example.Greeter/SayHello") .hasKind(SpanKind.SERVER) @@ -833,8 +832,8 @@ public void sayHello( .hasName("message") .hasAttributesSatisfyingExactly( equalTo( - MessageIncubatingAttributes.MESSAGE_TYPE, "RECEIVED"), - equalTo(MessageIncubatingAttributes.MESSAGE_ID, 1L)); + RpcIncubatingAttributes.RPC_MESSAGE_TYPE, "RECEIVED"), + equalTo(RpcIncubatingAttributes.RPC_MESSAGE_ID, 1L)); span.hasException(status.asRuntimeException()); }))); testing() @@ -1053,16 +1052,16 @@ public void onCompleted() { .hasName("message") .hasAttributesSatisfyingExactly( equalTo( - MessageIncubatingAttributes.MESSAGE_TYPE, "SENT"), - equalTo(MessageIncubatingAttributes.MESSAGE_ID, 1L)), + RpcIncubatingAttributes.RPC_MESSAGE_TYPE, "SENT"), + equalTo(RpcIncubatingAttributes.RPC_MESSAGE_ID, 1L)), event -> event .hasName("message") .hasAttributesSatisfyingExactly( equalTo( - MessageIncubatingAttributes.MESSAGE_TYPE, + RpcIncubatingAttributes.RPC_MESSAGE_TYPE, "RECEIVED"), - equalTo(MessageIncubatingAttributes.MESSAGE_ID, 2L))), + equalTo(RpcIncubatingAttributes.RPC_MESSAGE_ID, 2L))), span -> span.hasName("example.Greeter/SayHello") .hasKind(SpanKind.SERVER) @@ -1087,16 +1086,16 @@ public void onCompleted() { .hasName("message") .hasAttributesSatisfyingExactly( equalTo( - MessageIncubatingAttributes.MESSAGE_TYPE, + RpcIncubatingAttributes.RPC_MESSAGE_TYPE, "RECEIVED"), - equalTo(MessageIncubatingAttributes.MESSAGE_ID, 1L)), + equalTo(RpcIncubatingAttributes.RPC_MESSAGE_ID, 1L)), event -> event .hasName("message") .hasAttributesSatisfyingExactly( equalTo( - MessageIncubatingAttributes.MESSAGE_TYPE, "SENT"), - equalTo(MessageIncubatingAttributes.MESSAGE_ID, 2L))))); + RpcIncubatingAttributes.RPC_MESSAGE_TYPE, "SENT"), + equalTo(RpcIncubatingAttributes.RPC_MESSAGE_ID, 2L))))); } @Test @@ -1176,14 +1175,14 @@ public void onCompleted() { assertThat(events.get(0)) .hasName("message") .hasAttributesSatisfyingExactly( - equalTo(MessageIncubatingAttributes.MESSAGE_TYPE, "SENT"), - equalTo(MessageIncubatingAttributes.MESSAGE_ID, 1L)); + equalTo(RpcIncubatingAttributes.RPC_MESSAGE_TYPE, "SENT"), + equalTo(RpcIncubatingAttributes.RPC_MESSAGE_ID, 1L)); assertThat(events.get(1)) .hasName("message") .hasAttributesSatisfyingExactly( equalTo( - MessageIncubatingAttributes.MESSAGE_TYPE, "RECEIVED"), - equalTo(MessageIncubatingAttributes.MESSAGE_ID, 2L)); + RpcIncubatingAttributes.RPC_MESSAGE_TYPE, "RECEIVED"), + equalTo(RpcIncubatingAttributes.RPC_MESSAGE_ID, 2L)); span.hasException(thrown); }), span -> @@ -1210,16 +1209,16 @@ public void onCompleted() { .hasName("message") .hasAttributesSatisfyingExactly( equalTo( - MessageIncubatingAttributes.MESSAGE_TYPE, + RpcIncubatingAttributes.RPC_MESSAGE_TYPE, "RECEIVED"), - equalTo(MessageIncubatingAttributes.MESSAGE_ID, 1L)), + equalTo(RpcIncubatingAttributes.RPC_MESSAGE_ID, 1L)), event -> event .hasName("message") .hasAttributesSatisfyingExactly( equalTo( - MessageIncubatingAttributes.MESSAGE_TYPE, "SENT"), - equalTo(MessageIncubatingAttributes.MESSAGE_ID, 2L))))); + RpcIncubatingAttributes.RPC_MESSAGE_TYPE, "SENT"), + equalTo(RpcIncubatingAttributes.RPC_MESSAGE_ID, 2L))))); } @Test @@ -1298,16 +1297,16 @@ public void onCompleted() { .hasName("message") .hasAttributesSatisfyingExactly( equalTo( - MessageIncubatingAttributes.MESSAGE_TYPE, "SENT"), - equalTo(MessageIncubatingAttributes.MESSAGE_ID, 1L)), + RpcIncubatingAttributes.RPC_MESSAGE_TYPE, "SENT"), + equalTo(RpcIncubatingAttributes.RPC_MESSAGE_ID, 1L)), event -> event .hasName("message") .hasAttributesSatisfyingExactly( equalTo( - MessageIncubatingAttributes.MESSAGE_TYPE, + RpcIncubatingAttributes.RPC_MESSAGE_TYPE, "RECEIVED"), - equalTo(MessageIncubatingAttributes.MESSAGE_ID, 2L))), + equalTo(RpcIncubatingAttributes.RPC_MESSAGE_ID, 2L))), span -> span.hasName( "grpc.reflection.v1alpha.ServerReflection/ServerReflectionInfo") @@ -1335,16 +1334,16 @@ public void onCompleted() { .hasName("message") .hasAttributesSatisfyingExactly( equalTo( - MessageIncubatingAttributes.MESSAGE_TYPE, + RpcIncubatingAttributes.RPC_MESSAGE_TYPE, "RECEIVED"), - equalTo(MessageIncubatingAttributes.MESSAGE_ID, 1L)), + equalTo(RpcIncubatingAttributes.RPC_MESSAGE_ID, 1L)), event -> event .hasName("message") .hasAttributesSatisfyingExactly( equalTo( - MessageIncubatingAttributes.MESSAGE_TYPE, "SENT"), - equalTo(MessageIncubatingAttributes.MESSAGE_ID, 2L))))); + RpcIncubatingAttributes.RPC_MESSAGE_TYPE, "SENT"), + equalTo(RpcIncubatingAttributes.RPC_MESSAGE_ID, 2L))))); } @Test @@ -1408,16 +1407,16 @@ public void sayHello( .hasName("message") .hasAttributesSatisfyingExactly( equalTo( - MessageIncubatingAttributes.MESSAGE_TYPE, "SENT"), - equalTo(MessageIncubatingAttributes.MESSAGE_ID, 1L)), + RpcIncubatingAttributes.RPC_MESSAGE_TYPE, "SENT"), + equalTo(RpcIncubatingAttributes.RPC_MESSAGE_ID, 1L)), event -> event .hasName("message") .hasAttributesSatisfyingExactly( equalTo( - MessageIncubatingAttributes.MESSAGE_TYPE, + RpcIncubatingAttributes.RPC_MESSAGE_TYPE, "RECEIVED"), - equalTo(MessageIncubatingAttributes.MESSAGE_ID, 2L))), + equalTo(RpcIncubatingAttributes.RPC_MESSAGE_ID, 2L))), span -> span.hasName("example.Greeter/SayHello") .hasKind(SpanKind.SERVER) @@ -1442,16 +1441,16 @@ public void sayHello( .hasName("message") .hasAttributesSatisfyingExactly( equalTo( - MessageIncubatingAttributes.MESSAGE_TYPE, + RpcIncubatingAttributes.RPC_MESSAGE_TYPE, "RECEIVED"), - equalTo(MessageIncubatingAttributes.MESSAGE_ID, 1L)), + equalTo(RpcIncubatingAttributes.RPC_MESSAGE_ID, 1L)), event -> event .hasName("message") .hasAttributesSatisfyingExactly( equalTo( - MessageIncubatingAttributes.MESSAGE_TYPE, "SENT"), - equalTo(MessageIncubatingAttributes.MESSAGE_ID, 2L))))); + RpcIncubatingAttributes.RPC_MESSAGE_TYPE, "SENT"), + equalTo(RpcIncubatingAttributes.RPC_MESSAGE_ID, 2L))))); } // Regression test for diff --git a/instrumentation/hibernate/hibernate-3.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/AbstractHibernateTest.java b/instrumentation/hibernate/hibernate-3.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/AbstractHibernateTest.java index 7042194917d5..a760083269ee 100644 --- a/instrumentation/hibernate/hibernate-3.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/AbstractHibernateTest.java +++ b/instrumentation/hibernate/hibernate-3.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/AbstractHibernateTest.java @@ -63,12 +63,12 @@ static SpanDataAssert assertClientSpan(SpanDataAssert span, SpanData parent) { .hasParent(parent) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "h2"), - equalTo(DbIncubatingAttributes.DB_NAME, "db1"), - equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_NAMESPACE, "db1"), equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "h2:mem:"), - satisfies(DbIncubatingAttributes.DB_STATEMENT, val -> val.isInstanceOf(String.class)), - satisfies(DbIncubatingAttributes.DB_OPERATION, val -> val.isInstanceOf(String.class)), - equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Value")); + satisfies(DbIncubatingAttributes.DB_QUERY_TEXT, val -> val.isInstanceOf(String.class)), + satisfies( + DbIncubatingAttributes.DB_OPERATION_NAME, val -> val.isInstanceOf(String.class)), + equalTo(DbIncubatingAttributes.DB_COLLECTION_NAME, "Value")); } @SuppressWarnings("deprecation") // TODO DbIncubatingAttributes.DB_CONNECTION_STRING deprecation @@ -78,14 +78,13 @@ static SpanDataAssert assertClientSpan(SpanDataAssert span, SpanData parent, Str .hasParent(parent) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "h2"), - equalTo(DbIncubatingAttributes.DB_NAME, "db1"), - equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_NAMESPACE, "db1"), equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "h2:mem:"), satisfies( - DbIncubatingAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_QUERY_TEXT, stringAssert -> stringAssert.startsWith(verb.toLowerCase(Locale.ROOT))), - equalTo(DbIncubatingAttributes.DB_OPERATION, verb), - equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Value")); + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, verb), + equalTo(DbIncubatingAttributes.DB_COLLECTION_NAME, "Value")); } static SpanDataAssert assertSessionSpan(SpanDataAssert span, SpanData parent, String spanName) { diff --git a/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/CriteriaTest.java b/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/CriteriaTest.java index 509173d79e80..432fc77198bc 100644 --- a/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/CriteriaTest.java +++ b/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/CriteriaTest.java @@ -67,14 +67,13 @@ void testCriteria(String methodName, Consumer interaction) { .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "h2"), - equalTo(DbIncubatingAttributes.DB_NAME, "db1"), - equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_NAMESPACE, "db1"), equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "h2:mem:"), satisfies( - DbIncubatingAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_QUERY_TEXT, stringAssert -> stringAssert.startsWith("select")), - equalTo(DbIncubatingAttributes.DB_OPERATION, "SELECT"), - equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Value")), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "SELECT"), + equalTo(DbIncubatingAttributes.DB_COLLECTION_NAME, "Value")), span -> span.hasName("Transaction.commit") .hasKind(INTERNAL) diff --git a/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/EntityManagerTest.java b/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/EntityManagerTest.java index d9402fc439ca..f4c37a81d1ff 100644 --- a/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/EntityManagerTest.java +++ b/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/EntityManagerTest.java @@ -101,16 +101,15 @@ void testHibernateActions(Parameter parameter) { .hasParent(trace.getSpan(2)) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "h2"), - equalTo(DbIncubatingAttributes.DB_NAME, "db1"), - equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_NAMESPACE, "db1"), equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "h2:mem:"), satisfies( - DbIncubatingAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_QUERY_TEXT, val -> val.isInstanceOf(String.class)), satisfies( - DbIncubatingAttributes.DB_OPERATION, + DbIncubatingAttributes.DB_OPERATION_NAME, val -> val.isInstanceOf(String.class)), - equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Value"))); + equalTo(DbIncubatingAttributes.DB_COLLECTION_NAME, "Value"))); } else { trace.hasSpansSatisfyingExactly( @@ -132,16 +131,15 @@ void testHibernateActions(Parameter parameter) { .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "h2"), - equalTo(DbIncubatingAttributes.DB_NAME, "db1"), - equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_NAMESPACE, "db1"), equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "h2:mem:"), satisfies( - DbIncubatingAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_QUERY_TEXT, val -> val.isInstanceOf(String.class)), satisfies( - DbIncubatingAttributes.DB_OPERATION, + DbIncubatingAttributes.DB_OPERATION_NAME, val -> val.isInstanceOf(String.class)), - equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Value")), + equalTo(DbIncubatingAttributes.DB_COLLECTION_NAME, "Value")), span -> span.hasName("Transaction.commit") .hasKind(INTERNAL) @@ -218,16 +216,15 @@ void testHibernatePersist() { .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "h2"), - equalTo(DbIncubatingAttributes.DB_NAME, "db1"), - equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_NAMESPACE, "db1"), equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "h2:mem:"), satisfies( - DbIncubatingAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_QUERY_TEXT, val -> val.isInstanceOf(String.class)), satisfies( - DbIncubatingAttributes.DB_OPERATION, + DbIncubatingAttributes.DB_OPERATION_NAME, val -> val.isInstanceOf(String.class)), - equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Value")), + equalTo(DbIncubatingAttributes.DB_COLLECTION_NAME, "Value")), span -> span.hasName("Transaction.commit") .hasKind(INTERNAL) @@ -244,16 +241,15 @@ void testHibernatePersist() { .hasParent(trace.getSpan(3)) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "h2"), - equalTo(DbIncubatingAttributes.DB_NAME, "db1"), - equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_NAMESPACE, "db1"), equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "h2:mem:"), satisfies( - DbIncubatingAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_QUERY_TEXT, val -> val.isInstanceOf(String.class)), satisfies( - DbIncubatingAttributes.DB_OPERATION, + DbIncubatingAttributes.DB_OPERATION_NAME, val -> val.isInstanceOf(String.class)), - equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Value")))); + equalTo(DbIncubatingAttributes.DB_COLLECTION_NAME, "Value")))); } @SuppressWarnings("deprecation") // TODO DbIncubatingAttributes.DB_CONNECTION_STRING deprecation @@ -293,16 +289,15 @@ void testAttachesStateToQuery(Function queryBuildMethod) { .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "h2"), - equalTo(DbIncubatingAttributes.DB_NAME, "db1"), - equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_NAMESPACE, "db1"), equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "h2:mem:"), satisfies( - DbIncubatingAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_QUERY_TEXT, val -> val.isInstanceOf(String.class)), satisfies( - DbIncubatingAttributes.DB_OPERATION, + DbIncubatingAttributes.DB_OPERATION_NAME, val -> val.isInstanceOf(String.class)), - equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Value")), + equalTo(DbIncubatingAttributes.DB_COLLECTION_NAME, "Value")), span -> span.hasName("Transaction.commit") .hasKind(INTERNAL) diff --git a/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/QueryTest.java b/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/QueryTest.java index f68fe97e9ba5..c3e664bba1d0 100644 --- a/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/QueryTest.java +++ b/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/QueryTest.java @@ -62,16 +62,15 @@ void testHibernateQueryExecuteUpdateWithTransaction() { .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "h2"), - equalTo(DbIncubatingAttributes.DB_NAME, "db1"), - equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_NAMESPACE, "db1"), equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "h2:mem:"), satisfies( - DbIncubatingAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_QUERY_TEXT, val -> val.isInstanceOf(String.class)), satisfies( - DbIncubatingAttributes.DB_OPERATION, + DbIncubatingAttributes.DB_OPERATION_NAME, val -> val.isInstanceOf(String.class)), - equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Value")), + equalTo(DbIncubatingAttributes.DB_COLLECTION_NAME, "Value")), span -> span.hasName("Transaction.commit") .hasKind(INTERNAL) @@ -120,14 +119,13 @@ void testHibernateQuerySingleCall(Parameter parameter) { .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "h2"), - equalTo(DbIncubatingAttributes.DB_NAME, "db1"), - equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_NAMESPACE, "db1"), equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "h2:mem:"), satisfies( - DbIncubatingAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_QUERY_TEXT, val -> val.startsWith("select ")), - equalTo(DbIncubatingAttributes.DB_OPERATION, "SELECT"), - equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Value")))); + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "SELECT"), + equalTo(DbIncubatingAttributes.DB_COLLECTION_NAME, "Value")))); } private static Stream providesArgumentsSingleCall() { @@ -194,14 +192,13 @@ void testHibernateQueryIterate() { .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "h2"), - equalTo(DbIncubatingAttributes.DB_NAME, "db1"), - equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_NAMESPACE, "db1"), equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "h2:mem:"), satisfies( - DbIncubatingAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_QUERY_TEXT, val -> val.startsWith("select ")), - equalTo(DbIncubatingAttributes.DB_OPERATION, "SELECT"), - equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Value")), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "SELECT"), + equalTo(DbIncubatingAttributes.DB_COLLECTION_NAME, "Value")), span -> span.hasName("Transaction.commit") .hasKind(INTERNAL) diff --git a/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/SessionTest.java b/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/SessionTest.java index b40068f4827f..1741cfba2b98 100644 --- a/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/SessionTest.java +++ b/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/SessionTest.java @@ -65,16 +65,15 @@ void testHibernateAction(Parameter parameter) { .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "h2"), - equalTo(DbIncubatingAttributes.DB_NAME, "db1"), - equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_NAMESPACE, "db1"), equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "h2:mem:"), satisfies( - DbIncubatingAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_QUERY_TEXT, val -> val.isInstanceOf(String.class)), satisfies( - DbIncubatingAttributes.DB_OPERATION, + DbIncubatingAttributes.DB_OPERATION_NAME, val -> val.isInstanceOf(String.class)), - equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Value")), + equalTo(DbIncubatingAttributes.DB_COLLECTION_NAME, "Value")), span -> span.hasName("Transaction.commit") .hasKind(INTERNAL) @@ -176,16 +175,15 @@ void testHibernateActionStateless(Parameter parameter) { .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "h2"), - equalTo(DbIncubatingAttributes.DB_NAME, "db1"), - equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_NAMESPACE, "db1"), equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "h2:mem:"), satisfies( - DbIncubatingAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_QUERY_TEXT, val -> val.isInstanceOf(String.class)), satisfies( - DbIncubatingAttributes.DB_OPERATION, + DbIncubatingAttributes.DB_OPERATION_NAME, val -> val.isInstanceOf(String.class)), - equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Value")), + equalTo(DbIncubatingAttributes.DB_COLLECTION_NAME, "Value")), span -> span.hasName("Transaction.commit") .hasKind(INTERNAL) @@ -323,16 +321,15 @@ void testHibernateReplicate(Parameter parameter) { .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "h2"), - equalTo(DbIncubatingAttributes.DB_NAME, "db1"), - equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_NAMESPACE, "db1"), equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "h2:mem:"), satisfies( - DbIncubatingAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_QUERY_TEXT, val -> val.isInstanceOf(String.class)), satisfies( - DbIncubatingAttributes.DB_OPERATION, + DbIncubatingAttributes.DB_OPERATION_NAME, val -> val.isInstanceOf(String.class)), - equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Value")), + equalTo(DbIncubatingAttributes.DB_COLLECTION_NAME, "Value")), span -> span.hasName("Transaction.commit") .hasKind(INTERNAL) @@ -349,16 +346,15 @@ void testHibernateReplicate(Parameter parameter) { .hasParent(trace.getSpan(3)) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "h2"), - equalTo(DbIncubatingAttributes.DB_NAME, "db1"), - equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_NAMESPACE, "db1"), equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "h2:mem:"), satisfies( - DbIncubatingAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_QUERY_TEXT, val -> val.isInstanceOf(String.class)), satisfies( - DbIncubatingAttributes.DB_OPERATION, + DbIncubatingAttributes.DB_OPERATION_NAME, val -> val.isInstanceOf(String.class)), - equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Value")))); + equalTo(DbIncubatingAttributes.DB_COLLECTION_NAME, "Value")))); } private static Stream provideArgumentsHibernateReplicate() { @@ -483,16 +479,15 @@ void testHibernateCommitAction(Parameter parameter) { .hasParent(trace.getSpan(2)) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "h2"), - equalTo(DbIncubatingAttributes.DB_NAME, "db1"), - equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_NAMESPACE, "db1"), equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "h2:mem:"), satisfies( - DbIncubatingAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_QUERY_TEXT, val -> val.isInstanceOf(String.class)), satisfies( - DbIncubatingAttributes.DB_OPERATION, + DbIncubatingAttributes.DB_OPERATION_NAME, val -> val.isInstanceOf(String.class)), - equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Value")))); + equalTo(DbIncubatingAttributes.DB_COLLECTION_NAME, "Value")))); } private static Stream provideArgumentsHibernateCommitAction() { @@ -662,16 +657,15 @@ void testAttachesStateToQueryCreated(Consumer queryBuilder) { .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "h2"), - equalTo(DbIncubatingAttributes.DB_NAME, "db1"), - equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_NAMESPACE, "db1"), equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "h2:mem:"), satisfies( - DbIncubatingAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_QUERY_TEXT, val -> val.isInstanceOf(String.class)), satisfies( - DbIncubatingAttributes.DB_OPERATION, + DbIncubatingAttributes.DB_OPERATION_NAME, val -> val.isInstanceOf(String.class)), - equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Value")), + equalTo(DbIncubatingAttributes.DB_COLLECTION_NAME, "Value")), span -> span.hasName("Transaction.commit") .hasKind(INTERNAL) @@ -763,14 +757,13 @@ void testHibernateOverlappingSessions() { .hasParent(trace.getSpan(2)) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "h2"), - equalTo(DbIncubatingAttributes.DB_NAME, "db1"), - equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_NAMESPACE, "db1"), equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "h2:mem:"), satisfies( - DbIncubatingAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_QUERY_TEXT, stringAssert -> stringAssert.startsWith("insert")), - equalTo(DbIncubatingAttributes.DB_OPERATION, "INSERT"), - equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Value")), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "INSERT"), + equalTo(DbIncubatingAttributes.DB_COLLECTION_NAME, "Value")), span -> { span.hasName("Session.save " + Value.class.getName()) .hasKind(INTERNAL) @@ -807,28 +800,26 @@ void testHibernateOverlappingSessions() { .hasParent(trace.getSpan(6)) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "h2"), - equalTo(DbIncubatingAttributes.DB_NAME, "db1"), - equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_NAMESPACE, "db1"), equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "h2:mem:"), satisfies( - DbIncubatingAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_QUERY_TEXT, stringAssert -> stringAssert.startsWith("insert")), - equalTo(DbIncubatingAttributes.DB_OPERATION, "INSERT"), - equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Value")), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "INSERT"), + equalTo(DbIncubatingAttributes.DB_COLLECTION_NAME, "Value")), span -> span.hasName("DELETE db1.Value") .hasKind(CLIENT) .hasParent(trace.getSpan(6)) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "h2"), - equalTo(DbIncubatingAttributes.DB_NAME, "db1"), - equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_NAMESPACE, "db1"), equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "h2:mem:"), satisfies( - DbIncubatingAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_QUERY_TEXT, stringAssert -> stringAssert.startsWith("delete")), - equalTo(DbIncubatingAttributes.DB_OPERATION, "DELETE"), - equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Value")))); + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "DELETE"), + equalTo(DbIncubatingAttributes.DB_COLLECTION_NAME, "Value")))); assertThat(sessionId1.get()).isNotEqualTo(sessionId2.get()); assertThat(sessionId1.get()).isNotEqualTo(sessionId3.get()); diff --git a/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/spring/jpa/SpringJpaTest.java b/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/spring/jpa/SpringJpaTest.java index 17ebc73ba798..936de283e01a 100644 --- a/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/spring/jpa/SpringJpaTest.java +++ b/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/spring/jpa/SpringJpaTest.java @@ -67,17 +67,16 @@ void testCrud() { .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "hsqldb"), - equalTo(DbIncubatingAttributes.DB_NAME, "test"), - equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_NAMESPACE, "test"), equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "hsqldb:mem:"), satisfies( - DbIncubatingAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_QUERY_TEXT, val -> val.matches( Pattern.compile( "select ([^.]+).id([^,]*), ([^.]+).firstName([^,]*), ([^.]+).lastName(.*)from Customer(.*)"))), - equalTo(DbIncubatingAttributes.DB_OPERATION, "SELECT"), - equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Customer")), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "SELECT"), + equalTo(DbIncubatingAttributes.DB_COLLECTION_NAME, "Customer")), span -> span.hasName("Transaction.commit") .hasKind(INTERNAL) @@ -122,17 +121,16 @@ void testCrud() { .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "hsqldb"), - equalTo(DbIncubatingAttributes.DB_NAME, "test"), - equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_NAMESPACE, "test"), equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "hsqldb:mem:"), satisfies( - DbIncubatingAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_QUERY_TEXT, val -> val.matches( Pattern.compile( "insert into Customer (.*) values \\(.*, \\?, \\?\\)"))), - equalTo(DbIncubatingAttributes.DB_OPERATION, "INSERT"), - equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Customer")), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "INSERT"), + equalTo(DbIncubatingAttributes.DB_COLLECTION_NAME, "Customer")), span -> span.hasName("Transaction.commit") .hasKind(INTERNAL) @@ -165,13 +163,12 @@ void testCrud() { .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "hsqldb"), - equalTo(DbIncubatingAttributes.DB_NAME, "test"), - equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_NAMESPACE, "test"), equalTo( - DbIncubatingAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_QUERY_TEXT, "call next value for hibernate_sequence"), equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "hsqldb:mem:"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "CALL")), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "CALL")), span -> span.hasName("Transaction.commit") .hasKind(INTERNAL) @@ -189,17 +186,16 @@ void testCrud() { .hasParent(trace.getSpan(3)) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "hsqldb"), - equalTo(DbIncubatingAttributes.DB_NAME, "test"), - equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_NAMESPACE, "test"), equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "hsqldb:mem:"), satisfies( - DbIncubatingAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_QUERY_TEXT, val -> val.matches( Pattern.compile( "insert into Customer (.*) values \\(.* \\?, \\?\\)"))), - equalTo(DbIncubatingAttributes.DB_OPERATION, "INSERT"), - equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Customer"))); + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "INSERT"), + equalTo(DbIncubatingAttributes.DB_COLLECTION_NAME, "Customer"))); } }); testing.clearData(); @@ -236,17 +232,16 @@ void testCrud() { .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "hsqldb"), - equalTo(DbIncubatingAttributes.DB_NAME, "test"), - equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_NAMESPACE, "test"), equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "hsqldb:mem:"), satisfies( - DbIncubatingAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_QUERY_TEXT, val -> val.matches( Pattern.compile( "select ([^.]+).id([^,]*), ([^.]+).firstName([^,]*), ([^.]+).lastName (.*)from Customer (.*)where ([^.]+).id=\\?"))), - equalTo(DbIncubatingAttributes.DB_OPERATION, "SELECT"), - equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Customer")), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "SELECT"), + equalTo(DbIncubatingAttributes.DB_COLLECTION_NAME, "Customer")), span -> span.hasName("Transaction.commit") .hasKind(INTERNAL) @@ -264,14 +259,13 @@ void testCrud() { .hasParent(trace.getSpan(3)) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "hsqldb"), - equalTo(DbIncubatingAttributes.DB_NAME, "test"), - equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_NAMESPACE, "test"), equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "hsqldb:mem:"), equalTo( - DbIncubatingAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_QUERY_TEXT, "update Customer set firstName=?, lastName=? where id=?"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "UPDATE"), - equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Customer")))); + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "UPDATE"), + equalTo(DbIncubatingAttributes.DB_COLLECTION_NAME, "Customer")))); testing.clearData(); Customer foundCustomer = @@ -302,17 +296,16 @@ void testCrud() { .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "hsqldb"), - equalTo(DbIncubatingAttributes.DB_NAME, "test"), - equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_NAMESPACE, "test"), equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "hsqldb:mem:"), satisfies( - DbIncubatingAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_QUERY_TEXT, val -> val.matches( Pattern.compile( "select ([^.]+).id([^,]*), ([^.]+).firstName([^,]*), ([^.]+).lastName (.*)from Customer (.*)(where ([^.]+).lastName=\\?)"))), - equalTo(DbIncubatingAttributes.DB_OPERATION, "SELECT"), - equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Customer")))); + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "SELECT"), + equalTo(DbIncubatingAttributes.DB_COLLECTION_NAME, "Customer")))); testing.clearData(); testing.runWithSpan("parent", () -> repo.delete(foundCustomer)); @@ -340,17 +333,16 @@ void testCrud() { .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "hsqldb"), - equalTo(DbIncubatingAttributes.DB_NAME, "test"), - equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_NAMESPACE, "test"), equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "hsqldb:mem:"), satisfies( - DbIncubatingAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_QUERY_TEXT, val -> val.matches( Pattern.compile( "select ([^.]+).id([^,]*), ([^.]+).firstName([^,]*), ([^.]+).lastName (.*)from Customer (.*)where ([^.]+).id=\\?"))), - equalTo(DbIncubatingAttributes.DB_OPERATION, "SELECT"), - equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Customer")), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "SELECT"), + equalTo(DbIncubatingAttributes.DB_COLLECTION_NAME, "Customer")), span -> span.hasName("Session.delete spring.jpa.Customer") .hasKind(INTERNAL) @@ -372,14 +364,13 @@ void testCrud() { .hasKind(CLIENT) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "hsqldb"), - equalTo(DbIncubatingAttributes.DB_NAME, "test"), - equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_NAMESPACE, "test"), equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "hsqldb:mem:"), equalTo( - DbIncubatingAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_QUERY_TEXT, "delete from Customer where id=?"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "DELETE"), - equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Customer"))); + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "DELETE"), + equalTo(DbIncubatingAttributes.DB_COLLECTION_NAME, "Customer"))); } else { String findAction; @@ -405,17 +396,16 @@ void testCrud() { .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "hsqldb"), - equalTo(DbIncubatingAttributes.DB_NAME, "test"), - equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_NAMESPACE, "test"), equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "hsqldb:mem:"), satisfies( - DbIncubatingAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_QUERY_TEXT, val -> val.matches( Pattern.compile( "select ([^.]+).id([^,]*), ([^.]+).firstName([^,]*), ([^.]+).lastName (.*)from Customer (.*)where ([^.]+).id=\\?"))), - equalTo(DbIncubatingAttributes.DB_OPERATION, "SELECT"), - equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Customer")), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "SELECT"), + equalTo(DbIncubatingAttributes.DB_COLLECTION_NAME, "Customer")), span -> span.hasName("Session.merge spring.jpa.Customer") .hasKind(INTERNAL) @@ -445,14 +435,13 @@ void testCrud() { .hasKind(CLIENT) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "hsqldb"), - equalTo(DbIncubatingAttributes.DB_NAME, "test"), - equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_NAMESPACE, "test"), equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "hsqldb:mem:"), equalTo( - DbIncubatingAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_QUERY_TEXT, "delete from Customer where id=?"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "DELETE"), - equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Customer"))); + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "DELETE"), + equalTo(DbIncubatingAttributes.DB_COLLECTION_NAME, "Customer"))); } }); } diff --git a/instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/CriteriaTest.java b/instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/CriteriaTest.java index d2ab1450ed09..08352bac8314 100644 --- a/instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/CriteriaTest.java +++ b/instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/CriteriaTest.java @@ -77,14 +77,13 @@ void testCriteriaQuery(Consumer> interaction) { .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "h2"), - equalTo(DbIncubatingAttributes.DB_NAME, "db1"), - equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_NAMESPACE, "db1"), equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "h2:mem:"), satisfies( - DbIncubatingAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_QUERY_TEXT, stringAssert -> stringAssert.startsWith("select")), - equalTo(DbIncubatingAttributes.DB_OPERATION, "SELECT"), - equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Value")), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "SELECT"), + equalTo(DbIncubatingAttributes.DB_COLLECTION_NAME, "Value")), span -> span.hasName("Transaction.commit") .hasKind(SpanKind.INTERNAL) diff --git a/instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/EntityManagerTest.java b/instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/EntityManagerTest.java index 5bc237dc24b2..89cba8a9e5b4 100644 --- a/instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/EntityManagerTest.java +++ b/instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/EntityManagerTest.java @@ -139,14 +139,13 @@ void testAttachesStateToQuery(Parameter parameter) { .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "h2"), - equalTo(DbIncubatingAttributes.DB_NAME, "db1"), - equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_NAMESPACE, "db1"), equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "h2:mem:"), satisfies( - DbIncubatingAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_QUERY_TEXT, val -> val.isInstanceOf(String.class)), - equalTo(DbIncubatingAttributes.DB_OPERATION, "SELECT"), - equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Value")), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "SELECT"), + equalTo(DbIncubatingAttributes.DB_COLLECTION_NAME, "Value")), span -> assertTransactionCommitSpan( span, @@ -294,12 +293,12 @@ private static SpanDataAssert assertClientSpan(SpanDataAssert span, SpanData par .hasParent(parent) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "h2"), - equalTo(DbIncubatingAttributes.DB_NAME, "db1"), - equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_NAMESPACE, "db1"), equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "h2:mem:"), - satisfies(DbIncubatingAttributes.DB_STATEMENT, val -> val.isInstanceOf(String.class)), - satisfies(DbIncubatingAttributes.DB_OPERATION, val -> val.isInstanceOf(String.class)), - equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Value")); + satisfies(DbIncubatingAttributes.DB_QUERY_TEXT, val -> val.isInstanceOf(String.class)), + satisfies( + DbIncubatingAttributes.DB_OPERATION_NAME, val -> val.isInstanceOf(String.class)), + equalTo(DbIncubatingAttributes.DB_COLLECTION_NAME, "Value")); } @SuppressWarnings("deprecation") // TODO DbIncubatingAttributes.DB_CONNECTION_STRING deprecation @@ -310,12 +309,12 @@ private static SpanDataAssert assertClientSpan( .hasParent(parent) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "h2"), - equalTo(DbIncubatingAttributes.DB_NAME, "db1"), - equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_NAMESPACE, "db1"), equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "h2:mem:"), - satisfies(DbIncubatingAttributes.DB_STATEMENT, val -> val.isInstanceOf(String.class)), - satisfies(DbIncubatingAttributes.DB_OPERATION, val -> val.isInstanceOf(String.class)), - equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Value")); + satisfies(DbIncubatingAttributes.DB_QUERY_TEXT, val -> val.isInstanceOf(String.class)), + satisfies( + DbIncubatingAttributes.DB_OPERATION_NAME, val -> val.isInstanceOf(String.class)), + equalTo(DbIncubatingAttributes.DB_COLLECTION_NAME, "Value")); } private static SpanDataAssert assertSessionSpan( diff --git a/instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/ProcedureCallTest.java b/instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/ProcedureCallTest.java index 1a1e36cf9a61..4ef547bcd01c 100644 --- a/instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/ProcedureCallTest.java +++ b/instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/ProcedureCallTest.java @@ -103,11 +103,10 @@ void testProcedureCall() { .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "hsqldb"), - equalTo(DbIncubatingAttributes.DB_NAME, "test"), - equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_NAMESPACE, "test"), equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "hsqldb:mem:"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "{call TEST_PROC()}"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "CALL")), + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "{call TEST_PROC()}"), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "CALL")), span -> span.hasName("Transaction.commit") .hasKind(SpanKind.INTERNAL) diff --git a/instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/SessionTest.java b/instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/SessionTest.java index d95c4fe7805d..cb1763eb2ea8 100644 --- a/instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/SessionTest.java +++ b/instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/SessionTest.java @@ -244,14 +244,13 @@ void testAttachesStateToQuery(Parameter parameter) { .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "h2"), - equalTo(DbIncubatingAttributes.DB_NAME, "db1"), - equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_NAMESPACE, "db1"), equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "h2:mem:"), satisfies( - DbIncubatingAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_QUERY_TEXT, val -> val.isInstanceOf(String.class)), - equalTo(DbIncubatingAttributes.DB_OPERATION, "SELECT"), - equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Value")), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "SELECT"), + equalTo(DbIncubatingAttributes.DB_COLLECTION_NAME, "Value")), span -> assertSpanWithSessionId( span, @@ -809,12 +808,12 @@ private static SpanDataAssert assertClientSpan(SpanDataAssert span, SpanData par .hasParent(parent) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "h2"), - equalTo(DbIncubatingAttributes.DB_NAME, "db1"), - equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_NAMESPACE, "db1"), equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "h2:mem:"), - satisfies(DbIncubatingAttributes.DB_STATEMENT, val -> val.isInstanceOf(String.class)), - satisfies(DbIncubatingAttributes.DB_OPERATION, val -> val.isInstanceOf(String.class)), - equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Value")); + satisfies(DbIncubatingAttributes.DB_QUERY_TEXT, val -> val.isInstanceOf(String.class)), + satisfies( + DbIncubatingAttributes.DB_OPERATION_NAME, val -> val.isInstanceOf(String.class)), + equalTo(DbIncubatingAttributes.DB_COLLECTION_NAME, "Value")); } @SuppressWarnings("deprecation") // TODO DbIncubatingAttributes.DB_CONNECTION_STRING deprecation @@ -825,13 +824,12 @@ private static SpanDataAssert assertClientSpan( .hasParent(parent) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "h2"), - equalTo(DbIncubatingAttributes.DB_NAME, "db1"), - equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_NAMESPACE, "db1"), equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "h2:mem:"), satisfies( - DbIncubatingAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_QUERY_TEXT, stringAssert -> stringAssert.startsWith(verb.toLowerCase(Locale.ROOT))), - equalTo(DbIncubatingAttributes.DB_OPERATION, verb), - equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Value")); + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, verb), + equalTo(DbIncubatingAttributes.DB_COLLECTION_NAME, "Value")); } } diff --git a/instrumentation/hibernate/hibernate-6.0/spring-testing/src/test/groovy/SpringJpaTest.groovy b/instrumentation/hibernate/hibernate-6.0/spring-testing/src/test/groovy/SpringJpaTest.groovy index 6be2e3e5cdb7..a0afda30c7ab 100644 --- a/instrumentation/hibernate/hibernate-6.0/spring-testing/src/test/groovy/SpringJpaTest.groovy +++ b/instrumentation/hibernate/hibernate-6.0/spring-testing/src/test/groovy/SpringJpaTest.groovy @@ -62,12 +62,11 @@ class SpringJpaTest extends AgentInstrumentationSpecification { childOf span(1) attributes { "$DbIncubatingAttributes.DB_SYSTEM" "hsqldb" - "$DbIncubatingAttributes.DB_NAME" "test" - "$DbIncubatingAttributes.DB_USER" "sa" + "$DbIncubatingAttributes.DB_NAMESPACE" "test" "$DbIncubatingAttributes.DB_CONNECTION_STRING" "hsqldb:mem:" - "$DbIncubatingAttributes.DB_STATEMENT" ~/select ([^.]+)\.id([^,]*),([^.]+)\.firstName([^,]*),([^.]+)\.lastName(.*)from Customer(.*)/ - "$DbIncubatingAttributes.DB_OPERATION" "SELECT" - "$DbIncubatingAttributes.DB_SQL_TABLE" "Customer" + "$DbIncubatingAttributes.DB_QUERY_TEXT" ~/select ([^.]+)\.id([^,]*),([^.]+)\.firstName([^,]*),([^.]+)\.lastName(.*)from Customer(.*)/ + "$DbIncubatingAttributes.DB_OPERATION_NAME" "SELECT" + "$DbIncubatingAttributes.DB_COLLECTION_NAME" "Customer" } } span(3) { @@ -118,11 +117,10 @@ class SpringJpaTest extends AgentInstrumentationSpecification { childOf span(1) attributes { "$DbIncubatingAttributes.DB_SYSTEM" "hsqldb" - "$DbIncubatingAttributes.DB_NAME" "test" - "$DbIncubatingAttributes.DB_USER" "sa" - "$DbIncubatingAttributes.DB_STATEMENT" "call next value for Customer_SEQ" + "$DbIncubatingAttributes.DB_NAMESPACE" "test" + "$DbIncubatingAttributes.DB_QUERY_TEXT" "call next value for Customer_SEQ" "$DbIncubatingAttributes.DB_CONNECTION_STRING" "hsqldb:mem:" - "$DbIncubatingAttributes.DB_OPERATION" "CALL" + "$DbIncubatingAttributes.DB_OPERATION_NAME" "CALL" } } span(3) { @@ -139,12 +137,11 @@ class SpringJpaTest extends AgentInstrumentationSpecification { childOf span(3) attributes { "$DbIncubatingAttributes.DB_SYSTEM" "hsqldb" - "$DbIncubatingAttributes.DB_NAME" "test" - "$DbIncubatingAttributes.DB_USER" "sa" + "$DbIncubatingAttributes.DB_NAMESPACE" "test" "$DbIncubatingAttributes.DB_CONNECTION_STRING" "hsqldb:mem:" - "$DbIncubatingAttributes.DB_STATEMENT" ~/insert into Customer \(.*\) values \(.*\)/ - "$DbIncubatingAttributes.DB_OPERATION" "INSERT" - "$DbIncubatingAttributes.DB_SQL_TABLE" "Customer" + "$DbIncubatingAttributes.DB_QUERY_TEXT" ~/insert into Customer \(.*\) values \(.*\)/ + "$DbIncubatingAttributes.DB_OPERATION_NAME" "INSERT" + "$DbIncubatingAttributes.DB_COLLECTION_NAME" "Customer" } } } else { @@ -154,12 +151,11 @@ class SpringJpaTest extends AgentInstrumentationSpecification { childOf span(1) attributes { "$DbIncubatingAttributes.DB_SYSTEM" "hsqldb" - "$DbIncubatingAttributes.DB_NAME" "test" - "$DbIncubatingAttributes.DB_USER" "sa" + "$DbIncubatingAttributes.DB_NAMESPACE" "test" "$DbIncubatingAttributes.DB_CONNECTION_STRING" "hsqldb:mem:" - "$DbIncubatingAttributes.DB_STATEMENT" ~/insert into Customer \(.*\) values \(.*\)/ - "$DbIncubatingAttributes.DB_OPERATION" "INSERT" - "$DbIncubatingAttributes.DB_SQL_TABLE" "Customer" + "$DbIncubatingAttributes.DB_QUERY_TEXT" ~/insert into Customer \(.*\) values \(.*\)/ + "$DbIncubatingAttributes.DB_OPERATION_NAME" "INSERT" + "$DbIncubatingAttributes.DB_COLLECTION_NAME" "Customer" } } span(3) { @@ -209,12 +205,11 @@ class SpringJpaTest extends AgentInstrumentationSpecification { kind CLIENT attributes { "$DbIncubatingAttributes.DB_SYSTEM" "hsqldb" - "$DbIncubatingAttributes.DB_NAME" "test" - "$DbIncubatingAttributes.DB_USER" "sa" + "$DbIncubatingAttributes.DB_NAMESPACE" "test" "$DbIncubatingAttributes.DB_CONNECTION_STRING" "hsqldb:mem:" - "$DbIncubatingAttributes.DB_STATEMENT" ~/select ([^.]+)\.id([^,]*),([^.]+)\.firstName([^,]*),([^.]+)\.lastName (.*)from Customer (.*)where ([^.]+)\.id( ?)=( ?)\?/ - "$DbIncubatingAttributes.DB_OPERATION" "SELECT" - "$DbIncubatingAttributes.DB_SQL_TABLE" "Customer" + "$DbIncubatingAttributes.DB_QUERY_TEXT" ~/select ([^.]+)\.id([^,]*),([^.]+)\.firstName([^,]*),([^.]+)\.lastName (.*)from Customer (.*)where ([^.]+)\.id( ?)=( ?)\?/ + "$DbIncubatingAttributes.DB_OPERATION_NAME" "SELECT" + "$DbIncubatingAttributes.DB_COLLECTION_NAME" "Customer" } } span(3) { @@ -230,12 +225,11 @@ class SpringJpaTest extends AgentInstrumentationSpecification { kind CLIENT attributes { "$DbIncubatingAttributes.DB_SYSTEM" "hsqldb" - "$DbIncubatingAttributes.DB_NAME" "test" - "$DbIncubatingAttributes.DB_USER" "sa" + "$DbIncubatingAttributes.DB_NAMESPACE" "test" "$DbIncubatingAttributes.DB_CONNECTION_STRING" "hsqldb:mem:" - "$DbIncubatingAttributes.DB_STATEMENT" ~/update Customer set firstName=\?,(.*)lastName=\? where id=\?/ - "$DbIncubatingAttributes.DB_OPERATION" "UPDATE" - "$DbIncubatingAttributes.DB_SQL_TABLE" "Customer" + "$DbIncubatingAttributes.DB_QUERY_TEXT" ~/update Customer set firstName=\?,(.*)lastName=\? where id=\?/ + "$DbIncubatingAttributes.DB_OPERATION_NAME" "UPDATE" + "$DbIncubatingAttributes.DB_COLLECTION_NAME" "Customer" } } } @@ -273,12 +267,11 @@ class SpringJpaTest extends AgentInstrumentationSpecification { childOf span(1) attributes { "$DbIncubatingAttributes.DB_SYSTEM" "hsqldb" - "$DbIncubatingAttributes.DB_NAME" "test" - "$DbIncubatingAttributes.DB_USER" "sa" + "$DbIncubatingAttributes.DB_NAMESPACE" "test" "$DbIncubatingAttributes.DB_CONNECTION_STRING" "hsqldb:mem:" - "$DbIncubatingAttributes.DB_STATEMENT" ~/select ([^.]+)\.id([^,]*),([^.]+)\.firstName([^,]*),([^.]+)\.lastName (.*)from Customer (.*)(where ([^.]+)\.lastName( ?)=( ?)\?|)/ - "$DbIncubatingAttributes.DB_OPERATION" "SELECT" - "$DbIncubatingAttributes.DB_SQL_TABLE" "Customer" + "$DbIncubatingAttributes.DB_QUERY_TEXT" ~/select ([^.]+)\.id([^,]*),([^.]+)\.firstName([^,]*),([^.]+)\.lastName (.*)from Customer (.*)(where ([^.]+)\.lastName( ?)=( ?)\?|)/ + "$DbIncubatingAttributes.DB_OPERATION_NAME" "SELECT" + "$DbIncubatingAttributes.DB_COLLECTION_NAME" "Customer" } } } @@ -317,12 +310,11 @@ class SpringJpaTest extends AgentInstrumentationSpecification { childOf span(1) attributes { "$DbIncubatingAttributes.DB_SYSTEM" "hsqldb" - "$DbIncubatingAttributes.DB_NAME" "test" - "$DbIncubatingAttributes.DB_USER" "sa" + "$DbIncubatingAttributes.DB_NAMESPACE" "test" "$DbIncubatingAttributes.DB_CONNECTION_STRING" "hsqldb:mem:" - "$DbIncubatingAttributes.DB_STATEMENT" ~/select ([^.]+)\.id([^,]*),([^.]+)\.firstName([^,]*),([^.]+)\.lastName (.*)from Customer (.*)where ([^.]+)\.id( ?)=( ?)\?/ - "$DbIncubatingAttributes.DB_OPERATION" "SELECT" - "$DbIncubatingAttributes.DB_SQL_TABLE" "Customer" + "$DbIncubatingAttributes.DB_QUERY_TEXT" ~/select ([^.]+)\.id([^,]*),([^.]+)\.firstName([^,]*),([^.]+)\.lastName (.*)from Customer (.*)where ([^.]+)\.id( ?)=( ?)\?/ + "$DbIncubatingAttributes.DB_OPERATION_NAME" "SELECT" + "$DbIncubatingAttributes.DB_COLLECTION_NAME" "Customer" } } } @@ -342,12 +334,11 @@ class SpringJpaTest extends AgentInstrumentationSpecification { childOf span(1) attributes { "$DbIncubatingAttributes.DB_SYSTEM" "hsqldb" - "$DbIncubatingAttributes.DB_NAME" "test" - "$DbIncubatingAttributes.DB_USER" "sa" + "$DbIncubatingAttributes.DB_NAMESPACE" "test" "$DbIncubatingAttributes.DB_CONNECTION_STRING" "hsqldb:mem:" - "$DbIncubatingAttributes.DB_STATEMENT" ~/select ([^.]+)\.id([^,]*),([^.]+)\.firstName([^,]*),([^.]+)\.lastName (.*)from Customer (.*)where ([^.]+)\.id( ?)=( ?)\?/ - "$DbIncubatingAttributes.DB_OPERATION" "SELECT" - "$DbIncubatingAttributes.DB_SQL_TABLE" "Customer" + "$DbIncubatingAttributes.DB_QUERY_TEXT" ~/select ([^.]+)\.id([^,]*),([^.]+)\.firstName([^,]*),([^.]+)\.lastName (.*)from Customer (.*)where ([^.]+)\.id( ?)=( ?)\?/ + "$DbIncubatingAttributes.DB_OPERATION_NAME" "SELECT" + "$DbIncubatingAttributes.DB_COLLECTION_NAME" "Customer" } } } @@ -372,12 +363,11 @@ class SpringJpaTest extends AgentInstrumentationSpecification { kind CLIENT attributes { "$DbIncubatingAttributes.DB_SYSTEM" "hsqldb" - "$DbIncubatingAttributes.DB_NAME" "test" - "$DbIncubatingAttributes.DB_USER" "sa" + "$DbIncubatingAttributes.DB_NAMESPACE" "test" "$DbIncubatingAttributes.DB_CONNECTION_STRING" "hsqldb:mem:" - "$DbIncubatingAttributes.DB_STATEMENT" "delete from Customer where id=?" - "$DbIncubatingAttributes.DB_OPERATION" "DELETE" - "$DbIncubatingAttributes.DB_SQL_TABLE" "Customer" + "$DbIncubatingAttributes.DB_QUERY_TEXT" "delete from Customer where id=?" + "$DbIncubatingAttributes.DB_OPERATION_NAME" "DELETE" + "$DbIncubatingAttributes.DB_COLLECTION_NAME" "Customer" } } } diff --git a/instrumentation/hibernate/hibernate-procedure-call-4.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_3/ProcedureCallTest.java b/instrumentation/hibernate/hibernate-procedure-call-4.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_3/ProcedureCallTest.java index 3e36101c7bef..21d8e2922c62 100644 --- a/instrumentation/hibernate/hibernate-procedure-call-4.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_3/ProcedureCallTest.java +++ b/instrumentation/hibernate/hibernate-procedure-call-4.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_3/ProcedureCallTest.java @@ -115,11 +115,10 @@ void testProcedureCall() { .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "hsqldb"), - equalTo(DbIncubatingAttributes.DB_NAME, "test"), - equalTo(DbIncubatingAttributes.DB_USER, "sa"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "{call TEST_PROC()}"), + equalTo(DbIncubatingAttributes.DB_NAMESPACE, "test"), + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "{call TEST_PROC()}"), equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "hsqldb:mem:"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "CALL")), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "CALL")), span -> span.hasName("Transaction.commit") .hasKind(INTERNAL) diff --git a/instrumentation/hibernate/hibernate-reactive-1.0/javaagent/src/hibernateReactive1Test/java/io/opentelemetry/javaagent/instrumentation/hibernate/reactive/v1_0/HibernateReactiveTest.java b/instrumentation/hibernate/hibernate-reactive-1.0/javaagent/src/hibernateReactive1Test/java/io/opentelemetry/javaagent/instrumentation/hibernate/reactive/v1_0/HibernateReactiveTest.java index c2152b4c8dc0..8011bd140606 100644 --- a/instrumentation/hibernate/hibernate-reactive-1.0/javaagent/src/hibernateReactive1Test/java/io/opentelemetry/javaagent/instrumentation/hibernate/reactive/v1_0/HibernateReactiveTest.java +++ b/instrumentation/hibernate/hibernate-reactive-1.0/javaagent/src/hibernateReactive1Test/java/io/opentelemetry/javaagent/instrumentation/hibernate/reactive/v1_0/HibernateReactiveTest.java @@ -8,11 +8,10 @@ import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS; import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT; -import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_NAME; -import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION; -import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SQL_TABLE; -import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_STATEMENT; -import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_USER; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_COLLECTION_NAME; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_NAMESPACE; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION_NAME; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_QUERY_TEXT; import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.SpanKind; @@ -304,13 +303,12 @@ private static void assertTrace() { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(DB_NAME, DB), - equalTo(DB_USER, USER_DB), + equalTo(DB_NAMESPACE, DB), equalTo( - DB_STATEMENT, + DB_QUERY_TEXT, "select value0_.id as id1_0_0_, value0_.name as name2_0_0_ from Value value0_ where value0_.id=$1"), - equalTo(DB_OPERATION, "SELECT"), - equalTo(DB_SQL_TABLE, "Value"), + equalTo(DB_OPERATION_NAME, "SELECT"), + equalTo(DB_COLLECTION_NAME, "Value"), equalTo(SERVER_ADDRESS, host), equalTo(SERVER_PORT, port)), span -> diff --git a/instrumentation/hibernate/hibernate-reactive-1.0/javaagent/src/hibernateReactive2Test/java/io/opentelemetry/javaagent/instrumentation/hibernate/reactive/v2_0/HibernateReactiveTest.java b/instrumentation/hibernate/hibernate-reactive-1.0/javaagent/src/hibernateReactive2Test/java/io/opentelemetry/javaagent/instrumentation/hibernate/reactive/v2_0/HibernateReactiveTest.java index a7ec8dc7248d..1eae3d57be66 100644 --- a/instrumentation/hibernate/hibernate-reactive-1.0/javaagent/src/hibernateReactive2Test/java/io/opentelemetry/javaagent/instrumentation/hibernate/reactive/v2_0/HibernateReactiveTest.java +++ b/instrumentation/hibernate/hibernate-reactive-1.0/javaagent/src/hibernateReactive2Test/java/io/opentelemetry/javaagent/instrumentation/hibernate/reactive/v2_0/HibernateReactiveTest.java @@ -8,11 +8,10 @@ import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS; import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT; -import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_NAME; -import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION; -import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SQL_TABLE; -import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_STATEMENT; -import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_USER; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_COLLECTION_NAME; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_NAMESPACE; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION_NAME; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_QUERY_TEXT; import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.SpanKind; @@ -296,13 +295,12 @@ private static void assertTrace() { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(DB_NAME, DB), - equalTo(DB_USER, USER_DB), + equalTo(DB_NAMESPACE, DB), equalTo( - DB_STATEMENT, + DB_QUERY_TEXT, "select v1_0.id,v1_0.name from Value v1_0 where v1_0.id=$1"), - equalTo(DB_OPERATION, "SELECT"), - equalTo(DB_SQL_TABLE, "Value"), + equalTo(DB_OPERATION_NAME, "SELECT"), + equalTo(DB_COLLECTION_NAME, "Value"), equalTo(SERVER_ADDRESS, host), equalTo(SERVER_PORT, port)), span -> diff --git a/instrumentation/influxdb-2.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/influxdb/v2_4/InfluxDbClientTest.java b/instrumentation/influxdb-2.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/influxdb/v2_4/InfluxDbClientTest.java index 40d5300fe5d8..219f2e2b0080 100644 --- a/instrumentation/influxdb-2.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/influxdb/v2_4/InfluxDbClientTest.java +++ b/instrumentation/influxdb-2.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/influxdb/v2_4/InfluxDbClientTest.java @@ -319,12 +319,12 @@ private static List attributeAssertions( result.addAll( asList( equalTo(DbIncubatingAttributes.DB_SYSTEM, "influxdb"), - equalTo(DbIncubatingAttributes.DB_NAME, databaseName), + equalTo(DbIncubatingAttributes.DB_NAMESPACE, databaseName), equalTo(ServerAttributes.SERVER_ADDRESS, host), equalTo(ServerAttributes.SERVER_PORT, port), - equalTo(DbIncubatingAttributes.DB_OPERATION, operation))); + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, operation))); if (statement != null) { - result.add(equalTo(DbIncubatingAttributes.DB_STATEMENT, statement)); + result.add(equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, statement)); } return result; } diff --git a/instrumentation/influxdb-2.4/javaagent/src/test24/java/io/opentelemetry/javaagent/instrumentation/influxdb/v2_4/InfluxDbClient24Test.java b/instrumentation/influxdb-2.4/javaagent/src/test24/java/io/opentelemetry/javaagent/instrumentation/influxdb/v2_4/InfluxDbClient24Test.java index 3cd33152551c..d3002bfb93b5 100644 --- a/instrumentation/influxdb-2.4/javaagent/src/test24/java/io/opentelemetry/javaagent/instrumentation/influxdb/v2_4/InfluxDbClient24Test.java +++ b/instrumentation/influxdb-2.4/javaagent/src/test24/java/io/opentelemetry/javaagent/instrumentation/influxdb/v2_4/InfluxDbClient24Test.java @@ -147,12 +147,12 @@ private static List attributeAssertions( result.addAll( asList( equalTo(DbIncubatingAttributes.DB_SYSTEM, "influxdb"), - equalTo(DbIncubatingAttributes.DB_NAME, databaseName), + equalTo(DbIncubatingAttributes.DB_NAMESPACE, databaseName), equalTo(ServerAttributes.SERVER_ADDRESS, host), equalTo(ServerAttributes.SERVER_PORT, port), - equalTo(DbIncubatingAttributes.DB_OPERATION, operation))); + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, operation))); if (statement != null) { - result.add(equalTo(DbIncubatingAttributes.DB_STATEMENT, statement)); + result.add(equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, statement)); } return result; } diff --git a/instrumentation/jdbc/javaagent/src/test/groovy/JdbcInstrumentationTest.groovy b/instrumentation/jdbc/javaagent/src/test/groovy/JdbcInstrumentationTest.groovy index 39eec0059569..23e6b208a2a5 100644 --- a/instrumentation/jdbc/javaagent/src/test/groovy/JdbcInstrumentationTest.groovy +++ b/instrumentation/jdbc/javaagent/src/test/groovy/JdbcInstrumentationTest.groovy @@ -191,14 +191,11 @@ class JdbcInstrumentationTest extends AgentInstrumentationSpecification { childOf span(0) attributes { "$DbIncubatingAttributes.DB_SYSTEM" system - "$DbIncubatingAttributes.DB_NAME" dbNameLower - if (username != null) { - "$DbIncubatingAttributes.DB_USER" username - } + "$DbIncubatingAttributes.DB_NAMESPACE" dbNameLower "$DbIncubatingAttributes.DB_CONNECTION_STRING" url - "$DbIncubatingAttributes.DB_STATEMENT" sanitizedQuery - "$DbIncubatingAttributes.DB_OPERATION" "SELECT" - "$DbIncubatingAttributes.DB_SQL_TABLE" table + "$DbIncubatingAttributes.DB_QUERY_TEXT" sanitizedQuery + "$DbIncubatingAttributes.DB_OPERATION_NAME" "SELECT" + "$DbIncubatingAttributes.DB_COLLECTION_NAME" table } } } @@ -251,14 +248,11 @@ class JdbcInstrumentationTest extends AgentInstrumentationSpecification { childOf span(0) attributes { "$DbIncubatingAttributes.DB_SYSTEM" system - "$DbIncubatingAttributes.DB_NAME" dbNameLower - if (username != null) { - "$DbIncubatingAttributes.DB_USER" username - } + "$DbIncubatingAttributes.DB_NAMESPACE" dbNameLower "$DbIncubatingAttributes.DB_CONNECTION_STRING" url - "$DbIncubatingAttributes.DB_STATEMENT" sanitizedQuery - "$DbIncubatingAttributes.DB_OPERATION" "SELECT" - "$DbIncubatingAttributes.DB_SQL_TABLE" table + "$DbIncubatingAttributes.DB_QUERY_TEXT" sanitizedQuery + "$DbIncubatingAttributes.DB_OPERATION_NAME" "SELECT" + "$DbIncubatingAttributes.DB_COLLECTION_NAME" table } } } @@ -303,14 +297,11 @@ class JdbcInstrumentationTest extends AgentInstrumentationSpecification { childOf span(0) attributes { "$DbIncubatingAttributes.DB_SYSTEM" system - "$DbIncubatingAttributes.DB_NAME" dbNameLower - if (username != null) { - "$DbIncubatingAttributes.DB_USER" username - } + "$DbIncubatingAttributes.DB_NAMESPACE" dbNameLower "$DbIncubatingAttributes.DB_CONNECTION_STRING" url - "$DbIncubatingAttributes.DB_STATEMENT" sanitizedQuery - "$DbIncubatingAttributes.DB_OPERATION" "SELECT" - "$DbIncubatingAttributes.DB_SQL_TABLE" table + "$DbIncubatingAttributes.DB_QUERY_TEXT" sanitizedQuery + "$DbIncubatingAttributes.DB_OPERATION_NAME" "SELECT" + "$DbIncubatingAttributes.DB_COLLECTION_NAME" table } } } @@ -355,14 +346,11 @@ class JdbcInstrumentationTest extends AgentInstrumentationSpecification { childOf span(0) attributes { "$DbIncubatingAttributes.DB_SYSTEM" system - "$DbIncubatingAttributes.DB_NAME" dbName.toLowerCase() - if (username != null) { - "$DbIncubatingAttributes.DB_USER" username - } + "$DbIncubatingAttributes.DB_NAMESPACE" dbName.toLowerCase() "$DbIncubatingAttributes.DB_CONNECTION_STRING" url - "$DbIncubatingAttributes.DB_STATEMENT" sanitizedQuery - "$DbIncubatingAttributes.DB_OPERATION" "SELECT" - "$DbIncubatingAttributes.DB_SQL_TABLE" table + "$DbIncubatingAttributes.DB_QUERY_TEXT" sanitizedQuery + "$DbIncubatingAttributes.DB_OPERATION_NAME" "SELECT" + "$DbIncubatingAttributes.DB_COLLECTION_NAME" table } } } @@ -407,14 +395,11 @@ class JdbcInstrumentationTest extends AgentInstrumentationSpecification { childOf span(0) attributes { "$DbIncubatingAttributes.DB_SYSTEM" system - "$DbIncubatingAttributes.DB_NAME" dbNameLower - if (username != null) { - "$DbIncubatingAttributes.DB_USER" username - } - "$DbIncubatingAttributes.DB_STATEMENT" query + "$DbIncubatingAttributes.DB_NAMESPACE" dbNameLower + "$DbIncubatingAttributes.DB_QUERY_TEXT" query "$DbIncubatingAttributes.DB_CONNECTION_STRING" url - "$DbIncubatingAttributes.DB_OPERATION" "CREATE TABLE" - "$DbIncubatingAttributes.DB_SQL_TABLE" table + "$DbIncubatingAttributes.DB_OPERATION_NAME" "CREATE TABLE" + "$DbIncubatingAttributes.DB_COLLECTION_NAME" table } } } @@ -462,14 +447,11 @@ class JdbcInstrumentationTest extends AgentInstrumentationSpecification { childOf span(0) attributes { "$DbIncubatingAttributes.DB_SYSTEM" system - "$DbIncubatingAttributes.DB_NAME" dbName.toLowerCase() - if (username != null) { - "$DbIncubatingAttributes.DB_USER" username - } - "$DbIncubatingAttributes.DB_STATEMENT" query + "$DbIncubatingAttributes.DB_NAMESPACE" dbName.toLowerCase() + "$DbIncubatingAttributes.DB_QUERY_TEXT" query "$DbIncubatingAttributes.DB_CONNECTION_STRING" url - "$DbIncubatingAttributes.DB_OPERATION" "CREATE TABLE" - "$DbIncubatingAttributes.DB_SQL_TABLE" table + "$DbIncubatingAttributes.DB_OPERATION_NAME" "CREATE TABLE" + "$DbIncubatingAttributes.DB_COLLECTION_NAME" table } } } @@ -529,14 +511,11 @@ class JdbcInstrumentationTest extends AgentInstrumentationSpecification { childOf span(0) attributes { "$DbIncubatingAttributes.DB_SYSTEM" system - "$DbIncubatingAttributes.DB_NAME" dbNameLower - if (username != null) { - "$DbIncubatingAttributes.DB_USER" username - } + "$DbIncubatingAttributes.DB_NAMESPACE" dbNameLower "$DbIncubatingAttributes.DB_CONNECTION_STRING" url - "$DbIncubatingAttributes.DB_STATEMENT" sanitizedQuery - "$DbIncubatingAttributes.DB_OPERATION" "SELECT" - "$DbIncubatingAttributes.DB_SQL_TABLE" table + "$DbIncubatingAttributes.DB_QUERY_TEXT" sanitizedQuery + "$DbIncubatingAttributes.DB_OPERATION_NAME" "SELECT" + "$DbIncubatingAttributes.DB_COLLECTION_NAME" table } } } @@ -588,8 +567,7 @@ class JdbcInstrumentationTest extends AgentInstrumentationSpecification { "$CodeIncubatingAttributes.CODE_NAMESPACE" datasource.class.name "$CodeIncubatingAttributes.CODE_FUNCTION" "getConnection" "$DbIncubatingAttributes.DB_SYSTEM" system - "$DbIncubatingAttributes.DB_USER" { user == null | user == it } - "$DbIncubatingAttributes.DB_NAME" "jdbcunittest" + "$DbIncubatingAttributes.DB_NAMESPACE" "jdbcunittest" "$DbIncubatingAttributes.DB_CONNECTION_STRING" connectionString } } @@ -602,8 +580,7 @@ class JdbcInstrumentationTest extends AgentInstrumentationSpecification { "$CodeIncubatingAttributes.CODE_NAMESPACE" datasource.class.name "$CodeIncubatingAttributes.CODE_FUNCTION" "getConnection" "$DbIncubatingAttributes.DB_SYSTEM" system - "$DbIncubatingAttributes.DB_USER" { user == null | user == it } - "$DbIncubatingAttributes.DB_NAME" "jdbcunittest" + "$DbIncubatingAttributes.DB_NAMESPACE" "jdbcunittest" "$DbIncubatingAttributes.DB_CONNECTION_STRING" connectionString } } @@ -652,7 +629,7 @@ class JdbcInstrumentationTest extends AgentInstrumentationSpecification { childOf span(0) attributes { "$DbIncubatingAttributes.DB_SYSTEM" "other_sql" - "$DbIncubatingAttributes.DB_STATEMENT" "testing ?" + "$DbIncubatingAttributes.DB_QUERY_TEXT" "testing ?" "$DbIncubatingAttributes.DB_CONNECTION_STRING" "testdb://localhost" "$ServerAttributes.SERVER_ADDRESS" "localhost" } @@ -693,11 +670,11 @@ class JdbcInstrumentationTest extends AgentInstrumentationSpecification { childOf span(0) attributes { "$DbIncubatingAttributes.DB_SYSTEM" "other_sql" - "$DbIncubatingAttributes.DB_NAME" databaseName + "$DbIncubatingAttributes.DB_NAMESPACE" databaseName "$DbIncubatingAttributes.DB_CONNECTION_STRING" "testdb://localhost" - "$DbIncubatingAttributes.DB_STATEMENT" sanitizedQuery - "$DbIncubatingAttributes.DB_OPERATION" operation - "$DbIncubatingAttributes.DB_SQL_TABLE" table + "$DbIncubatingAttributes.DB_QUERY_TEXT" sanitizedQuery + "$DbIncubatingAttributes.DB_OPERATION_NAME" operation + "$DbIncubatingAttributes.DB_COLLECTION_NAME" table "$ServerAttributes.SERVER_ADDRESS" "localhost" } } @@ -750,12 +727,11 @@ class JdbcInstrumentationTest extends AgentInstrumentationSpecification { kind CLIENT attributes { "$DbIncubatingAttributes.DB_SYSTEM" "hsqldb" - "$DbIncubatingAttributes.DB_NAME" dbNameLower - "$DbIncubatingAttributes.DB_USER" "SA" + "$DbIncubatingAttributes.DB_NAMESPACE" dbNameLower "$DbIncubatingAttributes.DB_CONNECTION_STRING" "hsqldb:mem:" - "$DbIncubatingAttributes.DB_STATEMENT" "SELECT ? FROM INFORMATION_SCHEMA.SYSTEM_USERS" - "$DbIncubatingAttributes.DB_OPERATION" "SELECT" - "$DbIncubatingAttributes.DB_SQL_TABLE" "INFORMATION_SCHEMA.SYSTEM_USERS" + "$DbIncubatingAttributes.DB_QUERY_TEXT" "SELECT ? FROM INFORMATION_SCHEMA.SYSTEM_USERS" + "$DbIncubatingAttributes.DB_OPERATION_NAME" "SELECT" + "$DbIncubatingAttributes.DB_COLLECTION_NAME" "INFORMATION_SCHEMA.SYSTEM_USERS" } } } @@ -800,9 +776,9 @@ class JdbcInstrumentationTest extends AgentInstrumentationSpecification { attributes { "$DbIncubatingAttributes.DB_SYSTEM" "other_sql" "$DbIncubatingAttributes.DB_CONNECTION_STRING" "testdb://localhost" - "$DbIncubatingAttributes.DB_STATEMENT" "SELECT * FROM table" - "$DbIncubatingAttributes.DB_OPERATION" "SELECT" - "$DbIncubatingAttributes.DB_SQL_TABLE" "table" + "$DbIncubatingAttributes.DB_QUERY_TEXT" "SELECT * FROM table" + "$DbIncubatingAttributes.DB_OPERATION_NAME" "SELECT" + "$DbIncubatingAttributes.DB_COLLECTION_NAME" "table" "$ServerAttributes.SERVER_ADDRESS" "localhost" } } diff --git a/instrumentation/jdbc/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/scalaexecutors/SlickTest.scala b/instrumentation/jdbc/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/scalaexecutors/SlickTest.scala index dc1ff375acc6..f0c943838dad 100644 --- a/instrumentation/jdbc/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/scalaexecutors/SlickTest.scala +++ b/instrumentation/jdbc/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/scalaexecutors/SlickTest.scala @@ -83,14 +83,13 @@ class SlickTest { DbIncubatingAttributes.DB_SYSTEM, DbSystemValues.H2 ), - equalTo(DbIncubatingAttributes.DB_NAME, Db), - equalTo(DbIncubatingAttributes.DB_USER, Username), + equalTo(DbIncubatingAttributes.DB_NAMESPACE, Db), equalTo( DbIncubatingAttributes.DB_CONNECTION_STRING, "h2:mem:" ), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "SELECT ?"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "SELECT") + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "SELECT ?"), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "SELECT") ) } ) diff --git a/instrumentation/jdbc/library/src/main/java/io/opentelemetry/instrumentation/jdbc/internal/DataSourceDbAttributesExtractor.java b/instrumentation/jdbc/library/src/main/java/io/opentelemetry/instrumentation/jdbc/internal/DataSourceDbAttributesExtractor.java index fb35e335d9d7..00e5307a6a7e 100644 --- a/instrumentation/jdbc/library/src/main/java/io/opentelemetry/instrumentation/jdbc/internal/DataSourceDbAttributesExtractor.java +++ b/instrumentation/jdbc/library/src/main/java/io/opentelemetry/instrumentation/jdbc/internal/DataSourceDbAttributesExtractor.java @@ -19,9 +19,8 @@ enum DataSourceDbAttributesExtractor implements AttributesExtractor DB_NAME = AttributeKey.stringKey("db.name"); + private static final AttributeKey DB_NAMESPACE = AttributeKey.stringKey("db.namespace"); private static final AttributeKey DB_SYSTEM = AttributeKey.stringKey("db.system"); - private static final AttributeKey DB_USER = AttributeKey.stringKey("db.user"); private static final AttributeKey DB_CONNECTION_STRING = AttributeKey.stringKey("db.connection_string"); @@ -40,8 +39,7 @@ public void onEnd( return; } internalSet(attributes, DB_SYSTEM, dbInfo.getSystem()); - internalSet(attributes, DB_USER, dbInfo.getUser()); - internalSet(attributes, DB_NAME, getName(dbInfo)); + internalSet(attributes, DB_NAMESPACE, getName(dbInfo)); internalSet(attributes, DB_CONNECTION_STRING, dbInfo.getShortUrl()); } diff --git a/instrumentation/jdbc/library/src/test/java/io/opentelemetry/instrumentation/jdbc/datasource/JdbcTelemetryTest.java b/instrumentation/jdbc/library/src/test/java/io/opentelemetry/instrumentation/jdbc/datasource/JdbcTelemetryTest.java index 977a87f54c56..0808376074c9 100644 --- a/instrumentation/jdbc/library/src/test/java/io/opentelemetry/instrumentation/jdbc/datasource/JdbcTelemetryTest.java +++ b/instrumentation/jdbc/library/src/test/java/io/opentelemetry/instrumentation/jdbc/datasource/JdbcTelemetryTest.java @@ -41,7 +41,7 @@ void buildWithDefaults() throws SQLException { span -> span.hasName("TestDataSource.getConnection"), span -> span.hasName("SELECT dbname") - .hasAttribute(equalTo(DbIncubatingAttributes.DB_STATEMENT, "SELECT ?;")))); + .hasAttribute(equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "SELECT ?;")))); } @Test @@ -117,7 +117,7 @@ void buildWithSanitizationDisabled() throws SQLException { span -> span.hasName("TestDataSource.getConnection"), span -> span.hasName("SELECT dbname") - .hasAttribute(equalTo(DbIncubatingAttributes.DB_STATEMENT, "SELECT 1;")))); + .hasAttribute(equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "SELECT 1;")))); } @Test diff --git a/instrumentation/jdbc/library/src/test/java/io/opentelemetry/instrumentation/jdbc/datasource/OpenTelemetryDataSourceTest.java b/instrumentation/jdbc/library/src/test/java/io/opentelemetry/instrumentation/jdbc/datasource/OpenTelemetryDataSourceTest.java index 6c775f9c2b7f..0b58a99e73c7 100644 --- a/instrumentation/jdbc/library/src/test/java/io/opentelemetry/instrumentation/jdbc/datasource/OpenTelemetryDataSourceTest.java +++ b/instrumentation/jdbc/library/src/test/java/io/opentelemetry/instrumentation/jdbc/datasource/OpenTelemetryDataSourceTest.java @@ -56,7 +56,7 @@ void shouldEmitGetConnectionSpans(GetConnectionFunction getConnection) throws SQ TestDataSource.class.getName()), equalTo(CodeIncubatingAttributes.CODE_FUNCTION, "getConnection"), equalTo(DbIncubatingAttributes.DB_SYSTEM, "postgresql"), - equalTo(DbIncubatingAttributes.DB_NAME, "dbname"), + equalTo(DbIncubatingAttributes.DB_NAMESPACE, "dbname"), equalTo( DbIncubatingAttributes.DB_CONNECTION_STRING, "postgresql://127.0.0.1:5432")))); diff --git a/instrumentation/jdbc/library/src/test/java/io/opentelemetry/instrumentation/jdbc/internal/OpenTelemetryConnectionTest.java b/instrumentation/jdbc/library/src/test/java/io/opentelemetry/instrumentation/jdbc/internal/OpenTelemetryConnectionTest.java index 5405ddd14026..cc54a867856c 100644 --- a/instrumentation/jdbc/library/src/test/java/io/opentelemetry/instrumentation/jdbc/internal/OpenTelemetryConnectionTest.java +++ b/instrumentation/jdbc/library/src/test/java/io/opentelemetry/instrumentation/jdbc/internal/OpenTelemetryConnectionTest.java @@ -188,13 +188,12 @@ private static void jdbcTraceAssertion(DbInfo dbInfo, String query) { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, dbInfo.getSystem()), - equalTo(DbIncubatingAttributes.DB_NAME, dbInfo.getName()), - equalTo(DbIncubatingAttributes.DB_USER, dbInfo.getUser()), + equalTo(DbIncubatingAttributes.DB_NAMESPACE, dbInfo.getName()), equalTo( DbIncubatingAttributes.DB_CONNECTION_STRING, dbInfo.getShortUrl()), - equalTo(DbIncubatingAttributes.DB_STATEMENT, query), - equalTo(DbIncubatingAttributes.DB_OPERATION, "SELECT"), - equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "users"), + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, query), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "SELECT"), + equalTo(DbIncubatingAttributes.DB_COLLECTION_NAME, "users"), equalTo(ServerAttributes.SERVER_ADDRESS, dbInfo.getHost()), equalTo(ServerAttributes.SERVER_PORT, dbInfo.getPort())))); } diff --git a/instrumentation/jedis/jedis-1.4/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/AbstractJedisTest.java b/instrumentation/jedis/jedis-1.4/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/AbstractJedisTest.java index 547a4fc0ba6e..221bd6f62051 100644 --- a/instrumentation/jedis/jedis-1.4/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/AbstractJedisTest.java +++ b/instrumentation/jedis/jedis-1.4/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/AbstractJedisTest.java @@ -65,8 +65,8 @@ void setCommand() { .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "SET foo ?"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "SET"), + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "SET foo ?"), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "SET"), equalTo(ServerAttributes.SERVER_ADDRESS, host), equalTo(ServerAttributes.SERVER_PORT, port)))); } @@ -86,8 +86,8 @@ void getCommand() { .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "SET foo ?"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "SET"), + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "SET foo ?"), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "SET"), equalTo(ServerAttributes.SERVER_ADDRESS, host), equalTo(ServerAttributes.SERVER_PORT, port))), trace -> @@ -97,8 +97,8 @@ void getCommand() { .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "GET foo"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "GET"), + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "GET foo"), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "GET"), equalTo(ServerAttributes.SERVER_ADDRESS, host), equalTo(ServerAttributes.SERVER_PORT, port)))); } @@ -118,8 +118,8 @@ void commandWithNoArguments() { .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "SET foo ?"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "SET"), + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "SET foo ?"), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "SET"), equalTo(ServerAttributes.SERVER_ADDRESS, host), equalTo(ServerAttributes.SERVER_PORT, port))), trace -> @@ -129,8 +129,8 @@ void commandWithNoArguments() { .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "RANDOMKEY"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "RANDOMKEY"), + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "RANDOMKEY"), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "RANDOMKEY"), equalTo(ServerAttributes.SERVER_ADDRESS, host), equalTo(ServerAttributes.SERVER_PORT, port)))); } diff --git a/instrumentation/jedis/jedis-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/Jedis30ClientTest.java b/instrumentation/jedis/jedis-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/Jedis30ClientTest.java index be3e155d06fc..2459f4465db3 100644 --- a/instrumentation/jedis/jedis-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/Jedis30ClientTest.java +++ b/instrumentation/jedis/jedis-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/Jedis30ClientTest.java @@ -74,8 +74,8 @@ void setCommand() { .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "SET foo ?"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "SET"), + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "SET foo ?"), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "SET"), equalTo(ServerAttributes.SERVER_ADDRESS, host), equalTo(ServerAttributes.SERVER_PORT, port), equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), @@ -100,8 +100,8 @@ void getCommand() { .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "SET foo ?"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "SET"), + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "SET foo ?"), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "SET"), equalTo(ServerAttributes.SERVER_ADDRESS, host), equalTo(ServerAttributes.SERVER_PORT, port), equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), @@ -116,8 +116,8 @@ void getCommand() { .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "GET foo"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "GET"), + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "GET foo"), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "GET"), equalTo(ServerAttributes.SERVER_ADDRESS, host), equalTo(ServerAttributes.SERVER_PORT, port), equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), @@ -142,8 +142,8 @@ void commandWithNoArguments() { .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "SET foo ?"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "SET"), + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "SET foo ?"), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "SET"), equalTo(ServerAttributes.SERVER_ADDRESS, host), equalTo(ServerAttributes.SERVER_PORT, port), equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), @@ -158,8 +158,8 @@ void commandWithNoArguments() { .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "RANDOMKEY"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "RANDOMKEY"), + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "RANDOMKEY"), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "RANDOMKEY"), equalTo(ServerAttributes.SERVER_ADDRESS, host), equalTo(ServerAttributes.SERVER_PORT, port), equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), diff --git a/instrumentation/jedis/jedis-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v4_0/Jedis40ClientTest.java b/instrumentation/jedis/jedis-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v4_0/Jedis40ClientTest.java index 0d54274d9a35..1485d85b8c79 100644 --- a/instrumentation/jedis/jedis-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v4_0/Jedis40ClientTest.java +++ b/instrumentation/jedis/jedis-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v4_0/Jedis40ClientTest.java @@ -68,8 +68,8 @@ void setCommand() { .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "SET foo ?"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "SET"), + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "SET foo ?"), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "SET"), equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, ip)))); @@ -90,8 +90,8 @@ void getCommand() { .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "SET foo ?"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "SET"), + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "SET foo ?"), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "SET"), equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, ip))), @@ -102,8 +102,8 @@ void getCommand() { .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "GET foo"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "GET"), + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "GET foo"), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "GET"), equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, ip)))); @@ -124,8 +124,8 @@ void commandWithNoArguments() { .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "SET foo ?"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "SET"), + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "SET foo ?"), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "SET"), equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, ip))), @@ -136,8 +136,8 @@ void commandWithNoArguments() { .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "RANDOMKEY"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "RANDOMKEY"), + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "RANDOMKEY"), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "RANDOMKEY"), equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, ip)))); diff --git a/instrumentation/jms/jms-1.1/javaagent/src/jms2Test/java/io/opentelemetry/javaagent/instrumentation/jms/v1_1/Jms2InstrumentationTest.java b/instrumentation/jms/jms-1.1/javaagent/src/jms2Test/java/io/opentelemetry/javaagent/instrumentation/jms/v1_1/Jms2InstrumentationTest.java index 439fa62de2ec..166fcb8b9eab 100644 --- a/instrumentation/jms/jms-1.1/javaagent/src/jms2Test/java/io/opentelemetry/javaagent/instrumentation/jms/v1_1/Jms2InstrumentationTest.java +++ b/instrumentation/jms/jms-1.1/javaagent/src/jms2Test/java/io/opentelemetry/javaagent/instrumentation/jms/v1_1/Jms2InstrumentationTest.java @@ -171,7 +171,8 @@ void testMessageConsumer( equalTo( MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, destinationName), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "publish"), equalTo(MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, messageId), messagingTempDestination(isTemporary))); @@ -190,7 +191,8 @@ void testMessageConsumer( equalTo( MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, destinationName), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "receive"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "receive"), equalTo(MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, messageId), messagingTempDestination(isTemporary)))); } @@ -238,7 +240,8 @@ void testMessageListener( equalTo( MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, destinationName), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "publish"), equalTo(MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, messageId), messagingTempDestination(isTemporary)), span -> @@ -250,7 +253,8 @@ void testMessageListener( equalTo( MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, destinationName), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "process"), equalTo(MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, messageId), messagingTempDestination(isTemporary)), span -> span.hasName("consumer").hasParent(trace.getSpan(2)))); diff --git a/instrumentation/jms/jms-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jms/v1_1/AbstractJms1Test.java b/instrumentation/jms/jms-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jms/v1_1/AbstractJms1Test.java index 76aba2ac0414..fcd6d7ee508d 100644 --- a/instrumentation/jms/jms-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jms/v1_1/AbstractJms1Test.java +++ b/instrumentation/jms/jms-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jms/v1_1/AbstractJms1Test.java @@ -131,7 +131,8 @@ void testMessageListener( equalTo( MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, destinationName), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "publish"), equalTo(MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, messageId), messagingTempDestination(isTemporary)), span -> @@ -143,7 +144,8 @@ void testMessageListener( equalTo( MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, destinationName), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "process"), equalTo(MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, messageId), messagingTempDestination(isTemporary)), span -> span.hasName("consumer").hasParent(trace.getSpan(2)))); @@ -214,7 +216,8 @@ void shouldCaptureMessageHeaders( equalTo( MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, destinationName), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "publish"), equalTo(MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, messageId), messagingTempDestination(isTemporary), equalTo( @@ -232,7 +235,8 @@ void shouldCaptureMessageHeaders( equalTo( MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, destinationName), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "process"), equalTo(MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, messageId), messagingTempDestination(isTemporary), equalTo( @@ -288,7 +292,8 @@ void shouldFailWhenSendingReadOnlyMessage( equalTo( MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, destinationName), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "publish"), equalTo(MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, messageId), messagingTempDestination(isTemporary))), trace -> @@ -303,7 +308,8 @@ void shouldFailWhenSendingReadOnlyMessage( equalTo( MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, destinationName), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "receive"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "receive"), equalTo(MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, messageId), messagingTempDestination(isTemporary)))); } diff --git a/instrumentation/jms/jms-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jms/v1_1/Jms1InstrumentationTest.java b/instrumentation/jms/jms-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jms/v1_1/Jms1InstrumentationTest.java index dc21edad5f6d..4b1ee2554b79 100644 --- a/instrumentation/jms/jms-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jms/v1_1/Jms1InstrumentationTest.java +++ b/instrumentation/jms/jms-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jms/v1_1/Jms1InstrumentationTest.java @@ -64,7 +64,8 @@ void testMessageConsumer( equalTo( MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, destinationName), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "publish"), equalTo(MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, messageId), messagingTempDestination(isTemporary))); @@ -83,7 +84,8 @@ void testMessageConsumer( equalTo( MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, destinationName), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "receive"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "receive"), equalTo(MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, messageId), messagingTempDestination(isTemporary)))); } diff --git a/instrumentation/jms/jms-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jms/v1_1/Jms1SuppressReceiveSpansTest.java b/instrumentation/jms/jms-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jms/v1_1/Jms1SuppressReceiveSpansTest.java index 261f2c3e87f9..baf10f07f391 100644 --- a/instrumentation/jms/jms-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jms/v1_1/Jms1SuppressReceiveSpansTest.java +++ b/instrumentation/jms/jms-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jms/v1_1/Jms1SuppressReceiveSpansTest.java @@ -60,7 +60,8 @@ void testMessageConsumer( equalTo( MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, destinationName), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "publish"), equalTo(MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, messageId), messagingTempDestination(isTemporary)), span -> @@ -73,7 +74,8 @@ void testMessageConsumer( equalTo( MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, destinationName), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "receive"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "receive"), equalTo(MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, messageId), messagingTempDestination(isTemporary))), trace -> diff --git a/instrumentation/jms/jms-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jms/v3_0/AbstractJms3Test.java b/instrumentation/jms/jms-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jms/v3_0/AbstractJms3Test.java index 0e90b1164c3b..5e9014ffd038 100644 --- a/instrumentation/jms/jms-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jms/v3_0/AbstractJms3Test.java +++ b/instrumentation/jms/jms-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jms/v3_0/AbstractJms3Test.java @@ -147,7 +147,8 @@ void testMessageListener(DestinationFactory destinationFactory, boolean isTempor equalTo( MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, producerDestinationName), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "publish"), equalTo(MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, messageId), messagingTempDestination(isTemporary)), span -> @@ -159,7 +160,8 @@ void testMessageListener(DestinationFactory destinationFactory, boolean isTempor equalTo( MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, actualDestinationName), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "process"), equalTo(MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, messageId)), span -> span.hasName("consumer").hasParent(trace.getSpan(2)))); } @@ -231,7 +233,8 @@ void shouldCaptureMessageHeaders(DestinationFactory destinationFactory, boolean equalTo( MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, producerDestinationName), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "publish"), equalTo(MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, messageId), messagingTempDestination(isTemporary), equalTo( @@ -249,7 +252,8 @@ void shouldCaptureMessageHeaders(DestinationFactory destinationFactory, boolean equalTo( MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, actualDestinationName), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "process"), equalTo(MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, messageId), equalTo( stringArrayKey("messaging.header.test_message_header"), diff --git a/instrumentation/jms/jms-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jms/v3_0/Jms3InstrumentationTest.java b/instrumentation/jms/jms-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jms/v3_0/Jms3InstrumentationTest.java index b5f8b1f3cd58..f88c28e97c3f 100644 --- a/instrumentation/jms/jms-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jms/v3_0/Jms3InstrumentationTest.java +++ b/instrumentation/jms/jms-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jms/v3_0/Jms3InstrumentationTest.java @@ -67,7 +67,8 @@ void testMessageConsumer(DestinationFactory destinationFactory, boolean isTempor equalTo( MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, producerDestinationName), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "publish"), equalTo(MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, messageId), messagingTempDestination(isTemporary))); @@ -86,7 +87,8 @@ void testMessageConsumer(DestinationFactory destinationFactory, boolean isTempor equalTo( MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, actualDestinationName), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "receive"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "receive"), equalTo( MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, messageId)))); } diff --git a/instrumentation/jms/jms-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jms/v3_0/Jms3SuppressReceiveSpansTest.java b/instrumentation/jms/jms-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jms/v3_0/Jms3SuppressReceiveSpansTest.java index 3789a29acf34..3e47d2df00e1 100644 --- a/instrumentation/jms/jms-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jms/v3_0/Jms3SuppressReceiveSpansTest.java +++ b/instrumentation/jms/jms-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jms/v3_0/Jms3SuppressReceiveSpansTest.java @@ -63,7 +63,8 @@ void testMessageConsumer(DestinationFactory destinationFactory, boolean isTempor equalTo( MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, producerDestinationName), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "publish"), equalTo(MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, messageId), messagingTempDestination(isTemporary)), span -> @@ -76,7 +77,8 @@ void testMessageConsumer(DestinationFactory destinationFactory, boolean isTempor equalTo( MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, actualDestinationName), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "receive"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "receive"), equalTo( MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, messageId))), trace -> diff --git a/instrumentation/kafka/kafka-clients/kafka-clients-0.11/testing/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaClientBaseTest.java b/instrumentation/kafka/kafka-clients/kafka-clients-0.11/testing/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaClientBaseTest.java index 582d68c70a4e..a81c317f279a 100644 --- a/instrumentation/kafka/kafka-clients/kafka-clients-0.11/testing/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaClientBaseTest.java +++ b/instrumentation/kafka/kafka-clients/kafka-clients-0.11/testing/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaClientBaseTest.java @@ -160,7 +160,7 @@ protected static List sendAttributes( Arrays.asList( equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "kafka"), equalTo(MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, SHARED_TOPIC), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "publish"), satisfies( MessagingIncubatingAttributes.MESSAGING_CLIENT_ID, stringAssert -> stringAssert.startsWith("producer")), @@ -193,7 +193,7 @@ protected static List receiveAttributes(boolean testHeaders) Arrays.asList( equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "kafka"), equalTo(MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, SHARED_TOPIC), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "receive"), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "receive"), satisfies( MessagingIncubatingAttributes.MESSAGING_CLIENT_ID, stringAssert -> stringAssert.startsWith("consumer")), @@ -220,7 +220,7 @@ protected static List processAttributes( Arrays.asList( equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "kafka"), equalTo(MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, SHARED_TOPIC), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "process"), satisfies( MessagingIncubatingAttributes.MESSAGING_CLIENT_ID, stringAssert -> stringAssert.startsWith("consumer")), diff --git a/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/test/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/InterceptorsSuppressReceiveSpansTest.java b/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/test/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/InterceptorsSuppressReceiveSpansTest.java index 8d70c340f60a..37248598a51e 100644 --- a/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/test/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/InterceptorsSuppressReceiveSpansTest.java +++ b/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/test/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/InterceptorsSuppressReceiveSpansTest.java @@ -31,7 +31,8 @@ void assertTraces() { equalTo( MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, SHARED_TOPIC), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "publish"), satisfies( MessagingIncubatingAttributes.MESSAGING_CLIENT_ID, stringAssert -> stringAssert.startsWith("producer"))), @@ -44,7 +45,8 @@ void assertTraces() { equalTo( MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, SHARED_TOPIC), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "process"), equalTo( MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE, greeting.getBytes(StandardCharsets.UTF_8).length), diff --git a/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/test/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/InterceptorsTest.java b/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/test/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/InterceptorsTest.java index 35e723247b44..47e95bca624f 100644 --- a/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/test/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/InterceptorsTest.java +++ b/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/test/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/InterceptorsTest.java @@ -38,7 +38,8 @@ void assertTraces() { equalTo( MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, SHARED_TOPIC), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "publish"), satisfies( MessagingIncubatingAttributes.MESSAGING_CLIENT_ID, stringAssert -> stringAssert.startsWith("producer")))); @@ -62,7 +63,8 @@ void assertTraces() { equalTo( MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, SHARED_TOPIC), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "receive"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "receive"), equalTo( MessagingIncubatingAttributes.MESSAGING_KAFKA_CONSUMER_GROUP, "test"), @@ -81,7 +83,8 @@ void assertTraces() { equalTo( MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, SHARED_TOPIC), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "process"), equalTo( MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE, greeting.getBytes(StandardCharsets.UTF_8).length), diff --git a/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/test/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/WrapperSuppressReceiveSpansTest.java b/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/test/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/WrapperSuppressReceiveSpansTest.java index 04c1babf5b60..8ed701e63bb6 100644 --- a/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/test/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/WrapperSuppressReceiveSpansTest.java +++ b/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/test/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/WrapperSuppressReceiveSpansTest.java @@ -59,7 +59,7 @@ protected static List sendAttributes(boolean testHeaders) { Arrays.asList( equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "kafka"), equalTo(MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, SHARED_TOPIC), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "publish"), satisfies( MessagingIncubatingAttributes.MESSAGING_CLIENT_ID, stringAssert -> stringAssert.startsWith("producer")), @@ -84,7 +84,7 @@ private static List processAttributes(String greeting, boole Arrays.asList( equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "kafka"), equalTo(MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, SHARED_TOPIC), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "process"), equalTo( MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE, greeting.getBytes(StandardCharsets.UTF_8).length), diff --git a/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/test/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/WrapperTest.java b/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/test/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/WrapperTest.java index aaa6730f1dd6..83571ca31131 100644 --- a/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/test/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/WrapperTest.java +++ b/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/test/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/WrapperTest.java @@ -81,7 +81,7 @@ protected static List sendAttributes(boolean testHeaders) { Arrays.asList( equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "kafka"), equalTo(MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, SHARED_TOPIC), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "publish"), satisfies( MessagingIncubatingAttributes.MESSAGING_CLIENT_ID, stringAssert -> stringAssert.startsWith("producer")), @@ -106,7 +106,7 @@ private static List processAttributes(String greeting, boole Arrays.asList( equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "kafka"), equalTo(MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, SHARED_TOPIC), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "process"), equalTo( MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE, greeting.getBytes(StandardCharsets.UTF_8).length), @@ -138,7 +138,7 @@ protected static List receiveAttributes(boolean testHeaders) Arrays.asList( equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "kafka"), equalTo(MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, SHARED_TOPIC), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "receive"), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "receive"), equalTo(MessagingIncubatingAttributes.MESSAGING_KAFKA_CONSUMER_GROUP, "test"), satisfies( MessagingIncubatingAttributes.MESSAGING_CLIENT_ID, diff --git a/instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsDefaultTest.groovy b/instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsDefaultTest.groovy index d50f9e950dba..e26442d53cfa 100644 --- a/instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsDefaultTest.groovy +++ b/instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsDefaultTest.groovy @@ -99,7 +99,7 @@ class KafkaStreamsDefaultTest extends KafkaStreamsBaseTest { attributes { "$MessagingIncubatingAttributes.MESSAGING_SYSTEM" "kafka" "$MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME" STREAM_PENDING - "$MessagingIncubatingAttributes.MESSAGING_OPERATION" "publish" + "$MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE" "publish" "$MessagingIncubatingAttributes.MESSAGING_CLIENT_ID" { it.startsWith("producer") } "$MessagingIncubatingAttributes.MESSAGING_DESTINATION_PARTITION_ID" String "$MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET" 0 @@ -118,7 +118,7 @@ class KafkaStreamsDefaultTest extends KafkaStreamsBaseTest { attributes { "$MessagingIncubatingAttributes.MESSAGING_SYSTEM" "kafka" "$MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME" STREAM_PENDING - "$MessagingIncubatingAttributes.MESSAGING_OPERATION" "receive" + "$MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE" "receive" "$MessagingIncubatingAttributes.MESSAGING_CLIENT_ID" { it.endsWith("consumer") } "$MessagingIncubatingAttributes.MESSAGING_BATCH_MESSAGE_COUNT" 1 if (Boolean.getBoolean("testLatestDeps")) { @@ -135,7 +135,7 @@ class KafkaStreamsDefaultTest extends KafkaStreamsBaseTest { attributes { "$MessagingIncubatingAttributes.MESSAGING_SYSTEM" "kafka" "$MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME" STREAM_PENDING - "$MessagingIncubatingAttributes.MESSAGING_OPERATION" "process" + "$MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE" "process" "$MessagingIncubatingAttributes.MESSAGING_CLIENT_ID" { it.endsWith("consumer") } "$MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE" Long "$MessagingIncubatingAttributes.MESSAGING_DESTINATION_PARTITION_ID" String @@ -156,7 +156,7 @@ class KafkaStreamsDefaultTest extends KafkaStreamsBaseTest { attributes { "$MessagingIncubatingAttributes.MESSAGING_SYSTEM" "kafka" "$MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME" STREAM_PROCESSED - "$MessagingIncubatingAttributes.MESSAGING_OPERATION" "publish" + "$MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE" "publish" "$MessagingIncubatingAttributes.MESSAGING_CLIENT_ID" { it.endsWith("producer") } "$MessagingIncubatingAttributes.MESSAGING_DESTINATION_PARTITION_ID" String "$MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET" 0 @@ -174,7 +174,7 @@ class KafkaStreamsDefaultTest extends KafkaStreamsBaseTest { attributes { "$MessagingIncubatingAttributes.MESSAGING_SYSTEM" "kafka" "$MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME" STREAM_PROCESSED - "$MessagingIncubatingAttributes.MESSAGING_OPERATION" "receive" + "$MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE" "receive" "$MessagingIncubatingAttributes.MESSAGING_CLIENT_ID" { it.startsWith("consumer") } "$MessagingIncubatingAttributes.MESSAGING_BATCH_MESSAGE_COUNT" 1 if (Boolean.getBoolean("testLatestDeps")) { @@ -191,7 +191,7 @@ class KafkaStreamsDefaultTest extends KafkaStreamsBaseTest { attributes { "$MessagingIncubatingAttributes.MESSAGING_SYSTEM" "kafka" "$MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME" STREAM_PROCESSED - "$MessagingIncubatingAttributes.MESSAGING_OPERATION" "process" + "$MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE" "process" "$MessagingIncubatingAttributes.MESSAGING_CLIENT_ID" { it.startsWith("consumer") } "$MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE" Long "$MessagingIncubatingAttributes.MESSAGING_DESTINATION_PARTITION_ID" String diff --git a/instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsSuppressReceiveSpansTest.groovy b/instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsSuppressReceiveSpansTest.groovy index 386e09b56efb..1fd5d5a60977 100644 --- a/instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsSuppressReceiveSpansTest.groovy +++ b/instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsSuppressReceiveSpansTest.groovy @@ -94,7 +94,7 @@ class KafkaStreamsSuppressReceiveSpansTest extends KafkaStreamsBaseTest { attributes { "$MessagingIncubatingAttributes.MESSAGING_SYSTEM" "kafka" "$MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME" STREAM_PENDING - "$MessagingIncubatingAttributes.MESSAGING_OPERATION" "publish" + "$MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE" "publish" "$MessagingIncubatingAttributes.MESSAGING_CLIENT_ID" "producer-1" "$MessagingIncubatingAttributes.MESSAGING_DESTINATION_PARTITION_ID" String "$MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET" 0 @@ -109,7 +109,7 @@ class KafkaStreamsSuppressReceiveSpansTest extends KafkaStreamsBaseTest { attributes { "$MessagingIncubatingAttributes.MESSAGING_SYSTEM" "kafka" "$MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME" STREAM_PENDING - "$MessagingIncubatingAttributes.MESSAGING_OPERATION" "process" + "$MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE" "process" "$MessagingIncubatingAttributes.MESSAGING_CLIENT_ID" { it.endsWith("consumer") } "$MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE" Long "$MessagingIncubatingAttributes.MESSAGING_DESTINATION_PARTITION_ID" String @@ -133,7 +133,7 @@ class KafkaStreamsSuppressReceiveSpansTest extends KafkaStreamsBaseTest { attributes { "$MessagingIncubatingAttributes.MESSAGING_SYSTEM" "kafka" "$MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME" STREAM_PROCESSED - "$MessagingIncubatingAttributes.MESSAGING_OPERATION" "publish" + "$MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE" "publish" "$MessagingIncubatingAttributes.MESSAGING_CLIENT_ID" String "$MessagingIncubatingAttributes.MESSAGING_DESTINATION_PARTITION_ID" String "$MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET" 0 @@ -147,7 +147,7 @@ class KafkaStreamsSuppressReceiveSpansTest extends KafkaStreamsBaseTest { attributes { "$MessagingIncubatingAttributes.MESSAGING_SYSTEM" "kafka" "$MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME" STREAM_PROCESSED - "$MessagingIncubatingAttributes.MESSAGING_OPERATION" "process" + "$MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE" "process" "$MessagingIncubatingAttributes.MESSAGING_CLIENT_ID" { it.startsWith("consumer") } "$MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE" Long "$MessagingIncubatingAttributes.MESSAGING_DESTINATION_PARTITION_ID" String diff --git a/instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceConnectAttributesExtractor.java b/instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceConnectAttributesExtractor.java index 7609edbc402c..cc70d546d9fe 100644 --- a/instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceConnectAttributesExtractor.java +++ b/instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceConnectAttributesExtractor.java @@ -20,7 +20,7 @@ public void onStart(AttributesBuilder attributes, Context parentContext, RedisUR int database = redisUri.getDatabase(); if (database != 0) { - attributes.put(DbIncubatingAttributes.DB_REDIS_DATABASE_INDEX, (long) database); + attributes.put(DbIncubatingAttributes.DB_NAMESPACE, String.valueOf(database)); } } diff --git a/instrumentation/lettuce/lettuce-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceAsyncClientTest.java b/instrumentation/lettuce/lettuce-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceAsyncClientTest.java index 74bc895b59a9..86838b0484f9 100644 --- a/instrumentation/lettuce/lettuce-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceAsyncClientTest.java +++ b/instrumentation/lettuce/lettuce-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceAsyncClientTest.java @@ -191,7 +191,7 @@ void testSetCommandUsingFutureGetWithTimeout() .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "SET")))); + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "SET")))); } @Test @@ -221,7 +221,7 @@ void testCommandChainedWithThenAccept() { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "GET")), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "GET")), span -> span.hasName("callback") .hasKind(SpanKind.INTERNAL) @@ -283,7 +283,7 @@ void getNonExistentKeyCommandWithHandleAsyncAndChainedWithThenApply() { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "GET")), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "GET")), span -> span.hasName("callback1") .hasKind(SpanKind.INTERNAL) @@ -324,7 +324,7 @@ void testCommandWithNoArgumentsUsingBiconsumer() { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "RANDOMKEY")), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "RANDOMKEY")), span -> span.hasName("callback") .hasKind(SpanKind.INTERNAL) @@ -368,7 +368,7 @@ void testHashSetAndThenNestApplyToHashGetall() { .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "HMSET"))), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "HMSET"))), trace -> trace.hasSpansSatisfyingExactly( span -> @@ -376,7 +376,7 @@ void testHashSetAndThenNestApplyToHashGetall() { .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "HGETALL")))); + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "HGETALL")))); } @Test @@ -418,7 +418,7 @@ void testCommandCompletesExceptionally() { .hasException(new IllegalStateException("TestException")) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "DEL")))); + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "DEL")))); } @Test @@ -455,7 +455,7 @@ void testCommandBeforeItFinished() { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "SADD"), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "SADD"), equalTo(booleanKey("lettuce.command.cancelled"), true)), span -> span.hasName("callback") @@ -492,7 +492,7 @@ void testDebugSegfaultCommandWithNoArgumentShouldProduceSpan() { .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "DEBUG")))); + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "DEBUG")))); } @Test @@ -526,6 +526,6 @@ void testShutdownCommandShouldProduceSpan() { .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "SHUTDOWN")))); + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "SHUTDOWN")))); } } diff --git a/instrumentation/lettuce/lettuce-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceSyncClientTest.java b/instrumentation/lettuce/lettuce-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceSyncClientTest.java index 49fa0ba716ee..b23951ff23aa 100644 --- a/instrumentation/lettuce/lettuce-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceSyncClientTest.java +++ b/instrumentation/lettuce/lettuce-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceSyncClientTest.java @@ -161,7 +161,7 @@ void testSetCommand() { .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "SET")))); + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "SET")))); } @Test @@ -177,7 +177,7 @@ void testGetCommand() { .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "GET")))); + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "GET")))); } @Test @@ -193,7 +193,7 @@ void testGetNonExistentKeyCommand() { .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "GET")))); + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "GET")))); } @Test @@ -209,7 +209,7 @@ void testCommandWithNoArguments() { .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "RANDOMKEY")))); + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "RANDOMKEY")))); } @Test @@ -225,7 +225,7 @@ void testListCommand() { .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "LPUSH")))); + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "LPUSH")))); } @Test @@ -241,7 +241,7 @@ void testHashSetCommand() { .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "HMSET")))); + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "HMSET")))); } @Test @@ -257,7 +257,7 @@ void testHashGetallCommand() { .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "HGETALL")))); + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "HGETALL")))); } @Test @@ -289,7 +289,7 @@ void testDebugSegfaultCommandWithNoArgumentShouldProduceSpan() { .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "DEBUG")))); + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "DEBUG")))); } @Test @@ -323,6 +323,6 @@ void testShutdownCommandShouldProduceSpan() { .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "SHUTDOWN")))); + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "SHUTDOWN")))); } } diff --git a/instrumentation/lettuce/lettuce-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceConnectAttributesExtractor.java b/instrumentation/lettuce/lettuce-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceConnectAttributesExtractor.java index 142e7b15abb6..becb1f7cb528 100644 --- a/instrumentation/lettuce/lettuce-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceConnectAttributesExtractor.java +++ b/instrumentation/lettuce/lettuce-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceConnectAttributesExtractor.java @@ -20,7 +20,7 @@ public void onStart(AttributesBuilder attributes, Context parentContext, RedisUR int database = redisUri.getDatabase(); if (database != 0) { - attributes.put(DbIncubatingAttributes.DB_REDIS_DATABASE_INDEX, (long) database); + attributes.put(DbIncubatingAttributes.DB_NAMESPACE, String.valueOf(database)); } } diff --git a/instrumentation/lettuce/lettuce-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceAsyncClientTest.java b/instrumentation/lettuce/lettuce-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceAsyncClientTest.java index 408f2ba72d91..2477142a2582 100644 --- a/instrumentation/lettuce/lettuce-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceAsyncClientTest.java +++ b/instrumentation/lettuce/lettuce-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceAsyncClientTest.java @@ -185,8 +185,8 @@ void testSetCommandUsingFutureGetWithTimeout() .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "SET TESTSETKEY ?"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "SET")))); + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "SET TESTSETKEY ?"), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "SET")))); } @Test @@ -217,8 +217,8 @@ void testGetCommandChainedWithThenAccept() .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "GET TESTKEY"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "GET")), + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "GET TESTKEY"), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "GET")), span -> span.hasName("callback") .hasKind(SpanKind.INTERNAL) @@ -274,8 +274,8 @@ void testGetNonExistentKeyCommandWithHandleAsyncAndChainedWithThenApply() .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "GET NON_EXISTENT_KEY"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "GET")), + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "GET NON_EXISTENT_KEY"), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "GET")), span -> span.hasName("callback1") .hasKind(SpanKind.INTERNAL) @@ -317,8 +317,8 @@ void testCommandWithNoArgumentsUsingBiconsumer() .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "RANDOMKEY"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "RANDOMKEY")), + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "RANDOMKEY"), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "RANDOMKEY")), span -> span.hasName("callback") .hasKind(SpanKind.INTERNAL) @@ -364,9 +364,9 @@ void testHashSetAndThenNestApplyToHashGetall() .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), equalTo( - DbIncubatingAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_QUERY_TEXT, "HMSET TESTHM firstname ? lastname ? age ?"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "HMSET"))), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "HMSET"))), trace -> trace.hasSpansSatisfyingExactly( span -> @@ -374,8 +374,8 @@ void testHashSetAndThenNestApplyToHashGetall() .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "HGETALL TESTHM"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "HGETALL")))); + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "HGETALL TESTHM"), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "HGETALL")))); } @Test @@ -417,8 +417,8 @@ void testCommandCompletesExceptionally() { .hasException(new IllegalStateException("TestException")) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "DEL key1 key2"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "DEL")))); + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "DEL key1 key2"), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "DEL")))); } @Test @@ -455,8 +455,8 @@ void testCancelCommandBeforeItFinishes() { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "SADD SKEY ? ?"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "SADD"), + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "SADD SKEY ? ?"), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "SADD"), equalTo(booleanKey("lettuce.command.cancelled"), true)), span -> span.hasName("callback") @@ -480,8 +480,8 @@ void testDebugSegfaultCommandWithNoArgumentShouldProduceSpan() { .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "DEBUG SEGFAULT"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "DEBUG")))); + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "DEBUG SEGFAULT"), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "DEBUG")))); } @Test @@ -500,7 +500,7 @@ void testShutdownCommandShouldProduceSpan() { .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "SHUTDOWN NOSAVE"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "SHUTDOWN")))); + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "SHUTDOWN NOSAVE"), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "SHUTDOWN")))); } } diff --git a/instrumentation/lettuce/lettuce-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceReactiveClientTest.java b/instrumentation/lettuce/lettuce-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceReactiveClientTest.java index feb5f7ead45c..1d26ce38e824 100644 --- a/instrumentation/lettuce/lettuce-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceReactiveClientTest.java +++ b/instrumentation/lettuce/lettuce-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceReactiveClientTest.java @@ -92,8 +92,8 @@ void testSetCommandWithSubscribeOnDefinedConsumer() .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "SET TESTSETKEY ?"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "SET")), + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "SET TESTSETKEY ?"), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "SET")), span -> span.hasName("callback") .hasKind(SpanKind.INTERNAL) @@ -123,8 +123,8 @@ void testGetCommandWithLambdaFunction() .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "GET TESTKEY"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "GET")))); + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "GET TESTKEY"), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "GET")))); } // to make sure instrumentation's chained completion stages won't interfere with user's, while @@ -162,8 +162,8 @@ void testGetNonExistentKeyCommand() .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "GET NON_EXISTENT_KEY"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "GET")), + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "GET NON_EXISTENT_KEY"), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "GET")), span -> span.hasName("callback") .hasKind(SpanKind.INTERNAL) @@ -192,8 +192,8 @@ void testCommandWithNoArguments() .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "RANDOMKEY"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "RANDOMKEY")))); + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "RANDOMKEY"), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "RANDOMKEY")))); } @Test @@ -208,8 +208,8 @@ void testCommandFluxPublisher() { .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "COMMAND"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "COMMAND"), + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "COMMAND"), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "COMMAND"), satisfies( AttributeKey.longKey("lettuce.command.results.count"), val -> val.isGreaterThan(100))))); @@ -227,8 +227,8 @@ void testCommandCancelAfter2OnFluxPublisher() { .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "COMMAND"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "COMMAND"), + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "COMMAND"), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "COMMAND"), satisfies( AttributeKey.booleanKey("lettuce.command.cancelled"), AbstractBooleanAssert::isTrue), @@ -261,8 +261,8 @@ void testDebugSegfaultCommandReturnsMonoVoidWithNoArgumentShouldProduceSpan() { .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "DEBUG SEGFAULT"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "DEBUG")))); + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "DEBUG SEGFAULT"), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "DEBUG")))); } @Test @@ -281,8 +281,8 @@ void testShutdownCommandShouldProduceSpan() { .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "SHUTDOWN NOSAVE"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "SHUTDOWN")))); + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "SHUTDOWN NOSAVE"), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "SHUTDOWN")))); } @Test @@ -301,16 +301,16 @@ void testBlockingSubscriber() { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "SET a ?"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "SET")), + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "SET a ?"), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "SET")), span -> span.hasName("GET") .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "GET a"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "GET")))); + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "GET a"), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "GET")))); } @Test @@ -329,16 +329,16 @@ void testAsyncSubscriber() { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "SET a ?"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "SET")), + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "SET a ?"), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "SET")), span -> span.hasName("GET") .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "GET a"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "GET")))); + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "GET a"), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "GET")))); } @Test @@ -362,15 +362,15 @@ void testAsyncSubscriberWithSpecificThreadPool() { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "SET a ?"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "SET")), + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "SET a ?"), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "SET")), span -> span.hasName("GET") .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "GET a"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "GET")))); + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "GET a"), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "GET")))); } } diff --git a/instrumentation/lettuce/lettuce-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceSyncClientTest.java b/instrumentation/lettuce/lettuce-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceSyncClientTest.java index 7828a3c5ef8e..e2a447f7ee33 100644 --- a/instrumentation/lettuce/lettuce-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceSyncClientTest.java +++ b/instrumentation/lettuce/lettuce-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceSyncClientTest.java @@ -148,8 +148,8 @@ void testSetCommand() { .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "SET TESTSETKEY ?"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "SET")))); + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "SET TESTSETKEY ?"), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "SET")))); } @Test @@ -165,8 +165,8 @@ void testGetCommand() { .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "GET TESTKEY"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "GET")))); + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "GET TESTKEY"), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "GET")))); } @Test @@ -182,8 +182,8 @@ void testGetNonExistentKeyCommand() { .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "GET NON_EXISTENT_KEY"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "GET")))); + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "GET NON_EXISTENT_KEY"), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "GET")))); } @Test @@ -199,8 +199,8 @@ void testCommandWithNoArguments() { .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "RANDOMKEY"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "RANDOMKEY")))); + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "RANDOMKEY"), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "RANDOMKEY")))); } @Test @@ -216,8 +216,8 @@ void testListCommand() { .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "LPUSH TESTLIST ?"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "LPUSH")))); + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "LPUSH TESTLIST ?"), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "LPUSH")))); } @Test @@ -234,9 +234,9 @@ void testHashSetCommand() { .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), equalTo( - DbIncubatingAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_QUERY_TEXT, "HMSET user firstname ? lastname ? age ?"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "HMSET")))); + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "HMSET")))); } @Test @@ -252,8 +252,8 @@ void testHashGetallCommand() { .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "HGETALL TESTHM"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "HGETALL")))); + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "HGETALL TESTHM"), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "HGETALL")))); } @Test @@ -272,8 +272,8 @@ void testDebugSegfaultCommandWithNoArgumentShouldProduceSpan() { .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "DEBUG SEGFAULT"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "DEBUG")))); + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "DEBUG SEGFAULT"), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "DEBUG")))); } @Test @@ -292,7 +292,7 @@ void testShutdownCommandShouldProduceSpan() { .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "SHUTDOWN NOSAVE"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "SHUTDOWN")))); + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "SHUTDOWN NOSAVE"), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "SHUTDOWN")))); } } diff --git a/instrumentation/lettuce/lettuce-5.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_1/LettuceReactiveClientTest.java b/instrumentation/lettuce/lettuce-5.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_1/LettuceReactiveClientTest.java index 2121d2500510..242bdce460f4 100644 --- a/instrumentation/lettuce/lettuce-5.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_1/LettuceReactiveClientTest.java +++ b/instrumentation/lettuce/lettuce-5.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_1/LettuceReactiveClientTest.java @@ -58,7 +58,7 @@ void testAsyncSubscriberWithSpecificThreadPool() { equalTo(ServerAttributes.SERVER_ADDRESS, host), equalTo(ServerAttributes.SERVER_PORT, port), equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "SET a ?")) + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "SET a ?")) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), event -> event.hasName("redis.encode.end")), @@ -73,7 +73,7 @@ void testAsyncSubscriberWithSpecificThreadPool() { equalTo(ServerAttributes.SERVER_ADDRESS, host), equalTo(ServerAttributes.SERVER_PORT, port), equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "GET a")) + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "GET a")) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), event -> event.hasName("redis.encode.end")))); diff --git a/instrumentation/lettuce/lettuce-5.1/library/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/OpenTelemetryTracing.java b/instrumentation/lettuce/lettuce-5.1/library/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/OpenTelemetryTracing.java index d040634872b6..d2d1f704771b 100644 --- a/instrumentation/lettuce/lettuce-5.1/library/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/OpenTelemetryTracing.java +++ b/instrumentation/lettuce/lettuce-5.1/library/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/OpenTelemetryTracing.java @@ -40,7 +40,7 @@ final class OpenTelemetryTracing implements Tracing { // copied from DbIncubatingAttributes private static final AttributeKey DB_SYSTEM = AttributeKey.stringKey("db.system"); - private static final AttributeKey DB_STATEMENT = AttributeKey.stringKey("db.statement"); + private static final AttributeKey DB_QUERY_TEXT = AttributeKey.stringKey("db.query.text"); // copied from DbIncubatingAttributes.DbSystemValues private static final String REDIS = "redis"; @@ -338,7 +338,7 @@ private void finish(Span span) { if (name != null) { String statement = sanitizer.sanitize(name, argsList != null ? argsList : splitArgs(argsString)); - span.setAttribute(DB_STATEMENT, statement); + span.setAttribute(DB_QUERY_TEXT, statement); } span.end(); } diff --git a/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceAsyncClientTest.java b/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceAsyncClientTest.java index 7aecb49b892b..1039144eee30 100644 --- a/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceAsyncClientTest.java +++ b/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceAsyncClientTest.java @@ -152,7 +152,7 @@ void testSetCommandUsingFutureGetWithTimeout() throws Exception { equalTo(ServerAttributes.SERVER_ADDRESS, host), equalTo(ServerAttributes.SERVER_PORT, port), equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "SET TESTSETKEY ?")) + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "SET TESTSETKEY ?")) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), event -> event.hasName("redis.encode.end")))); @@ -198,7 +198,7 @@ void testGetCommandChainedWithThenAccept() throws Exception { equalTo(ServerAttributes.SERVER_ADDRESS, host), equalTo(ServerAttributes.SERVER_PORT, port), equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "GET TESTKEY")) + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "GET TESTKEY")) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), event -> event.hasName("redis.encode.end")))); @@ -277,7 +277,7 @@ void testGetNonExistentKeyCommandWithHandleAsyncAndChainedWithThenApply() throws equalTo(ServerAttributes.SERVER_PORT, port), equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), equalTo( - DbIncubatingAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_QUERY_TEXT, "GET NON_EXISTENT_KEY")) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), @@ -343,7 +343,7 @@ void testCommandWithNoArgumentsUsingBiconsumer() throws Exception { equalTo(ServerAttributes.SERVER_ADDRESS, host), equalTo(ServerAttributes.SERVER_PORT, port), equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "RANDOMKEY")) + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "RANDOMKEY")) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), event -> event.hasName("redis.encode.end")))); @@ -403,7 +403,7 @@ void testHashSetAndThenNestApplyToHashGetall() throws Exception { equalTo(ServerAttributes.SERVER_PORT, port), equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), equalTo( - DbIncubatingAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_QUERY_TEXT, "HMSET TESTHM firstname ? lastname ? age ?")) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), @@ -420,7 +420,7 @@ void testHashSetAndThenNestApplyToHashGetall() throws Exception { equalTo(ServerAttributes.SERVER_ADDRESS, host), equalTo(ServerAttributes.SERVER_PORT, port), equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "HGETALL TESTHM")) + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "HGETALL TESTHM")) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), event -> event.hasName("redis.encode.end")))); diff --git a/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceReactiveClientTest.java b/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceReactiveClientTest.java index a2e157952953..b9a62232e30b 100644 --- a/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceReactiveClientTest.java +++ b/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceReactiveClientTest.java @@ -99,7 +99,7 @@ void testSetCommandWithSubscribeOnDefinedConsumer() throws Exception { equalTo(ServerAttributes.SERVER_ADDRESS, host), equalTo(ServerAttributes.SERVER_PORT, port), equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "SET TESTSETKEY ?")) + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "SET TESTSETKEY ?")) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), event -> event.hasName("redis.encode.end")), @@ -137,7 +137,7 @@ void testGetCommandWithLambdaFunction() throws Exception { equalTo(ServerAttributes.SERVER_ADDRESS, host), equalTo(ServerAttributes.SERVER_PORT, port), equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "GET TESTKEY")) + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "GET TESTKEY")) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), event -> event.hasName("redis.encode.end")))); @@ -187,7 +187,7 @@ void testGetNonExistentKeyCommand() throws Exception { equalTo(ServerAttributes.SERVER_PORT, port), equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), equalTo( - DbIncubatingAttributes.DB_STATEMENT, "GET NON_EXISTENT_KEY")) + DbIncubatingAttributes.DB_QUERY_TEXT, "GET NON_EXISTENT_KEY")) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), event -> event.hasName("redis.encode.end")), @@ -224,7 +224,7 @@ void testCommandWithNoArguments() throws Exception { equalTo(ServerAttributes.SERVER_ADDRESS, host), equalTo(ServerAttributes.SERVER_PORT, port), equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "RANDOMKEY")) + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "RANDOMKEY")) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), event -> event.hasName("redis.encode.end")))); @@ -248,7 +248,7 @@ void testCommandFluxPublisher() { equalTo(ServerAttributes.SERVER_ADDRESS, host), equalTo(ServerAttributes.SERVER_PORT, port), equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "COMMAND")) + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "COMMAND")) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), event -> event.hasName("redis.encode.end")))); @@ -293,7 +293,7 @@ void testBlockingSubscriber() { equalTo(ServerAttributes.SERVER_ADDRESS, host), equalTo(ServerAttributes.SERVER_PORT, port), equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "SET a ?")) + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "SET a ?")) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), event -> event.hasName("redis.encode.end")), @@ -308,7 +308,7 @@ void testBlockingSubscriber() { equalTo(ServerAttributes.SERVER_ADDRESS, host), equalTo(ServerAttributes.SERVER_PORT, port), equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "GET a")) + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "GET a")) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), event -> event.hasName("redis.encode.end")))); @@ -337,7 +337,7 @@ void testAsyncSubscriber() { equalTo(ServerAttributes.SERVER_ADDRESS, host), equalTo(ServerAttributes.SERVER_PORT, port), equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "SET a ?")) + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "SET a ?")) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), event -> event.hasName("redis.encode.end")), @@ -352,7 +352,7 @@ void testAsyncSubscriber() { equalTo(ServerAttributes.SERVER_ADDRESS, host), equalTo(ServerAttributes.SERVER_PORT, port), equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "GET a")) + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "GET a")) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), event -> event.hasName("redis.encode.end")))); diff --git a/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceSyncClientAuthTest.java b/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceSyncClientAuthTest.java index a067003b9ae0..b4adf4e29a57 100644 --- a/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceSyncClientAuthTest.java +++ b/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceSyncClientAuthTest.java @@ -73,7 +73,7 @@ void testAuthCommand() throws Exception { equalTo(ServerAttributes.SERVER_ADDRESS, host), equalTo(ServerAttributes.SERVER_PORT, port), equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "AUTH ?")) + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "AUTH ?")) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), event -> event.hasName("redis.encode.end")))); diff --git a/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceSyncClientTest.java b/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceSyncClientTest.java index b9e53ffb83a1..15a644045c87 100644 --- a/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceSyncClientTest.java +++ b/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceSyncClientTest.java @@ -118,7 +118,7 @@ void testSetCommand() { equalTo(ServerAttributes.SERVER_ADDRESS, host), equalTo(ServerAttributes.SERVER_PORT, port), equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "SET TESTSETKEY ?")) + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "SET TESTSETKEY ?")) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), event -> event.hasName("redis.encode.end")))); @@ -143,7 +143,7 @@ void testGetCommand() { equalTo(ServerAttributes.SERVER_ADDRESS, host), equalTo(ServerAttributes.SERVER_PORT, port), equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "GET TESTKEY")) + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "GET TESTKEY")) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), event -> event.hasName("redis.encode.end")))); @@ -169,7 +169,7 @@ void testGetNonExistentKeyCommand() { equalTo(ServerAttributes.SERVER_PORT, port), equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), equalTo( - DbIncubatingAttributes.DB_STATEMENT, "GET NON_EXISTENT_KEY")) + DbIncubatingAttributes.DB_QUERY_TEXT, "GET NON_EXISTENT_KEY")) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), event -> event.hasName("redis.encode.end")))); @@ -194,7 +194,7 @@ void testCommandWithNoArguments() { equalTo(ServerAttributes.SERVER_ADDRESS, host), equalTo(ServerAttributes.SERVER_PORT, port), equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "RANDOMKEY")) + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "RANDOMKEY")) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), event -> event.hasName("redis.encode.end")))); @@ -224,7 +224,7 @@ void testListCommand() { equalTo(ServerAttributes.SERVER_ADDRESS, host), equalTo(ServerAttributes.SERVER_PORT, containerConnection.port), equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "LPUSH TESTLIST ?")) + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "LPUSH TESTLIST ?")) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), event -> event.hasName("redis.encode.end")))); @@ -250,7 +250,7 @@ void testHashSetCommand() { equalTo(ServerAttributes.SERVER_PORT, port), equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), equalTo( - DbIncubatingAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_QUERY_TEXT, "HMSET user firstname ? lastname ? age ?")) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), @@ -276,7 +276,7 @@ void testHashGetallCommand() { equalTo(ServerAttributes.SERVER_ADDRESS, host), equalTo(ServerAttributes.SERVER_PORT, port), equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "HGETALL TESTHM")) + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "HGETALL TESTHM")) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), event -> event.hasName("redis.encode.end")))); @@ -309,7 +309,7 @@ void testEvalCommand() { equalTo(ServerAttributes.SERVER_PORT, port), equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), equalTo( - DbIncubatingAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_QUERY_TEXT, "EVAL " + b64Script + " 1 TESTLIST ? ?")) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), @@ -336,7 +336,7 @@ void testMsetCommand() { equalTo(ServerAttributes.SERVER_ADDRESS, host), equalTo(ServerAttributes.SERVER_PORT, port), equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "MSET key1 ? key2 ?")) + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "MSET key1 ? key2 ?")) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), event -> event.hasName("redis.encode.end")))); @@ -366,7 +366,7 @@ void testDebugSegfaultCommandWithNoArgumentProducesNoSpan() { equalTo(ServerAttributes.SERVER_ADDRESS, host), equalTo(ServerAttributes.SERVER_PORT, containerConnection.port), equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "DEBUG SEGFAULT"))); + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "DEBUG SEGFAULT"))); } else { trace.hasSpansSatisfyingExactly( span -> @@ -380,7 +380,7 @@ void testDebugSegfaultCommandWithNoArgumentProducesNoSpan() { equalTo(ServerAttributes.SERVER_ADDRESS, host), equalTo(ServerAttributes.SERVER_PORT, containerConnection.port), equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "DEBUG SEGFAULT")) + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "DEBUG SEGFAULT")) // these are no longer recorded since Lettuce 6.1.6 .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), @@ -415,7 +415,7 @@ void testShutdownCommandProducesNoSpan() { equalTo(ServerAttributes.SERVER_ADDRESS, host), equalTo(ServerAttributes.SERVER_PORT, containerConnection.port), equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "SHUTDOWN NOSAVE"))); + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "SHUTDOWN NOSAVE"))); } else { trace.hasSpansSatisfyingExactly( span -> @@ -430,7 +430,7 @@ void testShutdownCommandProducesNoSpan() { equalTo(ServerAttributes.SERVER_ADDRESS, host), equalTo(ServerAttributes.SERVER_PORT, containerConnection.port), equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "SHUTDOWN NOSAVE")) + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "SHUTDOWN NOSAVE")) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), event -> event.hasName("redis.encode.end"))); diff --git a/instrumentation/mongo/mongo-3.1/library/src/main/java/io/opentelemetry/instrumentation/mongo/v3_1/MongoAttributesExtractor.java b/instrumentation/mongo/mongo-3.1/library/src/main/java/io/opentelemetry/instrumentation/mongo/v3_1/MongoAttributesExtractor.java index 6890025d5c8a..dadd705965e9 100644 --- a/instrumentation/mongo/mongo-3.1/library/src/main/java/io/opentelemetry/instrumentation/mongo/v3_1/MongoAttributesExtractor.java +++ b/instrumentation/mongo/mongo-3.1/library/src/main/java/io/opentelemetry/instrumentation/mongo/v3_1/MongoAttributesExtractor.java @@ -19,15 +19,15 @@ class MongoAttributesExtractor implements AttributesExtractor { // copied from DbIncubatingAttributes - private static final AttributeKey DB_MONGODB_COLLECTION = - AttributeKey.stringKey("db.mongodb.collection"); + private static final AttributeKey DB_COLLECTION_NAME = + AttributeKey.stringKey("db.collection.name"); @Override public void onStart( AttributesBuilder attributes, Context parentContext, CommandStartedEvent event) { String collectionName = collectionName(event); if (collectionName != null) { - attributes.put(DB_MONGODB_COLLECTION, collectionName); + attributes.put(DB_COLLECTION_NAME, collectionName); } } diff --git a/instrumentation/mongo/mongo-common/testing/src/main/groovy/io/opentelemetry/instrumentation/mongo/testing/AbstractMongoClientTest.groovy b/instrumentation/mongo/mongo-common/testing/src/main/groovy/io/opentelemetry/instrumentation/mongo/testing/AbstractMongoClientTest.groovy index 3cd9dafc2afe..3e87fcf0d237 100644 --- a/instrumentation/mongo/mongo-common/testing/src/main/groovy/io/opentelemetry/instrumentation/mongo/testing/AbstractMongoClientTest.groovy +++ b/instrumentation/mongo/mongo-common/testing/src/main/groovy/io/opentelemetry/instrumentation/mongo/testing/AbstractMongoClientTest.groovy @@ -418,14 +418,14 @@ abstract class AbstractMongoClientTest extends InstrumentationSpecification { attributes { "$ServerAttributes.SERVER_ADDRESS" host "$ServerAttributes.SERVER_PORT" port - "$DbIncubatingAttributes.DB_STATEMENT" { + "$DbIncubatingAttributes.DB_QUERY_TEXT" { statementEval.call(it.replaceAll(" ", "")) } "$DbIncubatingAttributes.DB_SYSTEM" "mongodb" "$DbIncubatingAttributes.DB_CONNECTION_STRING" "mongodb://localhost:" + port - "$DbIncubatingAttributes.DB_NAME" dbName - "$DbIncubatingAttributes.DB_OPERATION" operation - "$DbIncubatingAttributes.DB_MONGODB_COLLECTION" collection + "$DbIncubatingAttributes.DB_NAMESPACE" dbName + "$DbIncubatingAttributes.DB_OPERATION_NAME" operation + "$DbIncubatingAttributes.DB_COLLECTION_NAME" collection } } } diff --git a/instrumentation/opensearch/opensearch-rest-1.0/javaagent/src/test/java/OpenSearchRestTest.java b/instrumentation/opensearch/opensearch-rest-1.0/javaagent/src/test/java/OpenSearchRestTest.java index cb51f8efb076..082f4005362c 100644 --- a/instrumentation/opensearch/opensearch-rest-1.0/javaagent/src/test/java/OpenSearchRestTest.java +++ b/instrumentation/opensearch/opensearch-rest-1.0/javaagent/src/test/java/OpenSearchRestTest.java @@ -98,8 +98,8 @@ void shouldGetStatusWithTraces() throws IOException { .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "opensearch"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "GET"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "GET _cluster/health")), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "GET"), + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "GET _cluster/health")), span -> span.hasName("GET") .hasKind(SpanKind.CLIENT) @@ -163,8 +163,8 @@ public void onFailure(Exception e) { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "opensearch"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "GET"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "GET _cluster/health")), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "GET"), + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "GET _cluster/health")), span -> span.hasName("GET") .hasKind(SpanKind.CLIENT) diff --git a/instrumentation/pulsar/pulsar-2.8/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/AbstractPulsarClientTest.java b/instrumentation/pulsar/pulsar-2.8/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/AbstractPulsarClientTest.java index 7883d5082c4f..316ff576c7c3 100644 --- a/instrumentation/pulsar/pulsar-2.8/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/AbstractPulsarClientTest.java +++ b/instrumentation/pulsar/pulsar-2.8/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/AbstractPulsarClientTest.java @@ -13,7 +13,7 @@ import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME; import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE; import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID; -import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_OPERATION; +import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE; import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_SYSTEM; import static org.assertj.core.api.Assertions.assertThat; @@ -262,7 +262,7 @@ static List sendAttributes( equalTo(SERVER_ADDRESS, brokerHost), equalTo(SERVER_PORT, brokerPort), equalTo(MESSAGING_DESTINATION_NAME, destination), - equalTo(MESSAGING_OPERATION, "publish"), + equalTo(MESSAGING_OPERATION_TYPE, "publish"), equalTo(MESSAGING_MESSAGE_ID, messageId), satisfies(MESSAGING_MESSAGE_BODY_SIZE, AbstractLongAssert::isNotNegative), equalTo(MESSAGE_TYPE, "normal"))); @@ -295,7 +295,7 @@ static List receiveAttributes( equalTo(SERVER_ADDRESS, brokerHost), equalTo(SERVER_PORT, brokerPort), equalTo(MESSAGING_DESTINATION_NAME, destination), - equalTo(MESSAGING_OPERATION, "receive"), + equalTo(MESSAGING_OPERATION_TYPE, "receive"), equalTo(MESSAGING_MESSAGE_ID, messageId), satisfies(MESSAGING_MESSAGE_BODY_SIZE, AbstractLongAssert::isNotNegative))); if (testHeaders) { @@ -317,7 +317,7 @@ static List processAttributes( Arrays.asList( equalTo(MESSAGING_SYSTEM, "pulsar"), equalTo(MESSAGING_DESTINATION_NAME, destination), - equalTo(MESSAGING_OPERATION, "process"), + equalTo(MESSAGING_OPERATION_TYPE, "process"), equalTo(MESSAGING_MESSAGE_ID, messageId), satisfies(MESSAGING_MESSAGE_BODY_SIZE, AbstractLongAssert::isNotNegative))); if (testHeaders) { diff --git a/instrumentation/r2dbc-1.0/testing/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/AbstractR2dbcStatementTest.java b/instrumentation/r2dbc-1.0/testing/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/AbstractR2dbcStatementTest.java index 465c0e40bef6..6af3290b979c 100644 --- a/instrumentation/r2dbc-1.0/testing/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/AbstractR2dbcStatementTest.java +++ b/instrumentation/r2dbc-1.0/testing/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/AbstractR2dbcStatementTest.java @@ -8,13 +8,12 @@ import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS; import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_COLLECTION_NAME; import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_CONNECTION_STRING; -import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_NAME; -import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION; -import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SQL_TABLE; -import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_STATEMENT; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_NAMESPACE; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION_NAME; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_QUERY_TEXT; import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SYSTEM; -import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_USER; import static io.r2dbc.spi.ConnectionFactoryOptions.DATABASE; import static io.r2dbc.spi.ConnectionFactoryOptions.DRIVER; import static io.r2dbc.spi.ConnectionFactoryOptions.HOST; @@ -170,11 +169,10 @@ void testQueries(Parameter parameter) { DB_CONNECTION_STRING, parameter.system + "://localhost:" + port), equalTo(DB_SYSTEM, parameter.system), - equalTo(DB_NAME, DB), - equalTo(DB_USER, USER_DB), - equalTo(DB_STATEMENT, parameter.expectedStatement), - equalTo(DB_OPERATION, parameter.operation), - equalTo(DB_SQL_TABLE, parameter.table), + equalTo(DB_NAMESPACE, DB), + equalTo(DB_QUERY_TEXT, parameter.expectedStatement), + equalTo(DB_OPERATION_NAME, parameter.operation), + equalTo(DB_COLLECTION_NAME, parameter.table), equalTo(SERVER_ADDRESS, container.getHost()), equalTo(SERVER_PORT, port)), span -> diff --git a/instrumentation/rabbitmq-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitMqTest.java b/instrumentation/rabbitmq-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitMqTest.java index 8347f81df4f8..f6fefd81f0c4 100644 --- a/instrumentation/rabbitmq-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitMqTest.java +++ b/instrumentation/rabbitmq-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitMqTest.java @@ -839,7 +839,7 @@ private static void verifyMessagingAttributes( }); if (operation != null && !operation.equals("publish")) { - span.hasAttribute(MessagingIncubatingAttributes.MESSAGING_OPERATION, operation); + span.hasAttribute(MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, operation); } } diff --git a/instrumentation/reactor/reactor-kafka-1.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/kafka/v1_0/AbstractReactorKafkaTest.java b/instrumentation/reactor/reactor-kafka-1.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/kafka/v1_0/AbstractReactorKafkaTest.java index becea32946d4..ee6889a5946d 100644 --- a/instrumentation/reactor/reactor-kafka-1.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/kafka/v1_0/AbstractReactorKafkaTest.java +++ b/instrumentation/reactor/reactor-kafka-1.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/kafka/v1_0/AbstractReactorKafkaTest.java @@ -181,7 +181,7 @@ protected static List sendAttributes(ProducerRecord stringAssert.startsWith("producer")), @@ -205,7 +205,7 @@ protected static List receiveAttributes(String topic) { asList( equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "kafka"), equalTo(MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, topic), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "receive"), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "receive"), satisfies( MessagingIncubatingAttributes.MESSAGING_CLIENT_ID, stringAssert -> stringAssert.startsWith("consumer")), @@ -223,7 +223,7 @@ protected static List processAttributes( asList( equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "kafka"), equalTo(MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, record.topic()), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "process"), satisfies( MessagingIncubatingAttributes.MESSAGING_CLIENT_ID, stringAssert -> stringAssert.startsWith("consumer")), diff --git a/instrumentation/rediscala-1.8/javaagent/src/test/groovy/RediscalaClientTest.groovy b/instrumentation/rediscala-1.8/javaagent/src/test/groovy/RediscalaClientTest.groovy index 5f6e10ab0acc..cb1af9916c0f 100644 --- a/instrumentation/rediscala-1.8/javaagent/src/test/groovy/RediscalaClientTest.groovy +++ b/instrumentation/rediscala-1.8/javaagent/src/test/groovy/RediscalaClientTest.groovy @@ -91,7 +91,7 @@ class RediscalaClientTest extends AgentInstrumentationSpecification { kind CLIENT attributes { "$DbIncubatingAttributes.DB_SYSTEM" "redis" - "$DbIncubatingAttributes.DB_OPERATION" "SET" + "$DbIncubatingAttributes.DB_OPERATION_NAME" "SET" } } } @@ -126,7 +126,7 @@ class RediscalaClientTest extends AgentInstrumentationSpecification { childOf span(0) attributes { "$DbIncubatingAttributes.DB_SYSTEM" "redis" - "$DbIncubatingAttributes.DB_OPERATION" "SET" + "$DbIncubatingAttributes.DB_OPERATION_NAME" "SET" } } span(2) { @@ -135,7 +135,7 @@ class RediscalaClientTest extends AgentInstrumentationSpecification { childOf span(0) attributes { "$DbIncubatingAttributes.DB_SYSTEM" "redis" - "$DbIncubatingAttributes.DB_OPERATION" "GET" + "$DbIncubatingAttributes.DB_OPERATION_NAME" "GET" } } } diff --git a/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonAsyncClientTest.java b/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonAsyncClientTest.java index 9a005c90315c..6b15b703975a 100644 --- a/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonAsyncClientTest.java +++ b/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonAsyncClientTest.java @@ -118,8 +118,8 @@ void futureSet() throws ExecutionException, InterruptedException, TimeoutExcepti equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, ip), equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port), equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "SET foo ?"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "SET")))); + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "SET foo ?"), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "SET")))); } @Test @@ -151,8 +151,8 @@ void futureWhenComplete() throws ExecutionException, InterruptedException, Timeo equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, ip), equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port), equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "SADD set1 ?"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "SADD")) + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "SADD set1 ?"), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "SADD")) .hasParent(trace.getSpan(0)), span -> span.hasName("callback").hasKind(INTERNAL).hasParent(trace.getSpan(0)))); } @@ -225,7 +225,7 @@ void atomicBatchCommand() throws ExecutionException, InterruptedException, Timeo equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, ip), equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port), equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "MULTI;SET batch1 ?")) + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "MULTI;SET batch1 ?")) .hasParent(trace.getSpan(0)), span -> span.hasName("SET") @@ -235,8 +235,8 @@ void atomicBatchCommand() throws ExecutionException, InterruptedException, Timeo equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, ip), equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port), equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "SET batch2 ?"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "SET")) + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "SET batch2 ?"), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "SET")) .hasParent(trace.getSpan(0)), span -> span.hasName("EXEC") @@ -246,8 +246,8 @@ void atomicBatchCommand() throws ExecutionException, InterruptedException, Timeo equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, ip), equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port), equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "EXEC"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "EXEC")) + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "EXEC"), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "EXEC")) .hasParent(trace.getSpan(0)), span -> span.hasName("callback").hasKind(INTERNAL).hasParent(trace.getSpan(0)))); } diff --git a/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonClientTest.java b/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonClientTest.java index d25aa7e4fcd4..ca52e2b52641 100644 --- a/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonClientTest.java +++ b/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonClientTest.java @@ -121,8 +121,8 @@ void stringCommand() { equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, ip), equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port), equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "SET foo ?"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "SET"))), + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "SET foo ?"), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "SET"))), trace -> trace.hasSpansSatisfyingExactly( span -> @@ -133,8 +133,8 @@ void stringCommand() { equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, ip), equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port), equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "GET foo"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "GET")))); + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "GET foo"), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "GET")))); } @Test @@ -160,7 +160,7 @@ void batchCommand() equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port), equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), equalTo( - DbIncubatingAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_QUERY_TEXT, "SET batch1 ?;SET batch2 ?")))); } @@ -201,7 +201,7 @@ void atomicBatchCommand() { equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, ip), equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port), equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "MULTI;SET batch1 ?")) + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "MULTI;SET batch1 ?")) .hasParent(trace.getSpan(0)), span -> span.hasName("SET") @@ -211,8 +211,8 @@ void atomicBatchCommand() { equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, ip), equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port), equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "SET batch2 ?"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "SET")) + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "SET batch2 ?"), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "SET")) .hasParent(trace.getSpan(0)), span -> span.hasName("EXEC") @@ -222,8 +222,8 @@ void atomicBatchCommand() { equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, ip), equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port), equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "EXEC"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "EXEC")) + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "EXEC"), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "EXEC")) .hasParent(trace.getSpan(0)))); } @@ -244,8 +244,8 @@ void listCommand() { equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, ip), equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port), equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "RPUSH list1 ?"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "RPUSH")) + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "RPUSH list1 ?"), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "RPUSH")) .hasNoParent())); } @@ -270,9 +270,9 @@ void hashCommand() { equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port), equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), equalTo( - DbIncubatingAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_QUERY_TEXT, String.format("EVAL %s 1 map1 ? ?", script)), - equalTo(DbIncubatingAttributes.DB_OPERATION, "EVAL"))), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "EVAL"))), trace -> trace.hasSpansSatisfyingExactly( span -> @@ -283,8 +283,8 @@ void hashCommand() { equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, ip), equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port), equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "HGET map1 key1"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "HGET")))); + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "HGET map1 key1"), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "HGET")))); } @Test @@ -304,8 +304,8 @@ void setCommand() { equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, ip), equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port), equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "SADD set1 ?"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "SADD")))); + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "SADD set1 ?"), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "SADD")))); } @Test @@ -333,8 +333,8 @@ void sortedSetCommand() equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port), equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), equalTo( - DbIncubatingAttributes.DB_STATEMENT, "ZADD sort_set1 ? ? ? ? ? ?"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "ZADD")))); + DbIncubatingAttributes.DB_QUERY_TEXT, "ZADD sort_set1 ? ? ? ? ? ?"), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "ZADD")))); } private static void invokeAddAll(RScoredSortedSet object, Map arg) @@ -359,8 +359,8 @@ void atomicLongCommand() { equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, ip), equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port), equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, "INCR AtomicLong"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "INCR")))); + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, "INCR AtomicLong"), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "INCR")))); } @Test @@ -385,9 +385,9 @@ void lockCommand() { equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, ip), equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port), equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "EVAL"), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "EVAL"), satisfies( - DbIncubatingAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_QUERY_TEXT, stringAssert -> stringAssert.startsWith("EVAL"))))); traceAsserts.add( trace -> @@ -400,9 +400,9 @@ void lockCommand() { equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, ip), equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port), equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "EVAL"), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "EVAL"), satisfies( - DbIncubatingAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_QUERY_TEXT, stringAssert -> stringAssert.startsWith("EVAL"))))); if (lockHas3Traces()) { traceAsserts.add( @@ -416,9 +416,9 @@ void lockCommand() { equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, ip), equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port), equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_OPERATION, "DEL"), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "DEL"), satisfies( - DbIncubatingAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_QUERY_TEXT, stringAssert -> stringAssert.startsWith("DEL"))))); } diff --git a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v4_8/RocketMqInstrumenterFactory.java b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v4_8/RocketMqInstrumenterFactory.java index f01f9b3ead35..a7b9007a7c4a 100644 --- a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v4_8/RocketMqInstrumenterFactory.java +++ b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v4_8/RocketMqInstrumenterFactory.java @@ -5,6 +5,7 @@ package io.opentelemetry.instrumentation.rocketmqclient.v4_8; +import static io.opentelemetry.api.common.AttributeKey.stringKey; import static io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor.constant; import io.opentelemetry.api.OpenTelemetry; @@ -28,8 +29,8 @@ class RocketMqInstrumenterFactory { private static final String INSTRUMENTATION_NAME = "io.opentelemetry.rocketmq-client-4.8"; // copied from MessagingIncubatingAttributes - private static final AttributeKey MESSAGING_OPERATION = - AttributeKey.stringKey("messaging.operation"); + private static final AttributeKey MESSAGING_OPERATION_TYPE = + stringKey("messaging.operation.type"); private static final AttributeKey MESSAGING_SYSTEM = AttributeKey.stringKey("messaging.system"); @@ -65,7 +66,7 @@ static RocketMqConsumerInstrumenter createConsumerInstrumenter( Instrumenter.builder( openTelemetry, INSTRUMENTATION_NAME, RocketMqInstrumenterFactory::spanNameOnReceive) .addAttributesExtractor(constant(MESSAGING_SYSTEM, "rocketmq")) - .addAttributesExtractor(constant(MESSAGING_OPERATION, "receive")); + .addAttributesExtractor(constant(MESSAGING_OPERATION_TYPE, "receive")); return new RocketMqConsumerInstrumenter( createProcessInstrumenter( diff --git a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-4.8/testing/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v4_8/AbstractRocketMqClientTest.java b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-4.8/testing/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v4_8/AbstractRocketMqClientTest.java index 60b277d7a46d..54ec0e7b8048 100644 --- a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-4.8/testing/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v4_8/AbstractRocketMqClientTest.java +++ b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-4.8/testing/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v4_8/AbstractRocketMqClientTest.java @@ -143,7 +143,8 @@ public void onException(Throwable throwable) { MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, sharedTopic), equalTo( - MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, + "publish"), satisfies( MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, val -> val.isInstanceOf(String.class)), @@ -166,7 +167,8 @@ public void onException(Throwable throwable) { MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, sharedTopic), equalTo( - MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"), + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, + "process"), satisfies( MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE, val -> val.isInstanceOf(Long.class)), @@ -219,7 +221,8 @@ void testRocketmqProduceAndConsume() throws Exception { MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, sharedTopic), equalTo( - MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, + "publish"), satisfies( MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, val -> val.isInstanceOf(String.class)), @@ -242,7 +245,8 @@ void testRocketmqProduceAndConsume() throws Exception { MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, sharedTopic), equalTo( - MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"), + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, + "process"), satisfies( MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE, val -> val.isInstanceOf(Long.class)), @@ -307,7 +311,9 @@ void testRocketmqProduceAndBatchConsume() throws Exception { equalTo( MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, sharedTopic), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, + "publish"), satisfies( MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, val -> val.isInstanceOf(String.class)), @@ -334,7 +340,8 @@ void testRocketmqProduceAndBatchConsume() throws Exception { .hasAttributesSatisfyingExactly( equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "rocketmq"), equalTo( - MessagingIncubatingAttributes.MESSAGING_OPERATION, "receive")), + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, + "receive")), span -> span.hasName(sharedTopic + " process") .hasKind(SpanKind.CONSUMER) @@ -346,7 +353,8 @@ void testRocketmqProduceAndBatchConsume() throws Exception { MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, sharedTopic), equalTo( - MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"), + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, + "process"), satisfies( MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE, val -> val.isInstanceOf(Long.class)), @@ -376,7 +384,8 @@ void testRocketmqProduceAndBatchConsume() throws Exception { MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, sharedTopic), equalTo( - MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"), + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, + "process"), satisfies( MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE, val -> val.isInstanceOf(Long.class)), @@ -434,7 +443,8 @@ void captureMessageHeaderAsSpanAttributes() throws Exception { MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, sharedTopic), equalTo( - MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, + "publish"), satisfies( MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, val -> val.isInstanceOf(String.class)), @@ -461,7 +471,8 @@ void captureMessageHeaderAsSpanAttributes() throws Exception { MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, sharedTopic), equalTo( - MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"), + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, + "process"), satisfies( MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE, val -> val.isInstanceOf(Long.class)), diff --git a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/testing/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v5_0/AbstractRocketMqClientSuppressReceiveSpanTest.java b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/testing/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v5_0/AbstractRocketMqClientSuppressReceiveSpanTest.java index c9b0557e79a5..bedd6c0c5bef 100644 --- a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/testing/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v5_0/AbstractRocketMqClientSuppressReceiveSpanTest.java +++ b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/testing/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v5_0/AbstractRocketMqClientSuppressReceiveSpanTest.java @@ -9,7 +9,7 @@ import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME; import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE; import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID; -import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_OPERATION; +import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE; import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_ROCKETMQ_CLIENT_GROUP; import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_ROCKETMQ_MESSAGE_KEYS; import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_ROCKETMQ_MESSAGE_TAG; @@ -124,7 +124,7 @@ void testSendAndConsumeMessage() throws Throwable { MESSAGING_MESSAGE_ID, sendReceipt.getMessageId().toString()), equalTo(MESSAGING_DESTINATION_NAME, topic), - equalTo(MESSAGING_OPERATION, "publish")), + equalTo(MESSAGING_OPERATION_TYPE, "publish")), span -> span.hasKind(SpanKind.CONSUMER) .hasName(topic + " process") @@ -141,7 +141,7 @@ void testSendAndConsumeMessage() throws Throwable { MESSAGING_MESSAGE_ID, sendReceipt.getMessageId().toString()), equalTo(MESSAGING_DESTINATION_NAME, topic), - equalTo(MESSAGING_OPERATION, "process")), + equalTo(MESSAGING_OPERATION_TYPE, "process")), span -> span.hasName("child") .hasKind(SpanKind.INTERNAL) diff --git a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/testing/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v5_0/AbstractRocketMqClientTest.java b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/testing/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v5_0/AbstractRocketMqClientTest.java index beab651f2a8f..5bef54777626 100644 --- a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/testing/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v5_0/AbstractRocketMqClientTest.java +++ b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/testing/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v5_0/AbstractRocketMqClientTest.java @@ -11,7 +11,7 @@ import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME; import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE; import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID; -import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_OPERATION; +import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE; import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_ROCKETMQ_CLIENT_GROUP; import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_ROCKETMQ_MESSAGE_DELIVERY_TIMESTAMP; import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_ROCKETMQ_MESSAGE_GROUP; @@ -421,7 +421,7 @@ private static SpanDataAssert assertProducerSpan( equalTo(MESSAGING_SYSTEM, "rocketmq"), equalTo(MESSAGING_MESSAGE_ID, sendReceipt.getMessageId().toString()), equalTo(MESSAGING_DESTINATION_NAME, topic), - equalTo(MESSAGING_OPERATION, "publish"))); + equalTo(MESSAGING_OPERATION_TYPE, "publish"))); attributeAssertions.addAll(Arrays.asList(extraAttributes)); return span.hasKind(SpanKind.PRODUCER) @@ -452,7 +452,7 @@ private static SpanDataAssert assertProducerSpanWithFifoMessage( equalTo(MESSAGING_SYSTEM, "rocketmq"), equalTo(MESSAGING_MESSAGE_ID, sendReceipt.getMessageId().toString()), equalTo(MESSAGING_DESTINATION_NAME, topic), - equalTo(MESSAGING_OPERATION, "publish"))); + equalTo(MESSAGING_OPERATION_TYPE, "publish"))); attributeAssertions.addAll(Arrays.asList(extraAttributes)); return span.hasKind(SpanKind.PRODUCER) @@ -483,7 +483,7 @@ private static SpanDataAssert assertProducerSpanWithDelayMessage( equalTo(MESSAGING_SYSTEM, "rocketmq"), equalTo(MESSAGING_MESSAGE_ID, sendReceipt.getMessageId().toString()), equalTo(MESSAGING_DESTINATION_NAME, topic), - equalTo(MESSAGING_OPERATION, "publish"))); + equalTo(MESSAGING_OPERATION_TYPE, "publish"))); attributeAssertions.addAll(Arrays.asList(extraAttributes)); return span.hasKind(SpanKind.PRODUCER) @@ -501,7 +501,7 @@ private static SpanDataAssert assertReceiveSpan( equalTo(MESSAGING_ROCKETMQ_CLIENT_GROUP, consumerGroup), equalTo(MESSAGING_SYSTEM, "rocketmq"), equalTo(MESSAGING_DESTINATION_NAME, topic), - equalTo(MESSAGING_OPERATION, "receive"), + equalTo(MESSAGING_OPERATION_TYPE, "receive"), equalTo(MESSAGING_BATCH_MESSAGE_COUNT, 1)); } @@ -525,7 +525,7 @@ private static SpanDataAssert assertProcessSpan( equalTo(MESSAGING_SYSTEM, "rocketmq"), equalTo(MESSAGING_MESSAGE_ID, sendReceipt.getMessageId().toString()), equalTo(MESSAGING_DESTINATION_NAME, topic), - equalTo(MESSAGING_OPERATION, "process"))); + equalTo(MESSAGING_OPERATION_TYPE, "process"))); attributeAssertions.addAll(Arrays.asList(extraAttributes)); return span.hasKind(SpanKind.CONSUMER) @@ -558,7 +558,7 @@ private static SpanDataAssert assertProcessSpanWithFifoMessage( equalTo(MESSAGING_SYSTEM, "rocketmq"), equalTo(MESSAGING_MESSAGE_ID, sendReceipt.getMessageId().toString()), equalTo(MESSAGING_DESTINATION_NAME, topic), - equalTo(MESSAGING_OPERATION, "process"))); + equalTo(MESSAGING_OPERATION_TYPE, "process"))); attributeAssertions.addAll(Arrays.asList(extraAttributes)); return span.hasKind(SpanKind.CONSUMER) @@ -591,7 +591,7 @@ private static SpanDataAssert assertProcessSpanWithDelayMessage( equalTo(MESSAGING_SYSTEM, "rocketmq"), equalTo(MESSAGING_MESSAGE_ID, sendReceipt.getMessageId().toString()), equalTo(MESSAGING_DESTINATION_NAME, topic), - equalTo(MESSAGING_OPERATION, "process"))); + equalTo(MESSAGING_OPERATION_TYPE, "process"))); attributeAssertions.addAll(Arrays.asList(extraAttributes)); return span.hasKind(SpanKind.CONSUMER) diff --git a/instrumentation/spring/spring-boot-autoconfigure-2/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/r2dbc/R2DbcInstrumentationAutoConfigurationTest.java b/instrumentation/spring/spring-boot-autoconfigure-2/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/r2dbc/R2DbcInstrumentationAutoConfigurationTest.java index 118076a97dea..c3dc0da25794 100644 --- a/instrumentation/spring/spring-boot-autoconfigure-2/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/r2dbc/R2DbcInstrumentationAutoConfigurationTest.java +++ b/instrumentation/spring/spring-boot-autoconfigure-2/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/r2dbc/R2DbcInstrumentationAutoConfigurationTest.java @@ -50,13 +50,13 @@ void statementSanitizerEnabledByDefault() { trace.hasSpansSatisfyingExactly( span -> span.hasAttribute( - DbIncubatingAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_QUERY_TEXT, "CREATE TABLE IF NOT EXISTS player(id INT NOT NULL AUTO_INCREMENT, name VARCHAR(?), age INT, PRIMARY KEY (id))")), trace -> trace.hasSpansSatisfyingExactly( span -> span.hasAttribute( - DbIncubatingAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_QUERY_TEXT, "SELECT * FROM player WHERE id = ?"))); }); } diff --git a/instrumentation/spring/spring-data/spring-data-3.0/testing/src/reactiveTest/java/io/opentelemetry/javaagent/instrumentation/spring/data/v3_0/ReactiveSpringDataTest.java b/instrumentation/spring/spring-data/spring-data-3.0/testing/src/reactiveTest/java/io/opentelemetry/javaagent/instrumentation/spring/data/v3_0/ReactiveSpringDataTest.java index 826bf0877497..4ece3165d53f 100644 --- a/instrumentation/spring/spring-data/spring-data-3.0/testing/src/reactiveTest/java/io/opentelemetry/javaagent/instrumentation/spring/data/v3_0/ReactiveSpringDataTest.java +++ b/instrumentation/spring/spring-data/spring-data-3.0/testing/src/reactiveTest/java/io/opentelemetry/javaagent/instrumentation/spring/data/v3_0/ReactiveSpringDataTest.java @@ -7,13 +7,12 @@ import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_COLLECTION_NAME; import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_CONNECTION_STRING; -import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_NAME; -import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION; -import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SQL_TABLE; -import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_STATEMENT; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_NAMESPACE; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION_NAME; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_QUERY_TEXT; import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SYSTEM; -import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_USER; import static org.assertj.core.api.Assertions.assertThat; import io.opentelemetry.api.trace.SpanKind; @@ -82,11 +81,10 @@ void testFindAll() { .isLessThanOrEqualTo(trace.getSpan(1).getEndEpochNanos())) .hasAttributesSatisfyingExactly( equalTo(DB_SYSTEM, "h2"), - equalTo(DB_NAME, "db"), - equalTo(DB_USER, "sa"), - equalTo(DB_STATEMENT, "SELECT CUSTOMER.* FROM CUSTOMER"), - equalTo(DB_OPERATION, "SELECT"), - equalTo(DB_SQL_TABLE, "CUSTOMER"), + equalTo(DB_NAMESPACE, "db"), + equalTo(DB_QUERY_TEXT, "SELECT CUSTOMER.* FROM CUSTOMER"), + equalTo(DB_OPERATION_NAME, "SELECT"), + equalTo(DB_COLLECTION_NAME, "CUSTOMER"), equalTo(DB_CONNECTION_STRING, "h2:mem://localhost"), equalTo(SERVER_ADDRESS, "localhost")))); } diff --git a/instrumentation/spring/spring-data/spring-data-common/testing/src/main/java/AbstractSpringJpaTest.java b/instrumentation/spring/spring-data/spring-data-common/testing/src/main/java/AbstractSpringJpaTest.java index 670999905aa5..b9ddf9756ce3 100644 --- a/instrumentation/spring/spring-data/spring-data-common/testing/src/main/java/AbstractSpringJpaTest.java +++ b/instrumentation/spring/spring-data/spring-data-common/testing/src/main/java/AbstractSpringJpaTest.java @@ -81,13 +81,12 @@ static void assertHibernate4Trace(TraceAssert trace, String repoClassName) { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "hsqldb"), - equalTo(DbIncubatingAttributes.DB_NAME, "test"), - equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_NAMESPACE, "test"), equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "hsqldb:mem:"), satisfies( - DbIncubatingAttributes.DB_STATEMENT, val -> val.startsWith("insert ")), - equalTo(DbIncubatingAttributes.DB_OPERATION, "INSERT"), - equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "JpaCustomer"))); + DbIncubatingAttributes.DB_QUERY_TEXT, val -> val.startsWith("insert ")), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "INSERT"), + equalTo(DbIncubatingAttributes.DB_COLLECTION_NAME, "JpaCustomer"))); } @SuppressWarnings("deprecation") // TODO DbIncubatingAttributes.DB_CONNECTION_STRING deprecation @@ -104,26 +103,24 @@ static void assertHibernateTrace(TraceAssert trace, String repoClassName) { .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "hsqldb"), - equalTo(DbIncubatingAttributes.DB_NAME, "test"), - equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_NAMESPACE, "test"), equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "hsqldb:mem:"), satisfies( - DbIncubatingAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_QUERY_TEXT, val -> val.startsWith("call next value for ")), - equalTo(DbIncubatingAttributes.DB_OPERATION, "CALL")), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "CALL")), span -> span.hasName("INSERT test.JpaCustomer") .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "hsqldb"), - equalTo(DbIncubatingAttributes.DB_NAME, "test"), - equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_NAMESPACE, "test"), equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "hsqldb:mem:"), satisfies( - DbIncubatingAttributes.DB_STATEMENT, val -> val.startsWith("insert ")), - equalTo(DbIncubatingAttributes.DB_OPERATION, "INSERT"), - equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "JpaCustomer"))); + DbIncubatingAttributes.DB_QUERY_TEXT, val -> val.startsWith("insert ")), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "INSERT"), + equalTo(DbIncubatingAttributes.DB_COLLECTION_NAME, "JpaCustomer"))); } @SuppressWarnings("deprecation") // TODO DbIncubatingAttributes.DB_CONNECTION_STRING deprecation @@ -153,14 +150,13 @@ void testCrud() { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "hsqldb"), - equalTo(DbIncubatingAttributes.DB_NAME, "test"), - equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_NAMESPACE, "test"), equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "hsqldb:mem:"), satisfies( - DbIncubatingAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_QUERY_TEXT, val -> val.startsWith("select ")), - equalTo(DbIncubatingAttributes.DB_OPERATION, "SELECT"), - equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "JpaCustomer")))); + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "SELECT"), + equalTo(DbIncubatingAttributes.DB_COLLECTION_NAME, "JpaCustomer")))); clearData(); repo.save(customer); @@ -191,28 +187,26 @@ void testCrud() { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "hsqldb"), - equalTo(DbIncubatingAttributes.DB_NAME, "test"), - equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_NAMESPACE, "test"), equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "hsqldb:mem:"), satisfies( - DbIncubatingAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_QUERY_TEXT, val -> val.startsWith("select ")), - equalTo(DbIncubatingAttributes.DB_OPERATION, "SELECT"), - equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "JpaCustomer")), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "SELECT"), + equalTo(DbIncubatingAttributes.DB_COLLECTION_NAME, "JpaCustomer")), span -> span.hasName("UPDATE test.JpaCustomer") .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "hsqldb"), - equalTo(DbIncubatingAttributes.DB_NAME, "test"), - equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_NAMESPACE, "test"), equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "hsqldb:mem:"), satisfies( - DbIncubatingAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_QUERY_TEXT, val -> val.startsWith("update ")), - equalTo(DbIncubatingAttributes.DB_OPERATION, "UPDATE"), - equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "JpaCustomer")))); + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "UPDATE"), + equalTo(DbIncubatingAttributes.DB_COLLECTION_NAME, "JpaCustomer")))); clearData(); customer = findByLastName(repo, "Anonymous").get(0); @@ -231,14 +225,13 @@ void testCrud() { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "hsqldb"), - equalTo(DbIncubatingAttributes.DB_NAME, "test"), - equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_NAMESPACE, "test"), equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "hsqldb:mem:"), satisfies( - DbIncubatingAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_QUERY_TEXT, val -> val.startsWith("select ")), - equalTo(DbIncubatingAttributes.DB_OPERATION, "SELECT"), - equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "JpaCustomer")))); + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "SELECT"), + equalTo(DbIncubatingAttributes.DB_COLLECTION_NAME, "JpaCustomer")))); clearData(); repo.delete(customer); @@ -257,28 +250,26 @@ void testCrud() { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "hsqldb"), - equalTo(DbIncubatingAttributes.DB_NAME, "test"), - equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_NAMESPACE, "test"), equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "hsqldb:mem:"), satisfies( - DbIncubatingAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_QUERY_TEXT, val -> val.startsWith("select ")), - equalTo(DbIncubatingAttributes.DB_OPERATION, "SELECT"), - equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "JpaCustomer")), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "SELECT"), + equalTo(DbIncubatingAttributes.DB_COLLECTION_NAME, "JpaCustomer")), span -> span.hasName("DELETE test.JpaCustomer") .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "hsqldb"), - equalTo(DbIncubatingAttributes.DB_NAME, "test"), - equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_NAMESPACE, "test"), equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "hsqldb:mem:"), satisfies( - DbIncubatingAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_QUERY_TEXT, val -> val.startsWith("delete ")), - equalTo(DbIncubatingAttributes.DB_OPERATION, "DELETE"), - equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "JpaCustomer")))); + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "DELETE"), + equalTo(DbIncubatingAttributes.DB_COLLECTION_NAME, "JpaCustomer")))); } @SuppressWarnings("deprecation") // TODO DbIncubatingAttributes.DB_CONNECTION_STRING deprecation @@ -306,14 +297,13 @@ void testCustomRepositoryMethod() { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "hsqldb"), - equalTo(DbIncubatingAttributes.DB_NAME, "test"), - equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_NAMESPACE, "test"), equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "hsqldb:mem:"), satisfies( - DbIncubatingAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_QUERY_TEXT, val -> val.startsWith("select ")), - equalTo(DbIncubatingAttributes.DB_OPERATION, "SELECT"), - equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "JpaCustomer")))); + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "SELECT"), + equalTo(DbIncubatingAttributes.DB_COLLECTION_NAME, "JpaCustomer")))); } @SuppressWarnings("deprecation") // TODO DbIncubatingAttributes.DB_CONNECTION_STRING deprecation @@ -353,13 +343,12 @@ void testFailedRepositoryMethod() { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo(DbIncubatingAttributes.DB_SYSTEM, "hsqldb"), - equalTo(DbIncubatingAttributes.DB_NAME, "test"), - equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_NAMESPACE, "test"), equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "hsqldb:mem:"), satisfies( - DbIncubatingAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_QUERY_TEXT, val -> val.startsWith("select ")), - equalTo(DbIncubatingAttributes.DB_OPERATION, "SELECT"), - equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "JpaCustomer")))); + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, "SELECT"), + equalTo(DbIncubatingAttributes.DB_COLLECTION_NAME, "JpaCustomer")))); } } diff --git a/instrumentation/spring/spring-integration-4.1/javaagent/src/test/groovy/SpringIntegrationAndRabbitTest.groovy b/instrumentation/spring/spring-integration-4.1/javaagent/src/test/groovy/SpringIntegrationAndRabbitTest.groovy index 33fc7906b3bf..6bcd93acdb0f 100644 --- a/instrumentation/spring/spring-integration-4.1/javaagent/src/test/groovy/SpringIntegrationAndRabbitTest.groovy +++ b/instrumentation/spring/spring-integration-4.1/javaagent/src/test/groovy/SpringIntegrationAndRabbitTest.groovy @@ -61,7 +61,7 @@ class SpringIntegrationAndRabbitTest extends AgentInstrumentationSpecification i "$NetworkAttributes.NETWORK_TYPE" { it == "ipv4" || it == "ipv6" || it == null } "$MessagingIncubatingAttributes.MESSAGING_SYSTEM" "rabbitmq" "$MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME" "testTopic" - "$MessagingIncubatingAttributes.MESSAGING_OPERATION" "publish" + "$MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE" "publish" "$MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE" Long "$MessagingIncubatingAttributes.MESSAGING_RABBITMQ_DESTINATION_ROUTING_KEY" String } @@ -79,7 +79,7 @@ class SpringIntegrationAndRabbitTest extends AgentInstrumentationSpecification i "$NetworkAttributes.NETWORK_TYPE" { it == "ipv4" || it == "ipv6" || it == null } "$MessagingIncubatingAttributes.MESSAGING_SYSTEM" "rabbitmq" "$MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME" "testTopic" - "$MessagingIncubatingAttributes.MESSAGING_OPERATION" "process" + "$MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE" "process" "$MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE" Long "$MessagingIncubatingAttributes.MESSAGING_RABBITMQ_DESTINATION_ROUTING_KEY" String } @@ -93,7 +93,7 @@ class SpringIntegrationAndRabbitTest extends AgentInstrumentationSpecification i attributes { "$MessagingIncubatingAttributes.MESSAGING_SYSTEM" "rabbitmq" "$MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME" "testTopic" - "$MessagingIncubatingAttributes.MESSAGING_OPERATION" "process" + "$MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE" "process" "$MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID" String "$MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE" Long } diff --git a/instrumentation/spring/spring-jms/spring-jms-2.0/testing/src/main/java/io/opentelemetry/instrumentation/spring/jms/v2_0/AbstractJmsTest.java b/instrumentation/spring/spring-jms/spring-jms-2.0/testing/src/main/java/io/opentelemetry/instrumentation/spring/jms/v2_0/AbstractJmsTest.java index 6e679ecd2f3d..4d878d0bf8c3 100644 --- a/instrumentation/spring/spring-jms/spring-jms-2.0/testing/src/main/java/io/opentelemetry/instrumentation/spring/jms/v2_0/AbstractJmsTest.java +++ b/instrumentation/spring/spring-jms/spring-jms-2.0/testing/src/main/java/io/opentelemetry/instrumentation/spring/jms/v2_0/AbstractJmsTest.java @@ -40,7 +40,7 @@ protected List producerAttributeAssertions( asList( equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "jms"), equalTo(MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, destinationName), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "publish"), satisfies( MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, val -> val.isInstanceOf(String.class)))); @@ -89,7 +89,7 @@ protected List consumerAttributeAssertions( asList( equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "jms"), equalTo(MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, destinationName), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, operation))); + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, operation))); if (msgId != null) { attributeAssertions.add(equalTo(MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, msgId)); } else { diff --git a/instrumentation/spring/spring-jms/spring-jms-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/jms/v6_0/SpringJmsListenerTest.java b/instrumentation/spring/spring-jms/spring-jms-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/jms/v6_0/SpringJmsListenerTest.java index d0f50978b3f0..543a27c70d3d 100644 --- a/instrumentation/spring/spring-jms/spring-jms-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/jms/v6_0/SpringJmsListenerTest.java +++ b/instrumentation/spring/spring-jms/spring-jms-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/jms/v6_0/SpringJmsListenerTest.java @@ -50,7 +50,8 @@ void assertSpringJmsListener() { equalTo( MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, "spring-jms-listener"), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "publish"), satisfies( MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, AbstractStringAssert::isNotBlank))); @@ -69,7 +70,8 @@ void assertSpringJmsListener() { equalTo( MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, "spring-jms-listener"), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "receive"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "receive"), satisfies( MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, AbstractStringAssert::isNotBlank)), @@ -83,7 +85,8 @@ void assertSpringJmsListener() { equalTo( MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, "spring-jms-listener"), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "process"), satisfies( MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, AbstractStringAssert::isNotBlank)), @@ -136,7 +139,8 @@ void shouldCaptureHeaders(Class configClass) equalTo( MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, "spring-jms-listener"), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "publish"), satisfies( MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, AbstractStringAssert::isNotBlank), @@ -157,7 +161,8 @@ void shouldCaptureHeaders(Class configClass) equalTo( MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, "spring-jms-listener"), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "receive"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "receive"), satisfies( MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, AbstractStringAssert::isNotBlank), @@ -176,7 +181,8 @@ void shouldCaptureHeaders(Class configClass) equalTo( MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, "spring-jms-listener"), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "process"), satisfies( MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, AbstractStringAssert::isNotBlank), diff --git a/instrumentation/spring/spring-jms/spring-jms-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/jms/v6_0/SpringListenerSuppressReceiveSpansTest.java b/instrumentation/spring/spring-jms/spring-jms-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/jms/v6_0/SpringListenerSuppressReceiveSpansTest.java index 043cf148ab9b..44c80d9ce19d 100644 --- a/instrumentation/spring/spring-jms/spring-jms-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/jms/v6_0/SpringListenerSuppressReceiveSpansTest.java +++ b/instrumentation/spring/spring-jms/spring-jms-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/jms/v6_0/SpringListenerSuppressReceiveSpansTest.java @@ -30,7 +30,8 @@ void assertSpringJmsListener() { equalTo( MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, "spring-jms-listener"), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "publish"), satisfies( MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, AbstractStringAssert::isNotBlank)), @@ -44,7 +45,8 @@ void assertSpringJmsListener() { equalTo( MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, "spring-jms-listener"), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "process"), satisfies( MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, AbstractStringAssert::isNotBlank)), diff --git a/instrumentation/spring/spring-kafka-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/kafka/v2_7/SpringKafkaTest.java b/instrumentation/spring/spring-kafka-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/kafka/v2_7/SpringKafkaTest.java index edf932d59af9..8a95bb35efda 100644 --- a/instrumentation/spring/spring-kafka-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/kafka/v2_7/SpringKafkaTest.java +++ b/instrumentation/spring/spring-kafka-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/kafka/v2_7/SpringKafkaTest.java @@ -77,7 +77,8 @@ void shouldCreateSpansForSingleRecordProcess() { equalTo( MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, "testSingleTopic"), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "publish"), satisfies( MessagingIncubatingAttributes.MESSAGING_DESTINATION_PARTITION_ID, AbstractStringAssert::isNotEmpty), @@ -102,7 +103,8 @@ void shouldCreateSpansForSingleRecordProcess() { equalTo( MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, "testSingleTopic"), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "receive"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "receive"), equalTo( MessagingIncubatingAttributes.MESSAGING_KAFKA_CONSUMER_GROUP, "testSingleListener"), @@ -121,7 +123,8 @@ void shouldCreateSpansForSingleRecordProcess() { equalTo( MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, "testSingleTopic"), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "process"), satisfies( MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE, AbstractLongAssert::isNotNegative), @@ -167,7 +170,7 @@ void shouldHandleFailureInKafkaListener() { equalTo( MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, "testSingleTopic"), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "receive"), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "receive"), equalTo( MessagingIncubatingAttributes.MESSAGING_KAFKA_CONSUMER_GROUP, "testSingleListener"), @@ -179,7 +182,7 @@ void shouldHandleFailureInKafkaListener() { Arrays.asList( equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "kafka"), equalTo(MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, "testSingleTopic"), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "process"), satisfies( MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE, AbstractLongAssert::isNotNegative), @@ -212,7 +215,8 @@ void shouldHandleFailureInKafkaListener() { equalTo( MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, "testSingleTopic"), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "publish"), satisfies( MessagingIncubatingAttributes.MESSAGING_DESTINATION_PARTITION_ID, AbstractStringAssert::isNotEmpty), @@ -286,7 +290,8 @@ void shouldCreateSpansForBatchReceiveAndProcess() throws InterruptedException { equalTo( MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, "testBatchTopic"), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "publish"), satisfies( MessagingIncubatingAttributes.MESSAGING_DESTINATION_PARTITION_ID, AbstractStringAssert::isNotEmpty), @@ -306,7 +311,8 @@ void shouldCreateSpansForBatchReceiveAndProcess() throws InterruptedException { equalTo( MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, "testBatchTopic"), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "publish"), satisfies( MessagingIncubatingAttributes.MESSAGING_DESTINATION_PARTITION_ID, AbstractStringAssert::isNotEmpty), @@ -332,7 +338,8 @@ void shouldCreateSpansForBatchReceiveAndProcess() throws InterruptedException { equalTo( MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, "testBatchTopic"), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "receive"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "receive"), equalTo( MessagingIncubatingAttributes.MESSAGING_KAFKA_CONSUMER_GROUP, "testBatchListener"), @@ -353,7 +360,8 @@ void shouldCreateSpansForBatchReceiveAndProcess() throws InterruptedException { equalTo( MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, "testBatchTopic"), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "process"), equalTo( MessagingIncubatingAttributes.MESSAGING_KAFKA_CONSUMER_GROUP, "testBatchListener"), @@ -393,7 +401,8 @@ void shouldHandleFailureInKafkaBatchListener() { equalTo( MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, "testBatchTopic"), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "publish"), satisfies( MessagingIncubatingAttributes.MESSAGING_DESTINATION_PARTITION_ID, AbstractStringAssert::isNotEmpty), @@ -451,7 +460,7 @@ private static void assertReceiveSpan(SpanDataAssert span) { .hasAttributesSatisfyingExactly( equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "kafka"), equalTo(MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, "testBatchTopic"), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "receive"), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "receive"), equalTo( MessagingIncubatingAttributes.MESSAGING_KAFKA_CONSUMER_GROUP, "testBatchListener"), satisfies( @@ -469,7 +478,7 @@ private static void assertProcessSpan( .hasAttributesSatisfyingExactly( equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "kafka"), equalTo(MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, "testBatchTopic"), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "process"), equalTo( MessagingIncubatingAttributes.MESSAGING_KAFKA_CONSUMER_GROUP, "testBatchListener"), satisfies( diff --git a/instrumentation/spring/spring-kafka-2.7/testing/src/main/java/io/opentelemetry/testing/AbstractSpringKafkaNoReceiveTelemetryTest.java b/instrumentation/spring/spring-kafka-2.7/testing/src/main/java/io/opentelemetry/testing/AbstractSpringKafkaNoReceiveTelemetryTest.java index 53535037d566..ecc416cbdbb2 100644 --- a/instrumentation/spring/spring-kafka-2.7/testing/src/main/java/io/opentelemetry/testing/AbstractSpringKafkaNoReceiveTelemetryTest.java +++ b/instrumentation/spring/spring-kafka-2.7/testing/src/main/java/io/opentelemetry/testing/AbstractSpringKafkaNoReceiveTelemetryTest.java @@ -56,7 +56,8 @@ void shouldCreateSpansForSingleRecordProcess() { MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, "testSingleTopic"), equalTo( - MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, + "publish"), satisfies( MessagingIncubatingAttributes.MESSAGING_CLIENT_ID, stringAssert -> stringAssert.startsWith("producer")), @@ -80,7 +81,8 @@ void shouldCreateSpansForSingleRecordProcess() { MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, "testSingleTopic"), equalTo( - MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"), + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, + "process"), satisfies( MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE, AbstractLongAssert::isNotNegative), @@ -120,7 +122,7 @@ void shouldHandleFailureInKafkaListener() { Arrays.asList( equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "kafka"), equalTo(MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, "testSingleTopic"), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "process"), satisfies( MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE, AbstractLongAssert::isNotNegative), @@ -152,7 +154,8 @@ void shouldHandleFailureInKafkaListener() { MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, "testSingleTopic"), equalTo( - MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, + "publish"), satisfies( MessagingIncubatingAttributes.MESSAGING_CLIENT_ID, stringAssert -> stringAssert.startsWith("producer")), @@ -216,7 +219,9 @@ void shouldCreateSpansForBatchReceiveAndProcess() throws InterruptedException { equalTo( MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, "testBatchTopic"), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, + "publish"), satisfies( MessagingIncubatingAttributes.MESSAGING_CLIENT_ID, stringAssert -> stringAssert.startsWith("producer")), @@ -237,7 +242,9 @@ void shouldCreateSpansForBatchReceiveAndProcess() throws InterruptedException { equalTo( MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, "testBatchTopic"), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, + "publish"), satisfies( MessagingIncubatingAttributes.MESSAGING_CLIENT_ID, stringAssert -> stringAssert.startsWith("producer")), @@ -270,7 +277,8 @@ void shouldCreateSpansForBatchReceiveAndProcess() throws InterruptedException { MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, "testBatchTopic"), equalTo( - MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"), + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, + "process"), equalTo( MessagingIncubatingAttributes.MESSAGING_KAFKA_CONSUMER_GROUP, "testBatchListener"), @@ -302,7 +310,7 @@ void shouldHandleFailureInKafkaBatchListener() { Arrays.asList( equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "kafka"), equalTo(MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, "testBatchTopic"), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "process"), equalTo( MessagingIncubatingAttributes.MESSAGING_KAFKA_CONSUMER_GROUP, "testBatchListener"), satisfies( @@ -325,7 +333,9 @@ void shouldHandleFailureInKafkaBatchListener() { equalTo( MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, "testBatchTopic"), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, + "publish"), satisfies( MessagingIncubatingAttributes.MESSAGING_CLIENT_ID, stringAssert -> stringAssert.startsWith("producer")), diff --git a/instrumentation/spring/spring-rabbit-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/rabbit/v1_0/SpringRabbitMqTest.java b/instrumentation/spring/spring-rabbit-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/rabbit/v1_0/SpringRabbitMqTest.java index 950ee620dbae..141c7c7dc5f0 100644 --- a/instrumentation/spring/spring-rabbit-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/rabbit/v1_0/SpringRabbitMqTest.java +++ b/instrumentation/spring/spring-rabbit-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/rabbit/v1_0/SpringRabbitMqTest.java @@ -110,7 +110,7 @@ private static List getAssertions( MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE, AbstractLongAssert::isNotNegative))); if (operation != null) { - assertions.add(equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, operation)); + assertions.add(equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, operation)); } if (peerAddress != null) { assertions.add(equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4")); diff --git a/instrumentation/spymemcached-2.12/javaagent/src/test/groovy/SpymemcachedTest.groovy b/instrumentation/spymemcached-2.12/javaagent/src/test/groovy/SpymemcachedTest.groovy index fed320ec30b2..5b72b5653eca 100644 --- a/instrumentation/spymemcached-2.12/javaagent/src/test/groovy/SpymemcachedTest.groovy +++ b/instrumentation/spymemcached-2.12/javaagent/src/test/groovy/SpymemcachedTest.groovy @@ -623,7 +623,7 @@ class SpymemcachedTest extends AgentInstrumentationSpecification { attributes { "$DbIncubatingAttributes.DB_SYSTEM" "memcached" - "$DbIncubatingAttributes.DB_OPERATION" operation + "$DbIncubatingAttributes.DB_OPERATION_NAME" operation if (error == "canceled") { "spymemcached.command.cancelled" true 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 2fdacdf5f531..a462e4369cb3 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 @@ -202,7 +202,7 @@ protected static List sendAttributes( Arrays.asList( equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "kafka"), equalTo(MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, record.topic()), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "publish"), satisfies( MessagingIncubatingAttributes.MESSAGING_CLIENT_ID, stringAssert -> stringAssert.startsWith("producer")), @@ -234,7 +234,7 @@ private static List batchConsumerAttributes(String topic, St Arrays.asList( equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "kafka"), equalTo(MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, topic), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, operation), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, operation), satisfies( MessagingIncubatingAttributes.MESSAGING_CLIENT_ID, stringAssert -> stringAssert.startsWith("consumer")), @@ -255,7 +255,7 @@ protected static List processAttributes( Arrays.asList( equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "kafka"), equalTo(MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, record.topic()), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "process"), satisfies( MessagingIncubatingAttributes.MESSAGING_CLIENT_ID, stringAssert -> stringAssert.startsWith("consumer")), diff --git a/instrumentation/vertx/vertx-redis-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/redis/VertxRedisClientAttributesExtractor.java b/instrumentation/vertx/vertx-redis-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/redis/VertxRedisClientAttributesExtractor.java index 5203ed1e96b8..5dfd8f8091c4 100644 --- a/instrumentation/vertx/vertx-redis-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/redis/VertxRedisClientAttributesExtractor.java +++ b/instrumentation/vertx/vertx-redis-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/redis/VertxRedisClientAttributesExtractor.java @@ -21,7 +21,9 @@ enum VertxRedisClientAttributesExtractor public void onStart( AttributesBuilder attributes, Context parentContext, VertxRedisClientRequest request) { internalSet( - attributes, DbIncubatingAttributes.DB_REDIS_DATABASE_INDEX, request.getDatabaseIndex()); + attributes, + DbIncubatingAttributes.DB_NAMESPACE, + String.valueOf(request.getDatabaseIndex())); } @Override 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 69add7333329..06544ad24f6e 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 @@ -202,9 +202,9 @@ void commandWithNoArguments() throws Exception { private static AttributeAssertion[] redisSpanAttributes(String operation, String statement) { return new AttributeAssertion[] { equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), - equalTo(DbIncubatingAttributes.DB_STATEMENT, statement), - equalTo(DbIncubatingAttributes.DB_OPERATION, operation), - equalTo(DbIncubatingAttributes.DB_REDIS_DATABASE_INDEX, 1), + equalTo(DbIncubatingAttributes.DB_QUERY_TEXT, statement), + equalTo(DbIncubatingAttributes.DB_OPERATION_NAME, operation), + equalTo(DbIncubatingAttributes.DB_NAMESPACE, "1"), equalTo(ServerAttributes.SERVER_ADDRESS, host), equalTo(ServerAttributes.SERVER_PORT, port), equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), diff --git a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/latestDepTest/groovy/VertxReactivePropagationTest.groovy b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/latestDepTest/groovy/VertxReactivePropagationTest.groovy index 7e776c9ab177..2ff8b865fe1c 100644 --- a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/latestDepTest/groovy/VertxReactivePropagationTest.groovy +++ b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/latestDepTest/groovy/VertxReactivePropagationTest.groovy @@ -99,12 +99,11 @@ class VertxReactivePropagationTest extends AgentInstrumentationSpecification { childOf span(2) attributes { "$DbIncubatingAttributes.DB_SYSTEM" "hsqldb" - "$DbIncubatingAttributes.DB_NAME" "test" - "$DbIncubatingAttributes.DB_USER" "SA" + "$DbIncubatingAttributes.DB_NAMESPACE" "test" "$DbIncubatingAttributes.DB_CONNECTION_STRING" "hsqldb:mem:" - "$DbIncubatingAttributes.DB_STATEMENT" "SELECT id, name, price, weight FROM products" - "$DbIncubatingAttributes.DB_OPERATION" "SELECT" - "$DbIncubatingAttributes.DB_SQL_TABLE" "products" + "$DbIncubatingAttributes.DB_QUERY_TEXT" "SELECT id, name, price, weight FROM products" + "$DbIncubatingAttributes.DB_OPERATION_NAME" "SELECT" + "$DbIncubatingAttributes.DB_COLLECTION_NAME" "products" } } } @@ -199,12 +198,11 @@ class VertxReactivePropagationTest extends AgentInstrumentationSpecification { childOf(span(3)) attributes { "$DbIncubatingAttributes.DB_SYSTEM" "hsqldb" - "$DbIncubatingAttributes.DB_NAME" "test" - "$DbIncubatingAttributes.DB_USER" "SA" + "$DbIncubatingAttributes.DB_NAMESPACE" "test" "$DbIncubatingAttributes.DB_CONNECTION_STRING" "hsqldb:mem:" - "$DbIncubatingAttributes.DB_STATEMENT" "SELECT id AS request$requestId, name, price, weight FROM products" - "$DbIncubatingAttributes.DB_OPERATION" "SELECT" - "$DbIncubatingAttributes.DB_SQL_TABLE" "products" + "$DbIncubatingAttributes.DB_QUERY_TEXT" "SELECT id AS request$requestId, name, price, weight FROM products" + "$DbIncubatingAttributes.DB_OPERATION_NAME" "SELECT" + "$DbIncubatingAttributes.DB_COLLECTION_NAME" "products" } } } diff --git a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/VertxReactivePropagationTest.groovy b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/VertxReactivePropagationTest.groovy index 9490912c8f93..9bc757268ff4 100644 --- a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/VertxReactivePropagationTest.groovy +++ b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/VertxReactivePropagationTest.groovy @@ -99,12 +99,11 @@ class VertxReactivePropagationTest extends AgentInstrumentationSpecification { childOf span(2) attributes { "$DbIncubatingAttributes.DB_SYSTEM" "hsqldb" - "$DbIncubatingAttributes.DB_NAME" "test" - "$DbIncubatingAttributes.DB_USER" "SA" + "$DbIncubatingAttributes.DB_NAMESPACE" "test" "$DbIncubatingAttributes.DB_CONNECTION_STRING" "hsqldb:mem:" - "$DbIncubatingAttributes.DB_STATEMENT" "SELECT id, name, price, weight FROM products" - "$DbIncubatingAttributes.DB_OPERATION" "SELECT" - "$DbIncubatingAttributes.DB_SQL_TABLE" "products" + "$DbIncubatingAttributes.DB_QUERY_TEXT" "SELECT id, name, price, weight FROM products" + "$DbIncubatingAttributes.DB_OPERATION_NAME" "SELECT" + "$DbIncubatingAttributes.DB_COLLECTION_NAME" "products" } } } @@ -198,12 +197,11 @@ class VertxReactivePropagationTest extends AgentInstrumentationSpecification { childOf(span(3)) attributes { "$DbIncubatingAttributes.DB_SYSTEM" "hsqldb" - "$DbIncubatingAttributes.DB_NAME" "test" - "$DbIncubatingAttributes.DB_USER" "SA" + "$DbIncubatingAttributes.DB_NAMESPACE" "test" "$DbIncubatingAttributes.DB_CONNECTION_STRING" "hsqldb:mem:" - "$DbIncubatingAttributes.DB_STATEMENT" "SELECT id AS request$requestId, name, price, weight FROM products" - "$DbIncubatingAttributes.DB_OPERATION" "SELECT" - "$DbIncubatingAttributes.DB_SQL_TABLE" "products" + "$DbIncubatingAttributes.DB_QUERY_TEXT" "SELECT id AS request$requestId, name, price, weight FROM products" + "$DbIncubatingAttributes.DB_OPERATION_NAME" "SELECT" + "$DbIncubatingAttributes.DB_COLLECTION_NAME" "products" } } } diff --git a/instrumentation/vertx/vertx-sql-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/sql/VertxSqlClientTest.java b/instrumentation/vertx/vertx-sql-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/sql/VertxSqlClientTest.java index 17f318eb375f..89b27ce0aae0 100644 --- a/instrumentation/vertx/vertx-sql-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/sql/VertxSqlClientTest.java +++ b/instrumentation/vertx/vertx-sql-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/sql/VertxSqlClientTest.java @@ -12,11 +12,10 @@ import static io.opentelemetry.semconv.ExceptionAttributes.EXCEPTION_TYPE; import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS; import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT; -import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_NAME; -import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION; -import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SQL_TABLE; -import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_STATEMENT; -import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_USER; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_COLLECTION_NAME; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_NAMESPACE; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION_NAME; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_QUERY_TEXT; import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.internal.AutoCleanupExtension; @@ -137,11 +136,10 @@ void testSimpleSelect() throws Exception { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(DB_NAME, DB), - equalTo(DB_USER, USER_DB), - equalTo(DB_STATEMENT, "select * from test"), - equalTo(DB_OPERATION, "SELECT"), - equalTo(DB_SQL_TABLE, "test"), + equalTo(DB_NAMESPACE, DB), + equalTo(DB_QUERY_TEXT, "select * from test"), + equalTo(DB_OPERATION_NAME, "SELECT"), + equalTo(DB_COLLECTION_NAME, "test"), equalTo(SERVER_ADDRESS, host), equalTo(SERVER_PORT, port)), span -> @@ -193,9 +191,8 @@ void testInvalidQuery() throws Exception { EXCEPTION_STACKTRACE, val -> val.isInstanceOf(String.class)))) .hasAttributesSatisfyingExactly( - equalTo(DB_NAME, DB), - equalTo(DB_USER, USER_DB), - equalTo(DB_STATEMENT, "invalid"), + equalTo(DB_NAMESPACE, DB), + equalTo(DB_QUERY_TEXT, "invalid"), equalTo(SERVER_ADDRESS, host), equalTo(SERVER_PORT, port)), span -> @@ -227,11 +224,10 @@ private static void assertPreparedSelect() { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(DB_NAME, DB), - equalTo(DB_USER, USER_DB), - equalTo(DB_STATEMENT, "select * from test where id = $1"), - equalTo(DB_OPERATION, "SELECT"), - equalTo(DB_SQL_TABLE, "test"), + equalTo(DB_NAMESPACE, DB), + equalTo(DB_QUERY_TEXT, "select * from test where id = $1"), + equalTo(DB_OPERATION_NAME, "SELECT"), + equalTo(DB_COLLECTION_NAME, "test"), equalTo(SERVER_ADDRESS, host), equalTo(SERVER_PORT, port)))); } @@ -257,11 +253,10 @@ void testBatch() throws Exception { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(DB_NAME, DB), - equalTo(DB_USER, USER_DB), - equalTo(DB_STATEMENT, "insert into test values ($1, $2) returning *"), - equalTo(DB_OPERATION, "INSERT"), - equalTo(DB_SQL_TABLE, "test"), + equalTo(DB_NAMESPACE, DB), + equalTo(DB_QUERY_TEXT, "insert into test values ($1, $2) returning *"), + equalTo(DB_OPERATION_NAME, "INSERT"), + equalTo(DB_COLLECTION_NAME, "test"), equalTo(SERVER_ADDRESS, host), equalTo(SERVER_PORT, port)))); } @@ -343,11 +338,10 @@ void testManyQueries() throws Exception { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(DB_NAME, DB), - equalTo(DB_USER, USER_DB), - equalTo(DB_STATEMENT, "select * from test"), - equalTo(DB_OPERATION, "SELECT"), - equalTo(DB_SQL_TABLE, "test"), + equalTo(DB_NAMESPACE, DB), + equalTo(DB_QUERY_TEXT, "select * from test"), + equalTo(DB_OPERATION_NAME, "SELECT"), + equalTo(DB_COLLECTION_NAME, "test"), equalTo(SERVER_ADDRESS, host), equalTo(SERVER_PORT, port)), span -> @@ -408,11 +402,10 @@ void testConcurrency() throws Exception { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(DB_NAME, DB), - equalTo(DB_USER, USER_DB), - equalTo(DB_STATEMENT, "select * from test where id = $1"), - equalTo(DB_OPERATION, "SELECT"), - equalTo(DB_SQL_TABLE, "test"), + equalTo(DB_NAMESPACE, DB), + equalTo(DB_QUERY_TEXT, "select * from test where id = $1"), + equalTo(DB_OPERATION_NAME, "SELECT"), + equalTo(DB_COLLECTION_NAME, "test"), equalTo(SERVER_ADDRESS, host), equalTo(SERVER_PORT, port)), span -> diff --git a/licenses/licenses.md b/licenses/licenses.md index 1ed39a0d3b56..c50bdf6f6419 100644 --- a/licenses/licenses.md +++ b/licenses/licenses.md @@ -1,7 +1,7 @@ # javaagent ## Dependency License Report -_2024-07-08 16:22:15 PDT_ +_2024-07-09 23:05:09 CST_ ## Apache License, Version 2.0 **1** **Group:** `com.blogspot.mydailyjava` **Name:** `weak-lock-free` **Version:** `0.18` @@ -159,11 +159,11 @@ _2024-07-08 16:22:15 PDT_ > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java-contrib](https://github.com/open-telemetry/opentelemetry-java-contrib) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**36** **Group:** `io.opentelemetry.semconv` **Name:** `opentelemetry-semconv` **Version:** `1.25.0-alpha` +**36** **Group:** `io.opentelemetry.semconv` **Name:** `opentelemetry-semconv` **Version:** `1.26.0-alpha` > - **POM Project URL**: [https://github.com/open-telemetry/semantic-conventions-java](https://github.com/open-telemetry/semantic-conventions-java) > - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0) -**37** **Group:** `io.opentelemetry.semconv` **Name:** `opentelemetry-semconv-incubating` **Version:** `1.25.0-alpha` +**37** **Group:** `io.opentelemetry.semconv` **Name:** `opentelemetry-semconv-incubating` **Version:** `1.26.0-alpha` > - **POM Project URL**: [https://github.com/open-telemetry/semantic-conventions-java](https://github.com/open-telemetry/semantic-conventions-java) > - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0) 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 28a4d8980d9a..741f5cecc773 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 @@ -60,7 +60,8 @@ void shouldInstrumentProducerAndConsumer() { equalTo( MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, "testTopic"), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "publish"), satisfies( MessagingIncubatingAttributes.MESSAGING_CLIENT_ID, stringAssert -> stringAssert.startsWith("producer")), @@ -81,7 +82,8 @@ void shouldInstrumentProducerAndConsumer() { equalTo( MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, "testTopic"), - equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION_TYPE, "process"), satisfies( MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE, AbstractLongAssert::isNotNegative), diff --git a/smoke-tests-otel-starter/spring-boot-common/src/main/java/io/opentelemetry/spring/smoketest/AbstractOtelSpringStarterSmokeTest.java b/smoke-tests-otel-starter/spring-boot-common/src/main/java/io/opentelemetry/spring/smoketest/AbstractOtelSpringStarterSmokeTest.java index 773c00e2cf8d..7c18442aaaf8 100644 --- a/smoke-tests-otel-starter/spring-boot-common/src/main/java/io/opentelemetry/spring/smoketest/AbstractOtelSpringStarterSmokeTest.java +++ b/smoke-tests-otel-starter/spring-boot-common/src/main/java/io/opentelemetry/spring/smoketest/AbstractOtelSpringStarterSmokeTest.java @@ -136,7 +136,7 @@ void shouldSendTelemetry() { spanDataAssert .hasKind(SpanKind.CLIENT) .hasAttribute( - DbIncubatingAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_QUERY_TEXT, "create table customer (id bigint not null, name varchar not null, primary key (id))")), traceAssert -> traceAssert.hasSpansSatisfyingExactly( @@ -219,7 +219,7 @@ void databaseQuery() { span -> span.hasKind(SpanKind.CLIENT) .hasAttribute( - DbIncubatingAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_QUERY_TEXT, "select name from customer where id = 1"))); } diff --git a/smoke-tests-otel-starter/spring-boot-reactive-common/src/main/java/io/opentelemetry/spring/smoketest/AbstractOtelReactiveSpringStarterSmokeTest.java b/smoke-tests-otel-starter/spring-boot-reactive-common/src/main/java/io/opentelemetry/spring/smoketest/AbstractOtelReactiveSpringStarterSmokeTest.java index 8de8f4fc0ac5..79dc20534afa 100644 --- a/smoke-tests-otel-starter/spring-boot-reactive-common/src/main/java/io/opentelemetry/spring/smoketest/AbstractOtelReactiveSpringStarterSmokeTest.java +++ b/smoke-tests-otel-starter/spring-boot-reactive-common/src/main/java/io/opentelemetry/spring/smoketest/AbstractOtelReactiveSpringStarterSmokeTest.java @@ -58,12 +58,12 @@ void webClientAndWebFluxAndR2dbc() { s -> assertThat(s.getName()) .isEqualToIgnoringCase("SELECT testdb.PLAYER")) - .hasAttribute(DbIncubatingAttributes.DB_NAME, "testdb") + .hasAttribute(DbIncubatingAttributes.DB_NAMESPACE, "testdb") // 2 is not replaced by ?, // otel.instrumentation.common.db-statement-sanitizer.enabled=false .hasAttributesSatisfying( a -> - assertThat(a.get(DbIncubatingAttributes.DB_STATEMENT)) + assertThat(a.get(DbIncubatingAttributes.DB_QUERY_TEXT)) .isEqualToIgnoringCase( "SELECT PLAYER.* FROM PLAYER WHERE PLAYER.ID = $1 LIMIT 2")) .hasAttribute(DbIncubatingAttributes.DB_SYSTEM, "h2")));