Skip to content

Commit 3bfeb81

Browse files
SylvainJugeSylvainJuge
committed
remove inlined values
1 parent 9b8732f commit 3bfeb81

File tree

10 files changed

+34
-46
lines changed

10 files changed

+34
-46
lines changed

‎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/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/SqlClientAttributesExtractorTest.java‎

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

88
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
9+
import static io.opentelemetry.semconv.DbAttributes.DB_OPERATION_BATCH_SIZE;
910
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_QUERY_PARAMETER;
1011
import static java.util.Collections.emptySet;
1112
import static java.util.Collections.singleton;
@@ -61,7 +62,7 @@ public String getConnectionString(Map<String, Object> map) {
6162

6263
@Override
6364
public Long getBatchSize(Map<String, Object> map) {
64-
return read(map, "db.operation.batch.size", Long.class);
65+
return read(map, DB_OPERATION_BATCH_SIZE.getKey(), Long.class);
6566
}
6667

6768
@SuppressWarnings("unchecked")
@@ -252,7 +253,7 @@ void shouldExtractSingleQueryBatchAttributes() {
252253
Map<String, Object> request = new HashMap<>();
253254
request.put("db.name", "potatoes");
254255
request.put("db.statements", singleton("INSERT INTO potato VALUES(?)"));
255-
request.put("db.operation.batch.size", 2L);
256+
request.put(DB_OPERATION_BATCH_SIZE.getKey(), 2L);
256257

257258
Context context = Context.root();
258259

@@ -278,7 +279,7 @@ void shouldExtractSingleQueryBatchAttributes() {
278279
entry(DbAttributes.DB_QUERY_TEXT, "INSERT INTO potato VALUES(?)"),
279280
entry(DbAttributes.DB_OPERATION_NAME, "BATCH INSERT"),
280281
entry(DbAttributes.DB_COLLECTION_NAME, "potato"),
281-
entry(DbAttributes.DB_OPERATION_BATCH_SIZE, 2L));
282+
entry(DB_OPERATION_BATCH_SIZE, 2L));
282283
} else if (SemconvStability.emitOldDatabaseSemconv()) {
283284
assertThat(startAttributes.build())
284285
.containsOnly(
@@ -293,7 +294,7 @@ void shouldExtractSingleQueryBatchAttributes() {
293294
entry(DbAttributes.DB_QUERY_TEXT, "INSERT INTO potato VALUES(?)"),
294295
entry(DbAttributes.DB_OPERATION_NAME, "BATCH INSERT"),
295296
entry(DbAttributes.DB_COLLECTION_NAME, "potato"),
296-
entry(DbAttributes.DB_OPERATION_BATCH_SIZE, 2L));
297+
entry(DB_OPERATION_BATCH_SIZE, 2L));
297298
}
298299

299300
assertThat(endAttributes.build().isEmpty()).isTrue();
@@ -307,7 +308,7 @@ void shouldExtractMultiQueryBatchAttributes() {
307308
request.put(
308309
"db.statements",
309310
Arrays.asList("INSERT INTO potato VALUES(1)", "INSERT INTO potato VALUES(2)"));
310-
request.put("db.operation.batch.size", 2L);
311+
request.put(DB_OPERATION_BATCH_SIZE.getKey(), 2L);
311312

312313
Context context = Context.root();
313314

@@ -330,7 +331,7 @@ void shouldExtractMultiQueryBatchAttributes() {
330331
entry(DbAttributes.DB_QUERY_TEXT, "INSERT INTO potato VALUES(?)"),
331332
entry(DbAttributes.DB_OPERATION_NAME, "BATCH INSERT"),
332333
entry(DbAttributes.DB_COLLECTION_NAME, "potato"),
333-
entry(DbAttributes.DB_OPERATION_BATCH_SIZE, 2L));
334+
entry(DB_OPERATION_BATCH_SIZE, 2L));
334335
} else if (SemconvStability.emitOldDatabaseSemconv()) {
335336
assertThat(startAttributes.build())
336337
.containsOnly(entry(DbIncubatingAttributes.DB_NAME, "potatoes"));
@@ -341,7 +342,7 @@ void shouldExtractMultiQueryBatchAttributes() {
341342
entry(DbAttributes.DB_QUERY_TEXT, "INSERT INTO potato VALUES(?)"),
342343
entry(DbAttributes.DB_OPERATION_NAME, "BATCH INSERT"),
343344
entry(DbAttributes.DB_COLLECTION_NAME, "potato"),
344-
entry(DbAttributes.DB_OPERATION_BATCH_SIZE, 2L));
345+
entry(DB_OPERATION_BATCH_SIZE, 2L));
345346
}
346347

