Skip to content

Commit 418b8a2

Browse files
committed
Add default implementation for getDbSystem() and fix nullable handling
1 parent 1d8ba85 commit 418b8a2

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,11 @@ static <REQUEST, RESPONSE> void onStartCommon(
7474
DbClientAttributesGetter<REQUEST, RESPONSE> getter,
7575
REQUEST request) {
7676
if (SemconvStability.emitStableDatabaseSemconv()) {
77+
String dbSystemName = getter.getDbSystemName(request);
7778
internalSet(
7879
attributes,
7980
DB_SYSTEM_NAME,
80-
SemconvStability.stableDbSystemName(getter.getDbSystem(request)));
81+
dbSystemName != null ? SemconvStability.stableDbSystemName(dbSystemName) : null);
8182
internalSet(attributes, DB_NAMESPACE, getter.getDbNamespace(request));
8283
internalSet(attributes, DB_QUERY_TEXT, getter.getDbQueryText(request));
8384
internalSet(attributes, DB_OPERATION_NAME, getter.getDbOperationName(request));

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@ public interface DbClientCommonAttributesGetter<REQUEST, RESPONSE> {
1919
* @deprecated Use {@link DbClientAttributesGetter#getDbSystemName} instead.
2020
*/
2121
@Deprecated
22-
String getDbSystem(REQUEST request);
22+
@Nullable
23+
default String getDbSystem(REQUEST request) {
24+
return null;
25+
}
2326

2427
/**
2528
* @deprecated There is no replacement at this time.
@@ -35,7 +38,9 @@ default String getUser(REQUEST request) {
3538
*/
3639
@Deprecated
3740
@Nullable
38-
String getDbNamespace(REQUEST request);
41+
default String getDbNamespace(REQUEST request) {
42+
return null;
43+
}
3944

4045
/**
4146
* @deprecated There is no replacement at this time.

instrumentation/jdbc/library/src/main/java/io/opentelemetry/instrumentation/jdbc/internal/JdbcAttributesGetter.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ public String getUser(DbRequest request) {
3333
return request.getDbInfo().getUser();
3434
}
3535

36+
@SuppressWarnings("deprecation") // overriding deprecated method from parent interface
3637
@Nullable
3738
@Override
3839
public String getDbNamespace(DbRequest request) {

0 commit comments

Comments
 (0)