Skip to content

Require db methods #14460

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 20, 2025
Merged

Require db methods #14460

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1d2cba4
require DB methods
zeitlinger Aug 18, 2025
448e8a4
require DB methods
zeitlinger Aug 18, 2025
695fb5a
fix
zeitlinger Aug 18, 2025
591159e
remove deprecated methods
zeitlinger Aug 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions ...pentelemetry/instrumentation/api/incubator/semconv/db/DbClientCommonAttributesGetter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,7 @@ default String getSystem(REQUEST request) {
return null;
}

// TODO: make this required to implement
@Nullable
default String getDbSystem(REQUEST request) {
return getSystem(request);
}
String getDbSystem(REQUEST request);

@Deprecated
@Nullable
Expand All @@ -37,11 +33,8 @@ default String getName(REQUEST request) {
return null;
}

// TODO: make this required to implement
@Nullable
default String getDbNamespace(REQUEST request) {
return getName(request);
}
String getDbNamespace(REQUEST request);

@Deprecated
@Nullable
Expand Down
9 changes: 1 addition & 8 deletions .../io/opentelemetry/instrumentation/api/incubator/semconv/db/SqlClientAttributesGetter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@

package io.opentelemetry.instrumentation.api.incubator.semconv.db;

import static java.util.Collections.emptySet;
import static java.util.Collections.singleton;

import java.util.Collection;
import java.util.Collections;
import java.util.Map;
Expand Down Expand Up @@ -58,11 +55,7 @@ default String getRawQueryText(REQUEST request) {
* <p>If {@code request} is not a batch query, then this method should return a collection with a
* single element.
*/
// TODO: make this required to implement
default Collection<String> getRawQueryTexts(REQUEST request) {
String rawQueryText = getRawQueryText(request);
return rawQueryText == null ? emptySet() : singleton(rawQueryText);
}
Collection<String> getRawQueryTexts(REQUEST request);

// TODO: make this required to implement
default Long getBatchSize(REQUEST request) {
Expand Down
9 changes: 9 additions & 0 deletions .../src/test/java/io/opentelemetry/instrumentation/api/internal/InstrumenterContextTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,15 @@ void testSqlSanitizer() {
String testQuery = "SELECT name FROM test WHERE id = 1";
SqlClientAttributesGetter<Object, Void> getter =
new SqlClientAttributesGetter<Object, Void>() {
@Override
public String getDbSystem(Object o) {
return "testdb";
}

@Override
public String getDbNamespace(Object o) {
return null;
}

@Override
public Collection<String> getRawQueryTexts(Object request) {
Expand Down
Loading