newrelic_rpm 6.9.0.363 → 6.13.1

data/lib/new_relic/agent/instrumentation/redis.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/datastores'
 require 'new_relic/agent/datastores/redis'
@@ -55,73 +55,158 @@ DependencyDetection.defer do
     Redis::Client.class_eval do
       alias_method :call_without_new_relic, :call
 
-      def call(*args, &block)
-        operation = args[0][0]
-        statement = ::NewRelic::Agent::Datastores::Redis.format_command(args[0])
-
-        hostname = NewRelic::Agent::Instrumentation::Redis.host_for(self)
-        port_path_or_id = NewRelic::Agent::Instrumentation::Redis.port_path_or_id_for(self)
-
-        segment = NewRelic::Agent::Tracer.start_datastore_segment(
-          product: NewRelic::Agent::Datastores::Redis::PRODUCT_NAME,
-          operation: operation,
-          host: hostname,
-          port_path_or_id: port_path_or_id,
-          database_name: db
-        )
-        begin
-          segment.notice_nosql_statement(statement) if statement
-          call_without_new_relic(*args, &block)
-        ensure
-          segment.finish if segment
+      if RUBY_VERSION < "2.7.0"
+        def call(*args, &block)
+          operation = args[0][0]
+          statement = ::NewRelic::Agent::Datastores::Redis.format_command(args[0])
+  
+          hostname = NewRelic::Agent::Instrumentation::Redis.host_for(self)
+          port_path_or_id = NewRelic::Agent::Instrumentation::Redis.port_path_or_id_for(self)
+  
+          segment = NewRelic::Agent::Tracer.start_datastore_segment(
+            product: NewRelic::Agent::Datastores::Redis::PRODUCT_NAME,
+            operation: operation,
+            host: hostname,
+            port_path_or_id: port_path_or_id,
+            database_name: db
+          )
+          begin
+            segment.notice_nosql_statement(statement) if statement
+            NewRelic::Agent::Tracer.capture_segment_error segment do
+              call_without_new_relic(*args, &block)
+            end
+          ensure
+            segment.finish if segment
+          end
+        end
+      else
+        def call(*args, **kwargs, &block)
+          operation = args[0][0]
+          statement = ::NewRelic::Agent::Datastores::Redis.format_command(args[0])
+  
+          hostname = NewRelic::Agent::Instrumentation::Redis.host_for(self)
+          port_path_or_id = NewRelic::Agent::Instrumentation::Redis.port_path_or_id_for(self)
+  
+          segment = NewRelic::Agent::Tracer.start_datastore_segment(
+            product: NewRelic::Agent::Datastores::Redis::PRODUCT_NAME,
+            operation: operation,
+            host: hostname,
+            port_path_or_id: port_path_or_id,
+            database_name: db
+          )
+          begin
+            segment.notice_nosql_statement(statement) if statement
+            NewRelic::Agent::Tracer.capture_segment_error segment do
+              call_without_new_relic(*args, **kwargs, &block)
+            end
+          ensure
+            segment.finish if segment
+          end
         end
       end
 
+
+
       alias_method :call_pipeline_without_new_relic, :call_pipeline
 
