opentelemetry-instrumentation-pg 0.23.0 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e23146922971bd7f68d16184b1c4b65125cc0bbae634fb92a19eef6dbbdbd2c2
-  data.tar.gz: f073627a94ac5e69df6c4315a2f0542c2b7d3534a392d37ebfbdbc3e8c86626d
+  metadata.gz: 708556793d4e7d3dfcfca9d3892b6f6a966baacd5abe1fa358861196fb8794a9
+  data.tar.gz: fce3c184ff8338d93644b0b5bf8d02bf328887c1b342140e574c6c5b20b454a6
 SHA512:
-  metadata.gz: 0e8cb6546f07d994770031506f960bf567d3726c8d74f374dbdd126825bc5e24340ec564a88e0802805266eda2c9216b5a4e576acaa97bc4f3518e3ab50fff1a
-  data.tar.gz: a5a053eaeaf5bd0b702063b72ebe2757750027744cd2c33901719641285709a1e4cfd6bc32cf256b7d59c7545031dc8b276de1af4a5772299a34c30a135c8ed5
+  metadata.gz: a0ed151255f25b758cb3361599b8b0c7d6b3b66e01d817f76d298b2d791acdf647c8d7f83178995b4dd5e76f2ef8117c491090f23b8d01e79dcd5b4000f3aa8e
+  data.tar.gz: c1a87ff107bf43d4890c82e6a19669c0d1176db9a8db973f099898958bea1083a16ac0bd3731eceda7644764ce85eb46cf23600235d110102a6cacc764583656

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Release History: opentelemetry-instrumentation-pg
 
+### v0.25.0 / 2023-05-25
+
+* ADDED: Add config[:obfuscation_limit] to pg and mysql2 
+
+### v0.24.0 / 2023-04-17
+
+* BREAKING CHANGE: Drop support for EoL Ruby 2.7 
+
+* ADDED: Drop support for EoL Ruby 2.7 
+
 ### v0.23.0 / 2023-01-14
 
 * BREAKING CHANGE: Removed deprecated instrumentation options 

data/lib/opentelemetry/instrumentation/pg/constants.rb

@@ -86,7 +86,7 @@ module OpenTelemetry
           multi_line_comments
         ].freeze
 
-        UNMATCHED_PAIRS_REGEX = %r{'|\/\*|\*\/|\$(?!\?)}.freeze
+        UNMATCHED_PAIRS_REGEX = %r{'|\/\*|\*\/|\$(?!\?)}
 
         # These are all alike in that they will have a SQL statement as the first parameter.
         # That statement may possibly be parameterized, but we can still use it - the

data/lib/opentelemetry/instrumentation/pg/instrumentation.rb

@@ -26,6 +26,7 @@ module OpenTelemetry
 
         option :peer_service, default: nil, validate: :string
         option :db_statement, default: :include, validate: %I[omit include obfuscate]
+        option :obfuscation_limit, default: 2000, validate: :integer
 
         private
 

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

@@ -107,8 +107,10 @@ module OpenTelemetry
           def obfuscate_sql(sql)
             return sql unless config[:db_statement] == :obfuscate
 
-            # Borrowed from opentelemetry-instrumentation-mysql2
-            return 'SQL query too large to remove sensitive data ...' if sql.size > 2000
+            if sql.size > config[:obfuscation_limit]
+              truncated_sql = sql[..sql.index(generated_postgres_regex) - 1]
+              return truncated_sql + "...\nSQL truncated (> #{config[:obfuscation_limit]} characters)"
+            end
 
             # From:
             # https://github.com/newrelic/newrelic-ruby-agent/blob/9787095d4b5b2d8fcaf2fdbd964ed07c731a8b6b/lib/new_relic/agent/database/obfuscator.rb

data/lib/opentelemetry/instrumentation/pg/version.rb

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module PG
-      VERSION = '0.23.0'
+      VERSION = '0.25.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opentelemetry-instrumentation-pg
 version: !ruby/object:Gem::Version
-  version: 0.23.0
+  version: 0.25.0
 platform: ruby
 authors:
 - OpenTelemetry Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-14 00:00:00.000000000 Z
+date: 2023-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opentelemetry-api
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.22.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -112,16 +112,16 @@ dependencies:
   name: opentelemetry-test-helpers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.41.1
+        version: 1.50.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.41.1
+        version: 1.50.2
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -243,10 +243,10 @@ homepage: https://github.com/open-telemetry/opentelemetry-ruby-contrib
 licenses:
 - Apache-2.0
 metadata:
-  changelog_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-pg/0.23.0/file/CHANGELOG.md
+  changelog_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-pg/0.25.0/file/CHANGELOG.md
   source_code_uri: https://github.com/open-telemetry/opentelemetry-ruby-contrib/tree/main/instrumentation/pg
   bug_tracker_uri: https://github.com/open-telemetry/opentelemetry-ruby-contrib/issues
-  documentation_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-pg/0.23.0
+  documentation_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-pg/0.25.0
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -255,14 +255,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.33
 signing_key: 
 specification_version: 4
 summary: PG (PostgreSQL) instrumentation for the OpenTelemetry framework