newrelic_rpm 8.0.0 → 8.4.0

data/lib/new_relic/agent/error_filter.rb

@@ -4,11 +4,9 @@
 
 module NewRelic
   module Agent
-
     # Handles loading of ignored and expected errors from the agent configuration, and
     # determining at runtime whether an exception is ignored or expected.
     class ErrorFilter
-
       def initialize
         reset
       end
@@ -20,16 +18,17 @@ module NewRelic
       end
 
       def load_all
-        %i(
+        %i[
           ignore_errors ignore_classes ignore_messages ignore_status_codes
           expected_classes expected_messages expected_status_codes
-        ).each { |setting| load_from_config(setting) }
+        ].each { |setting| load_from_config(setting) }
       end
 
       def load_from_config(setting, value = nil)
         errors = nil
         new_value = value || fetch_agent_config(setting.to_sym)
-        return if new_value.nil? || new_value.empty?
+
+        return if new_value.nil? || (new_value.respond_to?(:empty?) && new_value.empty?)
 
         case setting.to_sym
         when :ignore_errors, :ignore_classes
@@ -50,7 +49,7 @@ module NewRelic
       end
 
       def ignore?(ex, status_code = nil)
-        @ignore_classes.include?(ex.class.name) || 
+        @ignore_classes.include?(ex.class.name) ||
           (@ignore_messages.keys.include?(ex.class.name) &&
           @ignore_messages[ex.class.name].any? { |m| ex.message.include?(m) }) ||
           @ignore_status_codes.include?(status_code.to_i)
@@ -126,7 +125,7 @@ module NewRelic
             ::NewRelic::Agent.logger.debug("Ignoring errors of type '#{error}'")
           end
         when :ignore_messages
-          errors.each do |error,messages|
+          errors.each do |error, messages|
             ::NewRelic::Agent.logger.debug("Ignoring errors of type '#{error}' with messages: #{messages.join(',')}")
           end
         when :ignore_status_codes
@@ -136,7 +135,7 @@ module NewRelic
             ::NewRelic::Agent.logger.debug("Expecting errors of type '#{error}'")
           end
         when :expected_messages
-          errors.each do |error,messages|
+          errors.each do |error, messages|
             ::NewRelic::Agent.logger.debug("Expecting errors of type '#{error}' with messages: #{messages.join(',')}")
           end
         when :expected_status_codes
@@ -145,7 +144,14 @@ module NewRelic
       end
 
       def parse_status_codes(codes)
-        code_list = codes.is_a?(String) ? codes.split(',') : codes
+        code_list = case codes
+          when String
+            codes.split(',')
+          when Integer
+            [codes]
+          else
+            codes
+        end
         result = []
         code_list.each do |code|
           result << code && next if code.is_a?(Integer)
@@ -164,4 +170,4 @@ module NewRelic
       end
     end
   end
-end
+end

data/lib/new_relic/agent/error_trace_aggregator.rb

@@ -54,7 +54,7 @@ module NewRelic
       # checks the size of the error queue to make sure we are under
       # the maximum limit, and logs a warning if we are over the limit.
       def over_queue_limit?(message)
-        over_limit = (@errors.reject{|err| err.is_internal}.length >= @capacity)
+        over_limit = (@errors.reject { |err| err.is_internal }.length >= @capacity)
         if over_limit
           ::NewRelic::Agent.logger.warn("The error reporting queue has reached #{@capacity}. The error detail for this and subsequent errors will not be transmitted to New Relic until the queued errors have been sent: #{message}")
         end

data/lib/new_relic/agent/event_aggregator.rb

@@ -25,7 +25,7 @@ module NewRelic
             @enabled_keys ||= []
           else
             @enabled_keys = Array(keys)
-            @enabled_fn = ->(){ @enabled_keys.all? { |k| Agent.config[k] } }
+            @enabled_fn = ->() { @enabled_keys.all? { |k| Agent.config[k] } }
           end
         end
 

data/lib/new_relic/agent/event_buffer.rb

@@ -22,22 +22,22 @@ module NewRelic
 
       def initialize(capacity)
         @capacity = capacity
-        @items    = []
-        @seen     = 0
+        @items = []
+        @seen = 0
       end
 
       def reset!
         @items = []
-        @seen  = 0
+        @seen = 0
       end
 
       def capacity=(new_capacity)
         @capacity = new_capacity
         old_items = @items
-        @items    = []
-        old_seen  = @seen
+        @items = []
+        old_seen = @seen
         old_items.each { |i| append(i) }
-        @seen     = old_seen
+        @seen = old_seen
       end
 
       def append(x)
@@ -88,4 +88,3 @@ module NewRelic
     end
   end
 end
-

data/lib/new_relic/agent/event_listener.rb

@@ -9,7 +9,6 @@ module NewRelic::Agent
   # While an EventListener could be used elsewhere, it's strongly expected
   # your eventing needs should be met by the agent's instance.
   class EventListener
-
     attr_accessor :runaway_threshold
 
     def initialize

data/lib/new_relic/agent/event_loop.rb

@@ -10,11 +10,11 @@ module NewRelic
       class Timer
         attr_reader :next_fire_time, :event, :interval, :last_fired_at
 
-        def initialize(interval, event, repeat=false)
-          @interval      = interval
-          @event         = event
-          @repeat        = repeat
-          @started_at    = Process.clock_gettime(Process::CLOCK_REALTIME)
+        def initialize(interval, event, repeat = false)
+          @interval = interval
+          @event = event
+          @repeat = repeat
+          @started_at = Process.clock_gettime(Process::CLOCK_REALTIME)
           @last_fired_at = nil
           reschedule
         end
@@ -45,7 +45,7 @@ module NewRelic
           @last_fired_at = Process.clock_gettime(Process::CLOCK_REALTIME)
         end
 
-        def due?(now=Process.clock_gettime(Process::CLOCK_REALTIME))
+        def due?(now = Process.clock_gettime(Process::CLOCK_REALTIME))
           now >= @next_fire_time
         end
 
@@ -57,10 +57,10 @@ module NewRelic
       def initialize
         @self_pipe_rd, @self_pipe_wr = IO.pipe
         @event_queue = Queue.new
-        @stopped     = false
-        @timers      = {}
+        @stopped = false
+        @timers = {}
 
-        @subscriptions = Hash.new { |h,k| h[k] = [] }
+        @subscriptions = Hash.new { |h, k| h[k] = [] }
         @subscriptions[:__add_timer] << Proc.new { |t| set_timer(t) }
         @subscriptions[:__add_event] << Proc.new { |e, blk| @subscriptions[e] << blk }
       end
@@ -100,7 +100,7 @@ module NewRelic
         end
       end
 
-      def run_once(nonblock=false)
+      def run_once(nonblock = false)
         wait_to_run(nonblock)
 
         prune_timers

data/lib/new_relic/agent/external.rb

@@ -18,7 +18,7 @@ module NewRelic
     module External
       extend self
 
-      NON_HTTP_CAT_ID_HEADER  = 'NewRelicID'.freeze
+      NON_HTTP_CAT_ID_HEADER = 'NewRelicID'.freeze
       NON_HTTP_CAT_TXN_HEADER = 'NewRelicTransaction'.freeze
       NON_HTTP_CAT_SYNTHETICS_HEADER = 'NewRelicSynthetics'.freeze
       NON_HTTP_CAT_CONTENT_LENGTH = -1
@@ -105,7 +105,6 @@ module NewRelic
       def obfuscator
         CrossAppTracing.obfuscator
       end
-
     end
   end
 end

data/lib/new_relic/agent/guid_generator.rb

@@ -5,9 +5,6 @@
 module NewRelic
   module Agent
     module GuidGenerator
-
-      HEX_DIGITS = (0..15).map{|i| i.to_s(16)}
-
       module_function
 
       # This method intentionally does not use SecureRandom, because it relies
@@ -16,13 +13,9 @@ module NewRelic
       # The guids generated by this method may not be _secure_, but they are
       # random enough for our purposes.
       def generate_guid length = 16
-        guid = ''
-        length.times do |a|
-          guid << HEX_DIGITS[rand(16)]
-        end
-        guid
+        guid = rand(16**length).to_s(16)
+        guid.length < length ? guid.rjust(length, "0") : guid
       end
-
     end
   end
 end

data/lib/new_relic/agent/harvester.rb

@@ -5,11 +5,10 @@
 module NewRelic
   module Agent
     class Harvester
-
       attr_accessor :starting_pid
 
       # Inject target for after_fork call to avoid spawning thread in tests
-      def initialize(events, after_forker=NewRelic::Agent)
+      def initialize(events, after_forker = NewRelic::Agent)
         # We intentionally don't set our pid as started at this point.
         # Startup routines must call mark_started when they consider us set!
         @starting_pid = nil
@@ -22,8 +21,8 @@ module NewRelic
 
       def on_transaction(*_)
         return unless restart_in_children_enabled? &&
-                        needs_restart? &&
-                        harvest_thread_enabled?
+          needs_restart? &&
+          harvest_thread_enabled?
 
         restart_harvest_thread
       end

data/lib/new_relic/agent/heap.rb

@@ -18,7 +18,6 @@ module NewRelic
     #
 
     class Heap
-
       # @param [Array] items an optional array of items to intialize the heap
       #
       # @param [Callable] priority_fn an optional priority function used to
@@ -27,7 +26,7 @@ module NewRelic
       def initialize(items = nil, &priority_fn)
         @items = []
         @priority_fn = priority_fn || ->(x) { x }
-        items.each{ |item| push(item) } if items
+        items.each { |item| push(item) } if items
       end
 
       def [](index)
@@ -135,6 +134,5 @@ module NewRelic
         @items[i], @items[j] = @items[j], @items[i]
       end
     end
-
   end
 end

data/lib/new_relic/agent/hostname.rb

@@ -19,11 +19,11 @@ module NewRelic
 
       # calling hostname with -f on some OS's (NetBSD, FreeBSD, Solaris)
       # produces invalid option error, but doesn't raise exception.  Instead,
-      # we get back empty string.  So, solution here is to check for non-zero 
+      # we get back empty string.  So, solution here is to check for non-zero
       # exit status and retry the command without the -f flag.
       def self.get_fqdn
-        fqdn = %x[hostname -f].chomp!
-        fqdn = %x[hostname].chomp! unless $?.exitstatus.zero?
+        fqdn = %x(hostname -f).chomp!
+        fqdn = %x(hostname).chomp! unless $?.exitstatus.zero?
         fqdn
       rescue => e
         NewRelic::Agent.logger.debug "Unable to determine fqdn #{e}"

data/lib/new_relic/agent/http_clients/abstract.rb

@@ -15,7 +15,6 @@ module NewRelic
       #
       # @api public
       class AbstractRequest
-
         def []
           raise NotImplementedError, MUST_IMPLEMENT_ERROR % [self.class, __method__]
         end
@@ -41,13 +40,12 @@ module NewRelic
         end
       end
 
-      # This class implements the adaptor pattern and is used internally provide 
+      # This class implements the adaptor pattern and is used internally provide
       # uniform access to the underlying HTTP Client's response object
       # NOTE: response_object should be non-nil!
       class AbstractResponse # :nodoc:
-
         def initialize(wrapped_response)
-          if wrapped_response.nil? 
+          if wrapped_response.nil?
             raise ArgumentError, WHINY_NIL_ERROR % self.class
           end
           @wrapped_response = wrapped_response
@@ -57,13 +55,13 @@ module NewRelic
           !!status_code
         end
 
-        # most HTTP client libraries report the HTTP status code as an integer, so 
+        # most HTTP client libraries report the HTTP status code as an integer, so
         # we expect status_code to be set only if a non-zero value is present
         def status_code
           @status_code ||= get_status_code
         end
 
-        private 
+        private
 
         def get_status_code_using(method_name)
           return unless @wrapped_response.respond_to?(method_name)
@@ -71,7 +69,7 @@ module NewRelic
           code == 0 ? nil : code
         end
 
-        # Override this method to memoize a non-zero Integer representation 
+        # Override this method to memoize a non-zero Integer representation
         # of HTTP status code from the response object
         def get_status_code
           get_status_code_using :code

data/lib/new_relic/agent/http_clients/curb_wrappers.rb

@@ -8,7 +8,6 @@ require_relative 'abstract'
 module NewRelic
   module Agent
     module HTTPClients
-
       class CurbRequest
         CURB = 'Curb'
         LHOST = 'host'
@@ -34,7 +33,7 @@ module NewRelic
           @curlobj._nr_http_verb
         end
 
-        def []( key )
+        def [](key)
           @curlobj.headers[key]
         end
 
@@ -48,7 +47,6 @@ module NewRelic
       end
 
       class CurbResponse < AbstractResponse
-
         def initialize wrapped_response
           super wrapped_response
           @headers = {}
@@ -75,8 +73,6 @@ module NewRelic
           get_status_code_using :response_code
         end
       end
-
     end
-
   end
 end

data/lib/new_relic/agent/http_clients/excon_wrappers.rb

@@ -31,8 +31,8 @@ module NewRelic
         private
 
         def get_attribute name
-          if @wrapped_response.respond_to?(name) 
-            @wrapped_response.send(name) 
+          if @wrapped_response.respond_to?(name)
+            @wrapped_response.send(name)
           else
             @wrapped_response[name]
           end
@@ -57,8 +57,8 @@ module NewRelic
 
           @method = @datum[:method].to_s.upcase
           @scheme = @datum[:scheme]
-          @port   = @datum[:port]
-          @path   = @datum[:path]
+          @port = @datum[:port]
+          @path = @datum[:path]
         end
 
         def type

data/lib/new_relic/agent/http_clients/http_rb_wrappers.rb

@@ -10,7 +10,7 @@ module NewRelic
     module HTTPClients
       class HTTPResponse < AbstractResponse
         def [](key)
-          _, value = @wrapped_response.headers.find{ |k, _| key.downcase == k.downcase }
+          _, value = @wrapped_response.headers.find { |k, _| key.downcase == k.downcase }
           value unless value.nil?
         end
 
@@ -21,8 +21,8 @@ module NewRelic
 
       class HTTPRequest < AbstractRequest
         HTTP_RB = 'http.rb'
-        HOST    = 'host'
-        COLON   = ':'
+        HOST = 'host'
+        COLON = ':'
 
         def initialize wrapped_request
           @wrapped_request = wrapped_request

data/lib/new_relic/agent/http_clients/httpclient_wrappers.rb

@@ -9,9 +9,8 @@ module NewRelic
   module Agent
     module HTTPClients
       class HTTPClientResponse < AbstractResponse
-
         def [](key)
-          @wrapped_response.headers.each do |k,v|
+          @wrapped_response.headers.each do |k, v|
             if key.downcase == k.downcase
               return v
             end

data/lib/new_relic/agent/http_clients/net_http_wrappers.rb

@@ -4,12 +4,12 @@
 # frozen_string_literal: true
 
 require_relative 'abstract'
+require 'resolv'
 
 module NewRelic
   module Agent
     module HTTPClients
       class NetHTTPResponse < AbstractResponse
-
         def [](key)
           @wrapped_response[key]
         end
@@ -61,10 +61,15 @@ module NewRelic
           when /^https?:\/\//
             ::NewRelic::Agent::HTTPClients::URIUtil.parse_and_normalize_url(@request.path)
           else
+            connection_address = @connection.address
+            if connection_address =~ Resolv::IPv6::Regex
+              connection_address = "[#{connection_address}]"
+            end
+
             scheme = @connection.use_ssl? ? 'https' : 'http'
             ::NewRelic::Agent::HTTPClients::URIUtil.parse_and_normalize_url(
-              "#{scheme}://#{@connection.address}:#{@connection.port}#{@request.path}"
-              )
+              "#{scheme}://#{connection_address}:#{@connection.port}#{@request.path}"
+            )
           end
         end
       end

data/lib/new_relic/agent/http_clients/typhoeus_wrappers.rb

@@ -9,7 +9,6 @@ module NewRelic
   module Agent
     module HTTPClients
       class TyphoeusHTTPResponse < AbstractResponse
-
         def [](key)
           unless headers.nil?
             result = headers[key]
@@ -22,7 +21,7 @@ module NewRelic
 
         def to_hash
           hash = {}
-          headers.each do |(k,v)|
+          headers.each do |(k, v)|
             hash[k] = v
           end
           hash
@@ -41,7 +40,7 @@ module NewRelic
           @uri = case request.url
             when ::URI then request.url
             else NewRelic::Agent::HTTPClients::URIUtil.parse_and_normalize_url(request.url)
-            end
+          end
         end
 
         TYPHOEUS = "Typhoeus".freeze

data/lib/new_relic/agent/http_clients/uri_util.rb

@@ -14,7 +14,6 @@ module NewRelic
   module Agent
     module HTTPClients
       module URIUtil
-
         def self.obfuscated_uri(url)
           parse_and_normalize_url(url).tap do |obfuscated|
             obfuscated.user = nil

data/lib/new_relic/agent/instrumentation/action_cable_subscriber.rb

@@ -7,10 +7,9 @@ module NewRelic
   module Agent
     module Instrumentation
       class ActionCableSubscriber < NotificationsSubscriber
-
         PERFORM_ACTION = 'perform_action.action_cable'.freeze
 
-        def start(name, id, payload) #THREAD_LOCAL_ACCESS
+        def start(name, id, payload) # THREAD_LOCAL_ACCESS
           return unless state.is_execution_traced?
 
           finishable = if name == PERFORM_ACTION
@@ -26,7 +25,7 @@ module NewRelic
           log_notification_error e, name, 'start'
         end
 
-        def finish(name, id, payload) #THREAD_LOCAL_ACCESS
+        def finish(name, id, payload) # THREAD_LOCAL_ACCESS
           return unless state.is_execution_traced?
 
           if exception = exception_object(payload)

data/lib/new_relic/agent/instrumentation/action_controller_subscriber.rb

@@ -9,8 +9,7 @@ module NewRelic
   module Agent
     module Instrumentation
       class ActionControllerSubscriber < NotificationsSubscriber
-
-        def start(name, id, payload) #THREAD_LOCAL_ACCESS
+        def start(name, id, payload) # THREAD_LOCAL_ACCESS
           # @req is a historically stable but not guaranteed Rails header property
           request = payload[:headers].instance_variable_get(:@req)
 
@@ -29,7 +28,7 @@ module NewRelic
           log_notification_error(e, name, 'start')
         end
 
-        def finish(name, id, payload) #THREAD_LOCAL_ACCESS
+        def finish(name, id, payload) # THREAD_LOCAL_ACCESS
           finishable = pop_segment(id)
 
           if state.is_execution_traced? \
