opentelemetry-instrumentation-trilogy 0.54.0 → 0.55.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4932e3113d2bb9a5e8df80ee5496f0dcca34de17b8f5a1aac5233953cd4fd292
-  data.tar.gz: 56471b24b26a886ab01937ed3f790705ae2130c8bab98952131de6868daad83c
+  metadata.gz: 8cc568f9e1a5d6a330ffddee8c6888fac1c7b1c84433a003cf68673d654e6008
+  data.tar.gz: ccfa730942e2472d8ad4978ed229d6b1fc44a597ac74331bfe1e17be28fcd4a1
 SHA512:
-  metadata.gz: 66215a5c1bf88db8fdfe6cf65ba6dd3bec73eede9afe5923c0e031ff4067e0c627d5a4ef3de8897fa1fa44b7ee6bad1dc97558169342db8d21001c2893e4757f
-  data.tar.gz: 1d0eda4aa160896c6c1ff33cdc64102e5b5c8df186286b3a731e2cb23b12c9d45b454d0e643f78b7d8766e0ad2da7470b192c0f789247ee1675d81f96dcc00c6
+  metadata.gz: e92928d645e72804e3dfc5d10069856585f0d48badf6a8dd2ecabf2c471012222b33d70bc16d247adeee6d0c98196ab53bda948e36aafd23ec898b5fd202050a
+  data.tar.gz: 72f70ea92bf8f58c0cf767898362724ba6e9c1d73adcdec2a2ffb0ce0f84c6540880b8a9e359e43b06797514b5789f7b0d8db9f98df107ce5db0a655acde46b0

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Release History: opentelemetry-instrumentation-trilogy
 
+### v0.55.1 / 2023-06-01
+
+* FIXED: Regex non-match with obfuscation limit (issue #486) 
+
+### v0.55.0 / 2023-05-31
+
+* BREAKING CHANGE: Add database name for trilogy traces 
+
+* ADDED: Add database name for trilogy traces 
+
 ### v0.54.0 / 2023-05-25
 
 * ADDED: Add Obfuscation Limit Option to Trilogy 

data/lib/opentelemetry/instrumentation/trilogy/instrumentation.rb

@@ -19,7 +19,7 @@ module OpenTelemetry
         end
 
         compatible do
-          Gem::Requirement.create('>= 2.0', '< 3.0').satisfied_by?(Gem::Version.new(::Trilogy::VERSION))
+          Gem::Requirement.create('>= 2.3', '< 3.0').satisfied_by?(Gem::Version.new(::Trilogy::VERSION))
         end
 
         option :peer_service, default: nil, validate: :string

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

@@ -71,6 +71,7 @@ module OpenTelemetry
               ::OpenTelemetry::SemanticConventions::Trace::NET_PEER_NAME => net_peer_name
             }
 
+            attributes[::OpenTelemetry::SemanticConventions::Trace::DB_NAME] = database_name if database_name
             attributes[::OpenTelemetry::SemanticConventions::Trace::PEER_SERVICE] = config[:peer_service] unless config[:peer_service].nil?
 
             case config[:db_statement]
@@ -85,8 +86,12 @@ module OpenTelemetry
 
           def obfuscate_sql(sql)
             if sql.size > config[:obfuscation_limit]
-              truncated_sql = sql[..sql.index(FULL_SQL_REGEXP) - 1]
-              truncated_sql + "...\nSQL truncated (> #{config[:obfuscation_limit]} characters)"
+              first_match_index = sql.index(FULL_SQL_REGEXP)
+              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(FULL_SQL_REGEXP, '?')

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

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module Trilogy
-      VERSION = '0.54.0'
+      VERSION = '0.55.1'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opentelemetry-instrumentation-trilogy
 version: !ruby/object:Gem::Version
-  version: 0.54.0
+  version: 0.55.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
@@ -275,10 +275,10 @@ homepage: https://github.com/open-telemetry/opentelemetry-ruby-contrib
 licenses:
 - Apache-2.0
 metadata:
-  changelog_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-trilogy/0.54.0/file/CHANGELOG.md
+  changelog_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-trilogy/0.55.1/file/CHANGELOG.md
   source_code_uri: https://github.com/open-telemetry/opentelemetry-ruby-contrib/tree/main/instrumentation/trilogy
   bug_tracker_uri: https://github.com/open-telemetry/opentelemetry-ruby-contrib/issues
-  documentation_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-trilogy/0.54.0
+  documentation_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-trilogy/0.55.1
 post_install_message: 
 rdoc_options: []
 require_paths: