newrelic_rpm 6.11.0.365 → 6.12.0.367

data/lib/new_relic/agent/instrumentation/active_record_notifications.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/active_record_subscriber'
 require 'new_relic/agent/instrumentation/active_record_prepend'

data/lib/new_relic/agent/instrumentation/active_record_prepend.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/prepend_supportability'
 
@@ -11,16 +11,31 @@ module NewRelic
         ACTIVE_RECORD = 'ActiveRecord'.freeze
 
         module BaseExtensions
-          def save(*args, &blk)
-            ::NewRelic::Agent.with_database_metric_name(self.class.name, nil, ACTIVE_RECORD) do
-              super
+
+          if RUBY_VERSION < "2.7.0"
+            def save(*args, &blk)
+              ::NewRelic::Agent.with_database_metric_name(self.class.name, nil, ACTIVE_RECORD) do
+                super
+              end
+            end
+            def save!(*args, &blk)
+              ::NewRelic::Agent.with_database_metric_name(self.class.name, nil, ACTIVE_RECORD) do
+                super
+              end
             end
-          end
 
-          def save!(*args, &blk)
-            ::NewRelic::Agent.with_database_metric_name(self.class.name, nil, ACTIVE_RECORD) do
-              super
+          else
+            def save(*args, **kwargs, &blk)
+              ::NewRelic::Agent.with_database_metric_name(self.class.name, nil, ACTIVE_RECORD) do
+                super
+              end
             end
+            def save!(*args, **kwargs, &blk)
+              ::NewRelic::Agent.with_database_metric_name(self.class.name, nil, ACTIVE_RECORD) do
+                super
+              end
+            end  
+
           end
         end
 
@@ -30,42 +45,85 @@ module NewRelic
           # Starting in v5.1.6, this call no longer happens. We'll
           # have to set the database metrics explicitly now.
           #
-          def touch(*args, &blk)
-            ::NewRelic::Agent.with_database_metric_name(self.class.name, nil, ACTIVE_RECORD) do
-              super
+          if RUBY_VERSION < "2.7.0"
+            def touch(*args, **kwargs, &blk)
+              ::NewRelic::Agent.with_database_metric_name(self.class.name, nil, ACTIVE_RECORD) do
+                super
+              end
+            end
+          else
+            def touch(*args, **kwargs, &blk)
+              ::NewRelic::Agent.with_database_metric_name(self.class.name, nil, ACTIVE_RECORD) do
+                super
+              end
             end
           end
+
         end
 
         module RelationExtensions
-          def update_all(*args, &blk)
-            ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
-              super
+          if RUBY_VERSION < "2.7.0"
+            def update_all(*args, &blk)
+              ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
+                super
+              end
             end
-          end
-
-          def delete_all(*args, &blk)
-            ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
-              super
+  
+            def delete_all(*args, &blk)
+              ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
+                super
+              end
             end
-          end
-
-          def destroy_all(*args, &blk)
-            ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
-              super
+  
+            def destroy_all(*args, &blk)
+              ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
+                super
+              end
             end
-          end
-
-          def calculate(*args, &blk)
-            ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
-              super
+  
+            def calculate(*args, &blk)
+              ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
+                super
+              end
             end
-          end
-
-          def pluck(*args, &blk)
-            ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
-              super
+  
+            def pluck(*args, &blk)
+              ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
+                super
+              end
+            end
+            
+          else
+            def update_all(*args, **kwargs, &blk)
+              ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
+                super
+              end
             end
+  
+            def delete_all(*args, **kwargs, &blk)
+              ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
+                super
+              end
+            end
+  
+            def destroy_all(*args, **kwargs, &blk)
+              ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
+                super
+              end
+            end
+  
+            def calculate(*args, **kwargs, &blk)
+              ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
+                super
+              end
+            end
+  
+            def pluck(*args, **kwargs, &blk)
+              ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
+                super
+              end
+            end
+
           end
         end
       end

data/lib/new_relic/agent/instrumentation/active_record_subscriber.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/active_record_helper'
 require 'new_relic/agent/instrumentation/notifications_subscriber'
 

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

data/lib/new_relic/agent/instrumentation/active_storage_subscriber.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/notifications_subscriber'
 
 module NewRelic

data/lib/new_relic/agent/instrumentation/acts_as_solr.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/database'
 
@@ -8,15 +8,31 @@ module NewRelic
   module Instrumentation
     module ActsAsSolrInstrumentation
       module ParserMethodsInstrumentation
