newrelic_rpm 8.2.0 → 8.3.0

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)
 

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

@@ -70,7 +70,8 @@ module NewRelic::Agent::Instrumentation
         begin
           if txn_name = TransactionNamer.transaction_name_for_route(env, request)
             ::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 route_eval to set transaction name", e)
@@ -93,8 +94,8 @@ module NewRelic::Agent::Instrumentation
 
         name = TransactionNamer.initial_transaction_name(request)
         perform_action_with_newrelic_trace(:category => :sinatra,
-                                          :name => name,
-                                          :params => filtered_params) do
+          :name => name,
+          :params => filtered_params) do
           begin
             yield
           ensure

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

@@ -16,7 +16,7 @@ DependencyDetection.defer do
   executes do
     ::Sunspot.module_eval do
       class << self
-        %w(index index!).each do |method|
+        %w[index index!].each do |method|
           add_method_tracer method, 'SolrClient/Sunspot/index'
         end
         add_method_tracer :commit, 'SolrClient/Sunspot/commit'

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

@@ -6,7 +6,6 @@ module NewRelic
   module Agent
     module Instrumentation
       module Tilt
-
         def metric_name(klass, file)
           "View/#{klass}/#{file}/Rendering"
         end

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

@@ -4,19 +4,19 @@
 
 module NewRelic::Agent::Instrumentation
   module Typhoeus
-    module Chain 
+    module Chain
       def self.instrument!
-        ::Typhoeus::Hydra.class_eval do 
+        ::Typhoeus::Hydra.class_eval do
           include NewRelic::Agent::Instrumentation::Typhoeus
 
           def run_with_newrelic(*args)
             with_tracing { run_without_newrelic(*args) }
           end
-    
+
           alias run_without_newrelic run
           alias run run_with_newrelic
         end
       end
     end
   end
-end
+end

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

@@ -6,8 +6,7 @@ module NewRelic
   module Agent
     module Instrumentation
       module Typhoeus
-
-        HYDRA_SEGMENT_NAME    = "External/Multiple/Typhoeus::Hydra/run"
+        HYDRA_SEGMENT_NAME = "External/Multiple/Typhoeus::Hydra/run"
         NOTICIBLE_ERROR_CLASS = "Typhoeus::Errors::TyphoeusError"
 
         EARLIEST_VERSION = Gem::Version.new("0.5.3")
@@ -27,7 +26,7 @@ module NewRelic
             response.return_message
           else
             # 0.5.4 seems to have lost xxxx_message methods altogether.
-            "timeout" 
+            "timeout"
           end
         end
 
@@ -68,11 +67,10 @@ module NewRelic
             if request.response.code == 0
               segment.notice_error NoticibleError.new NOTICIBLE_ERROR_CLASS, response_message(request.response)
             end
-           
+
             segment.finish if segment
           end
           request.on_complete.unshift(callback)
-
         rescue => e
           NewRelic::Agent.logger.error("Exception during trace setup for Typhoeus request", e)
         end

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

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

data/lib/new_relic/agent/internal_agent_error.rb

@@ -10,7 +10,7 @@
 module NewRelic
   module Agent
     class InternalAgentError < StandardError
-      def initialize(msg=nil)
+      def initialize(msg = nil)
         super("Ruby agent internal error. Please contact support referencing this error.\n #{msg}")
       end
     end

data/lib/new_relic/agent/javascript_instrumentor.rb

@@ -19,8 +19,8 @@ module NewRelic
 
       def log_configuration
         NewRelic::Agent.logger.debug("JS agent loader requested: #{NewRelic::Agent.config[:'browser_monitoring.loader']}",
-                                     "JS agent loader debug: #{NewRelic::Agent.config[:'browser_monitoring.debug']}",
-                                     "JS agent loader version: #{NewRelic::Agent.config[:'browser_monitoring.loader_version']}")
+          "JS agent loader debug: #{NewRelic::Agent.config[:'browser_monitoring.debug']}",
+          "JS agent loader version: #{NewRelic::Agent.config[:'browser_monitoring.loader_version']}")
 
         if !NewRelic::Agent.config[:'rum.enabled']
           NewRelic::Agent.logger.debug("Real User Monitoring is disabled for this agent. Edit your configuration to change this.")
@@ -38,19 +38,19 @@ module NewRelic
       def js_enabled_and_ready?
         if !enabled?
           ::NewRelic::Agent.logger.log_once(:debug, :js_agent_disabled,
-                                            "JS agent instrumentation is disabled.")
+            "JS agent instrumentation is disabled.")
           false
         elsif missing_config?(:js_agent_loader)
           ::NewRelic::Agent.logger.log_once(:debug, :missing_js_agent_loader,
-                                            "Missing :js_agent_loader. Skipping browser instrumentation.")
+            "Missing :js_agent_loader. Skipping browser instrumentation.")
           false
         elsif missing_config?(:beacon)
           ::NewRelic::Agent.logger.log_once(:debug, :missing_beacon,
-                                            "Beacon configuration not received (yet?). Skipping browser instrumentation.")
+            "Beacon configuration not received (yet?). Skipping browser instrumentation.")
           false
         elsif missing_config?(:browser_key)
           ::NewRelic::Agent.logger.log_once(:debug, :missing_browser_key,
-                                            "Browser key is not set. Skipping browser instrumentation.")
+            "Browser key is not set. Skipping browser instrumentation.")
           false
         else
           true
@@ -83,7 +83,7 @@ module NewRelic
         value.nil? || value.empty?
       end
 
-      def browser_timing_header(nonce=nil) #THREAD_LOCAL_ACCESS
+      def browser_timing_header(nonce = nil) # THREAD_LOCAL_ACCESS
         return '' unless js_enabled_and_ready? # fast exit
 
         state = NewRelic::Agent::Tracer.state
@@ -99,11 +99,11 @@ module NewRelic
         ''
       end
 
-      def browser_timing_loader(nonce=nil)
+      def browser_timing_loader(nonce = nil)
         html_safe_if_needed("\n<script type=\"text/javascript\"#{create_nonce(nonce)}>#{Agent.config[:js_agent_loader]}</script>")
       end
 
-      def browser_timing_config(state, nonce=nil)
+      def browser_timing_config(state, nonce = nil)
         txn = state.current_transaction
         return '' if txn.nil?
 
@@ -116,44 +116,44 @@ module NewRelic
         ''
       end
 
-      def create_nonce(nonce=nil)
+      def create_nonce(nonce = nil)
         return '' unless nonce
         " nonce=\"#{nonce.to_s}\""
       end
 
-      BEACON_KEY           = "beacon".freeze
-      ERROR_BEACON_KEY     = "errorBeacon".freeze
-      LICENSE_KEY_KEY      = "licenseKey".freeze
-      APPLICATIONID_KEY    = "applicationID".freeze
+      BEACON_KEY = "beacon".freeze
+      ERROR_BEACON_KEY = "errorBeacon".freeze
+      LICENSE_KEY_KEY = "licenseKey".freeze
+      APPLICATIONID_KEY = "applicationID".freeze
       TRANSACTION_NAME_KEY = "transactionName".freeze
-      QUEUE_TIME_KEY       = "queueTime".freeze
+      QUEUE_TIME_KEY = "queueTime".freeze
       APPLICATION_TIME_KEY = "applicationTime".freeze
-      AGENT_KEY            = "agent".freeze
-      SSL_FOR_HTTP_KEY     = "sslForHttp".freeze
-      ATTS_KEY             = "atts".freeze
-      ATTS_USER_SUBKEY     = "u".freeze
-      ATTS_AGENT_SUBKEY    = "a".freeze
+      AGENT_KEY = "agent".freeze
+      SSL_FOR_HTTP_KEY = "sslForHttp".freeze
+      ATTS_KEY = "atts".freeze
+      ATTS_USER_SUBKEY = "u".freeze
+      ATTS_AGENT_SUBKEY = "a".freeze
 
       # NOTE: Internal prototyping may override this, so leave name stable!
       def data_for_js_agent(transaction)
         queue_time_in_seconds = [transaction.queue_time, 0.0].max
         start_time_in_seconds = [transaction.start_time, 0.0].max
