newrelic_rpm 8.0.0 → 8.4.0

data/lib/new_relic/agent/instrumentation/net_http/prepend.rb

@@ -4,13 +4,13 @@
 
 require_relative 'instrumentation'
 
-module NewRelic 
-  module Agent 
+module NewRelic
+  module Agent
     module Instrumentation
       module NetHTTP
         module Prepend
           include NewRelic::Agent::Instrumentation::NetHTTP
-          
+
           def request(request, *args, &block)
             request_with_tracing(request) { super }
           end
@@ -18,4 +18,4 @@ module NewRelic
       end
     end
   end
-end
+end

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

@@ -37,7 +37,7 @@ DependencyDetection.defer do
   executes do
     if use_prepend?
       prepend_instrument ::Net::HTTP, ::NewRelic::Agent::Instrumentation::NetHTTP::Prepend
-    else 
+    else
       chain_instrument ::NewRelic::Agent::Instrumentation::NetHTTP::Chain
     end
   end

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

@@ -12,7 +12,7 @@ module NewRelic
         end
 
         def self.subscribed?
-          find_all_subscribers.find{|s| s.instance_variable_get(:@delegate).class == self }
+          find_all_subscribers.find { |s| s.instance_variable_get(:@delegate).class == self }
         end
 
         def self.find_all_subscribers
@@ -64,7 +64,7 @@ module NewRelic
         end
 
         def segment_stack
-          Thread.current[@queue_key] ||= Hash.new {|h,id| h[id] = [] }
+          Thread.current[@queue_key] ||= Hash.new { |h, id| h[id] = [] }
         end
 
         def state
@@ -94,7 +94,6 @@ module NewRelic
           end
         end
       end
-
     end
   end
 end

data/lib/new_relic/agent/instrumentation/padrino/chain.rb

@@ -2,30 +2,34 @@
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
-module NewRelic::Agent::Instrumentation
-  module Padrino
-    module Chain
-      def self.instrument!
-        ::Padrino::Routing::InstanceMethods.module_eval do
-          include NewRelic::Agent::Instrumentation::Sinatra
+module NewRelic
+  module Agent
+    module Instrumentation
+      module PadrinoTracer
+        module Chain
+          def self.instrument!
+            ::Padrino::Routing::InstanceMethods.module_eval do
+              include NewRelic::Agent::Instrumentation::Sinatra
 
-          def dispatch_with_newrelic
-            dispatch_with_tracing { dispatch_without_newrelic }
-          end
+              def dispatch_with_newrelic
+                dispatch_with_tracing { dispatch_without_newrelic }
+              end
 
-          alias dispatch_without_newrelic dispatch!
-          alias dispatch! dispatch_with_newrelic
+              alias dispatch_without_newrelic dispatch!
+              alias dispatch! dispatch_with_newrelic
 
-          # Padrino 0.13 mustermann routing
-          if private_method_defined?(:invoke_route)
-            include NewRelic::Agent::Instrumentation::Padrino
+              # Padrino 0.13 mustermann routing
+              if private_method_defined?(:invoke_route)
+                include NewRelic::Agent::Instrumentation::Padrino
 
-            def invoke_route_with_newrelic(*args, &block)
-              invoke_route_with_tracing(*args) { invoke_route_without_newrelic(*args, &block) }
-            end
+                def invoke_route_with_newrelic(*args, &block)
+                  invoke_route_with_tracing(*args) { invoke_route_without_newrelic(*args, &block) }
+                end
 
-            alias invoke_route_without_newrelic invoke_route
-            alias invoke_route invoke_route_with_newrelic
+                alias invoke_route_without_newrelic invoke_route
+                alias invoke_route invoke_route_with_newrelic
+              end
+            end
           end
         end
       end

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

@@ -15,7 +15,8 @@ module NewRelic::Agent::Instrumentation
         txn_name = ::NewRelic::Agent::Instrumentation::Sinatra::TransactionNamer.transaction_name_for_route(env, request)
         unless txn_name.nil?
           ::NewRelic::Agent::Transaction.set_default_transaction_name(
-            "#{self.class.name}/#{txn_name}", :sinatra)
+            "#{self.class.name}/#{txn_name}", :sinatra
+          )
         end
       rescue => e
         ::NewRelic::Agent.logger.debug("Failed during invoke_route to set transaction name", e)
@@ -24,4 +25,4 @@ module NewRelic::Agent::Instrumentation
       yield
     end
   end
-end
+end

data/lib/new_relic/agent/instrumentation/padrino/prepend.rb

@@ -3,7 +3,7 @@
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 module NewRelic::Agent::Instrumentation
-  module Padrino
+  module PadrinoTracer
     module Prepend
       include NewRelic::Agent::Instrumentation::Sinatra
       include NewRelic::Agent::Instrumentation::Padrino
@@ -17,4 +17,4 @@ module NewRelic::Agent::Instrumentation
       end
     end
   end
-end
+end

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

@@ -24,12 +24,9 @@ DependencyDetection.defer do
   executes do
     ::NewRelic::Agent.logger.info 'Installing Padrino instrumentation'
     if use_prepend?
-      prepend_instrument ::Padrino::Routing::InstanceMethods, NewRelic::Agent::Instrumentation::Padrino::Prepend
+      prepend_instrument ::Padrino::Application, NewRelic::Agent::Instrumentation::PadrinoTracer::Prepend
     else
-      chain_instrument NewRelic::Agent::Instrumentation::Padrino::Chain
+      chain_instrument NewRelic::Agent::Instrumentation::PadrinoTracer::Chain
     end
   end
 end
-
-
-

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

@@ -9,10 +9,10 @@ module NewRelic
       # Record queue time metrics based on any of three headers
       # which can be set on the request.
       module QueueTime
-        REQUEST_START_HEADER    = 'HTTP_X_REQUEST_START'.freeze
-        QUEUE_START_HEADER      = 'HTTP_X_QUEUE_START'.freeze
+        REQUEST_START_HEADER = 'HTTP_X_REQUEST_START'.freeze
+        QUEUE_START_HEADER = 'HTTP_X_QUEUE_START'.freeze
         MIDDLEWARE_START_HEADER = 'HTTP_X_MIDDLEWARE_START'.freeze
-        ALL_QUEUE_METRIC        = 'WebFrontend/QueueTime'.freeze
+        ALL_QUEUE_METRIC = 'WebFrontend/QueueTime'.freeze
         # any timestamps before this are thrown out and the parser
         # will try again with a larger unit (2000/1/1 UTC)
         EARLIEST_ACCEPTABLE_TIME = Time.at(946684800).to_f
@@ -27,7 +27,7 @@ module NewRelic
 
         module_function
 
-        def parse_frontend_timestamp(headers, now=Process.clock_gettime(Process::CLOCK_REALTIME))
+        def parse_frontend_timestamp(headers, now = Process.clock_gettime(Process::CLOCK_REALTIME))
           earliest = nil
 
           CANDIDATE_HEADERS.each do |header|
@@ -52,7 +52,7 @@ module NewRelic
           when /^\s*([\d+\.]+)\s*$/ then $1
           # following regexp intentionally unanchored to handle
           # (ie ignore) leading server names
-          when /t=([\d+\.]+)/       then $1
+          when /t=([\d+\.]+)/ then $1
           end
         end
 

data/lib/new_relic/agent/instrumentation/rack/chain.rb

@@ -10,24 +10,24 @@ module NewRelic::Agent::Instrumentation
 
         builder_class.class_eval do
           include ::NewRelic::Agent::Instrumentation::RackBuilder
-  
+
           def to_app_with_newrelic_deferred_dependency_detection
             with_deferred_dependency_detection { to_app_without_newrelic }
           end
 
           alias_method :to_app_without_newrelic, :to_app
           alias_method :to_app, :to_app_with_newrelic_deferred_dependency_detection
-  
+
           if ::NewRelic::Agent::Instrumentation::RackHelpers.middleware_instrumentation_enabled?
             ::NewRelic::Agent.logger.info "Installing #{builder_class} middleware instrumentation"
 
             def run_with_newrelic(app, *args)
               run_with_tracing(app) { |wrapped_app| run_without_newrelic(wrapped_app, *args) }
             end
-   
+
             alias_method :run_without_newrelic, :run
             alias_method :run, :run_with_newrelic
-  
+
             def use_with_newrelic(middleware_class, *args, &block)
               use_with_tracing(middleware_class) { |wrapped_class| use_without_newrelic(wrapped_class, *args, &block) }
             end
@@ -45,7 +45,7 @@ module NewRelic::Agent::Instrumentation
         def self.instrument! url_map_class
           url_map_class.class_eval do
             alias_method :initialize_without_newrelic, :initialize
-    
+
             def initialize(map = {})
               traced_map = ::NewRelic::Agent::Instrumentation::RackURLMap.generate_traced_map(map)
               initialize_without_newrelic(traced_map)

data/lib/new_relic/agent/instrumentation/rack/helpers.rb

@@ -29,4 +29,3 @@ module NewRelic::Agent::Instrumentation
     end
   end
 end
-

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

@@ -6,7 +6,6 @@ module NewRelic
   module Agent
     module Instrumentation
       module RackBuilder
-
         def self.track_deferred_detection builder_class
           class << builder_class
             attr_accessor :_nr_deferred_detection_ran
@@ -16,7 +15,7 @@ module NewRelic
 
         def deferred_dependency_check
           return if self.class._nr_deferred_detection_ran
-  
+
           NewRelic::Agent.logger.info "Doing deferred dependency-detection before Rack startup"
           DependencyDetection.detect!
           self.class._nr_deferred_detection_ran = true
@@ -28,7 +27,7 @@ module NewRelic
           if middleware_instrumentation_enabled?
             if ::NewRelic::Agent::Instrumentation::MiddlewareProxy.needs_wrapping?(app)
               ::NewRelic::Agent.logger.info("We weren't able to instrument all of your Rack middlewares.",
-                                            "To correct this, ensure you 'require \"newrelic_rpm\"' before setting up your middleware stack.")
+                "To correct this, ensure you 'require \"newrelic_rpm\"' before setting up your middleware stack.")
             end
           end
         end
@@ -41,7 +40,7 @@ module NewRelic
         # this point.
         def with_deferred_dependency_detection
           deferred_dependency_check
-          yield.tap{ |result| check_for_late_instrumentation(result) }
+          yield.tap { |result| check_for_late_instrumentation(result) }
         end
 
         def middleware_instrumentation_enabled?
@@ -70,4 +69,4 @@ module NewRelic
       end
     end
   end
-end
+end

data/lib/new_relic/agent/instrumentation/rack/prepend.rb

@@ -4,7 +4,6 @@
 
 module NewRelic::Agent::Instrumentation
   module Rack
-    
     module URLMap
       module Prepend
         def initialize(map = {})

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

@@ -57,7 +57,7 @@ DependencyDetection.defer do
       prepend_instrument ::Rack::URLMap, NewRelic::Agent::Instrumentation::Rack::URLMap::Prepend
     else
       chain_instrument_target ::Rack::URLMap, NewRelic::Agent::Instrumentation::Rack::URLMap::Chain
-      ::NewRelic::Agent::Instrumentation::RackHelpers.instrument_url_map 
+      ::NewRelic::Agent::Instrumentation::RackHelpers.instrument_url_map
     end
   end
 end

data/lib/new_relic/agent/instrumentation/rails3/action_controller.rb

@@ -20,17 +20,16 @@ module NewRelic
             end
           end
 
-          def process_action(*args) #THREAD_LOCAL_ACCESS
+          def process_action(*args) # THREAD_LOCAL_ACCESS
             munged_params = NewRelic::Agent::ParameterFiltering.filter_rails_request_parameters(request.filtered_parameters)
             perform_action_with_newrelic_trace(:category => :controller,
-                                               :name => self.action_name,
-                                               :path => newrelic_metric_path,
-                                               :params => munged_params,
-                                               :class_name => self.class.name)  do
+              :name => self.action_name,
+              :path => newrelic_metric_path,
+              :params => munged_params,
+              :class_name => self.class.name) do
               super
             end
           end
-
         end
 
         module ActionView
@@ -47,6 +46,7 @@ module NewRelic
                 identifier
               end
             end
+
             def render_type(file_path)
               file = File.basename(file_path)
               if file.starts_with?('_')

data/lib/new_relic/agent/instrumentation/rails_notifications/action_cable.rb

@@ -9,8 +9,8 @@ DependencyDetection.defer do
 
   depends_on do
     defined?(::Rails::VERSION::MAJOR) &&
-     ::Rails::VERSION::MAJOR.to_i >= 5 &&
-       defined?(::ActionCable)
+      ::Rails::VERSION::MAJOR.to_i >= 5 &&
+      defined?(::ActionCable)
   end
 
   depends_on do

data/lib/new_relic/agent/instrumentation/rails_notifications/action_controller.rb

@@ -4,7 +4,6 @@
 require 'new_relic/agent/instrumentation/action_controller_subscriber'
 require 'new_relic/agent/prepend_supportability'
 
-
 DependencyDetection.defer do
   @name = :action_controller_notifications
 

data/lib/new_relic/agent/instrumentation/rake/chain.rb

@@ -18,8 +18,3 @@ module NewRelic::Agent::Instrumentation
     end
   end
 end
-
-
-
-
-

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

@@ -99,14 +99,14 @@ module NewRelic
 
         def record_attributes(args, task)
           command_line = task.application.top_level_tasks.join(" ")
-          NewRelic::Agent::Transaction.merge_untrusted_agent_attributes({ :command => command_line },
-                                                                        :'job.rake',
-                                                                        NewRelic::Agent::AttributeFilter::DST_NONE)
+          NewRelic::Agent::Transaction.merge_untrusted_agent_attributes({:command => command_line},
+            :'job.rake',
+            NewRelic::Agent::AttributeFilter::DST_NONE)
           named_args = name_the_args(args, task.arg_names)
           unless named_args.empty?
             NewRelic::Agent::Transaction.merge_untrusted_agent_attributes(named_args,
-                                                                          :'job.rake.args',
-                                                                          NewRelic::Agent::AttributeFilter::DST_NONE)
+              :'job.rake.args',
+              NewRelic::Agent::AttributeFilter::DST_NONE)
           end
         rescue => e
           NewRelic::Agent.logger.error("Error during Rake task attribute recording.", e)
@@ -141,4 +141,4 @@ module NewRelic
       end
     end
   end
-end
+end

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

@@ -17,7 +17,7 @@ DependencyDetection.defer do
   depends_on { ::NewRelic::Agent::Instrumentation::Rake.safe_from_third_party_gem? }
 
   executes do
-    ::NewRelic::Agent.logger.info  "Installing Rake instrumentation"
+    ::NewRelic::Agent.logger.info "Installing Rake instrumentation"
     ::NewRelic::Agent.logger.debug "Instrumenting Rake tasks: #{::NewRelic::Agent.config[:'rake.tasks']}"
   end
 

data/lib/new_relic/agent/instrumentation/redis/chain.rb

@@ -5,25 +5,25 @@
 
 module NewRelic::Agent::Instrumentation
   module Redis
-    module Chain 
+    module Chain
       def self.instrument!
         ::Redis::Client.class_eval do
           include NewRelic::Agent::Instrumentation::Redis
 
           alias_method :call_without_new_relic, :call
-    
+
           def call(*args, &block)
             call_with_tracing(args[0]) { call_without_new_relic(*args, &block) }
           end
-      
+
           alias_method :call_pipeline_without_new_relic, :call_pipeline
-    
+
           def call_pipeline(*args, &block)
             call_pipeline_with_tracing(args[0]) { call_pipeline_without_new_relic(*args, &block) }
           end
 
           alias_method :connect_without_new_relic, :connect
-    
+
           def connect(*args, &block)
             connect_with_tracing { connect_without_new_relic(*args, &block) }
           end
@@ -31,4 +31,4 @@ module NewRelic::Agent::Instrumentation
       end
     end
   end
-end
+end

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

@@ -32,7 +32,7 @@ module NewRelic::Agent::Instrumentation
 
     private
 
-    def with_tracing operation, statement=nil
+    def with_tracing operation, statement = nil
       segment = NewRelic::Agent::Tracer.start_datastore_segment(
         product: PRODUCT_NAME,
         operation: operation,
@@ -62,4 +62,4 @@ module NewRelic::Agent::Instrumentation
       UNKNOWN
     end
   end
-end
+end

data/lib/new_relic/agent/instrumentation/redis/prepend.rb

@@ -21,4 +21,4 @@ module NewRelic::Agent::Instrumentation
       end
     end
   end
-end
+end

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

@@ -13,7 +13,7 @@ DependencyDetection.defer do
   # Why not :redis? newrelic-redis used that name, so avoid conflicting
   named :redis_instrumentation
   configure_with :redis
-  
+
   depends_on do
     defined?(::Redis) && defined?(::Redis::VERSION)
   end

data/lib/new_relic/agent/instrumentation/resque/chain.rb

@@ -2,16 +2,15 @@
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
-
 module NewRelic::Agent::Instrumentation
   module Resque
-    module Chain 
+    module Chain
       def self.instrument!
         ::Resque::Job.class_eval do
           include NewRelic::Agent::Instrumentation::Resque
 
           alias_method :perform_without_instrumentation, :perform
-  
+
           def perform
             with_tracing { perform_without_instrumentation }
           end

data/lib/new_relic/agent/instrumentation/resque/helper.rb

@@ -16,4 +16,4 @@ module NewRelic
       end
     end
   end
-end
+end

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

@@ -12,12 +12,13 @@ module NewRelic::Agent::Instrumentation
         perform_action_with_newrelic_trace(
           :name => 'perform',
           :class_name => self.payload_class,
-          :category => 'OtherTransaction/ResqueJob') do
-
+          :category => 'OtherTransaction/ResqueJob'
+        ) do
           NewRelic::Agent::Transaction.merge_untrusted_agent_attributes(
             args,
             :'job.resque.args',
-            NewRelic::Agent::AttributeFilter::DST_NONE)
+            NewRelic::Agent::AttributeFilter::DST_NONE
+          )
 
           yield
         end
@@ -30,6 +31,5 @@ module NewRelic::Agent::Instrumentation
         end
       end
     end
-
   end
 end

data/lib/new_relic/agent/instrumentation/resque/prepend.rb

@@ -2,10 +2,9 @@
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
-
 module NewRelic::Agent::Instrumentation
   module Resque
-    module Prepend 
+    module Prepend
       include NewRelic::Agent::Instrumentation::Resque
 
       def perform

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

@@ -39,9 +39,9 @@ DependencyDetection.defer do
 
     if NewRelic::Agent::Instrumentation::Resque::Helper.resque_fork_per_job?
       ::Resque.before_first_fork do
-        NewRelic::Agent.manual_start(:dispatcher   => :resque,
-                                     :sync_startup => true,
-                                     :start_channel_listener => true)
+        NewRelic::Agent.manual_start(:dispatcher => :resque,
+          :sync_startup => true,
+          :start_channel_listener => true)
       end
 
       ::Resque.before_fork do |job|
