stackify-ruby-apm 1.14.8 → 1.16.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 071d161a1f209e027f271d462fdc8cdf57c8d68197d8ae1ed6190cebe9e2114b
-  data.tar.gz: 815f90aaa08dcd15878bc93e7a18d71619a8cd1f55959ef18c0918267754a3df
+  metadata.gz: 1ebb6c26f4eef249448035790df567d74b2c81915d42dcba72a4d8dfa83649f0
+  data.tar.gz: d4a30f83de5976fbacab28c544b27c5d8afb26b13db4af484570e666f4424717
 SHA512:
-  metadata.gz: 35d8996e6e1bdc270ba44a231e405275d7b090efd316daa590aeefe2875a0b586f19b8c280fdab16c8a8e5f9b482038c344b40c1893358528a9e4ffa2b5018d0
-  data.tar.gz: 1ce353e5bf442f5ae8c18a5f1c323f0aa177586dc46942f9082baf1fa1acfc1980b04f3b5745a538f5eab7271c7bfdd0a340e2455d97d1695eafac7c9522d17f
+  metadata.gz: af4ef9861dfdeb3eaa8e721ed92f55d752c8687f53aa818596b7688e0a909e1971e35b0aab90c7a37569eb2930c3e07a17697795b932ffee3e4cecc95e92ba67
+  data.tar.gz: 8df99628de54aadbe98674602da416dfde21d637f879ea70d540ad4ce830dc740f449da68f390a595893f4ac3665f1b0f8d03edc5d6512e9049cabf5af483585

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

@@ -26,13 +26,13 @@ module StackifyRubyAPM
       environment_name: ENV['RAILS_ENV'] || ENV['RACK_ENV'],
       already_instrumented_flag: false,
       rum_auto_injection: false,
-      rum_enabled: true,
+      rum_enabled: false,
       rum_cookie_path: '/',
       rum_cookie_name: '.Stackify.Rum',
       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/',
 
@@ -71,14 +71,17 @@ module StackifyRubyAPM
 
       queue: true,
       lambda_handler: '',
-      prefix_enabled: false
+      prefix_enabled: false,
+
+      rum_script_url: 'https://stckjs.stackify.com/stckjs.js',
+      rum_key: ''
     }.freeze
 
     ENV_TO_KEY = {
       'STACKIFY_DEBUG' => [:bool, 'debug_logging'],
       'STACKIFY_APPLICATION_NAME' => 'application_name',
       'STACKIFY_ENVIRONMENT_NAME' => 'environment_name',
-      'STACKIFY_RUM' => [:bool, 'rum_enabled'],
+      'RETRACE_RUMV2_ENABLED' => [:bool, 'rum_enabled'],
       'STACKIFY_RUM_AUTO_INJECT' => [:bool, 'rum_auto_injection'],
       'STACKIFY_RUM_SCRIPT_SRC' => 'rum_script_src',
       'STACKIFY_TRANSPORT' => 'transport',
@@ -99,7 +102,9 @@ module StackifyRubyAPM
       'STACKIFY_DISABLED_SPIES' => [:list, 'disabled_spies'],
       'STACKIFY_QUEUE' => [:bool, 'queue'],
       'STACKIFY_LAMBDA_HANDLER' => 'lambda_handler',
-      'STACKIFY_PREFIX_ENABLED' => [:bool, 'prefix_enabled']
+      'STACKIFY_PREFIX_ENABLED' => [:bool, 'prefix_enabled'],
+      'RETRACE_RUM_SCRIPT_URL' => 'rum_script_url',
+      'RETRACE_RUM_KEY' => 'rum_key'
     }.freeze
 
     def initialize(options = {})
@@ -180,6 +185,9 @@ module StackifyRubyAPM
     attr_reader :apm_disabled_in_rake
     attr_reader :client_run_domain
 
+    attr_accessor :rum_script_url
+    attr_accessor :rum_key
+
     def app=(app)
       case app_type?(app)
       when :rails
