stackify-ruby-apm 1.14.2 → 1.14.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4db351752b697f408b2c683f6d6e82bb406f4b1acedd9cc8136bd38de622f613
-  data.tar.gz: baa9790e6ecbec16c9c27a68b7e60cdf3955ad60ab75b19fdd6f232efbec26b4
+  metadata.gz: 881446a181c81d422cdd81f2de4b4ccef409989171d96a53833bbe425f8105c0
+  data.tar.gz: ed31e237779e881ab4a57d7db2c4dcc7936bbe01b6af256ac4f53d9ae4c96054
 SHA512:
-  metadata.gz: 611d7584183fc9491055c5dc86f3141a4e6d72fc408e18a7e8b4d54fa1ee598a5ca6197b30ecd047793e1a5a139de89a18f0a6e4006605e0d17a2800558b871e
-  data.tar.gz: 3ce7f56cbabf25ac2c55d049eba7f76b86a056f8e8a248b7625d6762ec0717a680a4f28b03b9b84fb0be49eb074f19ca6f4c54ad9390dfca5812cd3500aa3a03
+  metadata.gz: 293677dce94cf22be5e9a45fb1e7d9b7090fcbbe76a4a1bb679da719896d3ced92c5e34bc6ef0315ef8c05c3ee8621bcd51bac552e6f02bfce635aa13205f23e
+  data.tar.gz: 581165dd6ee9b10a02d206a7f985b6980ee1ddb46a9a2de05e194a6a9578596114823eff12cd4dab96277e82e533bb9c742c0ee72e109de2a8e819405fb5f4ce

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/logger/log_device.rb

@@ -8,6 +8,7 @@
 module StackifyRubyAPM
   # @api private
   class LogDevice < Logger::LogDevice
+    MAX_LOG_FILES_COUNT = 10
     alias_method 'write_without_apm', 'write'
     def write(message)
       if @filename
@@ -84,6 +85,24 @@ module StackifyRubyAPM
     def create_logfile(filename)
       logdev = super
       File.chmod(0o777, filename)
+
+      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
+
+        if log_files.length > MAX_LOG_FILES_COUNT
+          files_to_delete = log_files[MAX_LOG_FILES_COUNT..-1]
+          files_to_delete.each { |f|
+            File.delete(f) if File.exists? f
+          }
+        end
+      rescue
+        # nothing to do here
+      end
+
       logdev
     end
     # rubocop:enable Style/RescueModifier

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,63 @@ 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
+          if Gem::Version.new(Rails::VERSION::STRING) >= Gem::Version.new('6.1')
+            ::ActiveRecord::Base.connection_db_config.to_h
+          else
+            ::ActiveRecord::Base.connection_config.to_h
+          end
         rescue StandardError => error
           debug '[SqlNormalizer] lookup_adapter_config err: ' + error.inspect.to_s
           nil
@@ -55,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/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/version.rb

@@ -2,5 +2,5 @@
 
 # Sets the version of the APM
 module StackifyRubyAPM
-  VERSION = '1.14.2'.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.2
+  version: 1.14.7
 platform: ruby
 authors:
 - Stackify
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-21 00:00:00.000000000 Z
+date: 2021-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails