newrelic_rpm 2.13.6.beta1 → 2.13.6.beta2

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

@@ -37,13 +37,25 @@
 #     non-first metric in trace_execution_scoped() (docs say only first counts
 #     towards scope) so they don't show up ine normal call graph/trace.
 
-DependencyDetector.defer do
+DependencyDetection.defer do
   depends_on do
     defined?(::DataMapper)
   end
+
+  depends_on do
+    defined?(DataMapper::Model)
+  end
+
+  depends_on do
+    defined?(DataMapper::Resource)
+  end
+
+  depends_on do
+    defined?(DataMapper::Collection)
+  end
   
-  executes_on(:'DataMapper::Model') do
-    class_eval do
+  executes do
+    DataMapper::Model.class_eval do
       add_method_tracer :get,      'ActiveRecord/#{self.name}/get'
       add_method_tracer :first,    'ActiveRecord/#{self.name}/first'
       add_method_tracer :last,     'ActiveRecord/#{self.name}/last'
@@ -64,9 +76,9 @@ DependencyDetector.defer do
 
     end
   end
-  
-  executes_on(:'DataMapper::Resource') do
-    class_eval do
+
+  executes do
+    DataMapper::Resource.class_eval do
       add_method_tracer :update,   'ActiveRecord/#{self.class.name[/[^:]*$/]}/update'
       add_method_tracer :update!,  'ActiveRecord/#{self.class.name[/[^:]*$/]}/update'
       add_method_tracer :save,     'ActiveRecord/#{self.class.name[/[^:]*$/]}/save'
@@ -77,8 +89,8 @@ DependencyDetector.defer do
     end
   end
 
-  executes_on(:'DataMapper::Collection') do
-    class_eval do
+  executes do
+    DataMapper::Collection.class_eval do
       # DM's Collection instance methods
       add_method_tracer :get,       'ActiveRecord/#{self.name}/get'
       add_method_tracer :first,     'ActiveRecord/#{self.name}/first'
@@ -105,10 +117,16 @@ DependencyDetector.defer do
 end
 
 DependencyDetection.defer do
-  executes_on(:'DataMapper::Adapters::DataObjectsAdapter') do
+  
+  depends_on do
+    defined?(DataMapper) && defined?(DataMapper::Adapters) && defined?(DataMapper::Adapters::DataObjectsAdapter)
+  end
+  
+  executes do
+    
     # Catch the two entry points into DM::Repository::Adapter that bypass CRUD
     # (for when SQL is run directly).
-    class_eval do
+    DataMapper::Adapters::DataObjectsAdapter.class_eval do
 
       add_method_tracer :select,  'ActiveRecord/#{self.class.name[/[^:]*$/]}/select'
       add_method_tracer :execute, 'ActiveRecord/#{self.class.name[/[^:]*$/]}/execute'
@@ -119,26 +137,33 @@ end
 
 DependencyDetection.defer do
 
+  depends_on do
+    defined?(DataMapper) && defined?(DataMapper::Validations) && defined?(DataMapper::Validations::ClassMethods)
+  end
+  
   # DM::Validations overrides Model#create, but currently in a way that makes it
   # impossible to instrument from one place.  I've got a patch pending inclusion
   # to make it instrumentable by putting the create method inside ClassMethods.
   # This will pick it up if/when that patch is accepted.
-  executes_on(:'DataMapper::Validations::ClassMethods') do
-    class_eval do
-
+  executes do
+    DataMapper::Validations::ClassMethods.class_eval do
       next unless method_defined? :create
       add_method_tracer :create,   'ActiveRecord/#{self.name}/create'
-
     end
   end
 end
 
 DependencyDetection.defer do
-# NOTE: DM::Transaction basically calls commit() twice, so as-is it will show
-# up in traces twice -- second time subordinate to the first's scope.  Works
-# well enough.
-  executes_on(:'DataMapper::Transaction') do
-    module_eval do
+
+  depends_on do
+    defined?(DataMapper) && defined?(DataMapper::Transaction)
+  end
+  
+  # NOTE: DM::Transaction basically calls commit() twice, so as-is it will show
+  # up in traces twice -- second time subordinate to the first's scope.  Works
+  # well enough.
+  executes do
+    DataMapper::Transaction.module_eval do
       add_method_tracer :commit, 'ActiveRecord/#{self.class.name[/[^:]*$/]}/commit'
     end
   end
@@ -194,8 +219,13 @@ module NewRelic
 end # NewRelic
 
 DependencyDetection.defer do
-  executes_on(:'DataObjects::Connection') do
-    class_eval do
+  
+  depends_on do
+    defined?(DataObjects) && defined?(DataObjects::Connection)
+  end
+  
+  executes do
+    DataObjects::Connection.class_eval do
       include ::NewRelic::Agent::Instrumentation::DataMapperInstrumentation
     end
   end

data/lib/new_relic/agent/instrumentation/merb/controller.rb

