stackify-ruby-apm 1.15.3.beta1 → 1.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 014b8a770c78acfd3eba5a9f75e1a4c76eeb2c4d28635d80834e53f985807ed8
-  data.tar.gz: 1f82c3bb6394992ffe325182d32b76b5a7cf665923ec93842461186cf9594c90
+  metadata.gz: c7035174601ce074375fd5afebbe9bfa598be439724f300b1f623017af7f3fb0
+  data.tar.gz: 5b58d741ebc7b1f90e3a3417a4d084ded8dbd7f9c765dc29c35d3ba64a102bfb
 SHA512:
-  metadata.gz: d0e4223d7f5b01adc3ba840ed02aaced9509fe5277ad112d02a0c4febdabfddcac6f2a456866bdd76027486b14f296256b1515399b41eef78672549d02b7bcc5
-  data.tar.gz: 42ab0ae25cda2ee2d6aae7ff7b54888db652d80c6f72006befc61317d4871068b59986eb92fc5766ca8ff8d96dac8969a69065d08bab661232452dda322481e1
+  metadata.gz: fbb3be71d1f365d24cfea4d2d4beaafa3d0e36fa615ae0d07350def337379098141c4bc9f48102edfa571dc8a7671ff90a3833a9283fce5cdcddcdf5c6399773
+  data.tar.gz: 26a203e142cfb947dbf0625f645c61f695222a38d67d8da032eae17bcbc0a9a5e97bdfdea0352460beb4f9e71f4b2fd73ffb6e7eea0718817f3abbae2f786a2a

data/lib/stackify_apm/agent.rb

@@ -40,6 +40,7 @@ module StackifyRubyAPM
         date_now = Time.now
         current_trace_file = config.log_trace_path + squish(host_name) + '#' + squish(pid.to_s)
         if ENV['STACKIFY_RUBY_ENV'] != 'rspec'
+          Util.checkOrCreateFolder(config.log_trace_path)
           config.tracer_logger = StackifyLogger.new(current_trace_file, config.filenum_rotate, config.logger_byte_size)
           config.debug_logger
           config.logtime_created = date_now.strftime('%H:%M')
@@ -148,12 +149,12 @@ module StackifyRubyAPM
 
     # Loads transaction
     #
-    def transaction(*args, &block)
-      instrumenter.transaction(*args, &block)
+    def transaction(*args, **kwargs, &block)
+      instrumenter.transaction(*args, **kwargs, &block)
     end
 
-    def span(*args, &block)
-      instrumenter.span(*args, &block)
+    def span(*args, **kwargs, &block)
+      instrumenter.span(*args, **kwargs, &block)
     end
 
     # Responsible for building the transaction's context

data/lib/stackify_apm/config.rb

@@ -32,7 +32,7 @@ module StackifyRubyAPM
       transport: StackifyRubyAPM::TRACE_LOG,
       instrument: true,
       debug_logging: false,
-      log_path: StackifyRubyAPM::Util.host_os == 'WINDOWS' ? 'C:\ProgramData\Stackify\Ruby\log\stackify-ruby-apm-1.log' : '/usr/local/stackify/stackify-ruby-apm/log/stackify-ruby-apm-1.log',
+      log_path: StackifyRubyAPM::Util.host_os == 'WINDOWS' ? 'C:\ProgramData\Stackify\Ruby\debug\stackify-ruby-apm-1.log' : '/usr/local/stackify/stackify-ruby-apm/debug/stackify-ruby-apm-1.log',
       log_level: Logger::INFO,
       log_trace_path: StackifyRubyAPM::Util.host_os == 'WINDOWS' ? 'C:\ProgramData\Stackify\Ruby\log\\' : '/usr/local/stackify/stackify-ruby-apm/log/',
 
@@ -269,6 +269,10 @@ module StackifyRubyAPM
       # For unix socket we don't create a trace log file
       when StackifyRubyAPM::TRACE_LOG
         debugger_logpath = log_path == '-' ? $stdout : log_path
+        if (debugger_logpath == log_path)
+          dir_name = File.dirname(debugger_logpath)
+          Util.checkOrCreateFolder(dir_name)
+        end
         logger = StackifyLogger.new(debugger_logpath, debugger_filenum_rotate, debugger_byte_size)
         logger.level = log_level
         self.logger = logger
@@ -344,6 +348,10 @@ module StackifyRubyAPM
 
     def build_logger
       debugger_logpath = log_path == '-' ? $stdout : log_path
