opentelemetry-instrumentation-trilogy 0.55.0 → 0.56.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a562e640a2941ea333b6fefd0f6c275252e7fb5bffd9327e0ea891c5e67c3195
-  data.tar.gz: aa7f7c24b523d7b6e4be3227bfab739d76ee17df8d8542611b6056cb0adb8e08
+  metadata.gz: 87f006ee60e9b69302f9d4da5945d7cde5a917ea925498b2fe727e1916b8bbff
+  data.tar.gz: 938cd875ffd5ae56f97525d01ed4058918dcc3709ae9429546b8132099ef7ec2
 SHA512:
-  metadata.gz: 968b789fe4cfe9fb5f721feebc97c3681fc16cdf5d10ef4cc5db0614c797d52be05ada1e3552be26097291c8361f3ddd04316dfdd06ece9ad3d22e44f2ba1a5e
-  data.tar.gz: afad929f2c05d074afbbf54df28389b998f7fe3632932e8729929eddb73bb25ecbe4d14bc54a676cef45bee203b34a8751b14e396f319d09f54e27cb320ff2ab
+  metadata.gz: 1d14dddca8b736a90197744d35d0bb7c523767b5a5a4ce93fa445b46dfa570b4463636802a8613ded1cebc7c2be44b41f85ee02525fbeb19d7e847cfa007f2d6
+  data.tar.gz: cb79931cef883a55c7b356e33fdb7a883a2bedf518edb72cb7179065a9c861383eadc6d0a773971022d28c2aacd78f70560574d4be1be50aeca129aeb4cb1231

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Release History: opentelemetry-instrumentation-trilogy
 
+### v0.56.0 / 2023-06-02
+
+* BREAKING CHANGE: Separate logical MySQL host from connected host 
+
+* ADDED: Separate logical MySQL host from connected host 
+
+### 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 

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

@@ -48,11 +48,6 @@ module OpenTelemetry
 
           FULL_SQL_REGEXP = Regexp.union(MYSQL_COMPONENTS.map { |component| COMPONENTS_REGEX_MAP[component] })
 
-          def initialize(args)
-            @_otel_net_peer_name = args[:host]
-            super
-          end
-
           def query(sql)
             tracer.in_span(
               database_span_name(sql),
@@ -68,11 +63,12 @@ module OpenTelemetry
           def client_attributes(sql)
             attributes = {
               ::OpenTelemetry::SemanticConventions::Trace::DB_SYSTEM => 'mysql',
-              ::OpenTelemetry::SemanticConventions::Trace::NET_PEER_NAME => net_peer_name
+              ::OpenTelemetry::SemanticConventions::Trace::NET_PEER_NAME => connection_options.fetch(:host, 'unknown sock')
             }
 
             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?
+            attributes['db.mysql.instance.address'] = @connected_host if defined?(@connected_host)
 
             case config[:db_statement]
             when :obfuscate
@@ -86,8 +82,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, '?')
@@ -131,16 +131,6 @@ module OpenTelemetry
             connection_options[:database]
           end
 
-          def net_peer_name
-            if defined?(@connected_host)
-              @connected_host
-            elsif @_otel_net_peer_name
-              @_otel_net_peer_name
-            else
-              'unknown sock'
-            end
-          end
-
           def tracer
             Trilogy::Instrumentation.instance.tracer
           end

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

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module Trilogy
-      VERSION = '0.55.0'
+      VERSION = '0.56.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opentelemetry-instrumentation-trilogy
 version: !ruby/object:Gem::Version
-  version: 0.55.0
+  version: 0.56.0
 platform: ruby
 authors:
 - OpenTelemetry Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-31 00:00:00.000000000 Z
+date: 2023-06-02 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.55.0/file/CHANGELOG.md
+  changelog_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-trilogy/0.56.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.55.0
+  documentation_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-trilogy/0.56.0
 post_install_message: 
 rdoc_options: []
 require_paths: