stackify-ruby-apm 1.14.0 → 1.14.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76953d4e093b082edd18b9b64c80f282cef005ca138ded983b5bc88b1545db96
-  data.tar.gz: 3c1fba2fa393369d38de568f91dbec9d1708a963c5f3802719f285c2e99edefa
+  metadata.gz: 207d50046b455753b802c84ef15314d336df3376b986e98f8fff5014aeed6370
+  data.tar.gz: bfc2a15d2d26c9aea7263945b6a0f10c02da58f6c1ed0dfb6ea13fc2adcd6c38
 SHA512:
-  metadata.gz: d1b9b23f4c1b473fc45850f996701cc33703de8a6937297638d84603a4ce816b2e00cb318d73eca407e073f1f41403d82b9d1bc7305cf4623b47a53965d8b576
-  data.tar.gz: 517edbe2b9f8ff7e1c5c8ecb381f93fc39a28af406de5c6ec45b5ff3c99a113bd4833482f38f7944f1c542e2a027e2c581c5d36df45d8b1749aefcdc752050df
+  metadata.gz: bc2621fd6efa921753d1db81649e7cbff2f26b35350798c82a01a2326752ba2db8e42ccd5de1730a69a9516a849b48943415b9160ffeaa0b70b5baea54f3cb9e
+  data.tar.gz: 7f6b9b487101dad81b0b29acfe7c1844d29a778ff48235a9180160c2724dd78a57a8d6eee515169a01e4e36f92156ee9f590aa2a88de4043f1c47de64666d061

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/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

@@ -53,6 +53,8 @@ module StackifyRubyAPM
         if okay_to_modify?
           @configuration.already_instrumented_flag = true
           if @configuration.rum_enabled.is_a?(TrueClass)
+            # close old response body proxy to close all db connections
+            @rack_body.close if @rack_body.respond_to?(:close)
             response = Rack::Response.new @rack_body, @rack_status, @rack_headers
             response.set_cookie(@configuration.rum_cookie_name, value: transaction.id, path: @configuration.rum_cookie_path)
             resp = response.finish
@@ -125,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,7 @@ module StackifyRubyAPM
 
         def initialize(*args)
           super(*args)
-
-          @type = format('db.%s.sql', lookup_adapter || 'unknown').freeze
+          @type = nil
         end
 
         def normalize(_transaction, _name, payload)
@@ -23,6 +24,11 @@ module StackifyRubyAPM
           check_prepared_stmt(statement, payload)
           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]
         end
 
@@ -39,6 +45,21 @@ module StackifyRubyAPM
           props
         end
 
+        # 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
           ::ActiveRecord::Base.connection.adapter_name.downcase
         rescue StandardError => error
@@ -47,7 +68,11 @@ module StackifyRubyAPM
         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

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.0'.freeze
+  VERSION = '1.14.6'.freeze
 end

metadata

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