Skip to content
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.

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

Bump Spring Boot to 3.4.0 #3939

Merged
merged 8 commits into from
Dec 2, 2024
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
support DB_QUERY_TEXT
adinauer committed Nov 28, 2024

Verified

This commit was signed with the committer’s verified signature.
ktwrd kate
commit 9a5dfc0ed525a681c1dd2b8d6de7c80f2b05a8ee
Original file line number Diff line number Diff line change
@@ -96,7 +96,14 @@ private OtelSpanInfo descriptionForHttpMethod(
private OtelSpanInfo descriptionForDbSystem(final @NotNull SpanData otelSpan) {
final @NotNull Attributes attributes = otelSpan.getAttributes();
@Nullable String dbStatement = attributes.get(DbIncubatingAttributes.DB_STATEMENT);
@NotNull String description = dbStatement != null ? dbStatement : otelSpan.getName();
return new OtelSpanInfo("db", description, TransactionNameSource.TASK);
if (dbStatement != null) {
return new OtelSpanInfo("db", dbStatement, TransactionNameSource.TASK);
}
@Nullable String dbQueryText = attributes.get(DbIncubatingAttributes.DB_QUERY_TEXT);
if (dbQueryText != null) {
return new OtelSpanInfo("db", dbQueryText, TransactionNameSource.TASK);
}

return new OtelSpanInfo("db", otelSpan.getName(), TransactionNameSource.TASK);
}
}