newrelic_rpm 4.8.0.341 → 6.13.1

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

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 DependencyDetection.defer do
   @name = :resque
@@ -22,52 +22,36 @@ DependencyDetection.defer do
   end
 
   executes do
-    module Resque
-      module Plugins
-        module NewRelicInstrumentation
-          include NewRelic::Agent::Instrumentation::ControllerInstrumentation
+    module ::Resque
+      class Job
+        include NewRelic::Agent::Instrumentation::ControllerInstrumentation
 
-          def around_perform_with_monitoring(*args)
-            begin
-              perform_action_with_newrelic_trace(
-                :name => 'perform',
-                :class_name => self.name,
-                :category => 'OtherTransaction/ResqueJob') do
+        alias_method :perform_without_instrumentation, :perform
 
-                NewRelic::Agent::Transaction.merge_untrusted_agent_attributes(args, :'job.resque.args',
-                  NewRelic::Agent::AttributeFilter::DST_NONE)
+        def perform
+          begin
+            perform_action_with_newrelic_trace(
+              :name => 'perform',
+              :class_name => self.payload_class,
+              :category => 'OtherTransaction/ResqueJob') do
 
-                yield(*args)
-              end
-            ensure
-              NewRelic::Agent.agent.flush_pipe_data
-            end
-          end
-        end
-      end
-    end
+              NewRelic::Agent::Transaction.merge_untrusted_agent_attributes(
+                args,
+                :'job.resque.args',
+                NewRelic::Agent::AttributeFilter::DST_NONE)
 
-    module NewRelic
-      module Agent
-        module Instrumentation
-          module ResqueInstrumentationInstaller
-            def payload_class
-              klass = super
-              klass.instance_eval do
-                extend ::Resque::Plugins::NewRelicInstrumentation
-              end
+              perform_without_instrumentation
             end
+          ensure
+            # Stopping the event loop before flushing the pipe.
+            # The goal is to avoid conflict during write.
+            NewRelic::Agent.agent.stop_event_loop
+            NewRelic::Agent.agent.flush_pipe_data
           end
         end
       end
     end
 
-    ::Resque::Job.class_eval do
-      def self.new(*args)
-        super(*args).extend NewRelic::Agent::Instrumentation::ResqueInstrumentationInstaller
-      end
-    end
-
     if NewRelic::LanguageSupport.can_fork?
       ::Resque.before_first_fork do
         NewRelic::Agent.manual_start(:dispatcher   => :resque,

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

@@ -1,7 +1,7 @@
 # -*- ruby -*-
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 DependencyDetection.defer do
   @name = :sequel
@@ -38,8 +38,7 @@ DependencyDetection.defer do
         db.extension :newrelic_instrumentation
       end
 
-      Sequel::Model.plugin :newrelic_instrumentation
-
+      Sequel::Model.plugin(:newrelic_instrumentation) if defined?(Sequel::Model)
     else
 
       NewRelic::Agent.logger.info "Sequel instrumentation requires at least version 3.37.0."

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

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 module NewRelic
   module Agent

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

@@ -1,6 +1,5 @@
-# encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 DependencyDetection.defer do
   @name = :sidekiq
@@ -14,32 +13,48 @@ DependencyDetection.defer do
   end
 
   executes do
-    class NewRelic::SidekiqInstrumentation
-      include NewRelic::Agent::Instrumentation::ControllerInstrumentation
+    module NewRelic::SidekiqInstrumentation
+      class Server
+        include NewRelic::Agent::Instrumentation::ControllerInstrumentation
 
-      # Client middleware has additional parameters, and our tests use the
-      # middleware client-side to work inline.
-      def call(worker, msg, queue, *_)
-        trace_args = if worker.respond_to?(:newrelic_trace_args)
-          worker.newrelic_trace_args(msg, queue)
-        else
-          self.class.default_trace_args(msg)
-        end
+        # Client middleware has additional parameters, and our tests use the
+        # middleware client-side to work inline.
+        def call(worker, msg, queue, *_)
+          trace_args = if worker.respond_to?(:newrelic_trace_args)
+            worker.newrelic_trace_args(msg, queue)
+          else
+            self.class.default_trace_args(msg)
+          end
+          trace_headers = msg.delete(NewRelic::NEWRELIC_KEY)
 
-        perform_action_with_newrelic_trace(trace_args) do
-          NewRelic::Agent::Transaction.merge_untrusted_agent_attributes(msg['args'], :'job.sidekiq.args',
-            NewRelic::Agent::AttributeFilter::DST_NONE)
+          perform_action_with_newrelic_trace(trace_args) do
+            NewRelic::Agent::Transaction.merge_untrusted_agent_attributes(msg['args'], :'job.sidekiq.args',
+              NewRelic::Agent::AttributeFilter::DST_NONE)
 
-          yield
+            ::NewRelic::Agent::DistributedTracing::accept_distributed_trace_headers(trace_headers, "Other") if ::NewRelic::Agent.config[:'distributed_tracing.enabled']
+            yield
+          end
+        end
+
+        def self.default_trace_args(msg)
+          {
+            :name => 'perform',
+            :class_name => msg['class'],
+            :category => 'OtherTransaction/SidekiqJob'
+          }
         end
       end
+      class Client
+        def call(_worker_class, job, *_)
+          job[NewRelic::NEWRELIC_KEY] = distributed_tracing_headers if ::NewRelic::Agent.config[:'distributed_tracing.enabled']
+          yield
+        end
 
-      def self.default_trace_args(msg)
-        {
-          :name => 'perform',
-          :class_name => msg['class'],
-          :category => 'OtherTransaction/SidekiqJob'
-        }
+        def distributed_tracing_headers
+          headers = {}
+          ::NewRelic::Agent::DistributedTracing.insert_distributed_trace_headers(headers)
+          headers
+        end
       end
     end
 
@@ -53,13 +68,22 @@ DependencyDetection.defer do
         }
       rescue => e
         NewRelic::Agent.logger.error("Failure during deserializing YAML for Sidekiq::Extensions::DelayedClass", e)
-        NewRelic::SidekiqInstrumentation.default_trace_args(msg)
+        NewRelic::SidekiqInstrumentation::Server.default_trace_args(msg)
+      end
+    end
+
+    Sidekiq.configure_client do |config|
+      config.client_middleware do |chain|
+        chain.add NewRelic::SidekiqInstrumentation::Client
       end
     end
 
     Sidekiq.configure_server do |config|
+      config.client_middleware do |chain|
+        chain.add NewRelic::SidekiqInstrumentation::Client
+      end
       config.server_middleware do |chain|
-        chain.add NewRelic::SidekiqInstrumentation
+        chain.add NewRelic::SidekiqInstrumentation::Server
       end
 
       if config.respond_to?(:error_handlers)

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

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 require 'new_relic/agent/instrumentation/controller_instrumentation'
 require 'new_relic/agent/instrumentation/sinatra/transaction_namer'
@@ -92,13 +92,24 @@ module NewRelic
             middlewares
           end
 
-          def build_with_newrelic(*args, &block)
-            unless NewRelic::Agent.config[:disable_sinatra_auto_middleware]
-              newrelic_middlewares.each do |middleware_class|
-                try_to_use(self, middleware_class)
+          if RUBY_VERSION < "2.7.0"
+            def build_with_newrelic(*args, &block)
+              unless NewRelic::Agent.config[:disable_sinatra_auto_middleware]
+                newrelic_middlewares.each do |middleware_class|
+                  try_to_use(self, middleware_class)
+                end
               end
+              build_without_newrelic(*args, &block)
+            end
+          else 
+            def build_with_newrelic(*args, **kwargs, &block)
+              unless NewRelic::Agent.config[:disable_sinatra_auto_middleware]
+                newrelic_middlewares.each do |middleware_class|
+                  try_to_use(self, middleware_class)
+                end
+              end
+              build_without_newrelic(*args, **kwargs, &block)
             end
-            build_without_newrelic(*args, &block)
           end
 
           def try_to_use(app, clazz)
@@ -108,14 +119,26 @@ module NewRelic
         end
 
         # Capture last route we've seen. Will set for transaction on route_eval
-        def process_route_with_newrelic(*args, &block)
-          begin
-            env["newrelic.last_route"] = args[0]
-          rescue => e
-            ::NewRelic::Agent.logger.debug("Failed determining last route in Sinatra", e)
+        if RUBY_VERSION < "2.7.0"
+          def process_route_with_newrelic(*args, &block)
+            begin
+              env["newrelic.last_route"] = args[0]
+            rescue => e
+              ::NewRelic::Agent.logger.debug("Failed determining last route in Sinatra", e)
+            end
+  
+            process_route_without_newrelic(*args, &block)
+          end
+        else 
+          def process_route_with_newrelic(*args, **kwargs, &block)
+            begin
+              env["newrelic.last_route"] = args[0]
+            rescue => e
+              ::NewRelic::Agent.logger.debug("Failed determining last route in Sinatra", e)
+            end
+  
+            process_route_without_newrelic(*args, **kwargs, &block)
           end
