Merge branch 'main' into logger-instrumentation

Author: kaylareopelle

.github/workflows/ci-contrib.yml

@@ -27,6 +27,7 @@ jobs:
           - sql
           - mysql
           - sql-obfuscation
+          - sql-processor
         os:
           - ubuntu-latest
     name: "helpers-${{ matrix.gem }} / ${{ matrix.os }}"

.toys/.data/releases.yml

@@ -55,6 +55,11 @@ gems:
     version_rb_path: lib/opentelemetry/helpers/sql_obfuscation/version.rb
     version_constant: [OpenTelemetry, Helpers, SqlObfuscation, VERSION]
 
+  - name: opentelemetry-helpers-sql-processor
+    directory: helpers/sql-processor
+    version_rb_path: lib/opentelemetry/helpers/sql_processor/version.rb
+    version_constant: [OpenTelemetry, Helpers, SqlProcessor, VERSION]
+
   - name: opentelemetry-instrumentation-grape
     directory: instrumentation/grape
     version_constant: [OpenTelemetry, Instrumentation, Grape, VERSION]

helpers/sql-obfuscation/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Release History: opentelemetry-helpers-sql-obfuscation
 
+### v0.4.0 / 2025-10-08
+
+## Deprecation Notice
+
+* **DEPRECATED:** This gem, `opentelemetry-helpers-sql-obfuscation`, has been replaced by `opentelemetry-helpers-sql-processor`. This is the final release and serves as a transitional package.
+* **ACTION REQUIRED:** No action is needed unless you use this gem directly. If you use this gem directly, update your `Gemfile` to use `gem 'opentelemetry-helpers-sql-processor'` instead.
+* **SUPPORT ENDING:** `opentelemetry-helpers-sql-obfuscation` will no longer receive updates.
+
 ### v0.3.0 / 2025-01-16
 
 * BREAKING CHANGE: Set minimum supported version to Ruby 3.1

helpers/sql-obfuscation/README.md

@@ -1,4 +1,12 @@
-# OpenTelemetry Instrumentation Helpers: SQL Obfuscation
+# Deprecation Notice
+
+**This gem (`opentelemetry-helpers-sql-obfuscation`) is deprecated and no longer maintained.**
+
+It has been replaced by **`opentelemetry-helpers-sql-processor`**.
+
+All future development, bug fixes, and feature releases will occur in the new gem.
+
+## OpenTelemetry Instrumentation Helpers: SQL Obfuscation
 
 This Ruby gem contains logic to obfuscate SQL. It's intended for use by by gem authors instrumenting SQL adapter libraries, such as mysql2, pg, and trilogy.
 

helpers/sql-obfuscation/lib/opentelemetry-helpers-sql-obfuscation.rb

@@ -5,3 +5,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 require_relative 'opentelemetry/helpers'
+
+OpenTelemetry.logger.warn <<~WARNING
+  [DEPRECATION] The 'opentelemetry-helpers-sql-obfuscation' gem has been renamed to 'opentelemetry-helpers-sql-processor'. No action is needed unless you use this gem directly.
+WARNING

helpers/sql-obfuscation/lib/opentelemetry/helpers/sql_obfuscation/version.rb

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Helpers
     module SqlObfuscation
-      VERSION = '0.3.0'
+      VERSION = '0.4.0'
     end
   end
 end

helpers/sql-obfuscation/opentelemetry-helpers-sql-obfuscation.gemspec

@@ -14,8 +14,8 @@ Gem::Specification.new do |spec|
   spec.authors     = ['OpenTelemetry Authors']
   spec.email       = ['[email protected]']
 
-  spec.summary     = 'SQL Obfuscation Instrumentation Helpers for the OpenTelemetry framework'
-  spec.description = 'SQL Obfuscation Instrumentation Helpers for the OpenTelemetry framework'
+  spec.summary     = 'This gem is deprecated and no longer maintained. It has been replaced by opentelemetry-helpers-sql-processor.'
+  spec.description = 'This gem is deprecated and no longer maintained. It has been replaced by opentelemetry-helpers-sql-processor.'
   spec.homepage    = 'https://github.com/open-telemetry/opentelemetry-ruby-contrib'
   spec.license     = 'Apache-2.0'
 

helpers/sql-processor/.rubocop.yml

@@ -0,0 +1,4 @@
+inherit_from: ../../.rubocop.yml
+
+Gemspec/DevelopmentDependencies:
+  Enabled: false

helpers/sql-processor/.yardopts

@@ -0,0 +1,9 @@
+--no-private
+--title=OpenTelemetry SQL Processor Instrumentation Helpers
+--markup=markdown
+--main=README.md
+./lib/opentelemetry/helpers/**/*.rb
+./lib/opentelemetry/helpers.rb
+-
+README.md
+CHANGELOG.md

helpers/sql-processor/CHANGELOG.md

@@ -0,0 +1,5 @@
+# Release History: opentelemetry-helpers-sql-processor
+
+### v0.1.0 / 2025-10-08
+
+Initial release.