activerecord-instrumentation 0.6.0.jhemphill1 → 0.6.0.jhemphill4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f9fe8e655275c95316af6091d55c794c384c20b721c301056661aa4eca8aafd
-  data.tar.gz: 128ba9528fdc517e3fddfab4ad75cad0cfea8fd4f4dab7f371cfd0b7c79c5699
+  metadata.gz: 5fceef2796a103f493c939152dcdaa4428111c082e3908354abfbe04b1614f16
+  data.tar.gz: ef23a8d9a4fe682d7dfd5c6d23b8bb45fd188917240d79b27fa1417c56522c90
 SHA512:
-  metadata.gz: 1b3b8da9054b12445889993ee125a3ef456ff97f056ef3ee6194d3bfc100eb263401335e797681334dd58745bc3d9108110bf3b2aa9e69212d25f68a9e840a03
-  data.tar.gz: de602d96113006ff75dbaf44a497289f5fcc193b1fd8a5797a35c3a4bfafa65a546effd7152db406ca901dfc738bae538ef214c24a485888ac9a96e52bf4b668
+  metadata.gz: 70d78da8a4bb59a1f917d94b65bc5c7cdb75a16de16220727ef21ae4c03cf0ba7fa7d12a8d4a266af693cc4971c91b78e8327550f0cc254b169c1da76446b012
+  data.tar.gz: 33b0aa8435da2e6aa7d9877d1019feb37d9d984a39a2906d6dfd614fc26f75afdb53d1bad0782a558e3d8472b621be76abca53c2fc4df87a2fa7c3a27a8060ee

data/CHANGELOG.md

@@ -1,6 +1,9 @@
 Changelog
 =========
 
+## 0.6.0.jhemphill4 07/11/2022
+  * Fixed query tagging for empty queries
+
 ## 0.5.2 01/24/2022
   * Fixed query tagging for empty queries
 

data/Gemfile.lock

@@ -1,31 +1,31 @@
 PATH
   remote: .
   specs:
-    activerecord-instrumentation (0.6.0.jhemphill1)
+    activerecord-instrumentation (0.6.0.jhemphill4)
       activerecord
       opentracing (~> 0.5)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.1.4.4)
-      activesupport (= 6.1.4.4)
-    activerecord (6.1.4.4)
-      activemodel (= 6.1.4.4)
-      activesupport (= 6.1.4.4)
-    activesupport (6.1.4.4)
+    activemodel (6.1.6.1)
+      activesupport (= 6.1.6.1)
+    activerecord (6.1.6.1)
+      activemodel (= 6.1.6.1)
+      activesupport (= 6.1.6.1)
+    activesupport (6.1.6.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
     ast (2.4.0)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     diff-lcs (1.3)
-    i18n (1.10.0)
+    i18n (1.11.0)
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.4)
-    minitest (5.15.0)
+    minitest (5.16.2)
     opentracing (0.5.0)
     opentracing_test_tracer (0.1.1)
       opentracing
@@ -66,7 +66,7 @@ GEM
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     unicode-display_width (1.6.1)
-    zeitwerk (2.5.4)
+    zeitwerk (2.6.0)
 
 PLATFORMS
   ruby

data/lib/active_record/open_tracing/processor.rb

@@ -73,13 +73,16 @@ module ActiveRecord
       end
 
       def tags_for_payload(payload)
+        db_config = connection_config(payload[:connection])
+
         {
           "component" => COMPONENT_NAME,
           "span.kind" => SPAN_KIND,
           "db.instance" => db_instance,
           "db.cached" => payload.fetch(:cached, false),
           "db.type" => DB_TYPE,
-          "peer.address" => peer_address_tag(payload.fetch(:connection, false))
+          "peer.mysql_db_name" => mysql_db_name_tag(payload.fetch(:connection, nil)&.raw_connection),
+          "peer.address" => peer_address_tag(db_config)
         }.merge(db_statement(payload))
       end
 
@@ -104,31 +107,41 @@ module ActiveRecord
         sanitizer ? sanitizer.sanitize(sql) : sql
       end
 
-      def peer_address_tag(connection)
-        unless defined? @peer_address_tag
-          if connection.respond_to? :host # using the postgres adapter
-            @peer_address_tag = connection.host
-          else
-            @peer_address_tag = [
-              "#{connection_config.fetch(:adapter)}://",
-              connection_config[:username],
-              connection_config[:host] && "@#{connection_config[:host]}",
-              "/#{db_instance}"
-            ].join
-          end
-        end
+      def mysql_db_name_tag(db_connection)
+        return db_connection.host if db_connection.respond_to?(:host)
+        return nil
+      end
 
-        @peer_address_tag
+      def peer_address_tag(config)
+        @peer_address_tag ||= [
+          "#{config.fetch(:adapter)}://",
+          config[:username],
+          config[:host] && "@#{config[:host]}",
+          "/#{db_instance}"
+        ].join
       end
 
       def db_instance
         @db_instance ||= connection_config.fetch(:database)
       end
 
-      def connection_config
-        # Rails 6.2 will deprecate ActiveRecord::Base.connection_config
-        @connection_config ||=
-          ActiveRecord::Base.try(:connection_db_config)&.configuration_hash || ActiveRecord::Base.connection_config
+      # If a connection is passed in, pull the db config options hash from it.  This connection
+      # is likely to be attached to the query/query client.  Fall back to the application level
+      # config.  This change will show writer vs reader/replica dbs in spans when it is determined
+      # at the query level.
+      def connection_config(connection = nil)
+        unless defined? @connection_config
+          if connection.raw_connection && connection.raw_connection.respond_to?(:query_options)
+            # you have a mysql client
+            @connection_config = connection.raw_connection.query_options
+          else
+            # Rails 6.2 will deprecate ActiveRecord::Base.connection_config
+            @connection_config = ActiveRecord::Base.try(:connection_db_config)&.configuration_hash ||
+                                  ActiveRecord::Base.connection_config
+          end
+        end
+
+        @connection_config
       end
     end
   end

data/lib/active_record/open_tracing/version.rb

@@ -2,6 +2,6 @@
 
 module ActiveRecord
   module OpenTracing
-    VERSION = "0.6.0.jhemphill1"
+    VERSION = "0.6.0.jhemphill4"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-instrumentation
 version: !ruby/object:Gem::Version
-  version: 0.6.0.jhemphill1
+  version: 0.6.0.jhemphill4
 platform: ruby
 authors:
 - SaleMove TechMovers
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-11 00:00:00.000000000 Z
+date: 2022-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -213,7 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.11
 signing_key: 
 specification_version: 4
 summary: ActiveRecord OpenTracing intrumenter