-        def parse_query_with_newrelic(*args)
-          self.class.trace_execution_scoped(["SolrClient/ActsAsSolr/query"]) do
-            begin
-              parse_query_without_newrelic(*args)
-            ensure
-              return unless txn = ::NewRelic::Agent::Tracer.current_transaction
-              txn.current_segment.params[:statement] = ::NewRelic::Agent::Database.truncate_query(args.first.inspect) rescue nil
+
+        if RUBY_VERSION < "2.7.0"
+          def parse_query_with_newrelic(*args)
+            self.class.trace_execution_scoped(["SolrClient/ActsAsSolr/query"]) do
+              begin
+                parse_query_without_newrelic(*args)
+              ensure
+                return unless txn = ::NewRelic::Agent::Tracer.current_transaction
+                txn.current_segment.params[:statement] = ::NewRelic::Agent::Database.truncate_query(args.first.inspect) rescue nil
+              end
+            end
+          end
+  
+        else
+          def parse_query_with_newrelic(*args, **kwargs)
+            self.class.trace_execution_scoped(["SolrClient/ActsAsSolr/query"]) do
+              begin
+                parse_query_without_newrelic(*args, **kwargs)
+              ensure
+                return unless txn = ::NewRelic::Agent::Tracer.current_transaction
+                txn.current_segment.params[:statement] = ::NewRelic::Agent::Database.truncate_query(args.first.inspect) rescue nil
+              end
             end
           end
+  
         end
       end
     end

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

data/lib/new_relic/agent/instrumentation/bunny.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.
 # frozen_string_literal: true
 
 DependencyDetection.defer do
@@ -100,46 +100,92 @@ DependencyDetection.defer do
 
         alias_method :purge_without_new_relic, :purge
 
-        def purge *args
-          begin
-            type = server_named? ? :temporary_queue : :queue
-            segment = NewRelic::Agent::Tracer.start_message_broker_segment(
-              action: :purge,
-              library: NewRelic::Agent::Instrumentation::Bunny::LIBRARY,
-              destination_type: type,
-              destination_name: name
-            )
-          rescue => e
-            NewRelic::Agent.logger.error "Error starting message broker segment in Bunny::Queue#purge", e
-            purge_without_new_relic(*args)
-          else
-            NewRelic::Agent::Tracer.capture_segment_error segment do
+        if RUBY_VERSION < "2.7.0"
+          def purge *args
+            begin
+              type = server_named? ? :temporary_queue : :queue
+              segment = NewRelic::Agent::Tracer.start_message_broker_segment(
+                action: :purge,
+                library: NewRelic::Agent::Instrumentation::Bunny::LIBRARY,
+                destination_type: type,
+                destination_name: name
+              )
+            rescue => e
+              NewRelic::Agent.logger.error "Error starting message broker segment in Bunny::Queue#purge", e
               purge_without_new_relic(*args)
+            else
+              NewRelic::Agent::Tracer.capture_segment_error segment do
+                purge_without_new_relic(*args)
+              end
+            ensure
+              segment.finish if segment
+            end
+          end
+
+        else     
+          def purge *args, **kwargs
+            begin
+              type = server_named? ? :temporary_queue : :queue
+              segment = NewRelic::Agent::Tracer.start_message_broker_segment(
+                action: :purge,
+                library: NewRelic::Agent::Instrumentation::Bunny::LIBRARY,
+                destination_type: type,
+                destination_name: name
+              )
+            rescue => e
+              NewRelic::Agent.logger.error "Error starting message broker segment in Bunny::Queue#purge", e
+              purge_without_new_relic(*args, **kwargs)
+            else
+              NewRelic::Agent::Tracer.capture_segment_error segment do
+                purge_without_new_relic(*args, **kwargs)
+              end
+            ensure
+              segment.finish if segment
             end
-          ensure
-            segment.finish if segment
           end
         end
+
       end
 
       class Consumer
         alias_method :call_without_new_relic, :call
 
