RubyGems - newrelic_rpm - Versions diffs - 6.11.0.365 → 6.15.0 - Mend

newrelic_rpm 6.11.0.365 → 6.15.0

Files changed (287) hide show

data/lib/new_relic/agent/instrumentation/active_record_helper.rb CHANGED

@@ -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/metric_helper'
@@ -19,7 +19,7 @@ module NewRelic
         def instrument_save_methods
           ::ActiveRecord::Base.class_eval do
             alias_method :save_without_newrelic, :save
             def save(*args, &blk)
               ::NewRelic::Agent.with_database_metric_name(self.class.name, nil, ACTIVE_RECORD) do
                 save_without_newrelic(*args, &blk)
@@ -45,12 +45,20 @@ module NewRelic
                 update_all_without_newrelic(*args, &blk)
               end
             end
             alias_method :delete_all_without_newrelic, :delete_all
-            def delete_all(*args, &blk)
-              ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
-                delete_all_without_newrelic(*args, &blk)
+            if RUBY_VERSION < "2.7.0"
+              def delete_all(*args, &blk)
+                ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
+                  delete_all_without_newrelic(*args, &blk)
+                end
+              end
+            else
+              def delete_all(*args, **kwargs, &blk)
+                ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
+                  delete_all_without_newrelic(*args, **kwargs, &blk)
+                end
               end
             end
@@ -62,6 +70,7 @@ module NewRelic
               end
             end
             alias_method :calculate_without_newrelic, :calculate
             def calculate(*args, &blk)
@@ -70,6 +79,7 @@ module NewRelic
               end
             end
             if method_defined?(:pluck)
               alias_method :pluck_without_newrelic, :pluck
@@ -78,6 +88,7 @@ module NewRelic
                   pluck_without_newrelic(*args, &blk)
                 end
               end
             end
           end
         end

data/lib/new_relic/agent/instrumentation/active_record_notifications.rb CHANGED

@@ -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 CHANGED

@@ -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,11 +45,20 @@ 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

data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

@@ -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,16 +8,17 @@ 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
+          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
-        end
       end
     end
   end

data/lib/new_relic/agent/instrumentation/authlogic.rb CHANGED

@@ -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 CHANGED

@@ -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
@@ -120,6 +120,7 @@ DependencyDetection.defer do
             segment.finish if segment
           end
         end
       end
       class Consumer
@@ -140,6 +141,7 @@ DependencyDetection.defer do
             call_without_new_relic(*args)
           end
         end
       end
     end
   end

data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb CHANGED

@@ -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 CHANGED

@@ -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
@@ -36,6 +36,8 @@ DependencyDetection.defer do
         self._nr_http_verb = :HEAD
         http_head_without_newrelic(*args, &blk)
       end
       alias_method :http_head_without_newrelic, :http_head
       alias_method :http_head, :http_head_with_newrelic
@@ -43,6 +45,8 @@ DependencyDetection.defer do
         self._nr_http_verb = :POST
         http_post_without_newrelic(*args, &blk)
       end
       alias_method :http_post_without_newrelic, :http_post
       alias_method :http_post, :http_post_with_newrelic
@@ -50,6 +54,8 @@ DependencyDetection.defer do
         self._nr_http_verb = :PUT
         http_put_without_newrelic(*args, &blk)
       end
       alias_method :http_put_without_newrelic, :http_put
       alias_method :http_put, :http_put_with_newrelic

data/lib/new_relic/agent/instrumentation/data_mapper.rb CHANGED

@@ -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 :data_mapper

data/lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb CHANGED

@@ -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'
@@ -89,6 +89,7 @@ DependencyDetection.defer do
   executes do
     Delayed::Worker.class_eval do
       def initialize_with_new_relic(*args)
         initialize_without_new_relic(*args)
         worker_name = case
@@ -129,6 +130,7 @@ DependencyDetection.defer do
               invoke_job_without_new_relic(*args, &block)
             end
           end
         end
       end
     end

data/lib/new_relic/agent/instrumentation/excon.rb CHANGED

@@ -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 :excon

data/lib/new_relic/agent/instrumentation/excon/connection.rb CHANGED

@@ -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 ::Excon
   class Connection

data/lib/new_relic/agent/instrumentation/excon/middleware.rb CHANGED

@@ -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 ::Excon
   module Middleware

data/lib/new_relic/agent/instrumentation/grape.rb CHANGED

@@ -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/http.rb CHANGED

@@ -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 :httprb

data/lib/new_relic/agent/instrumentation/httpclient.rb CHANGED

@@ -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 :httpclient

data/lib/new_relic/agent/instrumentation/ignore_actions.rb CHANGED

@@ -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/memcache.rb CHANGED

@@ -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.
 # NOTE there are multiple implementations of the MemCache client in Ruby,
 # each with slightly different API's and semantics.

data/lib/new_relic/agent/instrumentation/memcache/dalli.rb CHANGED

@@ -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/merb/controller.rb CHANGED

@@ -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 'set'

data/lib/new_relic/agent/instrumentation/merb/errors.rb CHANGED

@@ -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 = :merb_error

data/lib/new_relic/agent/instrumentation/middleware_proxy.rb CHANGED

@@ -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/method_tracer'
 require 'new_relic/agent/transaction'

data/lib/new_relic/agent/instrumentation/middleware_tracing.rb CHANGED

@@ -1,6 +1,7 @@
 # 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
 require 'new_relic/agent/method_tracer'
 require 'new_relic/agent/transaction'
@@ -26,7 +27,10 @@ module NewRelic
   module Agent
     module Instrumentation
       module MiddlewareTracing
-        TXN_STARTED_KEY = 'newrelic.transaction_started'.freeze
+        TXN_STARTED_KEY = 'newrelic.transaction_started'
+        CONTENT_TYPE    = 'Content-Type'
+        CONTENT_LENGTH  = 'Content-Length'
         def _nr_has_middleware_tracing
           true
@@ -56,8 +60,6 @@ module NewRelic
           end
         end
-        CONTENT_TYPE = 'Content-Type'.freeze
         def capture_response_content_type(state, result)
           if result.is_a?(Array) && state.current_transaction
             _, headers, _ = result
@@ -65,12 +67,12 @@ module NewRelic
           end
         end
-        CONTENT_LENGTH = 'Content-Length'.freeze
         def capture_response_content_length(state, result)
           if result.is_a?(Array) && state.current_transaction
             _, headers, _ = result
-            state.current_transaction.response_content_length = headers[CONTENT_LENGTH]
+            length = headers[CONTENT_LENGTH]
+            length = length.reduce(0){|sum, h| sum + h.to_i} if length.is_a?(Array)
+            state.current_transaction.response_content_length = length
           end
         end