newrelic_rpm 3.6.3.104 → 3.6.3.105.beta

data/lib/new_relic/agent/agent.rb

@@ -17,6 +17,7 @@ require 'new_relic/agent/thread_profiler'
 require 'new_relic/agent/event_listener'
 require 'new_relic/agent/cross_app_monitor'
 require 'new_relic/agent/request_sampler'
+require 'new_relic/agent/sampler_collection'
 require 'new_relic/environment_report'
 
 module NewRelic
@@ -42,6 +43,7 @@ module NewRelic
         @transaction_rules     = NewRelic::Agent::RulesEngine.new
         @metric_rules          = NewRelic::Agent::RulesEngine.new
         @request_sampler       = NewRelic::Agent::RequestSampler.new(@events)
+        @harvest_samplers      = NewRelic::Agent::SamplerCollection.new(@events)
 
         @connect_state = :pending
         @connect_attempts = 0
@@ -79,6 +81,7 @@ module NewRelic
         attr_reader :thread_profiler
         # error collector is a simple collection of recorded errors
         attr_reader :error_collector
+        attr_reader :harvest_samplers
         # whether we should record raw, obfuscated, or no sql
         attr_reader :record_sql
         # a configuration for the Real User Monitoring system -
@@ -203,7 +206,6 @@ module NewRelic
           # Don't ever check to see if this is a spawner.  If we're in a forked process
           # I'm pretty sure we're not also forking new instances.
           start_worker_thread(options)
-          @stats_engine.start_sampler_thread
         end
 
         # True if we have initialized and completed 'start'
@@ -521,21 +523,7 @@ module NewRelic
         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
+          @harvest_samplers.add_sampler(subclass)
         end
 
         private
@@ -1054,6 +1042,7 @@ module NewRelic
           now = Time.now
           ::NewRelic::Agent.logger.debug "Sending data to New Relic Service"
 
+          @events.notify(:before_harvest)
           @service.session do # use http keep-alive
             harvest_and_send_errors
             harvest_and_send_slowest_sample

data/lib/new_relic/agent/sampler.rb

@@ -1,11 +1,10 @@
 # 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.
-
+#
 # A Sampler is used to capture meaningful metrics in a background thread
-# periodically.  They will either be invoked once a minute just before the
-# data is sent to the agent (default) or every 10 seconds, when #use_harvest_sampler?
-# returns false.
+# periodically.  They will be invoked about once a minute, each time the agent
+# sends data to New Relic's servers.
 #
 # Samplers can be added to New Relic by subclassing NewRelic::Agent::Sampler.
 # Instances are created when the agent is enabled and installed.  Subclasses
@@ -29,12 +28,6 @@ module NewRelic
         true
       end
 
-      # Override to use the periodic sampler instead of running the sampler on the
-      # minute during harvests.
-      def self.use_harvest_sampler?
-        true
-      end
-
       def self.sampler_classes
         @sampler_classes
       end
@@ -46,8 +39,6 @@ module NewRelic
       def poll
         raise "Implement in the subclass"
       end
-
-
     end
   end
 end

data/lib/new_relic/agent/sampler_collection.rb

@@ -0,0 +1,53 @@
+# 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.
+
+module NewRelic
+  module Agent
+    class SamplerCollection
+      include Enumerable
+
+      def initialize(event_listener)
+        @samplers = []
+        event_listener.subscribe(:before_harvest) { poll_samplers }
+      end
+
+      def each(&blk)
+        @samplers.each(&blk)
+      end
+
+      def sampler_class_registered?(sampler_class)
+        self.any? { |s| s.class == sampler_class }
+      end
+
+      def poll_samplers
+        @samplers.delete_if do |sampler|
+          begin
+            sampler.poll
+            false # it's okay.  don't delete it.
+          rescue => e
+            ::NewRelic::Agent.logger.warn("Removing #{sampler} from list", e)
+            true # remove the sampler
+          end
+        end
+      end
+
+      def add_sampler(sampler_class)
+        if sampler_class.supported_on_this_platform?
+          if !sampler_class_registered?(sampler_class)
+            @samplers << sampler_class.new
+            ::NewRelic::Agent.logger.debug("Registered #{sampler_class.name} for harvest time sampling.")
+          else
+            ::NewRelic::Agent.logger.warn("Ignoring addition of #{sampler_class.name} because it is already registered.")
+          end
+        else
+          ::NewRelic::Agent.logger.debug("#{sampler_class.name} not supported on this platform.")
+        end
+      rescue NewRelic::Agent::Sampler::Unsupported => e
+        ::NewRelic::Agent.logger.info("#{sampler_class.name} not available: #{e}")
+      rescue => e
+        ::NewRelic::Agent.logger.error("Error registering sampler:", e)
+      end
+    end
+  end
+end

