diff --git a/bom-alpha/build.gradle.kts b/bom-alpha/build.gradle.kts index b4bd0cced0..4eb6acede7 100644 --- a/bom-alpha/build.gradle.kts +++ b/bom-alpha/build.gradle.kts @@ -18,11 +18,10 @@ dependencies { // Get the semconv version from :dependencyManagement val semconvConstraint = project.project(project(":dependencyManagement").path).configurations["api"].allDependencyConstraints .find { it.group.equals("io.opentelemetry.semconv") - && it.name.equals("opentelemetry-semconv") } + && it.name.equals("opentelemetry-semconv-incubating") } ?: throw Exception("semconv constraint not found") - val semconvVersion = semconvConstraint.version ?: throw Exception("missing version") - otelBom.addExtra(semconvConstraint.group, semconvConstraint.name, semconvVersion) - otelBom.addExtra(semconvConstraint.group, "opentelemetry-semconv-incubating", semconvVersion) + val semconvAlphaVersion = semconvConstraint.version ?: throw Exception("missing version") + otelBom.addExtra(semconvConstraint.group, "opentelemetry-semconv-incubating", semconvAlphaVersion) } otelBom.projectFilter.set { it.findProperty("otel.stable") != "true" } diff --git a/bom/build.gradle.kts b/bom/build.gradle.kts index 7b387f30d2..b8745c9a16 100644 --- a/bom/build.gradle.kts +++ b/bom/build.gradle.kts @@ -12,6 +12,14 @@ javaPlatform { dependencies { api(platform("io.opentelemetry:opentelemetry-bom")) + + // Get the semconv version from :dependencyManagement + val semconvConstraint = project.project(project(":dependencyManagement").path).configurations["api"].allDependencyConstraints + .find { it.group.equals("io.opentelemetry.semconv") + && it.name.equals("opentelemetry-semconv") } + ?: throw Exception("semconv constraint not found") + val semconvVersion = semconvConstraint.version ?: throw Exception("missing version") + otelBom.addExtra(semconvConstraint.group, semconvConstraint.name, semconvVersion) } otelBom.projectFilter.set { it.findProperty("otel.stable") == "true" } diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index e2f6ce0316..a86b00b90a 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -46,11 +46,12 @@ val asmVersion = "9.7.1" val jmhVersion = "1.37" val mockitoVersion = "4.11.0" val slf4jVersion = "2.0.16" -val semConvVersion = "1.29.0-alpha" +val semConvVersion = "1.30.0-rc.1" +val semConvAlphaVersion = semConvVersion.replaceFirst("(-rc.*)?$".toRegex(), "-alpha$1") val CORE_DEPENDENCIES = listOf( "io.opentelemetry.semconv:opentelemetry-semconv:${semConvVersion}", - "io.opentelemetry.semconv:opentelemetry-semconv-incubating:${semConvVersion}", + "io.opentelemetry.semconv:opentelemetry-semconv-incubating:${semConvAlphaVersion}", "com.google.auto.service:auto-service:${autoServiceVersion}", "com.google.auto.service:auto-service-annotations:${autoServiceVersion}", "com.google.auto.value:auto-value:${autoValueVersion}", diff --git a/instrumentation-annotations-support-testing/src/main/java/io/opentelemetry/javaagent/instrumentation/otelannotations/AbstractWithSpanTest.java b/instrumentation-annotations-support-testing/src/main/java/io/opentelemetry/javaagent/instrumentation/otelannotations/AbstractWithSpanTest.java index b76df02830..9d5ef28593 100644 --- a/instrumentation-annotations-support-testing/src/main/java/io/opentelemetry/javaagent/instrumentation/otelannotations/AbstractWithSpanTest.java +++ b/instrumentation-annotations-support-testing/src/main/java/io/opentelemetry/javaagent/instrumentation/otelannotations/AbstractWithSpanTest.java @@ -19,6 +19,7 @@ import io.opentelemetry.sdk.trace.data.StatusData; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +@SuppressWarnings("deprecation") // CodeIncubatingAttributes.CODE_FUNCTION is deprecated public abstract class AbstractWithSpanTest { @RegisterExtension 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 90e4c0a272..226db055b2 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 @@ -24,6 +24,8 @@ abstract class DbClientCommonAttributesExtractor< private static final AttributeKey DB_NAME = AttributeKey.stringKey("db.name"); static final AttributeKey DB_NAMESPACE = AttributeKey.stringKey("db.namespace"); static final AttributeKey DB_SYSTEM = AttributeKey.stringKey("db.system"); + public static final AttributeKey DB_SYSTEM_NAME = + AttributeKey.stringKey("db.system.name"); private static final AttributeKey DB_USER = AttributeKey.stringKey("db.user"); private static final AttributeKey DB_CONNECTION_STRING = AttributeKey.stringKey("db.connection_string"); @@ -37,11 +39,15 @@ abstract class DbClientCommonAttributesExtractor< @SuppressWarnings("deprecation") // until old db semconv are dropped @Override public void onStart(AttributesBuilder attributes, Context parentContext, REQUEST request) { - internalSet(attributes, DB_SYSTEM, getter.getDbSystem(request)); if (SemconvStability.emitStableDatabaseSemconv()) { + internalSet( + attributes, + DB_SYSTEM_NAME, + SemconvStability.stableDbSystemName(getter.getDbSystem(request))); internalSet(attributes, DB_NAMESPACE, getter.getDbNamespace(request)); } if (SemconvStability.emitOldDatabaseSemconv()) { + internalSet(attributes, DB_SYSTEM, getter.getDbSystem(request)); internalSet(attributes, DB_USER, getter.getUser(request)); internalSet(attributes, DB_NAME, getter.getDbNamespace(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/DbClientMetricsAdvice.java b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientMetricsAdvice.java index 1fcd386dc8..bce9910964 100644 --- a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientMetricsAdvice.java +++ b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientMetricsAdvice.java @@ -28,7 +28,7 @@ final class DbClientMetricsAdvice { ((ExtendedDoubleHistogramBuilder) builder) .setAttributesAdvice( asList( - DbClientCommonAttributesExtractor.DB_SYSTEM, + DbClientCommonAttributesExtractor.DB_SYSTEM_NAME, SqlClientAttributesExtractor.DB_COLLECTION_NAME, DbClientCommonAttributesExtractor.DB_NAMESPACE, DbClientAttributesExtractor.DB_OPERATION_NAME, diff --git a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/code/CodeAttributesExtractorTest.java b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/code/CodeAttributesExtractorTest.java index 1e399b0aa9..9d93093f45 100644 --- a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/code/CodeAttributesExtractorTest.java +++ b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/code/CodeAttributesExtractorTest.java @@ -37,6 +37,7 @@ class CodeAttributesExtractorTest { } } + @SuppressWarnings("deprecation") // using deprecated semconv @Test void shouldExtractAllAttributes() { // given 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 bb5f7e3a7c..7ee75a5183 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 @@ -84,6 +84,7 @@ class DbClientAttributesExtractorTest { assertThat(startAttributes.build()) .containsOnly( entry(DbIncubatingAttributes.DB_SYSTEM, "myDb"), + entry(DbIncubatingAttributes.DB_SYSTEM_NAME, "myDb"), entry(DbIncubatingAttributes.DB_USER, "username"), entry(DbIncubatingAttributes.DB_NAME, "potatoes"), entry(DbIncubatingAttributes.DB_CONNECTION_STRING, "mydb:///potatoes"), @@ -104,7 +105,7 @@ class DbClientAttributesExtractorTest { } else if (SemconvStability.emitStableDatabaseSemconv()) { assertThat(startAttributes.build()) .containsOnly( - entry(DbIncubatingAttributes.DB_SYSTEM, "myDb"), + entry(DbIncubatingAttributes.DB_SYSTEM_NAME, "myDb"), entry(DbIncubatingAttributes.DB_NAMESPACE, "potatoes"), entry(DbIncubatingAttributes.DB_QUERY_TEXT, "SELECT * FROM potato"), entry(DbIncubatingAttributes.DB_OPERATION_NAME, "SELECT")); diff --git a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientMetricsTest.java b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientMetricsTest.java index c54ff9ba6d..8ca4ce4997 100644 --- a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientMetricsTest.java +++ b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientMetricsTest.java @@ -42,7 +42,7 @@ class DbClientMetricsTest { Attributes operationAttributes = Attributes.builder() - .put(DbClientCommonAttributesExtractor.DB_SYSTEM, "myDb") + .put(DbClientCommonAttributesExtractor.DB_SYSTEM_NAME, "myDb") .put(SqlClientAttributesExtractor.DB_COLLECTION_NAME, "table") .put(DbClientCommonAttributesExtractor.DB_NAMESPACE, "potatoes") .put(DbClientAttributesExtractor.DB_OPERATION_NAME, "SELECT") @@ -89,7 +89,7 @@ class DbClientMetricsTest { .hasSum(0.15 /* seconds */) .hasAttributesSatisfying( equalTo( - DbClientCommonAttributesExtractor.DB_SYSTEM, + DbClientCommonAttributesExtractor.DB_SYSTEM_NAME, "myDb"), equalTo( DbClientCommonAttributesExtractor.DB_NAMESPACE, 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 6f5b9d73f6..b5fffdf08f 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 @@ -108,6 +108,7 @@ class SqlClientAttributesExtractorTest { assertThat(startAttributes.build()) .containsOnly( entry(DbIncubatingAttributes.DB_SYSTEM, "myDb"), + entry(DbIncubatingAttributes.DB_SYSTEM_NAME, "myDb"), entry(DbIncubatingAttributes.DB_USER, "username"), entry(DbIncubatingAttributes.DB_NAME, "potatoes"), entry(DbIncubatingAttributes.DB_CONNECTION_STRING, "mydb:///potatoes"), @@ -131,7 +132,7 @@ class SqlClientAttributesExtractorTest { } else if (SemconvStability.emitStableDatabaseSemconv()) { assertThat(startAttributes.build()) .containsOnly( - entry(DbIncubatingAttributes.DB_SYSTEM, "myDb"), + entry(DbIncubatingAttributes.DB_SYSTEM_NAME, "myDb"), entry(DbIncubatingAttributes.DB_NAMESPACE, "potatoes"), entry(DbIncubatingAttributes.DB_QUERY_TEXT, "SELECT * FROM potato WHERE id=?"), entry(DbIncubatingAttributes.DB_OPERATION_NAME, "SELECT"), diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/SemconvStability.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/SemconvStability.java index bbf7706c5a..6976bb268c 100644 --- a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/SemconvStability.java +++ b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/SemconvStability.java @@ -7,7 +7,9 @@ package io.opentelemetry.instrumentation.api.internal; import static java.util.Arrays.asList; +import java.util.HashMap; import java.util.HashSet; +import java.util.Map; import java.util.Set; /** @@ -50,5 +52,30 @@ public final class SemconvStability { return emitStableDatabaseSemconv; } + private static final Map dbSystemNameMap = new HashMap<>(); + + static { + dbSystemNameMap.put("adabas", "softwareag.adabas"); + dbSystemNameMap.put("intersystems_cache", "intersystems.cache"); + dbSystemNameMap.put("cosmosdb", "azure.cosmosdb"); + dbSystemNameMap.put("db2", "ibm.db2"); + dbSystemNameMap.put("dynamodb", "aws.dynamodb"); + dbSystemNameMap.put("h2", "h2database"); + dbSystemNameMap.put("hanadb", "sap.hana"); + dbSystemNameMap.put("informix", "ibm.informix"); + dbSystemNameMap.put("ingres", "actian.ingres"); + dbSystemNameMap.put("maxdb", "sap.maxdb"); + dbSystemNameMap.put("mssql", "microsoft.sql_server"); + dbSystemNameMap.put("netezza", "ibm.netezza"); + dbSystemNameMap.put("oracle", "oracle.db"); + dbSystemNameMap.put("redshift", "aws.redshift"); + dbSystemNameMap.put("spanner", "gcp.spanner"); + } + + public static String stableDbSystemName(String oldDbSystem) { + String dbSystemName = dbSystemNameMap.get(oldDbSystem); + return dbSystemName != null ? dbSystemName : oldDbSystem; + } + private SemconvStability() {} } diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/DynamoDbAttributesExtractor.java b/instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/DynamoDbAttributesExtractor.java index 664c512db7..f014955c2f 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/DynamoDbAttributesExtractor.java +++ b/instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/DynamoDbAttributesExtractor.java @@ -12,6 +12,7 @@ import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; import io.opentelemetry.instrumentation.api.internal.AttributesExtractorUtil; +import io.opentelemetry.instrumentation.api.internal.SemconvStability; import java.util.Collections; import java.util.List; import javax.annotation.Nullable; @@ -20,16 +21,24 @@ public class DynamoDbAttributesExtractor implements AttributesExtractor DB_SYSTEM = AttributeKey.stringKey("db.system"); + private static final AttributeKey DB_SYSTEM_NAME = + AttributeKey.stringKey("db.system.name"); // copied from AwsIncubatingAttributes private static final AttributeKey> AWS_DYNAMODB_TABLE_NAMES = AttributeKey.stringArrayKey("aws.dynamodb.table_names"); // copied from DbIncubatingAttributes.DbSystemIncubatingValues private static final String DYNAMODB = "dynamodb"; + // copied from DbIncubatingAttributes.DbSystemNameIncubatingValues + private static final String AWS_DYNAMODB = "aws.dynamodb"; @Override public void onStart(AttributesBuilder attributes, Context parentContext, Request request) { - AttributesExtractorUtil.internalSet(attributes, DB_SYSTEM, DYNAMODB); + if (SemconvStability.emitStableDatabaseSemconv()) { + AttributesExtractorUtil.internalSet(attributes, DB_SYSTEM_NAME, AWS_DYNAMODB); + } else { + AttributesExtractorUtil.internalSet(attributes, DB_SYSTEM, DYNAMODB); + } String tableName = RequestAccess.getTableName(request.getOriginalRequest()); AttributesExtractorUtil.internalSet( attributes, AWS_DYNAMODB_TABLE_NAMES, Collections.singletonList(tableName)); diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractDynamoDbClientTest.java b/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractDynamoDbClientTest.java index 683da33f1b..bef81bdb9e 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractDynamoDbClientTest.java +++ b/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractDynamoDbClientTest.java @@ -7,18 +7,22 @@ package io.opentelemetry.instrumentation.awssdk.v1_11; import static io.opentelemetry.api.common.AttributeKey.stringKey; import static io.opentelemetry.instrumentation.testing.junit.db.DbClientMetricsTestUtil.assertDurationMetric; +import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStable; 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.AwsIncubatingAttributes.AWS_DYNAMODB_TABLE_NAMES; import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SYSTEM; -import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DbSystemIncubatingValues.DYNAMODB; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SYSTEM_NAME; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DbSystemNameIncubatingValues.AWS_DYNAMODB; import static java.util.Collections.singletonList; import com.amazonaws.services.dynamodbv2.AmazonDynamoDB; import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClientBuilder; import com.amazonaws.services.dynamodbv2.model.CreateTableRequest; +import io.opentelemetry.instrumentation.api.internal.SemconvStability; import io.opentelemetry.sdk.testing.assertj.AttributeAssertion; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import io.opentelemetry.testing.internal.armeria.common.HttpResponse; import io.opentelemetry.testing.internal.armeria.common.HttpStatus; import io.opentelemetry.testing.internal.armeria.common.MediaType; @@ -35,6 +39,7 @@ public abstract class AbstractDynamoDbClientTest extends AbstractBaseAwsClientTe return false; } + @SuppressWarnings("deprecation") // using deprecated semconv @Test public void sendRequestWithMockedResponse() throws Exception { AmazonDynamoDBClientBuilder clientBuilder = AmazonDynamoDBClientBuilder.standard(); @@ -49,7 +54,11 @@ public abstract class AbstractDynamoDbClientTest extends AbstractBaseAwsClientTe List additionalAttributes = Arrays.asList( equalTo(stringKey("aws.table.name"), "sometable"), - equalTo(DB_SYSTEM, DYNAMODB), + equalTo( + maybeStable(DB_SYSTEM), + SemconvStability.emitStableDatabaseSemconv() + ? AWS_DYNAMODB + : DbIncubatingAttributes.DbSystemIncubatingValues.DYNAMODB), equalTo(AWS_DYNAMODB_TABLE_NAMES, singletonList("sometable"))); Object response = client.createTable(new CreateTableRequest("sometable", null)); @@ -57,6 +66,6 @@ public abstract class AbstractDynamoDbClientTest extends AbstractBaseAwsClientTe response, client, "DynamoDBv2", "CreateTable", "POST", additionalAttributes); assertDurationMetric( - testing(), "io.opentelemetry.aws-sdk-1.11", DB_SYSTEM, SERVER_ADDRESS, SERVER_PORT); + testing(), "io.opentelemetry.aws-sdk-1.11", DB_SYSTEM_NAME, SERVER_ADDRESS, SERVER_PORT); } } diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/internal/TracingExecutionInterceptor.java b/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/internal/TracingExecutionInterceptor.java index 40074c85b1..f44b47d3ae 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/internal/TracingExecutionInterceptor.java +++ b/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/internal/TracingExecutionInterceptor.java @@ -54,8 +54,12 @@ public final class TracingExecutionInterceptor implements ExecutionInterceptor { private static final AttributeKey DB_OPERATION_NAME = AttributeKey.stringKey("db.operation.name"); private static final AttributeKey DB_SYSTEM = AttributeKey.stringKey("db.system"); + private static final AttributeKey DB_SYSTEM_NAME = + AttributeKey.stringKey("db.system.name"); // copied from DbIncubatingAttributes.DbSystemIncubatingValues private static final String DB_SYSTEM_DYNAMODB = "dynamodb"; + // copied from DbIncubatingAttributes.DbSystemNameIncubatingValues + private static final String DB_SYSTEM_AWS_DYNAMODB = "aws.dynamodb"; // copied from AwsIncubatingAttributes private static final AttributeKey AWS_REQUEST_ID = AttributeKey.stringKey("aws.request_id"); @@ -348,7 +352,12 @@ public final class TracingExecutionInterceptor implements ExecutionInterceptor { fieldMapper.mapToAttributes(sdkRequest, awsSdkRequest, span); if (awsSdkRequest.type() == DYNAMODB) { - span.setAttribute(DB_SYSTEM, DB_SYSTEM_DYNAMODB); + if (SemconvStability.emitStableDatabaseSemconv()) { + span.setAttribute(DB_SYSTEM_NAME, DB_SYSTEM_AWS_DYNAMODB); + } + if (SemconvStability.emitOldDatabaseSemconv()) { + span.setAttribute(DB_SYSTEM, DB_SYSTEM_DYNAMODB); + } String operation = attributes.getAttribute(SdkExecutionAttribute.OPERATION_NAME); if (operation != null) { if (SemconvStability.emitStableDatabaseSemconv()) { diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientCoreTest.java b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientCoreTest.java index 343e19c0fb..41b2149f80 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientCoreTest.java +++ b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientCoreTest.java @@ -7,6 +7,7 @@ package io.opentelemetry.instrumentation.awssdk.v2_2; import static io.opentelemetry.api.common.AttributeKey.stringKey; import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStable; +import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStableDbSystemName; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; import static io.opentelemetry.semconv.HttpAttributes.HTTP_REQUEST_METHOD; import static io.opentelemetry.semconv.HttpAttributes.HTTP_RESPONSE_STATUS_CODE; @@ -170,7 +171,7 @@ public abstract class AbstractAws2ClientCoreTest { equalTo(stringKey("aws.agent"), "java-aws-sdk"), equalTo(AWS_REQUEST_ID, "UNKNOWN"), equalTo(stringKey("aws.table.name"), "sometable"), - equalTo(DB_SYSTEM, "dynamodb"), + equalTo(maybeStable(DB_SYSTEM), maybeStableDbSystemName("dynamodb")), equalTo(maybeStable(DB_OPERATION), "CreateTable"), equalTo( stringKey("aws.dynamodb.global_secondary_indexes"), @@ -196,7 +197,7 @@ public abstract class AbstractAws2ClientCoreTest { equalTo(stringKey("aws.agent"), "java-aws-sdk"), equalTo(AWS_REQUEST_ID, "UNKNOWN"), equalTo(stringKey("aws.table.name"), "sometable"), - equalTo(DB_SYSTEM, "dynamodb"), + equalTo(maybeStable(DB_SYSTEM), maybeStableDbSystemName("dynamodb")), equalTo(maybeStable(DB_OPERATION), "Query"), equalTo(stringKey("aws.dynamodb.limit"), "10"), equalTo(stringKey("aws.dynamodb.select"), "ALL_ATTRIBUTES")); @@ -219,7 +220,7 @@ public abstract class AbstractAws2ClientCoreTest { equalTo(stringKey("aws.agent"), "java-aws-sdk"), equalTo(AWS_REQUEST_ID, "UNKNOWN"), equalTo(stringKey("aws.table.name"), "sometable"), - equalTo(DB_SYSTEM, "dynamodb"), + equalTo(maybeStable(DB_SYSTEM), maybeStableDbSystemName("dynamodb")), equalTo(maybeStable(DB_OPERATION), operation)); } 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 73d2a0ba82..ca170a62a3 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 @@ -7,6 +7,7 @@ package io.opentelemetry.instrumentation.awssdk.v2_2; import static io.opentelemetry.api.common.AttributeKey.stringKey; import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStable; +import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStableDbSystemName; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; import static io.opentelemetry.semconv.HttpAttributes.HTTP_REQUEST_METHOD; @@ -184,7 +185,7 @@ public abstract class AbstractAws2ClientRecordHttpErrorTest { equalTo(stringKey("aws.agent"), "java-aws-sdk"), equalTo(AWS_REQUEST_ID, requestId), equalTo(stringKey("aws.table.name"), "sometable"), - equalTo(DB_SYSTEM, "dynamodb"), + equalTo(maybeStable(DB_SYSTEM), maybeStableDbSystemName("dynamodb")), equalTo(maybeStable(DB_OPERATION), operation)); if (isRecordIndividualHttpErrorEnabled()) { span.hasEventsSatisfyingExactly( 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 1c260c2c8e..421800519c 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 @@ -124,7 +124,12 @@ class DbSpanDecorator extends BaseSpanDecorator { CamelDirection camelDirection) { super.pre(attributes, exchange, endpoint, camelDirection); - attributes.put(DbIncubatingAttributes.DB_SYSTEM, system); + if (SemconvStability.emitStableDatabaseSemconv()) { + attributes.put(DbIncubatingAttributes.DB_SYSTEM_NAME, system); + } + if (SemconvStability.emitOldDatabaseSemconv()) { + attributes.put(DbIncubatingAttributes.DB_SYSTEM, system); + } String statement = getStatement(exchange, endpoint); if (statement != null) { if (SemconvStability.emitStableDatabaseSemconv()) { diff --git a/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/DecoratorRegistry.java b/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/DecoratorRegistry.java index 039bb0c7e7..2785755ffe 100644 --- a/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/DecoratorRegistry.java +++ b/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/DecoratorRegistry.java @@ -15,8 +15,8 @@ public class DecoratorRegistry { private static final SpanDecorator DEFAULT = new BaseSpanDecorator(); private static final Map DECORATORS = loadDecorators(); + @SuppressWarnings("deprecation") // using deprecated DbSystemIncubatingValues private static Map loadDecorators() { - Map result = new HashMap<>(); result.put("ahc", new HttpSpanDecorator()); result.put("ampq", new MessagingSpanDecorator("ampq")); 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 0328d65ff0..af03e572f5 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 @@ -124,6 +124,6 @@ class CassandraTest extends AbstractHttpServerUsingTest { + @SuppressWarnings("deprecation") // using deprecated DbSystemIncubatingValues @Override public String getDbSystem(CassandraRequest request) { return DbIncubatingAttributes.DbSystemIncubatingValues.CASSANDRA; 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 3373c0e762..d45c8ff034 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 @@ -107,7 +107,7 @@ class CassandraClientTest { equalTo(SERVER_PORT, cassandraPort), equalTo(NETWORK_PEER_ADDRESS, cassandraIp), equalTo(NETWORK_PEER_PORT, cassandraPort), - equalTo(DB_SYSTEM, "cassandra"), + equalTo(maybeStable(DB_SYSTEM), "cassandra"), equalTo(maybeStable(DB_STATEMENT), "USE " + parameter.keyspace))), trace -> trace.hasSpansSatisfyingExactly( @@ -121,7 +121,7 @@ class CassandraClientTest { equalTo(SERVER_PORT, cassandraPort), equalTo(NETWORK_PEER_ADDRESS, cassandraIp), equalTo(NETWORK_PEER_PORT, cassandraPort), - equalTo(DB_SYSTEM, "cassandra"), + equalTo(maybeStable(DB_SYSTEM), "cassandra"), equalTo(maybeStable(DB_NAME), parameter.keyspace), equalTo(maybeStable(DB_STATEMENT), parameter.expectedStatement), equalTo(maybeStable(DB_OPERATION), parameter.operation), @@ -140,7 +140,7 @@ class CassandraClientTest { equalTo(SERVER_PORT, cassandraPort), equalTo(NETWORK_PEER_ADDRESS, cassandraIp), equalTo(NETWORK_PEER_PORT, cassandraPort), - equalTo(DB_SYSTEM, "cassandra"), + equalTo(maybeStable(DB_SYSTEM), "cassandra"), equalTo(maybeStable(DB_STATEMENT), parameter.expectedStatement), equalTo(maybeStable(DB_OPERATION), parameter.operation), equalTo(maybeStable(DB_CASSANDRA_TABLE), parameter.table)))); @@ -179,7 +179,7 @@ class CassandraClientTest { equalTo(SERVER_PORT, cassandraPort), equalTo(NETWORK_PEER_ADDRESS, cassandraIp), equalTo(NETWORK_PEER_PORT, cassandraPort), - equalTo(DB_SYSTEM, "cassandra"), + equalTo(maybeStable(DB_SYSTEM), "cassandra"), equalTo(maybeStable(DB_STATEMENT), "USE " + parameter.keyspace))), trace -> trace.hasSpansSatisfyingExactly( @@ -194,7 +194,7 @@ class CassandraClientTest { equalTo(SERVER_PORT, cassandraPort), equalTo(NETWORK_PEER_ADDRESS, cassandraIp), equalTo(NETWORK_PEER_PORT, cassandraPort), - equalTo(DB_SYSTEM, "cassandra"), + equalTo(maybeStable(DB_SYSTEM), "cassandra"), equalTo(maybeStable(DB_NAME), parameter.keyspace), equalTo(maybeStable(DB_STATEMENT), parameter.expectedStatement), equalTo(maybeStable(DB_OPERATION), parameter.operation), @@ -218,7 +218,7 @@ class CassandraClientTest { equalTo(SERVER_PORT, cassandraPort), equalTo(NETWORK_PEER_ADDRESS, cassandraIp), equalTo(NETWORK_PEER_PORT, cassandraPort), - equalTo(DB_SYSTEM, "cassandra"), + equalTo(maybeStable(DB_SYSTEM), "cassandra"), equalTo(maybeStable(DB_STATEMENT), parameter.expectedStatement), equalTo(maybeStable(DB_OPERATION), parameter.operation), equalTo(maybeStable(DB_CASSANDRA_TABLE), parameter.table)), 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 b49fb7da01..c9176f8529 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 @@ -112,20 +112,20 @@ public abstract class AbstractCassandraTest { equalTo(SERVER_PORT, cassandraPort), equalTo(NETWORK_PEER_ADDRESS, cassandraIp), equalTo(NETWORK_PEER_PORT, cassandraPort), - equalTo(DB_SYSTEM, "cassandra"), + equalTo(maybeStable(DB_SYSTEM), "cassandra"), equalTo(maybeStable(DB_NAME), parameter.keyspace), equalTo(maybeStable(DB_STATEMENT), parameter.expectedStatement), equalTo(maybeStable(DB_OPERATION), parameter.operation), - equalTo(DB_CASSANDRA_CONSISTENCY_LEVEL, "LOCAL_ONE"), - equalTo(DB_CASSANDRA_COORDINATOR_DC, "datacenter1"), + equalTo(maybeStable(DB_CASSANDRA_CONSISTENCY_LEVEL), "LOCAL_ONE"), + equalTo(maybeStable(DB_CASSANDRA_COORDINATOR_DC), "datacenter1"), satisfies( - DB_CASSANDRA_COORDINATOR_ID, + maybeStable(DB_CASSANDRA_COORDINATOR_ID), val -> val.isInstanceOf(String.class)), satisfies( - DB_CASSANDRA_IDEMPOTENCE, + maybeStable(DB_CASSANDRA_IDEMPOTENCE), val -> val.isInstanceOf(Boolean.class)), - equalTo(DB_CASSANDRA_PAGE_SIZE, 5000), - equalTo(DB_CASSANDRA_SPECULATIVE_EXECUTION_COUNT, 0), + equalTo(maybeStable(DB_CASSANDRA_PAGE_SIZE), 5000), + equalTo(maybeStable(DB_CASSANDRA_SPECULATIVE_EXECUTION_COUNT), 0), equalTo(maybeStable(DB_CASSANDRA_TABLE), parameter.table)))); session.close(); @@ -166,20 +166,20 @@ public abstract class AbstractCassandraTest { equalTo(SERVER_PORT, cassandraPort), equalTo(NETWORK_PEER_ADDRESS, cassandraIp), equalTo(NETWORK_PEER_PORT, cassandraPort), - equalTo(DB_SYSTEM, "cassandra"), + equalTo(maybeStable(DB_SYSTEM), "cassandra"), equalTo(maybeStable(DB_NAME), parameter.keyspace), equalTo(maybeStable(DB_STATEMENT), parameter.expectedStatement), equalTo(maybeStable(DB_OPERATION), parameter.operation), - equalTo(DB_CASSANDRA_CONSISTENCY_LEVEL, "LOCAL_ONE"), - equalTo(DB_CASSANDRA_COORDINATOR_DC, "datacenter1"), + equalTo(maybeStable(DB_CASSANDRA_CONSISTENCY_LEVEL), "LOCAL_ONE"), + equalTo(maybeStable(DB_CASSANDRA_COORDINATOR_DC), "datacenter1"), satisfies( - DB_CASSANDRA_COORDINATOR_ID, + maybeStable(DB_CASSANDRA_COORDINATOR_ID), val -> val.isInstanceOf(String.class)), satisfies( - DB_CASSANDRA_IDEMPOTENCE, + maybeStable(DB_CASSANDRA_IDEMPOTENCE), val -> val.isInstanceOf(Boolean.class)), - equalTo(DB_CASSANDRA_PAGE_SIZE, 5000), - equalTo(DB_CASSANDRA_SPECULATIVE_EXECUTION_COUNT, 0), + equalTo(maybeStable(DB_CASSANDRA_PAGE_SIZE), 5000), + equalTo(maybeStable(DB_CASSANDRA_SPECULATIVE_EXECUTION_COUNT), 0), equalTo(maybeStable(DB_CASSANDRA_TABLE), parameter.table)), span -> span.hasName("child") diff --git a/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraAttributesExtractor.java b/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraAttributesExtractor.java index 3904af69ec..309e989bab 100644 --- a/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraAttributesExtractor.java +++ b/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraAttributesExtractor.java @@ -13,7 +13,9 @@ import com.datastax.oss.driver.api.core.metadata.Node; import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; +import io.opentelemetry.instrumentation.api.internal.SemconvStability; import io.opentelemetry.semconv.ServerAttributes; +import io.opentelemetry.semconv.incubating.CassandraIncubatingAttributes; import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import java.net.InetSocketAddress; import java.net.SocketAddress; @@ -26,6 +28,7 @@ final class CassandraAttributesExtractor public void onStart( AttributesBuilder attributes, Context parentContext, CassandraRequest request) {} + @SuppressWarnings("deprecation") // using deprecated semconv @Override public void onEnd( AttributesBuilder attributes, @@ -46,17 +49,38 @@ final class CassandraAttributesExtractor attributes.put(ServerAttributes.SERVER_PORT, ((InetSocketAddress) address).getPort()); } if (coordinator.getDatacenter() != null) { - attributes.put( - DbIncubatingAttributes.DB_CASSANDRA_COORDINATOR_DC, coordinator.getDatacenter()); + if (SemconvStability.emitStableDatabaseSemconv()) { + attributes.put( + CassandraIncubatingAttributes.CASSANDRA_COORDINATOR_DC, coordinator.getDatacenter()); + } + if (SemconvStability.emitOldDatabaseSemconv()) { + attributes.put( + DbIncubatingAttributes.DB_CASSANDRA_COORDINATOR_DC, coordinator.getDatacenter()); + } } if (coordinator.getHostId() != null) { - attributes.put( - DbIncubatingAttributes.DB_CASSANDRA_COORDINATOR_ID, coordinator.getHostId().toString()); + if (SemconvStability.emitStableDatabaseSemconv()) { + attributes.put( + CassandraIncubatingAttributes.CASSANDRA_COORDINATOR_ID, + coordinator.getHostId().toString()); + } + if (SemconvStability.emitOldDatabaseSemconv()) { + attributes.put( + DbIncubatingAttributes.DB_CASSANDRA_COORDINATOR_ID, + coordinator.getHostId().toString()); + } } } - attributes.put( - DbIncubatingAttributes.DB_CASSANDRA_SPECULATIVE_EXECUTION_COUNT, - executionInfo.getSpeculativeExecutionCount()); + if (SemconvStability.emitStableDatabaseSemconv()) { + attributes.put( + CassandraIncubatingAttributes.CASSANDRA_SPECULATIVE_EXECUTION_COUNT, + executionInfo.getSpeculativeExecutionCount()); + } + if (SemconvStability.emitOldDatabaseSemconv()) { + attributes.put( + DbIncubatingAttributes.DB_CASSANDRA_SPECULATIVE_EXECUTION_COUNT, + executionInfo.getSpeculativeExecutionCount()); + } Statement statement = executionInfo.getStatement(); String consistencyLevel; @@ -67,14 +91,29 @@ final class CassandraAttributesExtractor } else { consistencyLevel = config.getString(DefaultDriverOption.REQUEST_CONSISTENCY); } - attributes.put(DbIncubatingAttributes.DB_CASSANDRA_CONSISTENCY_LEVEL, consistencyLevel); + if (SemconvStability.emitStableDatabaseSemconv()) { + attributes.put(CassandraIncubatingAttributes.CASSANDRA_CONSISTENCY_LEVEL, consistencyLevel); + } + if (SemconvStability.emitOldDatabaseSemconv()) { + attributes.put(DbIncubatingAttributes.DB_CASSANDRA_CONSISTENCY_LEVEL, consistencyLevel); + } if (statement.getPageSize() > 0) { - attributes.put(DbIncubatingAttributes.DB_CASSANDRA_PAGE_SIZE, statement.getPageSize()); + if (SemconvStability.emitStableDatabaseSemconv()) { + attributes.put(CassandraIncubatingAttributes.CASSANDRA_PAGE_SIZE, statement.getPageSize()); + } + if (SemconvStability.emitOldDatabaseSemconv()) { + attributes.put(DbIncubatingAttributes.DB_CASSANDRA_PAGE_SIZE, statement.getPageSize()); + } } else { int pageSize = config.getInt(DefaultDriverOption.REQUEST_PAGE_SIZE); if (pageSize > 0) { - attributes.put(DbIncubatingAttributes.DB_CASSANDRA_PAGE_SIZE, pageSize); + if (SemconvStability.emitStableDatabaseSemconv()) { + attributes.put(CassandraIncubatingAttributes.CASSANDRA_PAGE_SIZE, pageSize); + } + if (SemconvStability.emitOldDatabaseSemconv()) { + attributes.put(DbIncubatingAttributes.DB_CASSANDRA_PAGE_SIZE, pageSize); + } } } @@ -82,6 +121,11 @@ final class CassandraAttributesExtractor if (idempotent == null) { idempotent = config.getBoolean(DefaultDriverOption.REQUEST_DEFAULT_IDEMPOTENCE); } - attributes.put(DbIncubatingAttributes.DB_CASSANDRA_IDEMPOTENCE, idempotent); + if (SemconvStability.emitStableDatabaseSemconv()) { + attributes.put(CassandraIncubatingAttributes.CASSANDRA_QUERY_IDEMPOTENT, idempotent); + } + if (SemconvStability.emitOldDatabaseSemconv()) { + attributes.put(DbIncubatingAttributes.DB_CASSANDRA_IDEMPOTENCE, idempotent); + } } } diff --git a/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraSqlAttributesGetter.java b/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraSqlAttributesGetter.java index 7965dc3fea..ada9ad70a0 100644 --- a/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraSqlAttributesGetter.java +++ b/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraSqlAttributesGetter.java @@ -15,6 +15,7 @@ import javax.annotation.Nullable; final class CassandraSqlAttributesGetter implements SqlClientAttributesGetter { + @SuppressWarnings("deprecation") // using deprecated DbSystemIncubatingValues @Override public String getDbSystem(CassandraRequest request) { return DbIncubatingAttributes.DbSystemIncubatingValues.CASSANDRA; diff --git a/instrumentation/cassandra/cassandra-4.4/library/src/main/java/io/opentelemetry/instrumentation/cassandra/v4_4/CassandraAttributesExtractor.java b/instrumentation/cassandra/cassandra-4.4/library/src/main/java/io/opentelemetry/instrumentation/cassandra/v4_4/CassandraAttributesExtractor.java index a4219a5988..9ad3d0f4b4 100644 --- a/instrumentation/cassandra/cassandra-4.4/library/src/main/java/io/opentelemetry/instrumentation/cassandra/v4_4/CassandraAttributesExtractor.java +++ b/instrumentation/cassandra/cassandra-4.4/library/src/main/java/io/opentelemetry/instrumentation/cassandra/v4_4/CassandraAttributesExtractor.java @@ -17,6 +17,7 @@ import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; +import io.opentelemetry.instrumentation.api.internal.SemconvStability; import io.opentelemetry.semconv.ServerAttributes; import java.lang.reflect.Field; import java.net.InetSocketAddress; @@ -44,6 +45,20 @@ final class CassandraAttributesExtractor private static final AttributeKey DB_CASSANDRA_SPECULATIVE_EXECUTION_COUNT = AttributeKey.longKey("db.cassandra.speculative_execution_count"); + // copied from CassandraIncubatingAttributes + private static final AttributeKey CASSANDRA_CONSISTENCY_LEVEL = + AttributeKey.stringKey("cassandra.consistency.level"); + private static final AttributeKey CASSANDRA_COORDINATOR_DC = + AttributeKey.stringKey("cassandra.coordinator.dc"); + private static final AttributeKey CASSANDRA_COORDINATOR_ID = + AttributeKey.stringKey("cassandra.coordinator.id"); + private static final AttributeKey CASSANDRA_PAGE_SIZE = + AttributeKey.longKey("cassandra.page.size"); + private static final AttributeKey CASSANDRA_QUERY_IDEMPOTENT = + AttributeKey.booleanKey("cassandra.query.idempotent"); + private static final AttributeKey CASSANDRA_SPECULATIVE_EXECUTION_COUNT = + AttributeKey.longKey("cassandra.speculative_execution.count"); + private static final Field proxyAddressField = getProxyAddressField(); @Override @@ -66,14 +81,30 @@ final class CassandraAttributesExtractor updateServerAddressAndPort(attributes, coordinator); if (coordinator.getDatacenter() != null) { - attributes.put(DB_CASSANDRA_COORDINATOR_DC, coordinator.getDatacenter()); + if (SemconvStability.emitStableDatabaseSemconv()) { + attributes.put(CASSANDRA_COORDINATOR_DC, coordinator.getDatacenter()); + } + if (SemconvStability.emitOldDatabaseSemconv()) { + attributes.put(DB_CASSANDRA_COORDINATOR_DC, coordinator.getDatacenter()); + } } if (coordinator.getHostId() != null) { - attributes.put(DB_CASSANDRA_COORDINATOR_ID, coordinator.getHostId().toString()); + if (SemconvStability.emitStableDatabaseSemconv()) { + attributes.put(CASSANDRA_COORDINATOR_ID, coordinator.getHostId().toString()); + } + if (SemconvStability.emitOldDatabaseSemconv()) { + attributes.put(DB_CASSANDRA_COORDINATOR_ID, coordinator.getHostId().toString()); + } } } - attributes.put( - DB_CASSANDRA_SPECULATIVE_EXECUTION_COUNT, executionInfo.getSpeculativeExecutionCount()); + if (SemconvStability.emitStableDatabaseSemconv()) { + attributes.put( + CASSANDRA_SPECULATIVE_EXECUTION_COUNT, executionInfo.getSpeculativeExecutionCount()); + } + if (SemconvStability.emitOldDatabaseSemconv()) { + attributes.put( + DB_CASSANDRA_SPECULATIVE_EXECUTION_COUNT, executionInfo.getSpeculativeExecutionCount()); + } Statement statement = (Statement) executionInfo.getRequest(); String consistencyLevel; @@ -84,14 +115,29 @@ final class CassandraAttributesExtractor } else { consistencyLevel = config.getString(DefaultDriverOption.REQUEST_CONSISTENCY); } - attributes.put(DB_CASSANDRA_CONSISTENCY_LEVEL, consistencyLevel); + if (SemconvStability.emitStableDatabaseSemconv()) { + attributes.put(CASSANDRA_CONSISTENCY_LEVEL, consistencyLevel); + } + if (SemconvStability.emitOldDatabaseSemconv()) { + attributes.put(DB_CASSANDRA_CONSISTENCY_LEVEL, consistencyLevel); + } if (statement.getPageSize() > 0) { - attributes.put(DB_CASSANDRA_PAGE_SIZE, statement.getPageSize()); + if (SemconvStability.emitStableDatabaseSemconv()) { + attributes.put(CASSANDRA_PAGE_SIZE, statement.getPageSize()); + } + if (SemconvStability.emitOldDatabaseSemconv()) { + attributes.put(DB_CASSANDRA_PAGE_SIZE, statement.getPageSize()); + } } else { int pageSize = config.getInt(DefaultDriverOption.REQUEST_PAGE_SIZE); if (pageSize > 0) { - attributes.put(DB_CASSANDRA_PAGE_SIZE, pageSize); + if (SemconvStability.emitStableDatabaseSemconv()) { + attributes.put(CASSANDRA_PAGE_SIZE, pageSize); + } + if (SemconvStability.emitOldDatabaseSemconv()) { + attributes.put(DB_CASSANDRA_PAGE_SIZE, pageSize); + } } } @@ -99,7 +145,12 @@ final class CassandraAttributesExtractor if (idempotent == null) { idempotent = config.getBoolean(DefaultDriverOption.REQUEST_DEFAULT_IDEMPOTENCE); } - attributes.put(DB_CASSANDRA_IDEMPOTENCE, idempotent); + if (SemconvStability.emitStableDatabaseSemconv()) { + attributes.put(CASSANDRA_QUERY_IDEMPOTENT, idempotent); + } + if (SemconvStability.emitOldDatabaseSemconv()) { + attributes.put(DB_CASSANDRA_IDEMPOTENCE, idempotent); + } } private static void updateServerAddressAndPort(AttributesBuilder attributes, Node coordinator) { 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 a5319f49df..fb323ddf9e 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 @@ -72,20 +72,20 @@ public abstract class AbstractCassandra44Test extends AbstractCassandraTest { equalTo(SERVER_PORT, cassandraPort), equalTo(NETWORK_PEER_ADDRESS, cassandraIp), equalTo(NETWORK_PEER_PORT, cassandraPort), - equalTo(DB_SYSTEM, "cassandra"), + equalTo(maybeStable(DB_SYSTEM), "cassandra"), equalTo(maybeStable(DB_NAME), parameter.keyspace), equalTo(maybeStable(DB_STATEMENT), parameter.expectedStatement), equalTo(maybeStable(DB_OPERATION), parameter.operation), - equalTo(DB_CASSANDRA_CONSISTENCY_LEVEL, "LOCAL_ONE"), - equalTo(DB_CASSANDRA_COORDINATOR_DC, "datacenter1"), + equalTo(maybeStable(DB_CASSANDRA_CONSISTENCY_LEVEL), "LOCAL_ONE"), + equalTo(maybeStable(DB_CASSANDRA_COORDINATOR_DC), "datacenter1"), satisfies( - DB_CASSANDRA_COORDINATOR_ID, + maybeStable(DB_CASSANDRA_COORDINATOR_ID), val -> val.isInstanceOf(String.class)), satisfies( - DB_CASSANDRA_IDEMPOTENCE, + maybeStable(DB_CASSANDRA_IDEMPOTENCE), val -> val.isInstanceOf(Boolean.class)), - equalTo(DB_CASSANDRA_PAGE_SIZE, 5000), - equalTo(DB_CASSANDRA_SPECULATIVE_EXECUTION_COUNT, 0), + equalTo(maybeStable(DB_CASSANDRA_PAGE_SIZE), 5000), + equalTo(maybeStable(DB_CASSANDRA_SPECULATIVE_EXECUTION_COUNT), 0), equalTo(maybeStable(DB_CASSANDRA_TABLE), parameter.table)), span -> span.hasName("child") diff --git a/instrumentation/clickhouse-client-0.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/ClickHouseAttributesGetter.java b/instrumentation/clickhouse-client-0.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/ClickHouseAttributesGetter.java index c8210b53b5..ee4dfc4697 100644 --- a/instrumentation/clickhouse-client-0.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/ClickHouseAttributesGetter.java +++ b/instrumentation/clickhouse-client-0.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/ClickHouseAttributesGetter.java @@ -29,7 +29,7 @@ final class ClickHouseAttributesGetter implements DbClientAttributesGetter attributeAssertions(String statement, String operation) { return asList( - equalTo(DB_SYSTEM, DbIncubatingAttributes.DbSystemIncubatingValues.CLICKHOUSE), + equalTo(maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.CLICKHOUSE), equalTo(maybeStable(DB_NAME), dbName), equalTo(SERVER_ADDRESS, host), equalTo(SERVER_PORT, port), diff --git a/instrumentation/couchbase/couchbase-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseAttributesGetter.java b/instrumentation/couchbase/couchbase-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseAttributesGetter.java index 5975b40d76..0a8a0aabe3 100644 --- a/instrumentation/couchbase/couchbase-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseAttributesGetter.java +++ b/instrumentation/couchbase/couchbase-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseAttributesGetter.java @@ -11,6 +11,7 @@ import javax.annotation.Nullable; final class CouchbaseAttributesGetter implements DbClientAttributesGetter { + @SuppressWarnings("deprecation") // using deprecated DbSystemIncubatingValues @Override public String getDbSystem(CouchbaseRequestInfo couchbaseRequest) { return DbIncubatingAttributes.DbSystemIncubatingValues.COUCHBASE; diff --git a/instrumentation/couchbase/couchbase-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/AbstractCouchbaseAsyncClientTest.java b/instrumentation/couchbase/couchbase-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/AbstractCouchbaseAsyncClientTest.java index 707c78dca8..8e81e84161 100644 --- a/instrumentation/couchbase/couchbase-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/AbstractCouchbaseAsyncClientTest.java +++ b/instrumentation/couchbase/couchbase-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/AbstractCouchbaseAsyncClientTest.java @@ -116,7 +116,7 @@ public abstract class AbstractCouchbaseAsyncClientTest extends AbstractCouchbase .hasNoParent() .hasAttributesSatisfyingExactly( equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.COUCHBASE), equalTo(maybeStable(DB_OPERATION), "Cluster.openBucket")), span -> @@ -157,7 +157,7 @@ public abstract class AbstractCouchbaseAsyncClientTest extends AbstractCouchbase .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.COUCHBASE), equalTo(maybeStable(DB_OPERATION), "Cluster.openBucket")), span -> @@ -205,7 +205,7 @@ public abstract class AbstractCouchbaseAsyncClientTest extends AbstractCouchbase .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.COUCHBASE), equalTo(maybeStable(DB_OPERATION), "Cluster.openBucket")), span -> @@ -250,7 +250,7 @@ public abstract class AbstractCouchbaseAsyncClientTest extends AbstractCouchbase .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.COUCHBASE), equalTo(maybeStable(DB_OPERATION), "Cluster.openBucket")), span -> diff --git a/instrumentation/couchbase/couchbase-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/AbstractCouchbaseClientTest.java b/instrumentation/couchbase/couchbase-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/AbstractCouchbaseClientTest.java index 2c1db076ce..c39389ccf8 100644 --- a/instrumentation/couchbase/couchbase-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/AbstractCouchbaseClientTest.java +++ b/instrumentation/couchbase/couchbase-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/AbstractCouchbaseClientTest.java @@ -110,7 +110,7 @@ public abstract class AbstractCouchbaseClientTest extends AbstractCouchbaseTest .hasNoParent() .hasAttributesSatisfyingExactly( equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.COUCHBASE), equalTo(maybeStable(DB_OPERATION), "Cluster.openBucket"))), trace -> @@ -146,7 +146,7 @@ public abstract class AbstractCouchbaseClientTest extends AbstractCouchbaseTest .hasNoParent() .hasAttributesSatisfyingExactly( equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.COUCHBASE), equalTo(maybeStable(DB_OPERATION), "Cluster.openBucket"))), trace -> diff --git a/instrumentation/couchbase/couchbase-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/AbstractCouchbaseTest.java b/instrumentation/couchbase/couchbase-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/AbstractCouchbaseTest.java index 719f8d037d..ec8d82ce05 100644 --- a/instrumentation/couchbase/couchbase-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/AbstractCouchbaseTest.java +++ b/instrumentation/couchbase/couchbase-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/AbstractCouchbaseTest.java @@ -125,7 +125,8 @@ public abstract class AbstractCouchbaseTest { span.hasName(spanName).hasKind(SpanKind.CLIENT); List assertions = new ArrayList<>(); - assertions.add(equalTo(DB_SYSTEM, DbIncubatingAttributes.DbSystemIncubatingValues.COUCHBASE)); + assertions.add( + equalTo(maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.COUCHBASE)); if (operation != null) { assertions.add(equalTo(maybeStable(DB_OPERATION), operation)); } 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 44cf25a0f8..5fa146a023 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 @@ -94,7 +94,7 @@ class ElasticsearchClientTest { .hasKind(SpanKind.CLIENT) .hasNoParent() .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "elasticsearch"), + equalTo(maybeStable(DB_SYSTEM), "elasticsearch"), equalTo(maybeStable(DB_OPERATION), "info"), equalTo(HTTP_REQUEST_METHOD, "GET"), equalTo(URL_FULL, httpHost.toURI() + "/"), @@ -130,7 +130,7 @@ class ElasticsearchClientTest { .hasKind(SpanKind.CLIENT) .hasNoParent() .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "elasticsearch"), + equalTo(maybeStable(DB_SYSTEM), "elasticsearch"), equalTo(maybeStable(DB_OPERATION), "index"), equalTo(SERVER_ADDRESS, httpHost.getHostName()), equalTo(SERVER_PORT, httpHost.getPort()), @@ -188,7 +188,7 @@ class ElasticsearchClientTest { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "elasticsearch"), + equalTo(maybeStable(DB_SYSTEM), "elasticsearch"), equalTo(maybeStable(DB_OPERATION), "info"), equalTo(SERVER_ADDRESS, httpHost.getHostName()), equalTo(SERVER_PORT, httpHost.getPort()), diff --git a/instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v5_0/ElasticsearchRest5Test.java b/instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v5_0/ElasticsearchRest5Test.java index 06412321d7..72dd9bfc43 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v5_0/ElasticsearchRest5Test.java +++ b/instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v5_0/ElasticsearchRest5Test.java @@ -5,6 +5,7 @@ package io.opentelemetry.javaagent.instrumentation.elasticsearch.rest.v5_0; +import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStable; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; import static io.opentelemetry.semconv.HttpAttributes.HTTP_REQUEST_METHOD; import static io.opentelemetry.semconv.HttpAttributes.HTTP_RESPONSE_STATUS_CODE; @@ -32,6 +33,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; import org.testcontainers.elasticsearch.ElasticsearchContainer; +@SuppressWarnings("deprecation") // using deprecated semconv class ElasticsearchRest5Test { @RegisterExtension @@ -98,7 +100,7 @@ class ElasticsearchRest5Test { .hasKind(SpanKind.CLIENT) .hasNoParent() .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "elasticsearch"), + equalTo(maybeStable(DB_SYSTEM), "elasticsearch"), equalTo(HTTP_REQUEST_METHOD, "GET"), equalTo(SERVER_ADDRESS, httpHost.getHostName()), equalTo(SERVER_PORT, httpHost.getPort()), @@ -174,7 +176,7 @@ class ElasticsearchRest5Test { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "elasticsearch"), + equalTo(maybeStable(DB_SYSTEM), "elasticsearch"), equalTo(HTTP_REQUEST_METHOD, "GET"), equalTo(SERVER_ADDRESS, httpHost.getHostName()), equalTo(SERVER_PORT, httpHost.getPort()), diff --git a/instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v6_4/ElasticsearchRest6Test.java b/instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v6_4/ElasticsearchRest6Test.java index 2eea2d43bc..fe0c402b12 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v6_4/ElasticsearchRest6Test.java +++ b/instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v6_4/ElasticsearchRest6Test.java @@ -5,6 +5,7 @@ package io.opentelemetry.javaagent.instrumentation.elasticsearch.rest.v6_4; +import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStable; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; import static io.opentelemetry.semconv.HttpAttributes.HTTP_REQUEST_METHOD; import static io.opentelemetry.semconv.HttpAttributes.HTTP_RESPONSE_STATUS_CODE; @@ -89,7 +90,7 @@ class ElasticsearchRest6Test { .hasKind(SpanKind.CLIENT) .hasNoParent() .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "elasticsearch"), + equalTo(maybeStable(DB_SYSTEM), "elasticsearch"), equalTo(HTTP_REQUEST_METHOD, "GET"), equalTo(SERVER_ADDRESS, httpHost.getHostName()), equalTo(SERVER_PORT, httpHost.getPort()), @@ -164,7 +165,7 @@ class ElasticsearchRest6Test { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "elasticsearch"), + equalTo(maybeStable(DB_SYSTEM), "elasticsearch"), equalTo(HTTP_REQUEST_METHOD, "GET"), equalTo(SERVER_ADDRESS, httpHost.getHostName()), equalTo(SERVER_PORT, httpHost.getPort()), diff --git a/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java b/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java index 51f0a3ff63..e4f7ee05db 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java +++ b/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java @@ -6,6 +6,7 @@ package io.opentelemetry.javaagent.instrumentation.elasticsearch.rest.v7_0; import static io.opentelemetry.instrumentation.testing.GlobalTraceUtil.runWithSpan; +import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStable; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; import static io.opentelemetry.semconv.HttpAttributes.HTTP_REQUEST_METHOD; import static io.opentelemetry.semconv.HttpAttributes.HTTP_RESPONSE_STATUS_CODE; @@ -34,6 +35,7 @@ import org.junit.jupiter.api.extension.RegisterExtension; import org.testcontainers.elasticsearch.ElasticsearchContainer; import org.testcontainers.shaded.com.fasterxml.jackson.databind.ObjectMapper; +@SuppressWarnings("deprecation") // using deprecated semconv class ElasticsearchRest7Test { @RegisterExtension static final InstrumentationExtension testing = AgentInstrumentationExtension.create(); @@ -87,7 +89,7 @@ class ElasticsearchRest7Test { .hasKind(SpanKind.CLIENT) .hasNoParent() .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "elasticsearch"), + equalTo(maybeStable(DB_SYSTEM), "elasticsearch"), equalTo(HTTP_REQUEST_METHOD, "GET"), equalTo(SERVER_ADDRESS, httpHost.getHostName()), equalTo(SERVER_PORT, httpHost.getPort()), @@ -157,7 +159,7 @@ class ElasticsearchRest7Test { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "elasticsearch"), + equalTo(maybeStable(DB_SYSTEM), "elasticsearch"), equalTo(HTTP_REQUEST_METHOD, "GET"), equalTo(SERVER_ADDRESS, httpHost.getHostName()), equalTo(SERVER_PORT, httpHost.getPort()), diff --git a/instrumentation/elasticsearch/elasticsearch-rest-7.0/library/src/test/java/io/opentelemetry/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java b/instrumentation/elasticsearch/elasticsearch-rest-7.0/library/src/test/java/io/opentelemetry/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java index cdac9d2be1..95152db42d 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-7.0/library/src/test/java/io/opentelemetry/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java +++ b/instrumentation/elasticsearch/elasticsearch-rest-7.0/library/src/test/java/io/opentelemetry/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java @@ -6,6 +6,7 @@ package io.opentelemetry.instrumentation.elasticsearch.rest.v7_0; import static io.opentelemetry.instrumentation.testing.GlobalTraceUtil.runWithSpan; +import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStable; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; import static io.opentelemetry.semconv.HttpAttributes.HTTP_REQUEST_METHOD; import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS; @@ -32,6 +33,7 @@ import org.junit.jupiter.api.extension.RegisterExtension; import org.testcontainers.elasticsearch.ElasticsearchContainer; import org.testcontainers.shaded.com.fasterxml.jackson.databind.ObjectMapper; +@SuppressWarnings("deprecation") // using deprecated semconv class ElasticsearchRest7Test { @RegisterExtension static final InstrumentationExtension testing = LibraryInstrumentationExtension.create(); @@ -86,7 +88,7 @@ class ElasticsearchRest7Test { .hasKind(SpanKind.CLIENT) .hasNoParent() .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "elasticsearch"), + equalTo(maybeStable(DB_SYSTEM), "elasticsearch"), equalTo(HTTP_REQUEST_METHOD, "GET"), equalTo(SERVER_ADDRESS, httpHost.getHostName()), equalTo(SERVER_PORT, httpHost.getPort()), @@ -145,7 +147,7 @@ class ElasticsearchRest7Test { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "elasticsearch"), + equalTo(maybeStable(DB_SYSTEM), "elasticsearch"), equalTo(HTTP_REQUEST_METHOD, "GET"), equalTo(SERVER_ADDRESS, httpHost.getHostName()), equalTo(SERVER_PORT, httpHost.getPort()), diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v5_3/springdata/Elasticsearch53SpringRepositoryTest.java b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v5_3/springdata/Elasticsearch53SpringRepositoryTest.java index 38c26d7fcf..b30258c900 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v5_3/springdata/Elasticsearch53SpringRepositoryTest.java +++ b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v5_3/springdata/Elasticsearch53SpringRepositoryTest.java @@ -90,7 +90,7 @@ class Elasticsearch53SpringRepositoryTest { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH), equalTo(maybeStable(DB_OPERATION), "SearchAction"), equalTo(stringKey("elasticsearch.action"), "SearchAction"), @@ -124,7 +124,7 @@ class Elasticsearch53SpringRepositoryTest { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH), equalTo(maybeStable(DB_OPERATION), "IndexAction"), equalTo(stringKey("elasticsearch.action"), "IndexAction"), @@ -142,7 +142,7 @@ class Elasticsearch53SpringRepositoryTest { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH), equalTo(maybeStable(DB_OPERATION), "RefreshAction"), equalTo(stringKey("elasticsearch.action"), "RefreshAction"), @@ -173,7 +173,7 @@ class Elasticsearch53SpringRepositoryTest { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH), equalTo(maybeStable(DB_OPERATION), "GetAction"), equalTo(stringKey("elasticsearch.action"), "GetAction"), @@ -207,7 +207,7 @@ class Elasticsearch53SpringRepositoryTest { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH), equalTo(maybeStable(DB_OPERATION), "IndexAction"), equalTo(stringKey("elasticsearch.action"), "IndexAction"), @@ -225,7 +225,7 @@ class Elasticsearch53SpringRepositoryTest { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH), equalTo(maybeStable(DB_OPERATION), "RefreshAction"), equalTo(stringKey("elasticsearch.action"), "RefreshAction"), @@ -251,7 +251,7 @@ class Elasticsearch53SpringRepositoryTest { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH), equalTo(maybeStable(DB_OPERATION), "GetAction"), equalTo(stringKey("elasticsearch.action"), "GetAction"), @@ -283,7 +283,7 @@ class Elasticsearch53SpringRepositoryTest { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH), equalTo(maybeStable(DB_OPERATION), "DeleteAction"), equalTo(stringKey("elasticsearch.action"), "DeleteAction"), @@ -300,7 +300,7 @@ class Elasticsearch53SpringRepositoryTest { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH), equalTo(maybeStable(DB_OPERATION), "RefreshAction"), equalTo(stringKey("elasticsearch.action"), "RefreshAction"), @@ -326,7 +326,7 @@ class Elasticsearch53SpringRepositoryTest { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH), equalTo(maybeStable(DB_OPERATION), "SearchAction"), equalTo(stringKey("elasticsearch.action"), "SearchAction"), diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v5_3/springdata/Elasticsearch53SpringTemplateTest.java b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v5_3/springdata/Elasticsearch53SpringTemplateTest.java index d48df4a86f..e92a7b5338 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v5_3/springdata/Elasticsearch53SpringTemplateTest.java +++ b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v5_3/springdata/Elasticsearch53SpringTemplateTest.java @@ -174,7 +174,7 @@ class Elasticsearch53SpringTemplateTest { .hasException(expectedException) .hasAttributesSatisfyingExactly( equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH), equalTo(maybeStable(DB_OPERATION), "RefreshAction"), equalTo(stringKey("elasticsearch.action"), "RefreshAction"), @@ -229,7 +229,7 @@ class Elasticsearch53SpringTemplateTest { .hasNoParent() .hasAttributesSatisfyingExactly( equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH), equalTo(maybeStable(DB_OPERATION), "CreateIndexAction"), equalTo(stringKey("elasticsearch.action"), "CreateIndexAction"), @@ -243,7 +243,7 @@ class Elasticsearch53SpringTemplateTest { .hasNoParent() .hasAttributesSatisfyingExactly( equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH), equalTo(maybeStable(DB_OPERATION), "ClusterHealthAction"), equalTo(stringKey("elasticsearch.action"), "ClusterHealthAction"), @@ -256,7 +256,7 @@ class Elasticsearch53SpringTemplateTest { .hasNoParent() .hasAttributesSatisfyingExactly( equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH), equalTo(maybeStable(DB_OPERATION), "SearchAction"), equalTo(stringKey("elasticsearch.action"), "SearchAction"), @@ -271,7 +271,7 @@ class Elasticsearch53SpringTemplateTest { .hasNoParent() .hasAttributesSatisfyingExactly( equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH), equalTo(maybeStable(DB_OPERATION), "IndexAction"), equalTo(stringKey("elasticsearch.action"), "IndexAction"), @@ -291,7 +291,7 @@ class Elasticsearch53SpringTemplateTest { .hasNoParent() .hasAttributesSatisfyingExactly( equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH), equalTo(maybeStable(DB_OPERATION), "RefreshAction"), equalTo(stringKey("elasticsearch.action"), "RefreshAction"), @@ -308,7 +308,7 @@ class Elasticsearch53SpringTemplateTest { .hasNoParent() .hasAttributesSatisfyingExactly( equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH), equalTo(maybeStable(DB_OPERATION), "SearchAction"), equalTo(stringKey("elasticsearch.action"), "SearchAction"), @@ -392,7 +392,7 @@ class Elasticsearch53SpringTemplateTest { .hasNoParent() .hasAttributesSatisfyingExactly( equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH), equalTo(maybeStable(DB_OPERATION), "SearchAction"), equalTo(stringKey("elasticsearch.action"), "SearchAction"), diff --git a/instrumentation/elasticsearch/elasticsearch-transport-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/ElasticsearchTransportAttributesGetter.java b/instrumentation/elasticsearch/elasticsearch-transport-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/ElasticsearchTransportAttributesGetter.java index cbd713f364..1034e52075 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/ElasticsearchTransportAttributesGetter.java +++ b/instrumentation/elasticsearch/elasticsearch-transport-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/ElasticsearchTransportAttributesGetter.java @@ -12,6 +12,7 @@ import javax.annotation.Nullable; final class ElasticsearchTransportAttributesGetter implements DbClientAttributesGetter { + @SuppressWarnings("deprecation") // using deprecated DbSystemIncubatingValues @Override public String getDbSystem(ElasticTransportRequest request) { return DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH; diff --git a/instrumentation/elasticsearch/elasticsearch-transport-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/AbstractElasticsearchNodeClientTest.java b/instrumentation/elasticsearch/elasticsearch-transport-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/AbstractElasticsearchNodeClientTest.java index d820120228..80061f2fc8 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/AbstractElasticsearchNodeClientTest.java +++ b/instrumentation/elasticsearch/elasticsearch-transport-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/AbstractElasticsearchNodeClientTest.java @@ -71,7 +71,7 @@ public abstract class AbstractElasticsearchNodeClientTest extends AbstractElasti .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH), equalTo(maybeStable(DB_OPERATION), "ClusterHealthAction"), equalTo(ELASTICSEARCH_ACTION, "ClusterHealthAction"), @@ -120,7 +120,7 @@ public abstract class AbstractElasticsearchNodeClientTest extends AbstractElasti .hasException(expectedException) .hasAttributesSatisfyingExactly( equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH), equalTo(maybeStable(DB_OPERATION), "GetAction"), equalTo(ELASTICSEARCH_ACTION, "GetAction"), @@ -182,7 +182,7 @@ public abstract class AbstractElasticsearchNodeClientTest extends AbstractElasti .hasNoParent() .hasAttributesSatisfyingExactly( equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH), equalTo(maybeStable(DB_OPERATION), "CreateIndexAction"), equalTo(ELASTICSEARCH_ACTION, "CreateIndexAction"), @@ -196,7 +196,7 @@ public abstract class AbstractElasticsearchNodeClientTest extends AbstractElasti .hasNoParent() .hasAttributesSatisfyingExactly( equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH), equalTo(maybeStable(DB_OPERATION), "ClusterHealthAction"), equalTo(ELASTICSEARCH_ACTION, "ClusterHealthAction"), @@ -209,7 +209,7 @@ public abstract class AbstractElasticsearchNodeClientTest extends AbstractElasti .hasNoParent() .hasAttributesSatisfyingExactly( equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH), equalTo(maybeStable(DB_OPERATION), "GetAction"), equalTo(ELASTICSEARCH_ACTION, "GetAction"), @@ -227,7 +227,7 @@ public abstract class AbstractElasticsearchNodeClientTest extends AbstractElasti .hasAttributesSatisfyingExactly( addIndexActionAttributes( equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH), equalTo(maybeStable(DB_OPERATION), "IndexAction"), equalTo(ELASTICSEARCH_ACTION, "IndexAction"), @@ -246,7 +246,7 @@ public abstract class AbstractElasticsearchNodeClientTest extends AbstractElasti .hasNoParent() .hasAttributesSatisfyingExactly( equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH), equalTo(maybeStable(DB_OPERATION), "GetAction"), equalTo(ELASTICSEARCH_ACTION, "GetAction"), diff --git a/instrumentation/elasticsearch/elasticsearch-transport-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/AbstractElasticsearchTransportClientTest.java b/instrumentation/elasticsearch/elasticsearch-transport-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/AbstractElasticsearchTransportClientTest.java index cd69a09f0b..51ba20b9be 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/AbstractElasticsearchTransportClientTest.java +++ b/instrumentation/elasticsearch/elasticsearch-transport-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/AbstractElasticsearchTransportClientTest.java @@ -86,7 +86,7 @@ public abstract class AbstractElasticsearchTransportClientTest equalTo(NETWORK_PEER_ADDRESS, getAddress()), equalTo(NETWORK_PEER_PORT, getPort()), equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH), equalTo(maybeStable(DB_OPERATION), "ClusterHealthAction"), equalTo(ELASTICSEARCH_ACTION, "ClusterHealthAction"), @@ -142,7 +142,7 @@ public abstract class AbstractElasticsearchTransportClientTest RemoteTransportException.class.getName()))) .hasAttributesSatisfyingExactly( equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH), equalTo(maybeStable(DB_OPERATION), "GetAction"), equalTo(ELASTICSEARCH_ACTION, "GetAction"), @@ -203,7 +203,7 @@ public abstract class AbstractElasticsearchTransportClientTest equalTo(NETWORK_PEER_ADDRESS, getAddress()), equalTo(NETWORK_PEER_PORT, getPort()), equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH), equalTo(maybeStable(DB_OPERATION), "CreateIndexAction"), equalTo(ELASTICSEARCH_ACTION, "CreateIndexAction"), @@ -217,7 +217,7 @@ public abstract class AbstractElasticsearchTransportClientTest .hasNoParent() .hasAttributesSatisfyingExactly( equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH), equalTo(maybeStable(DB_OPERATION), getPutMappingActionName()), equalTo(ELASTICSEARCH_ACTION, getPutMappingActionName()), @@ -233,7 +233,7 @@ public abstract class AbstractElasticsearchTransportClientTest equalTo(NETWORK_PEER_ADDRESS, getAddress()), equalTo(NETWORK_PEER_PORT, getPort()), equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH), equalTo(maybeStable(DB_OPERATION), "IndexAction"), equalTo(ELASTICSEARCH_ACTION, "IndexAction"), @@ -256,7 +256,7 @@ public abstract class AbstractElasticsearchTransportClientTest equalTo(NETWORK_PEER_ADDRESS, getAddress()), equalTo(NETWORK_PEER_PORT, getPort()), equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH), equalTo(maybeStable(DB_OPERATION), "GetAction"), equalTo(ELASTICSEARCH_ACTION, "GetAction"), @@ -276,7 +276,7 @@ public abstract class AbstractElasticsearchTransportClientTest equalTo(NETWORK_PEER_ADDRESS, getAddress()), equalTo(NETWORK_PEER_PORT, getPort()), equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH), equalTo(maybeStable(DB_OPERATION), "GetAction"), equalTo(ELASTICSEARCH_ACTION, "GetAction"), diff --git a/instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/extannotations/ConfiguredTraceAnnotationsTest.java b/instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/extannotations/ConfiguredTraceAnnotationsTest.java index 220a050b00..5cee9fabba 100644 --- a/instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/extannotations/ConfiguredTraceAnnotationsTest.java +++ b/instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/extannotations/ConfiguredTraceAnnotationsTest.java @@ -26,6 +26,7 @@ class ConfiguredTraceAnnotationsTest { assertThat(testing.spans()).isEmpty(); } + @SuppressWarnings("deprecation") // using deprecated semconv @Test void testMethodWithAnnotationShouldBeTraced() { assertThat(new AnnotationTracedCallable().call()).isEqualTo("Hello!"); diff --git a/instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/extannotations/TraceAnnotationsTest.java b/instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/extannotations/TraceAnnotationsTest.java index 4bdc9aa6e0..9f37402255 100644 --- a/instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/extannotations/TraceAnnotationsTest.java +++ b/instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/extannotations/TraceAnnotationsTest.java @@ -18,6 +18,7 @@ import java.util.concurrent.Callable; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +@SuppressWarnings("deprecation") // using deprecated semconv class TraceAnnotationsTest { @RegisterExtension diff --git a/instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/extannotations/TraceProvidersTest.java b/instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/extannotations/TraceProvidersTest.java index 6fba3ee5ff..31a0e78d24 100644 --- a/instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/extannotations/TraceProvidersTest.java +++ b/instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/extannotations/TraceProvidersTest.java @@ -22,6 +22,7 @@ class TraceProvidersTest { @RegisterExtension static final InstrumentationExtension testing = AgentInstrumentationExtension.create(); + @SuppressWarnings("deprecation") // using deprecated semconv @ParameterizedTest @EnumSource(TraceProvider.class) void testShouldSupportProvider(TraceProvider provider) { diff --git a/instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/extannotations/TracedMethodsExclusionTest.java b/instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/extannotations/TracedMethodsExclusionTest.java index d6aab0be70..2406706b77 100644 --- a/instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/extannotations/TracedMethodsExclusionTest.java +++ b/instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/extannotations/TracedMethodsExclusionTest.java @@ -20,6 +20,7 @@ class TracedMethodsExclusionTest { @RegisterExtension static final InstrumentationExtension testing = AgentInstrumentationExtension.create(); + @SuppressWarnings("deprecation") // using deprecated semconv @Test void testCallingTheseMethodsShouldBeTraced() { // Baseline and assumption validation diff --git a/instrumentation/geode-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/geode/GeodeDbAttributesGetter.java b/instrumentation/geode-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/geode/GeodeDbAttributesGetter.java index 0ce010e302..55ee8476db 100644 --- a/instrumentation/geode-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/geode/GeodeDbAttributesGetter.java +++ b/instrumentation/geode-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/geode/GeodeDbAttributesGetter.java @@ -16,6 +16,7 @@ final class GeodeDbAttributesGetter implements DbClientAttributesGetter span.hasName("put test-region") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "geode"), + equalTo(maybeStable(DB_SYSTEM), "geode"), equalTo(maybeStable(DB_NAME), "test-region"), equalTo(maybeStable(DB_OPERATION), "put")), span -> span.hasName(verb.concat(" test-region")) .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "geode"), + equalTo(maybeStable(DB_SYSTEM), "geode"), equalTo(maybeStable(DB_NAME), "test-region"), equalTo(maybeStable(DB_OPERATION), verb), equalTo(maybeStable(DB_STATEMENT), query)))); diff --git a/instrumentation/grails-3.0/javaagent/src/test/java/test/GrailsTest.java b/instrumentation/grails-3.0/javaagent/src/test/java/test/GrailsTest.java index c8dcf6c451..26be7954aa 100644 --- a/instrumentation/grails-3.0/javaagent/src/test/java/test/GrailsTest.java +++ b/instrumentation/grails-3.0/javaagent/src/test/java/test/GrailsTest.java @@ -161,6 +161,7 @@ public class GrailsTest extends AbstractHttpServerTest> errorPageSpanAssertions( String method, ServerEndpoint endpoint) { 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 871be36ae0..cc504baa77 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 @@ -7,6 +7,7 @@ package io.opentelemetry.javaagent.instrumentation.hibernate.v3_3; import static io.opentelemetry.instrumentation.api.internal.SemconvStability.emitStableDatabaseSemconv; import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStable; +import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStableDbSystemName; 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; @@ -69,7 +70,7 @@ abstract class AbstractHibernateTest { return span.hasKind(SpanKind.CLIENT) .hasParent(parent) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "h2"), + equalTo(maybeStable(DB_SYSTEM), maybeStableDbSystemName("h2")), equalTo(maybeStable(DB_NAME), "db1"), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"), equalTo(DB_CONNECTION_STRING, emitStableDatabaseSemconv() ? null : "h2:mem:"), @@ -84,7 +85,7 @@ abstract class AbstractHibernateTest { .hasKind(SpanKind.CLIENT) .hasParent(parent) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "h2"), + equalTo(maybeStable(DB_SYSTEM), maybeStableDbSystemName("h2")), equalTo(maybeStable(DB_NAME), "db1"), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"), equalTo(DB_CONNECTION_STRING, emitStableDatabaseSemconv() ? null : "h2:mem:"), 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 829a9b7ab2..cb1274f826 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 @@ -10,6 +10,7 @@ import static io.opentelemetry.api.trace.SpanKind.CLIENT; import static io.opentelemetry.api.trace.SpanKind.INTERNAL; import static io.opentelemetry.instrumentation.api.internal.SemconvStability.emitStableDatabaseSemconv; import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStable; +import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStableDbSystemName; 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; @@ -74,7 +75,7 @@ class CriteriaTest extends AbstractHibernateTest { .hasKind(CLIENT) .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "h2"), + equalTo(maybeStable(DB_SYSTEM), maybeStableDbSystemName("h2")), equalTo(maybeStable(DB_NAME), "db1"), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"), equalTo( 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 d3bad8bdb8..545fc29385 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 @@ -10,6 +10,7 @@ import static io.opentelemetry.api.trace.SpanKind.CLIENT; import static io.opentelemetry.api.trace.SpanKind.INTERNAL; import static io.opentelemetry.instrumentation.api.internal.SemconvStability.emitStableDatabaseSemconv; import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStable; +import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStableDbSystemName; 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; @@ -113,7 +114,7 @@ class EntityManagerTest extends AbstractHibernateTest { span.hasKind(CLIENT) .hasParent(trace.getSpan(2)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "h2"), + equalTo(maybeStable(DB_SYSTEM), maybeStableDbSystemName("h2")), equalTo(maybeStable(DB_NAME), "db1"), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"), equalTo( @@ -144,7 +145,7 @@ class EntityManagerTest extends AbstractHibernateTest { span.hasKind(CLIENT) .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "h2"), + equalTo(maybeStable(DB_SYSTEM), maybeStableDbSystemName("h2")), equalTo(maybeStable(DB_NAME), "db1"), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"), equalTo( @@ -230,7 +231,7 @@ class EntityManagerTest extends AbstractHibernateTest { .hasKind(CLIENT) .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "h2"), + equalTo(maybeStable(DB_SYSTEM), maybeStableDbSystemName("h2")), equalTo(maybeStable(DB_NAME), "db1"), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"), equalTo( @@ -256,7 +257,7 @@ class EntityManagerTest extends AbstractHibernateTest { span.hasKind(CLIENT) .hasParent(trace.getSpan(3)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "h2"), + equalTo(maybeStable(DB_SYSTEM), maybeStableDbSystemName("h2")), equalTo(maybeStable(DB_NAME), "db1"), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"), equalTo( @@ -305,7 +306,7 @@ class EntityManagerTest extends AbstractHibernateTest { .hasKind(CLIENT) .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "h2"), + equalTo(maybeStable(DB_SYSTEM), maybeStableDbSystemName("h2")), equalTo(maybeStable(DB_NAME), "db1"), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"), equalTo( 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 fc049858e5..5680bfefc1 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 @@ -10,6 +10,7 @@ import static io.opentelemetry.api.trace.SpanKind.CLIENT; import static io.opentelemetry.api.trace.SpanKind.INTERNAL; import static io.opentelemetry.instrumentation.api.internal.SemconvStability.emitStableDatabaseSemconv; import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStable; +import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStableDbSystemName; 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; @@ -69,7 +70,7 @@ class QueryTest extends AbstractHibernateTest { span.hasKind(CLIENT) .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "h2"), + equalTo(maybeStable(DB_SYSTEM), maybeStableDbSystemName("h2")), equalTo(maybeStable(DB_NAME), "db1"), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"), equalTo( @@ -127,7 +128,7 @@ class QueryTest extends AbstractHibernateTest { .hasKind(CLIENT) .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "h2"), + equalTo(maybeStable(DB_SYSTEM), maybeStableDbSystemName("h2")), equalTo(maybeStable(DB_NAME), "db1"), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"), equalTo( @@ -201,7 +202,7 @@ class QueryTest extends AbstractHibernateTest { .hasKind(CLIENT) .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "h2"), + equalTo(maybeStable(DB_SYSTEM), maybeStableDbSystemName("h2")), equalTo(maybeStable(DB_NAME), "db1"), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"), equalTo( 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 dad05c3e6f..0ef67c94a8 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 @@ -10,6 +10,7 @@ import static io.opentelemetry.api.trace.SpanKind.CLIENT; import static io.opentelemetry.api.trace.SpanKind.INTERNAL; import static io.opentelemetry.instrumentation.api.internal.SemconvStability.emitStableDatabaseSemconv; import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStable; +import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStableDbSystemName; 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; @@ -72,7 +73,7 @@ class SessionTest extends AbstractHibernateTest { span.hasKind(CLIENT) .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "h2"), + equalTo(maybeStable(DB_SYSTEM), maybeStableDbSystemName("h2")), equalTo(maybeStable(DB_NAME), "db1"), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"), equalTo( @@ -183,7 +184,7 @@ class SessionTest extends AbstractHibernateTest { span.hasKind(CLIENT) .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "h2"), + equalTo(maybeStable(DB_SYSTEM), maybeStableDbSystemName("h2")), equalTo(maybeStable(DB_NAME), "db1"), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"), equalTo( @@ -330,7 +331,7 @@ class SessionTest extends AbstractHibernateTest { span.hasKind(CLIENT) .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "h2"), + equalTo(maybeStable(DB_SYSTEM), maybeStableDbSystemName("h2")), equalTo(maybeStable(DB_NAME), "db1"), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"), equalTo( @@ -356,7 +357,7 @@ class SessionTest extends AbstractHibernateTest { span.hasKind(CLIENT) .hasParent(trace.getSpan(3)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "h2"), + equalTo(maybeStable(DB_SYSTEM), maybeStableDbSystemName("h2")), equalTo(maybeStable(DB_NAME), "db1"), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"), equalTo( @@ -490,7 +491,7 @@ class SessionTest extends AbstractHibernateTest { span.hasKind(CLIENT) .hasParent(trace.getSpan(2)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "h2"), + equalTo(maybeStable(DB_SYSTEM), maybeStableDbSystemName("h2")), equalTo(maybeStable(DB_NAME), "db1"), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"), equalTo( @@ -669,7 +670,7 @@ class SessionTest extends AbstractHibernateTest { span.hasKind(CLIENT) .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "h2"), + equalTo(maybeStable(DB_SYSTEM), maybeStableDbSystemName("h2")), equalTo(maybeStable(DB_NAME), "db1"), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"), equalTo( @@ -770,7 +771,7 @@ class SessionTest extends AbstractHibernateTest { .hasKind(CLIENT) .hasParent(trace.getSpan(2)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "h2"), + equalTo(maybeStable(DB_SYSTEM), maybeStableDbSystemName("h2")), equalTo(maybeStable(DB_NAME), "db1"), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"), equalTo( @@ -816,7 +817,7 @@ class SessionTest extends AbstractHibernateTest { .hasKind(CLIENT) .hasParent(trace.getSpan(6)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "h2"), + equalTo(maybeStable(DB_SYSTEM), maybeStableDbSystemName("h2")), equalTo(maybeStable(DB_NAME), "db1"), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"), equalTo( @@ -832,7 +833,7 @@ class SessionTest extends AbstractHibernateTest { .hasKind(CLIENT) .hasParent(trace.getSpan(6)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "h2"), + equalTo(maybeStable(DB_SYSTEM), maybeStableDbSystemName("h2")), equalTo(maybeStable(DB_NAME), "db1"), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"), equalTo( 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 2cbed93d9b..56170ea88b 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 @@ -74,7 +74,7 @@ class SpringJpaTest { .hasKind(CLIENT) .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "hsqldb"), + equalTo(maybeStable(DB_SYSTEM), "hsqldb"), equalTo(maybeStable(DB_NAME), "test"), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"), equalTo( @@ -131,7 +131,7 @@ class SpringJpaTest { .hasKind(CLIENT) .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "hsqldb"), + equalTo(maybeStable(DB_SYSTEM), "hsqldb"), equalTo(maybeStable(DB_NAME), "test"), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"), equalTo( @@ -176,7 +176,7 @@ class SpringJpaTest { .hasKind(CLIENT) .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "hsqldb"), + equalTo(maybeStable(DB_SYSTEM), "hsqldb"), equalTo(maybeStable(DB_NAME), "test"), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"), equalTo( @@ -202,7 +202,7 @@ class SpringJpaTest { .hasKind(CLIENT) .hasParent(trace.getSpan(3)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "hsqldb"), + equalTo(maybeStable(DB_SYSTEM), "hsqldb"), equalTo(maybeStable(DB_NAME), "test"), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"), equalTo( @@ -251,7 +251,7 @@ class SpringJpaTest { .hasKind(CLIENT) .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "hsqldb"), + equalTo(maybeStable(DB_SYSTEM), "hsqldb"), equalTo(maybeStable(DB_NAME), "test"), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"), equalTo( @@ -281,7 +281,7 @@ class SpringJpaTest { .hasKind(CLIENT) .hasParent(trace.getSpan(3)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "hsqldb"), + equalTo(maybeStable(DB_SYSTEM), "hsqldb"), equalTo(maybeStable(DB_NAME), "test"), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"), equalTo( @@ -321,7 +321,7 @@ class SpringJpaTest { .hasKind(CLIENT) .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "hsqldb"), + equalTo(maybeStable(DB_SYSTEM), "hsqldb"), equalTo(maybeStable(DB_NAME), "test"), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"), equalTo( @@ -361,7 +361,7 @@ class SpringJpaTest { .hasKind(CLIENT) .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "hsqldb"), + equalTo(maybeStable(DB_SYSTEM), "hsqldb"), equalTo(maybeStable(DB_NAME), "test"), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"), equalTo( @@ -395,7 +395,7 @@ class SpringJpaTest { span.hasName("DELETE test.Customer") .hasKind(CLIENT) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "hsqldb"), + equalTo(maybeStable(DB_SYSTEM), "hsqldb"), equalTo(maybeStable(DB_NAME), "test"), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"), equalTo( @@ -428,7 +428,7 @@ class SpringJpaTest { .hasKind(CLIENT) .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "hsqldb"), + equalTo(maybeStable(DB_SYSTEM), "hsqldb"), equalTo(maybeStable(DB_NAME), "test"), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"), equalTo( @@ -470,7 +470,7 @@ class SpringJpaTest { span.hasName("DELETE test.Customer") .hasKind(CLIENT) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "hsqldb"), + equalTo(maybeStable(DB_SYSTEM), "hsqldb"), equalTo(maybeStable(DB_NAME), "test"), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"), equalTo( 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 c02374b1e1..e458fddecb 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 @@ -7,6 +7,7 @@ package io.opentelemetry.javaagent.instrumentation.hibernate.v6_0; import static io.opentelemetry.instrumentation.api.internal.SemconvStability.emitStableDatabaseSemconv; import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStable; +import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStableDbSystemName; 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; @@ -84,7 +85,7 @@ public class CriteriaTest extends AbstractHibernateTest { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "h2"), + equalTo(maybeStable(DB_SYSTEM), maybeStableDbSystemName("h2")), equalTo(maybeStable(DB_NAME), "db1"), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"), equalTo( 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 126580bab3..b2aabba012 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 @@ -7,6 +7,7 @@ package io.opentelemetry.javaagent.instrumentation.hibernate.v6_0; import static io.opentelemetry.instrumentation.api.internal.SemconvStability.emitStableDatabaseSemconv; import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStable; +import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStableDbSystemName; 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; @@ -151,7 +152,7 @@ public class EntityManagerTest extends AbstractHibernateTest { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "h2"), + equalTo(maybeStable(DB_SYSTEM), maybeStableDbSystemName("h2")), equalTo(maybeStable(DB_NAME), "db1"), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"), equalTo( @@ -330,7 +331,7 @@ public class EntityManagerTest extends AbstractHibernateTest { return span.hasKind(SpanKind.CLIENT) .hasParent(parent) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "h2"), + equalTo(maybeStable(DB_SYSTEM), maybeStableDbSystemName("h2")), equalTo(maybeStable(DB_NAME), "db1"), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"), equalTo(DB_CONNECTION_STRING, emitStableDatabaseSemconv() ? null : "h2:mem:"), @@ -346,7 +347,7 @@ public class EntityManagerTest extends AbstractHibernateTest { .hasKind(SpanKind.CLIENT) .hasParent(parent) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "h2"), + equalTo(maybeStable(DB_SYSTEM), maybeStableDbSystemName("h2")), equalTo(maybeStable(DB_NAME), "db1"), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"), equalTo(DB_CONNECTION_STRING, emitStableDatabaseSemconv() ? null : "h2:mem:"), 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 9f528df5cf..616a0bdd74 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 @@ -109,7 +109,7 @@ public class ProcedureCallTest { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "hsqldb"), + equalTo(maybeStable(DB_SYSTEM), "hsqldb"), equalTo(maybeStable(DB_NAME), "test"), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"), equalTo( 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 69e95ce662..f28fcb457f 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 @@ -7,6 +7,7 @@ package io.opentelemetry.javaagent.instrumentation.hibernate.v6_0; import static io.opentelemetry.instrumentation.api.internal.SemconvStability.emitStableDatabaseSemconv; import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStable; +import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStableDbSystemName; 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; @@ -251,7 +252,7 @@ public class SessionTest extends AbstractHibernateTest { span.hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "h2"), + equalTo(maybeStable(DB_SYSTEM), maybeStableDbSystemName("h2")), equalTo(maybeStable(DB_NAME), "db1"), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"), equalTo( @@ -817,7 +818,7 @@ public class SessionTest extends AbstractHibernateTest { return span.hasKind(SpanKind.CLIENT) .hasParent(parent) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "h2"), + equalTo(maybeStable(DB_SYSTEM), maybeStableDbSystemName("h2")), equalTo(maybeStable(DB_NAME), "db1"), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"), equalTo(DB_CONNECTION_STRING, emitStableDatabaseSemconv() ? null : "h2:mem:"), @@ -833,7 +834,7 @@ public class SessionTest extends AbstractHibernateTest { .hasKind(SpanKind.CLIENT) .hasParent(parent) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "h2"), + equalTo(maybeStable(DB_SYSTEM), maybeStableDbSystemName("h2")), equalTo(maybeStable(DB_NAME), "db1"), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"), equalTo(DB_CONNECTION_STRING, emitStableDatabaseSemconv() ? null : "h2:mem:"), 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 8e4d345e70..f8b900140b 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 @@ -19,13 +19,13 @@ import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SQL_ 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; 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; @@ -81,7 +81,9 @@ class SpringJpaTest { .hasKind(CLIENT) .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, HSQLDB), + equalTo( + maybeStable(DB_SYSTEM), + DbIncubatingAttributes.DbSystemIncubatingValues.HSQLDB), equalTo(maybeStable(DB_NAME), "test"), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"), equalTo( @@ -133,7 +135,9 @@ class SpringJpaTest { .hasKind(CLIENT) .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, HSQLDB), + equalTo( + maybeStable(DB_SYSTEM), + DbIncubatingAttributes.DbSystemIncubatingValues.HSQLDB), equalTo(maybeStable(DB_NAME), "test"), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"), equalTo(maybeStable(DB_STATEMENT), "call next value for Customer_SEQ"), @@ -157,7 +161,9 @@ class SpringJpaTest { .hasKind(CLIENT) .hasParent(trace.getSpan(3)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, HSQLDB), + equalTo( + maybeStable(DB_SYSTEM), + DbIncubatingAttributes.DbSystemIncubatingValues.HSQLDB), equalTo(maybeStable(DB_NAME), "test"), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"), equalTo( @@ -196,7 +202,9 @@ class SpringJpaTest { span.hasName("SELECT test.Customer") .hasKind(CLIENT) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, HSQLDB), + equalTo( + maybeStable(DB_SYSTEM), + DbIncubatingAttributes.DbSystemIncubatingValues.HSQLDB), equalTo(maybeStable(DB_NAME), "test"), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"), equalTo( @@ -224,7 +232,9 @@ class SpringJpaTest { span.hasName("UPDATE test.Customer") .hasKind(CLIENT) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, HSQLDB), + equalTo( + maybeStable(DB_SYSTEM), + DbIncubatingAttributes.DbSystemIncubatingValues.HSQLDB), equalTo(maybeStable(DB_NAME), "test"), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"), equalTo( @@ -267,7 +277,9 @@ class SpringJpaTest { .hasKind(CLIENT) .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, HSQLDB), + equalTo( + maybeStable(DB_SYSTEM), + DbIncubatingAttributes.DbSystemIncubatingValues.HSQLDB), equalTo(maybeStable(DB_NAME), "test"), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"), equalTo( @@ -308,7 +320,9 @@ class SpringJpaTest { .hasKind(CLIENT) .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, HSQLDB), + equalTo( + maybeStable(DB_SYSTEM), + DbIncubatingAttributes.DbSystemIncubatingValues.HSQLDB), equalTo(maybeStable(DB_NAME), "test"), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"), equalTo( @@ -349,7 +363,9 @@ class SpringJpaTest { span.hasName("DELETE test.Customer") .hasKind(CLIENT) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, HSQLDB), + equalTo( + maybeStable(DB_SYSTEM), + DbIncubatingAttributes.DbSystemIncubatingValues.HSQLDB), equalTo(maybeStable(DB_NAME), "test"), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"), equalTo( 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 b8f5a35968..7b9471d06b 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 @@ -121,7 +121,7 @@ class ProcedureCallTest { .hasKind(CLIENT) .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "hsqldb"), + equalTo(maybeStable(DB_SYSTEM), "hsqldb"), equalTo(maybeStable(DB_NAME), "test"), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"), equalTo(maybeStable(DB_STATEMENT), "{call TEST_PROC()}"), 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 4f3033991f..c3650f6fa0 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 @@ -323,7 +323,7 @@ class InfluxDbClientTest { List result = new ArrayList<>(); result.addAll( asList( - equalTo(DB_SYSTEM, "influxdb"), + equalTo(maybeStable(DB_SYSTEM), "influxdb"), equalTo(maybeStable(DB_NAME), databaseName), equalTo(SERVER_ADDRESS, host), equalTo(SERVER_PORT, port), 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 e7bc6c0839..b05d42d168 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 @@ -152,7 +152,7 @@ class InfluxDbClient24Test { List result = new ArrayList<>(); result.addAll( asList( - equalTo(DB_SYSTEM, "influxdb"), + equalTo(maybeStable(DB_SYSTEM), "influxdb"), equalTo(maybeStable(DB_NAME), databaseName), equalTo(SERVER_ADDRESS, host), equalTo(SERVER_PORT, port), diff --git a/instrumentation/jaxrs/jaxrs-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v1_0/JaxRsAnnotations1InstrumentationTest.java b/instrumentation/jaxrs/jaxrs-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v1_0/JaxRsAnnotations1InstrumentationTest.java index 2cd0de942c..d33831fa75 100644 --- a/instrumentation/jaxrs/jaxrs-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v1_0/JaxRsAnnotations1InstrumentationTest.java +++ b/instrumentation/jaxrs/jaxrs-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v1_0/JaxRsAnnotations1InstrumentationTest.java @@ -104,6 +104,7 @@ class JaxRsAnnotations1InstrumentationTest { Arguments.of("/child/call", new JavaInterfaces.DefaultChildClassOnInterface())); } + @SuppressWarnings("deprecation") // using deprecated semconv @ParameterizedTest @MethodSource("provideArguments") void createSpanForAnnotatedMethod(String path, Jax action) { diff --git a/instrumentation/jaxrs/jaxrs-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v1_0/JerseyTest.java b/instrumentation/jaxrs/jaxrs-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v1_0/JerseyTest.java index ea40e17148..64d53de3d3 100644 --- a/instrumentation/jaxrs/jaxrs-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v1_0/JerseyTest.java +++ b/instrumentation/jaxrs/jaxrs-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v1_0/JerseyTest.java @@ -93,6 +93,7 @@ class JerseyTest extends AbstractHttpServerUsingTest { Arguments.of("test3/nested", "/test3/nested", "Test3", "nested", "Test3 nested!")); } + @SuppressWarnings("deprecation") // using deprecated semconv @ParameterizedTest @MethodSource("provideArguments") void request( diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/JaxRs2AnnotationsInstrumentationTest.java b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/JaxRs2AnnotationsInstrumentationTest.java index 35b0706618..2591a6ab0b 100644 --- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/JaxRs2AnnotationsInstrumentationTest.java +++ b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/JaxRs2AnnotationsInstrumentationTest.java @@ -104,6 +104,7 @@ class JaxRs2AnnotationsInstrumentationTest { Arguments.of("/child/call", new JavaInterfaces.DefaultChildClassOnInterface())); } + @SuppressWarnings("deprecation") // using deprecated semconv @ParameterizedTest @MethodSource("provideArguments") void createSpanForAnnotatedMethod(String path, Jax action) { diff --git a/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/JaxRs3AnnotationsInstrumentationTest.java b/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/JaxRs3AnnotationsInstrumentationTest.java index d309f5ece1..ee074bee82 100644 --- a/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/JaxRs3AnnotationsInstrumentationTest.java +++ b/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/JaxRs3AnnotationsInstrumentationTest.java @@ -104,6 +104,7 @@ class JaxRs3AnnotationsInstrumentationTest { Arguments.of("/child/call", new JavaInterfaces.DefaultChildClassOnInterface())); } + @SuppressWarnings("deprecation") // using deprecated semconv @ParameterizedTest @MethodSource("provideArguments") void createSpanForAnnotatedMethod(String path, Jax action) { diff --git a/instrumentation/jaxrs/jaxrs-common/testing/src/main/java/io/opentelemetry/instrumentation/jaxrs/AbstractJaxRsFilterTest.java b/instrumentation/jaxrs/jaxrs-common/testing/src/main/java/io/opentelemetry/instrumentation/jaxrs/AbstractJaxRsFilterTest.java index 29ea6e04aa..ebb838162b 100644 --- a/instrumentation/jaxrs/jaxrs-common/testing/src/main/java/io/opentelemetry/instrumentation/jaxrs/AbstractJaxRsFilterTest.java +++ b/instrumentation/jaxrs/jaxrs-common/testing/src/main/java/io/opentelemetry/instrumentation/jaxrs/AbstractJaxRsFilterTest.java @@ -25,6 +25,7 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; +@SuppressWarnings("deprecation") // using deprecated semconv public abstract class AbstractJaxRsFilterTest extends AbstractHttpServerUsingTest { protected static class TestResponse { diff --git a/instrumentation/jaxrs/jaxrs-common/testing/src/main/java/io/opentelemetry/instrumentation/jaxrs/AbstractJaxRsHttpServerTest.java b/instrumentation/jaxrs/jaxrs-common/testing/src/main/java/io/opentelemetry/instrumentation/jaxrs/AbstractJaxRsHttpServerTest.java index 9284c0a193..8a15711652 100644 --- a/instrumentation/jaxrs/jaxrs-common/testing/src/main/java/io/opentelemetry/instrumentation/jaxrs/AbstractJaxRsHttpServerTest.java +++ b/instrumentation/jaxrs/jaxrs-common/testing/src/main/java/io/opentelemetry/instrumentation/jaxrs/AbstractJaxRsHttpServerTest.java @@ -33,6 +33,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.EnumSource; +@SuppressWarnings("deprecation") // using deprecated semconv public abstract class AbstractJaxRsHttpServerTest extends AbstractHttpServerTest { protected abstract void awaitBarrier(int amount, TimeUnit timeUnit) throws Exception; diff --git a/instrumentation/jaxws/jaxws-2.0-arquillian-testing/src/main/java/AbstractArquillianJaxWsTest.java b/instrumentation/jaxws/jaxws-2.0-arquillian-testing/src/main/java/AbstractArquillianJaxWsTest.java index b93e4b31e9..d41814d31d 100644 --- a/instrumentation/jaxws/jaxws-2.0-arquillian-testing/src/main/java/AbstractArquillianJaxWsTest.java +++ b/instrumentation/jaxws/jaxws-2.0-arquillian-testing/src/main/java/AbstractArquillianJaxWsTest.java @@ -118,6 +118,7 @@ public abstract class AbstractArquillianJaxWsTest { return span.hasName(service + "/" + methodName).hasKind(SpanKind.INTERNAL); } + @SuppressWarnings("deprecation") // using deprecated semconv private static SpanDataAssert assertAnnotationHandlerSpan( SpanDataAssert span, String service, String methodName) { return span.hasName(service + "Impl." + methodName) diff --git a/instrumentation/jaxws/jaxws-2.0-common-testing/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/v2_0/AbstractJaxWs2Test.java b/instrumentation/jaxws/jaxws-2.0-common-testing/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/v2_0/AbstractJaxWs2Test.java index 3cd815de87..d499f7b890 100644 --- a/instrumentation/jaxws/jaxws-2.0-common-testing/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/v2_0/AbstractJaxWs2Test.java +++ b/instrumentation/jaxws/jaxws-2.0-common-testing/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/v2_0/AbstractJaxWs2Test.java @@ -40,6 +40,7 @@ import org.springframework.util.ClassUtils; import org.springframework.ws.client.core.WebServiceTemplate; import org.springframework.ws.soap.client.SoapFaultClientException; +@SuppressWarnings("deprecation") // using deprecated semconv public class AbstractJaxWs2Test extends AbstractHttpServerUsingTest { @RegisterExtension public static final InstrumentationExtension testing = diff --git a/instrumentation/jaxws/jaxws-2.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jaxws/v2_0/JaxWsAnnotationsTest.java b/instrumentation/jaxws/jaxws-2.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jaxws/v2_0/JaxWsAnnotationsTest.java index b037348e88..afbff45900 100644 --- a/instrumentation/jaxws/jaxws-2.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jaxws/v2_0/JaxWsAnnotationsTest.java +++ b/instrumentation/jaxws/jaxws-2.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jaxws/v2_0/JaxWsAnnotationsTest.java @@ -18,6 +18,7 @@ class JaxWsAnnotationsTest { @RegisterExtension static InstrumentationExtension testing = AgentInstrumentationExtension.create(); + @SuppressWarnings("deprecation") // using deprecated semconv @Test void webServiceProviderSpan() { new SoapProvider().invoke(null); diff --git a/instrumentation/jaxws/jaxws-jws-api-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jaxws/jws/v1_1/JwsAnnotationsTest.java b/instrumentation/jaxws/jaxws-jws-api-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jaxws/jws/v1_1/JwsAnnotationsTest.java index f9edd8f89c..4536422c82 100644 --- a/instrumentation/jaxws/jaxws-jws-api-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jaxws/jws/v1_1/JwsAnnotationsTest.java +++ b/instrumentation/jaxws/jaxws-jws-api-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jaxws/jws/v1_1/JwsAnnotationsTest.java @@ -16,6 +16,7 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +@SuppressWarnings("deprecation") // using deprecated semconv class JwsAnnotationsTest { @RegisterExtension static InstrumentationExtension testing = AgentInstrumentationExtension.create(); 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 36b1ccf33c..f22e9ad1a2 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 @@ -8,6 +8,7 @@ package io.opentelemetry.javaagent.instrumentation.jdbc.test; import static io.opentelemetry.instrumentation.api.internal.SemconvStability.emitStableDatabaseSemconv; import static io.opentelemetry.instrumentation.testing.junit.db.DbClientMetricsTestUtil.assertDurationMetric; import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStable; +import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStableDbSystemName; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS; @@ -21,6 +22,7 @@ import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPER 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_SYSTEM_NAME; import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_USER; import static java.util.Arrays.asList; @@ -371,7 +373,7 @@ class JdbcInstrumentationTest { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, system), + equalTo(maybeStable(DB_SYSTEM), maybeStableDbSystemName(system)), equalTo(maybeStable(DB_NAME), dbNameLower), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : username), equalTo(DB_CONNECTION_STRING, emitStableDatabaseSemconv() ? null : url), @@ -383,13 +385,13 @@ class JdbcInstrumentationTest { assertDurationMetric( testing, "io.opentelemetry.jdbc", - DB_SYSTEM, + DB_SYSTEM_NAME, DB_COLLECTION_NAME, DB_NAMESPACE, DB_OPERATION_NAME); } else { assertDurationMetric( - testing, "io.opentelemetry.jdbc", DB_SYSTEM, DB_OPERATION_NAME, DB_NAMESPACE); + testing, "io.opentelemetry.jdbc", DB_SYSTEM_NAME, DB_OPERATION_NAME, DB_NAMESPACE); } } @@ -503,7 +505,7 @@ class JdbcInstrumentationTest { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, system), + equalTo(maybeStable(DB_SYSTEM), maybeStableDbSystemName(system)), equalTo(maybeStable(DB_NAME), dbNameLower), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : username), equalTo(DB_CONNECTION_STRING, emitStableDatabaseSemconv() ? null : url), @@ -540,7 +542,7 @@ class JdbcInstrumentationTest { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, system), + equalTo(maybeStable(DB_SYSTEM), maybeStableDbSystemName(system)), equalTo(maybeStable(DB_NAME), dbNameLower), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : username), equalTo(DB_CONNECTION_STRING, emitStableDatabaseSemconv() ? null : url), @@ -577,7 +579,7 @@ class JdbcInstrumentationTest { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, system), + equalTo(maybeStable(DB_SYSTEM), maybeStableDbSystemName(system)), equalTo(maybeStable(DB_NAME), dbNameLower), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : username), equalTo(DB_CONNECTION_STRING, emitStableDatabaseSemconv() ? null : url), @@ -713,7 +715,7 @@ class JdbcInstrumentationTest { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, system), + equalTo(maybeStable(DB_SYSTEM), maybeStableDbSystemName(system)), equalTo(maybeStable(DB_NAME), dbNameLower), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : username), equalTo(DB_CONNECTION_STRING, emitStableDatabaseSemconv() ? null : url), @@ -815,7 +817,7 @@ class JdbcInstrumentationTest { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, system), + equalTo(maybeStable(DB_SYSTEM), maybeStableDbSystemName(system)), equalTo(maybeStable(DB_NAME), dbNameLower), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : username), equalTo(DB_CONNECTION_STRING, emitStableDatabaseSemconv() ? null : url), @@ -922,7 +924,7 @@ class JdbcInstrumentationTest { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, system), + equalTo(maybeStable(DB_SYSTEM), maybeStableDbSystemName(system)), equalTo(maybeStable(DB_NAME), dbNameLower), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : username), equalTo(DB_CONNECTION_STRING, emitStableDatabaseSemconv() ? null : url), @@ -992,7 +994,7 @@ class JdbcInstrumentationTest { CodeIncubatingAttributes.CODE_NAMESPACE, datasource.getClass().getName()), equalTo(CodeIncubatingAttributes.CODE_FUNCTION, "getConnection"), - equalTo(DB_SYSTEM, system), + equalTo(maybeStable(DB_SYSTEM), maybeStableDbSystemName(system)), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : user), equalTo(maybeStable(DB_NAME), "jdbcunittest"), equalTo( @@ -1009,7 +1011,7 @@ class JdbcInstrumentationTest { CodeIncubatingAttributes.CODE_NAMESPACE, datasource.getClass().getName()), equalTo(CodeIncubatingAttributes.CODE_FUNCTION, "getConnection"), - equalTo(DB_SYSTEM, system), + equalTo(maybeStable(DB_SYSTEM), maybeStableDbSystemName(system)), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : user), equalTo(maybeStable(DB_NAME), "jdbcunittest"), equalTo( @@ -1047,7 +1049,7 @@ class JdbcInstrumentationTest { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "other_sql"), + equalTo(maybeStable(DB_SYSTEM), "other_sql"), equalTo(maybeStable(DB_STATEMENT), "testing ?"), equalTo( DB_CONNECTION_STRING, @@ -1130,7 +1132,7 @@ class JdbcInstrumentationTest { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "other_sql"), + equalTo(maybeStable(DB_SYSTEM), "other_sql"), equalTo(maybeStable(DB_NAME), databaseName), equalTo( DB_CONNECTION_STRING, @@ -1180,7 +1182,7 @@ class JdbcInstrumentationTest { span.hasName("SELECT INFORMATION_SCHEMA.SYSTEM_USERS") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "hsqldb"), + equalTo(maybeStable(DB_SYSTEM), "hsqldb"), equalTo(maybeStable(DB_NAME), dbNameLower), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "SA"), equalTo( @@ -1254,7 +1256,7 @@ class JdbcInstrumentationTest { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "other_sql"), + equalTo(maybeStable(DB_SYSTEM), "other_sql"), equalTo( DB_CONNECTION_STRING, emitStableDatabaseSemconv() ? null : "testdb://localhost"), @@ -1360,7 +1362,7 @@ class JdbcInstrumentationTest { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, system), + equalTo(maybeStable(DB_SYSTEM), maybeStableDbSystemName(system)), equalTo(maybeStable(DB_NAME), dbNameLower), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : username), equalTo(DB_CONNECTION_STRING, emitStableDatabaseSemconv() ? null : url), @@ -1417,7 +1419,7 @@ class JdbcInstrumentationTest { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, system), + equalTo(maybeStable(DB_SYSTEM), maybeStableDbSystemName(system)), equalTo(maybeStable(DB_NAME), dbNameLower), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : username), equalTo(DB_CONNECTION_STRING, emitStableDatabaseSemconv() ? null : url), @@ -1463,7 +1465,7 @@ class JdbcInstrumentationTest { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, system), + equalTo(maybeStable(DB_SYSTEM), maybeStableDbSystemName(system)), equalTo(maybeStable(DB_NAME), dbNameLower), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : username), equalTo(DB_CONNECTION_STRING, emitStableDatabaseSemconv() ? null : url), @@ -1511,7 +1513,7 @@ class JdbcInstrumentationTest { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, system), + equalTo(maybeStable(DB_SYSTEM), maybeStableDbSystemName(system)), equalTo(maybeStable(DB_NAME), dbNameLower), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : username), equalTo(DB_CONNECTION_STRING, emitStableDatabaseSemconv() ? null : url), 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 e12d958a6b..79c74f466a 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 @@ -7,7 +7,10 @@ package io.opentelemetry.javaagent.instrumentation.scalaexecutors import io.opentelemetry.api.trace.{SpanKind, Tracer} import io.opentelemetry.instrumentation.api.internal.SemconvStability.emitStableDatabaseSemconv -import io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStable +import io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.{ + maybeStable, + maybeStableDbSystemName +} import io.opentelemetry.instrumentation.testing.junit.{ AgentInstrumentationExtension, InstrumentationExtension @@ -81,7 +84,10 @@ class SlickTest { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, DbSystemIncubatingValues.H2), + equalTo( + maybeStable(DB_SYSTEM), + maybeStableDbSystemName(DbSystemIncubatingValues.H2) + ), equalTo(maybeStable(DB_NAME), Db), equalTo( DB_USER, 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 7e71ddd5c6..b601e4b4aa 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 @@ -23,6 +23,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_SYSTEM_NAME = + AttributeKey.stringKey("db.system.name"); private static final AttributeKey DB_USER = AttributeKey.stringKey("db.user"); private static final AttributeKey DB_CONNECTION_STRING = AttributeKey.stringKey("db.connection_string"); @@ -43,13 +45,15 @@ enum DataSourceDbAttributesExtractor implements AttributesExtractor { + @SuppressWarnings("deprecation") // using deprecated DbSystemIncubatingValues @Override public String getDbSystem(JedisRequest request) { return DbIncubatingAttributes.DbSystemIncubatingValues.REDIS; 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 65578e6141..f8fb3b2d5f 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 @@ -18,6 +18,7 @@ import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPER import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION_NAME; 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_SYSTEM_NAME; import static org.assertj.core.api.Assertions.assertThat; import io.opentelemetry.api.trace.SpanKind; @@ -82,7 +83,7 @@ class Jedis30ClientTest { span.hasName("SET") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "SET foo ?"), equalTo(maybeStable(DB_OPERATION), "SET"), equalTo(SERVER_ADDRESS, host), @@ -95,7 +96,7 @@ class Jedis30ClientTest { testing, "io.opentelemetry.jedis-3.0", DB_OPERATION_NAME, - DB_SYSTEM, + DB_SYSTEM_NAME, SERVER_ADDRESS, SERVER_PORT, NETWORK_PEER_ADDRESS, @@ -116,7 +117,7 @@ class Jedis30ClientTest { span.hasName("SET") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "SET foo ?"), equalTo(maybeStable(DB_OPERATION), "SET"), equalTo(SERVER_ADDRESS, host), @@ -130,7 +131,7 @@ class Jedis30ClientTest { span.hasName("GET") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "GET foo"), equalTo(maybeStable(DB_OPERATION), "GET"), equalTo(SERVER_ADDRESS, host), @@ -154,7 +155,7 @@ class Jedis30ClientTest { span.hasName("SET") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "SET foo ?"), equalTo(maybeStable(DB_OPERATION), "SET"), equalTo(SERVER_ADDRESS, host), @@ -168,7 +169,7 @@ class Jedis30ClientTest { span.hasName("RANDOMKEY") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "RANDOMKEY"), equalTo(maybeStable(DB_OPERATION), "RANDOMKEY"), equalTo(SERVER_ADDRESS, host), diff --git a/instrumentation/jedis/jedis-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v4_0/JedisDbAttributesGetter.java b/instrumentation/jedis/jedis-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v4_0/JedisDbAttributesGetter.java index 8cdd49df99..b38b202b67 100644 --- a/instrumentation/jedis/jedis-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v4_0/JedisDbAttributesGetter.java +++ b/instrumentation/jedis/jedis-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v4_0/JedisDbAttributesGetter.java @@ -11,6 +11,7 @@ import javax.annotation.Nullable; final class JedisDbAttributesGetter implements DbClientAttributesGetter { + @SuppressWarnings("deprecation") // using deprecated DbSystemIncubatingValues @Override public String getDbSystem(JedisRequest request) { return DbIncubatingAttributes.DbSystemIncubatingValues.REDIS; 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 9e965ee16b..6522a2bdde 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 @@ -73,7 +73,7 @@ class Jedis40ClientTest { span.hasName("SET") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "SET foo ?"), equalTo(maybeStable(DB_OPERATION), "SET"), equalTo(NETWORK_TYPE, "ipv4"), @@ -95,7 +95,7 @@ class Jedis40ClientTest { span.hasName("SET") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "SET foo ?"), equalTo(maybeStable(DB_OPERATION), "SET"), equalTo(NETWORK_TYPE, "ipv4"), @@ -107,7 +107,7 @@ class Jedis40ClientTest { span.hasName("GET") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "GET foo"), equalTo(maybeStable(DB_OPERATION), "GET"), equalTo(NETWORK_TYPE, "ipv4"), @@ -129,7 +129,7 @@ class Jedis40ClientTest { span.hasName("SET") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "SET foo ?"), equalTo(maybeStable(DB_OPERATION), "SET"), equalTo(NETWORK_TYPE, "ipv4"), @@ -141,7 +141,7 @@ class Jedis40ClientTest { span.hasName("RANDOMKEY") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "RANDOMKEY"), equalTo(maybeStable(DB_OPERATION), "RANDOMKEY"), equalTo(NETWORK_TYPE, "ipv4"), diff --git a/instrumentation/jetty/jetty-11.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jetty/v11_0/JettyHandlerTest.java b/instrumentation/jetty/jetty-11.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jetty/v11_0/JettyHandlerTest.java index 3b7619c9bf..c460aa1fb1 100644 --- a/instrumentation/jetty/jetty-11.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jetty/v11_0/JettyHandlerTest.java +++ b/instrumentation/jetty/jetty-11.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jetty/v11_0/JettyHandlerTest.java @@ -84,6 +84,7 @@ class JettyHandlerTest extends AbstractHttpServerTest { options.setHasResponseCustomizer(endpoint -> true); } + @SuppressWarnings("deprecation") // using deprecated semconv @Override protected SpanDataAssert assertResponseSpan( SpanDataAssert span, String method, ServerEndpoint endpoint) { diff --git a/instrumentation/jetty/jetty-12.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jetty/v12_0/Jetty12HandlerTest.java b/instrumentation/jetty/jetty-12.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jetty/v12_0/Jetty12HandlerTest.java index b5bf258e07..3a75894f75 100644 --- a/instrumentation/jetty/jetty-12.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jetty/v12_0/Jetty12HandlerTest.java +++ b/instrumentation/jetty/jetty-12.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jetty/v12_0/Jetty12HandlerTest.java @@ -64,6 +64,7 @@ class Jetty12HandlerTest extends AbstractHttpServerTest { options.setHasResponseCustomizer(endpoint -> endpoint != EXCEPTION); } + @SuppressWarnings("deprecation") // using deprecated semconv @Override protected SpanDataAssert assertResponseSpan( SpanDataAssert span, String method, ServerEndpoint endpoint) { diff --git a/instrumentation/jetty/jetty-8.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jetty/v8_0/JettyHandlerTest.java b/instrumentation/jetty/jetty-8.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jetty/v8_0/JettyHandlerTest.java index 8619ca2b70..041f902901 100644 --- a/instrumentation/jetty/jetty-8.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jetty/v8_0/JettyHandlerTest.java +++ b/instrumentation/jetty/jetty-8.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jetty/v8_0/JettyHandlerTest.java @@ -84,6 +84,7 @@ class JettyHandlerTest extends AbstractHttpServerTest { options.setHasResponseCustomizer(endpoint -> endpoint != EXCEPTION); } + @SuppressWarnings("deprecation") // using deprecated semconv @Override protected SpanDataAssert assertResponseSpan( SpanDataAssert span, String method, ServerEndpoint endpoint) { 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 89cde6c423..e54700344b 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 @@ -18,8 +18,15 @@ final class LettuceConnectAttributesExtractor implements AttributesExtractor> { + @SuppressWarnings("deprecation") // using deprecated DbSystemIncubatingValues @Override public String getDbSystem(RedisCommand request) { return DbIncubatingAttributes.DbSystemIncubatingValues.REDIS; 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 ca25afe04e..bf8bb6bb93 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 @@ -148,7 +148,7 @@ class LettuceAsyncClientTest { .hasAttributesSatisfyingExactly( equalTo(SERVER_ADDRESS, host), equalTo(SERVER_PORT, port), - equalTo(DB_SYSTEM, "redis")))); + equalTo(maybeStable(DB_SYSTEM), "redis")))); } @Test @@ -176,7 +176,7 @@ class LettuceAsyncClientTest { .hasAttributesSatisfyingExactly( equalTo(SERVER_ADDRESS, host), equalTo(SERVER_PORT, incorrectPort), - equalTo(DB_SYSTEM, "redis")))); + equalTo(maybeStable(DB_SYSTEM), "redis")))); } @Test @@ -194,7 +194,7 @@ class LettuceAsyncClientTest { span.hasName("SET") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_OPERATION), "SET")))); } @@ -224,7 +224,8 @@ class LettuceAsyncClientTest { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "redis"), equalTo(maybeStable(DB_OPERATION), "GET")), + equalTo(maybeStable(DB_SYSTEM), "redis"), + equalTo(maybeStable(DB_OPERATION), "GET")), span -> span.hasName("callback") .hasKind(SpanKind.INTERNAL) @@ -285,7 +286,8 @@ class LettuceAsyncClientTest { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "redis"), equalTo(maybeStable(DB_OPERATION), "GET")), + equalTo(maybeStable(DB_SYSTEM), "redis"), + equalTo(maybeStable(DB_OPERATION), "GET")), span -> span.hasName("callback1") .hasKind(SpanKind.INTERNAL) @@ -325,7 +327,7 @@ class LettuceAsyncClientTest { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_OPERATION), "RANDOMKEY")), span -> span.hasName("callback") @@ -369,7 +371,7 @@ class LettuceAsyncClientTest { span.hasName("HMSET") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_OPERATION), "HMSET"))), trace -> trace.hasSpansSatisfyingExactly( @@ -377,7 +379,7 @@ class LettuceAsyncClientTest { span.hasName("HGETALL") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_OPERATION), "HGETALL")))); } @@ -419,7 +421,7 @@ class LettuceAsyncClientTest { .hasStatus(StatusData.error()) .hasException(new IllegalStateException("TestException")) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_OPERATION), "DEL")))); } @@ -456,7 +458,7 @@ class LettuceAsyncClientTest { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_OPERATION), "SADD"), equalTo(booleanKey("lettuce.command.cancelled"), true)), span -> @@ -493,7 +495,7 @@ class LettuceAsyncClientTest { span.hasName("DEBUG") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_OPERATION), "DEBUG")))); } @@ -527,7 +529,7 @@ class LettuceAsyncClientTest { span.hasName("SHUTDOWN") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_OPERATION), "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 e9d1dc16ba..af620f9ee2 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 @@ -126,7 +126,7 @@ class LettuceSyncClientTest { .hasAttributesSatisfyingExactly( equalTo(SERVER_ADDRESS, host), equalTo(SERVER_PORT, port), - equalTo(DB_SYSTEM, "redis")))); + equalTo(maybeStable(DB_SYSTEM), "redis")))); } @Test @@ -149,7 +149,7 @@ class LettuceSyncClientTest { .hasAttributesSatisfyingExactly( equalTo(SERVER_ADDRESS, host), equalTo(SERVER_PORT, incorrectPort), - equalTo(DB_SYSTEM, "redis")))); + equalTo(maybeStable(DB_SYSTEM), "redis")))); } @Test @@ -164,7 +164,7 @@ class LettuceSyncClientTest { span.hasName("SET") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_OPERATION), "SET")))); } @@ -180,7 +180,7 @@ class LettuceSyncClientTest { span.hasName("GET") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_OPERATION), "GET")))); } @@ -196,7 +196,7 @@ class LettuceSyncClientTest { span.hasName("GET") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_OPERATION), "GET")))); } @@ -212,7 +212,7 @@ class LettuceSyncClientTest { span.hasName("RANDOMKEY") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_OPERATION), "RANDOMKEY")))); } @@ -228,7 +228,7 @@ class LettuceSyncClientTest { span.hasName("LPUSH") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_OPERATION), "LPUSH")))); } @@ -244,7 +244,7 @@ class LettuceSyncClientTest { span.hasName("HMSET") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_OPERATION), "HMSET")))); } @@ -260,7 +260,7 @@ class LettuceSyncClientTest { span.hasName("HGETALL") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_OPERATION), "HGETALL")))); } @@ -292,7 +292,7 @@ class LettuceSyncClientTest { span.hasName("DEBUG") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_OPERATION), "DEBUG")))); } @@ -326,7 +326,7 @@ class LettuceSyncClientTest { span.hasName("SHUTDOWN") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_OPERATION), "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 108604a23e..e431b512fe 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 @@ -18,8 +18,15 @@ final class LettuceConnectAttributesExtractor implements AttributesExtractor request) { return DbIncubatingAttributes.DbSystemIncubatingValues.REDIS; 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 9f8b225871..2a6960ad41 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 @@ -121,7 +121,7 @@ class LettuceAsyncClientTest extends AbstractLettuceClientTest { .hasAttributesSatisfyingExactly( equalTo(SERVER_ADDRESS, host), equalTo(SERVER_PORT, port), - equalTo(DB_SYSTEM, "redis")))); + equalTo(maybeStable(DB_SYSTEM), "redis")))); } @SuppressWarnings("deprecation") // RedisURI constructor @@ -152,7 +152,7 @@ class LettuceAsyncClientTest extends AbstractLettuceClientTest { .hasAttributesSatisfyingExactly( equalTo(SERVER_ADDRESS, host), equalTo(SERVER_PORT, incorrectPort), - equalTo(DB_SYSTEM, "redis")) + equalTo(maybeStable(DB_SYSTEM), "redis")) .hasEventsSatisfyingExactly( event -> event @@ -189,7 +189,7 @@ class LettuceAsyncClientTest extends AbstractLettuceClientTest { span.hasName("SET") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "SET TESTSETKEY ?"), equalTo(maybeStable(DB_OPERATION), "SET")))); } @@ -221,7 +221,7 @@ class LettuceAsyncClientTest extends AbstractLettuceClientTest { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "GET TESTKEY"), equalTo(maybeStable(DB_OPERATION), "GET")), span -> @@ -278,7 +278,7 @@ class LettuceAsyncClientTest extends AbstractLettuceClientTest { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "GET NON_EXISTENT_KEY"), equalTo(maybeStable(DB_OPERATION), "GET")), span -> @@ -321,7 +321,7 @@ class LettuceAsyncClientTest extends AbstractLettuceClientTest { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "RANDOMKEY"), equalTo(maybeStable(DB_OPERATION), "RANDOMKEY")), span -> @@ -367,7 +367,7 @@ class LettuceAsyncClientTest extends AbstractLettuceClientTest { span.hasName("HMSET") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo( maybeStable(DB_STATEMENT), "HMSET TESTHM firstname ? lastname ? age ?"), @@ -378,7 +378,7 @@ class LettuceAsyncClientTest extends AbstractLettuceClientTest { span.hasName("HGETALL") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "HGETALL TESTHM"), equalTo(maybeStable(DB_OPERATION), "HGETALL")))); } @@ -421,7 +421,7 @@ class LettuceAsyncClientTest extends AbstractLettuceClientTest { .hasStatus(StatusData.error()) .hasException(new IllegalStateException("TestException")) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "DEL key1 key2"), equalTo(maybeStable(DB_OPERATION), "DEL")))); } @@ -459,7 +459,7 @@ class LettuceAsyncClientTest extends AbstractLettuceClientTest { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "SADD SKEY ? ?"), equalTo(maybeStable(DB_OPERATION), "SADD"), equalTo(booleanKey("lettuce.command.cancelled"), true)), @@ -484,7 +484,7 @@ class LettuceAsyncClientTest extends AbstractLettuceClientTest { span.hasName("DEBUG") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "DEBUG SEGFAULT"), equalTo(maybeStable(DB_OPERATION), "DEBUG")))); } @@ -504,7 +504,7 @@ class LettuceAsyncClientTest extends AbstractLettuceClientTest { span.hasName("SHUTDOWN") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "SHUTDOWN NOSAVE"), equalTo(maybeStable(DB_OPERATION), "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 1bc93dd586..9cf7b958e5 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 @@ -95,7 +95,7 @@ class LettuceReactiveClientTest extends AbstractLettuceClientTest { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "SET TESTSETKEY ?"), equalTo(maybeStable(DB_OPERATION), "SET")), span -> @@ -126,7 +126,7 @@ class LettuceReactiveClientTest extends AbstractLettuceClientTest { span.hasName("GET") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "GET TESTKEY"), equalTo(maybeStable(DB_OPERATION), "GET")))); } @@ -165,7 +165,7 @@ class LettuceReactiveClientTest extends AbstractLettuceClientTest { span.hasName("GET") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "GET NON_EXISTENT_KEY"), equalTo(maybeStable(DB_OPERATION), "GET")), span -> @@ -195,7 +195,7 @@ class LettuceReactiveClientTest extends AbstractLettuceClientTest { span.hasName("RANDOMKEY") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "RANDOMKEY"), equalTo(maybeStable(DB_OPERATION), "RANDOMKEY")))); } @@ -211,7 +211,7 @@ class LettuceReactiveClientTest extends AbstractLettuceClientTest { span.hasName("COMMAND") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "COMMAND"), equalTo(maybeStable(DB_OPERATION), "COMMAND"), satisfies( @@ -230,7 +230,7 @@ class LettuceReactiveClientTest extends AbstractLettuceClientTest { span.hasName("COMMAND") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "COMMAND"), equalTo(maybeStable(DB_OPERATION), "COMMAND"), satisfies( @@ -264,7 +264,7 @@ class LettuceReactiveClientTest extends AbstractLettuceClientTest { span.hasName("DEBUG") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "DEBUG SEGFAULT"), equalTo(maybeStable(DB_OPERATION), "DEBUG")))); } @@ -284,7 +284,7 @@ class LettuceReactiveClientTest extends AbstractLettuceClientTest { span.hasName("SHUTDOWN") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "SHUTDOWN NOSAVE"), equalTo(maybeStable(DB_OPERATION), "SHUTDOWN")))); } @@ -304,7 +304,7 @@ class LettuceReactiveClientTest extends AbstractLettuceClientTest { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "SET a ?"), equalTo(maybeStable(DB_OPERATION), "SET")), span -> @@ -312,7 +312,7 @@ class LettuceReactiveClientTest extends AbstractLettuceClientTest { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "GET a"), equalTo(maybeStable(DB_OPERATION), "GET")))); } @@ -332,7 +332,7 @@ class LettuceReactiveClientTest extends AbstractLettuceClientTest { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "SET a ?"), equalTo(maybeStable(DB_OPERATION), "SET")), span -> @@ -340,7 +340,7 @@ class LettuceReactiveClientTest extends AbstractLettuceClientTest { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "GET a"), equalTo(maybeStable(DB_OPERATION), "GET")))); } @@ -365,7 +365,7 @@ class LettuceReactiveClientTest extends AbstractLettuceClientTest { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "SET a ?"), equalTo(maybeStable(DB_OPERATION), "SET")), span -> @@ -373,7 +373,7 @@ class LettuceReactiveClientTest extends AbstractLettuceClientTest { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "GET a"), equalTo(maybeStable(DB_OPERATION), "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 de26734dd9..9e272fec6f 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 @@ -96,7 +96,7 @@ class LettuceSyncClientTest extends AbstractLettuceClientTest { .hasAttributesSatisfyingExactly( equalTo(SERVER_ADDRESS, host), equalTo(SERVER_PORT, port), - equalTo(DB_SYSTEM, "redis")))); + equalTo(maybeStable(DB_SYSTEM), "redis")))); } @Test @@ -118,7 +118,7 @@ class LettuceSyncClientTest extends AbstractLettuceClientTest { .hasAttributesSatisfyingExactly( equalTo(SERVER_ADDRESS, host), equalTo(SERVER_PORT, incorrectPort), - equalTo(DB_SYSTEM, "redis")) + equalTo(maybeStable(DB_SYSTEM), "redis")) .hasEventsSatisfyingExactly( event -> event @@ -152,7 +152,7 @@ class LettuceSyncClientTest extends AbstractLettuceClientTest { span.hasName("SET") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "SET TESTSETKEY ?"), equalTo(maybeStable(DB_OPERATION), "SET")))); } @@ -169,7 +169,7 @@ class LettuceSyncClientTest extends AbstractLettuceClientTest { span.hasName("GET") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "GET TESTKEY"), equalTo(maybeStable(DB_OPERATION), "GET")))); } @@ -186,7 +186,7 @@ class LettuceSyncClientTest extends AbstractLettuceClientTest { span.hasName("GET") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "GET NON_EXISTENT_KEY"), equalTo(maybeStable(DB_OPERATION), "GET")))); } @@ -203,7 +203,7 @@ class LettuceSyncClientTest extends AbstractLettuceClientTest { span.hasName("RANDOMKEY") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "RANDOMKEY"), equalTo(maybeStable(DB_OPERATION), "RANDOMKEY")))); } @@ -220,7 +220,7 @@ class LettuceSyncClientTest extends AbstractLettuceClientTest { span.hasName("LPUSH") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "LPUSH TESTLIST ?"), equalTo(maybeStable(DB_OPERATION), "LPUSH")))); } @@ -237,7 +237,7 @@ class LettuceSyncClientTest extends AbstractLettuceClientTest { span.hasName("HMSET") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo( maybeStable(DB_STATEMENT), "HMSET user firstname ? lastname ? age ?"), @@ -256,7 +256,7 @@ class LettuceSyncClientTest extends AbstractLettuceClientTest { span.hasName("HGETALL") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "HGETALL TESTHM"), equalTo(maybeStable(DB_OPERATION), "HGETALL")))); } @@ -276,7 +276,7 @@ class LettuceSyncClientTest extends AbstractLettuceClientTest { span.hasName("DEBUG") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "DEBUG SEGFAULT"), equalTo(maybeStable(DB_OPERATION), "DEBUG")))); } @@ -296,7 +296,7 @@ class LettuceSyncClientTest extends AbstractLettuceClientTest { span.hasName("SHUTDOWN") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "SHUTDOWN NOSAVE"), equalTo(maybeStable(DB_OPERATION), "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 4f2b40813e..e2b904ec43 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 @@ -64,7 +64,7 @@ class LettuceReactiveClientTest extends AbstractLettuceReactiveClientTest { equalTo(NETWORK_PEER_PORT, port), equalTo(SERVER_ADDRESS, host), equalTo(SERVER_PORT, port), - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "SET a ?"))) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), @@ -80,7 +80,7 @@ class LettuceReactiveClientTest extends AbstractLettuceReactiveClientTest { equalTo(NETWORK_PEER_PORT, port), equalTo(SERVER_ADDRESS, host), equalTo(SERVER_PORT, port), - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "GET a"))) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), 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 2fee8305d9..145ddc164e 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 @@ -42,6 +42,8 @@ final class OpenTelemetryTracing implements Tracing { // copied from DbIncubatingAttributes private static final AttributeKey DB_SYSTEM = AttributeKey.stringKey("db.system"); + private static final AttributeKey DB_SYSTEM_NAME = + AttributeKey.stringKey("db.system.name"); 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_REDIS_DATABASE_INDEX = @@ -171,11 +173,13 @@ final class OpenTelemetryTracing implements Tracing { // Name will be updated later, we create with an arbitrary one here to store other data before // the span starts. SpanBuilder spanBuilder = - tracer - .spanBuilder("redis") - .setSpanKind(SpanKind.CLIENT) - .setParent(context) - .setAttribute(DB_SYSTEM, REDIS); + tracer.spanBuilder("redis").setSpanKind(SpanKind.CLIENT).setParent(context); + if (SemconvStability.emitStableDatabaseSemconv()) { + spanBuilder.setAttribute(DB_SYSTEM_NAME, REDIS); + } + if (SemconvStability.emitOldDatabaseSemconv()) { + spanBuilder.setAttribute(DB_SYSTEM, REDIS); + } return new OpenTelemetrySpan(context, spanBuilder, sanitizer, metrics); } } @@ -196,7 +200,7 @@ final class OpenTelemetryTracing implements Tracing { @Nullable private Throwable error; @Nullable private Span span; private long spanStartNanos; - private final AttributesBuilder attributesBuilder = Attributes.builder().put(DB_SYSTEM, REDIS); + private final AttributesBuilder attributesBuilder; @Nullable private List argsList; @Nullable private String argsString; @@ -209,6 +213,13 @@ final class OpenTelemetryTracing implements Tracing { this.spanBuilder = spanBuilder; this.sanitizer = sanitizer; this.metrics = metrics; + this.attributesBuilder = Attributes.builder(); + if (SemconvStability.emitStableDatabaseSemconv()) { + attributesBuilder.put(DB_SYSTEM_NAME, REDIS); + } + if (SemconvStability.emitOldDatabaseSemconv()) { + attributesBuilder.put(DB_SYSTEM, REDIS); + } } @Override 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 9a65d02a37..22cd569bc0 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 @@ -166,7 +166,7 @@ public abstract class AbstractLettuceAsyncClientTest extends AbstractLettuceClie equalTo(NETWORK_PEER_PORT, port), equalTo(SERVER_ADDRESS, host), equalTo(SERVER_PORT, port), - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "SET TESTSETKEY ?"))) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), @@ -212,7 +212,7 @@ public abstract class AbstractLettuceAsyncClientTest extends AbstractLettuceClie equalTo(NETWORK_PEER_PORT, port), equalTo(SERVER_ADDRESS, host), equalTo(SERVER_PORT, port), - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "GET TESTKEY"))) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), @@ -291,7 +291,7 @@ public abstract class AbstractLettuceAsyncClientTest extends AbstractLettuceClie equalTo(NETWORK_PEER_PORT, port), equalTo(SERVER_ADDRESS, host), equalTo(SERVER_PORT, port), - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo( maybeStable(DB_STATEMENT), "GET NON_EXISTENT_KEY"))) .hasEventsSatisfyingExactly( @@ -358,7 +358,7 @@ public abstract class AbstractLettuceAsyncClientTest extends AbstractLettuceClie equalTo(NETWORK_PEER_PORT, port), equalTo(SERVER_ADDRESS, host), equalTo(SERVER_PORT, port), - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "RANDOMKEY"))) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), @@ -418,7 +418,7 @@ public abstract class AbstractLettuceAsyncClientTest extends AbstractLettuceClie equalTo(NETWORK_PEER_PORT, port), equalTo(SERVER_ADDRESS, host), equalTo(SERVER_PORT, port), - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo( maybeStable(DB_STATEMENT), "HMSET TESTHM firstname ? lastname ? age ?"))) @@ -437,7 +437,7 @@ public abstract class AbstractLettuceAsyncClientTest extends AbstractLettuceClie equalTo(NETWORK_PEER_PORT, port), equalTo(SERVER_ADDRESS, host), equalTo(SERVER_PORT, port), - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "HGETALL TESTHM"))) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), 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 93b20a87be..d301e43215 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 @@ -104,7 +104,7 @@ public abstract class AbstractLettuceReactiveClientTest extends AbstractLettuceC equalTo(NETWORK_PEER_PORT, port), equalTo(SERVER_ADDRESS, host), equalTo(SERVER_PORT, port), - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "SET TESTSETKEY ?"))) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), @@ -143,7 +143,7 @@ public abstract class AbstractLettuceReactiveClientTest extends AbstractLettuceC equalTo(NETWORK_PEER_PORT, port), equalTo(SERVER_ADDRESS, host), equalTo(SERVER_PORT, port), - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "GET TESTKEY"))) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), @@ -193,7 +193,7 @@ public abstract class AbstractLettuceReactiveClientTest extends AbstractLettuceC equalTo(NETWORK_PEER_PORT, port), equalTo(SERVER_ADDRESS, host), equalTo(SERVER_PORT, port), - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "GET NON_EXISTENT_KEY"))) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), @@ -231,7 +231,7 @@ public abstract class AbstractLettuceReactiveClientTest extends AbstractLettuceC equalTo(NETWORK_PEER_PORT, port), equalTo(SERVER_ADDRESS, host), equalTo(SERVER_PORT, port), - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "RANDOMKEY"))) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), @@ -256,7 +256,7 @@ public abstract class AbstractLettuceReactiveClientTest extends AbstractLettuceC equalTo(NETWORK_PEER_PORT, port), equalTo(SERVER_ADDRESS, host), equalTo(SERVER_PORT, port), - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "COMMAND"))) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), @@ -302,7 +302,7 @@ public abstract class AbstractLettuceReactiveClientTest extends AbstractLettuceC equalTo(NETWORK_PEER_PORT, port), equalTo(SERVER_ADDRESS, host), equalTo(SERVER_PORT, port), - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "SET a ?"))) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), @@ -318,7 +318,7 @@ public abstract class AbstractLettuceReactiveClientTest extends AbstractLettuceC equalTo(NETWORK_PEER_PORT, port), equalTo(SERVER_ADDRESS, host), equalTo(SERVER_PORT, port), - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "GET a"))) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), @@ -348,7 +348,7 @@ public abstract class AbstractLettuceReactiveClientTest extends AbstractLettuceC equalTo(NETWORK_PEER_PORT, port), equalTo(SERVER_ADDRESS, host), equalTo(SERVER_PORT, port), - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "SET a ?"))) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), @@ -364,7 +364,7 @@ public abstract class AbstractLettuceReactiveClientTest extends AbstractLettuceC equalTo(NETWORK_PEER_PORT, port), equalTo(SERVER_ADDRESS, host), equalTo(SERVER_PORT, port), - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "GET a"))) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), 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 76a4677980..a62e9f72e5 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 @@ -81,7 +81,7 @@ public abstract class AbstractLettuceSyncClientAuthTest extends AbstractLettuceC equalTo(NETWORK_PEER_PORT, port), equalTo(SERVER_ADDRESS, host), equalTo(SERVER_PORT, port), - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo( maybeStable(DB_STATEMENT), "CLIENT SETINFO lib-name Lettuce")))), @@ -97,7 +97,7 @@ public abstract class AbstractLettuceSyncClientAuthTest extends AbstractLettuceC equalTo(NETWORK_PEER_PORT, port), equalTo(SERVER_ADDRESS, host), equalTo(SERVER_PORT, port), - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), satisfies( maybeStable(DB_STATEMENT), stringAssert -> @@ -114,7 +114,7 @@ public abstract class AbstractLettuceSyncClientAuthTest extends AbstractLettuceC equalTo(NETWORK_PEER_PORT, port), equalTo(SERVER_ADDRESS, host), equalTo(SERVER_PORT, port), - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "AUTH ?"))) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), @@ -135,7 +135,7 @@ public abstract class AbstractLettuceSyncClientAuthTest extends AbstractLettuceC equalTo(NETWORK_PEER_PORT, port), equalTo(SERVER_ADDRESS, host), equalTo(SERVER_PORT, port), - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "AUTH ?"))) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), 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 460ed827a8..2011a35a52 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 @@ -17,6 +17,7 @@ import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT; import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_NAMESPACE; 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_SYSTEM_NAME; import static java.nio.charset.StandardCharsets.UTF_8; import static java.util.Arrays.asList; import static org.assertj.core.api.Assertions.assertThat; @@ -135,7 +136,7 @@ public abstract class AbstractLettuceSyncClientTest extends AbstractLettuceClien equalTo(NETWORK_PEER_PORT, port), equalTo(SERVER_ADDRESS, host), equalTo(SERVER_PORT, port), - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "SET TESTSETKEY ?"))) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), @@ -144,7 +145,11 @@ public abstract class AbstractLettuceSyncClientTest extends AbstractLettuceClien List> expected = new ArrayList<>( asList( - DB_SYSTEM, SERVER_ADDRESS, SERVER_PORT, NETWORK_PEER_ADDRESS, NETWORK_PEER_PORT)); + DB_SYSTEM_NAME, + SERVER_ADDRESS, + SERVER_PORT, + NETWORK_PEER_ADDRESS, + NETWORK_PEER_PORT)); if (Boolean.getBoolean("testLatestDeps")) { expected.add(DB_NAMESPACE); } @@ -175,7 +180,7 @@ public abstract class AbstractLettuceSyncClientTest extends AbstractLettuceClien equalTo(NETWORK_PEER_PORT, port), equalTo(SERVER_ADDRESS, host), equalTo(SERVER_PORT, port), - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "GET TESTKEY"))) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), @@ -201,7 +206,7 @@ public abstract class AbstractLettuceSyncClientTest extends AbstractLettuceClien equalTo(NETWORK_PEER_PORT, port), equalTo(SERVER_ADDRESS, host), equalTo(SERVER_PORT, port), - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "GET NON_EXISTENT_KEY"))) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), @@ -227,7 +232,7 @@ public abstract class AbstractLettuceSyncClientTest extends AbstractLettuceClien equalTo(NETWORK_PEER_PORT, port), equalTo(SERVER_ADDRESS, host), equalTo(SERVER_PORT, port), - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "RANDOMKEY"))) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), @@ -263,7 +268,7 @@ public abstract class AbstractLettuceSyncClientTest extends AbstractLettuceClien equalTo(NETWORK_PEER_PORT, containerConnection.port), equalTo(SERVER_ADDRESS, host), equalTo(SERVER_PORT, containerConnection.port), - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "LPUSH TESTLIST ?"))) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), @@ -289,7 +294,7 @@ public abstract class AbstractLettuceSyncClientTest extends AbstractLettuceClien equalTo(NETWORK_PEER_PORT, port), equalTo(SERVER_ADDRESS, host), equalTo(SERVER_PORT, port), - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo( maybeStable(DB_STATEMENT), "HMSET user firstname ? lastname ? age ?"))) @@ -317,7 +322,7 @@ public abstract class AbstractLettuceSyncClientTest extends AbstractLettuceClien equalTo(NETWORK_PEER_PORT, port), equalTo(SERVER_ADDRESS, host), equalTo(SERVER_PORT, port), - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "HGETALL TESTHM"))) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), @@ -350,7 +355,7 @@ public abstract class AbstractLettuceSyncClientTest extends AbstractLettuceClien equalTo(NETWORK_PEER_PORT, port), equalTo(SERVER_ADDRESS, host), equalTo(SERVER_PORT, port), - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo( maybeStable(DB_STATEMENT), "EVAL " + b64Script + " 1 TESTLIST ? ?"))) @@ -379,7 +384,7 @@ public abstract class AbstractLettuceSyncClientTest extends AbstractLettuceClien equalTo(NETWORK_PEER_PORT, port), equalTo(SERVER_ADDRESS, host), equalTo(SERVER_PORT, port), - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "MSET key1 ? key2 ?"))) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), @@ -409,7 +414,7 @@ public abstract class AbstractLettuceSyncClientTest extends AbstractLettuceClien equalTo(NETWORK_PEER_PORT, containerConnection.port), equalTo(SERVER_ADDRESS, host), equalTo(SERVER_PORT, containerConnection.port), - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo( maybeStable(DB_STATEMENT), "CLIENT SETINFO lib-name Lettuce")))), @@ -425,7 +430,7 @@ public abstract class AbstractLettuceSyncClientTest extends AbstractLettuceClien equalTo(NETWORK_PEER_PORT, containerConnection.port), equalTo(SERVER_ADDRESS, host), equalTo(SERVER_PORT, containerConnection.port), - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), satisfies( maybeStable(DB_STATEMENT), stringAssert -> @@ -442,7 +447,7 @@ public abstract class AbstractLettuceSyncClientTest extends AbstractLettuceClien equalTo(NETWORK_PEER_PORT, containerConnection.port), equalTo(SERVER_ADDRESS, host), equalTo(SERVER_PORT, containerConnection.port), - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "DEBUG SEGFAULT"))))); } else { testing() @@ -459,7 +464,7 @@ public abstract class AbstractLettuceSyncClientTest extends AbstractLettuceClien equalTo(NETWORK_PEER_PORT, containerConnection.port), equalTo(SERVER_ADDRESS, host), equalTo(SERVER_PORT, containerConnection.port), - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "DEBUG SEGFAULT"))) // these are no longer recorded since Lettuce 6.1.6 .hasEventsSatisfyingExactly( @@ -499,7 +504,7 @@ public abstract class AbstractLettuceSyncClientTest extends AbstractLettuceClien equalTo(NETWORK_PEER_PORT, containerConnection.port), equalTo(SERVER_ADDRESS, host), equalTo(SERVER_PORT, containerConnection.port), - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "SHUTDOWN NOSAVE")))); } else { trace.hasSpansSatisfyingExactly( @@ -515,7 +520,7 @@ public abstract class AbstractLettuceSyncClientTest extends AbstractLettuceClien equalTo(NETWORK_PEER_PORT, containerConnection.port), equalTo(SERVER_ADDRESS, host), equalTo(SERVER_PORT, containerConnection.port), - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "SHUTDOWN NOSAVE"))) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), diff --git a/instrumentation/log4j/log4j-appender-2.17/javaagent/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/Log4j2Test.java b/instrumentation/log4j/log4j-appender-2.17/javaagent/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/Log4j2Test.java index 0ea83e6e95..238e7afade 100644 --- a/instrumentation/log4j/log4j-appender-2.17/javaagent/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/Log4j2Test.java +++ b/instrumentation/log4j/log4j-appender-2.17/javaagent/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/Log4j2Test.java @@ -48,6 +48,7 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; +@SuppressWarnings("deprecation") // using deprecated semconv class Log4j2Test { @RegisterExtension diff --git a/instrumentation/log4j/log4j-appender-2.17/javaagent/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/Slf4jToLog4jTest.java b/instrumentation/log4j/log4j-appender-2.17/javaagent/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/Slf4jToLog4jTest.java index c1f5d1b932..d7a97fbb73 100644 --- a/instrumentation/log4j/log4j-appender-2.17/javaagent/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/Slf4jToLog4jTest.java +++ b/instrumentation/log4j/log4j-appender-2.17/javaagent/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/Slf4jToLog4jTest.java @@ -41,6 +41,7 @@ import org.slf4j.MDC; import org.slf4j.Marker; import org.slf4j.MarkerFactory; +@SuppressWarnings("deprecation") // using deprecated semconv class Slf4jToLog4jTest { @RegisterExtension diff --git a/instrumentation/log4j/log4j-appender-2.17/library/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/AbstractOpenTelemetryAppenderTest.java b/instrumentation/log4j/log4j-appender-2.17/library/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/AbstractOpenTelemetryAppenderTest.java index c7be6426f3..5a7373e24f 100644 --- a/instrumentation/log4j/log4j-appender-2.17/library/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/AbstractOpenTelemetryAppenderTest.java +++ b/instrumentation/log4j/log4j-appender-2.17/library/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/AbstractOpenTelemetryAppenderTest.java @@ -275,6 +275,7 @@ abstract class AbstractOpenTelemetryAppenderTest { return addLocationAttributes(AbstractOpenTelemetryAppenderTest.class, methodName, assertions); } + @SuppressWarnings("deprecation") // using deprecated semconv protected static List addLocationAttributes( Class testClass, String methodName, AttributeAssertion... assertions) { String selector = System.getProperty("Log4j2.contextSelector"); diff --git a/instrumentation/logback/logback-appender-1.0/javaagent/src/test/java/io/opentelemetry/instrumentation/logback/appender/v1_0/LogbackTest.java b/instrumentation/logback/logback-appender-1.0/javaagent/src/test/java/io/opentelemetry/instrumentation/logback/appender/v1_0/LogbackTest.java index 8fd7f563fc..101a956f51 100644 --- a/instrumentation/logback/logback-appender-1.0/javaagent/src/test/java/io/opentelemetry/instrumentation/logback/appender/v1_0/LogbackTest.java +++ b/instrumentation/logback/logback-appender-1.0/javaagent/src/test/java/io/opentelemetry/instrumentation/logback/appender/v1_0/LogbackTest.java @@ -115,6 +115,7 @@ class LogbackTest { testing.clearData(); } + @SuppressWarnings("deprecation") // using deprecated semconv private static void test( Logger logger, OneArgLoggerMethod oneArgLoggerMethod, @@ -184,6 +185,7 @@ class LogbackTest { } } + @SuppressWarnings("deprecation") // using deprecated semconv @Test void testMdc() { MDC.put("key1", "val1"); @@ -213,6 +215,7 @@ class LogbackTest { equalTo(CodeIncubatingAttributes.CODE_FILEPATH, "LogbackTest.java"))); } + @SuppressWarnings("deprecation") // using deprecated semconv @Test public void testMarker() { diff --git a/instrumentation/logback/logback-appender-1.0/library/src/test/java/io/opentelemetry/instrumentation/logback/appender/v1_0/AbstractOpenTelemetryAppenderTest.java b/instrumentation/logback/logback-appender-1.0/library/src/test/java/io/opentelemetry/instrumentation/logback/appender/v1_0/AbstractOpenTelemetryAppenderTest.java index 3dbbb0eb7c..fcefcccf0a 100644 --- a/instrumentation/logback/logback-appender-1.0/library/src/test/java/io/opentelemetry/instrumentation/logback/appender/v1_0/AbstractOpenTelemetryAppenderTest.java +++ b/instrumentation/logback/logback-appender-1.0/library/src/test/java/io/opentelemetry/instrumentation/logback/appender/v1_0/AbstractOpenTelemetryAppenderTest.java @@ -92,6 +92,7 @@ abstract class AbstractOpenTelemetryAppenderTest { .hasTotalAttributeCount(4)); } + @SuppressWarnings("deprecation") // using deprecated semconv @Test void logWithExtras() { Instant start = Instant.now(); diff --git a/instrumentation/methods/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/methods/MethodTest.java b/instrumentation/methods/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/methods/MethodTest.java index a187c3fbeb..34a342efb4 100644 --- a/instrumentation/methods/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/methods/MethodTest.java +++ b/instrumentation/methods/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/methods/MethodTest.java @@ -26,11 +26,13 @@ import javax.naming.ldap.InitialLdapContext; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +@SuppressWarnings("deprecation") // using deprecated semconv class MethodTest { @RegisterExtension static final InstrumentationExtension testing = AgentInstrumentationExtension.create(); + @SuppressWarnings("deprecation") // using deprecated semconv @Test void methodTraced() { assertThat(new ConfigTracedCallable().call()).isEqualTo("Hello!"); diff --git a/instrumentation/mongo/mongo-common/testing/src/main/java/io/opentelemetry/instrumentation/mongo/testing/AbstractMongoClientTest.java b/instrumentation/mongo/mongo-common/testing/src/main/java/io/opentelemetry/instrumentation/mongo/testing/AbstractMongoClientTest.java index f00cb317bc..fbedea73bb 100644 --- a/instrumentation/mongo/mongo-common/testing/src/main/java/io/opentelemetry/instrumentation/mongo/testing/AbstractMongoClientTest.java +++ b/instrumentation/mongo/mongo-common/testing/src/main/java/io/opentelemetry/instrumentation/mongo/testing/AbstractMongoClientTest.java @@ -534,7 +534,7 @@ public abstract class AbstractMongoClientTest { val -> val.satisfies( statement -> assertThat(statements).contains(statement.replaceAll(" ", "")))), - equalTo(DB_SYSTEM, "mongodb"), + equalTo(maybeStable(DB_SYSTEM), "mongodb"), equalTo( DB_CONNECTION_STRING, emitStableDatabaseSemconv() ? null : "mongodb://localhost:" + port), diff --git a/instrumentation/mybatis-3.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/mybatis/v3_2/MyBatisTest.java b/instrumentation/mybatis-3.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/mybatis/v3_2/MyBatisTest.java index a4ca40a009..8a246fb290 100644 --- a/instrumentation/mybatis-3.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/mybatis/v3_2/MyBatisTest.java +++ b/instrumentation/mybatis-3.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/mybatis/v3_2/MyBatisTest.java @@ -46,6 +46,7 @@ class MyBatisTest { } } + @SuppressWarnings("deprecation") // using deprecated semconv @Test void testSelect() { TestMapper testMapper = sqlSession.getMapper(TestMapper.class); 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 993ad7369e..6fee68ca86 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 @@ -102,7 +102,7 @@ public class OpenSearchRestTest { span.hasName("GET") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "opensearch"), + equalTo(maybeStable(DB_SYSTEM), "opensearch"), equalTo(maybeStable(DB_OPERATION), "GET"), equalTo(maybeStable(DB_STATEMENT), "GET _cluster/health")), span -> @@ -167,7 +167,7 @@ public class OpenSearchRestTest { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "opensearch"), + equalTo(maybeStable(DB_SYSTEM), "opensearch"), equalTo(maybeStable(DB_OPERATION), "GET"), equalTo(maybeStable(DB_STATEMENT), "GET _cluster/health")), span -> diff --git a/instrumentation/opensearch/opensearch-rest-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/OpenSearchRestAttributesGetter.java b/instrumentation/opensearch/opensearch-rest-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/OpenSearchRestAttributesGetter.java index aadbeba170..f428189998 100644 --- a/instrumentation/opensearch/opensearch-rest-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/OpenSearchRestAttributesGetter.java +++ b/instrumentation/opensearch/opensearch-rest-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/OpenSearchRestAttributesGetter.java @@ -12,6 +12,7 @@ import javax.annotation.Nullable; final class OpenSearchRestAttributesGetter implements DbClientAttributesGetter { + @SuppressWarnings("deprecation") // using deprecated DbSystemIncubatingValues @Override public String getDbSystem(OpenSearchRestRequest request) { return DbIncubatingAttributes.DbSystemIncubatingValues.OPENSEARCH; diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/ContextBridgeTest.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/ContextBridgeTest.java index d73dc4b80f..d84ea08722 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/ContextBridgeTest.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/ContextBridgeTest.java @@ -27,6 +27,7 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +@SuppressWarnings("deprecation") // using deprecated semconv class ContextBridgeTest { @RegisterExtension diff --git a/instrumentation/opentelemetry-instrumentation-annotations-1.16/javaagent/src/test/java/io/opentelemetry/test/annotation/AddingSpanAttributesInstrumentationTest.java b/instrumentation/opentelemetry-instrumentation-annotations-1.16/javaagent/src/test/java/io/opentelemetry/test/annotation/AddingSpanAttributesInstrumentationTest.java index 2ec738d7a4..4f57f6e334 100644 --- a/instrumentation/opentelemetry-instrumentation-annotations-1.16/javaagent/src/test/java/io/opentelemetry/test/annotation/AddingSpanAttributesInstrumentationTest.java +++ b/instrumentation/opentelemetry-instrumentation-annotations-1.16/javaagent/src/test/java/io/opentelemetry/test/annotation/AddingSpanAttributesInstrumentationTest.java @@ -23,6 +23,7 @@ class AddingSpanAttributesInstrumentationTest { public static final AgentInstrumentationExtension testing = AgentInstrumentationExtension.create(); + @SuppressWarnings("deprecation") // using deprecated semconv @Test void captureAttributesInNewSpan() { testing.runWithSpan( diff --git a/instrumentation/opentelemetry-instrumentation-annotations-1.16/javaagent/src/test/java/io/opentelemetry/test/annotation/WithSpanInstrumentationTest.java b/instrumentation/opentelemetry-instrumentation-annotations-1.16/javaagent/src/test/java/io/opentelemetry/test/annotation/WithSpanInstrumentationTest.java index 93fe05a740..d56fdc3f40 100644 --- a/instrumentation/opentelemetry-instrumentation-annotations-1.16/javaagent/src/test/java/io/opentelemetry/test/annotation/WithSpanInstrumentationTest.java +++ b/instrumentation/opentelemetry-instrumentation-annotations-1.16/javaagent/src/test/java/io/opentelemetry/test/annotation/WithSpanInstrumentationTest.java @@ -30,6 +30,7 @@ import net.bytebuddy.matcher.ElementMatchers; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +@SuppressWarnings("deprecation") // using deprecated semconv class WithSpanInstrumentationTest { @RegisterExtension diff --git a/instrumentation/powerjob-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/powerjob/v4_0/PowerJobBasicProcessorTest.java b/instrumentation/powerjob-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/powerjob/v4_0/PowerJobBasicProcessorTest.java index cf00072088..3f9edbbb7b 100644 --- a/instrumentation/powerjob-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/powerjob/v4_0/PowerJobBasicProcessorTest.java +++ b/instrumentation/powerjob-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/powerjob/v4_0/PowerJobBasicProcessorTest.java @@ -338,6 +338,7 @@ class PowerJobBasicProcessorTest { return taskContext; } + @SuppressWarnings("deprecation") // using deprecated semconv private static List attributeAssertions( String codeNamespace, long jobId, String jobParam, String jobType) { List attributeAssertions = diff --git a/instrumentation/quartz-2.0/testing/src/main/java/io/opentelemetry/instrumentation/quartz/v2_0/AbstractQuartzTest.java b/instrumentation/quartz-2.0/testing/src/main/java/io/opentelemetry/instrumentation/quartz/v2_0/AbstractQuartzTest.java index 49a33c0f1e..03f2ae6b2f 100644 --- a/instrumentation/quartz-2.0/testing/src/main/java/io/opentelemetry/instrumentation/quartz/v2_0/AbstractQuartzTest.java +++ b/instrumentation/quartz-2.0/testing/src/main/java/io/opentelemetry/instrumentation/quartz/v2_0/AbstractQuartzTest.java @@ -51,6 +51,7 @@ public abstract class AbstractQuartzTest { scheduler.shutdown(); } + @SuppressWarnings("deprecation") // using deprecated semconv @Test void successfulJob() throws Exception { Trigger trigger = newTrigger().build(); @@ -80,6 +81,7 @@ public abstract class AbstractQuartzTest { .hasParent(trace.getSpan(0)))); } + @SuppressWarnings("deprecation") // using deprecated semconv @Test void failingJob() throws Exception { Trigger trigger = newTrigger().build(); 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 16257cb55e..a8017706e7 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 @@ -173,7 +173,7 @@ public abstract class AbstractR2dbcStatementTest { emitStableDatabaseSemconv() ? null : parameter.system + "://localhost:" + port), - equalTo(DB_SYSTEM, parameter.system), + equalTo(maybeStable(DB_SYSTEM), parameter.system), equalTo(maybeStable(DB_NAME), DB), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : USER_DB), equalTo(maybeStable(DB_STATEMENT), parameter.expectedStatement), diff --git a/instrumentation/reactor/reactor-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactor/v3_1/BaseFluxWithSpanTest.java b/instrumentation/reactor/reactor-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactor/v3_1/BaseFluxWithSpanTest.java index 1c3eb39f56..17ddd64b9d 100644 --- a/instrumentation/reactor/reactor-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactor/v3_1/BaseFluxWithSpanTest.java +++ b/instrumentation/reactor/reactor-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactor/v3_1/BaseFluxWithSpanTest.java @@ -18,6 +18,7 @@ import reactor.core.publisher.Flux; import reactor.core.publisher.UnicastProcessor; import reactor.test.StepVerifier; +@SuppressWarnings("deprecation") // using deprecated semconv abstract class BaseFluxWithSpanTest extends AbstractWithSpanTest, Flux> { @Override diff --git a/instrumentation/reactor/reactor-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactor/v3_1/BaseMonoWithSpanTest.java b/instrumentation/reactor/reactor-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactor/v3_1/BaseMonoWithSpanTest.java index 2e0b3b2f7e..08882e82cc 100644 --- a/instrumentation/reactor/reactor-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactor/v3_1/BaseMonoWithSpanTest.java +++ b/instrumentation/reactor/reactor-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactor/v3_1/BaseMonoWithSpanTest.java @@ -18,6 +18,7 @@ import reactor.core.publisher.Mono; import reactor.core.publisher.UnicastProcessor; import reactor.test.StepVerifier; +@SuppressWarnings("deprecation") // using deprecated semconv abstract class BaseMonoWithSpanTest extends AbstractWithSpanTest, Mono> { @Override diff --git a/instrumentation/rediscala-1.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rediscala/RediscalaAttributesGetter.java b/instrumentation/rediscala-1.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rediscala/RediscalaAttributesGetter.java index a103eddf77..04f495c1a5 100644 --- a/instrumentation/rediscala-1.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rediscala/RediscalaAttributesGetter.java +++ b/instrumentation/rediscala-1.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rediscala/RediscalaAttributesGetter.java @@ -13,6 +13,7 @@ import redis.RedisCommand; final class RediscalaAttributesGetter implements DbClientAttributesGetter> { + @SuppressWarnings("deprecation") // using deprecated DbSystemIncubatingValues @Override public String getDbSystem(RedisCommand redisCommand) { return DbIncubatingAttributes.DbSystemIncubatingValues.REDIS; diff --git a/instrumentation/rediscala-1.8/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/rediscala/RediscalaClientTest.scala b/instrumentation/rediscala-1.8/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/rediscala/RediscalaClientTest.scala index 34292a6d60..1ced62ff9b 100644 --- a/instrumentation/rediscala-1.8/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/rediscala/RediscalaClientTest.scala +++ b/instrumentation/rediscala-1.8/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/rediscala/RediscalaClientTest.scala @@ -120,7 +120,7 @@ class RediscalaClientTest { .hasKind(CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, REDIS), + equalTo(SemconvStabilityUtil.maybeStable(DB_SYSTEM), REDIS), equalTo(SemconvStabilityUtil.maybeStable(DB_OPERATION), "SET") ) } @@ -166,7 +166,7 @@ class RediscalaClientTest { .hasKind(CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, REDIS), + equalTo(SemconvStabilityUtil.maybeStable(DB_SYSTEM), REDIS), equalTo(SemconvStabilityUtil.maybeStable(DB_OPERATION), "SET") ) } @@ -178,7 +178,7 @@ class RediscalaClientTest { .hasKind(CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, REDIS), + equalTo(SemconvStabilityUtil.maybeStable(DB_SYSTEM), REDIS), equalTo(SemconvStabilityUtil.maybeStable(DB_OPERATION), "GET") ) } diff --git a/instrumentation/redisson/redisson-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/RedissonDbAttributesGetter.java b/instrumentation/redisson/redisson-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/RedissonDbAttributesGetter.java index a2000c8e06..8bddd00632 100644 --- a/instrumentation/redisson/redisson-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/RedissonDbAttributesGetter.java +++ b/instrumentation/redisson/redisson-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/RedissonDbAttributesGetter.java @@ -11,6 +11,7 @@ import javax.annotation.Nullable; final class RedissonDbAttributesGetter implements DbClientAttributesGetter { + @SuppressWarnings("deprecation") // using deprecated DbSystemIncubatingValues @Override public String getDbSystem(RedissonRequest request) { return DbIncubatingAttributes.DbSystemIncubatingValues.REDIS; 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 219884a041..2d266085ee 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 @@ -124,7 +124,7 @@ public abstract class AbstractRedissonAsyncClientTest { equalTo(NETWORK_TYPE, "ipv4"), equalTo(NETWORK_PEER_ADDRESS, ip), equalTo(NETWORK_PEER_PORT, (long) port), - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "SET foo ?"), equalTo(maybeStable(DB_OPERATION), "SET")))); } @@ -157,7 +157,7 @@ public abstract class AbstractRedissonAsyncClientTest { equalTo(NETWORK_TYPE, "ipv4"), equalTo(NETWORK_PEER_ADDRESS, ip), equalTo(NETWORK_PEER_PORT, (long) port), - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "SADD set1 ?"), equalTo(maybeStable(DB_OPERATION), "SADD")) .hasParent(trace.getSpan(0)), @@ -231,7 +231,7 @@ public abstract class AbstractRedissonAsyncClientTest { equalTo(NETWORK_TYPE, "ipv4"), equalTo(NETWORK_PEER_ADDRESS, ip), equalTo(NETWORK_PEER_PORT, (long) port), - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "MULTI;SET batch1 ?")) .hasParent(trace.getSpan(0)), span -> @@ -241,7 +241,7 @@ public abstract class AbstractRedissonAsyncClientTest { equalTo(NETWORK_TYPE, "ipv4"), equalTo(NETWORK_PEER_ADDRESS, ip), equalTo(NETWORK_PEER_PORT, (long) port), - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "SET batch2 ?"), equalTo(maybeStable(DB_OPERATION), "SET")) .hasParent(trace.getSpan(0)), @@ -252,7 +252,7 @@ public abstract class AbstractRedissonAsyncClientTest { equalTo(NETWORK_TYPE, "ipv4"), equalTo(NETWORK_PEER_ADDRESS, ip), equalTo(NETWORK_PEER_PORT, (long) port), - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "EXEC"), equalTo(maybeStable(DB_OPERATION), "EXEC")) .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 81360d8edb..2fe73548a2 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 @@ -127,7 +127,7 @@ public abstract class AbstractRedissonClientTest { equalTo(NETWORK_TYPE, "ipv4"), equalTo(NETWORK_PEER_ADDRESS, ip), equalTo(NETWORK_PEER_PORT, (long) port), - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "SET foo ?"), equalTo(maybeStable(DB_OPERATION), "SET"))), trace -> @@ -139,7 +139,7 @@ public abstract class AbstractRedissonClientTest { equalTo(NETWORK_TYPE, "ipv4"), equalTo(NETWORK_PEER_ADDRESS, ip), equalTo(NETWORK_PEER_PORT, (long) port), - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "GET foo"), equalTo(maybeStable(DB_OPERATION), "GET")))); } @@ -165,7 +165,7 @@ public abstract class AbstractRedissonClientTest { equalTo(NETWORK_TYPE, "ipv4"), equalTo(NETWORK_PEER_ADDRESS, ip), equalTo(NETWORK_PEER_PORT, (long) port), - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "SET batch1 ?;SET batch2 ?")))); } @@ -205,7 +205,7 @@ public abstract class AbstractRedissonClientTest { equalTo(NETWORK_TYPE, "ipv4"), equalTo(NETWORK_PEER_ADDRESS, ip), equalTo(NETWORK_PEER_PORT, (long) port), - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "MULTI;SET batch1 ?")) .hasParent(trace.getSpan(0)), span -> @@ -215,7 +215,7 @@ public abstract class AbstractRedissonClientTest { equalTo(NETWORK_TYPE, "ipv4"), equalTo(NETWORK_PEER_ADDRESS, ip), equalTo(NETWORK_PEER_PORT, (long) port), - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "SET batch2 ?"), equalTo(maybeStable(DB_OPERATION), "SET")) .hasParent(trace.getSpan(0)), @@ -226,7 +226,7 @@ public abstract class AbstractRedissonClientTest { equalTo(NETWORK_TYPE, "ipv4"), equalTo(NETWORK_PEER_ADDRESS, ip), equalTo(NETWORK_PEER_PORT, (long) port), - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "EXEC"), equalTo(maybeStable(DB_OPERATION), "EXEC")) .hasParent(trace.getSpan(0)))); @@ -248,7 +248,7 @@ public abstract class AbstractRedissonClientTest { equalTo(NETWORK_TYPE, "ipv4"), equalTo(NETWORK_PEER_ADDRESS, ip), equalTo(NETWORK_PEER_PORT, (long) port), - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "RPUSH list1 ?"), equalTo(maybeStable(DB_OPERATION), "RPUSH")) .hasNoParent())); @@ -273,7 +273,7 @@ public abstract class AbstractRedissonClientTest { equalTo(NETWORK_TYPE, "ipv4"), equalTo(NETWORK_PEER_ADDRESS, ip), equalTo(NETWORK_PEER_PORT, (long) port), - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo( maybeStable(DB_STATEMENT), String.format("EVAL %s 1 map1 ? ?", script)), @@ -287,7 +287,7 @@ public abstract class AbstractRedissonClientTest { equalTo(NETWORK_TYPE, "ipv4"), equalTo(NETWORK_PEER_ADDRESS, ip), equalTo(NETWORK_PEER_PORT, (long) port), - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "HGET map1 key1"), equalTo(maybeStable(DB_OPERATION), "HGET")))); } @@ -308,7 +308,7 @@ public abstract class AbstractRedissonClientTest { equalTo(NETWORK_TYPE, "ipv4"), equalTo(NETWORK_PEER_ADDRESS, ip), equalTo(NETWORK_PEER_PORT, (long) port), - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "SADD set1 ?"), equalTo(maybeStable(DB_OPERATION), "SADD")))); } @@ -336,7 +336,7 @@ public abstract class AbstractRedissonClientTest { equalTo(NETWORK_TYPE, "ipv4"), equalTo(NETWORK_PEER_ADDRESS, ip), equalTo(NETWORK_PEER_PORT, (long) port), - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "ZADD sort_set1 ? ? ? ? ? ?"), equalTo(maybeStable(DB_OPERATION), "ZADD")))); } @@ -362,7 +362,7 @@ public abstract class AbstractRedissonClientTest { equalTo(NETWORK_TYPE, "ipv4"), equalTo(NETWORK_PEER_ADDRESS, ip), equalTo(NETWORK_PEER_PORT, (long) port), - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_STATEMENT), "INCR AtomicLong"), equalTo(maybeStable(DB_OPERATION), "INCR")))); } @@ -388,7 +388,7 @@ public abstract class AbstractRedissonClientTest { equalTo(NETWORK_TYPE, "ipv4"), equalTo(NETWORK_PEER_ADDRESS, ip), equalTo(NETWORK_PEER_PORT, (long) port), - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_OPERATION), "EVAL"), satisfies( maybeStable(DB_STATEMENT), @@ -403,7 +403,7 @@ public abstract class AbstractRedissonClientTest { equalTo(NETWORK_TYPE, "ipv4"), equalTo(NETWORK_PEER_ADDRESS, ip), equalTo(NETWORK_PEER_PORT, (long) port), - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_OPERATION), "EVAL"), satisfies( maybeStable(DB_STATEMENT), @@ -419,7 +419,7 @@ public abstract class AbstractRedissonClientTest { equalTo(NETWORK_TYPE, "ipv4"), equalTo(NETWORK_PEER_ADDRESS, ip), equalTo(NETWORK_PEER_PORT, (long) port), - equalTo(DB_SYSTEM, "redis"), + equalTo(maybeStable(DB_SYSTEM), "redis"), equalTo(maybeStable(DB_OPERATION), "DEL"), satisfies( maybeStable(DB_STATEMENT), diff --git a/instrumentation/rxjava/rxjava-2.0/javaagent/src/test/java/BaseRxJava2WithSpanTest.java b/instrumentation/rxjava/rxjava-2.0/javaagent/src/test/java/BaseRxJava2WithSpanTest.java index b57ea2532c..36b960407a 100644 --- a/instrumentation/rxjava/rxjava-2.0/javaagent/src/test/java/BaseRxJava2WithSpanTest.java +++ b/instrumentation/rxjava/rxjava-2.0/javaagent/src/test/java/BaseRxJava2WithSpanTest.java @@ -33,6 +33,7 @@ import org.reactivestreams.Publisher; import org.reactivestreams.Subscriber; import org.reactivestreams.Subscription; +@SuppressWarnings("deprecation") // using deprecated semconv public abstract class BaseRxJava2WithSpanTest { private static final AttributeKey RXJAVA_CANCELED = AttributeKey.booleanKey("rxjava.canceled"); diff --git a/instrumentation/rxjava/rxjava-3-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/AbstractRxJava3WithSpanTest.java b/instrumentation/rxjava/rxjava-3-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/AbstractRxJava3WithSpanTest.java index 1f06824c8f..2e4f87332b 100644 --- a/instrumentation/rxjava/rxjava-3-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/AbstractRxJava3WithSpanTest.java +++ b/instrumentation/rxjava/rxjava-3-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/AbstractRxJava3WithSpanTest.java @@ -34,6 +34,7 @@ import org.reactivestreams.Publisher; import org.reactivestreams.Subscriber; import org.reactivestreams.Subscription; +@SuppressWarnings("deprecation") // using deprecated semconv public abstract class AbstractRxJava3WithSpanTest { private static final AttributeKey RXJAVA_CANCELED = AttributeKey.booleanKey("rxjava.canceled"); diff --git a/instrumentation/servlet/servlet-2.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/HttpServletResponseTest.java b/instrumentation/servlet/servlet-2.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/HttpServletResponseTest.java index 0bf2090b6e..1262076658 100644 --- a/instrumentation/servlet/servlet-2.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/HttpServletResponseTest.java +++ b/instrumentation/servlet/servlet-2.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/HttpServletResponseTest.java @@ -61,6 +61,7 @@ class HttpServletResponseTest { assertThat(testing.spans()).isEmpty(); } + @SuppressWarnings("deprecation") // using deprecated semconv @Test void testSendWithParent() { runWithSpan( diff --git a/instrumentation/servlet/servlet-2.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/JettyServlet2Test.java b/instrumentation/servlet/servlet-2.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/JettyServlet2Test.java index 07ac818be6..1b838d46b7 100644 --- a/instrumentation/servlet/servlet-2.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/JettyServlet2Test.java +++ b/instrumentation/servlet/servlet-2.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/JettyServlet2Test.java @@ -111,6 +111,7 @@ class JettyServlet2Test extends AbstractHttpServerTest { } } + @SuppressWarnings("deprecation") // using deprecated semconv @Override protected SpanDataAssert assertResponseSpan( SpanDataAssert span, String method, ServerEndpoint endpoint) { diff --git a/instrumentation/servlet/servlet-3.0/testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/HttpServletResponseTest.java b/instrumentation/servlet/servlet-3.0/testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/HttpServletResponseTest.java index a71c4a2397..711ae8c492 100644 --- a/instrumentation/servlet/servlet-3.0/testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/HttpServletResponseTest.java +++ b/instrumentation/servlet/servlet-3.0/testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/HttpServletResponseTest.java @@ -62,6 +62,7 @@ class HttpServletResponseTest { assertThat(testing.spans()).isEmpty(); } + @SuppressWarnings("deprecation") // using deprecated semconv @Test void testSendWithParent() throws IOException { runWithSpan( diff --git a/instrumentation/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/annotations/InstrumentationWithSpanAspectTest.java b/instrumentation/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/annotations/InstrumentationWithSpanAspectTest.java index fbacd93f47..50c549b4aa 100644 --- a/instrumentation/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/annotations/InstrumentationWithSpanAspectTest.java +++ b/instrumentation/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/annotations/InstrumentationWithSpanAspectTest.java @@ -33,6 +33,7 @@ import org.junit.jupiter.api.extension.RegisterExtension; import org.springframework.aop.aspectj.annotation.AspectJProxyFactory; import org.springframework.core.ParameterNameDiscoverer; +@SuppressWarnings("deprecation") // using deprecated semconv class InstrumentationWithSpanAspectTest { @RegisterExtension diff --git a/instrumentation/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/scheduling/SchedulingInstrumentationAspectTest.java b/instrumentation/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/scheduling/SchedulingInstrumentationAspectTest.java index b6953c7060..f4e48515ca 100644 --- a/instrumentation/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/scheduling/SchedulingInstrumentationAspectTest.java +++ b/instrumentation/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/scheduling/SchedulingInstrumentationAspectTest.java @@ -29,6 +29,7 @@ import org.springframework.aop.aspectj.annotation.AspectJProxyFactory; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.scheduling.annotation.Schedules; +@SuppressWarnings("deprecation") // using deprecated semconv class SchedulingInstrumentationAspectTest { @RegisterExtension 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 06f7cc6730..01be707011 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,6 +7,7 @@ package io.opentelemetry.javaagent.instrumentation.spring.data.v3_0; import static io.opentelemetry.instrumentation.api.internal.SemconvStability.emitStableDatabaseSemconv; import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStable; +import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStableDbSystemName; 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_CONNECTION_STRING; @@ -51,7 +52,7 @@ class ReactiveSpringDataTest { applicationContext.close(); } - @SuppressWarnings("deprecation") // TODO DB_CONNECTION_STRING deprecation + @SuppressWarnings("deprecation") // using deprecated semconv @Test void testFindAll() { long count = @@ -83,7 +84,7 @@ class ReactiveSpringDataTest { assertThat(spanData.getEndEpochNanos()) .isLessThanOrEqualTo(trace.getSpan(1).getEndEpochNanos())) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "h2"), + equalTo(maybeStable(DB_SYSTEM), maybeStableDbSystemName("h2")), equalTo(maybeStable(DB_NAME), "db"), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"), equalTo(maybeStable(DB_STATEMENT), "SELECT CUSTOMER.* FROM CUSTOMER"), diff --git a/instrumentation/spring/spring-data/spring-data-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/data/AbstractSpringJpaTest.java b/instrumentation/spring/spring-data/spring-data-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/data/AbstractSpringJpaTest.java index ec329846d1..f01e728551 100644 --- a/instrumentation/spring/spring-data/spring-data-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/data/AbstractSpringJpaTest.java +++ b/instrumentation/spring/spring-data/spring-data-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/data/AbstractSpringJpaTest.java @@ -90,7 +90,7 @@ public abstract class AbstractSpringJpaTest< .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "hsqldb"), + equalTo(maybeStable(DB_SYSTEM), "hsqldb"), equalTo(maybeStable(DB_NAME), "test"), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"), equalTo( @@ -113,7 +113,7 @@ public abstract class AbstractSpringJpaTest< span.hasName("CALL test") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "hsqldb"), + equalTo(maybeStable(DB_SYSTEM), "hsqldb"), equalTo(maybeStable(DB_NAME), "test"), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"), equalTo( @@ -126,7 +126,7 @@ public abstract class AbstractSpringJpaTest< .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "hsqldb"), + equalTo(maybeStable(DB_SYSTEM), "hsqldb"), equalTo(maybeStable(DB_NAME), "test"), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"), equalTo( @@ -162,7 +162,7 @@ public abstract class AbstractSpringJpaTest< .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "hsqldb"), + equalTo(maybeStable(DB_SYSTEM), "hsqldb"), equalTo(maybeStable(DB_NAME), "test"), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"), equalTo( @@ -200,7 +200,7 @@ public abstract class AbstractSpringJpaTest< .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "hsqldb"), + equalTo(maybeStable(DB_SYSTEM), "hsqldb"), equalTo(maybeStable(DB_NAME), "test"), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"), equalTo( @@ -214,7 +214,7 @@ public abstract class AbstractSpringJpaTest< .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "hsqldb"), + equalTo(maybeStable(DB_SYSTEM), "hsqldb"), equalTo(maybeStable(DB_NAME), "test"), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"), equalTo( @@ -240,7 +240,7 @@ public abstract class AbstractSpringJpaTest< .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "hsqldb"), + equalTo(maybeStable(DB_SYSTEM), "hsqldb"), equalTo(maybeStable(DB_NAME), "test"), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"), equalTo( @@ -266,7 +266,7 @@ public abstract class AbstractSpringJpaTest< .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "hsqldb"), + equalTo(maybeStable(DB_SYSTEM), "hsqldb"), equalTo(maybeStable(DB_NAME), "test"), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"), equalTo( @@ -280,7 +280,7 @@ public abstract class AbstractSpringJpaTest< .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "hsqldb"), + equalTo(maybeStable(DB_SYSTEM), "hsqldb"), equalTo(maybeStable(DB_NAME), "test"), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"), equalTo( @@ -315,7 +315,7 @@ public abstract class AbstractSpringJpaTest< .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "hsqldb"), + equalTo(maybeStable(DB_SYSTEM), "hsqldb"), equalTo(maybeStable(DB_NAME), "test"), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"), equalTo( @@ -362,7 +362,7 @@ public abstract class AbstractSpringJpaTest< .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(DB_SYSTEM, "hsqldb"), + equalTo(maybeStable(DB_SYSTEM), "hsqldb"), equalTo(maybeStable(DB_NAME), "test"), equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"), equalTo( diff --git a/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/v3_1/SpringSchedulingTest.java b/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/v3_1/SpringSchedulingTest.java index 5061c0cf37..056c7ca084 100644 --- a/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/v3_1/SpringSchedulingTest.java +++ b/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/v3_1/SpringSchedulingTest.java @@ -35,6 +35,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; import org.springframework.context.annotation.AnnotationConfigApplicationContext; +@SuppressWarnings("deprecation") // using deprecated semconv class SpringSchedulingTest { @RegisterExtension diff --git a/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/SpringWebfluxTest.java b/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/SpringWebfluxTest.java index 5bff9988e0..f4bef0d08f 100644 --- a/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/SpringWebfluxTest.java +++ b/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/SpringWebfluxTest.java @@ -64,6 +64,7 @@ import server.FooModel; import server.SpringWebFluxTestApplication; import server.TestController; +@SuppressWarnings("deprecation") // using deprecated semconv @ExtendWith(SpringExtension.class) @SpringBootTest( webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, diff --git a/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v6_0/boot/SpringBootBasedTest.java b/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v6_0/boot/SpringBootBasedTest.java index 6c04a1bf09..8c89334b70 100644 --- a/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v6_0/boot/SpringBootBasedTest.java +++ b/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v6_0/boot/SpringBootBasedTest.java @@ -68,6 +68,7 @@ class SpringBootBasedTest extends AbstractSpringBootBasedTest { return context; } + @SuppressWarnings("deprecation") // using deprecated semconv @Override protected SpanDataAssert assertHandlerSpan( SpanDataAssert span, String method, ServerEndpoint endpoint) { diff --git a/instrumentation/spring/spring-webmvc/spring-webmvc-common/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/boot/AbstractSpringBootBasedTest.java b/instrumentation/spring/spring-webmvc/spring-webmvc-common/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/boot/AbstractSpringBootBasedTest.java index 8c3860959e..47bc03bfe6 100644 --- a/instrumentation/spring/spring-webmvc/spring-webmvc-common/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/boot/AbstractSpringBootBasedTest.java +++ b/instrumentation/spring/spring-webmvc/spring-webmvc-common/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/boot/AbstractSpringBootBasedTest.java @@ -48,6 +48,7 @@ import org.springframework.security.web.util.OnCommittedResponseWrapper; import org.springframework.web.servlet.resource.ResourceHttpRequestHandler; import org.springframework.web.servlet.view.RedirectView; +@SuppressWarnings("deprecation") // using deprecated semconv public abstract class AbstractSpringBootBasedTest extends AbstractHttpServerTest { diff --git a/instrumentation/spring/spring-webmvc/spring-webmvc-common/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/filter/AbstractServletFilterTest.java b/instrumentation/spring/spring-webmvc/spring-webmvc-common/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/filter/AbstractServletFilterTest.java index 015ce8aa19..f4819286e4 100644 --- a/instrumentation/spring/spring-webmvc/spring-webmvc-common/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/filter/AbstractServletFilterTest.java +++ b/instrumentation/spring/spring-webmvc/spring-webmvc-common/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/filter/AbstractServletFilterTest.java @@ -92,6 +92,7 @@ public abstract class AbstractServletFilterTest } } + @SuppressWarnings("deprecation") // using deprecated semconv @Override protected List> errorPageSpanAssertions( String method, ServerEndpoint endpoint) { diff --git a/instrumentation/spring/spring-ws-2.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/ws/v2_0/SpringWsTest.java b/instrumentation/spring/spring-ws-2.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/ws/v2_0/SpringWsTest.java index 381549a020..0dd58e0637 100644 --- a/instrumentation/spring/spring-ws-2.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/ws/v2_0/SpringWsTest.java +++ b/instrumentation/spring/spring-ws-2.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/ws/v2_0/SpringWsTest.java @@ -40,6 +40,7 @@ import org.springframework.ws.soap.addressing.client.ActionCallback; import org.springframework.ws.soap.client.SoapFaultClientException; import org.springframework.ws.soap.client.core.SoapActionCallback; +@SuppressWarnings("deprecation") // using deprecated semconv class SpringWsTest extends AbstractHttpServerUsingTest { @RegisterExtension diff --git a/instrumentation/spymemcached-2.12/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spymemcached/SpymemcachedTest.java b/instrumentation/spymemcached-2.12/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spymemcached/SpymemcachedTest.java index 3847c23c7b..adef33c28b 100644 --- a/instrumentation/spymemcached-2.12/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spymemcached/SpymemcachedTest.java +++ b/instrumentation/spymemcached-2.12/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spymemcached/SpymemcachedTest.java @@ -147,7 +147,7 @@ class SpymemcachedTest { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.MEMCACHED), equalTo(maybeStable(DB_OPERATION), "get"), equalTo(stringKey("spymemcached.result"), "hit")))); @@ -169,7 +169,7 @@ class SpymemcachedTest { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.MEMCACHED), equalTo(maybeStable(DB_OPERATION), "get"), equalTo(stringKey("spymemcached.result"), "miss")))); @@ -204,7 +204,7 @@ class SpymemcachedTest { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.MEMCACHED), equalTo(maybeStable(DB_OPERATION), "get"), equalTo(booleanKey("spymemcached.command.cancelled"), true)))); @@ -259,7 +259,7 @@ class SpymemcachedTest { val -> val.isInstanceOf(String.class)))) .hasAttributesSatisfyingExactly( equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.MEMCACHED), equalTo(maybeStable(DB_OPERATION), "get")))); } @@ -287,7 +287,7 @@ class SpymemcachedTest { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.MEMCACHED), equalTo(maybeStable(DB_OPERATION), "getBulk")))); } @@ -311,7 +311,7 @@ class SpymemcachedTest { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.MEMCACHED), equalTo(maybeStable(DB_OPERATION), "set")))); } @@ -347,7 +347,7 @@ class SpymemcachedTest { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.MEMCACHED), equalTo(maybeStable(DB_OPERATION), "set"), equalTo(booleanKey("spymemcached.command.cancelled"), true)))); @@ -373,7 +373,7 @@ class SpymemcachedTest { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.MEMCACHED), equalTo(maybeStable(DB_OPERATION), "add")), span -> @@ -382,7 +382,7 @@ class SpymemcachedTest { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.MEMCACHED), equalTo(maybeStable(DB_OPERATION), "get"), equalTo(stringKey("spymemcached.result"), "hit")))); @@ -409,7 +409,7 @@ class SpymemcachedTest { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.MEMCACHED), equalTo(maybeStable(DB_OPERATION), "add")), span -> @@ -418,7 +418,7 @@ class SpymemcachedTest { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.MEMCACHED), equalTo(maybeStable(DB_OPERATION), "add")))); } @@ -443,7 +443,7 @@ class SpymemcachedTest { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.MEMCACHED), equalTo(maybeStable(DB_OPERATION), "delete")), span -> @@ -452,7 +452,7 @@ class SpymemcachedTest { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.MEMCACHED), equalTo(maybeStable(DB_OPERATION), "get"), equalTo(stringKey("spymemcached.result"), "miss")))); @@ -477,7 +477,7 @@ class SpymemcachedTest { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.MEMCACHED), equalTo(maybeStable(DB_OPERATION), "delete")))); } @@ -503,7 +503,7 @@ class SpymemcachedTest { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.MEMCACHED), equalTo(maybeStable(DB_OPERATION), "replace")), span -> @@ -512,7 +512,7 @@ class SpymemcachedTest { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.MEMCACHED), equalTo(maybeStable(DB_OPERATION), "get"), equalTo(stringKey("spymemcached.result"), "hit")))); @@ -541,7 +541,7 @@ class SpymemcachedTest { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.MEMCACHED), equalTo(maybeStable(DB_OPERATION), "replace")))); } @@ -568,7 +568,7 @@ class SpymemcachedTest { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.MEMCACHED), equalTo(maybeStable(DB_OPERATION), "gets")), span -> @@ -577,7 +577,7 @@ class SpymemcachedTest { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.MEMCACHED), equalTo(maybeStable(DB_OPERATION), "append")), span -> @@ -586,7 +586,7 @@ class SpymemcachedTest { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.MEMCACHED), equalTo(maybeStable(DB_OPERATION), "get"), equalTo(stringKey("spymemcached.result"), "hit")))); @@ -614,7 +614,7 @@ class SpymemcachedTest { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.MEMCACHED), equalTo(maybeStable(DB_OPERATION), "gets")), span -> @@ -623,7 +623,7 @@ class SpymemcachedTest { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.MEMCACHED), equalTo(maybeStable(DB_OPERATION), "prepend")), span -> @@ -632,7 +632,7 @@ class SpymemcachedTest { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.MEMCACHED), equalTo(maybeStable(DB_OPERATION), "get"), equalTo(stringKey("spymemcached.result"), "hit")))); @@ -660,7 +660,7 @@ class SpymemcachedTest { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.MEMCACHED), equalTo(maybeStable(DB_OPERATION), "gets")), span -> @@ -669,7 +669,7 @@ class SpymemcachedTest { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.MEMCACHED), equalTo(maybeStable(DB_OPERATION), "cas")))); } @@ -695,7 +695,7 @@ class SpymemcachedTest { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.MEMCACHED), equalTo(maybeStable(DB_OPERATION), "cas")))); } @@ -719,7 +719,7 @@ class SpymemcachedTest { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.MEMCACHED), equalTo(maybeStable(DB_OPERATION), "touch")))); } @@ -744,7 +744,7 @@ class SpymemcachedTest { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.MEMCACHED), equalTo(maybeStable(DB_OPERATION), "touch")))); } @@ -769,7 +769,7 @@ class SpymemcachedTest { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.MEMCACHED), equalTo(maybeStable(DB_OPERATION), "getAndTouch")))); } @@ -794,7 +794,7 @@ class SpymemcachedTest { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.MEMCACHED), equalTo(maybeStable(DB_OPERATION), "getAndTouch")))); } @@ -823,7 +823,7 @@ class SpymemcachedTest { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.MEMCACHED), equalTo(maybeStable(DB_OPERATION), "decr")), span -> @@ -832,7 +832,7 @@ class SpymemcachedTest { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.MEMCACHED), equalTo(maybeStable(DB_OPERATION), "get"), equalTo(stringKey("spymemcached.result"), "hit")))); @@ -857,7 +857,7 @@ class SpymemcachedTest { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.MEMCACHED), equalTo(maybeStable(DB_OPERATION), "decr")))); } @@ -880,7 +880,7 @@ class SpymemcachedTest { new IllegalArgumentException("Key is too long (maxlen = 250)")) .hasAttributesSatisfyingExactly( equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.MEMCACHED), equalTo(maybeStable(DB_OPERATION), "decr")))); } @@ -909,7 +909,7 @@ class SpymemcachedTest { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.MEMCACHED), equalTo(maybeStable(DB_OPERATION), "incr")), span -> @@ -918,7 +918,7 @@ class SpymemcachedTest { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.MEMCACHED), equalTo(maybeStable(DB_OPERATION), "get"), equalTo(stringKey("spymemcached.result"), "hit")))); @@ -943,7 +943,7 @@ class SpymemcachedTest { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.MEMCACHED), equalTo(maybeStable(DB_OPERATION), "incr")))); } @@ -966,7 +966,7 @@ class SpymemcachedTest { new IllegalArgumentException("Key is too long (maxlen = 250)")) .hasAttributesSatisfyingExactly( equalTo( - DB_SYSTEM, + maybeStable(DB_SYSTEM), DbIncubatingAttributes.DbSystemIncubatingValues.MEMCACHED), equalTo(maybeStable(DB_OPERATION), "incr")))); } diff --git a/instrumentation/struts/struts-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/struts/v2_3/Struts2ActionSpanTest.java b/instrumentation/struts/struts-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/struts/v2_3/Struts2ActionSpanTest.java index e4c756910a..e33356f508 100644 --- a/instrumentation/struts/struts-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/struts/v2_3/Struts2ActionSpanTest.java +++ b/instrumentation/struts/struts-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/struts/v2_3/Struts2ActionSpanTest.java @@ -132,6 +132,7 @@ class Struts2ActionSpanTest extends AbstractHttpServerTest { return span; } + @SuppressWarnings("deprecation") // using deprecated semconv @Override protected SpanDataAssert assertHandlerSpan( SpanDataAssert span, String method, ServerEndpoint endpoint) { diff --git a/instrumentation/struts/struts-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/struts/v7_0/Struts2ActionSpanTest.java b/instrumentation/struts/struts-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/struts/v7_0/Struts2ActionSpanTest.java index fb5bb758b9..d76976857f 100644 --- a/instrumentation/struts/struts-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/struts/v7_0/Struts2ActionSpanTest.java +++ b/instrumentation/struts/struts-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/struts/v7_0/Struts2ActionSpanTest.java @@ -109,6 +109,7 @@ class Struts2ActionSpanTest extends AbstractHttpServerTest { return span; } + @SuppressWarnings("deprecation") // using deprecated semconv @Override protected SpanDataAssert assertHandlerSpan( SpanDataAssert span, String method, ServerEndpoint endpoint) { diff --git a/instrumentation/tomcat/tomcat-10.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/tomcat/v10_0/TomcatAsyncTest.java b/instrumentation/tomcat/tomcat-10.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/tomcat/v10_0/TomcatAsyncTest.java index b96d4d5046..36cc3cdc64 100644 --- a/instrumentation/tomcat/tomcat-10.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/tomcat/v10_0/TomcatAsyncTest.java +++ b/instrumentation/tomcat/tomcat-10.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/tomcat/v10_0/TomcatAsyncTest.java @@ -115,6 +115,7 @@ class TomcatAsyncTest extends AbstractHttpServerTest { options.setHasResponseSpan(endpoint -> endpoint == NOT_FOUND || endpoint == REDIRECT); } + @SuppressWarnings("deprecation") // using deprecated semconv @Override protected SpanDataAssert assertResponseSpan( SpanDataAssert span, String method, ServerEndpoint endpoint) { diff --git a/instrumentation/tomcat/tomcat-10.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/tomcat/v10_0/TomcatHandlerTest.java b/instrumentation/tomcat/tomcat-10.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/tomcat/v10_0/TomcatHandlerTest.java index 8eae88015a..8eba912ee1 100644 --- a/instrumentation/tomcat/tomcat-10.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/tomcat/v10_0/TomcatHandlerTest.java +++ b/instrumentation/tomcat/tomcat-10.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/tomcat/v10_0/TomcatHandlerTest.java @@ -115,6 +115,7 @@ class TomcatHandlerTest extends AbstractHttpServerTest { }); } + @SuppressWarnings("deprecation") // using deprecated semconv @Override protected SpanDataAssert assertResponseSpan( SpanDataAssert span, String method, ServerEndpoint endpoint) { diff --git a/instrumentation/tomcat/tomcat-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/tomcat/v7_0/TomcatAsyncTest.java b/instrumentation/tomcat/tomcat-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/tomcat/v7_0/TomcatAsyncTest.java index fcd7e38cf7..1a50c4d1ed 100644 --- a/instrumentation/tomcat/tomcat-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/tomcat/v7_0/TomcatAsyncTest.java +++ b/instrumentation/tomcat/tomcat-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/tomcat/v7_0/TomcatAsyncTest.java @@ -110,6 +110,7 @@ class TomcatAsyncTest extends AbstractHttpServerTest { options.setHasResponseSpan(endpoint -> endpoint == NOT_FOUND || endpoint == REDIRECT); } + @SuppressWarnings("deprecation") // using deprecated semconv @Override protected SpanDataAssert assertResponseSpan( SpanDataAssert span, String method, ServerEndpoint endpoint) { diff --git a/instrumentation/tomcat/tomcat-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/tomcat/v7_0/TomcatHandlerTest.java b/instrumentation/tomcat/tomcat-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/tomcat/v7_0/TomcatHandlerTest.java index be7109d4ad..36c4fa08bd 100644 --- a/instrumentation/tomcat/tomcat-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/tomcat/v7_0/TomcatHandlerTest.java +++ b/instrumentation/tomcat/tomcat-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/tomcat/v7_0/TomcatHandlerTest.java @@ -115,6 +115,7 @@ class TomcatHandlerTest extends AbstractHttpServerTest { }); } + @SuppressWarnings("deprecation") // using deprecated semconv @Override protected SpanDataAssert assertResponseSpan( SpanDataAssert span, String method, ServerEndpoint endpoint) { diff --git a/instrumentation/vertx/vertx-redis-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/redis/VertxRedisClientAttributesGetter.java b/instrumentation/vertx/vertx-redis-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/redis/VertxRedisClientAttributesGetter.java index 928ca141b1..233839ad08 100644 --- a/instrumentation/vertx/vertx-redis-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/redis/VertxRedisClientAttributesGetter.java +++ b/instrumentation/vertx/vertx-redis-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/redis/VertxRedisClientAttributesGetter.java @@ -19,6 +19,7 @@ public enum VertxRedisClientAttributesGetter private static final RedisCommandSanitizer sanitizer = RedisCommandSanitizer.create(AgentCommonConfig.get().isStatementSanitizationEnabled()); + @SuppressWarnings("deprecation") // using deprecated DbSystemIncubatingValues @Override public String getDbSystem(VertxRedisClientRequest request) { return DbIncubatingAttributes.DbSystemIncubatingValues.REDIS; 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 d7113fa066..214bed2cfe 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 @@ -18,6 +18,7 @@ import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_QUER import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_REDIS_DATABASE_INDEX; 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_SYSTEM_NAME; import static org.assertj.core.api.Assertions.assertThat; import io.opentelemetry.api.trace.SpanKind; @@ -213,7 +214,7 @@ class VertxRedisClientTest { // not testing database/dup if (emitStableDatabaseSemconv()) { return new AttributeAssertion[] { - equalTo(DB_SYSTEM, "redis"), + equalTo(DB_SYSTEM_NAME, "redis"), equalTo(DB_QUERY_TEXT, statement), equalTo(DB_OPERATION_NAME, operation), equalTo(DB_NAMESPACE, "1"), diff --git a/instrumentation/xxl-job/xxl-job-common/testing/src/main/java/io/opentelemetry/instrumentation/xxljob/AbstractXxlJobTest.java b/instrumentation/xxl-job/xxl-job-common/testing/src/main/java/io/opentelemetry/instrumentation/xxljob/AbstractXxlJobTest.java index 64d115812e..840991d3d4 100644 --- a/instrumentation/xxl-job/xxl-job-common/testing/src/main/java/io/opentelemetry/instrumentation/xxljob/AbstractXxlJobTest.java +++ b/instrumentation/xxl-job/xxl-job-common/testing/src/main/java/io/opentelemetry/instrumentation/xxljob/AbstractXxlJobTest.java @@ -140,6 +140,7 @@ public abstract class AbstractXxlJobTest { .hasAttributesSatisfyingExactly(assertions))); } + @SuppressWarnings("deprecation") // using deprecated semconv private static void checkXxlJob( String spanName, StatusData statusData, diff --git a/licenses/licenses.md b/licenses/licenses.md index 34bc2c6a32..139c0c0e33 100644 --- a/licenses/licenses.md +++ b/licenses/licenses.md @@ -166,11 +166,11 @@ > - **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) -**38** **Group:** `io.opentelemetry.semconv` **Name:** `opentelemetry-semconv` **Version:** `1.29.0-alpha` +**38** **Group:** `io.opentelemetry.semconv` **Name:** `opentelemetry-semconv` **Version:** `1.30.0-rc.1` > - **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) -**39** **Group:** `io.opentelemetry.semconv` **Name:** `opentelemetry-semconv-incubating` **Version:** `1.29.0-alpha` +**39** **Group:** `io.opentelemetry.semconv` **Name:** `opentelemetry-semconv-incubating` **Version:** `1.30.0-alpha-rc.1` > - **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/AbstractMongodbSpringStarterSmokeTest.java b/smoke-tests-otel-starter/spring-boot-common/src/main/java/io/opentelemetry/spring/smoketest/AbstractMongodbSpringStarterSmokeTest.java index c9790468ef..b66987c65a 100644 --- a/smoke-tests-otel-starter/spring-boot-common/src/main/java/io/opentelemetry/spring/smoketest/AbstractMongodbSpringStarterSmokeTest.java +++ b/smoke-tests-otel-starter/spring-boot-common/src/main/java/io/opentelemetry/spring/smoketest/AbstractMongodbSpringStarterSmokeTest.java @@ -5,6 +5,9 @@ package io.opentelemetry.spring.smoketest; +import static io.opentelemetry.instrumentation.api.internal.SemconvStability.stableDbSystemName; +import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStable; + import com.mongodb.client.MongoClient; import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; @@ -16,6 +19,7 @@ abstract class AbstractMongodbSpringStarterSmokeTest extends AbstractSpringStart @Autowired protected MongoClient mongoClient; + @SuppressWarnings("deprecation") // uses deprecated semconv @Test void mongodb() { testing.runWithSpan( @@ -32,7 +36,8 @@ abstract class AbstractMongodbSpringStarterSmokeTest extends AbstractSpringStart span.hasKind(SpanKind.CLIENT) .hasName("listDatabases admin") .hasAttribute( - DbIncubatingAttributes.DB_SYSTEM, - DbIncubatingAttributes.DbSystemIncubatingValues.MONGODB))); + maybeStable(DbIncubatingAttributes.DB_SYSTEM), + stableDbSystemName( + DbIncubatingAttributes.DbSystemIncubatingValues.MONGODB)))); } } diff --git a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/db/DbClientMetricsTestUtil.java b/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/db/DbClientMetricsTestUtil.java index 9bfff8d60b..ba8c8843d1 100644 --- a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/db/DbClientMetricsTestUtil.java +++ b/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/db/DbClientMetricsTestUtil.java @@ -7,7 +7,7 @@ package io.opentelemetry.instrumentation.testing.junit.db; import static io.opentelemetry.instrumentation.api.internal.SemconvStability.emitStableDatabaseSemconv; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat; -import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SYSTEM; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SYSTEM_NAME; import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; @@ -22,7 +22,7 @@ public class DbClientMetricsTestUtil { AttributeKey... expectedKeys) { // db.system is required - see // https://opentelemetry.io/docs/specs/semconv/database/database-metrics/#metric-dbclientoperationduration - assertThat(expectedKeys).extracting(AttributeKey::getKey).contains(DB_SYSTEM.getKey()); + assertThat(expectedKeys).extracting(AttributeKey::getKey).contains(DB_SYSTEM_NAME.getKey()); if (!emitStableDatabaseSemconv()) { return; } diff --git a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/db/SemconvStabilityUtil.java b/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/db/SemconvStabilityUtil.java index 282bc92042..c5b83a80ca 100644 --- a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/db/SemconvStabilityUtil.java +++ b/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/db/SemconvStabilityUtil.java @@ -5,12 +5,26 @@ package io.opentelemetry.instrumentation.testing.junit.db; +import static io.opentelemetry.semconv.incubating.CassandraIncubatingAttributes.CASSANDRA_CONSISTENCY_LEVEL; +import static io.opentelemetry.semconv.incubating.CassandraIncubatingAttributes.CASSANDRA_COORDINATOR_DC; +import static io.opentelemetry.semconv.incubating.CassandraIncubatingAttributes.CASSANDRA_COORDINATOR_ID; +import static io.opentelemetry.semconv.incubating.CassandraIncubatingAttributes.CASSANDRA_PAGE_SIZE; +import static io.opentelemetry.semconv.incubating.CassandraIncubatingAttributes.CASSANDRA_QUERY_IDEMPOTENT; +import static io.opentelemetry.semconv.incubating.CassandraIncubatingAttributes.CASSANDRA_SPECULATIVE_EXECUTION_COUNT; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_CASSANDRA_CONSISTENCY_LEVEL; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_CASSANDRA_COORDINATOR_DC; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_CASSANDRA_COORDINATOR_ID; +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_MONGODB_COLLECTION; 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_SYSTEM_NAME; import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.instrumentation.api.internal.SemconvStability; @@ -38,6 +52,15 @@ public class SemconvStabilityUtil { map.put(DB_SQL_TABLE, DB_COLLECTION_NAME); map.put(DB_CASSANDRA_TABLE, DB_COLLECTION_NAME); map.put(DB_MONGODB_COLLECTION, DB_COLLECTION_NAME); + map.put(DB_SYSTEM, DB_SYSTEM_NAME); + + map.put(DB_CASSANDRA_CONSISTENCY_LEVEL, CASSANDRA_CONSISTENCY_LEVEL); + map.put(DB_CASSANDRA_COORDINATOR_DC, CASSANDRA_COORDINATOR_DC); + map.put(DB_CASSANDRA_COORDINATOR_ID, CASSANDRA_COORDINATOR_ID); + map.put(DB_CASSANDRA_IDEMPOTENCE, CASSANDRA_QUERY_IDEMPOTENT); + map.put(DB_CASSANDRA_PAGE_SIZE, CASSANDRA_PAGE_SIZE); + map.put(DB_CASSANDRA_SPECULATIVE_EXECUTION_COUNT, CASSANDRA_SPECULATIVE_EXECUTION_COUNT); + return map; } @@ -51,4 +74,12 @@ public class SemconvStabilityUtil { } return oldKey; } + + public static String maybeStableDbSystemName(String oldDbSystemName) { + // not testing database/dup + if (SemconvStability.emitStableDatabaseSemconv()) { + return SemconvStability.stableDbSystemName(oldDbSystemName); + } + return oldDbSystemName; + } }