-
-          process_route_without_newrelic(*args, &block)
         end
 
         # If a transaction name is already set, this call will tromple over it.
@@ -124,18 +147,34 @@ module NewRelic
         #
         # If we're ignored, this remains safe, since set_transaction_name
         # care for the gating on the transaction's existence for us.
-        def route_eval_with_newrelic(*args, &block)
-          begin
-            txn_name = TransactionNamer.transaction_name_for_route(env, request)
-            unless txn_name.nil?
-              ::NewRelic::Agent::Transaction.set_default_transaction_name(
-                "#{self.class.name}/#{txn_name}", :sinatra)
+        if RUBY_VERSION < "2.7.0"
+          def route_eval_with_newrelic(*args, &block)
+            begin
+              txn_name = TransactionNamer.transaction_name_for_route(env, request)
+              unless txn_name.nil?
+                ::NewRelic::Agent::Transaction.set_default_transaction_name(
+                  "#{self.class.name}/#{txn_name}", :sinatra)
+              end
+            rescue => e
+              ::NewRelic::Agent.logger.debug("Failed during route_eval to set transaction name", e)
             end
-          rescue => e
-            ::NewRelic::Agent.logger.debug("Failed during route_eval to set transaction name", e)
+  
+            route_eval_without_newrelic(*args, &block)
+          end
+        else
+          def route_eval_with_newrelic(*args, **kwargs, &block)
+            begin
+              txn_name = TransactionNamer.transaction_name_for_route(env, request)
+              unless txn_name.nil?
+                ::NewRelic::Agent::Transaction.set_default_transaction_name(
+                  "#{self.class.name}/#{txn_name}", :sinatra)
+              end
+            rescue => e
+              ::NewRelic::Agent.logger.debug("Failed during route_eval to set transaction name", e)
+            end
+  
+            route_eval_without_newrelic(*args, **kwargs, &block)
           end
-
-          route_eval_without_newrelic(*args, &block)
         end
 
         def dispatch_with_newrelic #THREAD_LOCAL_ACCESS

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

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 module NewRelic
   module Agent

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

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 module NewRelic
   module Agent

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

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 DependencyDetection.defer do
   @name = :sunspot

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

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 DependencyDetection.defer do
   named :typhoeus
@@ -15,7 +15,7 @@ DependencyDetection.defer do
 
   executes do
     ::NewRelic::Agent.logger.info 'Installing Typhoeus instrumentation'
-    require 'new_relic/agent/cross_app_tracing'
+    require 'new_relic/agent/distributed_tracing/cross_app_tracing'
     require 'new_relic/agent/http_clients/typhoeus_wrappers'
   end
 
@@ -35,7 +35,7 @@ DependencyDetection.defer do
     class Typhoeus::Hydra
 
       def run_with_newrelic(*args)