-        app_time_in_seconds   = Process.clock_gettime(Process::CLOCK_REALTIME) - start_time_in_seconds
+        app_time_in_seconds = Process.clock_gettime(Process::CLOCK_REALTIME) - start_time_in_seconds
 
         queue_time_in_millis = (1000.0 * queue_time_in_seconds).round
-        app_time_in_millis   = (1000.0 * app_time_in_seconds).round
+        app_time_in_millis = (1000.0 * app_time_in_seconds).round
 
         transaction_name = transaction.best_name || ::NewRelic::Agent::UNKNOWN_METRIC
 
         data = {
-          BEACON_KEY           => NewRelic::Agent.config[:beacon],
-          ERROR_BEACON_KEY     => NewRelic::Agent.config[:error_beacon],
-          LICENSE_KEY_KEY      => NewRelic::Agent.config[:browser_key],
-          APPLICATIONID_KEY    => NewRelic::Agent.config[:application_id],
+          BEACON_KEY => NewRelic::Agent.config[:beacon],
+          ERROR_BEACON_KEY => NewRelic::Agent.config[:error_beacon],
+          LICENSE_KEY_KEY => NewRelic::Agent.config[:browser_key],
+          APPLICATIONID_KEY => NewRelic::Agent.config[:application_id],
           TRANSACTION_NAME_KEY => obfuscator.obfuscate(transaction_name),
-          QUEUE_TIME_KEY       => queue_time_in_millis,
+          QUEUE_TIME_KEY => queue_time_in_millis,
           APPLICATION_TIME_KEY => app_time_in_millis,
-          AGENT_KEY            => NewRelic::Agent.config[:js_agent_file]
+          AGENT_KEY => NewRelic::Agent.config[:js_agent_file]
         }
 
         add_ssl_for_http(data)

data/lib/new_relic/agent/logging.rb

@@ -8,7 +8,6 @@ require 'new_relic/agent/hostname'
 module NewRelic
   module Agent
     module Logging
-
       # This class can be used as the formatter for an existing logger.  It
       # decorates log messages with trace and entity metadata, and formats each
       # log messages as a JSON object.
@@ -89,7 +88,14 @@ module NewRelic
 
         def escape(message)
           message = message.to_s unless message.is_a?(String)
-          message = message.scrub(REPLACEMENT_CHAR) unless message.valid_encoding?
+          unless message.encoding == Encoding::UTF_8 && message.valid_encoding?
+            message = message.encode(
+              Encoding::UTF_8,
+              invalid: :replace,
+              undef: :replace,
+              replace: REPLACEMENT_CHAR
+            )
+          end
           message.to_json
         end
 
@@ -98,7 +104,6 @@ module NewRelic
         end
       end
 
-
       # This logger decorates logs with trace and entity metadata, and emits log
       # messages formatted as JSON objects.  It extends the Logger class from
       # the Ruby standard library, and accepts the same constructor parameters.
@@ -115,7 +120,6 @@ module NewRelic
       #
       # @api public
       class DecoratingLogger < (defined?(::ActiveSupport) && defined?(::ActiveSupport::Logger) ? ::ActiveSupport::Logger : ::Logger)
-
         alias :write :info
 
         # Positional and Keyword arguments are separated beginning with Ruby 2.7

data/lib/new_relic/agent/memory_logger.rb

@@ -44,7 +44,7 @@ module NewRelic
         messages << [:debug, msgs, blk]
       end
 
-      def log_exception(level, e, backtrace_level=level)
+      def log_exception(level, e, backtrace_level = level)
         messages << [:log_exception, [level, e, backtrace_level]]
       end
 

data/lib/new_relic/agent/messaging.rb

@@ -18,8 +18,8 @@ module NewRelic
       RABBITMQ_TRANSPORT_TYPE = "RabbitMQ"
 
       ATTR_DESTINATION = AttributeFilter::DST_TRANSACTION_EVENTS |
