opentelemetry-instrumentation-trilogy 0.56.2 → 0.57.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 629aab2e80bded0180191360f3ce7f39f32aa71e614e43133316d767d8d982e5
-  data.tar.gz: 9ad84c512c2aa3f36db0cfeabd600eb5e53247393f24bba9d87f20bac46d4896
+  metadata.gz: '09504a134e2dbff7d4b256525dc3b3633de98e89badfd6776ab673c8eea9f2ee'
+  data.tar.gz: c33bef4cdb1a85edbd2060aa12e786efd379f67aee03ca0ef23a3d0141267c97
 SHA512:
-  metadata.gz: f5259b1255a5a250812fec2f0a54e262cc82c399d7a43b530b26e3661cd141289be4bffcfd82b745968c97fec1512e2fb22b27e70629124bcc49951047e8fb04
-  data.tar.gz: 7088723e82f52bb468e2edabfabc3746f1929ea6bbb1ee13f337135516efb64a2b0a0ec97dd400a0218f55d2a1b469245979052b4838a06475bf7cb8ecb9000e
+  metadata.gz: 695b8bfa62151a372159af269e5cc72a69d8c0ce8c336e9b07266cee91a090dbd7d6d8f01a07d6e4b3c95824ef39a19610d499866cc14f8a4452674b6ff965e7
+  data.tar.gz: 5be93ffc2130b07a722b95c61b0a6fc7572a03f4979b23bfed6ef13b34a77ccb08fea86241c716ac6289bc59141e2003479d493ae64ea73c20b0a43441a99ecc

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Release History: opentelemetry-instrumentation-trilogy
 
+### v0.57.0 / 2023-10-27
+
+* ADDED: Instrument connect and ping
+
+### v0.56.3 / 2023-08-03
+
+* FIXED: Remove inline linter rules
+
 ### v0.56.2 / 2023-07-14
 
 * ADDED: `db.user` attribute (recommended connection-level attribute)

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

@@ -48,6 +48,28 @@ module OpenTelemetry
 
           FULL_SQL_REGEXP = Regexp.union(MYSQL_COMPONENTS.map { |component| COMPONENTS_REGEX_MAP[component] })
 
+          def initialize(options = {})
+            @connection_options = options # This is normally done by Trilogy#initialize
+
+            tracer.in_span(
+              'connect',
+              attributes: client_attributes.merge!(OpenTelemetry::Instrumentation::Trilogy.attributes),
+              kind: :client
+            ) do
+              super
+            end
+          end
+
+          def ping(...)
+            tracer.in_span(
+              'ping',
+              attributes: client_attributes.merge!(OpenTelemetry::Instrumentation::Trilogy.attributes),
+              kind: :client
+            ) do
+              super
+            end
+          end
+
           def query(sql)
             tracer.in_span(
               database_span_name(sql),
@@ -60,10 +82,10 @@ module OpenTelemetry
 
           private
 
-          def client_attributes(sql)
+          def client_attributes(sql = nil)
             attributes = {
               ::OpenTelemetry::SemanticConventions::Trace::DB_SYSTEM => 'mysql',
-              ::OpenTelemetry::SemanticConventions::Trace::NET_PEER_NAME => connection_options.fetch(:host, 'unknown sock')
+              ::OpenTelemetry::SemanticConventions::Trace::NET_PEER_NAME => connection_options&.fetch(:host, 'unknown sock') || 'unknown sock'
             }
 
             attributes[::OpenTelemetry::SemanticConventions::Trace::DB_NAME] = database_name if database_name
@@ -71,11 +93,13 @@ module OpenTelemetry
             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
-              attributes[::OpenTelemetry::SemanticConventions::Trace::DB_STATEMENT] = obfuscate_sql(sql)
-            when :include
-              attributes[::OpenTelemetry::SemanticConventions::Trace::DB_STATEMENT] = sql
+            if sql
+              case config[:db_statement]
+              when :obfuscate
+                attributes[::OpenTelemetry::SemanticConventions::Trace::DB_STATEMENT] = obfuscate_sql(sql)
+              when :include
+                attributes[::OpenTelemetry::SemanticConventions::Trace::DB_STATEMENT] = sql
+              end
             end
 
             attributes
@@ -109,7 +133,7 @@ module OpenTelemetry
             %r{'|"|\/\*|\*\/}.match(obfuscated)
           end
 
-          def database_span_name(sql) # rubocop:disable Metrics/CyclomaticComplexity
+          def database_span_name(sql)
             case config[:span_name]
             when :statement_type
               extract_statement_type(sql)

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

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module Trilogy
-      VERSION = '0.56.2'
+      VERSION = '0.57.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opentelemetry-instrumentation-trilogy
 version: !ruby/object:Gem::Version
-  version: 0.56.2
+  version: 0.57.0
 platform: ruby
 authors:
 - OpenTelemetry Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-14 00:00:00.000000000 Z
+date: 2023-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opentelemetry-api
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '2.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -184,14 +184,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.54.1
+        version: 1.56.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.54.1
+        version: 1.56.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -240,20 +240,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: yard-doctest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.6
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.6
 description: Adds auto instrumentation that includes SQL metadata
 email:
 - cncf-opentelemetry-contributors@lists.cncf.io
@@ -275,10 +261,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.56.2/file/CHANGELOG.md
+  changelog_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-trilogy/0.57.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.56.2
+  documentation_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-trilogy/0.57.0
 post_install_message: 
 rdoc_options: []
 require_paths: