newrelic_rpm 2.13.5.beta4 → 2.13.6.beta1

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

@@ -1,46 +1,53 @@
-if defined?(Sinatra::Base)
-  require 'new_relic/agent/instrumentation/controller_instrumentation'
-  module NewRelic
-    module Agent
-      module Instrumentation
-        # NewRelic instrumentation for Sinatra applications.  Sinatra actions will
-        # appear in the UI similar to controller actions, and have breakdown charts
-        # and transaction traces.
-        #
-        # The actions in the UI will correspond to the pattern expression used
-        # to match them.  HTTP operations are not distinguished.  Multiple matches
-        # will all be tracked as separate actions.
-        module Sinatra
+require 'new_relic/agent/instrumentation/controller_instrumentation'
 
-          include NewRelic::Agent::Instrumentation::ControllerInstrumentation
+DependencyDetection.defer do
+  depends_on do
+    defined?(::Sinatra) && defined?(::Sinatra::Base)
+  end
+  
+  executes do
+    ::Sinatra::Base.class_eval do
+      include NewRelic::Agent::Instrumentation::Sinatra
+      alias route_eval_without_newrelic route_eval
+      alias route_eval route_eval_with_newrelic
+    end
+  end
+end
+
+
+module NewRelic
+  module Agent
+    module Instrumentation
+      # NewRelic instrumentation for Sinatra applications.  Sinatra actions will
+      # appear in the UI similar to controller actions, and have breakdown charts
+      # and transaction traces.
+      #
+      # The actions in the UI will correspond to the pattern expression used
+      # to match them.  HTTP operations are not distinguished.  Multiple matches
+      # will all be tracked as separate actions.
+      module Sinatra
 
-          def route_eval_with_newrelic(&block_arg)
-            path = unescape(@request.path_info)
-            name = path
-            # Go through each route and look for a match
-            if routes = self.class.routes[@request.request_method]
-              routes.detect do |pattern, keys, conditions, block|
-                if block_arg.equal? block
-                  name = pattern.source
-                end
+        include NewRelic::Agent::Instrumentation::ControllerInstrumentation
+
+        def route_eval_with_newrelic(&block_arg)
+          path = unescape(@request.path_info)
+          name = path
+          # Go through each route and look for a match
+          if routes = self.class.routes[@request.request_method]
+            routes.detect do |pattern, keys, conditions, block|
+              if block_arg.equal? block
+                name = pattern.source
               end
             end
-            # strip off leading ^ and / chars and trailing $ and /
-            name.gsub!(%r{^[/^]*(.*?)[/\$\?]*$}, '\1')
-            name = 'root' if name.empty?
-            name = @request.request_method + ' ' + name if @request && @request.respond_to?(:request_method)
-            perform_action_with_newrelic_trace(:category => :sinatra, :name => name, :params => @request.params) do
-              route_eval_without_newrelic(&block_arg)
-            end
+          end
+          # strip off leading ^ and / chars and trailing $ and /
+          name.gsub!(%r{^[/^]*(.*?)[/\$\?]*$}, '\1')
+          name = 'root' if name.empty?
+          name = @request.request_method + ' ' + name if @request && @request.respond_to?(:request_method)
+          perform_action_with_newrelic_trace(:category => :sinatra, :name => name, :params => @request.params) do
+            route_eval_without_newrelic(&block_arg)
           end
         end
-
-        ::Sinatra::Base.class_eval do
-          include NewRelic::Agent::Instrumentation::Sinatra
-          alias route_eval_without_newrelic route_eval
-          alias route_eval route_eval_with_newrelic
-        end
-
       end
     end
   end

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

@@ -1,16 +1,22 @@
-if defined?(::Sunspot)
-  ::Sunspot.module_eval do
-    class << self
-      %w(index index!).each do |method|
-        add_method_tracer method, 'SolrClient/Sunspot/index'
-      end
-      add_method_tracer :commit, 'SolrClient/Sunspot/commit'
+DependencyDetection.defer do
+  depends_on do
+    defined?(::Sunspot)
+  end
 