@@ -261,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
@@ -336,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
@@ -412,6 +428,25 @@ module StackifyRubyAPM
       info '[Config] transport must be String type.' unless @transport.is_a?(String) && defined?(@transport)
       info '[Config] Transport should be one of these values: [agent_socket, default, agent_http]. Should be a String.' if defined?(@transport) && !%w[agent_socket default agent_http].include?(@transport.downcase)
       info '[Config] prefix_enabled must be Boolean type: true/false.' unless [TrueClass, FalseClass].include?(@prefix_enabled.class) && defined?(@prefix_enabled)
+
+      valid_rum_script_url = false
+      if defined?(@rum_script_url) && @rum_script_url.is_a?(String)
+        valid_rum_script_url = @rum_script_url =~ /^((((https?|ftps?|gopher|telnet|nntp):\/\/)|(mailto:|news:))(%[0-9A-Fa-f]{2}|[\-\(\)_\.!~*';\/?:@&=+$,A-Za-z0-9])+)([\)\.!';\/?:,][\[:blank:|:blank:\]])?$/
+      end
+
+      if !valid_rum_script_url
+        @rum_script_url = 'https://stckjs.stackify.com/stckjs.js'
+      end
+
+      valid_rum_key = false
+      if defined?(@rum_key) && @rum_key.is_a?(String)
+        valid_rum_key = @rum_key =~ %r{^[A-Za-z0-9_-]+$}
+      end
+
+      if !valid_rum_key
+        @rum_key = ''
+      end
+
     end
     # rubocop:enable Metrics/CyclomaticComplexity
     # rubocop:enable Metrics/PerceivedComplexity

data/lib/stackify_apm/context.rb

@@ -14,13 +14,14 @@ module StackifyRubyAPM
   class Context
     include NaivelyHashable
 
-    attr_accessor :request, :response, :aws, :category, :prefix
+    attr_accessor :request, :response, :aws, :category, :prefix, :rum
     attr_reader :custom, :tags
 
     def initialize
       @custom = {}
       @tags = {}
       @prefix = Context::Prefix.new
+      @rum = false
     end
 
     # add aws context to context instance

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

@@ -28,6 +28,7 @@ module StackifyRubyAPM
     CONTENT_TYPE_REGEX = %r{text\/html|application\/xhtml\+xml/}
     CONTENT_DISPOSITION = 'Content-Disposition'.freeze
     ATTACHMENT = 'attachment'.freeze
+    CONTENT_LENGTH = 'Content-Length'.freeze
 
     def initialize(app)
       @app = app
@@ -53,17 +54,15 @@ 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
-          end
-          if @configuration.rum_auto_injection.is_a?(TrueClass)
-            response_manupulate = StackifyRubyAPM::ResponseManipulator.new(env, resp, @configuration)
-            response_string = response_manupulate.adjust_pagehtml_response
+            response_manipulated = StackifyRubyAPM::ResponseManipulator.new(env, resp, @configuration)
+            response_string = response_manipulated.adjust_pagehtml_response
             if response_string
-              response = Rack::Response.new(response_string, resp[0].to_i, resp[1])
+              if @rack_headers.key?(CONTENT_LENGTH)
+                content_length = response_string ? response_string.bytesize : 0
+                @rack_headers[CONTENT_LENGTH] = content_length.to_s
+              end
+
+              response = Rack::Response.new(response_string, @rack_status, @rack_headers)
               resp = response.finish
             else
               resp

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

@@ -22,6 +22,7 @@ module StackifyRubyAPM
     GT = '>'.freeze
     CHARSET_RE = /<\s*meta[^>]+charset\s*=[^>]*>/
     X_UA_COMPATIBLE_RE = /<\s*meta[^>]+http-equiv\s*=\s*['"]x-ua-compatible['"][^>]*>/
+    STACKIFY_SETTING_TAG = '<script type="text/javascript">(window.StackifySettings ||'
 
     def initialize(env, rack_response, config)
       @env = env
@@ -46,27 +47,23 @@ module StackifyRubyAPM
       close_old_response(response)
       return nil unless source
 
-      client_id = @config.client_id
-      device_id = @config.device_id
-      client_rundomain = @config.client_run_domain
+      transaction_id = defined?(StackifyRubyAPM.current_transaction.id) ? StackifyRubyAPM.current_transaction.id : nil
       inject_flag = false
 
-      if client_id && device_id
-        if StackifyRubyAPM.check_isdomain(client_rundomain)
-          inject_flag = true
-        else
-          info 'RUM Injection Error: Client RUM Domain is invalid.'
-        end
+      if transaction_id
+        inject_flag = true
       else
-        info 'RUM Injection Error: No Device ID and/or Client ID found.'
+        info 'RUM Injection Error: No Transaction ID found.'
       end
 
       return unless inject_flag
 
+      return if has_stackify_tag(source[0..SCAN_LIMIT])
+
       # Only scan the first 50k (roughly) then give up.
       insertion_index = find_end_of_head_open(source[0..SCAN_LIMIT])
 
-      if insertion_index && inject_flag
+      if insertion_index
         source = source[0...insertion_index] <<
                  StackifyRubyAPM.inject_rum_script <<
                  source[insertion_index..-1]
@@ -77,13 +74,21 @@ module StackifyRubyAPM
     # rubocop:enable Metrics/PerceivedComplexity
 
     def find_end_of_head_open(beginning_of_source)
-      head_open = beginning_of_source.index(HEAD_END)
-      beginning_of_source.index(GT, head_open) - 6 if head_open
+      head_open = beginning_of_source.index(HEAD_START)
+      beginning_of_source.index(GT, head_open) + 1 if head_open
+    end
+
+    def has_stackify_tag(beginning_of_source)
+      !!beginning_of_source.index(STACKIFY_SETTING_TAG)
     end
 
     def gather_source(response)
       source = nil
-      response.each { |fragment| source ? (source << fragment.to_s) : (source = fragment.to_s) }
+      if response.respond_to?(:each)
+        response.each { |fragment| source ? (source << fragment.to_s) : (source = fragment.to_s) }
+      else
+        source << response
+      end
       source
     end
 

data/lib/stackify_apm/root_info.rb

@@ -31,7 +31,7 @@ module StackifyRubyAPM
         APPLICATION_FILESYSTEM_PATH: @config.root_path,
         APPLICATION_NAME: @config.application_name.strip,
         APPLICATION_ENV: @config.environment_name || 'Development',
-        REPORTING_URL: @transaction.name,
+        REPORTING_URL: @transaction.name || '/',
         TRACE_ID: @transaction.id,
         THREAD_ID: Thread.current.object_id,
         TRACE_SOURCE: 'RUBY',
@@ -45,7 +45,7 @@ module StackifyRubyAPM
       hash[:METHOD] = @transaction.context.request.method if @transaction.context && @transaction.context.request && @transaction.context.request.method
       hash[:STATUS] = @transaction.context.response.status_code if @transaction.context && @transaction.context.response && @transaction.context.response.status_code
       hash[:URL] = @transaction.context.request.url[:full] if @transaction.context && @transaction.context.request && @transaction.context.request.url[:full]
-      hash[:RUM] = true if @config.rum_enabled.is_a?(TrueClass)
+      hash[:ISRUM] = 'TRUE' if @transaction.context && @transaction.context.rum
       hash[:AWS_LAMBDA_ARN] = @transaction.context.aws[:arn] if @transaction.context && @transaction.context.aws && @transaction.context.aws[:arn]
       hash[:PREFIX_RESPONSE_BODY] = @transaction.context.prefix.response_body.to_s if @transaction.context.prefix && @transaction.context.prefix.response_body
       hash[:PREFIX_RESPONSE_SIZE_BYTES] = @transaction.context.prefix.response_body.length.to_s if @transaction.context.prefix && @transaction.context.prefix.response_body

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)