@@ -1,26 +1,36 @@
 require 'set'
-require 'merb-core/controller/merb_controller'
 
-Merb::Controller.class_eval do
-  include NewRelic::Agent::Instrumentation::ControllerInstrumentation
+DependencyDetection.defer do
 
-  class_inheritable_accessor :do_not_trace
-  class_inheritable_accessor :ignore_apdex
-
-  def self.newrelic_write_attr(attr_name, value) # :nodoc:
-    self.send "#{attr_name}=", attr_name, value
+  depends_on do
+    defined?(Merb) && defined?(Merb::Controller)
   end
+  
+  executes do
+    require 'merb-core/controller/merb_controller'
 
-  def self.newrelic_read_attr(attr_name) # :nodoc:
-    self.send attr_name
-  end
+    Merb::Controller.class_eval do
+      include NewRelic::Agent::Instrumentation::ControllerInstrumentation
+
+      class_inheritable_accessor :do_not_trace
+      class_inheritable_accessor :ignore_apdex
+
+      def self.newrelic_write_attr(attr_name, value) # :nodoc:
+        self.send "#{attr_name}=", attr_name, value
+      end
+
+      def self.newrelic_read_attr(attr_name) # :nodoc:
+        self.send attr_name
+      end
 
-  protected
-  # determine the path that is used in the metric name for
-  # the called controller action
-  def newrelic_metric_path
-    "#{controller_name}/#{action_name}"
+      protected
+      # determine the path that is used in the metric name for
+      # the called controller action
+      def newrelic_metric_path
+        "#{controller_name}/#{action_name}"
+      end
+      alias_method :perform_action_without_newrelic_trace, :_dispatch
+      alias_method :_dispatch, :perform_action_with_newrelic_trace
+    end
   end
-  alias_method :perform_action_without_newrelic_trace, :_dispatch
-  alias_method :_dispatch, :perform_action_with_newrelic_trace
 end

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

@@ -1,9 +1,23 @@
-# Hook in the notification to merb
-error_notifier = Proc.new {
-  if request.exceptions #check that there's actually an exception
-    # Note, this assumes we have already captured the other information such as uri and params in the MetricFrame.
-    NewRelic::Agent::Instrumentation::MetricFrame.notice_error(request.exceptions.first)
+DependencyDetection.defer do
+  depends_on do
+    defined?(Merb) && defined?(Merb::Dispatcher) && defined?(Merb::Dispatcher::DefaultException)
   end
-}
-Merb::Dispatcher::DefaultException.before error_notifier
-Exceptions.before error_notifier
+
+  depends_on do
+    Merb::Dispatcher::DefaultException.respond_to?(:before)
+  end
+
+  executes do
+
+    # Hook in the notification to merb
+    error_notifier = Proc.new {
+      if request.exceptions #check that there's actually an exception
+        # Note, this assumes we have already captured the other information such as uri and params in the MetricFrame.
+        NewRelic::Agent::Instrumentation::MetricFrame.notice_error(request.exceptions.first)
+      end
+    }
+    Merb::Dispatcher::DefaultException.before error_notifier
+    Exceptions.before error_notifier
+    
+  end
+end

data/lib/new_relic/version.rb

@@ -4,7 +4,7 @@ module NewRelic
     MAJOR = 2
     MINOR = 13
     TINY  = 6
-    BUILD = 'beta1' #'0' # Set to nil for a release, 'beta1', 'alpha', etc for prerelease builds
+    BUILD = 'beta2' #'0' # Set to nil for a release, 'beta1', 'alpha', etc for prerelease builds
     STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
   end
 

data/newrelic_rpm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{newrelic_rpm}
-  s.version = "2.13.6.beta1"
+  s.version = "2.13.6.beta2"
 
   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-21}
+  s.date = %q{2011-03-22}
   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
@@ -135,6 +135,7 @@ http://github.com/newrelic/rpm/tree/master.
     "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/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",

data/test/new_relic/agent/instrumentation/instrumentation_test.rb

@@ -0,0 +1,11 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'test_helper'))
+class NewRelic::Agent::Instrumentation::InstrumentationTest < Test::Unit::TestCase
+  def test_load_all_instrumentation_files
+    # just checking for syntax errors and unguarded code
+    Dir.glob(NEWRELIC_PLUGIN_DIR + '/lib/new_relic/agent/instrumentation/**/*.rb') do |f|
+      require f
+    end
+    require 'new_relic/delayed_job_injection'
+  end
+end
+

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: newrelic_rpm
 version: !ruby/object:Gem::Version 
-  hash: 62196225
+  hash: 62196231
   prerelease: 7
   segments: 
   - 2
   - 13
   - 6
   - beta
-  - 1
-  version: 2.13.6.beta1
+  - 2
+  version: 2.13.6.beta2
 platform: ruby
 authors: 
 - Bill Kayser
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-21 00:00:00 -07:00
+date: 2011-03-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -193,6 +193,7 @@ files:
 - 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/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