Skip to content

DbInfo simplification #16248

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
laurit merged 2 commits into from
Feb 25, 2026
Merged

DbInfo simplification #16248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
61d4637
DbInfo simplification
trask Feb 21, 2026
11ce454
Merge branch 'main' into small-db-info-prefactor
trask Feb 23, 2026
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
3 changes: 1 addition & 2 deletions .../java/io/opentelemetry/instrumentation/jdbc/internal/DataSourceDbAttributesExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ public void onEnd(
}

private static String getName(DbInfo dbInfo) {
String name = dbInfo.getName();
return name == null ? dbInfo.getDb() : name;
return dbInfo.getName();
}
}
4 changes: 1 addition & 3 deletions ...ry/src/main/java/io/opentelemetry/instrumentation/jdbc/internal/JdbcAttributesGetter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
package io.opentelemetry.instrumentation.jdbc.internal;

import io.opentelemetry.instrumentation.api.incubator.semconv.db.SqlClientAttributesGetter;
import io.opentelemetry.instrumentation.jdbc.internal.dbinfo.DbInfo;
import java.sql.SQLException;
import java.util.Collection;
import java.util.Map;
Expand Down Expand Up @@ -36,8 +35,7 @@ public String getUser(DbRequest request) {
@Nullable
@Override
public String getDbNamespace(DbRequest request) {
DbInfo dbInfo = request.getDbInfo();
return dbInfo.getName() == null ? dbInfo.getDb() : dbInfo.getName();
return request.getDbInfo().getName();
}

@Deprecated // to be removed in 3.0
Expand Down
36 changes: 20 additions & 16 deletions ...src/main/java/io/opentelemetry/instrumentation/jdbc/internal/JdbcConnectionUrlParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ DbInfo.Builder doParse(String jdbcUrl, DbInfo.Builder builder) {
path = path.substring(1);
}
if (!path.isEmpty()) {
builder.db(path);
builder.name(path);
}
if (uri.getHost() != null) {
builder.host(uri.getHost());
Expand Down Expand Up @@ -92,13 +92,6 @@ DbInfo.Builder doParse(String jdbcUrl, DbInfo.Builder builder) {
}

String[] split = jdbcUrl.split(";", 2);
if (split.length > 1) {
Map<String, String> props = splitQuery(split[1], ";");
populateStandardProperties(builder, props);
if (props.containsKey("instance")) {
builder.name(props.get("instance"));
}
}

String urlServerName = split[0].substring(hostIndex + 17);
if (!urlServerName.isEmpty()) {
Expand All @@ -107,10 +100,18 @@ DbInfo.Builder doParse(String jdbcUrl, DbInfo.Builder builder) {

int databaseLoc = serverName.indexOf("/");
if (databaseLoc > 1) {
builder.db(serverName.substring(databaseLoc + 1));
builder.name(serverName.substring(databaseLoc + 1));
serverName = serverName.substring(0, databaseLoc);
}

if (split.length > 1) {
Map<String, String> props = splitQuery(split[1], ";");
populateStandardProperties(builder, props);
if (props.containsKey("instance")) {
builder.name(props.get("instance"));
}
}

int portLoc = serverName.indexOf(":");
if (portLoc > 1) {
builder.port(Integer.parseInt(serverName.substring(portLoc + 1)));
Expand Down Expand Up @@ -295,9 +296,9 @@ DbInfo.Builder doParse(String jdbcUrl, DbInfo.Builder builder) {

if (paramLoc > 0) {
populateStandardProperties(builder, splitQuery(jdbcUrl.substring(paramLoc + 1), "&"));
builder.db(jdbcUrl.substring(dbLoc + 1, paramLoc));
builder.name(jdbcUrl.substring(dbLoc + 1, paramLoc));
} else {
builder.db(jdbcUrl.substring(dbLoc + 1));
builder.name(jdbcUrl.substring(dbLoc + 1));
}

if (portLoc > 0) {
Expand Down Expand Up @@ -331,9 +332,9 @@ DbInfo.Builder doParse(String jdbcUrl, DbInfo.Builder builder) {

if (paramLoc > 0) {
populateStandardProperties(builder, splitQuery(jdbcUrl.substring(paramLoc + 1), "&"));
builder.db(jdbcUrl.substring(dbLoc + 1, paramLoc));
builder.name(jdbcUrl.substring(dbLoc + 1, paramLoc));
} else if (dbLoc != -1) {
builder.db(jdbcUrl.substring(dbLoc + 1));
builder.name(jdbcUrl.substring(dbLoc + 1));
}

if (jdbcUrl.startsWith("address=")) {
Expand Down Expand Up @@ -809,7 +810,10 @@ DbInfo.Builder doParse(String jdbcUrl, DbInfo.Builder builder) {
if (host != null) {
builder.host(host);
}
return builder.name(instance);
if (instance != null) {
builder.name(instance);
}
return builder;
}
},

Expand Down Expand Up @@ -1117,10 +1121,10 @@ private static void populateStandardProperties(DbInfo.Builder builder, Map<?, ?>
}

if (props.containsKey("databasename")) {
builder.db((String) props.get("databasename"));
builder.name((String) props.get("databasename"));
}
if (props.containsKey("databaseName")) {
builder.db((String) props.get("databaseName"));
builder.name((String) props.get("databaseName"));
}

if (props.containsKey("servername")) {
Expand Down
6 changes: 0 additions & 6 deletions ...c/library/src/main/java/io/opentelemetry/instrumentation/jdbc/internal/dbinfo/DbInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,6 @@ public static DbInfo.Builder builder() {
@Nullable
public abstract String getName();

@Nullable
public abstract String getDb();

@Nullable
public abstract String getHost();

Expand All @@ -53,7 +50,6 @@ public Builder toBuilder() {
.shortUrl(getShortUrl())
.user(getUser())
.name(getName())
.db(getDb())
.host(getHost())
.port(getPort());
}
Expand All @@ -75,8 +71,6 @@ public abstract static class Builder {

public abstract Builder name(String name);

public abstract Builder db(String db);

public abstract Builder host(String host);

public abstract Builder port(Integer port);
Expand Down
3 changes: 1 addition & 2 deletions ...st/java/io/opentelemetry/instrumentation/jdbc/datasource/OpenTelemetryDataSourceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,7 @@ private static void assertDbInfo(DbInfo dbInfo) {
assertThat(dbInfo.getSubtype()).isNull();
assertThat(dbInfo.getShortUrl()).isEqualTo("postgresql://127.0.0.1:5432");
assertThat(dbInfo.getUser()).isNull();
assertThat(dbInfo.getName()).isNull();
assertThat(dbInfo.getDb()).isEqualTo("dbname");
assertThat(dbInfo.getName()).isEqualTo("dbname");
assertThat(dbInfo.getHost()).isEqualTo("127.0.0.1");
assertThat(dbInfo.getPort()).isEqualTo(5432);
}
Expand Down
Loading
Loading