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.

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

Add db.statement and user attributes to OpenTelemetry Plugin #3475

Merged
merged 3 commits into from
Jan 9, 2024
Merged

Add db.statement and user attributes to OpenTelemetry Plugin #3475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ebb252e
Update OTelSpan.java
Shaoranlaos Dec 21, 2023
3f51536
Update CHANGELOG.asciidoc
Shaoranlaos Dec 21, 2023
28b789d
Merge branch 'main' into master
Shaoranlaos Jan 5, 2024
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
5 changes: 5 additions & 0 deletions CHANGELOG.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,15 @@ Use subheadings with the "=====" level for adding notes for unreleased changes:

=== Unreleased

[float]
===== Features
* Added support for OpenTelementry Attributes db.statement and db.user - {pull}3475[#3475]

[float]
===== Bug fixes
* Fixed NPE in ApacheHttpClientApiAdapter#getHostName - {pull}3479[#3479]


[[release-notes-1.x]]
=== Java Agent version 1.x

Expand Down
6 changes: 5 additions & 1 deletion ...entelemetry-plugin/src/main/java/co/elastic/apm/agent/opentelemetry/tracing/OTelSpan.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,9 +169,13 @@ private void onSpanEnd(co.elastic.apm.agent.impl.transaction.Span s) {
type = "db";
subType = dbSystem;
String dbName = (String) attributes.get("db.name");
String dbStatement = (String) attributes.get("db.statement");
String dbUser = (String) attributes.get("db.user");
s.getContext().getDb()
.withType(subType)
.withInstance(dbName);
.withInstance(dbName)
.withStatement(dbStatement)
.withUser(dbUser);
s.getContext().getServiceTarget()
.withType(subType)
.withName(dbName);
Expand Down
Loading