opentelemetry-instrumentation-pg 0.26.0 → 0.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1f0cce766de33102b30042a14d65f2e9fd00e0e9bcdc82702cd5b747c146c27
-  data.tar.gz: b2e4ecbad38a5556a7ded3508d44bc0bd18d19078d1df9c5ad8efa29e6ab68b1
+  metadata.gz: 4bc1cf9d4064f6c7acdf160a45b360347c5ad87ffad97a63e086ccea564b396c
+  data.tar.gz: 5bf6eb9b540fd53b53d51126ebd8cce58cc640587f9a9ab7bc3aea9a20026a74
 SHA512:
-  metadata.gz: b131fc9b5c97da003fecf7252f33dd7ee87e07b7e88974031b6e789f7c5afe29621b76138ce78101d32437c31f50b6c3c0e8c91906155a74d918feebd6fdb8af
-  data.tar.gz: d50b7becf091842b581d56aee6d3466eaa51516306f15f120033e2859e1cc5537fc19604100d6b1a7567be1f5cecd34fd0a0f177f1fc396694be013af502f1d5
+  metadata.gz: 0f870b5c594e85710a9e71f514ae37059d679601d1d381f5854baf054f780b7504777b12a40e09decbd295852dc9c0b1bb951e97588e8d61b4dfd7e1f8b88f00
+  data.tar.gz: 62479ce766cf77cae8ea0854443d2a71882c9bc1995749c2f07bca70b4890cda2c91d18f1e45e0d27923652111a77257f5aa80e4caa88356f2574680e2647fce

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Release History: opentelemetry-instrumentation-pg
 
+### v0.27.0 / 2024-02-08
+
+* BREAKING CHANGE: Move shared sql behavior to helper gems
+
+
+### v0.26.1 / 2023-11-23
+
+* CHANGED: Applied Rubocop Performance Recommendations [#727](https://github.com/open-telemetry/opentelemetry-ruby-contrib/pull/727)
+
 ### v0.26.0 / 2023-10-16
 
 * BREAKING CHANGE: Obfuscation for mysql2, dalli and postgresql as default option for db_statement

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

@@ -65,29 +65,6 @@ module OpenTelemetry
           VALUES
         ].freeze
 
-        # From: https://github.com/newrelic/newrelic-ruby-agent/blob/9787095d4b5b2d8fcaf2fdbd964ed07c731a8b6b/lib/new_relic/agent/database/obfuscation_helpers.rb#L9-L34
-        COMPONENTS_REGEX_MAP = {
-          single_quotes: /'(?:[^']|'')*?(?:\\'.*|'(?!'))/,
-          dollar_quotes: /(\$(?!\d)[^$]*?\$).*?(?:\1|$)/,
-          uuids: /\{?(?:[0-9a-fA-F]\-*){32}\}?/,
-          numeric_literals: /-?\b(?:[0-9]+\.)?[0-9]+([eE][+-]?[0-9]+)?\b/,
-          boolean_literals: /\b(?:true|false|null)\b/i,
-          comments: /(?:#|--).*?(?=\r|\n|$)/i,
-          multi_line_comments: %r{\/\*(?:[^\/]|\/[^*])*?(?:\*\/|\/\*.*)}
-        }.freeze
-
-        POSTGRES_COMPONENTS = %i[
-          single_quotes
-          dollar_quotes
-          uuids
-          numeric_literals
-          boolean_literals
-          comments
-          multi_line_comments
-        ].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
         # obfuscation code will just transform $1 -> $? in that case (which is fine enough).

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

@@ -50,6 +50,16 @@ module OpenTelemetry
 
           private
 
+          def obfuscate_sql(sql)
+            return sql unless config[:db_statement] == :obfuscate
+
+            OpenTelemetry::Helpers::SqlObfuscation.obfuscate_sql(
+              sql,
+              obfuscation_limit: config[:obfuscation_limit],
+              adapter: :postgres
+            )
+          end
+
           def tracer
             PG::Instrumentation.instance.tracer
           end
@@ -112,34 +122,6 @@ module OpenTelemetry
             operation if PG::Constants::SQL_COMMANDS.include?(operation)
           end
 
-          def obfuscate_sql(sql)
-            return sql unless config[:db_statement] == :obfuscate
-
-            if sql.size > config[:obfuscation_limit]
-              first_match_index = sql.index(generated_postgres_regex)
-              truncation_message = "SQL truncated (> #{config[:obfuscation_limit]} characters)"
-              return truncation_message unless first_match_index
-
-              truncated_sql = sql[..first_match_index - 1]
-              return "#{truncated_sql}...\n#{truncation_message}"
-            end
-
-            # From:
-            # https://github.com/newrelic/newrelic-ruby-agent/blob/9787095d4b5b2d8fcaf2fdbd964ed07c731a8b6b/lib/new_relic/agent/database/obfuscator.rb
-            # https://github.com/newrelic/newrelic-ruby-agent/blob/9787095d4b5b2d8fcaf2fdbd964ed07c731a8b6b/lib/new_relic/agent/database/obfuscation_helpers.rb
-            obfuscated = sql.gsub(generated_postgres_regex, '?')
-            obfuscated = 'Failed to obfuscate SQL query - quote characters remained after obfuscation' if PG::Constants::UNMATCHED_PAIRS_REGEX.match(obfuscated)
-
-            obfuscated
-          rescue StandardError => e
-            OpenTelemetry.handle_error(message: 'Failed to obfuscate SQL', exception: e)
-            'OpenTelemetry error: failed to obfuscate sql'
-          end
-
-          def generated_postgres_regex
-            @generated_postgres_regex ||= Regexp.union(PG::Constants::POSTGRES_COMPONENTS.map { |component| PG::Constants::COMPONENTS_REGEX_MAP[component] })
-          end
-
           def client_attributes
             attributes = {
               'db.system' => 'postgresql',

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

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module PG
-      VERSION = '0.26.0'
+      VERSION = '0.27.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opentelemetry-instrumentation-pg
 version: !ruby/object:Gem::Version
-  version: 0.26.0
+  version: 0.27.0
 platform: ruby
 authors:
 - OpenTelemetry Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-16 00:00:00.000000000 Z
+date: 2024-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opentelemetry-api
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: opentelemetry-helpers-sql-obfuscation
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: opentelemetry-instrumentation-base
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +184,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.56.1
+        version: 1.60.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.60.1
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.20'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.56.1
+        version: '1.20'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -229,10 +257,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.26.0/file/CHANGELOG.md
+  changelog_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-pg/0.27.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.26.0
+  documentation_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-pg/0.27.0
 post_install_message: 
 rdoc_options: []
 require_paths: