Skip to content

fix: Trilogy only set db.instance.id attribute if there is a value #792

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
arielvalentin merged 2 commits into from
Jan 5, 2024
Merged

fix: Trilogy only set db.instance.id attribute if there is a value #792

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
81ffe08
Trilogy: only set `db.instance.id` if there is a value
bensheldon Jan 4, 2024
ca050bc
Remove `defined?` check and only use nil check
bensheldon 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
Prev Previous commit
Remove defined? check and only use nil check
  • Loading branch information
@bensheldon
bensheldon authored Jan 5, 2024
commit ca050bca187d36e3b413eb8e396e7b10f4badef3
2 changes: 1 addition & 1 deletion instrumentation/trilogy/lib/opentelemetry/instrumentation/trilogy/patches/client.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ def client_attributes(sql = nil)
attributes[::OpenTelemetry::SemanticConventions::Trace::DB_NAME] = database_name if database_name
attributes[::OpenTelemetry::SemanticConventions::Trace::DB_USER] = database_user if database_user
attributes[::OpenTelemetry::SemanticConventions::Trace::PEER_SERVICE] = config[:peer_service] unless config[:peer_service].nil?
attributes['db.instance.id'] = @connected_host if defined?(@connected_host) && @connected_host
attributes['db.instance.id'] = @connected_host unless @connected_host.nil?

if sql
case config[:db_statement]
Expand Down