-                         AttributeFilter::DST_TRANSACTION_TRACER |
-                         AttributeFilter::DST_ERROR_COLLECTOR
+        AttributeFilter::DST_TRANSACTION_TRACER |
+        AttributeFilter::DST_ERROR_COLLECTOR
 
       # Start a MessageBroker segment configured to trace a messaging action.
       # Finishing this segment will handle timing and recording of the proper
@@ -53,12 +53,12 @@ module NewRelic
       # @api public
       #
       def start_message_broker_segment(action: nil,
-                                       library: nil,
-                                       destination_type: nil,
-                                       destination_name: nil,
-                                       headers: nil,
-                                       parameters: nil,
-                                       start_time: nil)
+        library: nil,
+        destination_type: nil,
+        destination_name: nil,
+        headers: nil,
+        parameters: nil,
+        start_time: nil)
 
         Tracer.start_message_broker_segment(
           action: action,
@@ -111,14 +111,14 @@ module NewRelic
       # @api public
       #
       def wrap_message_broker_consume_transaction(library:,
-                                                  destination_type:,
-                                                  destination_name:,
-                                                  headers: nil,
-                                                  routing_key: nil,
-                                                  queue_name: nil,
-                                                  exchange_type: nil,
-                                                  reply_to: nil,
-                                                  correlation_id: nil)
+        destination_type:,
+        destination_name:,
+        headers: nil,
+        routing_key: nil,
+        queue_name: nil,
+        exchange_type: nil,
+        reply_to: nil,
+        correlation_id: nil)
 
         state = Tracer.state
         return yield if state.current_transaction
@@ -181,12 +181,12 @@ module NewRelic
       # @api public
       #
       def start_amqp_publish_segment(library:,
-                                     destination_name:,
-                                     headers: nil,
-                                     routing_key: nil,
-                                     reply_to: nil,
-                                     correlation_id: nil,
-                                     exchange_type: nil)
+        destination_name:,
+        headers: nil,
+        routing_key: nil,
+        reply_to: nil,
+        correlation_id: nil,
+        exchange_type: nil)
 
         raise ArgumentError, 'missing required argument: headers' if headers.nil? && CrossAppTracing.cross_app_enabled?
 
@@ -240,12 +240,12 @@ module NewRelic
       # @api public
       #
       def start_amqp_consume_segment(library:,
-                                     destination_name:,
-                                     delivery_info:,
-                                     message_properties:,
-                                     exchange_type: nil,
-                                     queue_name: nil,
-                                     start_time: nil)
+        destination_name:,
+        delivery_info:,
+        message_properties:,
+        exchange_type: nil,
+        queue_name: nil,
+        start_time: nil)
 
         segment = Tracer.start_message_broker_segment(
           action: :consume,
@@ -301,22 +301,22 @@ module NewRelic
       # @api public
       #
       def wrap_amqp_consume_transaction library: nil,
-                                        destination_name: nil,
-                                        delivery_info: nil,
-                                        message_properties: nil,
-                                        exchange_type: nil,
-                                        queue_name: nil,
-                                        &block
+        destination_name: nil,
+        delivery_info: nil,
+        message_properties: nil,
+        exchange_type: nil,
+        queue_name: nil,
+        &block
 
         wrap_message_broker_consume_transaction library: library,
-                                                destination_type: :exchange,
-                                                destination_name: Instrumentation::Bunny.exchange_name(destination_name),
-                                                routing_key: delivery_info[:routing_key],
-                                                reply_to: message_properties[:reply_to],
-                                                queue_name: queue_name,
-                                                exchange_type: exchange_type,
-                                                headers: message_properties[:headers],
-                                                correlation_id: message_properties[:correlation_id],
+          destination_type: :exchange,
+          destination_name: Instrumentation::Bunny.exchange_name(destination_name),
+          routing_key: delivery_info[:routing_key],
+          reply_to: message_properties[:reply_to],
+          queue_name: queue_name,
+          exchange_type: exchange_type,
+          headers: message_properties[:headers],
+          correlation_id: message_properties[:correlation_id],
                                                 &block
       end
 
@@ -352,7 +352,6 @@ module NewRelic
 
         transaction_name
       end
-
     end
   end
 end