newrelic_rpm 3.6.1.86.beta → 3.6.1.87

data/lib/new_relic/agent/agent.rb

@@ -503,6 +503,24 @@ module NewRelic
           @launch_time = Time.now
         end
 
+        def add_harvest_sampler(subclass)
+          begin
+            ::NewRelic::Agent.logger.debug "#{subclass.name} not supported on this platform." and return unless subclass.supported_on_this_platform?
+            sampler = subclass.new
+            if subclass.use_harvest_sampler?
+              stats_engine.add_harvest_sampler sampler
+              ::NewRelic::Agent.logger.debug "Registered #{subclass.name} for harvest time sampling"
+            else
+              stats_engine.add_sampler sampler
+              ::NewRelic::Agent.logger.debug "Registered #{subclass.name} for periodic sampling"
+            end
+          rescue NewRelic::Agent::Sampler::Unsupported => e
+            ::NewRelic::Agent.logger.info "#{subclass} sampler not available: #{e}"
+          rescue => e
+            ::NewRelic::Agent.logger.error "Error registering sampler:", e
+          end
+        end
+
         private
 
         # All of this module used to be contained in the

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

@@ -34,21 +34,14 @@ DependencyDetection.defer do
 
   executes do
     Delayed::Job.instance_eval do
-      if self.respond_to?('after_fork')
-        if method_defined?(:after_fork)
-          def after_fork_with_newrelic
-            NewRelic::Agent.after_fork(:force_reconnect => true)
-            after_fork_without_newrelic
-          end
+      # alias_method is for instance, not class methods. But we still want to
+      # call any existing class method we're redefining, so do it the hard way.
+      @original_after_fork = method(:after_fork) if respond_to?(:after_fork)
 
-          alias_method :after_fork_without_newrelic, :after_fork
-          alias_method :after_fork, :after_fork_with_newrelic
-        else
-          def after_fork
-            NewRelic::Agent.after_fork(:force_reconnect => true)
-            super
-          end
-        end
+      def after_fork
+        NewRelic::Agent.after_fork(:force_reconnect => true)
+        @original_after_fork.call() if @original_after_fork
+        super
       end
     end
   end

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

@@ -45,17 +45,6 @@ module Agent
         end
       end
 
-      private
-
-      def add_sampler_to(sampler_array, sampler)
-        raise "Sampler #{sampler.inspect} is already registered.  Don't call add_sampler directly anymore." if sampler_array.include?(sampler)
-        sampler_array << sampler
-        sampler.stats_engine = self
-      end
-
-      def log_added_sampler(type, sampler)
-        ::NewRelic::Agent.logger.debug "Adding #{type} sampler: #{sampler.id}"
-      end
 
       public
 
@@ -72,8 +61,30 @@ module Agent
         log_added_sampler('harvest-time', sampler)
       end
 
+      def harvest_samplers
+        @harvest_samplers ||= []
+      end
+
+      def periodic_samplers
+        @periodic_samplers ||= []
+      end
+
+
       private
 
+      def add_sampler_to(sampler_array, sampler)
+        if sampler_array.any? { |s| s.class == sampler.class }
+          NewRelic::Agent.logger.warn "Ignoring addition of #{sampler.inspect} because it is already registered."
+        else
+          sampler_array << sampler
+          sampler.stats_engine = self
+        end
+      end
+
+      def log_added_sampler(type, sampler)
+        ::NewRelic::Agent.logger.debug "Adding #{type} sampler: #{sampler.id}"
+      end
+
       # Call poll on each of the samplers.  Remove
       # the sampler if it raises.
       def poll(samplers)
@@ -88,12 +99,6 @@ module Agent
         end
       end
 
-      def harvest_samplers
-        @harvest_samplers ||= []
-      end
-      def periodic_samplers
-        @periodic_samplers ||= []
-      end
     end
   end
 end

data/lib/new_relic/control/instrumentation.rb

@@ -56,23 +56,8 @@ module NewRelic
       # minute. This is dynamically recognized by any class that
       # subclasses NewRelic::Agent::Sampler
       def load_samplers
-        agent = NewRelic::Agent.instance
         NewRelic::Agent::Sampler.sampler_classes.each do | subclass |