data/lib/new_relic/agent/stats_engine.rb

@@ -21,11 +21,10 @@ module NewRelic
         Thread::current[:newrelic_scope_stack] = nil
         @stats_lock = Mutex.new
         @stats_hash = StatsHash.new
-        start_sampler_thread
       end
 
       # All access to the @stats_hash ivar should be funnelled through this
-      # method to ensure thread-safety. 
+      # method to ensure thread-safety.
       def with_stats_lock
         @stats_lock.synchronize { yield }
       end

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

@@ -118,7 +118,6 @@ module NewRelic
         # unsent metrics, clear out stats cache, and return the current
         # stats.
         def harvest_timeslice_data(old_stats_hash, rules_engine=RulesEngine.new)
-          poll harvest_samplers
           snapshot = reset_stats
           snapshot = apply_rules_to_metric_data(rules_engine, snapshot)
           snapshot.merge!(old_stats_hash)

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

@@ -4,100 +4,24 @@
 
 module NewRelic
 module Agent
+  # This module exists only for backwards-compatibility reasons.
+  # Sampler functionality is now controlled by the SamplerManager class.
+  # @deprecated
   class StatsEngine
     module Shim # :nodoc:
       def add_sampler(*args); end
       def add_harvest_sampler(*args); end
       def start_sampler_thread(*args); end
     end
-    
-    # Contains statistics engine extensions to support the concept of samplers
-    module Samplers
-
-      # By default a sampler polls on harvest time, once a minute.  However you can
-      # override #use_harvest_sampler? to return false and it will sample
-      # every POLL_PERIOD seconds on a background thread.
-      POLL_PERIOD = 20
-      
-      # starts the sampler thread which runs periodically, rather than
-      # at harvest time. This is deprecated, and should not actually
-      # be used - mo threads mo problems
-      #
-      # returns unless there are actually periodic samplers to run
-      def start_sampler_thread
-
-        return if @sampler_thread && @sampler_thread.alive?
-
-        # start up a thread that will periodically poll for metric samples
-        return if periodic_samplers.empty?
-
-        @sampler_thread = NewRelic::Agent::AgentThread.new('Sampler Tasks') do
-          loop do
-            now = Time.now
-            begin
-              sleep POLL_PERIOD
-              poll periodic_samplers
-            ensure
-              duration = (Time.now - now).to_f
-              NewRelic::Agent.record_metric('Supportability/Samplers', duration)
-            end
-          end
-        end
-      end
-
-
-      public
-
-      # Add an instance of Sampler to be invoked about every 10 seconds on a background
-      # thread.
-      def add_sampler(sampler)
-        add_sampler_to(periodic_samplers, sampler)
-        log_added_sampler('periodic', sampler)
-      end
-
-      # Add a sampler to be invoked just before each harvest.
-      def add_harvest_sampler(sampler)
-        add_sampler_to(harvest_samplers, sampler)
-        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
-        end
-      end
-
-      def log_added_sampler(type, sampler)
-        ::NewRelic::Agent.logger.debug "Adding #{type} sampler: #{sampler.id}"
+    module Samplers
+      def add_sampler(*args)
+        NewRelic::Agent.logger.warn("Ignoring request to add periodic sampler - add_sampler is deprecated")
       end
 
-      # Call poll on each of the samplers.  Remove
-      # the sampler if it raises.
-      def poll(samplers)
-        samplers.delete_if do |sampled_item|
-          begin
-            sampled_item.poll
-            false # it's okay.  don't delete it.
-          rescue => e
-            ::NewRelic::Agent.logger.warn "Removing #{sampled_item} from list", e
-            true # remove the sampler
-          end
-        end
+      def add_harvest_sampler
+        NewRelic::Agent.logger.warn("Ignoring request to add harvest sampler - add_harvest_sampler is deprecated")
       end
-
     end
   end
 end

data/lib/new_relic/local_environment.rb

@@ -66,7 +66,8 @@ module NewRelic
 
     # Sets the @mongrel instance variable if we can find a Mongrel::HttpServer
     def mongrel
-      return @mongrel if @mongrel
+      return @mongrel if @looked_for_mongrel
+      @looked_for_mongrel = true
       if defined?(::Mongrel) && defined?(::Mongrel::HttpServer) && working_jruby?
         @mongrel = find_class_in_object_space(::Mongrel::HttpServer)
       end
@@ -129,7 +130,6 @@ module NewRelic
       @discovered_dispatcher = :mongrel
 
       # Get the port from the server if it's started
-
       if mongrel && mongrel.respond_to?(:port)
         @dispatcher_instance_id = mongrel.port.to_s
       end
@@ -143,6 +143,9 @@ module NewRelic
 
       # Still can't find the port.  Let's look at ARGV to fall back
       @dispatcher_instance_id = default_port if @dispatcher_instance_id.nil?
+
+      # Might not have server yet, so allow one more check later on first request
+      @looked_for_mongrel = false
     end
 
     def check_for_unicorn

data/test/new_relic/agent/agent_test.rb

@@ -13,6 +13,7 @@ module NewRelic
         super
         @agent = NewRelic::Agent::Agent.new
         @agent.service = default_service
+        @agent.stubs(:start_worker_thread)
       end
 
       #
@@ -65,6 +66,13 @@ module NewRelic
         end
       end
 
+      def test_transmit_data_should_emit_before_harvest_event
+        got_it = false
+        @agent.events.subscribe(:before_harvest) { got_it = true }
+        @agent.instance_eval { transmit_data }
+        assert(got_it)
+      end
+
       def test_transmit_data_should_transmit
         @agent.service.expects(:metric_data).at_least_once
         @agent.instance_eval { transmit_data }

data/test/new_relic/agent/method_tracer_test.rb

@@ -70,6 +70,9 @@ class NewRelic::Agent::MethodTracerTest < Test::Unit::TestCase
     @scope_listener = NewRelic::Agent::MockScopeListener.new
     @old_sampler = NewRelic::Agent.instance.transaction_sampler
     NewRelic::Agent.instance.stubs(:transaction_sampler).returns(@scope_listener)
+
+    freeze_time
+
     super
   end
 
@@ -91,14 +94,13 @@ class NewRelic::Agent::MethodTracerTest < Test::Unit::TestCase
 
   def test_trace_execution_scoped_records_metric_data
     metric = "hello"
-    t1 = Time.now
+    freeze_time
     self.class.trace_execution_scoped(metric) do
-      sleep 0.05
+      advance_time 0.05
     end
-    elapsed = Time.now - t1
 
     stats = @stats_engine.get_stats(metric)
-    check_time stats.total_call_time, elapsed
+    check_time 0.05, stats.total_call_time
     assert_equal 1, stats.call_count
   end
 
@@ -111,14 +113,12 @@ class NewRelic::Agent::MethodTracerTest < Test::Unit::TestCase
 
   def test_basic__original_api
     metric = "hello"
-    t1 = Time.now
     self.class.trace_method_execution(metric, true, true, true) do
-      sleep 0.05
+      advance_time(0.05)
     end
-    elapsed = Time.now - t1
 
     stats = @stats_engine.get_stats(metric)
-    check_time stats.total_call_time, elapsed
+    check_time 0.05, stats.total_call_time
     assert_equal 1, stats.call_count
     assert_equal metric,  @scope_listener.scopes.last
   end
@@ -128,9 +128,7 @@ class NewRelic::Agent::MethodTracerTest < Test::Unit::TestCase
     @metric_name = METRIC
     self.class.add_method_tracer :method_to_be_traced, METRIC
 
-    t1 = Time.now
     method_to_be_traced 1,2,3,true,METRIC
-    elapsed = Time.now - t1
 
     begin
       self.class.remove_method_tracer :method_to_be_traced, METRIC
@@ -140,7 +138,7 @@ class NewRelic::Agent::MethodTracerTest < Test::Unit::TestCase
 
 
     stats = @stats_engine.get_stats(METRIC)
-    check_time stats.total_call_time, elapsed
+    check_time 0.05, stats.total_call_time
     assert_equal 1, stats.call_count
     assert_equal METRIC, @scope_listener.scopes.last
   end
@@ -216,9 +214,7 @@ class NewRelic::Agent::MethodTracerTest < Test::Unit::TestCase
     self.class.add_method_tracer :method_to_be_traced, METRIC
     self.class.add_method_tracer :method_to_be_traced, METRIC
 
-    t1 = Time.now
     method_to_be_traced 1,2,3,true,METRIC
