Skip to content

feat!(trilogy): change db.mysql.instance.address to db.instance.id #758

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 5 commits into from
Dec 8, 2023
Merged

feat!(trilogy): change db.mysql.instance.address to db.instance.id #758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
99842ba
refactor(trilogy): change db.mysql.instance.address to db.instance.id
dlahn Dec 7, 2023
fb40a01
Merge branch 'main' into rename-db-instance-id
arielvalentin Dec 8, 2023
038d7ab
feat!(trilogy): change db.mysql.instance.address to db.instance.id
dlahn Dec 7, 2023
2c134e4
Merge branch 'rename-db-instance-id' of github.com:dlahn/opentelemetr…
dlahn Dec 8, 2023
4d93258
Merge branch 'main' into rename-db-instance-id
kaylareopelle Dec 8, 2023
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
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.mysql.instance.address'] = @connected_host if defined?(@connected_host)
attributes['db.instance.id'] = @connected_host if defined?(@connected_host)

if sql
case config[:db_statement]
Expand Down
8 changes: 4 additions & 4 deletions instrumentation/trilogy/test/opentelemetry/instrumentation/trilogy/instrumentation_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@
_(span.attributes[OpenTelemetry::SemanticConventions::Trace::DB_SYSTEM]).must_equal 'mysql'
_(span.attributes[OpenTelemetry::SemanticConventions::Trace::DB_STATEMENT]).must_equal 'SELECT ?'
_(span.attributes[OpenTelemetry::SemanticConventions::Trace::NET_PEER_NAME]).must_equal(host)
_(span.attributes['db.mysql.instance.address']).must_be_nil
_(span.attributes['db.instance.id']).must_be_nil
end

it 'extracts statement type' do
Expand Down Expand Up @@ -177,7 +177,7 @@
_(span.attributes[OpenTelemetry::SemanticConventions::Trace::DB_USER]).must_equal(username)
_(span.attributes[OpenTelemetry::SemanticConventions::Trace::DB_SYSTEM]).must_equal 'mysql'
_(span.attributes[OpenTelemetry::SemanticConventions::Trace::NET_PEER_NAME]).must_equal(host)
_(span.attributes['db.mysql.instance.address']).must_be_nil
_(span.attributes['db.instance.id']).must_be_nil
end
end

Expand Down Expand Up @@ -207,7 +207,7 @@
_(span.attributes[OpenTelemetry::SemanticConventions::Trace::DB_SYSTEM]).must_equal 'mysql'
_(span.attributes[OpenTelemetry::SemanticConventions::Trace::DB_STATEMENT]).must_equal 'select @@hostname'
_(span.attributes[OpenTelemetry::SemanticConventions::Trace::NET_PEER_NAME]).must_equal(host)
_(span.attributes['db.mysql.instance.address']).must_be_nil
_(span.attributes['db.instance.id']).must_be_nil

client.query('SELECT 1')

Expand All @@ -219,7 +219,7 @@
_(last_span.attributes[OpenTelemetry::SemanticConventions::Trace::DB_SYSTEM]).must_equal 'mysql'
_(last_span.attributes[OpenTelemetry::SemanticConventions::Trace::DB_STATEMENT]).must_equal 'SELECT ?'
_(last_span.attributes[OpenTelemetry::SemanticConventions::Trace::NET_PEER_NAME]).must_equal(host)
_(last_span.attributes['db.mysql.instance.address']).must_equal client.connected_host
_(last_span.attributes['db.instance.id']).must_equal client.connected_host
end
end

Expand Down