newrelic_rpm 3.1.0 → 3.1.1.beta1

data/lib/new_relic/transaction_sample/segment.rb

@@ -15,11 +15,13 @@ module NewRelic
         @metric_name = metric_name || '<unknown>'
         @segment_id = segment_id || object_id
       end
-
+      
+      # sets the final timestamp on a segment to indicate the exit
+      # point of the segment
       def end_trace(timestamp)
         @exit_timestamp = timestamp
       end
-
+      
       def add_called_segment(s)
         @called_segments ||= []
         @called_segments << s
@@ -100,7 +102,8 @@ module NewRelic
         called_segments.each { | seg | count  += seg.count_segments }
         count
       end
-      # Walk through the tree and truncate the segments
+      # Walk through the tree and truncate the segments in a
+      # depth-first manner
       def truncate(max)
         return 1 unless @called_segments
         total, self.called_segments = truncate_each_child(max - 1)
@@ -148,6 +151,21 @@ module NewRelic
         end
       end
 
+      # call the provided block for this segment and each
+      # of the called segments while keeping track of nested segments
+      def each_segment_with_nest_tracking(&block)
+        summary = block.call self
+        summary.current_nest_count += 1 if summary
+
+        if @called_segments
+          @called_segments.each do |segment|
+            segment.each_segment_with_nest_tracking(&block)
+          end
+        end
+
+        summary.current_nest_count -= 1 if summary
+      end
+
       def find_segment(id)
         return self if @segment_id == id
         called_segments.each do |segment|

data/lib/new_relic/version.rb

