Skip to content

Commit 73877a3

Browse files
feat: replace references sql-obfuscation -> sql-processor (#1675)
* feat: repalce references sql-obfuscation -> sql-processor * Move file structure * Update releases.yml * beep beep rubocop
1 parent fe28a99 commit 73877a3

File tree

11 files changed

+12
-18
lines changed

11 files changed

+12
-18
lines changed

.github/workflows/ci-contrib.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ jobs:
3939
gem:
4040
- sql
4141
- mysql
42-
- sql-obfuscation
4342
- sql-processor
4443
os:
4544
- ubuntu-latest

.toys/.data/releases.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,6 @@ gems:
5858
directory: helpers/mysql
5959
version_constant: [OpenTelemetry, Helpers, MySQL, VERSION]
6060

61-
- name: opentelemetry-helpers-sql-obfuscation
62-
directory: helpers/sql-obfuscation
63-
version_rb_path: lib/opentelemetry/helpers/sql_obfuscation/version.rb
64-
version_constant: [OpenTelemetry, Helpers, SqlObfuscation, VERSION]
65-
6661
- name: opentelemetry-helpers-sql-processor
6762
directory: helpers/sql-processor
6863
version_rb_path: lib/opentelemetry/helpers/sql_processor/version.rb

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ This repository also contains libraries that hold code shared among
6060
multiple instrumentation libraries.
6161

6262
- [MySQL](helpers/mysql/)
63-
- [SQL Obfuscation](helpers/sql-obfuscation/)
63+
- [SQL Processor](helpers/sql-processor/)
6464

6565
## Additional Libraries
6666

helpers/sql-obfuscation/test/test_helper.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@
99
Bundler.require(:default, :development, :test)
1010

1111
require 'minitest/autorun'
12-
require 'opentelemetry-helpers-sql-obfuscation'
12+
require 'opentelemetry-helpers-sql-processor'

instrumentation/mysql2/Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ group :test do
1212
gem 'opentelemetry-instrumentation-base', path: '../base'
1313
gem 'opentelemetry-helpers-sql', path: '../../helpers/sql'
1414
gem 'opentelemetry-helpers-mysql', path: '../../helpers/mysql'
15-
gem 'opentelemetry-helpers-sql-obfuscation', path: '../../helpers/sql-obfuscation'
15+
gem 'opentelemetry-helpers-sql-processor', path: '../../helpers/sql-processor'
1616
gem 'appraisal', '~> 2.5'
1717
gem 'bundler', '~> 2.4'
1818
gem 'minitest', '~> 5.0'

instrumentation/mysql2/lib/opentelemetry/instrumentation/mysql2/patches/client.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# SPDX-License-Identifier: Apache-2.0
66

77
require 'opentelemetry-helpers-mysql'
8-
require 'opentelemetry-helpers-sql-obfuscation'
8+
require 'opentelemetry-helpers-sql-processor'
99

1010
module OpenTelemetry
1111
module Instrumentation
@@ -53,7 +53,7 @@ def _otel_span_attributes(sql)
5353
attributes[SemanticConventions::Trace::DB_STATEMENT] = sql
5454
when :obfuscate
5555
attributes[SemanticConventions::Trace::DB_STATEMENT] =
56-
OpenTelemetry::Helpers::SqlObfuscation.obfuscate_sql(
56+
OpenTelemetry::Helpers::SqlProcessor.obfuscate_sql(
5757
sql, obfuscation_limit: config[:obfuscation_limit], adapter: :mysql
5858
)
5959
end

instrumentation/pg/Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ group :test do
2121
gem 'activerecord', '>= 7.0.0'
2222
gem 'opentelemetry-instrumentation-base', path: '../base'
2323
gem 'opentelemetry-helpers-sql', path: '../../helpers/sql'
24-
gem 'opentelemetry-helpers-sql-obfuscation', path: '../../helpers/sql-obfuscation'
24+
gem 'opentelemetry-helpers-sql-processor', path: '../../helpers/sql-processor'
2525
if RUBY_VERSION >= '3.4'
2626
gem 'base64'
2727
gem 'mutex_m'

instrumentation/pg/lib/opentelemetry/instrumentation/pg/patches/connection.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# SPDX-License-Identifier: Apache-2.0
66

7-
require 'opentelemetry-helpers-sql-obfuscation'
7+
require 'opentelemetry-helpers-sql-processor'
88
require_relative '../constants'
99
require_relative '../lru_cache'
1010

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

119-
OpenTelemetry::Helpers::SqlObfuscation.obfuscate_sql(
119+
OpenTelemetry::Helpers::SqlProcessor.obfuscate_sql(
120120
sql,
121121
obfuscation_limit: config[:obfuscation_limit],
122122
adapter: :postgres

instrumentation/que/Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ group :test do
2121
gem 'yard', '~> 0.9'
2222
gem 'pg'
2323
gem 'opentelemetry-helpers-sql', path: '../../helpers/sql'
24-
gem 'opentelemetry-helpers-sql-obfuscation', path: '../../helpers/sql-obfuscation'
24+
gem 'opentelemetry-helpers-sql-processor', path: '../../helpers/sql-processor'
2525
gem 'opentelemetry-instrumentation-base', path: '../base'
2626
gem 'opentelemetry-instrumentation-pg', path: '../pg'
2727
if RUBY_VERSION >= '3.4'

instrumentation/trilogy/Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ group :test do
2323
gem 'opentelemetry-instrumentation-base', path: '../base'
2424
gem 'opentelemetry-helpers-mysql', path: '../../helpers/mysql'
2525
gem 'opentelemetry-helpers-sql', path: '../../helpers/sql'
26-
gem 'opentelemetry-helpers-sql-obfuscation', path: '../../helpers/sql-obfuscation'
26+
gem 'opentelemetry-helpers-sql-processor', path: '../../helpers/sql-processor'
2727
gem 'opentelemetry-propagator-vitess', path: '../../propagator/vitess'
2828
if RUBY_VERSION >= '3.4'
2929
gem 'base64'

0 commit comments

Comments
 (0)