@@ -49,21 +48,21 @@ module NewRelic
 
         def start_transaction_or_segment(payload, request, controller_class)
           Tracer.start_transaction_or_segment(
-            name:      format_metric_name(payload[:action], controller_class),
-            category:  :controller,
-            options:   {
-              request:          request,
-              filtered_params:  NewRelic::Agent::ParameterFiltering.filter_using_rails(
+            name: format_metric_name(payload[:action], controller_class),
+            category: :controller,
+            options: {
+              request: request,
+              filtered_params: NewRelic::Agent::ParameterFiltering.filter_using_rails(
                 payload[:params],
                 Rails.application.config.filter_parameters
               ),
               apdex_start_time: queue_start(request),
-              ignore_apdex:     NewRelic::Agent::Instrumentation::IgnoreActions.is_filtered?(
+              ignore_apdex: NewRelic::Agent::Instrumentation::IgnoreActions.is_filtered?(
                 ControllerInstrumentation::NR_IGNORE_APDEX_KEY,
                 controller_class,
                 payload[:action]
               ),
-              ignore_enduser:   NewRelic::Agent::Instrumentation::IgnoreActions.is_filtered?(
+              ignore_enduser: NewRelic::Agent::Instrumentation::IgnoreActions.is_filtered?(
                 ControllerInstrumentation::NR_IGNORE_ENDUSER_KEY,
                 controller_class,
                 payload[:action]

data/lib/new_relic/agent/instrumentation/action_view_subscriber.rb

@@ -9,8 +9,7 @@ module NewRelic
   module Agent
     module Instrumentation
       class ActionViewSubscriber < NotificationsSubscriber
-
-        def start(name, id, payload) #THREAD_LOCAL_ACCESS
+        def start(name, id, payload) # THREAD_LOCAL_ACCESS
           parent = segment_stack[id].last
           metric_name = format_metric_name(name, payload, parent)
 
@@ -58,15 +57,15 @@ module NewRelic
               || metric_name == "View/#{::NewRelic::Agent::UNKNOWN_METRIC}/Partial"
         end
 
-        RENDER_TEMPLATE_EVENT_NAME   = 'render_template.action_view'.freeze
-        RENDER_PARTIAL_EVENT_NAME    = 'render_partial.action_view'.freeze
+        RENDER_TEMPLATE_EVENT_NAME = 'render_template.action_view'.freeze
+        RENDER_PARTIAL_EVENT_NAME = 'render_partial.action_view'.freeze
         RENDER_COLLECTION_EVENT_NAME = 'render_collection.action_view'.freeze
 
         def metric_action(name)
           case name
           when /#{RENDER_TEMPLATE_EVENT_NAME}$/ then 'Rendering'
-          when RENDER_PARTIAL_EVENT_NAME        then 'Partial'
-          when RENDER_COLLECTION_EVENT_NAME     then 'Partial'
+          when RENDER_PARTIAL_EVENT_NAME then 'Partial'
+          when RENDER_COLLECTION_EVENT_NAME then 'Partial'
           end
         end
 
@@ -107,6 +106,5 @@ module NewRelic
         end
       end
     end
-
   end
 end

data/lib/new_relic/agent/instrumentation/active_job.rb

@@ -44,12 +44,13 @@ module NewRelic
 
           # Don't nest transactions if we're already in a web transaction.
           # Probably inline processing the job if that happens, so just trace.
-          if    txn &&  txn.recording_web_transaction?
+          if txn && txn.recording_web_transaction?
             run_in_trace(job, block, :Consume)
           elsif txn && !txn.recording_web_transaction?
             ::NewRelic::Agent::Transaction.set_default_transaction_name(
               transaction_name_suffix_for_job(job),
-              transaction_category)
+              transaction_category
+            )
             block.call
           else
             run_in_transaction(job, block)
@@ -64,7 +65,7 @@ module NewRelic
 
         def self.run_in_transaction(job, block)
           ::NewRelic::Agent::Tracer.in_transaction(name: transaction_name_for_job(job),
-                                                   category: :other,
+            category: :other,
                                                    &block)
         end
 

data/lib/new_relic/agent/instrumentation/active_merchant.rb

@@ -27,8 +27,8 @@ DependencyDetection.defer do
         [:authorize, :purchase, :credit, :void, :capture, :recurring, :store, :unstore, :update].each do |operation|
           if implemented_methods.include?(operation)
             add_method_tracer operation, [-> (*) { "ActiveMerchant/gateway/#{gateway_name}/#{operation}" },
-                                          -> (*) { "ActiveMerchant/gateway/#{gateway_name}" },
-                                          -> (*) { "ActiveMerchant/operation/#{operation}" }]
+              -> (*) { "ActiveMerchant/gateway/#{gateway_name}" },
+              -> (*) { "ActiveMerchant/operation/#{operation}" }]
           end
         end
       end