newrelic_rpm 6.9.0.363 → 6.12.0.367

data/lib/new_relic/agent/instrumentation/passenger_instrumentation.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 = :passenger

data/lib/new_relic/agent/instrumentation/queue_time.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/rack.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'
 
@@ -81,22 +81,45 @@ module NewRelic
       end
 
       module RackBuilder
-        def run_with_newrelic(app, *args)
-          if ::NewRelic::Agent::Instrumentation::RackHelpers.middleware_instrumentation_enabled?
-            wrapped_app = ::NewRelic::Agent::Instrumentation::MiddlewareProxy.wrap(app, true)
-            run_without_newrelic(wrapped_app, *args)
-          else
-            run_without_newrelic(app, *args)
+
+        if RUBY_VERSION < "2.7.0"
+          def run_with_newrelic(app, *args)
+            if ::NewRelic::Agent::Instrumentation::RackHelpers.middleware_instrumentation_enabled?
+              wrapped_app = ::NewRelic::Agent::Instrumentation::MiddlewareProxy.wrap(app, true)
+              run_without_newrelic(wrapped_app, *args)
+            else
+              run_without_newrelic(app, *args)
+            end
           end
+        else
+          def run_with_newrelic(app, *args, **kwargs)
+            if ::NewRelic::Agent::Instrumentation::RackHelpers.middleware_instrumentation_enabled?
+              wrapped_app = ::NewRelic::Agent::Instrumentation::MiddlewareProxy.wrap(app, true)
+              run_without_newrelic(wrapped_app, *args, **kwargs)
+            else
+              run_without_newrelic(app, *args, **kwargs)
+            end
+          end          
         end
 
-        def use_with_newrelic(middleware_class, *args, &blk)
-          if ::NewRelic::Agent::Instrumentation::RackHelpers.middleware_instrumentation_enabled?
-            wrapped_middleware_class = ::NewRelic::Agent::Instrumentation::MiddlewareProxy.for_class(middleware_class)
-            use_without_newrelic(wrapped_middleware_class, *args, &blk)
-          else
-            use_without_newrelic(middleware_class, *args, &blk)
+        if RUBY_VERSION < "2.7.0"
+          def use_with_newrelic(middleware_class, *args, &blk)
+            if ::NewRelic::Agent::Instrumentation::RackHelpers.middleware_instrumentation_enabled?
+              wrapped_middleware_class = ::NewRelic::Agent::Instrumentation::MiddlewareProxy.for_class(middleware_class)
+              use_without_newrelic(wrapped_middleware_class, *args, &blk)
+            else
+              use_without_newrelic(middleware_class, *args, &blk)
+            end
           end
+        else
+          def use_with_newrelic(middleware_class, *args, **kwargs, &blk)
+            if ::NewRelic::Agent::Instrumentation::RackHelpers.middleware_instrumentation_enabled?
+              wrapped_middleware_class = ::NewRelic::Agent::Instrumentation::MiddlewareProxy.for_class(middleware_class)
+              use_without_newrelic(wrapped_middleware_class, *args, **kwargs, &blk)
+            else
+              use_without_newrelic(middleware_class, *args, **kwargs, &blk)
+            end
+          end  
         end
 
         # We patch this method for a reason that actually has nothing to do with

data/lib/new_relic/agent/instrumentation/rails/action_controller.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/parameter_filtering'
 

data/lib/new_relic/agent/instrumentation/rails/action_web_service.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 = :rails_action_web_service

data/lib/new_relic/agent/instrumentation/rails3/action_controller.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/parameter_filtering'
 

data/lib/new_relic/agent/instrumentation/rails_middleware.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/middleware_proxy'
 

data/lib/new_relic/agent/instrumentation/rails_notifications/action_cable.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/action_cable_subscriber'
 require 'new_relic/agent/prepend_supportability'
 

data/lib/new_relic/agent/instrumentation/rails_notifications/action_controller.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/action_controller_subscriber'
 require 'new_relic/agent/prepend_supportability'
 

data/lib/new_relic/agent/instrumentation/rails_notifications/action_view.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/action_view_subscriber'
 require 'new_relic/agent/prepend_supportability'
 

data/lib/new_relic/agent/instrumentation/rainbows_instrumentation.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 = :rainbows

data/lib/new_relic/agent/instrumentation/rake.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
   # Why not :rake? newrelic-rake used that name, so avoid conflicting
@@ -23,26 +23,51 @@ DependencyDetection.defer do
       class Task
         alias_method :invoke_without_newrelic, :invoke
 
-        def invoke(*args)
-          unless NewRelic::Agent::Instrumentation::RakeInstrumentation.should_trace? name
-            return invoke_without_newrelic(*args)
-          end
 
-          begin
-            timeout = NewRelic::Agent.config[:'rake.connect_timeout']
-            NewRelic::Agent.instance.wait_on_connect(timeout)
-          rescue => e
-            NewRelic::Agent.logger.error("Exception in wait_on_connect", e)
-            return invoke_without_newrelic(*args)
+        if RUBY_VERSION < "2.7.0"
+          def invoke(*args)
+            unless NewRelic::Agent::Instrumentation::RakeInstrumentation.should_trace? name
+              return invoke_without_newrelic(*args)
+            end
+  
+            begin
+              timeout = NewRelic::Agent.config[:'rake.connect_timeout']
+              NewRelic::Agent.instance.wait_on_connect(timeout)
+            rescue => e
+              NewRelic::Agent.logger.error("Exception in wait_on_connect", e)
+              return invoke_without_newrelic(*args)
+            end
+  
+            NewRelic::Agent::Instrumentation::RakeInstrumentation.before_invoke_transaction(self)
+  
+            NewRelic::Agent::Tracer.in_transaction(name: "OtherTransaction/Rake/invoke/#{name}", category: :rake) do
+              NewRelic::Agent::Instrumentation::RakeInstrumentation.record_attributes(args, self)
+              invoke_without_newrelic(*args)
+            end
           end
-
-          NewRelic::Agent::Instrumentation::RakeInstrumentation.before_invoke_transaction(self)
-
-          NewRelic::Agent::Tracer.in_transaction(name: "OtherTransaction/Rake/invoke/#{name}", category: :rake) do
-            NewRelic::Agent::Instrumentation::RakeInstrumentation.record_attributes(args, self)
-            invoke_without_newrelic(*args)
+        else
+          def invoke(*args, **kwargs)
+            unless NewRelic::Agent::Instrumentation::RakeInstrumentation.should_trace? name
+              return invoke_without_newrelic(*args, **kwargs)
+            end
+  
+            begin
+              timeout = NewRelic::Agent.config[:'rake.connect_timeout']
+              NewRelic::Agent.instance.wait_on_connect(timeout)
+            rescue => e
+              NewRelic::Agent.logger.error("Exception in wait_on_connect", e)
+              return invoke_without_newrelic(*args, **kwargs)
+            end
+  
+            NewRelic::Agent::Instrumentation::RakeInstrumentation.before_invoke_transaction(self)
+  
+            NewRelic::Agent::Tracer.in_transaction(name: "OtherTransaction/Rake/invoke/#{name}", category: :rake) do
+              NewRelic::Agent::Instrumentation::RakeInstrumentation.record_attributes(args, self)
+              invoke_without_newrelic(*args, **kwargs)
+            end
           end
         end
+
       end
     end
   end
@@ -86,11 +111,20 @@ module NewRelic
 
           task.instance_variable_set(:@__newrelic_instrumented_execute, true)
           task.instance_eval do
-            def execute(*args, &block)
-              NewRelic::Agent::MethodTracer.trace_execution_scoped("Rake/execute/#{self.name}") do
-                super
+            if RUBY_VERSION < "2.7.0"
+              def execute(*args, &block)
+                NewRelic::Agent::MethodTracer.trace_execution_scoped("Rake/execute/#{self.name}") do
+                  super
+                end
+              end
+            else
+              def execute(*args, **kwargs, &block)
+                NewRelic::Agent::MethodTracer.trace_execution_scoped("Rake/execute/#{self.name}") do
+                  super
+                end
               end
             end
+
           end
 
           instrument_execute_on_prereqs(task)

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