Skip to content

fix: Use sql-processor gem in instrumentations #1819

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

Closed
miry wants to merge 1 commit into from
Closed

fix: Use sql-processor gem in instrumentations #1819

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 5 additions & 3 deletions instrumentation/mysql2/lib/opentelemetry/instrumentation/mysql2/patches/client.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# SPDX-License-Identifier: Apache-2.0

require 'opentelemetry-helpers-mysql'
require 'opentelemetry-helpers-sql-obfuscation'
require 'opentelemetry-helpers-sql-processor'

module OpenTelemetry
module Instrumentation
Expand Down Expand Up @@ -53,8 +53,10 @@ def _otel_span_attributes(sql)
attributes[SemanticConventions::Trace::DB_STATEMENT] = sql
when :obfuscate
attributes[SemanticConventions::Trace::DB_STATEMENT] =
OpenTelemetry::Helpers::SqlObfuscation.obfuscate_sql(
sql, obfuscation_limit: config[:obfuscation_limit], adapter: :mysql
OpenTelemetry::Helpers::SqlProcessor.obfuscate_sql(
sql,
obfuscation_limit: config[:obfuscation_limit],
adapter: :mysql
)
end

Expand Down
2 changes: 1 addition & 1 deletion instrumentation/mysql2/opentelemetry-instrumentation-mysql2.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Gem::Specification.new do |spec|

spec.add_dependency 'opentelemetry-helpers-mysql'
spec.add_dependency 'opentelemetry-helpers-sql'
spec.add_dependency 'opentelemetry-helpers-sql-obfuscation'
spec.add_dependency 'opentelemetry-helpers-sql-processor'
spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.25'

if spec.respond_to?(:metadata)
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/pg/example/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ source 'https://rubygems.org'

gem 'opentelemetry-api'
gem 'opentelemetry-common'
gem 'opentelemetry-instrumentation-pg'
gem 'opentelemetry-instrumentation-pg', path: '..'
gem 'opentelemetry-sdk'
gem 'pg'
4 changes: 2 additions & 2 deletions instrumentation/pg/lib/opentelemetry/instrumentation/pg/patches/connection.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# SPDX-License-Identifier: Apache-2.0

require 'opentelemetry-helpers-sql-obfuscation'
require 'opentelemetry-helpers-sql-processor'
require_relative '../constants'
require_relative '../lru_cache'

Expand Down Expand Up @@ -116,7 +116,7 @@ module Connection # rubocop:disable Metrics/ModuleLength
def obfuscate_sql(sql)
return sql unless config[:db_statement] == :obfuscate

OpenTelemetry::Helpers::SqlObfuscation.obfuscate_sql(
OpenTelemetry::Helpers::SqlProcessor.obfuscate_sql(
sql,
obfuscation_limit: config[:obfuscation_limit],
adapter: :postgres
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/pg/opentelemetry-instrumentation-pg.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
spec.required_ruby_version = '>= 3.2'

spec.add_dependency 'opentelemetry-helpers-sql'
spec.add_dependency 'opentelemetry-helpers-sql-obfuscation'
spec.add_dependency 'opentelemetry-helpers-sql-processor'
spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.25'

if spec.respond_to?(:metadata)
Expand Down
8 changes: 6 additions & 2 deletions 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 @@ -5,7 +5,7 @@
# SPDX-License-Identifier: Apache-2.0

require 'opentelemetry-helpers-mysql'
require 'opentelemetry-helpers-sql-obfuscation'
require 'opentelemetry-helpers-sql-processor'

module OpenTelemetry
module Instrumentation
Expand Down Expand Up @@ -82,7 +82,11 @@ def client_attributes(sql = nil)
case config[:db_statement]
when :obfuscate
attributes[::OpenTelemetry::SemanticConventions::Trace::DB_STATEMENT] =
OpenTelemetry::Helpers::SqlObfuscation.obfuscate_sql(sql, obfuscation_limit: config[:obfuscation_limit], adapter: :mysql)
OpenTelemetry::Helpers::SqlProcessor.obfuscate_sql(
sql,
obfuscation_limit: config[:obfuscation_limit],
adapter: :mysql
)
when :include
attributes[::OpenTelemetry::SemanticConventions::Trace::DB_STATEMENT] = sql
end
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/trilogy/opentelemetry-instrumentation-trilogy.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Gem::Specification.new do |spec|

spec.add_dependency 'opentelemetry-helpers-mysql'
spec.add_dependency 'opentelemetry-helpers-sql'
spec.add_dependency 'opentelemetry-helpers-sql-obfuscation'
spec.add_dependency 'opentelemetry-helpers-sql-processor'
spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.25'
spec.add_dependency 'opentelemetry-semantic_conventions', '>= 1.8.0'

Expand Down
Loading