activerecord-instrumentation 0.6.0.jhemphill2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29ef8227c4292b15e644ab1b59e56c28d48d97e36fe7be95862678bae61e5d9c
-  data.tar.gz: 0e1efa52bb4a69a41b219028e8a25d9b21a67026c138d08c4b05b4bf72ab85bd
+  metadata.gz: 6ce6d77768f0c5c8ee3b9bc7459c840900d022ef672fb78f9342163bcfdee7ae
+  data.tar.gz: 5e73e0e111b40319e11326fe2247980daac4db510424b2d6c39452cba0f6fc06
 SHA512:
-  metadata.gz: fc2935010852dca0b75cc17d3add77c3257a7b636117eb0fd58e19cb06132d6f2475bc9ecf02964e970625b2660b51f4d1e8eeb8b9265d693b7fc835c34654e4
-  data.tar.gz: a7368790d1e844bf6b47812b50c2b439081c79648869f1eaf0dfba6e573568b0b7bd4097df7eefd7ce9dbe35cc9b584b0e4f5238dfd7c701cdbda2fb9f2279ab
+  metadata.gz: a18568aadaa039d7b14dfaecd8a95a2e909399c7640127e4389f9a9fc0875e30e9349a64747f2e2005c48e9281af44f42601ea6a22ea04b77f47ec77cdc2191b
+  data.tar.gz: 2a6e52c506b1c997e7ac881cad9117559471ed8af64c5bb7c1c503b98548b56d90610670f92f67d717c6393f9e370c360bebb15bcdd95e8d77ae08c5518ac469

data/CHANGELOG.md

@@ -1,8 +1,8 @@
 Changelog
 =========
 
-## 0.6.0.jhemphill2 07/11/2022
-  * Fixed query tagging for empty queries
+## 0.6.0 07/11/2022
+  * Improved pper address tag to reflect the current database when using the mysql adapter
 
 ## 0.5.2 01/24/2022
   * Fixed query tagging for empty queries

data/Gemfile.lock

@@ -1,19 +1,19 @@
 PATH
   remote: .
   specs:
-    activerecord-instrumentation (0.6.0.jhemphill2)
+    activerecord-instrumentation (0.6.0)
       activerecord
       opentracing (~> 0.5)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.1.6)
-      activesupport (= 6.1.6)
-    activerecord (6.1.6)
-      activemodel (= 6.1.6)
-      activesupport (= 6.1.6)
-    activesupport (6.1.6)
+    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)

data/lib/active_record/open_tracing/processor.rb

@@ -73,14 +73,15 @@ 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,
-          "connection" => payload[:connection].inspect,
-          "peer.address" => peer_address_tag(payload.fetch(:connection, false))
+          "peer.address" => peer_address_tag(db_config)
         }.merge(db_statement(payload))
       end
 
@@ -105,32 +106,36 @@ 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/mysql adapter
-            @peer_address_tag = connection.host + "_hotdogs_"
-          else
-            @peer_address_tag = "farts"
-            # [
-            #   "#{connection_config.fetch(:adapter)}://",
-            #   connection_config[:username],
-            #   connection_config[:host] && "@#{connection_config[:host]}",
-            #   "/#{db_instance}"
-            # ].join
-          end
-        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.jhemphill2"
+    VERSION = "0.6.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-instrumentation
 version: !ruby/object:Gem::Version
-  version: 0.6.0.jhemphill2
+  version: 0.6.0
 platform: ruby
 authors:
 - SaleMove TechMovers
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-12 00:00:00.000000000 Z
+date: 2022-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -209,9 +209,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.3.11
 signing_key: