stackify-ruby-apm 1.13.2 → 1.14.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1ee1b9b91d78729820e74b7fbc014310af4037390de6c0982cb0169cba50a8a
-  data.tar.gz: 3a7dfe377099f033779e85d591e8ec973039ee4a4b59f20175e57afdd967819a
+  metadata.gz: 81a16e2527e1237952803d7082cd0869b932e2af04dd3263490e5bd6538debbd
+  data.tar.gz: 3df0659ad3e96984f67c9850e69f38c20fae65ced83948b2791a2a9fe63012af
 SHA512:
-  metadata.gz: 143b1fba17994c286ad71dc020d731247079b28a75fda11ee742ed8d49c023557a731e16c0ae8715153d6f5c98dbbb7dbbdaa10a225d4ad8f5f0750aedb7a739
-  data.tar.gz: 28be6a1c40fa6dab5fc5a35f2c56e99984c579d4e5f84e5481ffa6e5c9b9fa9c615a0425c1af81d5a3d1d7d4088df1b4f777250fde816b48a2049f320a1df1c4
+  metadata.gz: d6a34b33a19b3a59c69fdfa105255b234a77b3be6b81a0bbdac68bc39bdc92eb327c33d236d49beb064dafe87b6f4e882df53fb29365b2152572f4d9cf7fdf08
+  data.tar.gz: e05ee709696f67a2bb4c7780a2b762393f5be5507c3af5b327c825e500fd3a18786827f2ba2e8d98df8e926af6cc2d4a5dc79fd380f8392fdd8443e04a998c5c

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'
 
@@ -29,9 +31,13 @@ module StackifyRubyAPM
         private
 
         def query_variables(payload)
+          adapter_config = lookup_adapter_config
           props = get_common_db_properties
           props[:PROVIDER] = get_profiler(lookup_adapter)
           props[:SQL] = payload[:sql]
+          if adapter_config
+            props[:URL] = "#{adapter_config[:host]}:#{adapter_config[:port]}"
+          end
           props
         end
 
@@ -42,6 +48,17 @@ module StackifyRubyAPM
           nil
         end
 
+        def lookup_adapter_config
+          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
+        end
+
         def check_prepared_stmt(statement, payload)
           if StackifyRubyAPM.agent.config.prefix_enabled
             case get_profiler(lookup_adapter)

data/lib/stackify_apm/spies/dynamo_db.rb

@@ -25,6 +25,7 @@ module StackifyRubyAPM
                   CATEGORY: 'Database',
                   SUBCATEGORY: 'DynamoDB',
                   ACTION: operation_name,
+                  URL: self.config.endpoint,
                 )
               rescue Exception => e
                 StackifyRubyAPM.agent.error "[DynamoDBSpy] Error: creating span context."

data/lib/stackify_apm/spies/mongo.rb

@@ -55,7 +55,9 @@ module StackifyRubyAPM
           #
           ctx = Span::Context.new(
             CATEGORY: 'MongoDB',
-            MONGODB_COLLECTION: col
+            MONGODB_COLLECTION: col,
+            OPERATION: event.command_name.to_s,
+            URL: event.address.to_s
           )
 
           # Creates new span from Mongo event

data/lib/stackify_apm/spies/redis.rb

@@ -18,11 +18,13 @@ module StackifyRubyAPM
               name = command[0].upcase.to_s
               type = 'db.redis'
               redis_details = command[1].is_a?(String) ? command[1].split(':') : []
-              redis_nspace = !redis_details.blank? ? redis_details[0] : ''
+              # use length instead of .blank?
+              # reason: will throw error if activesupport missing
+              redis_nspace = redis_details.length ? redis_details[0] : ''
               redis_key = ''
 
               # Checks CACHEKEY value
-              if !redis_details.blank? && redis_details[1]
+              if redis_details.length && redis_details[1]
                 # Initially sets the CACHEKEY value
                 args = redis_details[1].split('/')
                 redis_key = args[0]
@@ -31,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
@@ -43,10 +49,11 @@ module StackifyRubyAPM
                 COMPONENT_CATEGORY: 'Cache',
                 COMPONENT_DETAIL: 'Execute',
                 THREAD_ID: Thread.current.object_id,
-                OPERATION: name
+                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
@@ -10,6 +13,7 @@ module StackifyRubyAPM
     # @api private
     class MysqlAdapterSpy
       TYPE = 'db.sinatra_active_record.sql'.freeze
+      DEFAULT_PORT = 3306
       if ActiveRecord::VERSION::MAJOR.to_i >= 5
         def install
           ActiveRecord::ConnectionAdapters::MySQL::DatabaseStatements.class_eval do
@@ -79,6 +83,7 @@ module StackifyRubyAPM
               props = get_common_db_properties
               props[:PROVIDER] = 'mysql'
               props[:SQL] = payload[:sql]
+              props[:URL] = get_host unless !get_host
               props
             end
 
@@ -87,6 +92,13 @@ module StackifyRubyAPM
                 check_prepared_stmt_by_placeholder(payload[:sql].include?('?'), statement, payload)
               end
             end
+
+            def get_host
+              query_options = self.raw_connection.query_options.to_h
+              "#{query_options[:host]}:#{query_options[:port] || DEFAULT_PORT}"
+            rescue StandardError => error
+              nil
+            end
           end
         end
       else
@@ -112,6 +124,7 @@ module StackifyRubyAPM
                 SQL: sql,
                 PROVIDER: 'mysql'
               )
+              ctx[:URL] = get_host unless !get_host
 
               result = exec_query_without_apm(sql, name, binds)
 
@@ -135,6 +148,7 @@ module StackifyRubyAPM
                 SQL: sql,
                 PROVIDER: 'mysql'
               )
+              ctx[:URL] = get_host unless !get_host
 
               result = exec_delete_without_apm(sql, name, binds)
 
@@ -158,6 +172,7 @@ module StackifyRubyAPM
                 SQL: sql,
                 PROVIDER: 'mysql'
               )
+              ctx[:URL] = get_host unless !get_host
 
               result = exec_update_without_apm(sql, name, binds)
 
@@ -181,6 +196,7 @@ module StackifyRubyAPM
                 SQL: sql,
                 PROVIDER: 'mysql'
               )
+              ctx[:URL] = get_host unless !get_host
 
               result = exec_insert_without_apm(sql, name, binds, _pk = nil, _sequence_name = nil)
 
@@ -188,6 +204,14 @@ module StackifyRubyAPM
                 return result
               end
             end
+
+            def get_host
+              config = self.config.to_h
+              "#{config[:host]}:#{config[:port] || DEFAULT_PORT}"
+            rescue StandardError => error
+              nil
+            end
+
           end
         end
       end

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'
 
@@ -80,6 +82,7 @@ module StackifyRubyAPM
             props = get_common_db_properties
             props[:PROVIDER] = 'postgresql'
             props[:SQL] = payload[:sql]
+            props[:URL] = get_host unless !get_host
             props
           end
 
@@ -88,6 +91,13 @@ module StackifyRubyAPM
               check_prepared_stmt_by_placeholder(!!payload[:sql].match(/\$\d/), statement, payload)
             end
           end
+
+          def get_host
+            connection = self.raw_connection
+            "#{connection.host}:#{connection.port}"
+          rescue StandardError => error
+            nil
+          end
         end
       end
     end

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.13.2'.freeze
+  VERSION = '1.14.5'.freeze
 end

metadata

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