newrelic_rpm 6.1.0.352 → 6.6.0.358

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

@@ -1,42 +0,0 @@
-# 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.
-
-require 'new_relic/agent/instrumentation/active_record_prepend'
-require 'new_relic/agent/instrumentation/active_record_subscriber'
-require 'new_relic/agent/prepend_supportability'
-
-DependencyDetection.defer do
-  named :active_record_4
-
-  depends_on do
-    defined?(::ActiveRecord) && defined?(::ActiveRecord::Base) &&
-      defined?(::ActiveRecord::VERSION) &&
-      ::ActiveRecord::VERSION::MAJOR.to_i == 4
-  end
-
-  depends_on do
-    !NewRelic::Agent.config[:disable_activerecord_instrumentation] &&
-      !NewRelic::Agent::Instrumentation::ActiveRecordSubscriber.subscribed?
-  end
-
-  executes do
-    ::NewRelic::Agent.logger.info 'Installing ActiveRecord 4 instrumentation'
-  end
-
-  executes do
-    ActiveSupport::Notifications.subscribe('sql.active_record',
-      NewRelic::Agent::Instrumentation::ActiveRecordSubscriber.new)
-
-    ActiveSupport.on_load(:active_record) do
-      ::NewRelic::Agent::PrependSupportability.record_metrics_for(::ActiveRecord::Base, ::ActiveRecord::Relation)
-
-      if NewRelic::Agent.config[:prepend_active_record_instrumentation]
-        ::ActiveRecord::Base.prepend ::NewRelic::Agent::Instrumentation::ActiveRecordPrepend::BaseExtensions
-        ::ActiveRecord::Relation.prepend ::NewRelic::Agent::Instrumentation::ActiveRecordPrepend::RelationExtensions
-      else
-        ::NewRelic::Agent::Instrumentation::ActiveRecordHelper.instrument_additional_methods
-      end
-    end
-  end
-end

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

@@ -1,41 +0,0 @@
-# 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.
-
-require 'new_relic/agent/instrumentation/active_record_subscriber'
-require 'new_relic/agent/instrumentation/active_record_prepend'
-
-DependencyDetection.defer do
-  named :active_record_5
-
-  depends_on do
-    defined?(::ActiveRecord) && defined?(::ActiveRecord::Base) &&
-      defined?(::ActiveRecord::VERSION) &&
-      ::ActiveRecord::VERSION::MAJOR.to_i == 5
-  end
-
-  depends_on do
-    !NewRelic::Agent.config[:disable_activerecord_instrumentation] &&
-      !NewRelic::Agent::Instrumentation::ActiveRecordSubscriber.subscribed?
-  end
-
-  executes do
-    ::NewRelic::Agent.logger.info 'Installing ActiveRecord 5 instrumentation'
-  end
-
-  executes do
-    ActiveSupport::Notifications.subscribe('sql.active_record',
-      NewRelic::Agent::Instrumentation::ActiveRecordSubscriber.new)
-
-    ActiveSupport.on_load(:active_record) do
-      ::NewRelic::Agent::PrependSupportability.record_metrics_for(::ActiveRecord::Base, ::ActiveRecord::Relation)
-      ::ActiveRecord::Base.prepend ::NewRelic::Agent::Instrumentation::ActiveRecordPrepend::BaseExtensions
-      ::ActiveRecord::Relation.prepend ::NewRelic::Agent::Instrumentation::ActiveRecordPrepend::RelationExtensions
-
-      if ::ActiveRecord::VERSION::MINOR.to_i == 1 &&
-         ::ActiveRecord::VERSION::TINY.to_i >= 6
-        ::ActiveRecord::Base.prepend ::NewRelic::Agent::Instrumentation::ActiveRecordPrepend::BaseExtensions516
-      end
-    end
-  end
-end

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

@@ -1,104 +0,0 @@
-# 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.
-
-module NewRelic
-  module Agent
-    module Instrumentation
-      class EventedSubscriber
-        def initialize
-          @queue_key = ['NewRelic', self.class.name, object_id].join('-')
-        end
-
-        def self.subscribed?
-          # TODO: need to talk to Rails core about an API for this,
-          # rather than digging through Listener ivars
-          ActiveSupport::Notifications.notifier.instance_variable_get(:@subscribers) \
-            .find{|s| s.instance_variable_get(:@delegate).class == self }
-        end
-
-        def self.subscribe(pattern)
-          if !subscribed?
-            ActiveSupport::Notifications.subscribe(pattern, new)
-          end
-        end
-
-        def start(name, id, payload)
-          event = ActiveSupport::Notifications::Event.new(name, Time.now, nil, id, payload)
-          push_event(event)
-          return event
-        end
-
-        def finish(name, id, payload)
-          pop_event(id)
-        end
-
-        def log_notification_error(error, name, event_type)
-          # These are important enough failures that we want the backtraces
-          # logged at error level, hence the explicit log_exception call.
-          NewRelic::Agent.logger.error("Error during #{event_type} callback for event '#{name}':")
-          NewRelic::Agent.logger.log_exception(:error, error)
-        end
-
-        def push_event(event)
-          parent = event_stack[event.transaction_id].last
-          if parent && event.respond_to?(:parent=)
-            event.parent = parent
-            parent << event
-          end
-          event_stack[event.transaction_id].push event
-        end
-
-        def pop_event(transaction_id)
-          event = event_stack[transaction_id].pop
-          event.end = Time.now
-          return event
-        end
-
-        def event_stack
-          Thread.current[@queue_key] ||= Hash.new {|h,id| h[id] = [] }
-        end
-
-        def state
-          NewRelic::Agent::Tracer.state
-        end
-      end
-
-      # Taken from ActiveSupport::Notifications::Event, pasted here
-      # with a couple minor additions so we don't have a hard
-      # dependency on ActiveSupport::Notifications.
-      #
-      # Represents an instrumentation event, provides timing and metric
-      # name information useful when recording metrics.
-      class Event
-        attr_reader :name, :time, :transaction_id, :payload, :children
-        attr_accessor :end, :parent, :frame
-
-        def initialize(name, start, ending, transaction_id, payload)
-          @name           = name
-          @payload        = payload.dup
-          @time           = start
-          @transaction_id = transaction_id
-          @end            = ending
-          @children       = []
-        end
-
-        def metric_name
-          raise NotImplementedError
-        end
-
-        def duration
-          self.end - time
-        end
-
-        def <<(event)
-          @children << event
-        end
-
-        def parent_of?(event)
-          @children.include? event
-        end
-      end
-    end
-  end
-end

data/lib/new_relic/agent/instrumentation/rails4/action_controller.rb

@@ -1,32 +0,0 @@
-# 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.
-require 'new_relic/agent/instrumentation/action_controller_subscriber'
-require 'new_relic/agent/prepend_supportability'
-
-
-DependencyDetection.defer do
-  @name = :rails4_controller
-
-  depends_on do
-    defined?(::Rails::VERSION::MAJOR) && ::Rails::VERSION::MAJOR.to_i == 4
-  end
-
-  depends_on do
-    defined?(ActionController) && defined?(ActionController::Base)
-  end
-
-  executes do
-    ::NewRelic::Agent.logger.info 'Installing Rails 4 Controller instrumentation'
-  end
-
-  executes do
-    class ActionController::Base
-      include NewRelic::Agent::Instrumentation::ControllerInstrumentation
-    end
-    NewRelic::Agent::Instrumentation::ActionControllerSubscriber \
-      .subscribe(/^process_action.action_controller$/)
-
-    ::NewRelic::Agent::PrependSupportability.record_metrics_for(::ActionController::Base)
-  end
-end

data/lib/new_relic/agent/instrumentation/rails5/action_view.rb

@@ -1,27 +0,0 @@
-# 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.
-require 'new_relic/agent/instrumentation/action_view_subscriber'
-require 'new_relic/agent/prepend_supportability'
-
-DependencyDetection.defer do
-  @name = :rails5_view
-
-  depends_on do
-    defined?(::Rails::VERSION::MAJOR) && ::Rails::VERSION::MAJOR.to_i == 5
-  end
-
-  depends_on do
-    !NewRelic::Agent.config[:disable_view_instrumentation] &&
-      !NewRelic::Agent::Instrumentation::ActionViewSubscriber.subscribed?
-  end
-
-  executes do
-    NewRelic::Agent.logger.info 'Installing Rails 5 view instrumentation'
-  end
-
-  executes do
-    NewRelic::Agent::Instrumentation::ActionViewSubscriber.subscribe(/render_.+\.action_view$/)
-    NewRelic::Agent::PrependSupportability.record_metrics_for(::ActionView::Base, ::ActionView::Template, ::ActionView::Renderer)
-  end
-end

data/lib/new_relic/agent/transaction/xray_sample_buffer.rb

@@ -1,64 +0,0 @@
-# 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.
-
-require 'new_relic/agent/transaction/transaction_sample_buffer'
-
-module NewRelic
-  module Agent
-    class Transaction
-      class XraySampleBuffer < TransactionSampleBuffer
-
-        attr_writer :xray_session_collection
-
-        def initialize
-          super
-
-          # Memoize the config setting since this happens per request
-          @enabled = NewRelic::Agent.config[:'xray_session.allow_traces']
-          NewRelic::Agent.config.register_callback(:'xray_session.allow_traces') do |new_value|
-            @enabled = new_value
-          end
-
-          @capacity = NewRelic::Agent.config[:'xray_session.max_samples']
-          NewRelic::Agent.config.register_callback(:'xray_session.max_samples') do |new_value|
-            @capacity = new_value
-          end
-        end
-
-        def xray_session_collection
-          @xray_session_collection ||= NewRelic::Agent.instance.agent_command_router.xray_session_collection
-        end
-
-        def capacity
-          @capacity
-        end
-
-        def truncate_samples
-          # First in wins, so stop on allow_sample? instead of truncating
-        end
-
-        def allow_sample?(sample)
-          !full? && !lookup_session_id(sample).nil?
-        end
-
-        def enabled?
-          @enabled
-        end
-
-
-        private
-
-        def add_sample(sample)
-          super(sample)
-          sample.xray_session_id = lookup_session_id(sample)
-        end
-
-        def lookup_session_id(sample)
-          xray_session_collection.session_id_for_transaction_name(sample.transaction_name)
-        end
-
-      end
-    end
-  end
-end

data/lib/new_relic/control/frameworks/rails6.rb

@@ -1,14 +0,0 @@
-# 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.
-
-require 'new_relic/control/frameworks/rails4'
-
-module NewRelic
-  class Control
-    module Frameworks
-      class Rails6 < NewRelic::Control::Frameworks::Rails4
-      end
-    end
-  end
-end