-        def call *args
-          delivery_info, message_properties, _ = args
-          queue_name = queue.respond_to?(:name) ? queue.name : queue
+        if RUBY_VERSION < "2.7.0"
+          def call *args
+            delivery_info, message_properties, _ = args
+            queue_name = queue.respond_to?(:name) ? queue.name : queue
+  
+            NewRelic::Agent::Messaging.wrap_amqp_consume_transaction(
+              library: NewRelic::Agent::Instrumentation::Bunny::LIBRARY,
+              destination_name: NewRelic::Agent::Instrumentation::Bunny.exchange_name(delivery_info.exchange),
+              delivery_info: delivery_info,
+              message_properties: message_properties,
+              exchange_type: NewRelic::Agent::Instrumentation::Bunny.exchange_type(delivery_info, channel),
+              queue_name: queue_name) do
+  
+              call_without_new_relic(*args)
+            end
+          end
+        else
+          def call *args, **kwargs
+            delivery_info, message_properties, _ = args
+            queue_name = queue.respond_to?(:name) ? queue.name : queue
 
-          NewRelic::Agent::Messaging.wrap_amqp_consume_transaction(
-            library: NewRelic::Agent::Instrumentation::Bunny::LIBRARY,
-            destination_name: NewRelic::Agent::Instrumentation::Bunny.exchange_name(delivery_info.exchange),
-            delivery_info: delivery_info,
-            message_properties: message_properties,
-            exchange_type: NewRelic::Agent::Instrumentation::Bunny.exchange_type(delivery_info, channel),
-            queue_name: queue_name) do
+            NewRelic::Agent::Messaging.wrap_amqp_consume_transaction(
+              library: NewRelic::Agent::Instrumentation::Bunny::LIBRARY,
+              destination_name: NewRelic::Agent::Instrumentation::Bunny.exchange_name(delivery_info.exchange),
+              delivery_info: delivery_info,
+              message_properties: message_properties,
+              exchange_type: NewRelic::Agent::Instrumentation::Bunny.exchange_type(delivery_info, channel),
+              queue_name: queue_name) do
 
-            call_without_new_relic(*args)
+              call_without_new_relic(*args, **kwargs)
+            end
           end
         end
+
+
+
       end
     end
   end

data/lib/new_relic/agent/instrumentation/controller_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.
 
 require 'new_relic/agent/transaction'
 require 'new_relic/agent/instrumentation/queue_time'

data/lib/new_relic/agent/instrumentation/curb.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 :curb
@@ -32,24 +32,48 @@ DependencyDetection.defer do
 
       # We have to hook these three methods separately, as they don't use
       # Curl::Easy#http
-      def http_head_with_newrelic(*args, &blk)
-        self._nr_http_verb = :HEAD
-        http_head_without_newrelic(*args, &blk)
+      if RUBY_VERSION < "2.7.0"
+        def http_head_with_newrelic(*args, &blk)
+          self._nr_http_verb = :HEAD
+          http_head_without_newrelic(*args, &blk)
+        end
+      else
+        def http_head_with_newrelic(*args, **kwargs, &blk)
+          self._nr_http_verb = :HEAD
+          http_head_without_newrelic(*args, **kwargs, &blk)
+        end
       end
+
       alias_method :http_head_without_newrelic, :http_head
       alias_method :http_head, :http_head_with_newrelic
 
-      def http_post_with_newrelic(*args, &blk)
-        self._nr_http_verb = :POST
-        http_post_without_newrelic(*args, &blk)
+      if RUBY_VERSION < "2.7.0"
+        def http_post_with_newrelic(*args, &blk)
+          self._nr_http_verb = :POST
+          http_post_without_newrelic(*args, &blk)
+        end
+      else
+        def http_post_with_newrelic(*args, **kwargs, &blk)
+          self._nr_http_verb = :POST
+          http_post_without_newrelic(*args, **kwargs, &blk)
+        end
       end
+
       alias_method :http_post_without_newrelic, :http_post
       alias_method :http_post, :http_post_with_newrelic
 
-      def http_put_with_newrelic(*args, &blk)
-        self._nr_http_verb = :PUT
-        http_put_without_newrelic(*args, &blk)
+      if RUBY_VERSION < "2.7.0"
+        def http_put_with_newrelic(*args, &blk)
+          self._nr_http_verb = :PUT
+          http_put_without_newrelic(*args, &blk)
+        end
+      else
+        def http_put_with_newrelic(*args, **kwargs, &blk)
+          self._nr_http_verb = :PUT
+          http_put_without_newrelic(*args, **kwargs, &blk)
+        end
       end
+
       alias_method :http_put_without_newrelic, :http_put
       alias_method :http_put, :http_put_with_newrelic