-        segment = NewRelic::Agent::Transaction.start_segment(
+        segment = NewRelic::Agent::Tracer.start_segment(
           name: NewRelic::Agent::Instrumentation::TyphoeusTracing::HYDRA_SEGMENT_NAME
         )
 
@@ -60,10 +60,10 @@ module NewRelic
     module Instrumentation
       module TyphoeusTracing
 
-        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")
-
         def self.is_supported_version?
           Gem::Version.new(Typhoeus::VERSION) >= NewRelic::Agent::Instrumentation::TyphoeusTracing::EARLIEST_VERSION
         end
@@ -72,8 +72,19 @@ module NewRelic
           request.respond_to?(:hydra) && request.hydra
         end
 
+        def self.response_message(response)
+          if response.respond_to?(:response_message)
+            response.response_message
+          elsif response.respond_to?(:return_message)
+            response.return_message
+          else
+            # 0.5.4 seems to have lost xxxx_message methods altogether.
+            "timeout" 
+          end
+        end
+
         def self.trace(request)
-          state = NewRelic::Agent::TransactionState.tl_get
+          state = NewRelic::Agent::Tracer.state
           return unless state.is_execution_traced?
 
           wrapped_request = ::NewRelic::Agent::HTTPClients::TyphoeusHTTPRequest.new(request)
@@ -82,7 +93,7 @@ module NewRelic
             request.hydra.instance_variable_get(:@__newrelic_hydra_segment)
           end
 
-          segment = NewRelic::Agent::Transaction.start_external_request_segment(
+          segment = NewRelic::Agent::Tracer.start_external_request_segment(
             library: wrapped_request.type,
             uri: wrapped_request.uri,
             procedure: wrapped_request.method,
@@ -92,8 +103,14 @@ module NewRelic
           segment.add_request_headers wrapped_request
 
           callback = Proc.new do
-            wrapped_response = ::NewRelic::Agent::HTTPClients::TyphoeusHTTPResponse.new(request.response)
-            segment.read_response_headers wrapped_response
+            wrapped_response = HTTPClients::TyphoeusHTTPResponse.new(request.response)
+
+            segment.process_response_headers wrapped_response
+
+            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)

data/lib/new_relic/agent/internal_agent_error.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 # This is the base class for all errors that we want to record through the
 # NewRelic::Agent::ErrorCollector#notice_agent_error API. It provides the

data/lib/new_relic/agent/javascript_instrumentor.rb

@@ -1,11 +1,10 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 require 'base64'
 require 'json'
 require 'new_relic/agent/obfuscator'
-require 'new_relic/agent/transaction_timings'
 
 module NewRelic
   module Agent
@@ -15,7 +14,7 @@ module NewRelic
       RUM_KEY_LENGTH = 13
 
       def initialize(event_listener)
-        event_listener.subscribe(:finished_configuring, &method(:log_configuration))
+        event_listener.subscribe(:initial_configuration_complete, &method(:log_configuration))
       end
 
       def log_configuration
@@ -65,9 +64,6 @@ module NewRelic
         if !state.current_transaction
           ::NewRelic::Agent.logger.debug "Not in transaction. Skipping browser instrumentation."
           false
-        elsif !state.is_transaction_traced?
-          ::NewRelic::Agent.logger.debug "Transaction is not traced. Skipping browser instrumentation."
-          false
         elsif !state.is_execution_traced?
           ::NewRelic::Agent.logger.debug "Execution is not traced. Skipping browser instrumentation."
           false
@@ -90,7 +86,7 @@ module NewRelic
       def browser_timing_header #THREAD_LOCAL_ACCESS
         return '' unless js_enabled_and_ready? # fast exit
 
-        state = NewRelic::Agent::TransactionState.tl_get
+        state = NewRelic::Agent::Tracer.state
 
         return '' unless insert_js?(state) # slower exit
 
@@ -104,7 +100,7 @@ module NewRelic
       end
 
       def browser_timing_loader
-        html_safe_if_needed("\n<script type=\"text/javascript\">#{Agent.config[:js_agent_loader]}</script>")
+        html_safe_if_needed("\n<script>#{Agent.config[:js_agent_loader]}</script>")
       end
 
       def browser_timing_config(state)
@@ -112,9 +108,9 @@ module NewRelic
         return '' if txn.nil?
 
         txn.freeze_name_and_execute_if_not_ignored do
-          data = data_for_js_agent(state)
+          data = data_for_js_agent(txn)
           json = ::JSON.dump(data)
-          return html_safe_if_needed("\n<script type=\"text/javascript\">window.NREUM||(NREUM={});NREUM.info=#{json}</script>")
+          return html_safe_if_needed("\n<script>window.NREUM||(NREUM={});NREUM.info=#{json}</script>")
         end
 
         ''
@@ -134,22 +130,29 @@ module NewRelic
       ATTS_AGENT_SUBKEY    = "a".freeze
 
       # NOTE: Internal prototyping may override this, so leave name stable!
-      def data_for_js_agent(state)
-        timings = state.timings
+      def data_for_js_agent(transaction)
+        queue_time_in_seconds = [transaction.queue_time.to_f, 0.0].max
+        start_time_in_seconds = [transaction.start_time.to_f, 0.0].max
+        app_time_in_seconds   = Time.now.to_f - 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
+
+        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],
-          TRANSACTION_NAME_KEY => obfuscator.obfuscate(timings.transaction_name_or_unknown),
-          QUEUE_TIME_KEY       => timings.queue_time_in_millis,
-          APPLICATION_TIME_KEY => timings.app_time_in_millis,
+          TRANSACTION_NAME_KEY => obfuscator.obfuscate(transaction_name),
+          QUEUE_TIME_KEY       => queue_time_in_millis,
+          APPLICATION_TIME_KEY => app_time_in_millis,
           AGENT_KEY            => NewRelic::Agent.config[:js_agent_file]
         }
 
         add_ssl_for_http(data)
-        add_attributes(data, state.current_transaction)
+        add_attributes(data, transaction)
 
         data
       end