-      %w[search more_like_this].each do |method|
-        add_method_tracer method, 'SolrClient/Sunspot/query'
-      end
-      %w[remove remove! remove_by_id remove_by_id! remove_all remove_all!].each do |method|
-        add_method_tracer method, 'SolrClient/Sunspot/delete'
+  executes do
+    ::Sunspot.module_eval do
+      class << self
+        %w(index index!).each do |method|
+          add_method_tracer method, 'SolrClient/Sunspot/index'
+        end
+        add_method_tracer :commit, 'SolrClient/Sunspot/commit'
+
+        %w[search more_like_this].each do |method|
+          add_method_tracer method, 'SolrClient/Sunspot/query'
+        end
+        %w[remove remove! remove_by_id remove_by_id! remove_all remove_all!].each do |method|
+          add_method_tracer method, 'SolrClient/Sunspot/delete'
+        end
       end
     end
   end

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

@@ -1,10 +1,16 @@
-if defined?(Unicorn::HttpServer)
-  Unicorn::HttpServer.class_eval do
-    NewRelic::Agent.logger.debug "Installing Unicorn worker hook."
-    old_worker_loop = instance_method(:worker_loop)
-    define_method(:worker_loop) do | worker |
-      NewRelic::Agent.after_fork(:force_reconnect => true)
-      old_worker_loop.bind(self).call(worker)
+DependencyDetection.defer do
+  depends_on do
+    defined?(::Unicorn) && defined?(::Unicorn::HttpServer)
+  end
+
+  executes do
+    Unicorn::HttpServer.class_eval do
+      NewRelic::Agent.logger.debug "Installing Unicorn worker hook."
+      old_worker_loop = instance_method(:worker_loop)
+      define_method(:worker_loop) do | worker |
+        NewRelic::Agent.after_fork(:force_reconnect => true)
+        old_worker_loop.bind(self).call(worker)
+      end
     end
   end
 end

data/lib/new_relic/agent/method_tracer.rb

@@ -401,10 +401,10 @@ module NewRelic
         # may get removed as well.
         def remove_method_tracer(method_name, metric_name_code) # :nodoc:
           return unless NewRelic::Control.instance.agent_enabled?
-
           if method_defined? "#{_traced_method_name(method_name, metric_name_code)}"
             alias_method method_name, "#{_untraced_method_name(method_name, metric_name_code)}"
             undef_method "#{_traced_method_name(method_name, metric_name_code)}"
+            log.debug("removed method tracer #{method_name} #{metric_name_code}\n")
           else
             raise "No tracer for '#{metric_name_code}' on method '#{method_name}'"
           end

data/lib/new_relic/agent/samplers/cpu_sampler.rb

@@ -24,6 +24,8 @@ module NewRelic
         end
 
         def self.supported_on_this_platform?
+          # Process.times on JRuby reports wall clock elapsed time,
+          # not actual cpu time used, so we cannot use this sampler there.
           not defined?(JRuby)
         end
 

data/lib/new_relic/agent/stats_engine/metric_stats.rb

@@ -135,7 +135,7 @@ module NewRelic
 
         # Remove all stats.  For test code only.
         def clear_stats
-          stats_hash.clear
+          @stats_hash = SynchronizedHash.new
           NewRelic::Agent::BusyCalculator.reset
         end
 

data/lib/new_relic/control.rb

@@ -1,5 +1,6 @@
 require 'yaml'
 require 'conditional_vendored_metric_parser'
+require 'conditional_vendored_dependency_detection'
 require 'new_relic/local_environment'
 
 require 'singleton'

data/lib/new_relic/control/instrumentation.rb