+      if (debugger_logpath == log_path)
+        dir_name = File.dirname(debugger_logpath)
+        Util.checkOrCreateFolder(dir_name)
+      end
       logger = StackifyLogger.new(debugger_logpath, debugger_filenum_rotate, debugger_byte_size)
       logger.level = log_level
       self.logger = logger

data/lib/stackify_apm/instrumenter.rb

@@ -56,7 +56,7 @@ module StackifyRubyAPM
 
     # Creates a new transaction or return the currently running
     #
-    def transaction(*args)
+    def transaction(*args, **kwargs)
       unless config.instrument
         yield if block_given?
         return
@@ -67,7 +67,7 @@ module StackifyRubyAPM
         return transaction
       end
 
-      transaction = Transaction.new self, *args
+      transaction = Transaction.new self, *args, **kwargs
 
       self.current_transaction = transaction
       return transaction unless block_given?
@@ -82,14 +82,14 @@ module StackifyRubyAPM
       transaction
     end
 
-    def span(*args, &block)
+    def span(*args, **kwargs, &block)
       unless current_transaction
         return yield if block_given?
 
         return
       end
 
-      current_transaction.span(*args, &block)
+      current_transaction.span(*args, **kwargs, &block)
     end
 
     # Once the transaction is submitted it will be stored temporarily in queue

data/lib/stackify_apm/instrumenter_helper.rb

@@ -73,11 +73,11 @@ module StackifyRubyAPM
                   then "protected"
                 end
               }
-              def #{current_method}(*args, &block)
+              def #{current_method}(*args, **kwargs, &block)
                 if StackifyRubyAPM.current_transaction.nil? && #{!transaction.nil?}
                   t = StackifyRubyAPM.transaction("custom.#{current_class}.#{current_method}", TRACETYPE)
                   begin
-                    req = #{current_method_without}(*args, &block)
+                    req = #{current_method_without}(*args, **kwargs, &block)
                   rescue Exception => e
                     StackifyRubyAPM.report(e)
                     raise e
@@ -100,10 +100,10 @@ module StackifyRubyAPM
                         end
 
                   StackifyRubyAPM.span name, type, context: ctx do
-                    #{current_method_without}(*args, &block)
+                    #{current_method_without}(*args, **kwargs, &block)
                   end
                 else
-                  return #{current_method_without}(*args, &block)
+                  return #{current_method_without}(*args, **kwargs, &block)
                 end
               end
             end
@@ -152,11 +152,11 @@ module StackifyRubyAPM
             #{current_class}.class_eval do
               singleton_class.send(:alias_method, :"_self_without_apm_#{current_method}", :"#{current_method}")
 
-              def self.#{current_method}(*args, &block)
+              def self.#{current_method}(*args, **kwargs, &block)
                 if StackifyRubyAPM.current_transaction.nil? && #{!transaction.nil?}
                   t = StackifyRubyAPM.transaction("custom.#{current_class}.#{current_method}", TRACETYPE)
                   begin
-                    req = _self_without_apm_#{current_method}(*args, &block)
+                    req = _self_without_apm_#{current_method}(*args, **kwargs, &block)
                   rescue Exception => e
                     StackifyRubyAPM.report(e)
                     raise e
@@ -179,10 +179,10 @@ module StackifyRubyAPM
                         end
 
                   StackifyRubyAPM.span name, type, context: ctx do
-                    _self_without_apm_#{current_method}(*args, &block)
+                    _self_without_apm_#{current_method}(*args, **kwargs, &block)
                   end
                 else
-                  return _self_without_apm_#{current_method}(*args, &block)
+                  return _self_without_apm_#{current_method}(*args, **kwargs, &block)
                 end
               end
 
@@ -240,11 +240,11 @@ module StackifyRubyAPM
               class<< self
                 alias_method "#{current_method}_without_apm", "#{current_method}"
 
-                def #{current_method}(*args, &block)
+                def #{current_method}(*args, **kwargs, &block)
                   if StackifyRubyAPM.current_transaction.nil? && #{!transaction.nil?}
                     t = StackifyRubyAPM.transaction("custom.#{current_module}.#{current_method}", TRACETYPE)
                     begin
-                      req = #{current_method}_without_apm(*args, &block)
+                      req = #{current_method}_without_apm(*args, **kwargs, &block)
                     rescue Exception => e
                       StackifyRubyAPM.report(e)
                       raise e
