opentelemetry-instrumentation-trilogy 0.53.0 → 0.55.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1714d43b908e2ef4f6af27fd1d92376e509ceed407df30ca7380028bba61b45
-  data.tar.gz: 1ee3f0f262b413e6b6a149cd2f99f01e2fdfd5c2f39b7a4897779b3366b1b3f4
+  metadata.gz: a562e640a2941ea333b6fefd0f6c275252e7fb5bffd9327e0ea891c5e67c3195
+  data.tar.gz: aa7f7c24b523d7b6e4be3227bfab739d76ee17df8d8542611b6056cb0adb8e08
 SHA512:
-  metadata.gz: 4730f45bf6c73dbd32f370229ab46d452a12f2ac8459e79bf15b83f8d99aeee4bae9243723e60522f2821c68f5a1d76363ba736923abd42832706534417d32f7
-  data.tar.gz: d0d8f471da5f50d9f4139c6fe31973d255a2f399add2d55e84ebe514ad3f688144491e3b58711e1a3c880142511c92c5648d83bd7ab95028b0c1accb2c767704
+  metadata.gz: 968b789fe4cfe9fb5f721feebc97c3681fc16cdf5d10ef4cc5db0614c797d52be05ada1e3552be26097291c8361f3ddd04316dfdd06ece9ad3d22e44f2ba1a5e
+  data.tar.gz: afad929f2c05d074afbbf54df28389b998f7fe3632932e8729929eddb73bb25ecbe4d14bc54a676cef45bee203b34a8751b14e396f319d09f54e27cb320ff2ab

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Release History: opentelemetry-instrumentation-trilogy
 
+### 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 
+
 ### v0.53.0 / 2023-04-17
 
 * BREAKING CHANGE: Drop support for EoL Ruby 2.7 

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

@@ -19,12 +19,13 @@ 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
         option :db_statement, default: :obfuscate, validate: %I[omit include obfuscate]
         option :span_name, default: :statement_type, validate: %I[statement_type db_name db_operation_and_name]
+        option :obfuscation_limit, default: 2000, validate: :integer
 
         private
 

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]
@@ -84,8 +85,9 @@ module OpenTelemetry
           end
 
           def obfuscate_sql(sql)
-            if sql.size > 2000
-              'SQL query too large to remove sensitive data ...'
+            if sql.size > config[:obfuscation_limit]
+              truncated_sql = sql[..sql.index(FULL_SQL_REGEXP) - 1]
+              truncated_sql + "...\nSQL truncated (> #{config[:obfuscation_limit]} characters)"
             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.53.0'
+      VERSION = '0.55.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opentelemetry-instrumentation-trilogy
 version: !ruby/object:Gem::Version
-  version: 0.53.0
+  version: 0.55.0
 platform: ruby
 authors:
 - OpenTelemetry Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-17 00:00:00.000000000 Z
+date: 2023-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opentelemetry-api
@@ -184,14 +184,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.48.1
+        version: 1.50.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.48.1
+        version: 1.50.2
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -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.53.0/file/CHANGELOG.md
+  changelog_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-trilogy/0.55.0/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.53.0
+  documentation_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-trilogy/0.55.0
 post_install_message: 
 rdoc_options: []
 require_paths: