activerecord-instrumentation 0.5.1 → 0.6.0.jhemphill1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec1aa8f04a43ddc425d1b75bbb1b36e2a460a40301fa26ab3c231011acb2205a
-  data.tar.gz: 584f05b61f5bc532dcdbf65cd08d5e45697994f8dec83ab9c2f85b02175c0b9e
+  metadata.gz: 2f9fe8e655275c95316af6091d55c794c384c20b721c301056661aa4eca8aafd
+  data.tar.gz: 128ba9528fdc517e3fddfab4ad75cad0cfea8fd4f4dab7f371cfd0b7c79c5699
 SHA512:
-  metadata.gz: 9f4f2a6b39886d381866f1df1e0cd0edd83c39c9f603139948276216e8627cc34a9db7be1a10a8dfdb2df660601f28e291de642a9207ffbfefc78176ca96c570
-  data.tar.gz: 38c5ba6648ade1f097333ce41e4b47b6ecca143ad620b96b60cae1d6c68886d10726f96039040826b71b09463fb95ffa620aead8389375777af84d4c71503f78
+  metadata.gz: 1b3b8da9054b12445889993ee125a3ef456ff97f056ef3ee6194d3bfc100eb263401335e797681334dd58745bc3d9108110bf3b2aa9e69212d25f68a9e840a03
+  data.tar.gz: de602d96113006ff75dbaf44a497289f5fcc193b1fd8a5797a35c3a4bfafa65a546effd7152db406ca901dfc738bae538ef214c24a485888ac9a96e52bf4b668

data/CHANGELOG.md

@@ -1,6 +1,9 @@
 Changelog
 =========
 
+## 0.5.2 01/24/2022
+  * Fixed query tagging for empty queries
+
 ## 0.5.1 01/20/2022
   * Fixed the publishing process
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    activerecord-instrumentation (0.5.1)
+    activerecord-instrumentation (0.6.0.jhemphill1)
       activerecord
       opentracing (~> 0.5)
 
@@ -22,7 +22,7 @@ GEM
     ast (2.4.0)
     concurrent-ruby (1.1.9)
     diff-lcs (1.3)
-    i18n (1.8.11)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.4)
     minitest (5.15.0)
@@ -66,7 +66,7 @@ GEM
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     unicode-display_width (1.6.1)
-    zeitwerk (2.5.3)
+    zeitwerk (2.5.4)
 
 PLATFORMS
   ruby

data/lib/active_record/open_tracing/processor.rb

@@ -79,7 +79,7 @@ module ActiveRecord
           "db.instance" => db_instance,
           "db.cached" => payload.fetch(:cached, false),
           "db.type" => DB_TYPE,
-          "peer.address" => peer_address_tag
+          "peer.address" => peer_address_tag(payload.fetch(:connection, false))
         }.merge(db_statement(payload))
       end
 
@@ -87,7 +87,7 @@ module ActiveRecord
       def db_statement(payload)
         if sql_logging_enabled
           query_sql = sanitize_sql(payload.fetch(:sql).squish)
-          first_word = query_sql.split.first.downcase
+          first_word = query_sql.split.first&.downcase || ""
 
           {
             "db.statement" => query_sql,
@@ -104,13 +104,21 @@ module ActiveRecord
         sanitizer ? sanitizer.sanitize(sql) : sql
       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(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
+
+        @peer_address_tag
       end
 
       def db_instance

data/lib/active_record/open_tracing/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-instrumentation
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0.jhemphill1
 platform: ruby
 authors:
 - SaleMove TechMovers
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-20 00:00:00.000000000 Z
+date: 2022-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -209,11 +209,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: ActiveRecord OpenTracing intrumenter