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 74ab20759001..c0b4b13a17b4 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 @@ -14,6 +14,7 @@ import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS; import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT; import static io.opentelemetry.semconv.UrlAttributes.URL_FULL; +import static io.opentelemetry.semconv.incubating.AwsIncubatingAttributes.AWS_REQUEST_ID; import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME; import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID; import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_OPERATION; @@ -37,7 +38,6 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.test.utils.PortUtils; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; -import io.opentelemetry.semconv.incubating.AwsIncubatingAttributes; import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import org.elasticmq.rest.sqs.SQSRestServer; import org.elasticmq.rest.sqs.SQSRestServerBuilder; @@ -107,9 +107,7 @@ void testSimpleSqsProducerConsumerServices() { equalTo(stringKey("aws.agent"), "java-aws-sdk"), equalTo(stringKey("aws.endpoint"), "http://localhost:" + sqsPort), equalTo(stringKey("aws.queue.name"), "testSdkSqs"), - satisfies( - AwsIncubatingAttributes.AWS_REQUEST_ID, - val -> val.isInstanceOf(String.class)), + satisfies(AWS_REQUEST_ID, val -> val.isInstanceOf(String.class)), equalTo(RPC_SYSTEM, "aws-api"), equalTo(RPC_SERVICE, "AmazonSQS"), equalTo(RPC_METHOD, "CreateQueue"), @@ -131,9 +129,7 @@ void testSimpleSqsProducerConsumerServices() { equalTo( stringKey("aws.queue.url"), "http://localhost:" + sqsPort + "/000000000000/testSdkSqs"), - satisfies( - AwsIncubatingAttributes.AWS_REQUEST_ID, - val -> val.isInstanceOf(String.class)), + satisfies(AWS_REQUEST_ID, val -> val.isInstanceOf(String.class)), equalTo(RPC_SYSTEM, "aws-api"), equalTo(RPC_SERVICE, "AmazonSQS"), equalTo(RPC_METHOD, "SendMessage"), @@ -161,9 +157,7 @@ void testSimpleSqsProducerConsumerServices() { equalTo( stringKey("aws.queue.url"), "http://localhost:" + sqsPort + "/000000000000/testSdkSqs"), - satisfies( - AwsIncubatingAttributes.AWS_REQUEST_ID, - val -> val.isInstanceOf(String.class)), + satisfies(AWS_REQUEST_ID, val -> val.isInstanceOf(String.class)), equalTo(RPC_SYSTEM, "aws-api"), equalTo(RPC_SERVICE, "AmazonSQS"), equalTo(RPC_METHOD, "ReceiveMessage"), @@ -219,9 +213,7 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() { equalTo(stringKey("aws.agent"), "java-aws-sdk"), equalTo(stringKey("aws.endpoint"), "http://localhost:" + sqsPort), equalTo(stringKey("aws.queue.name"), "testSdkSqs"), - satisfies( - AwsIncubatingAttributes.AWS_REQUEST_ID, - val -> val.isInstanceOf(String.class)), + satisfies(AWS_REQUEST_ID, val -> val.isInstanceOf(String.class)), equalTo(RPC_SYSTEM, "aws-api"), equalTo(RPC_SERVICE, "AmazonSQS"), equalTo(RPC_METHOD, "CreateQueue"), @@ -243,9 +235,7 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() { equalTo( stringKey("aws.queue.url"), "http://localhost:" + sqsPort + "/000000000000/testSdkSqs"), - satisfies( - AwsIncubatingAttributes.AWS_REQUEST_ID, - val -> val.isInstanceOf(String.class)), + satisfies(AWS_REQUEST_ID, val -> val.isInstanceOf(String.class)), equalTo(RPC_SYSTEM, "aws-api"), equalTo(RPC_SERVICE, "AmazonSQS"), equalTo(RPC_METHOD, "SendMessage"), @@ -273,9 +263,7 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() { equalTo( stringKey("aws.queue.url"), "http://localhost:" + sqsPort + "/000000000000/testSdkSqs"), - satisfies( - AwsIncubatingAttributes.AWS_REQUEST_ID, - val -> val.isInstanceOf(String.class)), + satisfies(AWS_REQUEST_ID, val -> val.isInstanceOf(String.class)), equalTo(RPC_SYSTEM, "aws-api"), equalTo(RPC_SERVICE, "AmazonSQS"), equalTo(RPC_METHOD, "ReceiveMessage"), @@ -314,9 +302,7 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() { equalTo( stringKey("aws.queue.url"), "http://localhost:" + sqsPort + "/000000000000/testSdkSqs"), - satisfies( - AwsIncubatingAttributes.AWS_REQUEST_ID, - val -> val.isInstanceOf(String.class)), + satisfies(AWS_REQUEST_ID, val -> val.isInstanceOf(String.class)), equalTo(RPC_SYSTEM, "aws-api"), equalTo(RPC_SERVICE, "AmazonSQS"), equalTo(RPC_METHOD, "ReceiveMessage"), 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 92a9e88384bd..f1bfa126cad8 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 @@ -15,6 +15,7 @@ import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS; import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT; import static io.opentelemetry.semconv.UrlAttributes.URL_FULL; +import static io.opentelemetry.semconv.incubating.AwsIncubatingAttributes.AWS_REQUEST_ID; import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_BATCH_MESSAGE_COUNT; import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME; import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID; @@ -44,7 +45,6 @@ import io.opentelemetry.sdk.testing.assertj.AttributeAssertion; import io.opentelemetry.sdk.testing.assertj.SpanDataAssert; import io.opentelemetry.sdk.trace.data.SpanData; -import io.opentelemetry.semconv.incubating.AwsIncubatingAttributes; import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import java.util.ArrayList; import java.util.Arrays; @@ -141,9 +141,7 @@ void testSimpleSqsProducerConsumerServicesCaptureHeaders(boolean testCaptureHead equalTo(stringKey("aws.agent"), "java-aws-sdk"), equalTo(stringKey("aws.endpoint"), "http://localhost:" + sqsPort), equalTo(stringKey("aws.queue.name"), "testSdkSqs"), - satisfies( - AwsIncubatingAttributes.AWS_REQUEST_ID, - val -> val.isInstanceOf(String.class)), + satisfies(AWS_REQUEST_ID, val -> val.isInstanceOf(String.class)), equalTo(RPC_SYSTEM, "aws-api"), equalTo(RPC_SERVICE, "AmazonSQS"), equalTo(RPC_METHOD, "CreateQueue"), @@ -164,9 +162,7 @@ void testSimpleSqsProducerConsumerServicesCaptureHeaders(boolean testCaptureHead equalTo( stringKey("aws.queue.url"), "http://localhost:" + sqsPort + "/000000000000/testSdkSqs"), - satisfies( - AwsIncubatingAttributes.AWS_REQUEST_ID, - val -> val.isInstanceOf(String.class)), + satisfies(AWS_REQUEST_ID, val -> val.isInstanceOf(String.class)), equalTo(RPC_SYSTEM, "aws-api"), equalTo(RPC_SERVICE, "AmazonSQS"), equalTo(RPC_METHOD, "SendMessage"), @@ -208,9 +204,7 @@ void testSimpleSqsProducerConsumerServicesCaptureHeaders(boolean testCaptureHead equalTo( stringKey("aws.queue.url"), "http://localhost:" + sqsPort + "/000000000000/testSdkSqs"), - satisfies( - AwsIncubatingAttributes.AWS_REQUEST_ID, - val -> val.isInstanceOf(String.class)), + satisfies(AWS_REQUEST_ID, val -> val.isInstanceOf(String.class)), equalTo(RPC_SYSTEM, "aws-api"), equalTo(RPC_SERVICE, "AmazonSQS"), equalTo(RPC_METHOD, "ReceiveMessage"), @@ -249,9 +243,7 @@ void testSimpleSqsProducerConsumerServicesCaptureHeaders(boolean testCaptureHead equalTo( stringKey("aws.queue.url"), "http://localhost:" + sqsPort + "/000000000000/testSdkSqs"), - satisfies( - AwsIncubatingAttributes.AWS_REQUEST_ID, - val -> val.isInstanceOf(String.class)), + satisfies(AWS_REQUEST_ID, val -> val.isInstanceOf(String.class)), equalTo(RPC_SYSTEM, "aws-api"), equalTo(RPC_SERVICE, "AmazonSQS"), equalTo(RPC_METHOD, "ReceiveMessage"), @@ -319,9 +311,7 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() { equalTo(stringKey("aws.agent"), "java-aws-sdk"), equalTo(stringKey("aws.endpoint"), "http://localhost:" + sqsPort), equalTo(stringKey("aws.queue.name"), "testSdkSqs"), - satisfies( - AwsIncubatingAttributes.AWS_REQUEST_ID, - val -> val.isInstanceOf(String.class)), + satisfies(AWS_REQUEST_ID, val -> val.isInstanceOf(String.class)), equalTo(RPC_SYSTEM, "aws-api"), equalTo(RPC_SERVICE, "AmazonSQS"), equalTo(RPC_METHOD, "CreateQueue"), @@ -343,9 +333,7 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() { equalTo( stringKey("aws.queue.url"), "http://localhost:" + sqsPort + "/000000000000/testSdkSqs"), - satisfies( - AwsIncubatingAttributes.AWS_REQUEST_ID, - val -> val.isInstanceOf(String.class)), + satisfies(AWS_REQUEST_ID, val -> val.isInstanceOf(String.class)), equalTo(RPC_SYSTEM, "aws-api"), equalTo(RPC_SERVICE, "AmazonSQS"), equalTo(RPC_METHOD, "SendMessage"), @@ -388,8 +376,7 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() { + sqsPort + "/000000000000/testSdkSqs"), satisfies( - AwsIncubatingAttributes.AWS_REQUEST_ID, - val -> val.isInstanceOf(String.class)), + AWS_REQUEST_ID, val -> val.isInstanceOf(String.class)), equalTo(RPC_SYSTEM, "aws-api"), equalTo(RPC_SERVICE, "AmazonSQS"), equalTo(RPC_METHOD, "ReceiveMessage"), @@ -413,8 +400,7 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() { + sqsPort + "/000000000000/testSdkSqs"), satisfies( - AwsIncubatingAttributes.AWS_REQUEST_ID, - val -> val.isInstanceOf(String.class)), + AWS_REQUEST_ID, val -> val.isInstanceOf(String.class)), equalTo(RPC_SYSTEM, "aws-api"), equalTo(RPC_SERVICE, "AmazonSQS"), equalTo(RPC_METHOD, "ReceiveMessage"), @@ -448,8 +434,7 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() { + sqsPort + "/000000000000/testSdkSqs"), satisfies( - AwsIncubatingAttributes.AWS_REQUEST_ID, - val -> val.isInstanceOf(String.class)), + AWS_REQUEST_ID, val -> val.isInstanceOf(String.class)), equalTo(RPC_SYSTEM, "aws-api"), equalTo(RPC_SERVICE, "AmazonSQS"), equalTo(RPC_METHOD, "ReceiveMessage"), 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 1a872e415250..73d2a0ba824c 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 @@ -13,6 +13,7 @@ import static io.opentelemetry.semconv.HttpAttributes.HTTP_RESPONSE_STATUS_CODE; import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS; import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT; +import static io.opentelemetry.semconv.incubating.AwsIncubatingAttributes.AWS_REQUEST_ID; import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION; import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SYSTEM; import static io.opentelemetry.semconv.incubating.RpcIncubatingAttributes.RPC_METHOD; @@ -22,7 +23,6 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.api.internal.ConfigPropertiesUtil; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; -import io.opentelemetry.semconv.incubating.AwsIncubatingAttributes; import io.opentelemetry.testing.internal.armeria.common.HttpResponse; import io.opentelemetry.testing.internal.armeria.common.HttpStatus; import io.opentelemetry.testing.internal.armeria.common.MediaType; @@ -182,7 +182,7 @@ public void testSendDynamoDbRequestWithRetries() { equalTo(RPC_SERVICE, service), equalTo(RPC_METHOD, operation), equalTo(stringKey("aws.agent"), "java-aws-sdk"), - equalTo(AwsIncubatingAttributes.AWS_REQUEST_ID, requestId), + equalTo(AWS_REQUEST_ID, requestId), equalTo(stringKey("aws.table.name"), "sometable"), equalTo(DB_SYSTEM, "dynamodb"), equalTo(maybeStable(DB_OPERATION), operation)); diff --git a/instrumentation/hibernate/hibernate-6.0/spring-testing/src/test/java/spring/jpa/SpringJpaTest.java b/instrumentation/hibernate/hibernate-6.0/spring-testing/src/test/java/spring/jpa/SpringJpaTest.java index becfe4aef79c..8e4d345e7047 100644 --- a/instrumentation/hibernate/hibernate-6.0/spring-testing/src/test/java/spring/jpa/SpringJpaTest.java +++ b/instrumentation/hibernate/hibernate-6.0/spring-testing/src/test/java/spring/jpa/SpringJpaTest.java @@ -12,11 +12,13 @@ import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStable; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies; +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_SYSTEM; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_USER; import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DbSystemIncubatingValues.HSQLDB; import static java.util.Arrays.asList; import static org.assertj.core.api.Assertions.assertThat; @@ -24,7 +26,6 @@ import io.opentelemetry.api.common.Attributes; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -51,7 +52,7 @@ static void tearDown() { } } - @SuppressWarnings("deprecation") // DbIncubatingAttributes.DB_NAME has been deprecated + @SuppressWarnings("deprecation") // using deprecated semconv @Test void testCrud() { Customer customer = new Customer("Bob", "Anonymous"); @@ -82,11 +83,9 @@ void testCrud() { .hasAttributesSatisfyingExactly( equalTo(DB_SYSTEM, HSQLDB), equalTo(maybeStable(DB_NAME), "test"), + equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"), equalTo( - DbIncubatingAttributes.DB_USER, - emitStableDatabaseSemconv() ? null : "sa"), - equalTo( - DbIncubatingAttributes.DB_CONNECTION_STRING, + DB_CONNECTION_STRING, emitStableDatabaseSemconv() ? null : "hsqldb:mem:"), satisfies( maybeStable(DB_STATEMENT), @@ -136,12 +135,10 @@ void testCrud() { .hasAttributesSatisfyingExactly( equalTo(DB_SYSTEM, HSQLDB), equalTo(maybeStable(DB_NAME), "test"), - equalTo( - DbIncubatingAttributes.DB_USER, - emitStableDatabaseSemconv() ? null : "sa"), + equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"), equalTo(maybeStable(DB_STATEMENT), "call next value for Customer_SEQ"), equalTo( - DbIncubatingAttributes.DB_CONNECTION_STRING, + DB_CONNECTION_STRING, emitStableDatabaseSemconv() ? null : "hsqldb:mem:"), equalTo(maybeStable(DB_OPERATION), "CALL")), span -> @@ -162,11 +159,9 @@ void testCrud() { .hasAttributesSatisfyingExactly( equalTo(DB_SYSTEM, HSQLDB), equalTo(maybeStable(DB_NAME), "test"), + equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"), equalTo( - DbIncubatingAttributes.DB_USER, - emitStableDatabaseSemconv() ? null : "sa"), - equalTo( - DbIncubatingAttributes.DB_CONNECTION_STRING, + DB_CONNECTION_STRING, emitStableDatabaseSemconv() ? null : "hsqldb:mem:"), satisfies( maybeStable(DB_STATEMENT), @@ -203,11 +198,9 @@ void testCrud() { .hasAttributesSatisfyingExactly( equalTo(DB_SYSTEM, HSQLDB), equalTo(maybeStable(DB_NAME), "test"), + equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"), equalTo( - DbIncubatingAttributes.DB_USER, - emitStableDatabaseSemconv() ? null : "sa"), - equalTo( - DbIncubatingAttributes.DB_CONNECTION_STRING, + DB_CONNECTION_STRING, emitStableDatabaseSemconv() ? null : "hsqldb:mem:"), satisfies( maybeStable(DB_STATEMENT), @@ -233,11 +226,9 @@ void testCrud() { .hasAttributesSatisfyingExactly( equalTo(DB_SYSTEM, HSQLDB), equalTo(maybeStable(DB_NAME), "test"), + equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"), equalTo( - DbIncubatingAttributes.DB_USER, - emitStableDatabaseSemconv() ? null : "sa"), - equalTo( - DbIncubatingAttributes.DB_CONNECTION_STRING, + DB_CONNECTION_STRING, emitStableDatabaseSemconv() ? null : "hsqldb:mem:"), satisfies( maybeStable(DB_STATEMENT), @@ -278,11 +269,9 @@ void testCrud() { .hasAttributesSatisfyingExactly( equalTo(DB_SYSTEM, HSQLDB), equalTo(maybeStable(DB_NAME), "test"), + equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"), equalTo( - DbIncubatingAttributes.DB_USER, - emitStableDatabaseSemconv() ? null : "sa"), - equalTo( - DbIncubatingAttributes.DB_CONNECTION_STRING, + DB_CONNECTION_STRING, emitStableDatabaseSemconv() ? null : "hsqldb:mem:"), satisfies( maybeStable(DB_STATEMENT), @@ -321,11 +310,9 @@ void testCrud() { .hasAttributesSatisfyingExactly( equalTo(DB_SYSTEM, HSQLDB), equalTo(maybeStable(DB_NAME), "test"), + equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"), equalTo( - DbIncubatingAttributes.DB_USER, - emitStableDatabaseSemconv() ? null : "sa"), - equalTo( - DbIncubatingAttributes.DB_CONNECTION_STRING, + DB_CONNECTION_STRING, emitStableDatabaseSemconv() ? null : "hsqldb:mem:"), satisfies( maybeStable(DB_STATEMENT), @@ -364,11 +351,9 @@ void testCrud() { .hasAttributesSatisfyingExactly( equalTo(DB_SYSTEM, HSQLDB), equalTo(maybeStable(DB_NAME), "test"), + equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"), equalTo( - DbIncubatingAttributes.DB_USER, - emitStableDatabaseSemconv() ? null : "sa"), - equalTo( - DbIncubatingAttributes.DB_CONNECTION_STRING, + DB_CONNECTION_STRING, emitStableDatabaseSemconv() ? null : "hsqldb:mem:"), equalTo(maybeStable(DB_STATEMENT), "delete from Customer where id=?"), equalTo(maybeStable(DB_OPERATION), "DELETE"), diff --git a/instrumentation/jdbc/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jdbc/test/JdbcInstrumentationTest.java b/instrumentation/jdbc/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jdbc/test/JdbcInstrumentationTest.java index 92684a9026bf..3589be3c1b74 100644 --- a/instrumentation/jdbc/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jdbc/test/JdbcInstrumentationTest.java +++ b/instrumentation/jdbc/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jdbc/test/JdbcInstrumentationTest.java @@ -12,6 +12,7 @@ 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_NAMESPACE; import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION; @@ -27,7 +28,6 @@ import com.mchange.v2.c3p0.ComboPooledDataSource; import com.zaxxer.hikari.HikariConfig; import com.zaxxer.hikari.HikariDataSource; -import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.jdbc.TestConnection; import io.opentelemetry.instrumentation.jdbc.TestDriver; @@ -37,7 +37,6 @@ import io.opentelemetry.sdk.testing.assertj.SpanDataAssert; import io.opentelemetry.sdk.testing.assertj.TraceAssert; import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes; -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import java.beans.PropertyVetoException; import java.io.Closeable; import java.io.IOException; @@ -80,10 +79,6 @@ class JdbcInstrumentationTest { @RegisterExtension static final InstrumentationExtension testing = AgentInstrumentationExtension.create(); - @SuppressWarnings("deprecation") // TODO DB_CONNECTION_STRING deprecation - static final AttributeKey DB_CONNECTION_STRING = - DbIncubatingAttributes.DB_CONNECTION_STRING; - private static final String dbName = "jdbcUnitTest"; private static final String dbNameLower = dbName.toLowerCase(Locale.ROOT); private static final Map jdbcUrls = diff --git a/instrumentation/ratpack/ratpack-1.4/testing/src/main/java/io/opentelemetry/instrumentation/ratpack/client/AbstractRatpackHttpClientTest.java b/instrumentation/ratpack/ratpack-1.4/testing/src/main/java/io/opentelemetry/instrumentation/ratpack/client/AbstractRatpackHttpClientTest.java index 3e3ed9a1f6f1..dab84fea198b 100644 --- a/instrumentation/ratpack/ratpack-1.4/testing/src/main/java/io/opentelemetry/instrumentation/ratpack/client/AbstractRatpackHttpClientTest.java +++ b/instrumentation/ratpack/ratpack-1.4/testing/src/main/java/io/opentelemetry/instrumentation/ratpack/client/AbstractRatpackHttpClientTest.java @@ -5,6 +5,7 @@ package io.opentelemetry.instrumentation.ratpack.client; +import static io.opentelemetry.semconv.NetworkAttributes.NETWORK_PROTOCOL_VERSION; import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS; import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT; @@ -14,7 +15,6 @@ import io.opentelemetry.instrumentation.testing.junit.http.AbstractHttpClientTest; import io.opentelemetry.instrumentation.testing.junit.http.HttpClientResult; import io.opentelemetry.instrumentation.testing.junit.http.HttpClientTestOptions; -import io.opentelemetry.semconv.NetworkAttributes; import java.net.URI; import java.time.Duration; import java.util.Collections; @@ -158,7 +158,7 @@ protected Set> computeHttpAttributes(URI uri) { attributes.remove(SERVER_PORT); } else { // ratpack client instrumentation does not provide this - attributes.remove(NetworkAttributes.NETWORK_PROTOCOL_VERSION); + attributes.remove(NETWORK_PROTOCOL_VERSION); } return attributes; } diff --git a/instrumentation/spring/spring-cloud-aws-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/aws/AwsSqsTest.java b/instrumentation/spring/spring-cloud-aws-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/aws/AwsSqsTest.java index 4c35dc6776dd..87a6ba980605 100644 --- a/instrumentation/spring/spring-cloud-aws-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/aws/AwsSqsTest.java +++ b/instrumentation/spring/spring-cloud-aws-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/aws/AwsSqsTest.java @@ -13,6 +13,7 @@ import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS; import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT; import static io.opentelemetry.semconv.UrlAttributes.URL_FULL; +import static io.opentelemetry.semconv.incubating.AwsIncubatingAttributes.AWS_REQUEST_ID; import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME; import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID; import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_OPERATION; @@ -28,7 +29,6 @@ import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.semconv.HttpAttributes; -import io.opentelemetry.semconv.incubating.AwsIncubatingAttributes; import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; @@ -106,9 +106,7 @@ void sqsListener() throws InterruptedException, ExecutionException, TimeoutExcep v.startsWith( "http://localhost:" + AwsSqsTestApplication.sqsPort)), equalTo(AttributeKey.stringKey("aws.queue.name"), "test-queue"), - satisfies( - AwsIncubatingAttributes.AWS_REQUEST_ID, - val -> val.isInstanceOf(String.class))), + satisfies(AWS_REQUEST_ID, val -> val.isInstanceOf(String.class))), span -> span.hasName("test-queue publish") .hasKind(SpanKind.PRODUCER) @@ -139,9 +137,7 @@ void sqsListener() throws InterruptedException, ExecutionException, TimeoutExcep "http://localhost:" + AwsSqsTestApplication.sqsPort + "/000000000000/test-queue"), - satisfies( - AwsIncubatingAttributes.AWS_REQUEST_ID, - val -> val.isInstanceOf(String.class))), + satisfies(AWS_REQUEST_ID, val -> val.isInstanceOf(String.class))), span -> span.hasName("test-queue process") .hasKind(SpanKind.CONSUMER) @@ -192,8 +188,6 @@ void sqsListener() throws InterruptedException, ExecutionException, TimeoutExcep "http://localhost:" + AwsSqsTestApplication.sqsPort + "/000000000000/test-queue"), - satisfies( - AwsIncubatingAttributes.AWS_REQUEST_ID, - val -> val.isInstanceOf(String.class))))); + satisfies(AWS_REQUEST_ID, val -> val.isInstanceOf(String.class))))); } }