347348
assertThat(endAttributes.build().isEmpty()).isTrue();
@@ -353,7 +354,7 @@ void shouldIgnoreBatchSizeOne() {
353354
Map<String, Object> request = new HashMap<>();
354355
request.put("db.name", "potatoes");
355356
request.put("db.statements", singleton("INSERT INTO potato VALUES(?)"));
356-
request.put("db.operation.batch.size", 1L);
357+
request.put(DB_OPERATION_BATCH_SIZE.getKey(), 1L);
357358

358359
Context context = Context.root();
359360

@@ -446,7 +447,7 @@ void shouldNotExtractQueryParametersForBatch() {
446447
Map<String, Object> request = new HashMap<>();
447448
request.put("db.name", "potatoes");
448449
request.put("db.statements", singleton("INSERT INTO potato VALUES(?)"));
449-
request.put("db.operation.batch.size", 2L);
450+
request.put(DB_OPERATION_BATCH_SIZE.getKey(), 2L);
450451
request.put("db.query.parameter", Collections.singletonMap("0", "1"));
451452

452453
Context context = Context.root();

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,14 @@
1717
import java.util.List;
1818
import javax.annotation.Nullable;
1919

20+
import static io.opentelemetry.semconv.DbAttributes.DB_OPERATION_NAME;
21+
import static io.opentelemetry.semconv.DbAttributes.DB_SYSTEM_NAME;
22+
2023
class DynamoDbAttributesExtractor implements AttributesExtractor<Request<?>, Response<?>> {
2124

2225
// copied from DbIncubatingAttributes
2326
private static final AttributeKey<String> DB_OPERATION = AttributeKey.stringKey("db.operation");
24-
private static final AttributeKey<String> DB_OPERATION_NAME =
25-
AttributeKey.stringKey("db.operation.name");
2627
private static final AttributeKey<String> DB_SYSTEM = AttributeKey.stringKey("db.system");
27-
private static final AttributeKey<String> DB_SYSTEM_NAME =
28-
AttributeKey.stringKey("db.system.name");
2928
// copied from AwsIncubatingAttributes
3029
private static final AttributeKey<List<String>> AWS_DYNAMODB_TABLE_NAMES =
3130
AttributeKey.stringArrayKey("aws.dynamodb.table_names");

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,14 @@
1515
import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
1616
import software.amazon.awssdk.core.interceptor.SdkExecutionAttribute;
1717

18+
import static io.opentelemetry.semconv.DbAttributes.DB_OPERATION_NAME;
19+
import static io.opentelemetry.semconv.DbAttributes.DB_SYSTEM_NAME;
20+
1821
class DynamoDbAttributesExtractor implements AttributesExtractor<ExecutionAttributes, Response> {
1922

2023
// copied from DbIncubatingAttributes
2124
private static final AttributeKey<String> DB_OPERATION = AttributeKey.stringKey("db.operation");
22-
private static final AttributeKey<String> DB_OPERATION_NAME =
23-
AttributeKey.stringKey("db.operation.name");
2425
private static final AttributeKey<String> DB_SYSTEM = AttributeKey.stringKey("db.system");
25-
private static final AttributeKey<String> DB_SYSTEM_NAME =
26-
AttributeKey.stringKey("db.system.name");
2726

2827
// copied from DbIncubatingAttributes.DbSystemIncubatingValues
2928
private static final String DYNAMODB = "dynamodb";

‎instrumentation/jdbc/library/src/main/java/io/opentelemetry/instrumentation/jdbc/internal/DataSourceDbAttributesExtractor.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
package io.opentelemetry.instrumentation.jdbc.internal;
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_SYSTEM_NAME;
911

1012
import io.opentelemetry.api.common.AttributeKey;
1113
import io.opentelemetry.api.common.AttributesBuilder;
@@ -21,10 +23,7 @@ enum DataSourceDbAttributesExtractor implements AttributesExtractor<DataSource,
2123

2224
// copied from DbIncubatingAttributes
2325
private static final AttributeKey<String> DB_NAME = AttributeKey.stringKey("db.name");
24-
private static final AttributeKey<String> DB_NAMESPACE = AttributeKey.stringKey("db.namespace");
2526
private static final AttributeKey<String> DB_SYSTEM = AttributeKey.stringKey("db.system");
26-
private static final AttributeKey<String> DB_SYSTEM_NAME =
27-
AttributeKey.stringKey("db.system.name");
2827
private static final AttributeKey<String> DB_USER = AttributeKey.stringKey("db.user");
2928
private static final AttributeKey<String> DB_CONNECTION_STRING =
3029
AttributeKey.stringKey("db.connection_string");

‎instrumentation/jdbc/library/src/main/java/io/opentelemetry/instrumentation/jdbc/internal/TransactionAttributeExtractor.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
package io.opentelemetry.instrumentation.jdbc.internal;
77

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

1011
import io.opentelemetry.api.common.AttributeKey;
1112
import io.opentelemetry.api.common.AttributesBuilder;
@@ -19,8 +20,6 @@ enum TransactionAttributeExtractor implements AttributesExtractor<DbRequest, Voi
1920

2021
// copied from DbIncubatingAttributes
2122
private static final AttributeKey<String> DB_OPERATION = AttributeKey.stringKey("db.operation");
22-
private static final AttributeKey<String> DB_OPERATION_NAME =
23-
AttributeKey.stringKey("db.operation.name");
2423

2524
@Override
2625
public void onStart(AttributesBuilder attributes, Context parentContext, DbRequest request) {

‎instrumentation/lettuce/lettuce-5.1/library/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/OpenTelemetryTracing.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
package io.opentelemetry.instrumentation.lettuce.v5_1;
77

88
import static io.opentelemetry.instrumentation.lettuce.common.LettuceArgSplitter.splitArgs;
9+
import static io.opentelemetry.semconv.DbAttributes.DB_NAMESPACE;
10+
import static io.opentelemetry.semconv.DbAttributes.DB_QUERY_TEXT;
11+
import static io.opentelemetry.semconv.DbAttributes.DB_SYSTEM_NAME;
912

1013
import com.google.errorprone.annotations.CanIgnoreReturnValue;
1114
import io.lettuce.core.output.CommandOutput;
@@ -42,10 +45,7 @@ final class OpenTelemetryTracing implements Tracing {
4245

4346
// copied from DbIncubatingAttributes
4447
private static final AttributeKey<String> DB_SYSTEM = AttributeKey.stringKey("db.system");
45-
private static final AttributeKey<String> DB_SYSTEM_NAME =
46-
AttributeKey.stringKey("db.system.name");
4748
private static final AttributeKey<String> DB_STATEMENT = AttributeKey.stringKey("db.statement");
48-
private static final AttributeKey<String> DB_QUERY_TEXT = AttributeKey.stringKey("db.query.text");
4949
private static final AttributeKey<Long> DB_REDIS_DATABASE_INDEX =
5050
AttributeKey.longKey("db.redis.database_index");
5151
// copied from DbIncubatingAttributes.DbSystemIncubatingValues
@@ -349,7 +349,7 @@ public synchronized Tracer.Span tag(String key, String value) {
349349
argsString = value;
350350
return this;
351351
}
352-
if (key.equals("db.namespace") && SemconvStability.emitOldDatabaseSemconv()) {
352+
if (key.equals(DB_NAMESPACE.getKey()) && SemconvStability.emitOldDatabaseSemconv()) {
353353
// map backwards into db.redis.database.index
354354
long val = Long.parseLong(value);
355355
if (span != null) {

‎instrumentation/mongo/mongo-3.1/library/src/main/java/io/opentelemetry/instrumentation/mongo/v3_1/MongoAttributesExtractor.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
import static io.opentelemetry.instrumentation.api.internal.SemconvStability.emitOldDatabaseSemconv;
99
import static io.opentelemetry.instrumentation.api.internal.SemconvStability.emitStableDatabaseSemconv;
10+
import static io.opentelemetry.semconv.DbAttributes.DB_COLLECTION_NAME;
1011
import static java.util.Arrays.asList;
1112

1213
import com.mongodb.event.CommandStartedEvent;
@@ -21,8 +22,6 @@
2122

2223
class MongoAttributesExtractor implements AttributesExtractor<CommandStartedEvent, Void> {
2324
// copied from DbIncubatingAttributes
24-
private static final AttributeKey<String> DB_COLLECTION_NAME =
25-
AttributeKey.stringKey("db.collection.name");
2625
private static final AttributeKey<String> DB_MONGODB_COLLECTION =
2726
AttributeKey.stringKey("db.mongodb.collection");
2827

‎testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/db/SemconvStabilityUtil.java‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@
2525
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SQL_TABLE;
2626
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_STATEMENT;
2727
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SYSTEM;
28+
import static io.opentelemetry.semconv.DbAttributes.DB_NAMESPACE;
29+
import static io.opentelemetry.semconv.DbAttributes.DB_OPERATION_NAME;
30+
import static io.opentelemetry.semconv.DbAttributes.DB_COLLECTION_NAME;
31+
import static io.opentelemetry.semconv.DbAttributes.DB_QUERY_TEXT;
2832

2933
import io.opentelemetry.api.common.AttributeKey;
3034
import io.opentelemetry.instrumentation.api.internal.SemconvStability;
@@ -34,13 +38,6 @@
3438
// until old database semconv are dropped in 3.0
3539
public class SemconvStabilityUtil {
3640

37-
private static final AttributeKey<String> DB_NAMESPACE = AttributeKey.stringKey("db.namespace");
38-
private static final AttributeKey<String> DB_QUERY_TEXT = AttributeKey.stringKey("db.query.text");
39-
private static final AttributeKey<String> DB_OPERATION_NAME =
40-
AttributeKey.stringKey("db.operation.name");
41-
private static final AttributeKey<String> DB_COLLECTION_NAME =
42-
AttributeKey.stringKey("db.collection.name");
43-
4441
private static final Map<AttributeKey<?>, AttributeKey<?>> oldToNewMap = buildMap();
4542

4643
@SuppressWarnings("deprecation") // using deprecated semconv

0 commit comments

Comments
 (0)