@@ -3,8 +3,8 @@ module NewRelic
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 1
-    TINY  = 0
-    BUILD = nil #'0' # Set to nil for a release, 'beta1', 'alpha', etc for prerelease builds
+    TINY  = 1
+    BUILD = 'beta1' #'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 = "3.1.0"
+  s.version = "3.1.1.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-06-15}
+  s.authors = ["Bill Kayser", "Jon Guymon", "Justin George", "Darin Swanson"]
+  s.date = %q{2011-07-06}
   s.description = %q{New Relic is a performance management system, developed by New Relic,
 Inc (http://www.newrelic.com).  New Relic provides you with deep
 information about the performance of your web application as it runs
@@ -92,6 +92,7 @@ http://github.com/newrelic/rpm/
     "lib/new_relic/control.rb",
     "lib/new_relic/control/class_methods.rb",
     "lib/new_relic/control/configuration.rb",
+    "lib/new_relic/control/frameworks.rb",
     "lib/new_relic/control/frameworks/external.rb",
     "lib/new_relic/control/frameworks/merb.rb",
     "lib/new_relic/control/frameworks/rails.rb",
@@ -105,7 +106,6 @@ http://github.com/newrelic/rpm/
     "lib/new_relic/control/server_methods.rb",
     "lib/new_relic/data_serialization.rb",
     "lib/new_relic/delayed_job_injection.rb",
-    "lib/new_relic/histogram.rb",
     "lib/new_relic/local_environment.rb",
     "lib/new_relic/merbtasks.rb",
     "lib/new_relic/metric_data.rb",
@@ -114,10 +114,6 @@ http://github.com/newrelic/rpm/
     "lib/new_relic/noticed_error.rb",
     "lib/new_relic/rack/browser_monitoring.rb",
     "lib/new_relic/rack/developer_mode.rb",
-    "lib/new_relic/rack/metric_app.rb",
-    "lib/new_relic/rack/mongrel_rpm.ru",
-    "lib/new_relic/rack/newrelic.yml",
-    "lib/new_relic/rack_app.rb",
     "lib/new_relic/recipes.rb",
     "lib/new_relic/stats.rb",
     "lib/new_relic/timer_lib.rb",
@@ -176,12 +172,15 @@ http://github.com/newrelic/rpm/
     "test/new_relic/agent/transaction_sample_builder_test.rb",
     "test/new_relic/agent/transaction_sampler_test.rb",
     "test/new_relic/agent/worker_loop_test.rb",
+    "test/new_relic/agent_test.rb",
     "test/new_relic/collection_helper_test.rb",
     "test/new_relic/command/deployments_test.rb",
     "test/new_relic/control/class_methods_test.rb",
+    "test/new_relic/control/configuration_test.rb",
     "test/new_relic/control/logging_methods_test.rb",
     "test/new_relic/control_test.rb",
     "test/new_relic/data_serialization_test.rb",
+    "test/new_relic/delayed_job_injection_test.rb",
     "test/new_relic/local_environment_test.rb",
     "test/new_relic/metric_data_test.rb",
     "test/new_relic/metric_spec_test.rb",
@@ -232,11 +231,8 @@ http://github.com/newrelic/rpm/
     "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",
     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser.rb",
     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/action_mailer.rb",

data/test/config/newrelic.yml

@@ -24,7 +24,7 @@ test:
     - a
     - b
     - c
-  log_file_path: <%= RAILS_ROOT %>/log
+  log_file_path: <%= ::Rails::VERSION::MAJOR == 3 ? Rails.root : RAILS_ROOT %>/log
 
   # Some fixtures for newrelic.yml parsing tests
   erb_value: <%= 'hey'*3 %>

data/test/new_relic/agent/agent/start_worker_thread_test.rb

@@ -63,10 +63,7 @@ class NewRelic::Agent::Agent::StartWorkerThreadTest < Test::Unit::TestCase
     wl = mock('worker loop')
     NewRelic::Agent::WorkerLoop.expects(:new).returns(wl)
     wl.expects(:run).with(30).yields
-    self.expects(:harvest_and_send_timeslice_data)
-    self.expects(:harvest_and_send_slowest_sample)
-    self.expects(:harvest_and_send_errors)
-    NewRelic::Agent.expects(:load_data)
+    self.expects(:save_or_transmit_data)
     create_and_run_worker_loop
   end
 

data/test/new_relic/agent/agent_test.rb

@@ -8,6 +8,22 @@ module NewRelic
         @agent = NewRelic::Agent::Agent.new
       end
 
+      def test_save_or_transmit_data_should_save
+        NewRelic::Agent.expects(:save_data).once
+        @agent.expects(:harvest_and_send_timeslice_data).never
+        NewRelic::DataSerialization.expects(:should_send_data?).returns(false)
+        @agent.instance_eval { save_or_transmit_data }
+      end
+      
+      def test_save_or_transmit_data_should_transmit
+        NewRelic::Agent.expects(:load_data)
+        @agent.expects(:harvest_and_send_timeslice_data)
+        @agent.expects(:harvest_and_send_slowest_sample)
+        @agent.expects(:harvest_and_send_errors)
+        NewRelic::DataSerialization.expects(:should_send_data?).returns(true)
+        @agent.instance_eval { save_or_transmit_data }
+      end
+      
       def test_serialize
         assert_equal([{}, [], []], @agent.send(:serialize), "should return nil when shut down")
       end

data/test/new_relic/agent/agent_test_controller.rb

@@ -7,7 +7,7 @@ class NewRelic::Agent::SuperclassController <  ActionController::Base
 end
 # This is a controller class used in testing controller instrumentation
 class NewRelic::Agent::AgentTestController < NewRelic::Agent::SuperclassController
-  filter_parameter_logging :social_security_number
+  # filter_parameter_logging :social_security_number
 
   @@headers_to_add = nil
 

data/test/new_relic/agent/agent_test_controller_test.rb

@@ -14,16 +14,21 @@ class NewRelic::Agent::AgentTestControllerTest < ActionController::TestCase
     super name
 
   # Suggested by cee-dub for merb tests.  I'm actually amazed if our tests work with merb.
-  if defined?(Merb::Router)
-    Merb::Router.prepare do |r|
-      match('/:controller(/:action)(.:format)').register
-    end
-  else
-    ActionController::Routing::Routes.draw do | map |
-      map.connect '/:controller/:action.:format'
-      map.connect '/:controller/:action'
+    if defined?(Merb::Router)
+      Merb::Router.prepare do |r|
+        match('/:controller(/:action)(.:format)').register
       end
-  end
+    elsif NewRelic::Control.instance.rails_version < NewRelic::VersionNumber.new("3.0")
+      ActionController::Routing::Routes.draw do |map|
+        map.connect '/:controller/:action.:format'
+        map.connect '/:controller/:action'
+      end
+    else
+      Rails.application.routes.draw do
+        match '/:controller/:action.:format'
+        match '/:controller/:action'
+      end    
+    end
 
     if defined?(Rails) && Rails.respond_to?(:application) && Rails.application.respond_to?(:routes)
       @routes = Rails.application.routes
@@ -281,16 +286,6 @@ class NewRelic::Agent::AgentTestControllerTest < ActionController::TestCase
     assert_equal 0, stats('WebFrontend/Mongrel/Average Queue Time').call_count
   end
 
-  def test_histogram
-    engine.clear_stats
-    get :index, 'social_security_number' => "001-555-1212"
-    stats_engine = NewRelic::Agent.instance.stats_engine
-    bucket = NewRelic::Agent.instance.stats_engine.metrics.find { | m | m =~ /^Response Times/ }
-    assert_not_nil bucket, "Bucket contents: #{bucket.inspect}, #{stats_engine.metrics.inspect}"
-    bucket_stats = stats(bucket)
-    assert_equal 1, bucket_stats.call_count, "expected the bucket to have a call, but instead got: #{bucket_stats.inspect}"
-  end
-
   def test_queue_headers_no_header
     engine.clear_stats
     queue_length_stat = stats('Mongrel/Queue Length')

data/test/new_relic/agent/beacon_configuration_test.rb

@@ -87,13 +87,13 @@ class NewRelic::Agent::BeaconConfigurationTest < Test::Unit::TestCase
   def test_build_load_file_js_load_episodes_file_missing
     connect_data = {}
     bc = NewRelic::Agent::BeaconConfiguration.new(connect_data)
-    assert_equal(184, bc.build_load_file_js(connect_data).size, "should output the javascript when there is no configuration")
+    assert_equal(304, bc.build_load_file_js(connect_data).size, "should output the javascript when there is no configuration")
   end
 
   def test_build_load_file_js_load_episodes_file_present
     connect_data = {'rum.load_episodes_file' => true}
     bc = NewRelic::Agent::BeaconConfiguration.new(connect_data)
-    assert_equal(184, bc.build_load_file_js(connect_data).size, "should output the javascript when rum.load_episodes_file is true")
+    assert_equal(304, bc.build_load_file_js(connect_data).size, "should output the javascript when rum.load_episodes_file is true")
   end
   
   def test_build_load_file_js_load_episodes_file_with_episodes_url

data/test/new_relic/agent/browser_monitoring_test.rb

@@ -68,7 +68,9 @@ class NewRelic::Agent::BrowserMonitoringTest < Test::Unit::TestCase
     Thread.current[:newrelic_start_time] = Time.now
 
     footer = browser_timing_footer
-    snippet = "<script type=\"text/javascript\">(function(){var d=document;var e=d.createElement(\"script\");e.async=true;e.src=\"this_is_my_file\";e.type=\"text/javascript\";var s=d.getElementsByTagName(\"script\")[0];s.parentNode.insertBefore(e,s);})();NREUMQ.push([\"nrf2\","
+    snippet = '<script type="text/javascript">if (!NREUMQ.f) NREUMQ.f=function() {
+NREUMQ.push(["load",new Date().getTime()]);
+var e=document.createElement("script");'
     assert footer.include?(snippet), "Expected footer to include snippet: #{snippet}, but instead was #{footer}"
   end
 
@@ -101,7 +103,9 @@ class NewRelic::Agent::BrowserMonitoringTest < Test::Unit::TestCase
     config.expects(:license_bytes).returns(license_bytes)
     NewRelic::Agent.instance.expects(:beacon_configuration).returns(config).at_least_once
     footer = browser_timing_footer
-    beginning_snippet = "(function(){var d=document;var e=d.createElement(\"script\");e.async=true;e.src=\"this_is_my_file\";e.type=\"text/javascript\";var s=d.getElementsByTagName(\"script\")[0];s.parentNode.insertBefore(e,s);})();NREUMQ.push([\"nrf2\","
+    beginning_snippet = '<script type="text/javascript">if (!NREUMQ.f) NREUMQ.f=function() {
+NREUMQ.push(["load",new Date().getTime()]);
+var e=document.createElement("script");'
     ending_snippet = "])</script>"
     assert(footer.include?(beginning_snippet), "expected footer to include beginning snippet: #{beginning_snippet}, but was #{footer}")
     assert(footer.include?(ending_snippet), "expected footer to include ending snippet: #{ending_snippet}, but was #{footer}")
@@ -234,7 +238,7 @@ class NewRelic::Agent::BrowserMonitoringTest < Test::Unit::TestCase
     self.expects(:obfuscate).with('most recent transaction').returns('most recent transaction')
 
     value = footer_js_string(beacon, license_key, application_id)
-    assert_equal('<script type="text/javascript">(function(){var d=document;var e=d.createElement("script");e.async=true;e.src="this_is_my_file";e.type="text/javascript";var s=d.getElementsByTagName("script")[0];s.parentNode.insertBefore(e,s);})();NREUMQ.push(["nrf2","","",1,"most recent transaction",0,0,new Date().getTime()])</script>', value, "should return the javascript given some default values")
+    assert_equal("<script type=\"text/javascript\">if (!NREUMQ.f) NREUMQ.f=function() {\nNREUMQ.push([\"load\",new Date().getTime()]);\nvar e=document.createElement(\"script\");\ne.type=\"text/javascript\";e.async=true;e.src=\"this_is_my_file\";\ndocument.body.appendChild(e);\nif(NREUMQ.a)NREUMQ.a();\n};\nif(window.onload!==NREUMQ.f){NREUMQ.a=window.onload;window.onload=NREUMQ.f;};\nNREUMQ.push([\"nrf2\",\"\",\"\",1,\"most recent transaction\",0,0,new Date().getTime()])</script>", value, "should return the javascript given some default values")
   end
 
   def test_html_safe_if_needed_unsafed

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

@@ -45,7 +45,8 @@ class NewRelic::Agent::Instrumentation::ActiveRecordInstrumentationTest < Test::
       check_metric_count(find_metric, 2)
     end
 
-    return if NewRelic::Control.instance.rails_version < "2.3.4"
+    return if NewRelic::Control.instance.rails_version < "2.3.4" ||
+      NewRelic::Control.instance.rails_version >= "3.1"
 
     assert_calls_metrics(find_metric) do
       ActiveRecordFixtures::Order.exists?(["name=?", 'jeff'])
@@ -450,7 +451,11 @@ class NewRelic::Agent::Instrumentation::ActiveRecordInstrumentationTest < Test::
   # These are only valid for rails 2.1 and later
   if NewRelic::Control.instance.rails_version >= NewRelic::VersionNumber.new("2.1.0")
     ActiveRecordFixtures::Order.class_eval do
-      named_scope :jeffs, :conditions => { :name => 'Jeff' }
+      if NewRelic::Control.instance.rails_version < NewRelic::VersionNumber.new("3.1")
+        named_scope :jeffs, :conditions => { :name => 'Jeff' }
+      else
+        scope :jeffs, :conditions => { :name => 'Jeff' }
+      end      
     end
     def test_named_scope
       ActiveRecordFixtures::Order.create :name => 'Jeff'
@@ -508,15 +513,19 @@ class NewRelic::Agent::Instrumentation::ActiveRecordInstrumentationTest < Test::
     (defined?(Rails) && Rails.respond_to?(:version) && Rails.version.to_i == 3)
   end
 
+  def rails_env
+    rails3? ? ::Rails.env : RAILS_ENV
+  end
+
   def isPostgres?
-    ActiveRecordFixtures::Order.configurations[RAILS_ENV]['adapter'] =~ /postgres/i
+    ActiveRecordFixtures::Order.configurations[rails_env]['adapter'] =~ /postgres/i
   end
   def isMysql?
     ActiveRecordFixtures::Order.connection.class.name =~ /mysql/i
   end
 
   def isSqlite?
-    ActiveRecord::Base.configurations[RAILS_ENV]['adapter'] =~ /sqlite/i
+    ActiveRecord::Base.configurations[rails_env]['adapter'] =~ /sqlite/i
   end
 
 end

data/test/new_relic/agent/instrumentation/metric_frame/pop_test.rb

@@ -37,14 +37,6 @@ class NewRelic::Agent::Instrumentation::MetricFrame::PopTest < Test::Unit::TestC
     log_underflow
   end
 
-  def test_process_histogram_for_transaction
-    fakehistogram = mock('histogram')
-    agent.expects(:histogram).returns(fakehistogram)
-    self.expects(:start).returns(2)
-    fakehistogram.expects(:process).with(1.0)
-    process_histogram_for_transaction(3)
-  end
-
   def test_notice_scope_empty
     transaction_sampler.expects(:notice_scope_empty)
     notice_scope_empty
@@ -115,14 +107,12 @@ class NewRelic::Agent::Instrumentation::MetricFrame::PopTest < Test::Unit::TestC
 
   def test_notify_transaction_sampler_true
     self.expects(:record_transaction_cpu)
-    self.expects(:process_histogram_for_transaction)
     self.expects(:notice_scope_empty)
     notify_transaction_sampler(true)
   end
 
   def test_notify_transaction_sampler_false
     self.expects(:record_transaction_cpu)
-    self.expects(:process_histogram_for_transaction).never
     self.expects(:notice_scope_empty)
     notify_transaction_sampler(false)
   end

data/test/new_relic/agent/method_tracer/instance_methods/trace_execution_scoped_test.rb

@@ -206,7 +206,7 @@ class NewRelic::Agent::MethodTracer::InstanceMethods::TraceExecutionScopedTest <
     assert_raises(RuntimeError) do
       trace_execution_scoped(['metric', 'array'], passed_in_opts) do
         ran = true
-        raise 'wtfmate'
+        raise 'raising a test error'
       end
     end
 

data/test/new_relic/agent_test.rb

@@ -0,0 +1,168 @@
+require File.expand_path(File.join(File.dirname(__FILE__),'..','test_helper'))
+module NewRelic
+  class MainAgentTest < Test::Unit::TestCase
+    
+    # mostly this module just passes through to the active agent
+    # through the agent method or the control instance through
+    # NewRelic::Control.instance . But it's nice to make sure.
+
+    def teardown
+      super
+      Thread.current[:newrelic_untraced] = nil
+    end
+    
+    def test_shutdown
+      mock_agent = mocked_agent
+      mock_agent.expects(:shutdown).with({})
+      NewRelic::Agent.shutdown
+    end
+
+    def test_after_fork
+      mock_agent = mocked_agent
+      mock_agent.expects(:after_fork).with({})
+      NewRelic::Agent.after_fork
+    end
+    
+    def test_reset_stats
+      mock_agent = mocked_agent
+      mock_agent.expects(:reset_stats)
+      NewRelic::Agent.reset_stats
+    end
+
+    def test_manual_start_default
+      mock_control = mocked_control
+      mock_control.expects(:init_plugin).with({:agent_enabled => true, :sync_startup => true})
+      NewRelic::Agent.manual_start
+    end
+    
+    def test_manual_start_with_opts
+      mock_control = mocked_control
+      mock_control.expects(:init_plugin).with({:agent_enabled => true, :sync_startup => false})
+      NewRelic::Agent.manual_start(:sync_startup => false)
+    end
+
+    def test_logger
+      control = mocked_control
+      control.expects(:log)
+      NewRelic::Agent.logger
+    end
+
+    def test_browser_timing_header
+      agent = mocked_agent
+      agent.expects(:browser_timing_header)
+      NewRelic::Agent.browser_timing_header
+    end
+
+    def test_browser_timing_footer
+      agent = mocked_agent
+      agent.expects(:browser_timing_footer)
+      NewRelic::Agent.browser_timing_footer
+    end
+
+    def test_get_stats
+      agent = mocked_agent
+      mock_stats_engine = mock('stats_engine')
+      agent.expects(:stats_engine).returns(mock_stats_engine)
+      mock_stats_engine.expects(:get_stats).with('Custom/test/metric', false)
+      NewRelic::Agent.get_stats('Custom/test/metric')
+    end
+    
+    # note that this is the same as get_stats above, they're just aliases
+    def test_get_stats_no_scope
+      agent = mocked_agent
+      mock_stats_engine = mock('stats_engine')
+      agent.expects(:stats_engine).returns(mock_stats_engine)
+      mock_stats_engine.expects(:get_stats).with('Custom/test/metric', false)
+      NewRelic::Agent.get_stats_no_scope('Custom/test/metric')
+    end
+
+    def test_agent_not_started
+      old_agent = NewRelic::Agent.agent
+      NewRelic::Agent.instance_eval { @agent = nil }
+      assert_raise(RuntimeError) do
+        NewRelic::Agent.agent
+      end
+      NewRelic::Agent.instance_eval { @agent = old_agent }
+    end
+
+    def test_agent_when_started
+      old_agent = NewRelic::Agent.agent
+      NewRelic::Agent.instance_eval { @agent = 'not nil' }
+      assert_equal('not nil', NewRelic::Agent.agent, "should return the value from @agent")
+      NewRelic::Agent.instance_eval { @agent = old_agent }
+    end
+
+    def test_abort_transaction_bang
+      NewRelic::Agent::Instrumentation::MetricFrame.expects(:abort_transaction!)
+      NewRelic::Agent.abort_transaction!
+    end
+
+    def test_is_transaction_traced_true
+      Thread.current[:record_tt] = true
+      assert_equal(true, NewRelic::Agent.is_transaction_traced?, 'should be true since the thread local is set')
+    end
+
+    def test_is_transaction_traced_blank
+      Thread.current[:record_tt] = nil
+      assert_equal(true, NewRelic::Agent.is_transaction_traced?, 'should be true since the thread local is not set')
+    end
+
+    def test_is_transaction_traced_false
+      Thread.current[:record_tt] = false
+      assert_equal(false, NewRelic::Agent.is_transaction_traced?, 'should be false since the thread local is false')
+    end
+    
+    def test_is_sql_recorded_true
+      Thread.current[:record_sql] = true
+      assert_equal(true, NewRelic::Agent.is_sql_recorded?, 'should be true since the thread local is set')
+    end
+
+    def test_is_sql_recorded_blank
+      Thread.current[:record_sql] = nil
+      assert_equal(true, NewRelic::Agent.is_sql_recorded?, 'should be true since the thread local is not set')
+    end
+
+    def test_is_sql_recorded_false
+      Thread.current[:record_sql] = false
+      assert_equal(false, NewRelic::Agent.is_sql_recorded?, 'should be false since the thread local is false')
+    end
+    
+    def test_is_execution_traced_true
+      Thread.current[:newrelic_untraced] = [true, true]
+      assert_equal(true, NewRelic::Agent.is_execution_traced?, 'should be true since the thread local is set')
+    end
+
+    def test_is_execution_traced_blank
+      Thread.current[:newrelic_untraced] = nil
+      assert_equal(true, NewRelic::Agent.is_execution_traced?, 'should be true since the thread local is not set')
+    end
+
+    def test_is_execution_traced_empty
+      Thread.current[:newrelic_untraced] = []
+      assert_equal(true, NewRelic::Agent.is_execution_traced?, 'should be true since the thread local is an empty array')
+    end
+
+    def test_is_execution_traced_false
+      Thread.current[:newrelic_untraced] = [true, false]
+      assert_equal(false, NewRelic::Agent.is_execution_traced?, 'should be false since the thread local stack has the last element false')
+    end
+    
+    def test_instance
+      assert_equal(NewRelic::Agent.agent, NewRelic::Agent.instance, "should return the same agent for both identical methods")
+    end
+
+    private
+
+    def mocked_agent
+      agent = mock('agent')
+      NewRelic::Agent.stubs(:agent).returns(agent)
+      agent
+    end
+
+    def mocked_control
+      control = mock('control')
+      NewRelic::Control.stubs(:instance).returns(control)
+      control
+    end
+  end
+end