@@ -267,10 +267,10 @@ module StackifyRubyAPM
                           end
 
                     StackifyRubyAPM.span name, type, context: ctx do
-                      #{current_method}_without_apm(*args, &block)
+                      #{current_method}_without_apm(*args, **kwargs, &block)
                     end
                   else
-                    return #{current_method}_without_apm(*args, &block)
+                    return #{current_method}_without_apm(*args, **kwargs, &block)
                   end
                 end
               end

data/lib/stackify_apm/logger/log_device.rb

@@ -84,10 +84,11 @@ module StackifyRubyAPM
     # Override create_logfile of core LogDevice class where we set File.chmod to 0o777
     def create_logfile(filename)
       logdev = super
-      File.chmod(0o777, filename)
 
       begin
         dir_name = File.dirname(filename)
+        StackifyRubyAPM::Util.checkOrCreateFolder(dir_name)
+        File.chmod(0o777, 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")

data/lib/stackify_apm/normalizers/active_record.rb

@@ -3,6 +3,7 @@
 # Possible use of ActiveSupport.on_load(:active_record)
 
 require 'stackify_apm/helper/database_helper'
+require 'rails'
 
 module StackifyRubyAPM
   module Normalizers
@@ -79,17 +80,30 @@ module StackifyRubyAPM
           end
 
           if (connection.nil?)
-            return 'generic'
+            if ::ActiveRecord::Base.respond_to?(:connection)
+              return ::ActiveRecord::Base.connection.adapter_name.downcase
+            else
+              return 'generic'
+            end
           end
 
           if (connection.respond_to?(:adapter_name) && connection.adapter_name.nil?)
-            return 'generic'
+            if ::ActiveRecord::Base.respond_to?(:connection)
+              return ::ActiveRecord::Base.connection.adapter_name.downcase
+            else
+              return 'generic'
+            end
           end
 
           connection.adapter_name.downcase
         rescue StandardError => error
           debug '[SqlNormalizer] lookup_adapter err: ' + error.inspect.to_s
-          nil
+          # do a last fail safe check before returning nil
+          if ::ActiveRecord::Base.respond_to?(:connection)
+            ::ActiveRecord::Base.connection.adapter_name.downcase
+          else
+            nil
+          end
         end
 
         def lookup_adapter_config

data/lib/stackify_apm/span/context.rb

@@ -6,7 +6,7 @@ module StackifyRubyAPM
     class Context
       include NaivelyHashable
 
-      def initialize(**args)
+      def initialize(args)
         args.each do |key, val|
           send(:"#{key}=", val)
         end

data/lib/stackify_apm/spies/action_dispatch.rb

@@ -26,6 +26,26 @@ module StackifyRubyAPM
       end
     end
 
+    class ActionDispatchDebugExceptionsSpy
+      def install
+        ::ActionDispatch::DebugExceptions.class_eval do
+          alias_method 'render_exception_without_apm', 'render_exception'
+
+          def render_exception(env, exception)
+            # Creates exception log report
+            #
+            begin
+              StackifyRubyAPM.report(exception)
+            rescue Exception => e
+              StackifyRubyAPM.agent.error '[ActionDispatchDebugExceptionsSpy] Error: repoting exception.'
+              StackifyRubyAPM.agent.error "[ActionDispatchDebugExceptionsSpy] #{e.inspect}"
+            end
+            render_exception_without_apm env, exception
+          end
+        end
+      end
+    end
+
     # Registers ActionDispatch spy, go to: /stackify_apm/spies.rb
     #
     register(
@@ -33,5 +53,11 @@ module StackifyRubyAPM
       'action_dispatch/show_exception',
       ActionDispatchSpy.new
     )
+
+    register(
+      'ActionDispatch::DebugExceptions',
+      'action_dispatch/debug_exceptions',
+      ActionDispatchDebugExceptionsSpy.new
+    )
   end
 end

data/lib/stackify_apm/spies/curb/easy.rb

@@ -16,9 +16,9 @@ module StackifyRubyAPM
           singleton_class.send(:alias_method, :http_put_without_apm, :http_put)
           singleton_class.send(:alias_method, :http_get_without_apm, :http_get)
           singleton_class.send(:alias_method, :http_delete_without_apm, :http_delete)
-          def self.perform(*args)
+          def self.perform(*args, **kwargs)
             req = nil
-            return perform_without_apm(*args) unless StackifyRubyAPM.current_transaction
+            return perform_without_apm(*args, **kwargs) unless StackifyRubyAPM.current_transaction
 
             begin
               # Data configuration
@@ -40,14 +40,14 @@ module StackifyRubyAPM
             rescue Exception => e
               StackifyRubyAPM.agent.error "[CurbEasySpy] Error: creating span context."
               StackifyRubyAPM.agent.error "[CurbEasySpy] #{e.inspect}"
-              return perform_without_apm(*args)
+              return perform_without_apm(*args, **kwargs)
             end
 
             # Creates new span from HTTP result
             StackifyRubyAPM.span name, type, context: ctx do
               # Submits HTTP request
               #
-              res = perform_without_apm(*args)
+              res = perform_without_apm(*args, **kwargs)
 
               begin
                 status_code = res.status.sub(/^0-9/, '').to_i
@@ -67,9 +67,9 @@ module StackifyRubyAPM
             end
           end
 
-          def self.http_post(*args)
+          def self.http_post(*args, **kwargs)
             req = nil
-            return http_post_without_apm(*args) unless StackifyRubyAPM.current_transaction
+            return http_post_without_apm(*args, **kwargs) unless StackifyRubyAPM.current_transaction
 
             begin
               # Data configuration
@@ -90,12 +90,12 @@ module StackifyRubyAPM
             rescue Exception => e
               StackifyRubyAPM.agent.error "[CurbEasySpy] Error: creating span context."
               StackifyRubyAPM.agent.error "[CurbEasySpy] #{e.inspect}"
-              return http_post_without_apm(*args)
+              return http_post_without_apm(*args, **kwargs)
             end
 
             # Creates new span from HTTP result
             StackifyRubyAPM.span name, type, context: ctx do
-              res = http_post_without_apm(*args)
+              res = http_post_without_apm(*args, **kwargs)
 
               begin
                 status_code = res.status.sub(/^0-9/, '').to_i
@@ -178,9 +178,9 @@ module StackifyRubyAPM
             end
           end
 
-          def self.http_get(*args)
+          def self.http_get(*args, **kwargs)
             req = nil
-            return http_get_without_apm(*args) unless StackifyRubyAPM.current_transaction
+            return http_get_without_apm(*args, **kwargs) unless StackifyRubyAPM.current_transaction
 
             begin
               # Data configuration
@@ -201,12 +201,12 @@ module StackifyRubyAPM
             rescue Exception => e
               StackifyRubyAPM.agent.error "[CurbEasySpy] Error: creating span context."
               StackifyRubyAPM.agent.error "[CurbEasySpy] #{e.inspect}"
-              return http_get_without_apm(*args)
+              return http_get_without_apm(*args, **kwargs)
             end
 
             # Creates new span from HTTP result
             StackifyRubyAPM.span name, type, context: ctx do
-              res = http_get_without_apm(*args)
+              res = http_get_without_apm(*args, **kwargs)
 
               begin
                 status_code = res.status.sub(/^0-9/, '').to_i
@@ -227,9 +227,9 @@ module StackifyRubyAPM
             end
           end
 
-          def self.http_delete(*args)
+          def self.http_delete(*args, **kwargs)
             req = nil
-            return http_delete_without_apm(*args) unless StackifyRubyAPM.current_transaction
+            return http_delete_without_apm(*args, **kwargs) unless StackifyRubyAPM.current_transaction
 
             begin
               # Data configuration
@@ -250,12 +250,12 @@ module StackifyRubyAPM
             rescue Exception => e
               StackifyRubyAPM.agent.error "[CurbEasySpy] Error: creating span context."
               StackifyRubyAPM.agent.error "[CurbEasySpy] #{e.inspect}"
-              return http_delete_without_apm(*args)
+              return http_delete_without_apm(*args, **kwargs)
             end
 
             # Creates new span from HTTP result
             StackifyRubyAPM.span name, type, context: ctx do
-              res = http_delete_without_apm(*args)
+              res = http_delete_without_apm(*args, **kwargs)
 
               begin
                 status_code = res.status.sub(/^0-9/, '').to_i

data/lib/stackify_apm/spies/delayed_job.rb

@@ -12,7 +12,7 @@ module StackifyRubyAPM
         Delayed::Backend::Base.class_eval do
           alias_method 'invoke_job_without_apm', 'invoke_job'
 
-          def invoke_job(*args, &block)
+          def invoke_job(*args, **kwargs, &block)
             ret = nil
             begin
               name = nil
@@ -29,7 +29,7 @@ module StackifyRubyAPM
               ctx = StackifyRubyAPM::Context.new
               ctx.category = 'Delayed::Job'
               transaction = StackifyRubyAPM.transaction name, 'TASK', context: ctx
-              ret = invoke_job_without_apm(*args, &block)
+              ret = invoke_job_without_apm(*args, **kwargs, &block)
             rescue StackifyRubyAPM::InternalError
               raise # Don't report StackifyRubyAPM errors
             rescue StandardError => e

data/lib/stackify_apm/spies/httpclient.rb

@@ -12,9 +12,9 @@ module StackifyRubyAPM
         HTTPClient.class_eval do
           alias_method 'request_without_apm', 'request'
 
-          def request(method, uri, *args, &block)
+          def request(method, uri, *args, **kwargs, &block)
             req = nil
-            return request_without_apm(method, uri, *args, &block) unless StackifyRubyAPM.current_transaction
+            return request_without_apm(method, uri, *args, **kwargs, &block) unless StackifyRubyAPM.current_transaction
 
             begin
               # Data configuration
@@ -36,7 +36,7 @@ module StackifyRubyAPM
             rescue Exception => e
               StackifyRubyAPM.agent.error "[HTTPClientSpy] Error: creating span context."
               StackifyRubyAPM.agent.error "[HTTPClientSpy] #{e.inspect}"
-              return request_without_apm(method, uri, *args, &block)
+              return request_without_apm(method, uri, *args, **kwargs, &block)
             end
 
             # Creates new span from HTTP result
@@ -44,7 +44,7 @@ module StackifyRubyAPM
             StackifyRubyAPM.span name, type, context: ctx do
               # Submits HTTP request
               #
-              res = request_without_apm(method, uri, *args, &block)
+              res = request_without_apm(method, uri, *args, **kwargs, &block)
 
               begin
                 ctx.update_status(res.status_code)

data/lib/stackify_apm/spies/sequel.rb

@@ -29,8 +29,8 @@ module StackifyRubyAPM
         ::Sequel::Database.class_eval do
           alias_method 'log_connection_yield_without_apm', 'log_connection_yield'
 
-          def log_connection_yield(sql, *args, &block)
-            return log_connection_yield_without_apm(sql, *args, &block) unless StackifyRubyAPM.current_transaction
+          def log_connection_yield(sql, *args, **kwargs, &block)
+            return log_connection_yield_without_apm(sql, *args, **kwargs, &block) unless StackifyRubyAPM.current_transaction
 
             name = summarize sql
             db_adapter = ''

data/lib/stackify_apm/spies/sidekiq.rb

@@ -12,7 +12,7 @@ module StackifyRubyAPM
         Sidekiq::Processor.class_eval do
           alias_method 'process_without_apm', 'process'
 
-          def process(work, *args, &block)
+          def process(work, *args, **kwargs, &block)
             ret = nil
             begin
               job = nil
@@ -24,7 +24,7 @@ module StackifyRubyAPM
               job_hash = JSON.parse job
               name = job_hash["class"]
               transaction = StackifyRubyAPM.transaction name, 'TASK'
-              ret = process_without_apm(work, *args, &block)
+              ret = process_without_apm(work, *args, **kwargs, &block)
             rescue StackifyRubyAPM::InternalError
               raise # Don't report StackifyRubyAPM errors
             rescue StandardError => e

data/lib/stackify_apm/spies/sinatra.rb

@@ -15,8 +15,8 @@ module StackifyRubyAPM
 
           # Sets transaction name from Sinatra env's route name
           #
-          def dispatch!(*args, &block)
-            dispatch_without_apm!(*args, &block).tap do
+          def dispatch!(*args, **kwargs, &block)
+            dispatch_without_apm!(*args, **kwargs, &block).tap do
               next unless (transaction = StackifyRubyAPM.current_transaction)
               next unless (route = env['sinatra.route'])
 
@@ -26,23 +26,23 @@ module StackifyRubyAPM
 
           # Tilt engine template
           #
-          def compile_template(engine, data, opts, *args, &block)
+          def compile_template(engine, data, opts, *args, **kwargs, &block)
             opts[:__stackify_apm_template_name] =
               case data
               when Symbol then data.to_s
               else format('Inline %s', engine)
               end
 
-            compile_template_without_apm(engine, data, opts, *args, &block)
+            compile_template_without_apm(engine, data, opts, *args, **kwargs, &block)
           end
 
-          def route_eval(*args, &block)
+          def route_eval(*args, **kwargs, &block)
             if defined?(StackifyRubyAPM.current_transaction)
               if env.key?('sinatra.route')
                 StackifyRubyAPM.current_transaction.name = env['sinatra.route']
               end
             end
-            route_eval_without_apm(*args, &block)
+            route_eval_without_apm(*args, **kwargs, &block)
           end
         end
       end

data/lib/stackify_apm/spies/sucker_punch.rb

@@ -12,14 +12,14 @@ module StackifyRubyAPM
         SuckerPunch::Job::ClassMethods.class_eval do
           alias_method '__run_perform_without_elastic_apm', '__run_perform'
 
-          def __run_perform(*args)
+          def __run_perform(*args, **kwargs)
             ret = nil
             begin
               name = "#{to_s}.perform"
               ctx = StackifyRubyAPM::Context.new
               ctx.category = 'SuckerPunch::Job'
               transaction = StackifyRubyAPM.transaction name, 'TASK', context: ctx
-              ret = __run_perform_without_elastic_apm(*args)
+              ret = __run_perform_without_elastic_apm(*args, **kwargs)
             rescue StackifyRubyAPM::InternalError
               raise # Don't report StackifyRubyAPM errors
             rescue StandardError => e

data/lib/stackify_apm/spies/tilt.rb

@@ -15,13 +15,13 @@ module StackifyRubyAPM
         ::Tilt::Template.class_eval do
           alias_method 'render_without_apm', 'render'
 
-          def render(*args, &block)
+          def render(*args, **kwargs, &block)
             name = options[:__stackify_apm_template_name] || 'Unknown template'
 
             # Creates new span for Tilt templating
             #
             StackifyRubyAPM.span name, TYPE do
-              render_without_apm(*args, &block)
+              render_without_apm(*args, **kwargs, &block)
             end
           end
         end

data/lib/stackify_apm/util.rb

@@ -87,6 +87,40 @@ module StackifyRubyAPM
       string
     end
 
+    def self.fileExists?(dir_name)
+      # Ruby 3.2 changed File.exists to File.exist.
+      if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("3.2")
+        return File.exists?(dir_name)
+      else
+        return File.exist?(dir_name)
+      end
+    end
+
+    def self.checkOrCreateFolder(dir_name)
+      if (dir_name.to_s.empty?)
+        return false
+      end
+
+      if (!fileExists?(dir_name))
+        umask = File.umask
+        File.umask(0)
+        FileUtils.mkdir_p(dir_name)
+        File.chmod(0777, dir_name)
+        File.umask(umask)
+      end
+
+      if (!fileExists?(dir_name))
+        puts "Util::Stackify Profiler unable to find [" + dir_name + "]"
+        return false
+      end
+
+      if (!File.writable?(dir_name))
+        puts "Util::Stackify Profiler unable to access/write [" + dir_name + "]"
+        return false
+      end
+
+      return true
+    end
   end
 end
 require 'stackify_apm/util/inspector'

data/lib/stackify_apm/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Sets the version of the APM
+# Sets the version of the APM:
 module StackifyRubyAPM
-  VERSION = '1.15.3.beta1'.freeze
+  VERSION = '1.16.0'.freeze
 end

data/stackify-ruby-apm.gemspec

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-lib = File.expand_path('lib', __dir__)
+lib = File.expand_path('lib', File.dirname(__FILE__))
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'stackify_apm/version'
 
@@ -13,6 +13,9 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'http://www.stackify.com'
   spec.license       = 'Stackify'
 
+  # Set the minimum Ruby version required
+  spec.required_ruby_version = '>= 3.0.0'
+
   git_tracked_files = `git ls-files -z`.split("\x0")
   gem_ignored_files = `git ls-files -i -X .gemignore -z`.split("\x0")
   spec.files = git_tracked_files - gem_ignored_files
@@ -22,49 +25,77 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   # rails
-  if RUBY_VERSION > '2.5'
+  if RUBY_VERSION > '2.9'
+    spec.add_development_dependency  'rails', '~> 6.1'
+  elsif RUBY_VERSION > '2.5'
     spec.add_development_dependency  'rails', '~> 5.0'
   else
     spec.add_development_dependency  'rails', '~> 4.0'
+    spec.add_development_dependency 'sprockets', '~> 3.0'
   end
 
   # bigdecimal
   if RUBY_VERSION > '2.5'
     spec.add_development_dependency  'bigdecimal'
   end
-  
+
   if RUBY_PLATFORM == 'i386-mingw32'
     spec.add_development_dependency 'tzinfo-data'
+  end
+
+  if RUBY_VERSION > '2.9'
+    spec.add_development_dependency 'bundler', '~> 2.4.12'
+  else
+    spec.add_development_dependency 'bundler', '~> 1.16'
+  end
+
+  if RUBY_VERSION > '2.9'
+    spec.add_development_dependency 'rake'
+    spec.add_development_dependency 'rspec', '3.9.0'
+    spec.add_development_dependency 'curb', '1.0.3'
+    spec.add_development_dependency 'pg'
+    spec.add_development_dependency 'sqlite3'
   else
-    spec.add_development_dependency 'mongo'
+    spec.add_development_dependency 'rake', '~> 10.0'
+    spec.add_development_dependency 'rspec', '~> 3.0'
     spec.add_development_dependency 'curb', '0.9.8'
+    spec.add_development_dependency 'pg', '~> 0.20'
+    spec.add_development_dependency 'sqlite3', '1.3.13'
+    spec.add_development_dependency('delegate_matcher', '~> 0.4') # for testing
   end
 
-  spec.add_development_dependency 'bundler', '~> 1.17'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.0'
+
   spec.add_development_dependency 'activerecord'
-  
   spec.add_development_dependency 'fakeredis'
   spec.add_development_dependency 'http'
   spec.add_development_dependency 'httpclient'
+  spec.add_development_dependency 'mongo'
   spec.add_development_dependency 'mysql2'
-  spec.add_development_dependency 'pg', '~> 0.20'
+
   spec.add_development_dependency 'rack-test'
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'sequel'
   spec.add_development_dependency 'sinatra'
   spec.add_development_dependency 'sinatra-activerecord'
-  spec.add_development_dependency 'sqlite3', '1.3.13'
+
   spec.add_development_dependency 'stackify-api-ruby'
   spec.add_development_dependency 'timecop'
   spec.add_development_dependency 'to_bool'
   spec.add_development_dependency 'webmock'
   spec.add_development_dependency 'delayed_job'
-  spec.add_development_dependency('delegate_matcher', '~> 0.4') # for testing
 
-  spec.add_dependency('concurrent-ruby', '~> 1.0')
-  spec.add_dependency('faraday', '~> 0.8')
-  spec.add_dependency('net_http_unix', '~> 0.2')
-  spec.add_dependency('rufus-scheduler', '~> 3.0')
-end
+  if RUBY_VERSION > '2.9'
+    spec.add_dependency('concurrent-ruby')
+    spec.add_dependency('delegate_matcher')
+    spec.add_dependency('faraday')
+    spec.add_dependency('net_http_unix')
+    spec.add_dependency('rufus-scheduler')
+  else
+    spec.add_dependency('concurrent-ruby', '~> 1.0')
+    spec.add_dependency('delegate_matcher', '~> 0.4')
+    spec.add_dependency('faraday', '~> 0.8')
+    spec.add_dependency('net_http_unix', '~> 0.2')
+    spec.add_dependency('rufus-scheduler', '~> 3.0')
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stackify-ruby-apm
 version: !ruby/object:Gem::Version
-  version: 1.15.3.beta1
+  version: 1.16.0
 platform: ruby
 authors:
 - Stackify
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-08-23 00:00:00.000000000 Z
+date: 2023-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: bigdecimal
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +39,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mongo
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.12
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.12
+- !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,61 +67,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: curb
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.8
+        version: 3.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.8
+        version: 3.9.0
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: curb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 1.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 1.0.3
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -165,7 +179,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mysql2
+  name: mongo
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -179,19 +193,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pg
+  name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -262,20 +276,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.3.13
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.3.13
 - !ruby/object:Gem::Dependency
   name: stackify-api-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -347,75 +347,75 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: delegate_matcher
+  name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.4'
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: concurrent-ruby
+  name: delegate_matcher
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: net_http_unix
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 description: 
 email:
 - support@stackify.com
@@ -530,14 +530,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: Stackify APM for Ruby