-      def call_pipeline(*args, &block)
-        pipeline = args[0]
-        operation = pipeline.is_a?(::Redis::Pipeline::Multi) ? NewRelic::Agent::Datastores::Redis::MULTI_OPERATION : NewRelic::Agent::Datastores::Redis::PIPELINE_OPERATION
-        statement = ::NewRelic::Agent::Datastores::Redis.format_pipeline_commands(pipeline.commands)
-
-        hostname = NewRelic::Agent::Instrumentation::Redis.host_for(self)
-        port_path_or_id = NewRelic::Agent::Instrumentation::Redis.port_path_or_id_for(self)
-
-        segment = NewRelic::Agent::Tracer.start_datastore_segment(
-          product: NewRelic::Agent::Datastores::Redis::PRODUCT_NAME,
-          operation: operation,
-          host: hostname,
-          port_path_or_id: port_path_or_id,
-          database_name: db
-        )
-        begin
-          segment.notice_nosql_statement(statement)
-          call_pipeline_without_new_relic(*args, &block)
-        ensure
-          segment.finish if segment
+      if RUBY_VERSION < "2.7.0"
+        def call_pipeline(*args, &block)
+          pipeline = args[0]
+          operation = pipeline.is_a?(::Redis::Pipeline::Multi) ? NewRelic::Agent::Datastores::Redis::MULTI_OPERATION : NewRelic::Agent::Datastores::Redis::PIPELINE_OPERATION
+          statement = ::NewRelic::Agent::Datastores::Redis.format_pipeline_commands(pipeline.commands)
+  
+          hostname = NewRelic::Agent::Instrumentation::Redis.host_for(self)
+          port_path_or_id = NewRelic::Agent::Instrumentation::Redis.port_path_or_id_for(self)
+  
+          segment = NewRelic::Agent::Tracer.start_datastore_segment(
+            product: NewRelic::Agent::Datastores::Redis::PRODUCT_NAME,
+            operation: operation,
+            host: hostname,
+            port_path_or_id: port_path_or_id,
+            database_name: db
+          )
+          begin
+            segment.notice_nosql_statement(statement)
+            NewRelic::Agent::Tracer.capture_segment_error segment do
+              call_pipeline_without_new_relic(*args, &block)
+            end
+          ensure
+            segment.finish if segment
+          end
+        end
+      else
+        def call_pipeline(*args, **kwargs, &block)
+          pipeline = args[0]
+          operation = pipeline.is_a?(::Redis::Pipeline::Multi) ? NewRelic::Agent::Datastores::Redis::MULTI_OPERATION : NewRelic::Agent::Datastores::Redis::PIPELINE_OPERATION
+          statement = ::NewRelic::Agent::Datastores::Redis.format_pipeline_commands(pipeline.commands)
+  
+          hostname = NewRelic::Agent::Instrumentation::Redis.host_for(self)
+          port_path_or_id = NewRelic::Agent::Instrumentation::Redis.port_path_or_id_for(self)
+  
+          segment = NewRelic::Agent::Tracer.start_datastore_segment(
+            product: NewRelic::Agent::Datastores::Redis::PRODUCT_NAME,
+            operation: operation,
+            host: hostname,
+            port_path_or_id: port_path_or_id,
+            database_name: db
+          )
+          begin
+            segment.notice_nosql_statement(statement)
+            NewRelic::Agent::Tracer.capture_segment_error segment do
+              call_pipeline_without_new_relic(*args, **kwargs, &block)
+            end
+          ensure
+            segment.finish if segment
+          end
         end
       end
 
       alias_method :connect_without_new_relic, :connect
 
-      def connect(*args, &block)
-        hostname = NewRelic::Agent::Instrumentation::Redis.host_for(self)
-        port_path_or_id = NewRelic::Agent::Instrumentation::Redis.port_path_or_id_for(self)
-
-        segment = NewRelic::Agent::Tracer.start_datastore_segment(
-          product: NewRelic::Agent::Datastores::Redis::PRODUCT_NAME,
-          operation: NewRelic::Agent::Datastores::Redis::CONNECT,
-          host: hostname,
-          port_path_or_id: port_path_or_id,
-          database_name: db
-        )
-
-        begin
-          connect_without_new_relic(*args, &block)
-        ensure
-          segment.finish if segment
+      if RUBY_VERSION < "2.7.0"
+        def connect(*args, &block)
+          hostname = NewRelic::Agent::Instrumentation::Redis.host_for(self)
+          port_path_or_id = NewRelic::Agent::Instrumentation::Redis.port_path_or_id_for(self)
+  
+          segment = NewRelic::Agent::Tracer.start_datastore_segment(
+            product: NewRelic::Agent::Datastores::Redis::PRODUCT_NAME,
+            operation: NewRelic::Agent::Datastores::Redis::CONNECT,
+            host: hostname,
+            port_path_or_id: port_path_or_id,
+            database_name: db
+          )
+  
+          begin
+            NewRelic::Agent::Tracer.capture_segment_error segment do
+              connect_without_new_relic(*args, &block)
+            end
+          ensure
+            segment.finish if segment
+          end
+        end
+      else
+        def connect(*args, **kwargs, &block)
+          hostname = NewRelic::Agent::Instrumentation::Redis.host_for(self)
+          port_path_or_id = NewRelic::Agent::Instrumentation::Redis.port_path_or_id_for(self)
+  
+          segment = NewRelic::Agent::Tracer.start_datastore_segment(
+            product: NewRelic::Agent::Datastores::Redis::PRODUCT_NAME,
+            operation: NewRelic::Agent::Datastores::Redis::CONNECT,
+            host: hostname,
+            port_path_or_id: port_path_or_id,
+            database_name: db
+          )
+  
+          begin
+            NewRelic::Agent::Tracer.capture_segment_error segment do
+              connect_without_new_relic(*args, **kwargs, &block)
+            end
+          ensure
+            segment.finish if segment
+          end
         end
       end
+
     end
   end
 end

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

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

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