activerecord-instrumentation 0.6.0.jhemphill3 → 0.6.0.jhemphill4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95c186a845e1f54640ec23d41c6f4af63672c70a2b40eead66abd7dfdfa9a5d9
-  data.tar.gz: 5dbd6b7b69424ff53fe2aaaecd2c9980ea427f32ac85b69f779b6bd60fbfe1c5
+  metadata.gz: 5fceef2796a103f493c939152dcdaa4428111c082e3908354abfbe04b1614f16
+  data.tar.gz: ef23a8d9a4fe682d7dfd5c6d23b8bb45fd188917240d79b27fa1417c56522c90
 SHA512:
-  metadata.gz: 1542c660df6a46953df85ed993648afcf28b3a5195560176b528d7f03dd148ad404bbe53e732ea8ac4a0fa6f81cc471e89bb8931da42aa0c181ac93c819f8b36
-  data.tar.gz: bf4172f41056e08ef86bbcab7a6c56cd2d044d90f18ccd600ac59758ead73abf056283e7b2424771460b6a1ed6fd9a74d0d36ac790986629810d429167d259b6
+  metadata.gz: 70d78da8a4bb59a1f917d94b65bc5c7cdb75a16de16220727ef21ae4c03cf0ba7fa7d12a8d4a266af693cc4971c91b78e8327550f0cc254b169c1da76446b012
+  data.tar.gz: 33b0aa8435da2e6aa7d9877d1019feb37d9d984a39a2906d6dfd614fc26f75afdb53d1bad0782a558e3d8472b621be76abca53c2fc4df87a2fa7c3a27a8060ee

data/CHANGELOG.md

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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    activerecord-instrumentation (0.6.0.jhemphill3)
+    activerecord-instrumentation (0.6.0.jhemphill4)
       activerecord
       opentracing (~> 0.5)
 

data/lib/active_record/open_tracing/processor.rb

@@ -73,6 +73,8 @@ module ActiveRecord
       end
 
       def tags_for_payload(payload)
+        db_config = connection_config(payload[:connection])
+
         {
           "component" => COMPONENT_NAME,
           "span.kind" => SPAN_KIND,
@@ -80,7 +82,7 @@ module ActiveRecord
           "db.cached" => payload.fetch(:cached, false),
           "db.type" => DB_TYPE,
           "peer.mysql_db_name" => mysql_db_name_tag(payload.fetch(:connection, nil)&.raw_connection),
-          "peer.address" => peer_address_tag
+          "peer.address" => peer_address_tag(db_config)
         }.merge(db_statement(payload))
       end
 
@@ -110,24 +112,36 @@ module ActiveRecord
         return nil
       end
 
-      def peer_address_tag
-        @peer_address_tag ||=
-          [
-            "#{connection_config.fetch(:adapter)}://",
-            connection_config[:username],
-            connection_config[:host] && "@#{connection_config[:host]}",
-            "/#{db_instance}"
-          ].join
+      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.jhemphill3"
+    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.jhemphill3
+  version: 0.6.0.jhemphill4
 platform: ruby
 authors:
 - SaleMove TechMovers