opentelemetry-instrumentation-mysql2 0.24.0 → 0.24.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5556a962e40c18ff1e4c02618b9772bb6a9708bbcfa4867c62924118bfdf1de
-  data.tar.gz: 856f5881c0c843902bf79b38969f9dc20e9286719ebccde33c4155a2f4b06e54
+  metadata.gz: 1f086bc035af9f951109cd4e61e5f4f403c7f066d6c4d5f853465060c6cae2e8
+  data.tar.gz: 81bc9f183786bf26cdbdaa44c4d176258b6446e242800ac8543c1d6ff11784c0
 SHA512:
-  metadata.gz: 36a64234a88f39e07e957721e434633db8636c86467a457fe298492100c9c36f465b37aa36ee4f6a7b37d3747bb1df7c338077514b27e41f867697e19f1dda78
-  data.tar.gz: 6c8f6ffa8a510838c2c559da473b57edd7024d21696bcc143a8bfad6eb6ccba86e021a11cb6b8e9a6deee56ee4dab711274685a3e6bd3792ac6b7fa7e861e44c
+  metadata.gz: 8013b7edd0e679422859c67e13d29c395d5e767e7d780f83b72cd5e302be7430a785c93edbe4ddb417abae4dffe86adcb566b2d39231cf94e4f26c3e55c625c1
+  data.tar.gz: 9312c12a1e1f465a83d2b2617309f91fcfd32d6271ad010b85e934517109e71204ce7796198e68f9e9cada715e7ef8d8a004080a211f4feb1d88db42b3db0fa2

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Release History: opentelemetry-instrumentation-mysql2
 
+### v0.24.1 / 2023-06-01
+
+* FIXED: Regex non-match with obfuscation limit (issue #486)
+
 ### v0.24.0 / 2023-05-25
 
 * ADDED: Add config[:obfuscation_limit] to pg and mysql2

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

@@ -72,8 +72,12 @@ module OpenTelemetry
 
           def obfuscate_sql(sql)
             if sql.size > config[:obfuscation_limit]
-              truncated_sql = sql[..sql.index(generated_mysql_regex) - 1]
-              truncated_sql + "...\nSQL truncated (> #{config[:obfuscation_limit]} characters)"
+              first_match_index = sql.index(generated_mysql_regex)
+              truncation_message = "SQL truncated (> #{config[:obfuscation_limit]} characters)"
+              return truncation_message unless first_match_index
+
+              truncated_sql = sql[..first_match_index - 1]
+              "#{truncated_sql}...\n#{truncation_message}"
             else
               obfuscated = OpenTelemetry::Common::Utilities.utf8_encode(sql, binary: true)
               obfuscated = obfuscated.gsub(generated_mysql_regex, '?')

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

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module Mysql2
-      VERSION = '0.24.0'
+      VERSION = '0.24.1'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opentelemetry-instrumentation-mysql2
 version: !ruby/object:Gem::Version
-  version: 0.24.0
+  version: 0.24.1
 platform: ruby
 authors:
 - OpenTelemetry Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-25 00:00:00.000000000 Z
+date: 2023-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opentelemetry-api
@@ -227,10 +227,10 @@ homepage: https://github.com/open-telemetry/opentelemetry-ruby-contrib
 licenses:
 - Apache-2.0
 metadata:
-  changelog_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-mysql2/0.24.0/file/CHANGELOG.md
+  changelog_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-mysql2/0.24.1/file/CHANGELOG.md
   source_code_uri: https://github.com/open-telemetry/opentelemetry-ruby-contrib/tree/main/instrumentation/mysql2
   bug_tracker_uri: https://github.com/open-telemetry/opentelemetry-ruby-contrib/issues
-  documentation_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-mysql2/0.24.0
+  documentation_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-mysql2/0.24.1
 post_install_message: 
 rdoc_options: []
 require_paths: