stackify-ruby-apm 1.14.3 → 1.14.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 998639c042ca9a4beea8fc1e43db3389f03ca76862584c4a61dc1005e9607fe8
-  data.tar.gz: 90826860e8e0a3a94f4d6fab8dce27dfa2e467f78ba8cf17543bc31c5df5749e
+  metadata.gz: 071d161a1f209e027f271d462fdc8cdf57c8d68197d8ae1ed6190cebe9e2114b
+  data.tar.gz: 815f90aaa08dcd15878bc93e7a18d71619a8cd1f55959ef18c0918267754a3df
 SHA512:
-  metadata.gz: e4964f5b9c622aeaefe9e6f6760817a03d5987edf28337f79ebc2e513887efc6fa3eb383238a0921bbe4badf42d364a6c30710cd0ad5d74d69a131e24f470f1d
-  data.tar.gz: dfb9f04b510a26ddf237d7c7718b6d2f38130e165c7bb798085dad64d19b740f78a4d28a6aec91b2c744aedfbe1eba4cd30abe1aa2a8eab59a61cb3210814012
+  metadata.gz: 35d8996e6e1bdc270ba44a231e405275d7b090efd316daa590aeefe2875a0b586f19b8c280fdab16c8a8e5f9b482038c344b40c1893358528a9e4ffa2b5018d0
+  data.tar.gz: 1ce353e5bf442f5ae8c18a5f1c323f0aa177586dc46942f9082baf1fa1acfc1980b04f3b5745a538f5eab7271c7bfdd0a340e2455d97d1695eafac7c9522d17f

data/lib/stackify_apm/context_builder.rb

@@ -41,6 +41,8 @@ module StackifyRubyAPM
     end
 
     def rails_req?(env)
+      # Not used
+      # Possible use of ActiveSupport.on_load(:action_dispatch_request)
       defined?(ActionDispatch::Request) &&
         env.is_a?(ActionDispatch::Request)
     end

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/instrumenter_helper.rb

@@ -35,6 +35,8 @@ module StackifyRubyAPM
       classspyitem = "#{current_class}Spy"
       module_consget_spy = Module.const_get(current_class)
       current_method_without = "_without_apm_#{current_method}"
+      is_private_method = options[:is_private_method] || false
+      is_protected_method = options[:is_protected_method] || false
 
       unless @custom_instrumented[current_class.to_s]
         @custom_instrumented[current_class.to_s] = {}
@@ -63,7 +65,14 @@ module StackifyRubyAPM
           def install
             #{current_class}.class_eval do
               alias_method "#{current_method_without}", "#{current_method}"
-
+              
+              #{
+                if is_private_method
+                  then "private"
+                elsif is_protected_method
+                  then "protected"
+                end
+              }
               def #{current_method}(*args, &block)
                 if StackifyRubyAPM.current_transaction.nil? && #{!transaction.nil?}
                   t = StackifyRubyAPM.transaction("custom.#{current_class}.#{current_method}", TRACETYPE)

data/lib/stackify_apm/logger/log_device.rb

@@ -88,6 +88,8 @@ module StackifyRubyAPM
 
       begin
         dir_name = File.dirname(filename)
+        # repath current file due to windows separator \\ doesn't work with Dir.glob
+        dir_name = dir_name.split(File::ALT_SEPARATOR).join(File::SEPARATOR)
         search_files = File.join("#{dir_name}", "{[!stackify-ruby-apm]*}.log")
         log_files = Dir.glob(search_files).sort_by { |f| File.stat(f).mtime}.reverse
 

data/lib/stackify_apm/middleware.rb

@@ -127,6 +127,8 @@ module StackifyRubyAPM
     end
 
     def streaming?(env)
+      # Not used
+      # Possible use of ActiveSupport.on_load(:action_controller_base)
       return false unless defined?(ActionController::Live)
 
       env['action_controller.instance'].class.included_modules.include?(ActionController::Live)

data/lib/stackify_apm/normalizers/active_record.rb

@@ -1,4 +1,6 @@
 # frozen_string_literal: true
+# Not used
+# Possible use of ActiveSupport.on_load(:active_record)
 
 require 'stackify_apm/helper/database_helper'
 
@@ -12,8 +14,6 @@ module StackifyRubyAPM
 
         def initialize(*args)
           super(*args)
-
-          @type = format('db.%s.sql', lookup_adapter || 'unknown').freeze
         end
 
         def normalize(_transaction, _name, payload)
@@ -23,7 +23,9 @@ module StackifyRubyAPM
           check_prepared_stmt(statement, payload)
           name = payload[:sql] || payload[:name] || 'Default'
           context = Span::Context.new(statement)
-          [name, @type, context]
+
+          type = format('db.%s.sql', lookup_adapter(payload) || 'unknown').freeze
+          [name, type, context]
         end
 
         private
@@ -31,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]}"
@@ -39,15 +41,67 @@ module StackifyRubyAPM
           props
         end
 
-        def lookup_adapter
-          ::ActiveRecord::Base.connection.adapter_name.downcase
+        # Ideally the application doesn't connect to the database during boot,
+        # but sometimes it does. In case it did, we want to empty out the
+        # connection pools so that a non-database-using process (e.g. a master
+        # process in a forking server model) doesn't retain a needless
+        # connection. If it was needed, the incremental cost of reestablishing
+        # this connection is trivial: the rest of the pool would need to be
+        # populated anyway.
+        #
+        # Reference: https://github.com/rails/rails/blob/main/activerecord/lib/active_record/railtie.rb#L253
+        #
+        # Miko: Considering we are getting the connection method, it is retrieving connection from the connection pool
+        # Connection Method: lib/active_record/connection_handling.rb#L264
+        # 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(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
         end
 
         def lookup_adapter_config
