newrelic_rpm 6.2.0.354 → 6.3.0.355

data/lib/new_relic/agent/instrumentation/{rails5 → rails_notifications}/action_cable.rb

@@ -5,11 +5,11 @@ require 'new_relic/agent/instrumentation/action_cable_subscriber'
 require 'new_relic/agent/prepend_supportability'
 
 DependencyDetection.defer do
-  @name = :rails5_action_cable
+  @name = :action_cable_notifications
 
   depends_on do
     defined?(::Rails::VERSION::MAJOR) &&
-     ::Rails::VERSION::MAJOR.to_i == 5 &&
+     ::Rails::VERSION::MAJOR.to_i >= 5 &&
        defined?(::ActionCable)
   end
 
@@ -19,7 +19,7 @@ DependencyDetection.defer do
   end
 
   executes do
-    ::NewRelic::Agent.logger.info 'Installing Rails 5 Action Cable instrumentation'
+    ::NewRelic::Agent.logger.info 'Installing notifications based Action Cable instrumentation'
   end
 
   executes do

data/lib/new_relic/agent/instrumentation/{rails5 → rails_notifications}/action_controller.rb

@@ -6,10 +6,10 @@ require 'new_relic/agent/prepend_supportability'
 
 
 DependencyDetection.defer do
-  @name = :rails5_controller
+  @name = :action_controller_notifications
 
   depends_on do
-    defined?(::Rails::VERSION::MAJOR) && ::Rails::VERSION::MAJOR.to_i == 5
+    defined?(::Rails::VERSION::MAJOR) && ::Rails::VERSION::MAJOR.to_i >= 4
   end
 
   depends_on do
@@ -17,7 +17,7 @@ DependencyDetection.defer do
   end
 
   executes do
-    ::NewRelic::Agent.logger.info 'Installing Rails 5 Controller instrumentation'
+    ::NewRelic::Agent.logger.info 'Installing notifications based Action Controller instrumentation'
   end
 
   executes do

data/lib/new_relic/agent/instrumentation/{rails5 → rails_notifications}/action_view.rb

@@ -5,10 +5,10 @@ require 'new_relic/agent/instrumentation/action_view_subscriber'
 require 'new_relic/agent/prepend_supportability'
 
 DependencyDetection.defer do
-  @name = :rails5_view
+  @name = :action_view_notifications
 
   depends_on do
-    defined?(::Rails::VERSION::MAJOR) && ::Rails::VERSION::MAJOR.to_i == 5
+    defined?(::Rails::VERSION::MAJOR) && ::Rails::VERSION::MAJOR.to_i >= 4
   end
 
   depends_on do
@@ -17,7 +17,7 @@ DependencyDetection.defer do
   end
 
   executes do
-    NewRelic::Agent.logger.info 'Installing Rails 5 view instrumentation'
+    NewRelic::Agent.logger.info 'Installing notification based Action View instrumentation'
   end
 
   executes do

data/lib/new_relic/agent/parameter_filtering.rb

@@ -7,16 +7,29 @@ module NewRelic
     module ParameterFiltering
       extend self
 
+      ACTION_DISPATCH_PARAMETER_FILTER = "action_dispatch.parameter_filter".freeze
+
+      RAILS_FILTER_CLASS = if defined?(ActiveSupport::ParameterFilter)
+         ActiveSupport::ParameterFilter
+      elsif defined?(ActionDispatch::Http::ParameterFilter)
+        ActionDispatch::Http::ParameterFilter
+      else
+        nil
+      end
+
       def apply_filters(env, params)
-        params = filter_using_rails(env, params)
+        if filters = env[ACTION_DISPATCH_PARAMETER_FILTER]
+          params = filter_using_rails(params, filters) 
+        end
         params = filter_rack_file_data(env, params)
         params
       end
 
-      def filter_using_rails(env, params)
-        return params unless defined?(ActionDispatch::Http::ParameterFilter) && env.key?("action_dispatch.parameter_filter")
-        filters = env["action_dispatch.parameter_filter"]
-        ActionDispatch::Http::ParameterFilter.new(filters).filter(params)
+      def filter_using_rails(params, filters)
+        return params if RAILS_FILTER_CLASS.nil?
+
+        pre_filtered_params = filter_rails_request_parameters(params)
+        RAILS_FILTER_CLASS.new(filters).filter(pre_filtered_params)
       end
 
       def filter_rack_file_data(env, params)

data/lib/new_relic/control/class_methods.rb

@@ -49,13 +49,19 @@ module NewRelic
           # maybe it is already loaded by some external system
           # i.e. rpm_contrib or user extensions?
         end
-        NewRelic::Control::Frameworks.const_get(framework.to_s.capitalize)
+        NewRelic::Control::Frameworks.const_get(camelize(framework.to_s))
       end
 
       # The root directory for the plugin or gem
       def newrelic_root
         File.expand_path(File.join("..", "..", "..", ".."), __FILE__)
       end
+
+      def camelize(snake_case_name)
+        snake_case_name.gsub(/(\_|^)[a-z]/) do |substring|
+          substring[-1].capitalize!
+        end
+      end
     end
     extend ClassMethods
   end

data/lib/new_relic/control/frameworks/{rails5.rb → rails_notifications.rb}

@@ -7,7 +7,7 @@ require 'new_relic/control/frameworks/rails4'
 module NewRelic
   class Control
     module Frameworks
-      class Rails5 < NewRelic::Control::Frameworks::Rails4
+      class RailsNotifications < NewRelic::Control::Frameworks::Rails4
       end
     end
   end

data/lib/new_relic/version.rb

