stackify-ruby-apm 1.14.6 → 1.14.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 207d50046b455753b802c84ef15314d336df3376b986e98f8fff5014aeed6370
-  data.tar.gz: bfc2a15d2d26c9aea7263945b6a0f10c02da58f6c1ed0dfb6ea13fc2adcd6c38
+  metadata.gz: 881446a181c81d422cdd81f2de4b4ccef409989171d96a53833bbe425f8105c0
+  data.tar.gz: ed31e237779e881ab4a57d7db2c4dcc7936bbe01b6af256ac4f53d9ae4c96054
 SHA512:
-  metadata.gz: bc2621fd6efa921753d1db81649e7cbff2f26b35350798c82a01a2326752ba2db8e42ccd5de1730a69a9516a849b48943415b9160ffeaa0b70b5baea54f3cb9e
-  data.tar.gz: 7f6b9b487101dad81b0b29acfe7c1844d29a778ff48235a9180160c2724dd78a57a8d6eee515169a01e4e36f92156ee9f590aa2a88de4043f1c47de64666d061
+  metadata.gz: 293677dce94cf22be5e9a45fb1e7d9b7090fcbbe76a4a1bb679da719896d3ced92c5e34bc6ef0315ef8c05c3ee8621bcd51bac552e6f02bfce635aa13205f23e
+  data.tar.gz: 581165dd6ee9b10a02d206a7f985b6980ee1ddb46a9a2de05e194a6a9578596114823eff12cd4dab96277e82e533bb9c742c0ee72e109de2a8e819405fb5f4ce

data/lib/stackify_apm/helper/database_helper.rb

@@ -19,6 +19,8 @@ module DatabaseHelper
       'db2'
     elsif driver.include? 'sqlite'
       'sqlite'
+    else
+      'generic'
     end
   end
   # rubocop:enable Metrics/CyclomaticComplexity

data/lib/stackify_apm/normalizers/active_record.rb

@@ -14,7 +14,6 @@ module StackifyRubyAPM
 
         def initialize(*args)
           super(*args)
-          @type = nil
         end
 
         def normalize(_transaction, _name, payload)
@@ -25,11 +24,8 @@ module StackifyRubyAPM
           name = payload[:sql] || payload[:name] || 'Default'
           context = Span::Context.new(statement)
 
-          if (@type == nil)
-            @type = format('db.%s.sql', lookup_adapter || 'unknown').freeze
-          end
-
-          [name, @type, context]
+          type = format('db.%s.sql', lookup_adapter(payload) || 'unknown').freeze
+          [name, type, context]
         end
 
         private
@@ -37,7 +33,7 @@ module StackifyRubyAPM
         def query_variables(payload)
           adapter_config = lookup_adapter_config
           props = get_common_db_properties
-          props[:PROVIDER] = get_profiler(lookup_adapter)
+          props[:PROVIDER] = get_profiler(lookup_adapter(payload))
           props[:SQL] = payload[:sql]
           if adapter_config
             props[:URL] = "#{adapter_config[:host]}:#{adapter_config[:port]}"
@@ -60,8 +56,37 @@ module StackifyRubyAPM
         # Retrieve Connection: lib/active_record/connection_handling.rb#L309
         # Handler Retrieve Connection: lib/active_record/connection_adapters/abstract/connection_pool.rb#L1111
         
-        def lookup_adapter
-          ::ActiveRecord::Base.connection.adapter_name.downcase
+        def lookup_adapter(payload)
+          connection = nil
+          if (payload.key?(:connection))
+            connection = payload[:connection]
+          elsif ::ActiveRecord::Base.connection_pool.instance_variable_defined?(:@reserved_connections) and payload.key?(:connection_id)
+            connection_id = payload[:connection_id] # Connection ID here is the object_id of the connection object
+            connections = ::ActiveRecord::Base.connection_pool.instance_variable_get(:@reserved_connections) # Lets check the reserved connections
+
+            if (
+                (connections.class != nil and connections.respond_to?(:class) and
+                  (connections.class.to_s == 'ThreadSafe::Cache' or connections.class.to_s == 'Hash')
+                ) and connections.size()
+            )
+              connections.each_value do |val|
+                if val.object_id == connection_id
+                  connection = val
+                  break
+                end
+              end
+            end
+          end
+
+          if (connection.nil?)
+            return 'generic'
+          end
+
+          if (connection.respond_to?(:adapter_name) && connection.adapter_name.nil?)
+            return 'generic'
+          end
+
+          connection.adapter_name.downcase
         rescue StandardError => error
           debug '[SqlNormalizer] lookup_adapter err: ' + error.inspect.to_s
           nil
@@ -80,7 +105,7 @@ module StackifyRubyAPM
 
         def check_prepared_stmt(statement, payload)
           if StackifyRubyAPM.agent.config.prefix_enabled
-            case get_profiler(lookup_adapter)
+            case get_profiler(lookup_adapter(payload))
             when 'generic', 'mysql', 'sqlite', 'oracle', 'db2'
               check_prepared_stmt_by_placeholder(payload[:sql].include?('?'), statement, payload)
             when 'postgresql'

data/lib/stackify_apm/version.rb

@@ -2,5 +2,5 @@
 
 # Sets the version of the APM
 module StackifyRubyAPM
-  VERSION = '1.14.6'.freeze
+  VERSION = '1.14.7'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stackify-ruby-apm
 version: !ruby/object:Gem::Version
-  version: 1.14.6
+  version: 1.14.7
 platform: ruby
 authors:
 - Stackify
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-04 00:00:00.000000000 Z
+date: 2021-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails