open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(deps): update dependency io.opentelemetry.semconv:opentelemetry-semconv to v1.34.0 (#14015) 

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com>
Co-authored-by: Lauri Tulmin <ltulmin@splunk.com>
Co-authored-by: SylvainJuge <763082+SylvainJuge@users.noreply.github.com>
This commit is contained in:
renovate[bot] 2025-06-12 10:30:55 +03:00 committed by GitHub
parent 92b8554d1b
commit 70588cd360
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
29 changed files with 146 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dependencyManagement/build.gradle.kts
View File

@ -44,7 +44,7 @@ val asmVersion = "9.8"
val jmhVersion = "1.37" val jmhVersion = "1.37"
val mockitoVersion = "4.11.0" val mockitoVersion = "4.11.0"
val slf4jVersion = "2.0.17" val slf4jVersion = "2.0.17"
val semConvVersion = "1.32.0" val semConvVersion = "1.34.0"
val semConvAlphaVersion = semConvVersion.replaceFirst("(-rc.*)?$".toRegex(), "-alpha$1") val semConvAlphaVersion = semConvVersion.replaceFirst("(-rc.*)?$".toRegex(), "-alpha$1")
val CORE_DEPENDENCIES = listOf( val CORE_DEPENDENCIES = listOf(

6
instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientAttributesExtractor.java
View File

@ -6,6 +6,8 @@
package io.opentelemetry.instrumentation.api.incubator.semconv.db; package io.opentelemetry.instrumentation.api.incubator.semconv.db;
import static io.opentelemetry.instrumentation.api.internal.AttributesExtractorUtil.internalSet; import static io.opentelemetry.instrumentation.api.internal.AttributesExtractorUtil.internalSet;
import static io.opentelemetry.semconv.DbAttributes.DB_OPERATION_NAME;
import static io.opentelemetry.semconv.DbAttributes.DB_QUERY_TEXT;
import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.common.AttributeKey;
import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.api.common.AttributesBuilder;
@ -27,11 +29,7 @@ public final class DbClientAttributesExtractor<REQUEST, RESPONSE>
// copied from DbIncubatingAttributes // copied from DbIncubatingAttributes
private static final AttributeKey<String> DB_STATEMENT = AttributeKey.stringKey("db.statement"); private static final AttributeKey<String> DB_STATEMENT = AttributeKey.stringKey("db.statement");
private static final AttributeKey<String> DB_QUERY_TEXT = AttributeKey.stringKey("db.query.text");
static final AttributeKey<String> DB_OPERATION = AttributeKey.stringKey("db.operation"); static final AttributeKey<String> DB_OPERATION = AttributeKey.stringKey("db.operation");
static final AttributeKey<String> DB_OPERATION_NAME = AttributeKey.stringKey("db.operation.name");
static final AttributeKey<String> DB_RESPONSE_STATUS_CODE =
AttributeKey.stringKey("db.response.status_code");
/** Creates the database client attributes extractor with default configuration. */ /** Creates the database client attributes extractor with default configuration. */
public static <REQUEST, RESPONSE> AttributesExtractor<REQUEST, RESPONSE> create( public static <REQUEST, RESPONSE> AttributesExtractor<REQUEST, RESPONSE> create(

8
instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientCommonAttributesExtractor.java
View File

@ -6,6 +6,9 @@
package io.opentelemetry.instrumentation.api.incubator.semconv.db; package io.opentelemetry.instrumentation.api.incubator.semconv.db;
import static io.opentelemetry.instrumentation.api.internal.AttributesExtractorUtil.internalSet; import static io.opentelemetry.instrumentation.api.internal.AttributesExtractorUtil.internalSet;
import static io.opentelemetry.semconv.DbAttributes.DB_NAMESPACE;
import static io.opentelemetry.semconv.DbAttributes.DB_RESPONSE_STATUS_CODE;
import static io.opentelemetry.semconv.DbAttributes.DB_SYSTEM_NAME;
import static io.opentelemetry.semconv.ErrorAttributes.ERROR_TYPE; import static io.opentelemetry.semconv.ErrorAttributes.ERROR_TYPE;
import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.common.AttributeKey;
@ -23,15 +26,10 @@ abstract class DbClientCommonAttributesExtractor<
// copied from DbIncubatingAttributes // copied from DbIncubatingAttributes
private static final AttributeKey<String> DB_NAME = AttributeKey.stringKey("db.name"); private static final AttributeKey<String> DB_NAME = AttributeKey.stringKey("db.name");
static final AttributeKey<String> DB_NAMESPACE = AttributeKey.stringKey("db.namespace");
static final AttributeKey<String> DB_SYSTEM = AttributeKey.stringKey("db.system"); static final AttributeKey<String> DB_SYSTEM = AttributeKey.stringKey("db.system");
public static final AttributeKey<String> DB_SYSTEM_NAME =
AttributeKey.stringKey("db.system.name");
private static final AttributeKey<String> DB_USER = AttributeKey.stringKey("db.user"); private static final AttributeKey<String> DB_USER = AttributeKey.stringKey("db.user");
private static final AttributeKey<String> DB_CONNECTION_STRING = private static final AttributeKey<String> DB_CONNECTION_STRING =
AttributeKey.stringKey("db.connection_string"); AttributeKey.stringKey("db.connection_string");
private static final AttributeKey<String> DB_RESPONSE_STATUS_CODE =
AttributeKey.stringKey("db.response.status_code");
final GETTER getter; final GETTER getter;

11
instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientMetricsAdvice.java
View File

@ -10,6 +10,7 @@ import static java.util.Collections.unmodifiableList;
import io.opentelemetry.api.incubator.metrics.ExtendedDoubleHistogramBuilder; import io.opentelemetry.api.incubator.metrics.ExtendedDoubleHistogramBuilder;
import io.opentelemetry.api.metrics.DoubleHistogramBuilder; import io.opentelemetry.api.metrics.DoubleHistogramBuilder;
import io.opentelemetry.semconv.DbAttributes;
import io.opentelemetry.semconv.ErrorAttributes; import io.opentelemetry.semconv.ErrorAttributes;
import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.NetworkAttributes;
import io.opentelemetry.semconv.ServerAttributes; import io.opentelemetry.semconv.ServerAttributes;
@ -28,11 +29,11 @@ final class DbClientMetricsAdvice {
((ExtendedDoubleHistogramBuilder) builder) ((ExtendedDoubleHistogramBuilder) builder)
.setAttributesAdvice( .setAttributesAdvice(
asList( asList(
DbClientCommonAttributesExtractor.DB_SYSTEM_NAME, DbAttributes.DB_SYSTEM_NAME,
SqlClientAttributesExtractor.DB_COLLECTION_NAME, DbAttributes.DB_COLLECTION_NAME,
DbClientCommonAttributesExtractor.DB_NAMESPACE, DbAttributes.DB_NAMESPACE,
DbClientAttributesExtractor.DB_OPERATION_NAME, DbAttributes.DB_OPERATION_NAME,
DbClientAttributesExtractor.DB_RESPONSE_STATUS_CODE, DbAttributes.DB_RESPONSE_STATUS_CODE,
ErrorAttributes.ERROR_TYPE, ErrorAttributes.ERROR_TYPE,
NetworkAttributes.NETWORK_PEER_ADDRESS, NetworkAttributes.NETWORK_PEER_ADDRESS,
NetworkAttributes.NETWORK_PEER_PORT, NetworkAttributes.NETWORK_PEER_PORT,

11
instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/SqlClientAttributesExtractor.java
View File

@ -6,6 +6,10 @@
package io.opentelemetry.instrumentation.api.incubator.semconv.db; package io.opentelemetry.instrumentation.api.incubator.semconv.db;
import static io.opentelemetry.instrumentation.api.internal.AttributesExtractorUtil.internalSet; import static io.opentelemetry.instrumentation.api.internal.AttributesExtractorUtil.internalSet;
import static io.opentelemetry.semconv.DbAttributes.DB_COLLECTION_NAME;
import static io.opentelemetry.semconv.DbAttributes.DB_OPERATION_BATCH_SIZE;
import static io.opentelemetry.semconv.DbAttributes.DB_OPERATION_NAME;
import static io.opentelemetry.semconv.DbAttributes.DB_QUERY_TEXT;
import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.common.AttributeKey;
import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.api.common.AttributesBuilder;
@ -32,14 +36,7 @@ public final class SqlClientAttributesExtractor<REQUEST, RESPONSE>
// copied from DbIncubatingAttributes // copied from DbIncubatingAttributes
private static final AttributeKey<String> DB_OPERATION = AttributeKey.stringKey("db.operation"); private static final AttributeKey<String> DB_OPERATION = AttributeKey.stringKey("db.operation");
private static final AttributeKey<String> DB_OPERATION_NAME =
AttributeKey.stringKey("db.operation.name");
private static final AttributeKey<String> DB_STATEMENT = AttributeKey.stringKey("db.statement"); private static final AttributeKey<String> DB_STATEMENT = AttributeKey.stringKey("db.statement");
private static final AttributeKey<String> DB_QUERY_TEXT = AttributeKey.stringKey("db.query.text");
static final AttributeKey<String> DB_COLLECTION_NAME =
AttributeKey.stringKey("db.collection.name");
private static final AttributeKey<Long> DB_OPERATION_BATCH_SIZE =
AttributeKey.longKey("db.operation.batch.size");
private static final AttributeKeyTemplate<String> DB_QUERY_PARAMETER = private static final AttributeKeyTemplate<String> DB_QUERY_PARAMETER =
AttributeKeyTemplate.stringKeyTemplate("db.query.parameter"); AttributeKeyTemplate.stringKeyTemplate("db.query.parameter");

17
instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientAttributesExtractorTest.java
View File

@ -13,6 +13,7 @@ import io.opentelemetry.api.common.AttributesBuilder;
import io.opentelemetry.context.Context; import io.opentelemetry.context.Context;
import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
import io.opentelemetry.instrumentation.api.internal.SemconvStability; import io.opentelemetry.instrumentation.api.internal.SemconvStability;
import io.opentelemetry.semconv.DbAttributes;
import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import io.opentelemetry.semconv.incubating.DbIncubatingAttributes;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
@ -85,15 +86,15 @@ class DbClientAttributesExtractorTest {
assertThat(startAttributes.build()) assertThat(startAttributes.build())
.containsOnly( .containsOnly(
entry(DbIncubatingAttributes.DB_SYSTEM, "myDb"), entry(DbIncubatingAttributes.DB_SYSTEM, "myDb"),
entry(DbIncubatingAttributes.DB_SYSTEM_NAME, "myDb"), entry(DbAttributes.DB_SYSTEM_NAME, "myDb"),
entry(DbIncubatingAttributes.DB_USER, "username"), entry(DbIncubatingAttributes.DB_USER, "username"),
entry(DbIncubatingAttributes.DB_NAME, "potatoes"), entry(DbIncubatingAttributes.DB_NAME, "potatoes"),
entry(DbIncubatingAttributes.DB_CONNECTION_STRING, "mydb:///potatoes"), entry(DbIncubatingAttributes.DB_CONNECTION_STRING, "mydb:///potatoes"),
entry(DbIncubatingAttributes.DB_STATEMENT, "SELECT * FROM potato"), entry(DbIncubatingAttributes.DB_STATEMENT, "SELECT * FROM potato"),
entry(DbIncubatingAttributes.DB_OPERATION, "SELECT"), entry(DbIncubatingAttributes.DB_OPERATION, "SELECT"),
entry(DbIncubatingAttributes.DB_NAMESPACE, "potatoes"), entry(DbAttributes.DB_NAMESPACE, "potatoes"),
entry(DbIncubatingAttributes.DB_QUERY_TEXT, "SELECT * FROM potato"), entry(DbAttributes.DB_QUERY_TEXT, "SELECT * FROM potato"),
entry(DbIncubatingAttributes.DB_OPERATION_NAME, "SELECT")); entry(DbAttributes.DB_OPERATION_NAME, "SELECT"));
} else if (SemconvStability.emitOldDatabaseSemconv()) { } else if (SemconvStability.emitOldDatabaseSemconv()) {
assertThat(startAttributes.build()) assertThat(startAttributes.build())
.containsOnly( .containsOnly(
@ -106,10 +107,10 @@ class DbClientAttributesExtractorTest {
} else if (SemconvStability.emitStableDatabaseSemconv()) { } else if (SemconvStability.emitStableDatabaseSemconv()) {
assertThat(startAttributes.build()) assertThat(startAttributes.build())
.containsOnly( .containsOnly(
entry(DbIncubatingAttributes.DB_SYSTEM_NAME, "myDb"), entry(DbAttributes.DB_SYSTEM_NAME, "myDb"),
entry(DbIncubatingAttributes.DB_NAMESPACE, "potatoes"), entry(DbAttributes.DB_NAMESPACE, "potatoes"),
entry(DbIncubatingAttributes.DB_QUERY_TEXT, "SELECT * FROM potato"), entry(DbAttributes.DB_QUERY_TEXT, "SELECT * FROM potato"),
entry(DbIncubatingAttributes.DB_OPERATION_NAME, "SELECT")); entry(DbAttributes.DB_OPERATION_NAME, "SELECT"));
} }
assertThat(endAttributes.build().isEmpty()).isTrue(); assertThat(endAttributes.build().isEmpty()).isTrue();

31
instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientMetricsTest.java
View File

@ -19,6 +19,7 @@ import io.opentelemetry.context.Context;
import io.opentelemetry.instrumentation.api.instrumenter.OperationListener; import io.opentelemetry.instrumentation.api.instrumenter.OperationListener;
import io.opentelemetry.sdk.metrics.SdkMeterProvider; import io.opentelemetry.sdk.metrics.SdkMeterProvider;
import io.opentelemetry.sdk.testing.exporter.InMemoryMetricReader; import io.opentelemetry.sdk.testing.exporter.InMemoryMetricReader;
import io.opentelemetry.semconv.DbAttributes;
import io.opentelemetry.semconv.ErrorAttributes; import io.opentelemetry.semconv.ErrorAttributes;
import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.NetworkAttributes;
import io.opentelemetry.semconv.ServerAttributes; import io.opentelemetry.semconv.ServerAttributes;
@ -42,17 +43,17 @@ class DbClientMetricsTest {
Attributes operationAttributes = Attributes operationAttributes =
Attributes.builder() Attributes.builder()
.put(DbClientCommonAttributesExtractor.DB_SYSTEM_NAME, "myDb") .put(DbAttributes.DB_SYSTEM_NAME, "myDb")
.put(SqlClientAttributesExtractor.DB_COLLECTION_NAME, "table") .put(DbAttributes.DB_COLLECTION_NAME, "table")
.put(DbClientCommonAttributesExtractor.DB_NAMESPACE, "potatoes") .put(DbAttributes.DB_NAMESPACE, "potatoes")
.put(DbClientAttributesExtractor.DB_OPERATION_NAME, "SELECT") .put(DbAttributes.DB_OPERATION_NAME, "SELECT")
.put(ServerAttributes.SERVER_ADDRESS, "localhost") .put(ServerAttributes.SERVER_ADDRESS, "localhost")
.put(ServerAttributes.SERVER_PORT, 1234) .put(ServerAttributes.SERVER_PORT, 1234)
.build(); .build();
Attributes responseAttributes = Attributes responseAttributes =
Attributes.builder() Attributes.builder()
.put(DbClientAttributesExtractor.DB_RESPONSE_STATUS_CODE, "200") .put(DbAttributes.DB_RESPONSE_STATUS_CODE, "200")
.put(ErrorAttributes.ERROR_TYPE, "400") .put(ErrorAttributes.ERROR_TYPE, "400")
.put(NetworkAttributes.NETWORK_PEER_ADDRESS, "1.2.3.4") .put(NetworkAttributes.NETWORK_PEER_ADDRESS, "1.2.3.4")
.put(NetworkAttributes.NETWORK_PEER_PORT, 8080) .put(NetworkAttributes.NETWORK_PEER_PORT, 8080)
@ -88,23 +89,13 @@ class DbClientMetricsTest {
point point
.hasSum(0.15 /* seconds */) .hasSum(0.15 /* seconds */)
.hasAttributesSatisfying( .hasAttributesSatisfying(
equalTo( equalTo(DbAttributes.DB_SYSTEM_NAME, "myDb"),
DbClientCommonAttributesExtractor.DB_SYSTEM_NAME, equalTo(DbAttributes.DB_NAMESPACE, "potatoes"),
"myDb"), equalTo(DbAttributes.DB_OPERATION_NAME, "SELECT"),
equalTo( equalTo(DbAttributes.DB_COLLECTION_NAME, "table"),
DbClientCommonAttributesExtractor.DB_NAMESPACE,
"potatoes"),
equalTo(
DbClientAttributesExtractor.DB_OPERATION_NAME,
"SELECT"),
equalTo(
SqlClientAttributesExtractor.DB_COLLECTION_NAME,
"table"),
equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"),
equalTo(ServerAttributes.SERVER_PORT, 1234), equalTo(ServerAttributes.SERVER_PORT, 1234),
equalTo( equalTo(DbAttributes.DB_RESPONSE_STATUS_CODE, "200"),
DbClientAttributesExtractor.DB_RESPONSE_STATUS_CODE,
"200"),
equalTo(ErrorAttributes.ERROR_TYPE, "400"), equalTo(ErrorAttributes.ERROR_TYPE, "400"),
equalTo( equalTo(
NetworkAttributes.NETWORK_PEER_ADDRESS, "1.2.3.4"), NetworkAttributes.NETWORK_PEER_ADDRESS, "1.2.3.4"),

108
instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/SqlClientAttributesExtractorTest.java
View File

@ -6,6 +6,7 @@
package io.opentelemetry.instrumentation.api.incubator.semconv.db; package io.opentelemetry.instrumentation.api.incubator.semconv.db;
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
import static io.opentelemetry.semconv.DbAttributes.DB_OPERATION_BATCH_SIZE;
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_QUERY_PARAMETER; import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_QUERY_PARAMETER;
import static java.util.Collections.emptySet; import static java.util.Collections.emptySet;
import static java.util.Collections.singleton; import static java.util.Collections.singleton;
@ -16,6 +17,7 @@ import io.opentelemetry.api.common.AttributesBuilder;
import io.opentelemetry.context.Context; import io.opentelemetry.context.Context;
import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
import io.opentelemetry.instrumentation.api.internal.SemconvStability; import io.opentelemetry.instrumentation.api.internal.SemconvStability;
import io.opentelemetry.semconv.DbAttributes;
import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import io.opentelemetry.semconv.incubating.DbIncubatingAttributes;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
@ -60,7 +62,7 @@ class SqlClientAttributesExtractorTest {
@Override @Override
public Long getBatchSize(Map<String, Object> map) { public Long getBatchSize(Map<String, Object> map) {
return read(map, "db.operation.batch.size", Long.class); return read(map, DB_OPERATION_BATCH_SIZE.getKey(), Long.class);
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@ -118,17 +120,17 @@ class SqlClientAttributesExtractorTest {
assertThat(startAttributes.build()) assertThat(startAttributes.build())
.containsOnly( .containsOnly(
entry(DbIncubatingAttributes.DB_SYSTEM, "myDb"), entry(DbIncubatingAttributes.DB_SYSTEM, "myDb"),
entry(DbIncubatingAttributes.DB_SYSTEM_NAME, "myDb"), entry(DbAttributes.DB_SYSTEM_NAME, "myDb"),
entry(DbIncubatingAttributes.DB_USER, "username"), entry(DbIncubatingAttributes.DB_USER, "username"),
entry(DbIncubatingAttributes.DB_NAME, "potatoes"), entry(DbIncubatingAttributes.DB_NAME, "potatoes"),
entry(DbIncubatingAttributes.DB_CONNECTION_STRING, "mydb:///potatoes"), entry(DbIncubatingAttributes.DB_CONNECTION_STRING, "mydb:///potatoes"),
entry(DbIncubatingAttributes.DB_STATEMENT, "SELECT * FROM potato WHERE id=?"), entry(DbIncubatingAttributes.DB_STATEMENT, "SELECT * FROM potato WHERE id=?"),
entry(DbIncubatingAttributes.DB_OPERATION, "SELECT"), entry(DbIncubatingAttributes.DB_OPERATION, "SELECT"),
entry(DbIncubatingAttributes.DB_SQL_TABLE, "potato"), entry(DbIncubatingAttributes.DB_SQL_TABLE, "potato"),
entry(DbIncubatingAttributes.DB_NAMESPACE, "potatoes"), entry(DbAttributes.DB_NAMESPACE, "potatoes"),
entry(DbIncubatingAttributes.DB_QUERY_TEXT, "SELECT * FROM potato WHERE id=?"), entry(DbAttributes.DB_QUERY_TEXT, "SELECT * FROM potato WHERE id=?"),
entry(DbIncubatingAttributes.DB_OPERATION_NAME, "SELECT"), entry(DbAttributes.DB_OPERATION_NAME, "SELECT"),
entry(DbIncubatingAttributes.DB_COLLECTION_NAME, "potato")); entry(DbAttributes.DB_COLLECTION_NAME, "potato"));
} else if (SemconvStability.emitOldDatabaseSemconv()) { } else if (SemconvStability.emitOldDatabaseSemconv()) {
assertThat(startAttributes.build()) assertThat(startAttributes.build())
.containsOnly( .containsOnly(
@ -142,11 +144,11 @@ class SqlClientAttributesExtractorTest {
} else if (SemconvStability.emitStableDatabaseSemconv()) { } else if (SemconvStability.emitStableDatabaseSemconv()) {
assertThat(startAttributes.build()) assertThat(startAttributes.build())
.containsOnly( .containsOnly(
entry(DbIncubatingAttributes.DB_SYSTEM_NAME, "myDb"), entry(DbAttributes.DB_SYSTEM_NAME, "myDb"),
entry(DbIncubatingAttributes.DB_NAMESPACE, "potatoes"), entry(DbAttributes.DB_NAMESPACE, "potatoes"),
entry(DbIncubatingAttributes.DB_QUERY_TEXT, "SELECT * FROM potato WHERE id=?"), entry(DbAttributes.DB_QUERY_TEXT, "SELECT * FROM potato WHERE id=?"),
entry(DbIncubatingAttributes.DB_OPERATION_NAME, "SELECT"), entry(DbAttributes.DB_OPERATION_NAME, "SELECT"),
entry(DbIncubatingAttributes.DB_COLLECTION_NAME, "potato")); entry(DbAttributes.DB_COLLECTION_NAME, "potato"));
} }
assertThat(endAttributes.build().isEmpty()).isTrue(); assertThat(endAttributes.build().isEmpty()).isTrue();
@ -173,8 +175,8 @@ class SqlClientAttributesExtractorTest {
.containsOnly( .containsOnly(
entry(DbIncubatingAttributes.DB_STATEMENT, "SELECT *"), entry(DbIncubatingAttributes.DB_STATEMENT, "SELECT *"),
entry(DbIncubatingAttributes.DB_OPERATION, "SELECT"), entry(DbIncubatingAttributes.DB_OPERATION, "SELECT"),
entry(DbIncubatingAttributes.DB_QUERY_TEXT, "SELECT *"), entry(DbAttributes.DB_QUERY_TEXT, "SELECT *"),
entry(DbIncubatingAttributes.DB_OPERATION_NAME, "SELECT")); entry(DbAttributes.DB_OPERATION_NAME, "SELECT"));
} else if (SemconvStability.emitOldDatabaseSemconv()) { } else if (SemconvStability.emitOldDatabaseSemconv()) {
assertThat(attributes.build()) assertThat(attributes.build())
.containsOnly( .containsOnly(
@ -183,8 +185,8 @@ class SqlClientAttributesExtractorTest {
} else if (SemconvStability.emitStableDatabaseSemconv()) { } else if (SemconvStability.emitStableDatabaseSemconv()) {
assertThat(attributes.build()) assertThat(attributes.build())
.containsOnly( .containsOnly(
entry(DbIncubatingAttributes.DB_QUERY_TEXT, "SELECT *"), entry(DbAttributes.DB_QUERY_TEXT, "SELECT *"),
entry(DbIncubatingAttributes.DB_OPERATION_NAME, "SELECT")); entry(DbAttributes.DB_OPERATION_NAME, "SELECT"));
} }
} }
@ -213,9 +215,9 @@ class SqlClientAttributesExtractorTest {
entry(DbIncubatingAttributes.DB_STATEMENT, "SELECT * FROM table"), entry(DbIncubatingAttributes.DB_STATEMENT, "SELECT * FROM table"),
entry(DbIncubatingAttributes.DB_OPERATION, "SELECT"), entry(DbIncubatingAttributes.DB_OPERATION, "SELECT"),
entry(DbIncubatingAttributes.DB_CASSANDRA_TABLE, "table"), entry(DbIncubatingAttributes.DB_CASSANDRA_TABLE, "table"),
entry(DbIncubatingAttributes.DB_QUERY_TEXT, "SELECT * FROM table"), entry(DbAttributes.DB_QUERY_TEXT, "SELECT * FROM table"),
entry(DbIncubatingAttributes.DB_OPERATION_NAME, "SELECT"), entry(DbAttributes.DB_OPERATION_NAME, "SELECT"),
entry(DbIncubatingAttributes.DB_COLLECTION_NAME, "table")); entry(DbAttributes.DB_COLLECTION_NAME, "table"));
} else if (SemconvStability.emitOldDatabaseSemconv()) { } else if (SemconvStability.emitOldDatabaseSemconv()) {
assertThat(attributes.build()) assertThat(attributes.build())
.containsOnly( .containsOnly(
@ -225,9 +227,9 @@ class SqlClientAttributesExtractorTest {
} else if (SemconvStability.emitStableDatabaseSemconv()) { } else if (SemconvStability.emitStableDatabaseSemconv()) {
assertThat(attributes.build()) assertThat(attributes.build())
.containsOnly( .containsOnly(
entry(DbIncubatingAttributes.DB_QUERY_TEXT, "SELECT * FROM table"), entry(DbAttributes.DB_QUERY_TEXT, "SELECT * FROM table"),
entry(DbIncubatingAttributes.DB_OPERATION_NAME, "SELECT"), entry(DbAttributes.DB_OPERATION_NAME, "SELECT"),
entry(DbIncubatingAttributes.DB_COLLECTION_NAME, "table")); entry(DbAttributes.DB_COLLECTION_NAME, "table"));
} }
} }
@ -251,7 +253,7 @@ class SqlClientAttributesExtractorTest {
Map<String, Object> request = new HashMap<>(); Map<String, Object> request = new HashMap<>();
request.put("db.name", "potatoes"); request.put("db.name", "potatoes");
request.put("db.statements", singleton("INSERT INTO potato VALUES(?)")); request.put("db.statements", singleton("INSERT INTO potato VALUES(?)"));
request.put("db.operation.batch.size", 2L); request.put(DB_OPERATION_BATCH_SIZE.getKey(), 2L);
Context context = Context.root(); Context context = Context.root();
@ -273,11 +275,11 @@ class SqlClientAttributesExtractorTest {
entry(DbIncubatingAttributes.DB_STATEMENT, "INSERT INTO potato VALUES(?)"), entry(DbIncubatingAttributes.DB_STATEMENT, "INSERT INTO potato VALUES(?)"),
entry(DbIncubatingAttributes.DB_OPERATION, "INSERT"), entry(DbIncubatingAttributes.DB_OPERATION, "INSERT"),
entry(DbIncubatingAttributes.DB_SQL_TABLE, "potato"), entry(DbIncubatingAttributes.DB_SQL_TABLE, "potato"),
entry(DbIncubatingAttributes.DB_NAMESPACE, "potatoes"), entry(DbAttributes.DB_NAMESPACE, "potatoes"),
entry(DbIncubatingAttributes.DB_QUERY_TEXT, "INSERT INTO potato VALUES(?)"), entry(DbAttributes.DB_QUERY_TEXT, "INSERT INTO potato VALUES(?)"),
entry(DbIncubatingAttributes.DB_OPERATION_NAME, "BATCH INSERT"), entry(DbAttributes.DB_OPERATION_NAME, "BATCH INSERT"),
entry(DbIncubatingAttributes.DB_COLLECTION_NAME, "potato"), entry(DbAttributes.DB_COLLECTION_NAME, "potato"),
entry(DbIncubatingAttributes.DB_OPERATION_BATCH_SIZE, 2L)); entry(DB_OPERATION_BATCH_SIZE, 2L));
} else if (SemconvStability.emitOldDatabaseSemconv()) { } else if (SemconvStability.emitOldDatabaseSemconv()) {
assertThat(startAttributes.build()) assertThat(startAttributes.build())
.containsOnly( .containsOnly(
@ -288,11 +290,11 @@ class SqlClientAttributesExtractorTest {
} else if (SemconvStability.emitStableDatabaseSemconv()) { } else if (SemconvStability.emitStableDatabaseSemconv()) {
assertThat(startAttributes.build()) assertThat(startAttributes.build())
.containsOnly( .containsOnly(
entry(DbIncubatingAttributes.DB_NAMESPACE, "potatoes"), entry(DbAttributes.DB_NAMESPACE, "potatoes"),
entry(DbIncubatingAttributes.DB_QUERY_TEXT, "INSERT INTO potato VALUES(?)"), entry(DbAttributes.DB_QUERY_TEXT, "INSERT INTO potato VALUES(?)"),
entry(DbIncubatingAttributes.DB_OPERATION_NAME, "BATCH INSERT"), entry(DbAttributes.DB_OPERATION_NAME, "BATCH INSERT"),
entry(DbIncubatingAttributes.DB_COLLECTION_NAME, "potato"), entry(DbAttributes.DB_COLLECTION_NAME, "potato"),
entry(DbIncubatingAttributes.DB_OPERATION_BATCH_SIZE, 2L)); entry(DB_OPERATION_BATCH_SIZE, 2L));
} }
assertThat(endAttributes.build().isEmpty()).isTrue(); assertThat(endAttributes.build().isEmpty()).isTrue();
@ -306,7 +308,7 @@ class SqlClientAttributesExtractorTest {
request.put( request.put(
"db.statements", "db.statements",
Arrays.asList("INSERT INTO potato VALUES(1)", "INSERT INTO potato VALUES(2)")); Arrays.asList("INSERT INTO potato VALUES(1)", "INSERT INTO potato VALUES(2)"));
request.put("db.operation.batch.size", 2L); request.put(DB_OPERATION_BATCH_SIZE.getKey(), 2L);
Context context = Context.root(); Context context = Context.root();
@ -325,22 +327,22 @@ class SqlClientAttributesExtractorTest {
assertThat(startAttributes.build()) assertThat(startAttributes.build())
.containsOnly( .containsOnly(
entry(DbIncubatingAttributes.DB_NAME, "potatoes"), entry(DbIncubatingAttributes.DB_NAME, "potatoes"),
entry(DbIncubatingAttributes.DB_NAMESPACE, "potatoes"), entry(DbAttributes.DB_NAMESPACE, "potatoes"),
entry(DbIncubatingAttributes.DB_QUERY_TEXT, "INSERT INTO potato VALUES(?)"), entry(DbAttributes.DB_QUERY_TEXT, "INSERT INTO potato VALUES(?)"),
entry(DbIncubatingAttributes.DB_OPERATION_NAME, "BATCH INSERT"), entry(DbAttributes.DB_OPERATION_NAME, "BATCH INSERT"),
entry(DbIncubatingAttributes.DB_COLLECTION_NAME, "potato"), entry(DbAttributes.DB_COLLECTION_NAME, "potato"),
entry(DbIncubatingAttributes.DB_OPERATION_BATCH_SIZE, 2L)); entry(DB_OPERATION_BATCH_SIZE, 2L));
} else if (SemconvStability.emitOldDatabaseSemconv()) { } else if (SemconvStability.emitOldDatabaseSemconv()) {
assertThat(startAttributes.build()) assertThat(startAttributes.build())
.containsOnly(entry(DbIncubatingAttributes.DB_NAME, "potatoes")); .containsOnly(entry(DbIncubatingAttributes.DB_NAME, "potatoes"));
} else if (SemconvStability.emitStableDatabaseSemconv()) { } else if (SemconvStability.emitStableDatabaseSemconv()) {
assertThat(startAttributes.build()) assertThat(startAttributes.build())
.containsOnly( .containsOnly(
entry(DbIncubatingAttributes.DB_NAMESPACE, "potatoes"), entry(DbAttributes.DB_NAMESPACE, "potatoes"),
entry(DbIncubatingAttributes.DB_QUERY_TEXT, "INSERT INTO potato VALUES(?)"), entry(DbAttributes.DB_QUERY_TEXT, "INSERT INTO potato VALUES(?)"),
entry(DbIncubatingAttributes.DB_OPERATION_NAME, "BATCH INSERT"), entry(DbAttributes.DB_OPERATION_NAME, "BATCH INSERT"),
entry(DbIncubatingAttributes.DB_COLLECTION_NAME, "potato"), entry(DbAttributes.DB_COLLECTION_NAME, "potato"),
entry(DbIncubatingAttributes.DB_OPERATION_BATCH_SIZE, 2L)); entry(DB_OPERATION_BATCH_SIZE, 2L));
} }
assertThat(endAttributes.build().isEmpty()).isTrue(); assertThat(endAttributes.build().isEmpty()).isTrue();
@ -352,7 +354,7 @@ class SqlClientAttributesExtractorTest {
Map<String, Object> request = new HashMap<>(); Map<String, Object> request = new HashMap<>();
request.put("db.name", "potatoes"); request.put("db.name", "potatoes");
request.put("db.statements", singleton("INSERT INTO potato VALUES(?)")); request.put("db.statements", singleton("INSERT INTO potato VALUES(?)"));
request.put("db.operation.batch.size", 1L); request.put(DB_OPERATION_BATCH_SIZE.getKey(), 1L);
Context context = Context.root(); Context context = Context.root();
@ -374,10 +376,10 @@ class SqlClientAttributesExtractorTest {
entry(DbIncubatingAttributes.DB_STATEMENT, "INSERT INTO potato VALUES(?)"), entry(DbIncubatingAttributes.DB_STATEMENT, "INSERT INTO potato VALUES(?)"),
entry(DbIncubatingAttributes.DB_OPERATION, "INSERT"), entry(DbIncubatingAttributes.DB_OPERATION, "INSERT"),
entry(DbIncubatingAttributes.DB_SQL_TABLE, "potato"), entry(DbIncubatingAttributes.DB_SQL_TABLE, "potato"),
entry(DbIncubatingAttributes.DB_NAMESPACE, "potatoes"), entry(DbAttributes.DB_NAMESPACE, "potatoes"),
entry(DbIncubatingAttributes.DB_QUERY_TEXT, "INSERT INTO potato VALUES(?)"), entry(DbAttributes.DB_QUERY_TEXT, "INSERT INTO potato VALUES(?)"),
entry(DbIncubatingAttributes.DB_OPERATION_NAME, "INSERT"), entry(DbAttributes.DB_OPERATION_NAME, "INSERT"),
entry(DbIncubatingAttributes.DB_COLLECTION_NAME, "potato")); entry(DbAttributes.DB_COLLECTION_NAME, "potato"));
} else if (SemconvStability.emitOldDatabaseSemconv()) { } else if (SemconvStability.emitOldDatabaseSemconv()) {
assertThat(startAttributes.build()) assertThat(startAttributes.build())
.containsOnly( .containsOnly(
@ -388,10 +390,10 @@ class SqlClientAttributesExtractorTest {
} else if (SemconvStability.emitStableDatabaseSemconv()) { } else if (SemconvStability.emitStableDatabaseSemconv()) {
assertThat(startAttributes.build()) assertThat(startAttributes.build())
.containsOnly( .containsOnly(
entry(DbIncubatingAttributes.DB_NAMESPACE, "potatoes"), entry(DbAttributes.DB_NAMESPACE, "potatoes"),
entry(DbIncubatingAttributes.DB_QUERY_TEXT, "INSERT INTO potato VALUES(?)"), entry(DbAttributes.DB_QUERY_TEXT, "INSERT INTO potato VALUES(?)"),
entry(DbIncubatingAttributes.DB_OPERATION_NAME, "INSERT"), entry(DbAttributes.DB_OPERATION_NAME, "INSERT"),
entry(DbIncubatingAttributes.DB_COLLECTION_NAME, "potato")); entry(DbAttributes.DB_COLLECTION_NAME, "potato"));
} }
assertThat(endAttributes.build().isEmpty()).isTrue(); assertThat(endAttributes.build().isEmpty()).isTrue();
@ -445,7 +447,7 @@ class SqlClientAttributesExtractorTest {
Map<String, Object> request = new HashMap<>(); Map<String, Object> request = new HashMap<>();
request.put("db.name", "potatoes"); request.put("db.name", "potatoes");
request.put("db.statements", singleton("INSERT INTO potato VALUES(?)")); request.put("db.statements", singleton("INSERT INTO potato VALUES(?)"));
request.put("db.operation.batch.size", 2L); request.put(DB_OPERATION_BATCH_SIZE.getKey(), 2L);
request.put("db.query.parameter", Collections.singletonMap("0", "1")); request.put("db.query.parameter", Collections.singletonMap("0", "1"));
Context context = Context.root(); Context context = Context.root();

7
instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/DynamoDbAttributesExtractor.java
View File

@ -5,6 +5,9 @@
package io.opentelemetry.instrumentation.awssdk.v1_11; package io.opentelemetry.instrumentation.awssdk.v1_11;
import static io.opentelemetry.semconv.DbAttributes.DB_OPERATION_NAME;
import static io.opentelemetry.semconv.DbAttributes.DB_SYSTEM_NAME;
import com.amazonaws.Request; import com.amazonaws.Request;
import com.amazonaws.Response; import com.amazonaws.Response;
import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.common.AttributeKey;
@ -21,11 +24,7 @@ class DynamoDbAttributesExtractor implements AttributesExtractor<Request<?>, Res
// copied from DbIncubatingAttributes // copied from DbIncubatingAttributes
private static final AttributeKey<String> DB_OPERATION = AttributeKey.stringKey("db.operation"); private static final AttributeKey<String> DB_OPERATION = AttributeKey.stringKey("db.operation");
private static final AttributeKey<String> DB_OPERATION_NAME =
AttributeKey.stringKey("db.operation.name");
private static final AttributeKey<String> DB_SYSTEM = AttributeKey.stringKey("db.system"); private static final AttributeKey<String> DB_SYSTEM = AttributeKey.stringKey("db.system");
private static final AttributeKey<String> DB_SYSTEM_NAME =
AttributeKey.stringKey("db.system.name");
// copied from AwsIncubatingAttributes // copied from AwsIncubatingAttributes
private static final AttributeKey<List<String>> AWS_DYNAMODB_TABLE_NAMES = private static final AttributeKey<List<String>> AWS_DYNAMODB_TABLE_NAMES =
AttributeKey.stringArrayKey("aws.dynamodb.table_names"); AttributeKey.stringArrayKey("aws.dynamodb.table_names");

4
instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractDynamoDbClientTest.java
View File

@ -9,13 +9,13 @@ 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.DbClientMetricsTestUtil.assertDurationMetric;
import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStable; import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStable;
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
import static io.opentelemetry.semconv.DbAttributes.DB_OPERATION_NAME;
import static io.opentelemetry.semconv.DbAttributes.DB_SYSTEM_NAME;
import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS; import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS;
import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT; 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.AwsIncubatingAttributes.AWS_DYNAMODB_TABLE_NAMES;
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION; import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION;
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION_NAME;
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SYSTEM; 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.DbSystemNameIncubatingValues.AWS_DYNAMODB; import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DbSystemNameIncubatingValues.AWS_DYNAMODB;
import static java.util.Collections.singletonList; import static java.util.Collections.singletonList;

7
instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/internal/DynamoDbAttributesExtractor.java
View File

@ -5,6 +5,9 @@
package io.opentelemetry.instrumentation.awssdk.v2_2.internal; package io.opentelemetry.instrumentation.awssdk.v2_2.internal;
import static io.opentelemetry.semconv.DbAttributes.DB_OPERATION_NAME;
import static io.opentelemetry.semconv.DbAttributes.DB_SYSTEM_NAME;
import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.common.AttributeKey;
import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.api.common.AttributesBuilder;
import io.opentelemetry.context.Context; import io.opentelemetry.context.Context;
@ -19,11 +22,7 @@ class DynamoDbAttributesExtractor implements AttributesExtractor<ExecutionAttrib
// copied from DbIncubatingAttributes // copied from DbIncubatingAttributes
private static final AttributeKey<String> DB_OPERATION = AttributeKey.stringKey("db.operation"); private static final AttributeKey<String> DB_OPERATION = AttributeKey.stringKey("db.operation");
private static final AttributeKey<String> DB_OPERATION_NAME =
AttributeKey.stringKey("db.operation.name");
private static final AttributeKey<String> DB_SYSTEM = AttributeKey.stringKey("db.system"); private static final AttributeKey<String> DB_SYSTEM = AttributeKey.stringKey("db.system");
private static final AttributeKey<String> DB_SYSTEM_NAME =
AttributeKey.stringKey("db.system.name");
// copied from DbIncubatingAttributes.DbSystemIncubatingValues // copied from DbIncubatingAttributes.DbSystemIncubatingValues
private static final String DYNAMODB = "dynamodb"; private static final String DYNAMODB = "dynamodb";

4
instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientCoreTest.java
View File

@ -10,6 +10,8 @@ import static io.opentelemetry.instrumentation.testing.junit.db.DbClientMetricsT
import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStable; import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStable;
import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStableDbSystemName; 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.equalTo;
import static io.opentelemetry.semconv.DbAttributes.DB_OPERATION_NAME;
import static io.opentelemetry.semconv.DbAttributes.DB_SYSTEM_NAME;
import static io.opentelemetry.semconv.HttpAttributes.HTTP_REQUEST_METHOD; import static io.opentelemetry.semconv.HttpAttributes.HTTP_REQUEST_METHOD;
import static io.opentelemetry.semconv.HttpAttributes.HTTP_RESPONSE_STATUS_CODE; import static io.opentelemetry.semconv.HttpAttributes.HTTP_RESPONSE_STATUS_CODE;
import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS; import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS;
@ -17,9 +19,7 @@ import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT;
import static io.opentelemetry.semconv.UrlAttributes.URL_FULL; import static io.opentelemetry.semconv.UrlAttributes.URL_FULL;
import static io.opentelemetry.semconv.incubating.AwsIncubatingAttributes.AWS_REQUEST_ID; import static io.opentelemetry.semconv.incubating.AwsIncubatingAttributes.AWS_REQUEST_ID;
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION; import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION;
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION_NAME;
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SYSTEM; 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.RpcIncubatingAttributes.RPC_METHOD; import static io.opentelemetry.semconv.incubating.RpcIncubatingAttributes.RPC_METHOD;
import static io.opentelemetry.semconv.incubating.RpcIncubatingAttributes.RPC_SERVICE; import static io.opentelemetry.semconv.incubating.RpcIncubatingAttributes.RPC_SERVICE;
import static io.opentelemetry.semconv.incubating.RpcIncubatingAttributes.RPC_SYSTEM; import static io.opentelemetry.semconv.incubating.RpcIncubatingAttributes.RPC_SYSTEM;

7
instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/DbSpanDecorator.java
View File

@ -28,6 +28,7 @@ import io.opentelemetry.instrumentation.api.incubator.semconv.db.SqlStatementSan
import io.opentelemetry.instrumentation.api.internal.SemconvStability; import io.opentelemetry.instrumentation.api.internal.SemconvStability;
import io.opentelemetry.javaagent.bootstrap.internal.AgentCommonConfig; import io.opentelemetry.javaagent.bootstrap.internal.AgentCommonConfig;
import io.opentelemetry.javaagent.instrumentation.apachecamel.CamelDirection; import io.opentelemetry.javaagent.instrumentation.apachecamel.CamelDirection;
import io.opentelemetry.semconv.DbAttributes;
import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import io.opentelemetry.semconv.incubating.DbIncubatingAttributes;
import java.net.URI; import java.net.URI;
import java.util.Map; import java.util.Map;
@ -125,7 +126,7 @@ class DbSpanDecorator extends BaseSpanDecorator {
super.pre(attributes, exchange, endpoint, camelDirection); super.pre(attributes, exchange, endpoint, camelDirection);
if (SemconvStability.emitStableDatabaseSemconv()) { if (SemconvStability.emitStableDatabaseSemconv()) {
attributes.put(DbIncubatingAttributes.DB_SYSTEM_NAME, system); attributes.put(DbAttributes.DB_SYSTEM_NAME, system);
} }
if (SemconvStability.emitOldDatabaseSemconv()) { if (SemconvStability.emitOldDatabaseSemconv()) {
attributes.put(DbIncubatingAttributes.DB_SYSTEM, system); attributes.put(DbIncubatingAttributes.DB_SYSTEM, system);
@ -133,7 +134,7 @@ class DbSpanDecorator extends BaseSpanDecorator {
String statement = getStatement(exchange, endpoint); String statement = getStatement(exchange, endpoint);
if (statement != null) { if (statement != null) {
if (SemconvStability.emitStableDatabaseSemconv()) { if (SemconvStability.emitStableDatabaseSemconv()) {
attributes.put(DbIncubatingAttributes.DB_QUERY_TEXT, statement); attributes.put(DbAttributes.DB_QUERY_TEXT, statement);
} }
if (SemconvStability.emitOldDatabaseSemconv()) { if (SemconvStability.emitOldDatabaseSemconv()) {
attributes.put(DbIncubatingAttributes.DB_STATEMENT, statement); attributes.put(DbIncubatingAttributes.DB_STATEMENT, statement);
@ -142,7 +143,7 @@ class DbSpanDecorator extends BaseSpanDecorator {
String dbName = getDbName(endpoint); String dbName = getDbName(endpoint);
if (dbName != null) { if (dbName != null) {
if (SemconvStability.emitStableDatabaseSemconv()) { if (SemconvStability.emitStableDatabaseSemconv()) {
attributes.put(DbIncubatingAttributes.DB_NAMESPACE, dbName); attributes.put(DbAttributes.DB_NAMESPACE, dbName);
} }
if (SemconvStability.emitOldDatabaseSemconv()) { if (SemconvStability.emitOldDatabaseSemconv()) {
attributes.put(DbIncubatingAttributes.DB_NAME, dbName); attributes.put(DbIncubatingAttributes.DB_NAME, dbName);

2
instrumentation/clickhouse-client-0.5/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/clickhouse/ClickHouseClientTest.java
View File

@ -7,12 +7,12 @@ package io.opentelemetry.javaagent.instrumentation.clickhouse;
import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStable; import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStable;
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
import static io.opentelemetry.semconv.DbAttributes.DB_RESPONSE_STATUS_CODE;
import static io.opentelemetry.semconv.ErrorAttributes.ERROR_TYPE; import static io.opentelemetry.semconv.ErrorAttributes.ERROR_TYPE;
import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS; import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS;
import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT; import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT;
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_NAME; import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_NAME;
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION; import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION;
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_RESPONSE_STATUS_CODE;
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_STATEMENT; 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;
import static java.util.Arrays.asList; import static java.util.Arrays.asList;

10
instrumentation/jdbc/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jdbc/test/JdbcInstrumentationTest.java
View File

@ -11,18 +11,18 @@ import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStability
import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStableDbSystemName; 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.assertThat;
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
import static io.opentelemetry.semconv.DbAttributes.DB_COLLECTION_NAME;
import static io.opentelemetry.semconv.DbAttributes.DB_NAMESPACE;
import static io.opentelemetry.semconv.DbAttributes.DB_OPERATION_BATCH_SIZE;
import static io.opentelemetry.semconv.DbAttributes.DB_OPERATION_NAME;
import static io.opentelemetry.semconv.DbAttributes.DB_SYSTEM_NAME;
import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS; import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS;
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_COLLECTION_NAME;
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_CONNECTION_STRING; import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_CONNECTION_STRING;
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_NAME; import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_NAME;
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_NAMESPACE;
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION; import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION;
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION_BATCH_SIZE;
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION_NAME;
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SQL_TABLE; 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_STATEMENT;
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SYSTEM; 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 io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_USER;
import static java.util.Arrays.asList; import static java.util.Arrays.asList;
import static org.junit.jupiter.api.Assumptions.assumeTrue; import static org.junit.jupiter.api.Assumptions.assumeTrue;

5
instrumentation/jdbc/library/src/main/java/io/opentelemetry/instrumentation/jdbc/internal/DataSourceDbAttributesExtractor.java
View File

@ -6,6 +6,8 @@
package io.opentelemetry.instrumentation.jdbc.internal; package io.opentelemetry.instrumentation.jdbc.internal;
import static io.opentelemetry.instrumentation.api.internal.AttributesExtractorUtil.internalSet; import static io.opentelemetry.instrumentation.api.internal.AttributesExtractorUtil.internalSet;
import static io.opentelemetry.semconv.DbAttributes.DB_NAMESPACE;
import static io.opentelemetry.semconv.DbAttributes.DB_SYSTEM_NAME;
import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.common.AttributeKey;
import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.api.common.AttributesBuilder;
@ -21,10 +23,7 @@ enum DataSourceDbAttributesExtractor implements AttributesExtractor<DataSource,
// copied from DbIncubatingAttributes // copied from DbIncubatingAttributes
private static final AttributeKey<String> DB_NAME = AttributeKey.stringKey("db.name"); private static final AttributeKey<String> DB_NAME = AttributeKey.stringKey("db.name");
private static final AttributeKey<String> DB_NAMESPACE = AttributeKey.stringKey("db.namespace");
private static final AttributeKey<String> DB_SYSTEM = AttributeKey.stringKey("db.system"); private static final AttributeKey<String> DB_SYSTEM = AttributeKey.stringKey("db.system");
private static final AttributeKey<String> DB_SYSTEM_NAME =
AttributeKey.stringKey("db.system.name");
private static final AttributeKey<String> DB_USER = AttributeKey.stringKey("db.user"); private static final AttributeKey<String> DB_USER = AttributeKey.stringKey("db.user");
private static final AttributeKey<String> DB_CONNECTION_STRING = private static final AttributeKey<String> DB_CONNECTION_STRING =
AttributeKey.stringKey("db.connection_string"); AttributeKey.stringKey("db.connection_string");

3
instrumentation/jdbc/library/src/main/java/io/opentelemetry/instrumentation/jdbc/internal/TransactionAttributeExtractor.java
View File

@ -6,6 +6,7 @@
package io.opentelemetry.instrumentation.jdbc.internal; package io.opentelemetry.instrumentation.jdbc.internal;
import static io.opentelemetry.instrumentation.api.internal.AttributesExtractorUtil.internalSet; import static io.opentelemetry.instrumentation.api.internal.AttributesExtractorUtil.internalSet;
import static io.opentelemetry.semconv.DbAttributes.DB_OPERATION_NAME;
import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.common.AttributeKey;
import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.api.common.AttributesBuilder;
@ -19,8 +20,6 @@ enum TransactionAttributeExtractor implements AttributesExtractor<DbRequest, Voi
// copied from DbIncubatingAttributes // copied from DbIncubatingAttributes
private static final AttributeKey<String> DB_OPERATION = AttributeKey.stringKey("db.operation"); private static final AttributeKey<String> DB_OPERATION = AttributeKey.stringKey("db.operation");
private static final AttributeKey<String> DB_OPERATION_NAME =
AttributeKey.stringKey("db.operation.name");
@Override @Override
public void onStart(AttributesBuilder attributes, Context parentContext, DbRequest request) { public void onStart(AttributesBuilder attributes, Context parentContext, DbRequest request) {

12
instrumentation/jdbc/library/src/test/java/io/opentelemetry/instrumentation/jdbc/datasource/JdbcTelemetryTest.java
View File

@ -8,19 +8,19 @@ package io.opentelemetry.instrumentation.jdbc.datasource;
import static io.opentelemetry.instrumentation.testing.junit.db.DbClientMetricsTestUtil.assertDurationMetric; 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.maybeStable;
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
import static io.opentelemetry.semconv.DbAttributes.DB_NAMESPACE;
import static io.opentelemetry.semconv.DbAttributes.DB_OPERATION_BATCH_SIZE;
import static io.opentelemetry.semconv.DbAttributes.DB_OPERATION_NAME;
import static io.opentelemetry.semconv.DbAttributes.DB_QUERY_TEXT;
import static io.opentelemetry.semconv.DbAttributes.DB_RESPONSE_STATUS_CODE;
import static io.opentelemetry.semconv.DbAttributes.DB_SYSTEM_NAME;
import static io.opentelemetry.semconv.ErrorAttributes.ERROR_TYPE; import static io.opentelemetry.semconv.ErrorAttributes.ERROR_TYPE;
import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS; import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS;
import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT; import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT;
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_NAME; import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_NAME;
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_NAMESPACE;
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION; import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION;
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION_BATCH_SIZE;
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION_NAME;
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_QUERY_TEXT;
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_RESPONSE_STATUS_CODE;
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SQL_TABLE; 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_STATEMENT;
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SYSTEM_NAME;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatCode; import static org.assertj.core.api.Assertions.assertThatCode;
import static org.junit.jupiter.api.Assumptions.assumeTrue; import static org.junit.jupiter.api.Assumptions.assumeTrue;

4
instrumentation/jedis/jedis-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/Jedis30ClientTest.java
View File

@ -9,16 +9,16 @@ import static io.opentelemetry.instrumentation.testing.junit.db.DbClientMetricsT
import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStable; import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStable;
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies;
import static io.opentelemetry.semconv.DbAttributes.DB_OPERATION_NAME;
import static io.opentelemetry.semconv.DbAttributes.DB_SYSTEM_NAME;
import static io.opentelemetry.semconv.NetworkAttributes.NETWORK_PEER_ADDRESS; import static io.opentelemetry.semconv.NetworkAttributes.NETWORK_PEER_ADDRESS;
import static io.opentelemetry.semconv.NetworkAttributes.NETWORK_PEER_PORT; import static io.opentelemetry.semconv.NetworkAttributes.NETWORK_PEER_PORT;
import static io.opentelemetry.semconv.NetworkAttributes.NETWORK_TYPE; import static io.opentelemetry.semconv.NetworkAttributes.NETWORK_TYPE;
import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS; import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS;
import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT; import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT;
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION; import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION;
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_STATEMENT;
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SYSTEM; 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 static org.assertj.core.api.Assertions.assertThat;
import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.api.trace.SpanKind;

6
instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceConnectAttributesExtractor.java
View File

@ -10,6 +10,7 @@ import io.opentelemetry.api.common.AttributesBuilder;
import io.opentelemetry.context.Context; import io.opentelemetry.context.Context;
import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
import io.opentelemetry.instrumentation.api.internal.SemconvStability; import io.opentelemetry.instrumentation.api.internal.SemconvStability;
import io.opentelemetry.semconv.DbAttributes;
import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import io.opentelemetry.semconv.incubating.DbIncubatingAttributes;
import javax.annotation.Nullable; import javax.annotation.Nullable;
@ -20,8 +21,7 @@ final class LettuceConnectAttributesExtractor implements AttributesExtractor<Red
public void onStart(AttributesBuilder attributes, Context parentContext, RedisURI redisUri) { public void onStart(AttributesBuilder attributes, Context parentContext, RedisURI redisUri) {
if (SemconvStability.emitStableDatabaseSemconv()) { if (SemconvStability.emitStableDatabaseSemconv()) {
attributes.put( attributes.put(
DbIncubatingAttributes.DB_SYSTEM_NAME, DbAttributes.DB_SYSTEM_NAME, DbIncubatingAttributes.DbSystemNameIncubatingValues.REDIS);
DbIncubatingAttributes.DbSystemNameIncubatingValues.REDIS);
} }
if (SemconvStability.emitOldDatabaseSemconv()) { if (SemconvStability.emitOldDatabaseSemconv()) {
attributes.put( attributes.put(
@ -31,7 +31,7 @@ final class LettuceConnectAttributesExtractor implements AttributesExtractor<Red
int database = redisUri.getDatabase(); int database = redisUri.getDatabase();
if (database != 0) { if (database != 0) {
if (SemconvStability.emitStableDatabaseSemconv()) { if (SemconvStability.emitStableDatabaseSemconv()) {
attributes.put(DbIncubatingAttributes.DB_NAMESPACE, String.valueOf(database)); attributes.put(DbAttributes.DB_NAMESPACE, String.valueOf(database));
} }
if (SemconvStability.emitOldDatabaseSemconv()) { if (SemconvStability.emitOldDatabaseSemconv()) {
attributes.put(DbIncubatingAttributes.DB_REDIS_DATABASE_INDEX, (long) database); attributes.put(DbIncubatingAttributes.DB_REDIS_DATABASE_INDEX, (long) database);

6
instrumentation/lettuce/lettuce-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceConnectAttributesExtractor.java
View File

@ -10,6 +10,7 @@ import io.opentelemetry.api.common.AttributesBuilder;
import io.opentelemetry.context.Context; import io.opentelemetry.context.Context;
import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
import io.opentelemetry.instrumentation.api.internal.SemconvStability; import io.opentelemetry.instrumentation.api.internal.SemconvStability;
import io.opentelemetry.semconv.DbAttributes;
import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import io.opentelemetry.semconv.incubating.DbIncubatingAttributes;
import javax.annotation.Nullable; import javax.annotation.Nullable;
@ -20,8 +21,7 @@ final class LettuceConnectAttributesExtractor implements AttributesExtractor<Red
public void onStart(AttributesBuilder attributes, Context parentContext, RedisURI redisUri) { public void onStart(AttributesBuilder attributes, Context parentContext, RedisURI redisUri) {
if (SemconvStability.emitStableDatabaseSemconv()) { if (SemconvStability.emitStableDatabaseSemconv()) {
attributes.put( attributes.put(
DbIncubatingAttributes.DB_SYSTEM_NAME, DbAttributes.DB_SYSTEM_NAME, DbIncubatingAttributes.DbSystemNameIncubatingValues.REDIS);
DbIncubatingAttributes.DbSystemNameIncubatingValues.REDIS);
} }
if (SemconvStability.emitOldDatabaseSemconv()) { if (SemconvStability.emitOldDatabaseSemconv()) {
attributes.put( attributes.put(
@ -31,7 +31,7 @@ final class LettuceConnectAttributesExtractor implements AttributesExtractor<Red
int database = redisUri.getDatabase(); int database = redisUri.getDatabase();
if (database != 0) { if (database != 0) {
if (SemconvStability.emitStableDatabaseSemconv()) { if (SemconvStability.emitStableDatabaseSemconv()) {
attributes.put(DbIncubatingAttributes.DB_NAMESPACE, String.valueOf(database)); attributes.put(DbAttributes.DB_NAMESPACE, String.valueOf(database));
} }
if (SemconvStability.emitOldDatabaseSemconv()) { if (SemconvStability.emitOldDatabaseSemconv()) {
attributes.put(DbIncubatingAttributes.DB_REDIS_DATABASE_INDEX, (long) database); attributes.put(DbIncubatingAttributes.DB_REDIS_DATABASE_INDEX, (long) database);

5
instrumentation/lettuce/lettuce-5.1/library/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/OpenTelemetryTracing.java
View File

@ -6,6 +6,8 @@
package io.opentelemetry.instrumentation.lettuce.v5_1; package io.opentelemetry.instrumentation.lettuce.v5_1;
import static io.opentelemetry.instrumentation.lettuce.common.LettuceArgSplitter.splitArgs; import static io.opentelemetry.instrumentation.lettuce.common.LettuceArgSplitter.splitArgs;
import static io.opentelemetry.semconv.DbAttributes.DB_QUERY_TEXT;
import static io.opentelemetry.semconv.DbAttributes.DB_SYSTEM_NAME;
import com.google.errorprone.annotations.CanIgnoreReturnValue; import com.google.errorprone.annotations.CanIgnoreReturnValue;
import io.lettuce.core.output.CommandOutput; import io.lettuce.core.output.CommandOutput;
@ -42,10 +44,7 @@ final class OpenTelemetryTracing implements Tracing {
// copied from DbIncubatingAttributes // copied from DbIncubatingAttributes
private static final AttributeKey<String> DB_SYSTEM = AttributeKey.stringKey("db.system"); private static final AttributeKey<String> DB_SYSTEM = AttributeKey.stringKey("db.system");
private static final AttributeKey<String> DB_SYSTEM_NAME =
AttributeKey.stringKey("db.system.name");
private static final AttributeKey<String> DB_STATEMENT = AttributeKey.stringKey("db.statement"); private static final AttributeKey<String> DB_STATEMENT = AttributeKey.stringKey("db.statement");
private static final AttributeKey<String> DB_QUERY_TEXT = AttributeKey.stringKey("db.query.text");
private static final AttributeKey<Long> DB_REDIS_DATABASE_INDEX = private static final AttributeKey<Long> DB_REDIS_DATABASE_INDEX =
AttributeKey.longKey("db.redis.database_index"); AttributeKey.longKey("db.redis.database_index");
// copied from DbIncubatingAttributes.DbSystemIncubatingValues // copied from DbIncubatingAttributes.DbSystemIncubatingValues

2
instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceClientTest.java
View File

@ -6,7 +6,7 @@
package io.opentelemetry.instrumentation.lettuce.v5_1; package io.opentelemetry.instrumentation.lettuce.v5_1;
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_NAMESPACE; import static io.opentelemetry.semconv.DbAttributes.DB_NAMESPACE;
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_REDIS_DATABASE_INDEX; import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_REDIS_DATABASE_INDEX;
import io.lettuce.core.RedisClient; import io.lettuce.core.RedisClient;

4
instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceSyncClientTest.java
View File

@ -9,15 +9,15 @@ import static io.opentelemetry.instrumentation.testing.junit.db.DbClientMetricsT
import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStable; import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStable;
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies;
import static io.opentelemetry.semconv.DbAttributes.DB_NAMESPACE;
import static io.opentelemetry.semconv.DbAttributes.DB_SYSTEM_NAME;
import static io.opentelemetry.semconv.NetworkAttributes.NETWORK_PEER_ADDRESS; import static io.opentelemetry.semconv.NetworkAttributes.NETWORK_PEER_ADDRESS;
import static io.opentelemetry.semconv.NetworkAttributes.NETWORK_PEER_PORT; import static io.opentelemetry.semconv.NetworkAttributes.NETWORK_PEER_PORT;
import static io.opentelemetry.semconv.NetworkAttributes.NETWORK_TYPE; import static io.opentelemetry.semconv.NetworkAttributes.NETWORK_TYPE;
import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS; import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS;
import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT; 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_STATEMENT;
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SYSTEM; 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.nio.charset.StandardCharsets.UTF_8;
import static java.util.Arrays.asList; import static java.util.Arrays.asList;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;

3
instrumentation/mongo/mongo-3.1/library/src/main/java/io/opentelemetry/instrumentation/mongo/v3_1/MongoAttributesExtractor.java
View File

@ -7,6 +7,7 @@ package io.opentelemetry.instrumentation.mongo.v3_1;
import static io.opentelemetry.instrumentation.api.internal.SemconvStability.emitOldDatabaseSemconv; import static io.opentelemetry.instrumentation.api.internal.SemconvStability.emitOldDatabaseSemconv;
import static io.opentelemetry.instrumentation.api.internal.SemconvStability.emitStableDatabaseSemconv; import static io.opentelemetry.instrumentation.api.internal.SemconvStability.emitStableDatabaseSemconv;
import static io.opentelemetry.semconv.DbAttributes.DB_COLLECTION_NAME;
import static java.util.Arrays.asList; import static java.util.Arrays.asList;
import com.mongodb.event.CommandStartedEvent; import com.mongodb.event.CommandStartedEvent;
@ -21,8 +22,6 @@ import org.bson.BsonValue;
class MongoAttributesExtractor implements AttributesExtractor<CommandStartedEvent, Void> { class MongoAttributesExtractor implements AttributesExtractor<CommandStartedEvent, Void> {
// copied from DbIncubatingAttributes // copied from DbIncubatingAttributes
private static final AttributeKey<String> DB_COLLECTION_NAME =
AttributeKey.stringKey("db.collection.name");
private static final AttributeKey<String> DB_MONGODB_COLLECTION = private static final AttributeKey<String> DB_MONGODB_COLLECTION =
AttributeKey.stringKey("db.mongodb.collection"); AttributeKey.stringKey("db.mongodb.collection");

8
instrumentation/vertx/vertx-redis-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/redis/VertxRedisClientTest.java
View File

@ -7,18 +7,18 @@ package io.opentelemetry.javaagent.instrumentation.vertx.v4_0.redis;
import static io.opentelemetry.instrumentation.api.internal.SemconvStability.emitStableDatabaseSemconv; import static io.opentelemetry.instrumentation.api.internal.SemconvStability.emitStableDatabaseSemconv;
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
import static io.opentelemetry.semconv.DbAttributes.DB_NAMESPACE;
import static io.opentelemetry.semconv.DbAttributes.DB_OPERATION_NAME;
import static io.opentelemetry.semconv.DbAttributes.DB_QUERY_TEXT;
import static io.opentelemetry.semconv.DbAttributes.DB_SYSTEM_NAME;
import static io.opentelemetry.semconv.NetworkAttributes.NETWORK_PEER_ADDRESS; import static io.opentelemetry.semconv.NetworkAttributes.NETWORK_PEER_ADDRESS;
import static io.opentelemetry.semconv.NetworkAttributes.NETWORK_PEER_PORT; import static io.opentelemetry.semconv.NetworkAttributes.NETWORK_PEER_PORT;
import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS; import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS;
import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT; 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_OPERATION; import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION;
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION_NAME;
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_QUERY_TEXT;
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_REDIS_DATABASE_INDEX; 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_STATEMENT;
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SYSTEM; 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 static org.assertj.core.api.Assertions.assertThat;
import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.api.trace.SpanKind;

4
licenses/licenses.md generated
View File

@ -174,11 +174,11 @@
> - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java-contrib](https://github.com/open-telemetry/opentelemetry-java-contrib) > - **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) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
**40** **Group:** `io.opentelemetry.semconv` **Name:** `opentelemetry-semconv` **Version:** `1.32.0` **40** **Group:** `io.opentelemetry.semconv` **Name:** `opentelemetry-semconv` **Version:** `1.34.0`
> - **POM Project URL**: [https://github.com/open-telemetry/semantic-conventions-java](https://github.com/open-telemetry/semantic-conventions-java) > - **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) > - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
**41** **Group:** `io.opentelemetry.semconv` **Name:** `opentelemetry-semconv-incubating` **Version:** `1.32.0-alpha` **41** **Group:** `io.opentelemetry.semconv` **Name:** `opentelemetry-semconv-incubating` **Version:** `1.34.0-alpha`
> - **POM Project URL**: [https://github.com/open-telemetry/semantic-conventions-java](https://github.com/open-telemetry/semantic-conventions-java) > - **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) > - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)

2
testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/db/DbClientMetricsTestUtil.java
View File

@ -7,7 +7,7 @@ package io.opentelemetry.instrumentation.testing.junit.db;
import static io.opentelemetry.instrumentation.api.internal.SemconvStability.emitStableDatabaseSemconv; import static io.opentelemetry.instrumentation.api.internal.SemconvStability.emitStableDatabaseSemconv;
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SYSTEM_NAME; import static io.opentelemetry.semconv.DbAttributes.DB_SYSTEM_NAME;
import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.common.AttributeKey;
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;

13
testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/db/SemconvStabilityUtil.java
View File

@ -5,6 +5,11 @@
package io.opentelemetry.instrumentation.testing.junit.db; package io.opentelemetry.instrumentation.testing.junit.db;
import static io.opentelemetry.semconv.DbAttributes.DB_COLLECTION_NAME;
import static io.opentelemetry.semconv.DbAttributes.DB_NAMESPACE;
import static io.opentelemetry.semconv.DbAttributes.DB_OPERATION_NAME;
import static io.opentelemetry.semconv.DbAttributes.DB_QUERY_TEXT;
import static io.opentelemetry.semconv.DbAttributes.DB_SYSTEM_NAME;
import static io.opentelemetry.semconv.incubating.CassandraIncubatingAttributes.CASSANDRA_CONSISTENCY_LEVEL; 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_DC;
import static io.opentelemetry.semconv.incubating.CassandraIncubatingAttributes.CASSANDRA_COORDINATOR_ID; import static io.opentelemetry.semconv.incubating.CassandraIncubatingAttributes.CASSANDRA_COORDINATOR_ID;
@ -24,7 +29,6 @@ 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_SQL_TABLE;
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_STATEMENT; 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;
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SYSTEM_NAME;
import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.common.AttributeKey;
import io.opentelemetry.instrumentation.api.internal.SemconvStability; import io.opentelemetry.instrumentation.api.internal.SemconvStability;
@ -34,13 +38,6 @@ import java.util.Map;
// until old database semconv are dropped in 3.0 // until old database semconv are dropped in 3.0
public class SemconvStabilityUtil { public class SemconvStabilityUtil {
private static final AttributeKey<String> DB_NAMESPACE = AttributeKey.stringKey("db.namespace");
private static final AttributeKey<String> DB_QUERY_TEXT = AttributeKey.stringKey("db.query.text");
private static final AttributeKey<String> DB_OPERATION_NAME =
AttributeKey.stringKey("db.operation.name");
private static final AttributeKey<String> DB_COLLECTION_NAME =
AttributeKey.stringKey("db.collection.name");
private static final Map<AttributeKey<?>, AttributeKey<?>> oldToNewMap = buildMap(); private static final Map<AttributeKey<?>, AttributeKey<?>> oldToNewMap = buildMap();
@SuppressWarnings("deprecation") // using deprecated semconv @SuppressWarnings("deprecation") // using deprecated semconv