-    elapsed = Time.now - t1
 
     begin
       self.class.remove_method_tracer :method_to_be_traced, METRIC
@@ -227,7 +223,7 @@ class NewRelic::Agent::MethodTracerTest < Test::Unit::TestCase
     end
 
     stats = @stats_engine.get_stats(METRIC)
-    check_time stats.total_call_time, elapsed
+    check_time 0.05, stats.total_call_time
     assert_equal 1, stats.call_count
     assert_equal METRIC, @scope_listener.scopes.last
     assert(METRIC != @scope_listener.scopes[-2],
@@ -240,9 +236,7 @@ class NewRelic::Agent::MethodTracerTest < Test::Unit::TestCase
     expected_metric = "1.2"
     self.class.add_method_tracer :method_to_be_traced, metric_code
 
-    t1 = Time.now
     method_to_be_traced 1,2,3,true,expected_metric
-    elapsed = Time.now - t1
 
     begin
       self.class.remove_method_tracer :method_to_be_traced, metric_code
@@ -251,7 +245,7 @@ class NewRelic::Agent::MethodTracerTest < Test::Unit::TestCase
     end
 
     stats = @stats_engine.get_stats(expected_metric)
-    check_time stats.total_call_time, elapsed
+    check_time 0.05, stats.total_call_time
     assert_equal 1, stats.call_count
     assert_equal expected_metric, @scope_listener.scopes.last
   end
@@ -259,15 +253,12 @@ class NewRelic::Agent::MethodTracerTest < Test::Unit::TestCase
   def test_trace_method_with_block
     self.class.add_method_tracer :method_with_block, METRIC
 
-    t1 = Time.now
-    method_with_block(1,2,3,true,METRIC) do |scope|
-      assert_equal METRIC, scope
-      sleep 0.1 # pad the test a bit to increase the margin of error
+    method_with_block(1,2,3,true,METRIC) do
+      advance_time 0.1
     end
-    elapsed = Time.now - t1
 
     stats = @stats_engine.get_stats(METRIC)
-    check_time stats.total_call_time, elapsed
+    check_time 0.15, stats.total_call_time
     assert_equal 1, stats.call_count
     assert_equal METRIC, @scope_listener.scopes.last
   end
@@ -282,9 +273,7 @@ class NewRelic::Agent::MethodTracerTest < Test::Unit::TestCase
     self.class.add_method_tracer :method_to_be_traced, METRIC
     self.class.remove_method_tracer :method_to_be_traced, METRIC
 
-    t1 = Time.now
     method_to_be_traced 1,2,3,false,METRIC
-    elapsed = Time.now - t1
 
     stats = @stats_engine.get_stats(METRIC)
     assert stats.call_count == 0
@@ -307,7 +296,7 @@ class NewRelic::Agent::MethodTracerTest < Test::Unit::TestCase
   def test_multiple_metrics__scoped
     metrics = %w[first second third]
     self.class.trace_execution_scoped metrics do
-      sleep 0.05
+      advance_time 0.05
     end
     elapsed = @stats_engine.get_stats('first').total_call_time
     metrics.map{|name| @stats_engine.get_stats name}.each do | m |
@@ -320,7 +309,7 @@ class NewRelic::Agent::MethodTracerTest < Test::Unit::TestCase
   def test_multiple_metrics__unscoped
     metrics = %w[first second third]
     self.class.trace_execution_unscoped metrics do
-      sleep 0.05
+      advance_time 0.05
     end
     elapsed = @stats_engine.get_stats('first').total_call_time
     metrics.map{|name| @stats_engine.get_stats name}.each do | m |
@@ -370,23 +359,24 @@ class NewRelic::Agent::MethodTracerTest < Test::Unit::TestCase
   end
 
   def check_time(t1, t2)
-    assert_in_delta t2, t1, 0.05
+    assert_in_delta t2, t1, 0.001
   end
 
   # =======================================================
   # test methods to be traced
   def method_to_be_traced(x, y, z, is_traced, expected_metric)
-    sleep 0.01
+    advance_time 0.05
     assert x == 1
     assert y == 2
     assert z == 3
   end
 
   def method_with_block(x, y, z, is_traced, expected_metric, &block)
-    sleep 0.01
+    advance_time 0.05
     assert x == 1
     assert y == 2
     assert z == 3
+    yield
   end
 
   def method_c1

data/test/new_relic/agent/rpm_agent_test.rb

@@ -9,6 +9,7 @@ class NewRelic::Agent::RpmAgentTest < Test::Unit::TestCase # ActiveSupport::Test
   def setup
     NewRelic::Agent.manual_start
     @agent = NewRelic::Agent.instance
+    @agent.stubs(:start_worker_thread)
   end
 
   def teardown

data/test/new_relic/agent/sampler_collection_test.rb

@@ -0,0 +1,73 @@
+# 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 File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper'))
+
+class SamplerCollectionTest < Test::Unit::TestCase
+
+  class DummySampler
+    attr_reader :id
+    def self.supported_on_this_platform?; true; end
+    def poll; end
+  end
+  class DummySampler2 < DummySampler; end
+
+  def setup
+    @events  = NewRelic::Agent::EventListener.new
+    @collection = NewRelic::Agent::SamplerCollection.new(@events)
+  end
+
+  def test_add_sampler_adds_a_sampler_of_requested_class
+    @collection.add_sampler(DummySampler)
+    assert_equal(1, @collection.to_a.size)
+    assert_equal(DummySampler, @collection.to_a.first.class)
+  end
+
+  def test_add_sampler_does_add_non_dups
+    @collection.add_sampler(DummySampler)
+    @collection.add_sampler(DummySampler2)
+    assert_equal(2, @collection.to_a.size)
+    assert_equal([DummySampler, DummySampler2], @collection.map { |s| s.class })
+  end
+
+  def test_add_sampler_does_not_add_dups
+    @collection.add_sampler(DummySampler)
+    @collection.add_sampler(DummySampler)
+    assert_equal(1, @collection.to_a.size)
+  end
+
+  def test_add_sampler_omits_unsupported_samplers
+    DummySampler.stubs(:supported_on_this_platform?).returns(false)
+    @collection.add_sampler(DummySampler)
+    assert_equal(0, @collection.to_a.size)
+  end
+
+  def test_add_sampler_swallows_exceptions_during_sampler_creation
+    DummySampler.stubs(:new).raises(StandardError)
+    assert_nothing_raised { @collection.add_sampler(DummySampler) }
+    assert_equal(0, @collection.to_a.size)
+  end
+
+  def test_poll_samplers_polls_samplers
+    @collection.add_sampler(DummySampler)
+    @collection.add_sampler(DummySampler2)
+    @collection.each { |s| s.expects(:poll) }
+    @collection.poll_samplers
+  end
+
+  def test_poll_samplers_removes_busted_samplers_and_keeps_happy_ones
+    @collection.add_sampler(DummySampler)
+    @collection.add_sampler(DummySampler2)
+    good_sampler, bad_sampler = @collection.to_a
+    bad_sampler.stubs(:poll).raises('boo')
+    assert_nothing_raised { @collection.poll_samplers }
+    assert_equal(1, @collection.to_a.size)
+    assert_equal([good_sampler], @collection.to_a)
+  end
+
+  def test_polls_samplers_on_before_harvest_event
+    @collection.expects(:poll_samplers)
+    @events.notify(:before_harvest)
+  end
+end

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

@@ -20,24 +20,6 @@ class NewRelic::Agent::StatsEngine::SamplersTest < Test::Unit::TestCase
     NewRelic::Agent.instance.stubs(:stats_engine).returns(@stats_engine)
   end
 
-  def test_can_add_harvest_sampler
-    samplers = OurSamplers.new
-    sampler = OurSampler.new
-
-    samplers.add_harvest_sampler(sampler)
-
-    assert_equal [sampler], samplers.harvest_samplers
-  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
     timeinfo0 = mock
     timeinfo0.stubs(:utime).returns(10.0)
@@ -108,14 +90,6 @@ class NewRelic::Agent::StatsEngine::SamplersTest < Test::Unit::TestCase
     end
   end
 
-  def test_load_samplers
-    @stats_engine.expects(:add_harvest_sampler).at_least_once unless defined? JRuby
-    @stats_engine.expects(:add_sampler).never
-    NewRelic::Control.instance.load_samplers
-    sampler_count = 4
-    assert_equal sampler_count, NewRelic::Agent::Sampler.sampler_classes.size, NewRelic::Agent::Sampler.sampler_classes.inspect
-  end
-
   def test_memory__is_supported
     NewRelic::Agent::Samplers::MemorySampler.stubs(:platform).returns 'windows'
     assert !NewRelic::Agent::Samplers::MemorySampler.supported_on_this_platform? || defined? JRuby

data/test/new_relic/agent_test.rb

@@ -14,6 +14,7 @@ module NewRelic
 
     def setup
       NewRelic::Agent.reset_config
+      NewRelic::Agent.instance.stubs(:start_worker_thread)
     end
 
     def teardown

data/test/new_relic/control_test.rb

@@ -183,7 +183,7 @@ class NewRelic::ControlTest < Test::Unit::TestCase
     NewRelic::Agent.shutdown
     with_config(:disable_samplers => false, :agent_enabled => true) do
       NewRelic::Control.instance.init_plugin
-      assert NewRelic::Agent.instance.stats_engine.send(:harvest_samplers).any?
+      assert NewRelic::Agent.instance.harvest_samplers.any?
     end
   end
 
@@ -191,7 +191,7 @@ class NewRelic::ControlTest < Test::Unit::TestCase
     NewRelic::Agent.shutdown
     with_config(:disable_samplers => true, :agent_enabled => true) do
       NewRelic::Control.instance.init_plugin
-      assert NewRelic::Agent.instance.stats_engine.send(:harvest_samplers).empty?
+      assert !NewRelic::Agent.instance.harvest_samplers.any?
     end
   end
 end

data/test/new_relic/local_environment_test.rb

@@ -51,6 +51,43 @@ class NewRelic::LocalEnvironmentTest < Test::Unit::TestCase
     Object.send(:remove_const, :PhusionPassenger)
   end
 
+  # LocalEnvironment won't talk to ObjectSpace on JRuby, and these tests are
+  # around that interaction, so we don't run them on JRuby.
+  unless defined?(JRuby)
+    def test_mongrel_only_checks_once
+      define_mongrel
+
+      # One call from LocalEnvironment's initialize, second from first #mongrel call.
+      # All the rest shouldn't call into ObjectSpace
+      ObjectSpace.expects(:each_object).with(::Mongrel::HttpServer).twice
+
+      e = NewRelic::LocalEnvironment.new
+      5.times { e.mongrel }
+      assert_nil e.mongrel
+    ensure
+      Object.send(:remove_const, :Mongrel)
+    end
+
+    def test_check_for_mongrel_allows_one_more_check
+      define_mongrel
+
+      ObjectSpace.expects(:each_object).with(::Mongrel::HttpServer).at_least(2)
+
+      e = NewRelic::LocalEnvironment.new
+      e.send(:check_for_mongrel)
+    ensure
+      Object.send(:remove_const, :Mongrel)
+    end
+  end
+
+  def define_mongrel
+    class << self
+      module ::Mongrel
+        class HttpServer
+        end
+      end
+    end
+  end
 
   def test_default_port
     e = NewRelic::LocalEnvironment.new

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 3.6.3.104
-  prerelease: 
+  version: 3.6.3.105.beta
+  prerelease: 10
 platform: ruby
 authors:
 - Jason Clark
@@ -41,7 +41,7 @@ cert_chain:
   cHUySWFQWE92bTNUOEc0TzZxWnZobkxoL1VpZW4rK0RqOGVGQmVjVFBvTThw
   VmpLM3BoNQpuL0V3dVpDY0U2Z2h0Q0NNCi0tLS0tRU5EIENFUlRJRklDQVRF
   LS0tLS0K
-date: 2013-05-29 00:00:00.000000000 Z
+date: 2013-06-03 00:00:00.000000000 Z
 dependencies: []
 description: ! 'New Relic is a performance management system, developed by New Relic,
 
@@ -161,6 +161,7 @@ files:
 - lib/new_relic/agent/request_sampler.rb
 - lib/new_relic/agent/rules_engine.rb
 - lib/new_relic/agent/sampler.rb
+- lib/new_relic/agent/sampler_collection.rb
 - lib/new_relic/agent/samplers/cpu_sampler.rb
 - lib/new_relic/agent/samplers/delayed_job_sampler.rb
 - lib/new_relic/agent/samplers/memory_sampler.rb
@@ -385,6 +386,7 @@ files:
 - test/new_relic/agent/request_sampler_test.rb
 - test/new_relic/agent/rpm_agent_test.rb
 - test/new_relic/agent/rules_engine_test.rb
+- test/new_relic/agent/sampler_collection_test.rb
 - test/new_relic/agent/sampler_test.rb
 - test/new_relic/agent/shim_agent_test.rb
 - test/new_relic/agent/sql_sampler_test.rb