-          ::ActiveRecord::Base.connection_config.to_h
+          config = nil
+          if Gem::Version.new(Rails::VERSION::STRING) >= Gem::Version.new('6.1')
+            config = ::ActiveRecord::Base.connection_db_config
+          else
+            config = ::ActiveRecord::Base.connection_config
+          end
+          if (config != nil && config.respond_to(:to_h))
+            config.to_h
+          end
         rescue StandardError => error
           debug '[SqlNormalizer] lookup_adapter_config err: ' + error.inspect.to_s
           nil
@@ -55,7 +109,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/spies/custom_instrumenter.rb

@@ -70,6 +70,8 @@ module StackifyRubyAPM
           mod_constant = Module.const_get(current_class.to_s)
           klass_method_flag = mod_constant.method_defined?(current_method.to_s)
           singleton_method_flag = mod_constant.respond_to?(current_method.to_s)
+          klass_private_method_flag = mod_constant.private_method_defined?(current_method.to_s)
+          klass_protected_method_flag = mod_constant.protected_method_defined?(current_method.to_s)
 
           class_location = mod_constant.instance_methods(false).map do |m|
             mod_constant.instance_method(m).source_location.first
@@ -77,8 +79,17 @@ module StackifyRubyAPM
 
           class_path = class_location.last
 
-          if klass_method_flag
-            StackifyRubyAPM::InstrumenterHelper.m_class(tracked_func, current_class, class_path, current_method: current_method, tracked_function_name: tracked_function_name, is_transaction: transaction)
+          if klass_method_flag || klass_private_method_flag
+            StackifyRubyAPM::InstrumenterHelper.m_class(
+              tracked_func,
+              current_class,
+              class_path,
+              current_method: current_method,
+              tracked_function_name: tracked_function_name,
+              is_transaction: transaction,
+              is_private_method: klass_private_method_flag,
+              is_protected_method: klass_protected_method_flag
+            )
           elsif singleton_method_flag
             StackifyRubyAPM::InstrumenterHelper.m_singleton(tracked_func, current_class, class_path, current_method: current_method, tracked_function_name: tracked_function_name, is_transaction: transaction)
           end

data/lib/stackify_apm/spies/faraday.rb

@@ -36,7 +36,7 @@ module StackifyRubyAPM
               ctx = Span::Context.new(
                 CATEGORY: 'Web External',
                 SUBCATEGORY: 'Execute',
-                URL: uri,
+                URL: uri.to_s,
                 STATUS: '',
                 METHOD: method_upcase
               )

data/lib/stackify_apm/spies/redis.rb

@@ -33,7 +33,11 @@ module StackifyRubyAPM
                 # Possible formats:
                 # `<namespace:key/method_name/expires_in=300/ttl=60/>`
                 # `<namespace:key/expires_in=300/ttl=60/>`
-                redis_key = args[0..1].join('/') if args.length > 1 && !args[1].include?('=')
+                if redis_key.nil?
+                  redis_key = redis_details[1]
+                else
+                  redis_key = args[0..1].join('/') if args.length > 1 && !args[1].include?('=')
+                end
               end
 
               return call_without_apm(command, &block) if command[0] == :auth
@@ -48,8 +52,8 @@ module StackifyRubyAPM
                 OPERATION: name,
                 URL: "#{self.options[:host]}:#{self.options[:port]}"
               }.tap do |hash|
-                hash[:CACHEKEY] = redis_key unless redis_key.empty?
-                hash[:CACHENAME] = redis_nspace unless redis_nspace.empty?
+                hash[:CACHEKEY] = redis_key unless redis_key.nil? || redis_key.empty?
+                hash[:CACHENAME] = redis_nspace unless redis_nspace.nil? || redis_nspace.empty?
               end
 
               ctx = Span::Context.new(context)

data/lib/stackify_apm/spies/sinatra_activerecord/mysql_adapter.rb

@@ -2,6 +2,9 @@
 
 # Spies for active record when sinatra framework is used and active_record is being extended. (mysql adapter)
 
+# Not used
+# Possible use of ActiveSupport.on_load(:active_record)
+
 require 'stackify_apm/helper/database_helper'
 
 module StackifyRubyAPM

data/lib/stackify_apm/spies/sinatra_activerecord/postgresql_adapter.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 # Spies for active record when sinatra framework is used and active_record is being extended. (mysql adapter)
+# Not used
+# Possible use of ActiveSupport.on_load(:active_record)
 
 require 'stackify_apm/helper/database_helper'
 

data/lib/stackify_apm/spies/sinatra_activerecord/sqlite_adapter.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 # Spies for active record when sinatra framework is used and active_record is being extended. (mysql adapter)
+# Not used
+# Possible use of ActiveSupport.on_load(:active_record)
 
 require 'stackify_apm/helper/database_helper'
 

data/lib/stackify_apm/transport/agent_http_client.rb

@@ -42,7 +42,7 @@ module StackifyRubyAPM
         message = get_json_message(transactions)
         conn = Faraday.new(ssl: { verify: false })
         response = conn.post do |req|
-          req.url URI(@config.transport_http_endpoint + @config.agent_traces_url)
+          req.url URI(@config.transport_http_endpoint + @config.agent_traces_url).to_s
           req.headers = get_json_headers
           req.body = message
         end

data/lib/stackify_apm/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stackify-ruby-apm
 version: !ruby/object:Gem::Version
-  version: 1.14.3
+  version: 1.14.8
 platform: ruby
 authors:
 - Stackify
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-23 00:00:00.000000000 Z
+date: 2021-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails