newrelic_rpm 3.6.5.130 → 3.6.6.147

data/lib/new_relic/delayed_job_injection.rb

@@ -2,49 +2,9 @@
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
-require 'dependency_detection'
-# This installs some code to manually start the agent when a delayed
-# job worker starts.  It's not really instrumentation.  It's more like
-# a hook from DJ to the Ruby Agent so it gets loaded at the time the
-# Ruby Agent initializes, which must be before the DJ worker
-# initializes.  Loaded from control.rb
 module NewRelic
   module DelayedJobInjection
     extend self
     attr_accessor :worker_name
   end
 end
-
-DependencyDetection.defer do
-  @name = :delayed_job_injection
-  
-  depends_on do
-    defined?(::Delayed) && defined?(::Delayed::Worker) && !NewRelic::Agent.config[:disable_dj]
-  end
-  
-  executes do
-    if NewRelic::Agent.respond_to?(:logger)
-      ::NewRelic::Agent.logger.info 'Installing DelayedJob instrumentation hooks'
-    end
-  end
-  
-  executes do
-    Delayed::Worker.class_eval do
-      def initialize_with_new_relic(*args)
-        initialize_without_new_relic(*args)
-        worker_name = case
-                      when self.respond_to?(:name) then self.name
-                      when self.class.respond_to?(:default_name) then self.class.default_name
-                      end
-        dispatcher_instance_id = worker_name || "host:#{Socket.gethostname} pid:#{Process.pid}" rescue "pid:#{Process.pid}"
-        say "New Relic Ruby Agent Monitoring DJ worker #{dispatcher_instance_id}"
-        NewRelic::DelayedJobInjection.worker_name = worker_name
-        NewRelic::Control.instance.init_plugin :dispatcher => :delayed_job, :dispatcher_instance_id => dispatcher_instance_id
-        NewRelic::Agent.instance.add_harvest_sampler(NewRelic::Agent::Samplers::DelayedJobSampler)
-      end
-
-      alias initialize_without_new_relic initialize
-      alias initialize initialize_with_new_relic
-    end
-  end
-end

data/lib/new_relic/helper.rb

@@ -70,4 +70,3 @@ module NewRelic
   module_function :json_dump, :json_load
 
 end
-

data/lib/new_relic/latest_changes.rb

@@ -16,7 +16,7 @@ See https://github.com/newrelic/rpm/blob/master/CHANGELOG for a full list of
 changes.
 EOS
 
-      return footer unless File.exists?(changelog) 
+      return footer unless File.exists?(changelog)
 
       version_count = 0
       changes = []

data/lib/new_relic/local_environment.rb

@@ -75,7 +75,7 @@ module NewRelic
     # Although you can override the dispatcher with NEWRELIC_DISPATCHER this
     # is not advisable since it implies certain api's being available.
     def discover_dispatcher
-      dispatchers = %w[passenger torquebox trinidad glassfish resque sidekiq thin mongrel litespeed webrick fastcgi rainbows unicorn]
+      dispatchers = %w[passenger torquebox trinidad glassfish resque sidekiq delayed_job thin mongrel litespeed webrick fastcgi rainbows unicorn]
       while dispatchers.any? && @discovered_dispatcher.nil?
         send 'check_for_'+(dispatchers.shift)
       end
@@ -101,8 +101,7 @@ module NewRelic
     end
 
     def jruby_rack?
-      ((org.jruby.rack.DefaultRackApplicationFactory rescue nil) &&
-       defined?(org::jruby::rack::DefaultRackApplicationFactory))
+      defined?(JRuby::Rack::VERSION)
     end
 
     def check_for_webrick
@@ -147,7 +146,7 @@ module NewRelic
     def check_for_unicorn
       if (defined?(::Unicorn) && defined?(::Unicorn::HttpServer)) && NewRelic::LanguageSupport.object_space_enabled?
         v = find_class_in_object_space(::Unicorn::HttpServer)
-        @discovered_dispatcher = :unicorn if v 
+        @discovered_dispatcher = :unicorn if v
       end
     end
 
@@ -158,6 +157,12 @@ module NewRelic
       end
     end
 
+    def check_for_delayed_job
+      if $0 =~ /delayed_job$/
+        @discovered_dispatcher = :delayed_job
+      end
+    end
+
     def check_for_resque
       using_resque = (
         defined?(::Resque) &&

data/lib/new_relic/metric_spec.rb

@@ -2,12 +2,14 @@
 # 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/internal_agent_error'
+
 # this struct uniquely defines a metric, optionally inside
 # the call scope of another metric
 class NewRelic::MetricSpec
   attr_accessor   :name
   attr_accessor   :scope
-  
+
   # the maximum length of a metric name or metric scope
   MAX_LENGTH = 255
   LENGTH_RANGE = (0...MAX_LENGTH)
@@ -22,13 +24,27 @@ class NewRelic::MetricSpec
       self.scope = ''
     end
   end
-  
+
+  class InvalidScopeSettingError < NewRelic::Agent::InternalAgentError
+    def initialize(name, scope)
+      super("Attempted to set scope for #{name} to #{scope.inspect}, ignoring.")
+    end
+  end
+
+  def scope=(s)
+    if s.nil? || s == false
+      NewRelic::Agent.instance.error_collector.notice_agent_error(InvalidScopeSettingError.new(@name, s))
+    else
+      @scope = s
+    end
+  end
+
   # truncates the name and scope to the MAX_LENGTH
   def truncate!
     self.name = name[LENGTH_RANGE] if name && name.size > MAX_LENGTH
     self.scope = scope[LENGTH_RANGE] if scope && scope.size > MAX_LENGTH
   end
-  
+
   def ==(o)
     self.eql?(o)
   end

data/lib/new_relic/noticed_error.rb

@@ -7,7 +7,8 @@ require 'new_relic/helper'
 # This class encapsulates an error that was noticed by New Relic in a managed app.
 class NewRelic::NoticedError
   extend NewRelic::CollectionHelper
-  attr_accessor :path, :timestamp, :params, :exception_class_name, :exception_class_constant, :message
+  attr_accessor :path, :timestamp, :params, :message,
+                :exception_class_name, :exception_class_constant
   attr_reader :exception_id
 
   STRIPPED_EXCEPTION_REPLACEMENT_MESSAGE = "Message removed by New Relic 'strip_exception_messages' setting"

data/lib/new_relic/rack/agent_hooks.rb

@@ -35,4 +35,3 @@ module NewRelic::Rack
     end
   end
 end
-

data/lib/new_relic/rack/developer_mode.rb

@@ -236,7 +236,7 @@ module NewRelic
 
         sort_method = params['sort'] || :total_time
         @profile_options = {:min_percent => 0.5, :sort_method => sort_method.to_sym}
-        
+
         render(:show_sample)
       end
 

data/lib/new_relic/rack/error_collector.rb

@@ -8,40 +8,61 @@ module NewRelic::Rack
       @app = app
     end
 
+    def params_from_env(env)
+      if defined?(ActionDispatch::Request)
+        # We use ActionDispatch::Request if it's available so that we can get
+        # the parameter filtering supplied by Rails via filtered_parameters.
+        # The action and controller params are synthesized by
+        # ActionDispatch::Request, so we strip them for consistency with Rack::Request
+        params = ActionDispatch::Request.new(env).filtered_parameters
+        params.delete('action')
+        params.delete('controller')
+        params
+      else
+        Rack::Request.new(env).params
+      end
+    rescue => e
+      warning = "failed to capture request parameters: %p: %s" % [ e.class, e.message ]
+      NewRelic::Agent.logger.warn(warning)
+      { 'error' => warning }
+    end
+
+    def strip_query_string(s)
+      s.gsub(/\?.*/, '')
+    end
+
+    def uri_from_env(env)
+      strip_query_string("#{env['SCRIPT_NAME']}#{env['PATH_INFO']}")
+    end
+
+    def referrer_from_env(env)
+      strip_query_string(env['HTTP_REFERER'].to_s)
+    end
+
     def call(env)
       @app.call(env)
     rescue Exception => exception
       NewRelic::Agent.logger.debug "collecting %p: %s" % [ exception.class, exception.message ]
-      request = Rack::Request.new(env)
-
-      if !should_ignore_error?(exception, request)
-        params = begin
-          request.params
-        rescue => err
-          warning = "failed to capture request parameters: %p: %s" % [ err.class, err.message ]
-          NewRelic::Agent.logger.warn(warning)
-          {'error' => warning}
-        end
-
+      if !should_ignore_error?(exception, env)
         NewRelic::Agent.notice_error(exception,
-                                      :uri => request.path,
-                                      :referer => request.referer,
-                                      :request_params => params)
+                                     :uri => uri_from_env(env),
+                                     :referer => referrer_from_env(env),
+                                     :request_params => params_from_env(env))
       end
       raise exception
     end
 
-    def should_ignore_error?(error, request)
+    def should_ignore_error?(error, env)
       NewRelic::Agent.instance.error_collector.error_is_ignored?(error) ||
-        ignored_in_controller?(error, request)
+        ignored_in_controller?(error, env)
     end
 
-    def ignored_in_controller?(exception, request)
-      return true if request.env['newrelic.ignored']
+    def ignored_in_controller?(exception, env)
+      return true if env['newrelic.ignored']
 
-      if request.env['action_dispatch.request.parameters']
-        ignore_actions = newrelic_ignore_for_controller(request.env['action_dispatch.request.parameters']['controller'])
-        action_name = request.env['action_dispatch.request.parameters']['action']
+      if env['action_dispatch.request.parameters']
+        ignore_actions = newrelic_ignore_for_controller(env['action_dispatch.request.parameters']['controller'])
+        action_name = env['action_dispatch.request.parameters']['action']
 
         case ignore_actions
         when nil; false

data/lib/new_relic/recipes.rb

@@ -100,4 +100,3 @@ else
     make_notify_task.call
   end
 end
-

data/lib/new_relic/transaction_analysis.rb

@@ -78,4 +78,3 @@ module NewRelic
     end
   end
 end
-

data/lib/new_relic/transaction_sample/segment.rb

@@ -124,6 +124,10 @@ module NewRelic
         @params ||= {}
       end
 
+      def params=(p)
+        @params = p
+      end
+
       # call the provided block for this segment and each
       # of the called segments
       def each_segment(&block)
@@ -176,10 +180,6 @@ module NewRelic
         NewRelic::Agent::Database.obfuscate_sql(params[:sql])
       end
 
-      def params=(p)
-        @params = p
-      end
-
       def called_segments=(segments)
         @called_segments = segments
       end

data/lib/new_relic/version.rb

@@ -12,7 +12,7 @@ module NewRelic
 
     MAJOR = 3
     MINOR = 6
-    TINY  = 5
+    TINY  = 6
 
     begin
       require File.join(File.dirname(__FILE__), 'build')

data/lib/sequel/extensions/newrelic_instrumentation.rb

@@ -15,20 +15,20 @@ module Sequel
   # be instrumented, but if you're using a version of Sequel before 3.47.0,
   # you'll need to add the extension yourself if you create any after the
   # instrumentation is loaded:
-  # 
+  #
   #     db = Sequel.connect( ... )
   #     db.extension :newrelic_instrumentation
-  # 
+  #
   # Versions 3.47.0 and later use `Database.extension` to automatically
   # install the extension for new connections.
-  # 
+  #
   # == Disabling
-  # 
+  #
   # If you don't want your models or database connections to be instrumented,
   # you can disable them by setting `disable_database_instrumentation` in
-  # your `newrelic.yml` to `true`. It will also honor the 
+  # your `newrelic.yml` to `true`. It will also honor the
   # `disable_activerecord_instrumentation` setting.
-  # 
+  #
   module NewRelicInstrumentation
     include NewRelic::Agent::MethodTracer,
             NewRelic::Agent::Instrumentation::ActiveRecordHelper
@@ -100,4 +100,3 @@ module Sequel
   Database.register_extension( :newrelic_instrumentation, NewRelicInstrumentation )
 
 end # module Sequel
-

data/lib/sequel/plugins/newrelic_instrumentation.rb

@@ -80,4 +80,3 @@ module Sequel
     end # module NewRelicInstrumentation
   end # module Plugins
 end # module Sequel
-

data/lib/tasks/install.rake

@@ -2,6 +2,6 @@
 namespace :newrelic do
   desc "install a default config/newrelic.yml file"
   task :install do
-    load File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "install.rb"))  
+    load File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "install.rb"))
   end