@@ -72,6 +72,7 @@ module NewRelic
         File.join(instrumentation_path, '*.rb') <<
         File.join(instrumentation_path, app.to_s, '*.rb')
         @instrumentation_files.each { | pattern |  load_instrumentation_files pattern }
+        DependencyDetection.detect!
         log.debug "Finished instrumentation"
       end
     end

data/lib/new_relic/delayed_job_injection.rb

@@ -1,3 +1,4 @@
+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 RPM so it gets
 # loaded at the time the RPM plugin initializes, which must be before the DJ worker
@@ -9,19 +10,27 @@ module NewRelic
   end
 end
 
-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 "RPM 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
+DependencyDetection.defer do
+  depends_on do
+    defined?(::Delayed) && defined?(::Delayed::Worker) and !NewRelic::Control.instance['disable_dj']
   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 "RPM 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
+      end
 
-  alias initialize_without_new_relic initialize
-  alias initialize initialize_with_new_relic
-end if defined?(::Delayed::Worker) and not NewRelic::Control.instance['disable_dj']
+      alias initialize_without_new_relic initialize
+      alias initialize initialize_with_new_relic
+    end
+  end
+end

data/lib/new_relic/version.rb

@@ -3,8 +3,8 @@ module NewRelic
   module VERSION #:nodoc:
     MAJOR = 2
     MINOR = 13
-    TINY  = 5
-    BUILD = 'beta4' #'0' # Set to nil for a release, 'beta1', 'alpha', etc for prerelease builds
+    TINY  = 6
+    BUILD = 'beta1' #'0' # Set to nil for a release, 'beta1', 'alpha', etc for prerelease builds
     STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
   end
 

data/lib/newrelic_rpm.rb

@@ -18,6 +18,7 @@
 # directly.
 #
 require 'new_relic/control'
+
 if defined? Merb
   module NewRelic
     class MerbBootLoader < Merb::BootLoader
@@ -38,10 +39,14 @@ elsif defined? Rails
       end
     end
   else
+    if Rails.respond_to?(:configuration)
     # After verison 2.0 of Rails we can access the configuration directly.
     # We need it to add dev mode routes after initialization finished.
       config = Rails.configuration
       NewRelic::Control.instance.init_plugin :config => config
+    else
+      NewRelic::Control.instance.init_plugin
+    end
   end
 else
   NewRelic::Control.instance.init_plugin

data/newrelic_rpm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{newrelic_rpm}
-  s.version = "2.13.5.beta4"
+  s.version = "2.13.6.beta1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bill Kayser", "Justin George"]
-  s.date = %q{2011-03-07}
+  s.date = %q{2011-03-21}
   s.description = %q{New Relic RPM is a Ruby performance management system, developed by
 New Relic, Inc (http://www.newrelic.com).  RPM provides you with deep
 information about the performance of your Ruby on Rails or Merb
@@ -18,7 +18,7 @@ dual-purposed as a either a Rails plugin or a Gem, hosted on
 http://github.com/newrelic/rpm/tree/master.
 }
   s.email = %q{support@newrelic.com}
-  s.executables = ["mongrel_rpm", "newrelic", "newrelic_cmd"]
+  s.executables = ["newrelic_cmd", "newrelic", "mongrel_rpm"]
   s.extra_rdoc_files = [
     "CHANGELOG",
     "LICENSE",
@@ -34,6 +34,7 @@ http://github.com/newrelic/rpm/tree/master.
     "bin/newrelic_cmd",
     "cert/cacert.pem",
     "install.rb",
+    "lib/conditional_vendored_dependency_detection.rb",
     "lib/conditional_vendored_metric_parser.rb",
     "lib/new_relic/agent.rb",
     "lib/new_relic/agent/agent.rb",
@@ -124,44 +125,41 @@ http://github.com/newrelic/rpm/tree/master.
     "test/active_record_fixtures.rb",
     "test/config/newrelic.yml",
     "test/config/test_control.rb",
-    "test/new_relic/agent/active_record_instrumentation_test.rb",
-    "test/new_relic/agent/add_method_tracer_test.rb",
-    "test/new_relic/agent/agent_connect_test.rb",
-    "test/new_relic/agent/agent_controller_test.rb",
-    "test/new_relic/agent/agent_start_test.rb",
-    "test/new_relic/agent/agent_start_worker_thread_test.rb",
+    "test/new_relic/agent/agent/connect_test.rb",
+    "test/new_relic/agent/agent/start_test.rb",
+    "test/new_relic/agent/agent/start_worker_thread_test.rb",
     "test/new_relic/agent/agent_test_controller.rb",
+    "test/new_relic/agent/agent_test_controller_test.rb",
     "test/new_relic/agent/apdex_from_server_test.rb",
     "test/new_relic/agent/busy_calculator_test.rb",
-    "test/new_relic/agent/collection_helper_test.rb",
-    "test/new_relic/agent/error_collector_notice_error_test.rb",
+    "test/new_relic/agent/error_collector/notice_error_test.rb",
     "test/new_relic/agent/error_collector_test.rb",
+    "test/new_relic/agent/instrumentation/active_record_instrumentation_test.rb",
+    "test/new_relic/agent/instrumentation/metric_frame_test.rb",
+    "test/new_relic/agent/instrumentation/net_instrumentation_test.rb",
+    "test/new_relic/agent/instrumentation/queue_time_test.rb",
+    "test/new_relic/agent/instrumentation/task_instrumentation_test.rb",
     "test/new_relic/agent/memcache_instrumentation_test.rb",
+    "test/new_relic/agent/method_tracer/class_methods/add_method_tracer_test.rb",
+    "test/new_relic/agent/method_tracer/instance_methods/trace_execution_scoped_test.rb",
     "test/new_relic/agent/method_tracer_test.rb",
-    "test/new_relic/agent/method_tracer_trace_execution_scoped_test.rb",
-    "test/new_relic/agent/metric_data_test.rb",
-    "test/new_relic/agent/metric_frame_test.rb",
     "test/new_relic/agent/mock_scope_listener.rb",
-    "test/new_relic/agent/net_instrumentation_test.rb",
-    "test/new_relic/agent/queue_time_test.rb",
     "test/new_relic/agent/rpm_agent_test.rb",
     "test/new_relic/agent/stats_engine/metric_stats_test.rb",
     "test/new_relic/agent/stats_engine/samplers_test.rb",
     "test/new_relic/agent/stats_engine/stats_engine_test.rb",
-    "test/new_relic/agent/task_instrumentation_test.rb",
-    "test/new_relic/agent/testable_agent.rb",
     "test/new_relic/agent/transaction_sample_builder_test.rb",
-    "test/new_relic/agent/transaction_sample_subtest_test.rb",
-    "test/new_relic/agent/transaction_sample_test.rb",
     "test/new_relic/agent/transaction_sampler_test.rb",
     "test/new_relic/agent/worker_loop_test.rb",
+    "test/new_relic/collection_helper_test.rb",
+    "test/new_relic/command/deployments_test.rb",
     "test/new_relic/control_test.rb",
-    "test/new_relic/deployments_api_test.rb",
-    "test/new_relic/environment_test.rb",
+    "test/new_relic/local_environment_test.rb",
     "test/new_relic/metric_spec_test.rb",
     "test/new_relic/rack/episodes_test.rb",
-    "test/new_relic/shim_agent_test.rb",
     "test/new_relic/stats_test.rb",
+    "test/new_relic/transaction_sample_subtest_test.rb",
+    "test/new_relic/transaction_sample_test.rb",
     "test/new_relic/version_number_test.rb",
     "test/test_contexts.rb",
     "test/test_helper.rb",
@@ -196,6 +194,10 @@ http://github.com/newrelic/rpm/tree/master.
     "ui/views/newrelic/show_sample.rhtml",
     "ui/views/newrelic/show_source.rhtml",
     "ui/views/newrelic/threads.rhtml",
+    "vendor/gems/dependency_detection-0.0.1.build/LICENSE",
+    "vendor/gems/dependency_detection-0.0.1.build/README",
+    "vendor/gems/dependency_detection-0.0.1.build/lib/dependency_detection.rb",
+    "vendor/gems/dependency_detection-0.0.1.build/lib/dependency_detection/version.rb",
     "vendor/gems/metric_parser-0.1.0.pre1/LICENSE",
     "vendor/gems/metric_parser-0.1.0.pre1/README",
     "vendor/gems/metric_parser-0.1.0.pre1/lib/metric_parser.rb",

data/test/new_relic/agent/{agent_connect_test.rb → agent/connect_test.rb}

@@ -1,5 +1,5 @@
-require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper')) 
-class NewRelic::Agent::AgentConnectTest < Test::Unit::TestCase
+require File.expand_path(File.join(File.dirname(__FILE__),'..', '..', '..','test_helper')) 
+class NewRelic::Agent::Agent::ConnectTest < Test::Unit::TestCase
   require 'new_relic/agent/agent'
   include NewRelic::Agent::Agent::Connect
 

data/test/new_relic/agent/{agent_start_test.rb → agent/start_test.rb}

@@ -1,5 +1,5 @@
-require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper')) 
-class NewRelic::Agent::AgentStartTest < Test::Unit::TestCase
+require File.expand_path(File.join(File.dirname(__FILE__),'..','..','..','test_helper')) 
+class NewRelic::Agent::Agent::StartTest < Test::Unit::TestCase
   require 'new_relic/agent/agent'
   include NewRelic::Agent::Agent::Start
 
@@ -73,11 +73,18 @@ class NewRelic::Agent::AgentStartTest < Test::Unit::TestCase
     assert_equal :obfuscated, @record_sql, " should default to :obfuscated, was #{@record_sql}"
   end
 
+  def test_set_sql_recording_off
+    self.expects(:sampler_config).returns({'record_sql' => 'off'})
+    self.expects(:log_sql_transmission_warning?)
+    set_sql_recording!
+    assert_equal :off, @record_sql, "should be set to :off, was #{@record_sql}"
+  end
+  
   def test_set_sql_recording_none
     self.expects(:sampler_config).returns({'record_sql' => 'none'})
     self.expects(:log_sql_transmission_warning?)
     set_sql_recording!
-    assert_equal :none, @record_sql, "should be set to :none, was #{@record_sql}"
+    assert_equal :off, @record_sql, "should be set to :off, was #{@record_sql}"
   end
   
   def test_set_sql_recording_raw
@@ -87,6 +94,13 @@ class NewRelic::Agent::AgentStartTest < Test::Unit::TestCase
     assert_equal :raw, @record_sql, "should be set to :raw, was #{@record_sql}"
   end
 
+  def test_set_sql_recording_falsy
+    self.expects(:sampler_config).returns({'record_sql' => false})
+    self.expects(:log_sql_transmission_warning?)
+    set_sql_recording!
+    assert_equal :off, @record_sql, "should be set to :off, was #{@record_sql}"
+  end
+
   def test_log_sql_transmission_warning_negative
     log = mocked_log
     @record_sql = :obfuscated

data/test/new_relic/agent/{agent_start_worker_thread_test.rb → agent/start_worker_thread_test.rb}

@@ -1,5 +1,5 @@
-require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper')) 
-class NewRelic::Agent::AgentStartWorkerThread < Test::Unit::TestCase
+require File.expand_path(File.join(File.dirname(__FILE__),'..','..','..','test_helper')) 
+class NewRelic::Agent::Agent::StartWorkerThreadTest < Test::Unit::TestCase
   require 'new_relic/agent/agent'
   include NewRelic::Agent::Agent::StartWorkerThread