Skip to content

Use TagExtractor for JDBC connection-info tags (canary) #11820

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

Draft
dougqh wants to merge 2 commits into
base: dougqh/tag-extractor-api
Choose a base branch
from
+41 −9
Draft

Use TagExtractor for JDBC connection-info tags (canary) #11820

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
ccc7e0d
Use TagExtractor for JDBC connection-info tags (canary)
dougqh Jul 1, 2026
56d280d
Promote JDBC CONNECTION_INFO_EXTRACTOR to a named singleton class
dougqh Jul 1, 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
40 changes: 40 additions & 0 deletions ...tation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/ConnectionInfoExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
package datadog.trace.instrumentation.jdbc;

import static datadog.trace.bootstrap.instrumentation.api.Tags.DB_POOL_NAME;
import static datadog.trace.bootstrap.instrumentation.api.Tags.DB_SCHEMA;
import static datadog.trace.bootstrap.instrumentation.api.Tags.DB_WAREHOUSE;

import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
import datadog.trace.bootstrap.instrumentation.api.TagExtractor;
import datadog.trace.bootstrap.instrumentation.jdbc.DBInfo;

/**
* Named singleton {@link TagExtractor} for the pure JDBC connection tags (warehouse / schema /
* pool) — no derivation, no side-effects.
*
* <p>Promoted from an inline lambda in {@link JDBCDecorator} to a named class so it can be
* referenced by name at call sites ({@code span.setTags(dbInfo, ConnectionInfoExtractor.INSTANCE)})
* and composed with other extractors. Non-capturing and stateless — the single {@link #INSTANCE} is
* effectively a static function object, so a monomorphic call site inlines it away.
* Behavior-identical to the previous inline {@code setTagIfPresent} block. ({@code db.type} /
* instance / hostname stay in the decorator for now: their values feed service-name/naming
* derivation, a later declarative step.)
*/
public final class ConnectionInfoExtractor implements TagExtractor<DBInfo> {
public static final ConnectionInfoExtractor INSTANCE = new ConnectionInfoExtractor();

private ConnectionInfoExtractor() {}

@Override
public void extract(final DBInfo info, final AgentSpan span) {
setTagIfPresent(span, DB_WAREHOUSE, info.getWarehouse());
setTagIfPresent(span, DB_SCHEMA, info.getSchema());
setTagIfPresent(span, DB_POOL_NAME, info.getPoolName());
}

private static void setTagIfPresent(final AgentSpan span, final String key, final String value) {
if (value != null && !value.isEmpty()) {
span.setTag(key, value);
}
}
}
10 changes: 1 addition & 9 deletions .../instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/JDBCDecorator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,19 +147,11 @@ protected String dbHostname(final DBInfo info) {
return info.getHost();
}

private void setTagIfPresent(final AgentSpan span, final String key, final String value) {
if (value != null && !value.isEmpty()) {
span.setTag(key, value);
}
}

public AgentSpan onConnection(final AgentSpan span, DBInfo dbInfo) {
if (dbInfo != null) {
processDatabaseType(span, dbInfo.getType());

setTagIfPresent(span, DB_WAREHOUSE, dbInfo.getWarehouse());
setTagIfPresent(span, DB_SCHEMA, dbInfo.getSchema());
setTagIfPresent(span, DB_POOL_NAME, dbInfo.getPoolName());
span.setTags(dbInfo, ConnectionInfoExtractor.INSTANCE);
}
return super.onConnection(span, dbInfo);
}
Expand Down
Loading