Skip to content

Commit 70588cd

Browse files
renovate[bot]otelbot[bot]lauritSylvainJuge
authored
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 <[email protected]> Co-authored-by: Lauri Tulmin <[email protected]> Co-authored-by: SylvainJuge <[email protected]>
1 parent 92b8554 commit 70588cd

File tree

29 files changed

+146
-166
lines changed

29 files changed

+146
-166
lines changed

‎dependencyManagement/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ val asmVersion = "9.8"
4444
val jmhVersion = "1.37"
4545
val mockitoVersion = "4.11.0"
4646
val slf4jVersion = "2.0.17"
47-
val semConvVersion = "1.32.0"
47+
val semConvVersion = "1.34.0"
4848
val semConvAlphaVersion = semConvVersion.replaceFirst("(-rc.*)?$".toRegex(), "-alpha$1")
4949

5050
val CORE_DEPENDENCIES = listOf(

‎instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientAttributesExtractor.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
package io.opentelemetry.instrumentation.api.incubator.semconv.db;
77

88
import static io.opentelemetry.instrumentation.api.internal.AttributesExtractorUtil.internalSet;
9+
import static io.opentelemetry.semconv.DbAttributes.DB_OPERATION_NAME;
10+
import static io.opentelemetry.semconv.DbAttributes.DB_QUERY_TEXT;
911

1012
import io.opentelemetry.api.common.AttributeKey;
1113
import io.opentelemetry.api.common.AttributesBuilder;
@@ -27,11 +29,7 @@ public final class DbClientAttributesExtractor<REQUEST, RESPONSE>
2729

2830
// copied from DbIncubatingAttributes
2931
private static final AttributeKey<String> DB_STATEMENT = AttributeKey.stringKey("db.statement");
30-
private static final AttributeKey<String> DB_QUERY_TEXT = AttributeKey.stringKey("db.query.text");
3132
static final AttributeKey<String> DB_OPERATION = AttributeKey.stringKey("db.operation");
32-
static final AttributeKey<String> DB_OPERATION_NAME = AttributeKey.stringKey("db.operation.name");
33-
static final AttributeKey<String> DB_RESPONSE_STATUS_CODE =
34-
AttributeKey.stringKey("db.response.status_code");
3533

3634
/** Creates the database client attributes extractor with default configuration. */
3735
public static <REQUEST, RESPONSE> AttributesExtractor<REQUEST, RESPONSE> create(

‎instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientCommonAttributesExtractor.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
package io.opentelemetry.instrumentation.api.incubator.semconv.db;
77

88
import static io.opentelemetry.instrumentation.api.internal.AttributesExtractorUtil.internalSet;
9+
import static io.opentelemetry.semconv.DbAttributes.DB_NAMESPACE;
10+
import static io.opentelemetry.semconv.DbAttributes.DB_RESPONSE_STATUS_CODE;
11+
import static io.opentelemetry.semconv.DbAttributes.DB_SYSTEM_NAME;
912
import static io.opentelemetry.semconv.ErrorAttributes.ERROR_TYPE;
1013

1114
import io.opentelemetry.api.common.AttributeKey;
@@ -23,15 +26,10 @@ abstract class DbClientCommonAttributesExtractor<
2326

2427
// copied from DbIncubatingAttributes
2528
private static final AttributeKey<String> DB_NAME = AttributeKey.stringKey("db.name");
26-
static final AttributeKey<String> DB_NAMESPACE = AttributeKey.stringKey("db.namespace");
2729
static final AttributeKey<String> DB_SYSTEM = AttributeKey.stringKey("db.system");
28-
public static final AttributeKey<String> DB_SYSTEM_NAME =
29-
AttributeKey.stringKey("db.system.name");
3030
private static final AttributeKey<String> DB_USER = AttributeKey.stringKey("db.user");
3131
private static final AttributeKey<String> DB_CONNECTION_STRING =
3232
AttributeKey.stringKey("db.connection_string");
33-
private static final AttributeKey<String> DB_RESPONSE_STATUS_CODE =
34-
AttributeKey.stringKey("db.response.status_code");
3533

3634
final GETTER getter;
3735

‎instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientMetricsAdvice.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
import io.opentelemetry.api.incubator.metrics.ExtendedDoubleHistogramBuilder;
1212
import io.opentelemetry.api.metrics.DoubleHistogramBuilder;
13+
import io.opentelemetry.semconv.DbAttributes;
1314
import io.opentelemetry.semconv.ErrorAttributes;
1415
import io.opentelemetry.semconv.NetworkAttributes;
1516
import io.opentelemetry.semconv.ServerAttributes;
@@ -28,11 +29,11 @@ static void applyClientDurationAdvice(DoubleHistogramBuilder builder) {
2829
((ExtendedDoubleHistogramBuilder) builder)
2930
.setAttributesAdvice(
3031
asList(
31-
DbClientCommonAttributesExtractor.DB_SYSTEM_NAME,
32-
SqlClientAttributesExtractor.DB_COLLECTION_NAME,
33-
DbClientCommonAttributesExtractor.DB_NAMESPACE,
34-
DbClientAttributesExtractor.DB_OPERATION_NAME,
35-
DbClientAttributesExtractor.DB_RESPONSE_STATUS_CODE,
32+
DbAttributes.DB_SYSTEM_NAME,
33+
DbAttributes.DB_COLLECTION_NAME,
34+
DbAttributes.DB_NAMESPACE,
35+
DbAttributes.DB_OPERATION_NAME,
36+
DbAttributes.DB_RESPONSE_STATUS_CODE,
3637
ErrorAttributes.ERROR_TYPE,
3738
NetworkAttributes.NETWORK_PEER_ADDRESS,
3839
NetworkAttributes.NETWORK_PEER_PORT,

‎instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/SqlClientAttributesExtractor.java

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66
package io.opentelemetry.instrumentation.api.incubator.semconv.db;
77

88
import static io.opentelemetry.instrumentation.api.internal.AttributesExtractorUtil.internalSet;
9+
import static io.opentelemetry.semconv.DbAttributes.DB_COLLECTION_NAME;
10+
import static io.opentelemetry.semconv.DbAttributes.DB_OPERATION_BATCH_SIZE;
11+
import static io.opentelemetry.semconv.DbAttributes.DB_OPERATION_NAME;
12+
import static io.opentelemetry.semconv.DbAttributes.DB_QUERY_TEXT;
913

1014
import io.opentelemetry.api.common.AttributeKey;
1115
import io.opentelemetry.api.common.AttributesBuilder;
@@ -32,14 +36,7 @@ public final class SqlClientAttributesExtractor<REQUEST, RESPONSE>
3236

3337
// copied from DbIncubatingAttributes
3438
private static final AttributeKey<String> DB_OPERATION = AttributeKey.stringKey("db.operation");
35-
private static final AttributeKey<String> DB_OPERATION_NAME =
36-
AttributeKey.stringKey("db.operation.name");
3739
private static final AttributeKey<String> DB_STATEMENT = AttributeKey.stringKey("db.statement");
38-
private static final AttributeKey<String> DB_QUERY_TEXT = AttributeKey.stringKey("db.query.text");
39-
static final AttributeKey<String> DB_COLLECTION_NAME =
40-
AttributeKey.stringKey("db.collection.name");
41-
private static final AttributeKey<Long> DB_OPERATION_BATCH_SIZE =
42-
AttributeKey.longKey("db.operation.batch.size");
4340
private static final AttributeKeyTemplate<String> DB_QUERY_PARAMETER =
4441
AttributeKeyTemplate.stringKeyTemplate("db.query.parameter");
4542

‎instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientAttributesExtractorTest.java

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import io.opentelemetry.context.Context;
1414
import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
1515
import io.opentelemetry.instrumentation.api.internal.SemconvStability;
16+
import io.opentelemetry.semconv.DbAttributes;
1617
import io.opentelemetry.semconv.incubating.DbIncubatingAttributes;
1718
import java.util.Collections;
1819
import java.util.HashMap;
@@ -85,15 +86,15 @@ void shouldExtractAllAvailableAttributes() {
8586
assertThat(startAttributes.build())
8687
.containsOnly(
8788
entry(DbIncubatingAttributes.DB_SYSTEM, "myDb"),
88-
entry(DbIncubatingAttributes.DB_SYSTEM_NAME, "myDb"),
89+
entry(DbAttributes.DB_SYSTEM_NAME, "myDb"),
8990
entry(DbIncubatingAttributes.DB_USER, "username"),
9091
entry(DbIncubatingAttributes.DB_NAME, "potatoes"),
9192
entry(DbIncubatingAttributes.DB_CONNECTION_STRING, "mydb:///potatoes"),
9293
entry(DbIncubatingAttributes.DB_STATEMENT, "SELECT * FROM potato"),
9394
entry(DbIncubatingAttributes.DB_OPERATION, "SELECT"),
94-
entry(DbIncubatingAttributes.DB_NAMESPACE, "potatoes"),
95-
entry(DbIncubatingAttributes.DB_QUERY_TEXT, "SELECT * FROM potato"),
96-
entry(DbIncubatingAttributes.DB_OPERATION_NAME, "SELECT"));
95+
entry(DbAttributes.DB_NAMESPACE, "potatoes"),
96+
entry(DbAttributes.DB_QUERY_TEXT, "SELECT * FROM potato"),
97+
entry(DbAttributes.DB_OPERATION_NAME, "SELECT"));
9798
} else if (SemconvStability.emitOldDatabaseSemconv()) {
9899
assertThat(startAttributes.build())
99100
.containsOnly(
@@ -106,10 +107,10 @@ void shouldExtractAllAvailableAttributes() {
106107
} else if (SemconvStability.emitStableDatabaseSemconv()) {
107108
assertThat(startAttributes.build())
108109
.containsOnly(
109-
entry(DbIncubatingAttributes.DB_SYSTEM_NAME, "myDb"),
110-
entry(DbIncubatingAttributes.DB_NAMESPACE, "potatoes"),
111-
entry(DbIncubatingAttributes.DB_QUERY_TEXT, "SELECT * FROM potato"),
112-
entry(DbIncubatingAttributes.DB_OPERATION_NAME, "SELECT"));
110+
entry(DbAttributes.DB_SYSTEM_NAME, "myDb"),
111+
entry(DbAttributes.DB_NAMESPACE, "potatoes"),
112+
entry(DbAttributes.DB_QUERY_TEXT, "SELECT * FROM potato"),
113+
entry(DbAttributes.DB_OPERATION_NAME, "SELECT"));
113114
}
114115

115116
assertThat(endAttributes.build().isEmpty()).isTrue();

‎instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientMetricsTest.java

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import io.opentelemetry.instrumentation.api.instrumenter.OperationListener;
2020
import io.opentelemetry.sdk.metrics.SdkMeterProvider;
2121
import io.opentelemetry.sdk.testing.exporter.InMemoryMetricReader;
22+
import io.opentelemetry.semconv.DbAttributes;
2223
import io.opentelemetry.semconv.ErrorAttributes;
2324
import io.opentelemetry.semconv.NetworkAttributes;
2425
import io.opentelemetry.semconv.ServerAttributes;
@@ -42,17 +43,17 @@ void collectsMetrics() {
4243

4344
Attributes operationAttributes =
4445
Attributes.builder()
45-
.put(DbClientCommonAttributesExtractor.DB_SYSTEM_NAME, "myDb")
46-
.put(SqlClientAttributesExtractor.DB_COLLECTION_NAME, "table")
47-
.put(DbClientCommonAttributesExtractor.DB_NAMESPACE, "potatoes")
48-
.put(DbClientAttributesExtractor.DB_OPERATION_NAME, "SELECT")
46+
.put(DbAttributes.DB_SYSTEM_NAME, "myDb")
47+
.put(DbAttributes.DB_COLLECTION_NAME, "table")
48+
.put(DbAttributes.DB_NAMESPACE, "potatoes")
49+
.put(DbAttributes.DB_OPERATION_NAME, "SELECT")
4950
.put(ServerAttributes.SERVER_ADDRESS, "localhost")
5051
.put(ServerAttributes.SERVER_PORT, 1234)
5152
.build();
5253

5354
Attributes responseAttributes =
5455
Attributes.builder()
55-
.put(DbClientAttributesExtractor.DB_RESPONSE_STATUS_CODE, "200")
56+
.put(DbAttributes.DB_RESPONSE_STATUS_CODE, "200")
5657
.put(ErrorAttributes.ERROR_TYPE, "400")
5758
.put(NetworkAttributes.NETWORK_PEER_ADDRESS, "1.2.3.4")
5859
.put(NetworkAttributes.NETWORK_PEER_PORT, 8080)
@@ -88,23 +89,13 @@ void collectsMetrics() {
8889
point
8990
.hasSum(0.15 /* seconds */)
9091
.hasAttributesSatisfying(
91-
equalTo(
92-
DbClientCommonAttributesExtractor.DB_SYSTEM_NAME,
93-
"myDb"),
94-
equalTo(
95-
DbClientCommonAttributesExtractor.DB_NAMESPACE,
96-
"potatoes"),
97-
equalTo(
98-
DbClientAttributesExtractor.DB_OPERATION_NAME,
99-
"SELECT"),
100-
equalTo(
101-
SqlClientAttributesExtractor.DB_COLLECTION_NAME,
102-
"table"),
92+
equalTo(DbAttributes.DB_SYSTEM_NAME, "myDb"),
93+
equalTo(DbAttributes.DB_NAMESPACE, "potatoes"),
94+
equalTo(DbAttributes.DB_OPERATION_NAME, "SELECT"),
95+
equalTo(DbAttributes.DB_COLLECTION_NAME, "table"),
10396
equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"),
10497
equalTo(ServerAttributes.SERVER_PORT, 1234),
105-
equalTo(
106-
DbClientAttributesExtractor.DB_RESPONSE_STATUS_CODE,
107-
"200"),
98+
equalTo(DbAttributes.DB_RESPONSE_STATUS_CODE, "200"),
10899
equalTo(ErrorAttributes.ERROR_TYPE, "400"),
109100
equalTo(
110101
NetworkAttributes.NETWORK_PEER_ADDRESS, "1.2.3.4"),

0 commit comments

Comments
 (0)