-end
+end

data/newrelic_rpm.gemspec

@@ -20,7 +20,7 @@ Gem or plugin, hosted on
 http://github.com/newrelic/rpm/
 EOS
   s.email = "support@newrelic.com"
-  s.executables = [ "mongrel_rpm", "newrelic_cmd", "newrelic" ]
+  s.executables = [ "mongrel_rpm", "newrelic_cmd", "newrelic", "nrdebug" ]
   s.extra_rdoc_files = [
     "CHANGELOG",
     "LICENSE",
@@ -40,6 +40,16 @@ EOS
   s.rubygems_version = Gem::VERSION
   s.summary = "New Relic Ruby Agent"
   s.post_install_message = NewRelic::LatestChanges.read
+  s.add_development_dependency 'rake', '10.1.0'
+  s.add_development_dependency 'minitest', '~> 4.7.5'
+  s.add_development_dependency 'mocha', '~> 0.13.0'
+  s.add_development_dependency 'sdoc-helpers'
+  s.add_development_dependency 'rdoc', '>= 2.4.2'
+  s.add_development_dependency 'rails', '~> 3.2.13'
+  s.add_development_dependency 'sqlite3' unless RUBY_PLATFORM == 'java'
+  s.add_development_dependency 'activerecord-jdbcsqlite3-adapter' if RUBY_PLATFORM == 'java'
+  s.add_development_dependency 'jruby-openssl' if RUBY_PLATFORM == 'java'
+  s.add_development_dependency 'sequel', '~> 3.46.0'
 
   # Only sign with our private key if you can find it
   signing_key_path = File.expand_path('~/.ssh/newrelic_rpm-private_key.pem')

data/test/active_record_fixtures.rb

@@ -37,7 +37,7 @@ module ActiveRecordFixtures
     rescue => e
       false
     end
-    
+
     def self.add_delay
       # Introduce a 5 ms delay into db operations on Orders
       def connection.log_info *args
@@ -74,7 +74,7 @@ module ActiveRecordFixtures
       false
     end
 
-    
+
     def self.teardown
     end
   end

data/test/agent_helper.rb

@@ -63,6 +63,26 @@ def assert_calls_unscoped_metrics(*metrics)
   assert_not_equal first_metrics, last_metrics, "should have changed these metrics"
 end
 
+def assert_has_error(error_class)
+  assert \
+    NewRelic::Agent.instance.error_collector.errors.find {|e| e.exception_class_constant == error_class} != nil, \
+    "Didn't find error of class #{error_class}"
+end
+
+
+unless defined?( build_message )
+  def build_message(head, template=nil, *arguments)
+    template &&= template.chomp
+    template.gsub(/\?/) { mu_pp(arguments.shift) }
+  end
+end
+
+unless defined?( assert_block )
+  def assert_block(*msgs)
+    assert yield, *msgs
+  end
+end
+
 unless defined?( assert_includes )
   def assert_includes( collection, member, msg=nil )
     msg = build_message( msg, "Expected ? to include ?", collection, member )
@@ -254,12 +274,25 @@ ensure
   end
 end
 
+def constant_path(name)
+  path = [Object]
+  parts = name.gsub(/^::/, '').split('::')
+  parts.each do |part|
+    return nil unless path.last.const_defined?(part)
+    path << path.last.const_get(part)
+  end
+  path
+end
+
 def undefine_constant(constant_symbol)
-  return yield unless Object.const_defined?(constant_symbol)
-  removed_constant = Object.send(:remove_const, 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(/.*::/, '')
+  removed_constant = parent.send(:remove_const, const_name)
   yield
 ensure
-  Object.const_set(constant_symbol, removed_constant) if removed_constant
+  parent.const_set(const_name, removed_constant) if removed_constant
 end
 
 def internet_connection?
@@ -270,3 +303,13 @@ def internet_connection?
     true
   end
 end
+
+def with_debug_logging
+  orig_logger = NewRelic::Agent.logger
+  $stderr.puts '', '---', ''
+  NewRelic::Agent.logger =
+    NewRelic::Agent::AgentLogger.new( {:log_level => 'debug'}, '', Logger.new($stderr) )
+  yield
+ensure
+  NewRelic::Agent.logger = orig_logger
+end