-          begin
-            ::NewRelic::Agent.logger.debug "#{subclass.name} not supported on this platform." and next if not subclass.supported_on_this_platform?
-            sampler = subclass.new
-            if subclass.use_harvest_sampler?
-              agent.stats_engine.add_harvest_sampler sampler
-              ::NewRelic::Agent.logger.debug "Registered #{subclass.name} for harvest time sampling"
-            else
-              agent.stats_engine.add_sampler sampler
-              ::NewRelic::Agent.logger.debug "Registered #{subclass.name} for periodic sampling"
-            end
-          rescue NewRelic::Agent::Sampler::Unsupported => e
-            ::NewRelic::Agent.logger.info "#{subclass} sampler not available: #{e}"
-          rescue => e
-            ::NewRelic::Agent.logger.error "Error registering sampler:", e
-          end
+          NewRelic::Agent.instance.add_harvest_sampler(subclass)
         end
       end
 

data/lib/new_relic/delayed_job_injection.rb

@@ -40,6 +40,7 @@ DependencyDetection.defer do
         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
@@ -47,9 +48,3 @@ DependencyDetection.defer do
     end
   end
 end
-
-# If Rails is defined, this gets called in an after_initialize hook
-# see NewRelic::Control::Frameworks::Rails#init_config
-unless defined?(Rails)
-  DependencyDetection.detect!
-end

data/test/new_relic/agent/stats_engine/samplers_test.rb

@@ -7,34 +7,36 @@ require 'new_relic/agent/samplers/cpu_sampler'
 
 class NewRelic::Agent::StatsEngine::SamplersTest < Test::Unit::TestCase
 
-  class TestObject
+  class OurSamplers
     include NewRelic::Agent::StatsEngine::Samplers
   end
 
+  class OurSampler
+    attr_accessor :id, :stats_engine
+  end
+
   def setup
     @stats_engine = NewRelic::Agent::StatsEngine.new
     NewRelic::Agent.instance.stubs(:stats_engine).returns(@stats_engine)
   end
 
-  def test_add_sampler_to_positive
-    object = TestObject.new
-    sampler = mock('sampler')
-    sampler_array = mock('sampler_array')
-    sampler_array.expects(:include?).with(sampler).returns(false)
-    sampler_array.expects(:<<).with(sampler)
-    sampler.expects(:stats_engine=).with(object)
+  def test_can_add_harvest_sampler
+    samplers = OurSamplers.new
+    sampler = OurSampler.new
+
+    samplers.add_harvest_sampler(sampler)
 
-    object.send(:add_sampler_to, sampler_array, sampler)
+    assert_equal [sampler], samplers.harvest_samplers
+    assert_equal samplers, sampler.stats_engine
   end
 
-  def test_add_sampler_to_negative
-    object = TestObject.new
-    sampler = mock('sampler')
-    sampler_array = mock('sampler_array')
-    sampler_array.expects(:include?).with(sampler).returns(true)
-    assert_raise(RuntimeError) do
-      object.send(:add_sampler_to, sampler_array, sampler)
-    end
+  def test_cannot_add_harvest_sampler_twice
+    samplers = OurSamplers.new
+    samplers.add_harvest_sampler(OurSampler.new)
+    first_list = samplers.harvest_samplers.dup
+
+    samplers.add_harvest_sampler(OurSampler.new)
+    assert_equal first_list, samplers.harvest_samplers
   end
 
   def test_cpu_sampler_records_user_and_system_time

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 3.6.1.86.beta
-  prerelease: 9
+  version: 3.6.1.87
+  prerelease: 
 platform: ruby
 authors:
 - Jason Clark
@@ -41,7 +41,7 @@ cert_chain:
   cHUySWFQWE92bTNUOEc0TzZxWnZobkxoL1VpZW4rK0RqOGVGQmVjVFBvTThw
   VmpLM3BoNQpuL0V3dVpDY0U2Z2h0Q0NNCi0tLS0tRU5EIENFUlRJRklDQVRF
   LS0tLS0K
-date: 2013-04-18 00:00:00.000000000 Z
+date: 2013-04-24 00:00:00.000000000 Z
 dependencies: []
 description: ! 'New Relic is a performance management system, developed by New Relic,