@@ -52,13 +52,13 @@ DependencyDetection.defer do
         # Only suppress reporting Instance/Busy for forked children
         # Traced errors UI relies on having the parent process report that metric
         NewRelic::Agent.after_fork(:report_to_channel => job.object_id,
-                                   :report_instance_busy => false)
+          :report_instance_busy => false)
       end
     else
       ::Resque.before_first_fork do
-        NewRelic::Agent.manual_start(:dispatcher   => :resque,
-                                     :sync_startup => true,
-                                     :start_channel_listener => false)
+        NewRelic::Agent.manual_start(:dispatcher => :resque,
+          :sync_startup => true,
+          :start_channel_listener => false)
       end
     end
   end

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

@@ -12,13 +12,13 @@ DependencyDetection.defer do
 
   depends_on do
     !NewRelic::Agent.config[:disable_sequel_instrumentation] &&
-    !NewRelic::Agent.config[:disable_database_instrumentation]
+      !NewRelic::Agent.config[:disable_database_instrumentation]
   end
 
   def supported_sequel_version?
-    Sequel.const_defined?( :MAJOR ) &&
-      ( Sequel::MAJOR > 3 ||
-        Sequel::MAJOR == 3 && Sequel::MINOR >= 37 )
+    Sequel.const_defined?(:MAJOR) &&
+      (Sequel::MAJOR > 3 ||
+        Sequel::MAJOR == 3 && Sequel::MINOR >= 37)
   end
 
   executes do
@@ -26,15 +26,15 @@ DependencyDetection.defer do
 
       ::NewRelic::Agent.logger.info 'Installing Sequel instrumentation'
 
-      if Sequel::Database.respond_to?( :extension )
+      if Sequel::Database.respond_to?(:extension)
         Sequel::Database.extension :newrelic_instrumentation
       else
-        NewRelic::Agent.logger.info "Detected Sequel version %s." % [ Sequel::VERSION ]
+        NewRelic::Agent.logger.info "Detected Sequel version %s." % [Sequel::VERSION]
         NewRelic::Agent.logger.info "Please see additional documentation: " +
           "https://newrelic.com/docs/ruby/sequel-instrumentation"
       end
 
-      Sequel.synchronize{Sequel::DATABASES.dup}.each do |db|
+      Sequel.synchronize { Sequel::DATABASES.dup }.each do |db|
         db.extension :newrelic_instrumentation
       end
 
@@ -44,7 +44,5 @@ DependencyDetection.defer do
       NewRelic::Agent.logger.info "Sequel instrumentation requires at least version 3.37.0."
 
     end
-
   end
-
 end

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

@@ -33,4 +33,4 @@ module NewRelic
       end
     end
   end
-end
+end

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

@@ -44,6 +44,7 @@ DependencyDetection.defer do
           }
         end
       end
+
       class Client
         def call(_worker_class, job, *_)
           job[NewRelic::NEWRELIC_KEY] ||= distributed_tracing_headers if ::NewRelic::Agent.config[:'distributed_tracing.enabled']
@@ -61,10 +62,10 @@ DependencyDetection.defer do
     class Sidekiq::Extensions::DelayedClass
       def newrelic_trace_args(msg, queue)
         (target, method_name, _args) = if YAML.respond_to?(:unsafe_load)
-                                         YAML.unsafe_load(msg['args'][0])
-                                       else 
-                                         YAML.load(msg['args'][0])
-                                       end
+          YAML.unsafe_load(msg['args'][0])
+        else
+          YAML.load(msg['args'][0])
+        end
 
         {
           :name => method_name,

data/lib/new_relic/agent/instrumentation/sinatra/ignorer.rb

@@ -5,7 +5,6 @@
 module NewRelic::Agent::Instrumentation
   module Sinatra
     module Ignorer
-
       def self.should_ignore?(app, type)
         return false if !app.settings.respond_to?(:newrelic_ignores)