Skip to content

Commit 990b829

Browse files
heyamsheyams
committed
Use default method and only implement the new methods
1 parent e1a2c9a commit 990b829

File tree

28 files changed

+32
-613
lines changed

28 files changed

+32
-613
lines changed

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

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,26 @@ public interface DbClientAttributesGetter<REQUEST> extends DbClientCommonAttribu
2525
*/
2626
@Deprecated
2727
@Nullable
28-
String getStatement(REQUEST request);
28+
default String getStatement(REQUEST request) {
29+
return null;
30+
}
2931

3032
@Nullable
31-
String getDbQueryText(REQUEST request);
33+
default String getDbQueryText(REQUEST request) {
34+
return getStatement(request);
35+
}
3236

3337
/**
3438
* @deprecated Use {@link #getDbOperationName(REQUEST)} instead.
3539
*/
3640
@Deprecated
3741
@Nullable
38-
String getOperation(REQUEST request);
42+
default String getOperation(REQUEST request) {
43+
return null;
44+
}
3945

4046
@Nullable
41-
String getDbOperationName(REQUEST request);
47+
default String getDbOperationName(REQUEST request) {
48+
return getOperation(request);
49+
}
4250
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public void onStart(AttributesBuilder attributes, Context parentContext, REQUEST
4242
}
4343
if (SemconvStability.emitOldDatabaseSemconv()) {
4444
internalSet(attributes, DB_USER, getter.getUser(request));
45-
internalSet(attributes, DB_NAME, getter.getName(request));
45+
internalSet(attributes, DB_NAME, getter.getDbNamespace(request));
4646
internalSet(attributes, DB_CONNECTION_STRING, getter.getConnectionString(request));
4747
}
4848
internalSet(attributes, DB_SYSTEM, getter.getSystem(request));

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

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,14 @@ public interface DbClientCommonAttributesGetter<REQUEST> {
1212

1313
@Deprecated
1414
@Nullable
15-
String getSystem(REQUEST request);
15+
default String getSystem(REQUEST request) {
16+
return null;
17+
}
1618

1719
@Nullable
18-
String getDbSystem(REQUEST request);
20+
default String getDbSystem(REQUEST request) {
21+
return getSystem(request);
22+
}
1923

2024
@Deprecated
2125
@Nullable
@@ -26,10 +30,14 @@ public interface DbClientCommonAttributesGetter<REQUEST> {
2630
*/
2731
@Deprecated
2832
@Nullable
29-
String getName(REQUEST request);
33+
default String getName(REQUEST request) {
34+
return null;
35+
}
3036

3137
@Nullable
32-
String getDbNamespace(REQUEST request);
38+
default String getDbNamespace(REQUEST request) {
39+
return getName(request);
40+
}
3341

3442
@Deprecated
3543
@Nullable

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,12 @@ public interface SqlClientAttributesGetter<REQUEST>
2929
*/
3030
@Deprecated
3131
@Nullable
32-
String getRawStatement(REQUEST request);
32+
default String getRawStatement(REQUEST request) {
33+
return null;
34+
}
3335

3436
@Nullable
35-
String getRawQueryText(REQUEST request);
37+
default String getRawQueryText(REQUEST request) {
38+
return getRawStatement(request);
39+
}
3640
}

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,6 @@ class DbClientAttributesExtractorTest {
2525

2626
static final class TestAttributesGetter implements DbClientAttributesGetter<Map<String, String>> {
2727

28-
@Deprecated
29-
@Override
30-
public String getSystem(Map<String, String> map) {
31-
return map.get("db.system");
32-
}
33-
3428
@Nullable
3529
@Override
3630
public String getDbSystem(Map<String, String> map) {

‎instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraSqlAttributesGetter.java‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,6 @@
1111

1212
final class CassandraSqlAttributesGetter implements SqlClientAttributesGetter<CassandraRequest> {
1313

14-
@Deprecated
15-
@Override
16-
public String getSystem(CassandraRequest request) {
17-
return DbIncubatingAttributes.DbSystemValues.CASSANDRA;
18-
}
19-
2014
@Override
2115
public String getDbSystem(CassandraRequest cassandraRequest) {
2216
return DbIncubatingAttributes.DbSystemValues.CASSANDRA;
@@ -29,13 +23,6 @@ public String getUser(CassandraRequest request) {
2923
return null;
3024
}
3125

32-
@Deprecated
33-
@Override
34-
@Nullable
35-
public String getName(CassandraRequest request) {
36-
return request.getSession().getLoggedKeyspace();
37-
}
38-
3926
@Nullable
4027
@Override
4128
public String getDbNamespace(CassandraRequest request) {
@@ -49,13 +36,6 @@ public String getConnectionString(CassandraRequest request) {
4936
return null;
5037
}
5138

52-
@Deprecated
53-
@Override
54-
@Nullable
55-
public String getRawStatement(CassandraRequest request) {
56-
return request.getDbQueryText();
57-
}
58-
5939
@Override
6040
public String getRawQueryText(CassandraRequest request) {
6141
return request.getDbQueryText();

‎instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraSqlAttributesGetter.java‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,6 @@
1212

1313
final class CassandraSqlAttributesGetter implements SqlClientAttributesGetter<CassandraRequest> {
1414

15-
@Deprecated
16-
@Override
17-
public String getSystem(CassandraRequest request) {
18-
return DbIncubatingAttributes.DbSystemValues.CASSANDRA;
19-
}
20-
2115
@Override
2216
public String getDbSystem(CassandraRequest cassandraRequest) {
2317
return DbIncubatingAttributes.DbSystemValues.CASSANDRA;
@@ -30,13 +24,6 @@ public String getUser(CassandraRequest request) {
3024
return null;
3125
}
3226

33-
@Deprecated
34-
@Override
35-
@Nullable
36-
public String getName(CassandraRequest request) {
37-
return request.getSession().getKeyspace().map(CqlIdentifier::toString).orElse(null);
38-
}
39-
4027
@Nullable
4128
@Override
4229
public String getDbNamespace(CassandraRequest request) {
@@ -50,13 +37,6 @@ public String getConnectionString(CassandraRequest request) {
5037
return null;
5138
}
5239

53-
@Deprecated
54-
@Override
55-
@Nullable
56-
public String getRawStatement(CassandraRequest request) {
57-
return request.getDbQueryText();
58-
}
59-
6040
@Override
6141
public String getRawQueryText(CassandraRequest request) {
6242
return request.getDbQueryText();

‎instrumentation/cassandra/cassandra-4.4/library/src/main/java/io/opentelemetry/instrumentation/cassandra/v4_4/CassandraSqlAttributesGetter.java‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,6 @@ final class CassandraSqlAttributesGetter implements SqlClientAttributesGetter<Ca
1313
// copied from DbIncubatingAttributes.DbSystemValues
1414
private static final String CASSANDRA = "cassandra";
1515

16-
@Deprecated
17-
@Override
18-
public String getSystem(CassandraRequest request) {
19-
return CASSANDRA;
20-
}
21-
2216
@Override
2317
public String getDbSystem(CassandraRequest request) {
2418
return CASSANDRA;
@@ -31,13 +25,6 @@ public String getUser(CassandraRequest request) {
3125
return null;
3226
}
3327

34-
@Deprecated
35-
@Override
36-
@Nullable
37-
public String getName(CassandraRequest request) {
38-
return request.getSession().getKeyspace().map(CqlIdentifier::toString).orElse(null);
39-
}
40-
4128
@Nullable
4229
@Override
4330
public String getDbNamespace(CassandraRequest request) {
@@ -51,13 +38,6 @@ public String getConnectionString(CassandraRequest request) {
5138
return null;
5239
}
5340

54-
@Deprecated
55-
@Override
56-
@Nullable
57-
public String getRawStatement(CassandraRequest request) {
58-
return request.getDbQueryText();
59-
}
60-
6141
@Override
6242
public String getRawQueryText(CassandraRequest request) {
6343
return request.getDbQueryText();

‎instrumentation/clickhouse-client-0.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/ClickHouseAttributesGetter.java‎

Lines changed: 1 addition & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,6 @@
1010
import javax.annotation.Nullable;
1111

1212
final class ClickHouseAttributesGetter implements DbClientAttributesGetter<ClickHouseDbRequest> {
13-
@Deprecated
14-
@Nullable
15-
@Override
16-
public String getStatement(ClickHouseDbRequest request) {
17-
if (request.getSqlStatementInfo() == null) {
18-
return null;
19-
}
20-
return request.getSqlStatementInfo().getFullStatement();
21-
}
2213

2314
@Nullable
2415
@Override
@@ -29,16 +20,6 @@ public String getDbQueryText(ClickHouseDbRequest request) {
2920
return request.getSqlStatementInfo().getFullStatement();
3021
}
3122

32-
@Deprecated
33-
@Nullable
34-
@Override
35-
public String getOperation(ClickHouseDbRequest request) {
36-
if (request.getSqlStatementInfo() == null) {
37-
return null;
38-
}
39-
return request.getSqlStatementInfo().getOperation();
40-
}
41-
4223
@Nullable
4324
@Override
4425
public String getDbOperationName(ClickHouseDbRequest request) {
@@ -48,12 +29,6 @@ public String getDbOperationName(ClickHouseDbRequest request) {
4829
return request.getSqlStatementInfo().getOperation();
4930
}
5031

51-
@Deprecated
52-
@Override
53-
public String getSystem(ClickHouseDbRequest request) {
54-
return DbIncubatingAttributes.DbSystemValues.CLICKHOUSE;
55-
}
56-
5732
@Override
5833
public String getDbSystem(ClickHouseDbRequest request) {
5934
return DbIncubatingAttributes.DbSystemValues.CLICKHOUSE;
@@ -66,23 +41,16 @@ public String getUser(ClickHouseDbRequest request) {
6641
return null;
6742
}
6843

69-
@Deprecated
7044
@Nullable
7145
@Override
72-
public String getName(ClickHouseDbRequest request) {
46+
public String getDbNamespace(ClickHouseDbRequest request) {
7347
String dbName = request.getDbName();
7448
if (dbName == null || dbName.isEmpty()) {
7549
return null;
7650
}
7751
return dbName;
7852
}
7953

80-
@Nullable
81-
@Override
82-
public String getDbNamespace(ClickHouseDbRequest request) {
83-
return getName(request);
84-
}
85-
8654
@Deprecated
8755
@Nullable
8856
@Override

‎instrumentation/couchbase/couchbase-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseAttributesGetter.java‎

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,6 @@
1111

1212
final class CouchbaseAttributesGetter implements DbClientAttributesGetter<CouchbaseRequestInfo> {
1313

14-
@Deprecated
15-
@Override
16-
public String getSystem(CouchbaseRequestInfo couchbaseRequest) {
17-
return DbIncubatingAttributes.DbSystemValues.COUCHBASE;
18-
}
19-
2014
@Override
2115
public String getDbSystem(CouchbaseRequestInfo couchbaseRequest) {
2216
return DbIncubatingAttributes.DbSystemValues.COUCHBASE;
@@ -29,13 +23,6 @@ public String getUser(CouchbaseRequestInfo couchbaseRequest) {
2923
return null;
3024
}
3125

32-
@Deprecated
33-
@Override
34-
@Nullable
35-
public String getName(CouchbaseRequestInfo couchbaseRequest) {
36-
return couchbaseRequest.bucket();
37-
}
38-
3926
@Nullable
4027
@Override
4128
public String getDbNamespace(CouchbaseRequestInfo couchbaseRequest) {
@@ -49,26 +36,12 @@ public String getConnectionString(CouchbaseRequestInfo couchbaseRequest) {
4936
return null;
5037
}
5138

52-
@Deprecated
53-
@Override
54-
@Nullable
55-
public String getStatement(CouchbaseRequestInfo couchbaseRequest) {
56-
return couchbaseRequest.statement();
57-
}
58-
5939
@Nullable
6040
@Override
6141
public String getDbQueryText(CouchbaseRequestInfo couchbaseRequest) {
6242
return couchbaseRequest.statement();
6343
}
6444

65-
@Deprecated
66-
@Override
67-
@Nullable
68-
public String getOperation(CouchbaseRequestInfo couchbaseRequest) {
69-
return couchbaseRequest.operation();
70-
}
71-
7245
@Nullable
7346
@Override
7447
public String getDbOperationName(CouchbaseRequestInfo couchbaseRequest) {

0 commit comments

Comments
 (0)