@@ -11,7 +11,7 @@ module NewRelic
     end
 
     MAJOR = 6
-    MINOR = 2
+    MINOR = 3
     TINY  = 0
 
     begin

data/test/agent_helper.rb

@@ -521,7 +521,7 @@ def constant_path(name, opts={})
   path = [Object]
   parts = name.gsub(/^::/, '').split('::')
   parts.each do |part|
-    if !path.last.const_defined?(part)
+    if !path.last.constants.include?(part.to_sym)
       return allow_partial ? path : nil
     end
     path << path.last.const_get(part)
@@ -529,11 +529,17 @@ def constant_path(name, opts={})
   path
 end
 
+def get_parent(constant_name)
+  parent_name = constant_name.gsub(/::[^:]*$/, '')
+  const_path = constant_path(parent_name)
+  const_path ? const_path[-1] : nil
+end
+
 def undefine_constant(constant_symbol)
-  const_path = constant_path(constant_symbol.to_s)
-  return yield unless const_path
-  parent = const_path[-2]
-  const_name = constant_symbol.to_s.gsub(/.*::/, '')
+  const_str = constant_symbol.to_s
+  parent = get_parent(const_str)
+  const_name = const_str.gsub(/.*::/, '')
+  return yield unless parent && parent.constants.include?(const_name.to_sym)
   removed_constant = parent.send(:remove_const, const_name)
   yield
 ensure

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 6.2.0.354
+  version: 6.3.0.355
 platform: ruby
 authors:
 - Matthew Wear
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-12 00:00:00.000000000 Z
+date: 2019-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -184,6 +184,7 @@ files:
 - lib/new_relic/agent/configuration/default_source.rb
 - lib/new_relic/agent/configuration/dotted_hash.rb
 - lib/new_relic/agent/configuration/environment_source.rb
+- lib/new_relic/agent/configuration/event_data.rb
 - lib/new_relic/agent/configuration/high_security_source.rb
 - lib/new_relic/agent/configuration/manager.rb
 - lib/new_relic/agent/configuration/manual_source.rb
@@ -191,6 +192,8 @@ files:
 - lib/new_relic/agent/configuration/security_policy_source.rb
 - lib/new_relic/agent/configuration/server_source.rb
 - lib/new_relic/agent/configuration/yaml_source.rb
+- lib/new_relic/agent/connect/request_builder.rb
+- lib/new_relic/agent/connect/response_handler.rb
 - lib/new_relic/agent/cross_app_monitor.rb
 - lib/new_relic/agent/cross_app_payload.rb
 - lib/new_relic/agent/cross_app_tracing.rb
@@ -240,9 +243,8 @@ files:
 - lib/new_relic/agent/instrumentation/active_job.rb
 - lib/new_relic/agent/instrumentation/active_merchant.rb
 - lib/new_relic/agent/instrumentation/active_record.rb
-- lib/new_relic/agent/instrumentation/active_record_4.rb
-- lib/new_relic/agent/instrumentation/active_record_5.rb
 - lib/new_relic/agent/instrumentation/active_record_helper.rb
+- lib/new_relic/agent/instrumentation/active_record_notifications.rb
 - lib/new_relic/agent/instrumentation/active_record_prepend.rb
 - lib/new_relic/agent/instrumentation/active_record_subscriber.rb
 - lib/new_relic/agent/instrumentation/active_storage.rb
@@ -278,12 +280,10 @@ files:
 - lib/new_relic/agent/instrumentation/rails/action_controller.rb
 - lib/new_relic/agent/instrumentation/rails/action_web_service.rb
 - lib/new_relic/agent/instrumentation/rails3/action_controller.rb
-- lib/new_relic/agent/instrumentation/rails4/action_controller.rb
-- lib/new_relic/agent/instrumentation/rails4/action_view.rb
-- lib/new_relic/agent/instrumentation/rails5/action_cable.rb
-- lib/new_relic/agent/instrumentation/rails5/action_controller.rb
-- lib/new_relic/agent/instrumentation/rails5/action_view.rb
 - lib/new_relic/agent/instrumentation/rails_middleware.rb
+- lib/new_relic/agent/instrumentation/rails_notifications/action_cable.rb
+- lib/new_relic/agent/instrumentation/rails_notifications/action_controller.rb
+- lib/new_relic/agent/instrumentation/rails_notifications/action_view.rb
 - lib/new_relic/agent/instrumentation/rainbows_instrumentation.rb
 - lib/new_relic/agent/instrumentation/rake.rb
 - lib/new_relic/agent/instrumentation/redis.rb
@@ -394,8 +394,7 @@ files:
 - lib/new_relic/control/frameworks/rails.rb
 - lib/new_relic/control/frameworks/rails3.rb
 - lib/new_relic/control/frameworks/rails4.rb
-- lib/new_relic/control/frameworks/rails5.rb
-- lib/new_relic/control/frameworks/rails6.rb
+- lib/new_relic/control/frameworks/rails_notifications.rb
 - lib/new_relic/control/frameworks/ruby.rb
 - lib/new_relic/control/frameworks/sinatra.rb
 - lib/new_relic/control/instance_methods.rb

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/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/rails4/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 = :rails4_view
-
-  depends_on do
-    defined?(::Rails::VERSION::MAJOR) && ::Rails::VERSION::MAJOR.to_i == 4
-  end
-
-  depends_on do
-    !NewRelic::Agent.config[:disable_view_instrumentation] &&
-      !NewRelic::Agent::Instrumentation::ActionViewSubscriber.subscribed?
-  end
-
-  executes do
-    ::NewRelic::Agent.logger.info 'Installing Rails 4 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/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