stackify-ruby-apm 1.17.0 → 1.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e7111fe28e3f3d664a3ee3859b710ca68ad9419dff7be6bf08790c1c33daf93
-  data.tar.gz: 3db3dd30f3a82d751e649c5096fd27da82664184c24b9b434610a0ecac05b21b
+  metadata.gz: 95f66de5cfc9c86486d1d9be9083f3d86300ee9d546ee23c56a493bb99ab8fbf
+  data.tar.gz: ead544f89afaab3ccd1f77f249eff2cc76815353b4eb5ca8bd680937c4fa07da
 SHA512:
-  metadata.gz: 41712bd53c97a593907924abefbdeb4421a9487a7622b568d65fa3bbf30d678208d2477a51b9253e98172976ed541d16bf4ce36db48d240d99ff4d125fef7f45
-  data.tar.gz: e1413677db26b8548e83ce3a49d72394256b156feed4a9181f400edab0db46b180a3f6d86f1a737007756cc5edf64984dac1fa1ef2ac766a496489b5dabbdfe3
+  metadata.gz: 40e949476ed9c2b35420f574850c5e52086ff7f5c617a09728d62a2449bcc0b6d93af75271bf800b7718dcea122ebe819b8f9d0316d97e78b667667393dc99df
+  data.tar.gz: de9e2587b22f07aea878e714153ee19d60efe7a397363d2df5cdeed96051f62a4797580a61b83a41c3adde28446c1e1bf7f604afd30a5ba1bd662052e466c5ad

data/lib/stackify_apm/normalizers/active_record.rb

@@ -20,21 +20,22 @@ module StackifyRubyAPM
         def normalize(_transaction, _name, payload)
           return :skip if %w[SCHEMA CACHE].include?(payload[:name])
 
-          statement = query_variables(payload)
-          check_prepared_stmt(statement, payload)
+          adapter = lookup_adapter(payload)
+          statement = query_variables(payload, adapter)
+          check_prepared_stmt(statement, payload, adapter)
           name = payload[:sql] || payload[:name] || 'Default'
           context = Span::Context.new(statement)
 
-          type = format('db.%s.sql', lookup_adapter(payload) || 'unknown').freeze
+          type = format('db.%s.sql', adapter || 'unknown').freeze
           [name, type, context]
         end
 
         private
 
-        def query_variables(payload)
+        def query_variables(payload, adapter)
           adapter_config = lookup_adapter_config
           props = get_common_db_properties
-          props[:PROVIDER] = get_profiler(lookup_adapter(payload))
+          props[:PROVIDER] = get_profiler(adapter)
           props[:SQL] = payload[:sql]
           if adapter_config
             props[:URL] = "#{adapter_config[:host]}:#{adapter_config[:port]}"
@@ -58,52 +59,44 @@ module StackifyRubyAPM
         # Handler Retrieve Connection: lib/active_record/connection_adapters/abstract/connection_pool.rb#L1111
         
         def lookup_adapter(payload)
-          connection = nil
+          # If connection is explicitly set
           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
+            if (connection.respond_to?(:adapter_name) && !connection.adapter_name.nil?)
+              return connection.adapter_name.downcase
+            end
+          elsif ::ActiveRecord::Base.respond_to?(:connection_handler) && ::ActiveRecord::Base.connection_handler.connection_pool_list.size() > 0 && payload.key?(:connection_id)
+            connection_id = payload[:connection_id]
+            connection = nil
+            connection_pool = nil
+            connection_pool_list = ::ActiveRecord::Base.connection_handler.connection_pool_list
+            connection_pool_list.each do |pool|
+              pool.instance_variable_get(:@connections).each do |conn|
+                if conn.object_id == connection_id
+                  connection = conn
                   break
                 end
               end
             end
-          end
 
-          if (connection.nil?)
-            if ::ActiveRecord::Base.respond_to?(:connection)
-              return ::ActiveRecord::Base.connection.adapter_name.downcase
-            else
-              return 'generic'
+            if (!connection.nil? && connection.respond_to?(:adapter_name))
+              return connection.adapter_name.downcase
             end
           end
-
-          if (connection.respond_to?(:adapter_name) && connection.adapter_name.nil?)
-            if ::ActiveRecord::Base.respond_to?(:connection)
-              return ::ActiveRecord::Base.connection.adapter_name.downcase
-            else
-              return 'generic'
+          if (::ActiveRecord::Base.respond_to?(:connection_pool) && ::ActiveRecord::Base.connection_pool)
+            base_connection_pool = ::ActiveRecord::Base.connection_pool
+            if (base_connection_pool.respond_to?(:config))
+              return base_connection_pool.config[:adapter]
+            end
+            if (base_connection_pool.respond_to?(:db_config))
+              return base_connection_pool.db_config[:adapter]
             end
           end
 
-          connection.adapter_name.downcase
+          return 'generic'
         rescue StandardError => error
           debug '[SqlNormalizer] lookup_adapter err: ' + error.inspect.to_s
-          # do a last fail safe check before returning nil
-          if ::ActiveRecord::Base.respond_to?(:connection)
-            ::ActiveRecord::Base.connection.adapter_name.downcase
-          else
-            nil
-          end
+          return 'generic'
         end
 
         def lookup_adapter_config
@@ -121,9 +114,9 @@ module StackifyRubyAPM
           nil
         end
 
-        def check_prepared_stmt(statement, payload)
+        def check_prepared_stmt(statement, payload, adapter)
           if StackifyRubyAPM.agent.config.prefix_enabled
-            case get_profiler(lookup_adapter(payload))
+            case get_profiler(adapter)
             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.17.0'.freeze
+  VERSION = '1.17.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stackify-ruby-apm
 version: !ruby/object:Gem::Version
-  version: 1.17.0
+  version: 1.17.1
 platform: ruby
 authors:
 - Stackify
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-02-05 00:00:00.000000000 Z
+date: 2024-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails