RubyGems - newrelic_rpm - Versions diffs - 2.14.1 → 3.0.0.beta1 - Mend

newrelic_rpm 2.14.1 → 3.0.0.beta1

Potentially problematic release.

This version of newrelic_rpm might be problematic. Click here for more details.

Files changed (123) hide show

data/test/new_relic/agent/instrumentation/metric_frame_test.rb CHANGED

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__),'..','..','..','test_helper'))
+require File.expand_path(File.join(File.dirname(__FILE__),'..','..','..','test_helper'))
 class NewRelic::Agent::Instrumentation::MetricFrameTest < Test::Unit::TestCase
@@ -6,7 +6,7 @@ class NewRelic::Agent::Instrumentation::MetricFrameTest < Test::Unit::TestCase
   def setup
     @f = NewRelic::Agent::Instrumentation::MetricFrame.new
   end
   def test_request_parsing__none
     assert_nil f.uri
     assert_nil f.referer
@@ -34,7 +34,7 @@ class NewRelic::Agent::Instrumentation::MetricFrameTest < Test::Unit::TestCase
     assert_equal "/path", f.uri
     assert_equal "/path/hello", f.referer
   end
   def test_request_parsing__hostname_only
     request = stub(:uri => 'http://creature.com')
     f.request = request

data/test/new_relic/agent/instrumentation/net_instrumentation_test.rb CHANGED

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__),'..','..','..','test_helper'))
+require File.expand_path(File.join(File.dirname(__FILE__),'..','..','..','test_helper'))
 class NewRelic::Agent::Instrumentation::NetInstrumentationTest < Test::Unit::TestCase
   include NewRelic::Agent::Instrumentation::ControllerInstrumentation
@@ -7,13 +7,13 @@ class NewRelic::Agent::Instrumentation::NetInstrumentationTest < Test::Unit::Tes
     @engine = NewRelic::Agent.instance.stats_engine
     @engine.clear_stats
   end
   def metrics_without_gc
     @engine.metrics - ['GC/cumulative']
   end
   private :metrics_without_gc
   def test_get
     url = URI.parse('http://www.google.com/index.html')
     res = Net::HTTP.start(url.host, url.port) {|http|
@@ -21,7 +21,7 @@ class NewRelic::Agent::Instrumentation::NetInstrumentationTest < Test::Unit::Tes
     }
     assert_match /<head>/, res.body
     assert_equal %w[External/www.google.com/Net::HTTP/GET External/allOther External/www.google.com/all].sort,
-    metrics_without_gc.sort
+    metrics_without_gc.sort
   end
   def test_background
@@ -49,7 +49,7 @@ class NewRelic::Agent::Instrumentation::NetInstrumentationTest < Test::Unit::Tes
   end
   def test_get__simple
     Net::HTTP.get URI.parse('http://www.google.com/index.html')
-    assert_equal metrics_without_gc.sort,
+    assert_equal metrics_without_gc.sort,
     %w[External/www.google.com/Net::HTTP/GET External/allOther External/www.google.com/all].sort
   end
   def test_ignore
@@ -59,7 +59,7 @@ class NewRelic::Agent::Instrumentation::NetInstrumentationTest < Test::Unit::Tes
         http.post('/index.html','data')
       }
     end
-    assert_equal 0, metrics_without_gc.size
+    assert_equal 0, metrics_without_gc.size
   end
   def test_head
     url = URI.parse('http://www.google.com/index.html')
@@ -67,16 +67,16 @@ class NewRelic::Agent::Instrumentation::NetInstrumentationTest < Test::Unit::Tes
       http.head('/index.html')
     }
     assert_equal %w[External/www.google.com/Net::HTTP/HEAD External/allOther External/www.google.com/all].sort,
-    metrics_without_gc.sort
+    metrics_without_gc.sort
   end
   def test_post
     url = URI.parse('http://www.google.com/index.html')
     res = Net::HTTP.start(url.host, url.port) {|http|
       http.post('/index.html','data')
     }
-    assert_equal %w[External/www.google.com/Net::HTTP/POST External/allOther External/www.google.com/all].sort,
-    metrics_without_gc.sort
+    assert_equal %w[External/www.google.com/Net::HTTP/POST External/allOther External/www.google.com/all].sort,
+    metrics_without_gc.sort
   end
 end

data/test/new_relic/agent/instrumentation/queue_time_test.rb CHANGED

@@ -2,58 +2,61 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'te
 class NewRelic::Agent::Instrumentation::QueueTimeTest < Test::Unit::TestCase
   require 'new_relic/agent/instrumentation/queue_time'
   include NewRelic::Agent::Instrumentation::QueueTime
   def setup
     NewRelic::Agent.instance.stats_engine.clear_stats
   end
   def create_test_start_time(env)
     env[APP_HEADER] = "t=#{convert_to_microseconds(Time.at(1002))}"
   end
   def test_parse_frontend_headers
-    self.expects(:current_time).returns('END_TIME')
-    self.expects(:add_end_time_header).with('END_TIME', {:env => 'hash'})
+    middleware_start = Time.at(1002)
+    queue_start = Time.at(1001)
+    server_start = Time.at(1000)
+    Time.stubs(:now).returns(Time.at(1003)) # whee!
+    self.expects(:add_end_time_header).with(Time.at(1003), {:env => 'hash'})
     # ordering is important here, unfortunately, the mocks don't
     # support that kind of checking.
-    self.expects(:parse_middleware_time_from).with({:env => 'hash'})
-    self.expects(:parse_queue_time_from).with({:env => 'hash'})
-    self.expects(:parse_server_time_from).with({:env => 'hash'})
-    parse_frontend_headers({:env => 'hash'})
+    self.expects(:parse_middleware_time_from).with({:env => 'hash'}).returns(middleware_start)
+    self.expects(:parse_queue_time_from).with({:env => 'hash'}).returns(queue_start)
+    self.expects(:parse_server_time_from).with({:env => 'hash'}).returns(server_start)
+    assert_equal(server_start, parse_frontend_headers({:env => 'hash'}), "should return the oldest start time")
   end
   def test_all_combined_frontend_headers
     env = {}
     env[MAIN_HEADER] = "t=#{convert_to_microseconds(Time.at(1000))}"
-    env[QUEUE_HEADER] = "t=#{convert_to_microseconds(Time.at(1001))}"
+    env[QUEUE_HEADER] = "t=#{convert_to_microseconds(Time.at(1001))}"
     env[MIDDLEWARE_HEADER] = "t=#{convert_to_microseconds(Time.at(1002))}"
     env[APP_HEADER] = "t=#{convert_to_microseconds(Time.at(1003))}"
     assert_calls_metrics('WebFrontend/WebServer/all', 'WebFrontend/QueueTime', 'Middleware/all') do
-      parse_middleware_time_from(env)
-      parse_queue_time_from(env)
-      parse_server_time_from(env)
+      assert_equal(Time.at(1002), parse_middleware_time_from(env))
+      assert_equal(Time.at(1001), parse_queue_time_from(env))
+      assert_equal(Time.at(1000), parse_server_time_from(env))
     end
     check_metric_time('WebFrontend/WebServer/all', 1.0, 0.001)
-    check_metric_time('WebFrontend/QueueTime', 1.0, 0.001)
+    check_metric_time('WebFrontend/QueueTime', 1.0, 0.001)
     check_metric_time('Middleware/all', 1.0, 0.001)
   end
   def test_combined_middleware_and_queue
     env = {}
     env[QUEUE_HEADER] = "t=#{convert_to_microseconds(Time.at(1000))}"
-    env[MIDDLEWARE_HEADER] = "t=#{convert_to_microseconds(Time.at(1001))}"
+    env[MIDDLEWARE_HEADER] = "t=#{convert_to_microseconds(Time.at(1001))}"
     create_test_start_time(env)
     assert_calls_metrics('Middleware/all', 'WebFrontend/QueueTime') do
-      parse_middleware_time_from(env)
-      parse_queue_time_from(env)
+      parse_middleware_time_from(env)
+      assert_equal(Time.at(1000), parse_queue_time_from(env))
     end
     check_metric_time('Middleware/all', 1.0, 0.001)
-    check_metric_time('WebFrontend/QueueTime', 1.0, 0.001)
+    check_metric_time('WebFrontend/QueueTime', 1.0, 0.001)
   end
   def test_combined_queue_and_server
@@ -63,12 +66,12 @@ class NewRelic::Agent::Instrumentation::QueueTimeTest < Test::Unit::TestCase
     create_test_start_time(env)
     assert_calls_metrics('WebFrontend/WebServer/all', 'WebFrontend/QueueTime') do
-      parse_queue_time_from(env)
+      assert_equal(Time.at(1001), parse_queue_time_from(env))
       parse_server_time_from(env)
     end
     check_metric_time('WebFrontend/WebServer/all', 1.0, 0.001)
-    check_metric_time('WebFrontend/QueueTime', 1.0, 0.001)
+    check_metric_time('WebFrontend/QueueTime', 1.0, 0.001)
   end
   def test_combined_middleware_and_server
@@ -81,7 +84,7 @@ class NewRelic::Agent::Instrumentation::QueueTimeTest < Test::Unit::TestCase
       parse_middleware_time_from(env)
       parse_server_time_from(env)
     end
     check_metric_time('WebFrontend/WebServer/all', 1.0, 0.001)
     check_metric_time('Middleware/all', 1.0, 0.001)
   end
@@ -110,7 +113,7 @@ class NewRelic::Agent::Instrumentation::QueueTimeTest < Test::Unit::TestCase
     end
     check_metric_time('WebFrontend/WebServer/all', 1.0, 0.1)
   end
   def test_parse_server_time_from_with_bad_header
     env = {'HTTP_X_REQUEST_START' => 't=t=t=t='}
     create_test_start_time(env)
@@ -124,7 +127,7 @@ class NewRelic::Agent::Instrumentation::QueueTimeTest < Test::Unit::TestCase
       parse_server_time_from({})
     end
   end
   def test_parse_middleware_time
     env = {}
     create_test_start_time(env)
@@ -147,9 +150,9 @@ class NewRelic::Agent::Instrumentation::QueueTimeTest < Test::Unit::TestCase
     env['HTTP_X_QUEUE_START'] = "t=#{time1}"
     assert_calls_metrics('WebFrontend/QueueTime') do
-      parse_queue_time_from(env)
+      assert_equal(Time.at(1000), parse_queue_time_from(env))
     end
     check_metric_time('WebFrontend/QueueTime', 2.0, 0.1)
   end
@@ -158,7 +161,7 @@ class NewRelic::Agent::Instrumentation::QueueTimeTest < Test::Unit::TestCase
     create_test_start_time(env)
     env['HTTP_X_QUEUE_TIME'] = '1000000'
     assert_calls_metrics('WebFrontend/QueueTime') do
-      parse_queue_time_from(env)
+      assert_equal(Time.at(1001), parse_queue_time_from(env))
     end
     check_metric_time('WebFrontend/QueueTime', 1.0, 0.001)
@@ -170,7 +173,7 @@ class NewRelic::Agent::Instrumentation::QueueTimeTest < Test::Unit::TestCase
     env['HTTP_X_QUEUE_START'] = 't=1' # obviously incorrect
     env['HTTP_X_QUEUE_TIME'] = '1000000'
     assert_calls_metrics('WebFrontend/QueueTime') do
-      parse_queue_time_from(env)
+      assert_equal(Time.at(1001), parse_queue_time_from(env))
     end
     # alternate queue should override normal header
@@ -182,10 +185,10 @@ class NewRelic::Agent::Instrumentation::QueueTimeTest < Test::Unit::TestCase
     create_test_start_time(env)
     env['HTTP_X_HEROKU_QUEUE_WAIT_TIME'] = '1000'
     assert_calls_metrics('WebFrontend/QueueTime') do
-      parse_queue_time_from(env)
+      assert_equal(Time.at(1001), parse_queue_time_from(env))
     end
-    check_metric_time('WebFrontend/QueueTime', 1.0, 0.001)
+    check_metric_time('WebFrontend/QueueTime', 1.0, 0.001)
   end
   def test_check_for_heroku_queue_length_override
@@ -194,7 +197,7 @@ class NewRelic::Agent::Instrumentation::QueueTimeTest < Test::Unit::TestCase
     env['HTTP_X_QUEUE_TIME'] = '10000000' # ten MEEELION useconds
     env['HTTP_X_HEROKU_QUEUE_WAIT_TIME'] = '1000'
     assert_calls_metrics('WebFrontend/QueueTime') do
-      parse_queue_time_from(env)
+      assert_equal(Time.at(1001), parse_queue_time_from(env))
     end
     # heroku queue should override alternate queue
@@ -253,7 +256,7 @@ class NewRelic::Agent::Instrumentation::QueueTimeTest < Test::Unit::TestCase
     check_metric_time('WebFrontend/QueueTime', 0.0, 0.001)
   end
   # check all the combinations to make sure that ordering doesn't
   # affect the return value
   def test_find_oldest_time
@@ -287,7 +290,7 @@ class NewRelic::Agent::Instrumentation::QueueTimeTest < Test::Unit::TestCase
       record_time_stat('foo', Time.at(1001), Time.at(1000))
     end
   end
   def test_record_time_stat_with_end_after_start
     record_time_stat('WebFrontend/WebServer/foo', 2, 1)
   rescue RuntimeError => e
@@ -338,7 +341,7 @@ class NewRelic::Agent::Instrumentation::QueueTimeTest < Test::Unit::TestCase
     pair = convert_to_name_time_pair(name, time)
     assert_equal [:foo, Time.at(1)], pair
   end
   def test_get_matches
     str = "servera t=1000000, serverb t=1000000"
     matches = get_matches(str) # start a fire

data/test/new_relic/agent/instrumentation/task_instrumentation_test.rb CHANGED

@@ -4,9 +4,9 @@ class NewRelic::Agent::Instrumentation::TaskInstrumentationTest < Test::Unit::Te
   include NewRelic::Agent::Instrumentation::ControllerInstrumentation
   extend TestContexts
   attr_accessor :agent
   with_running_agent do
     should "run" do
       run_task_inner 0
       stat_names = %w[Controller/NewRelic::Agent::Instrumentation::TaskInstrumentationTest/inner_task_0
@@ -20,7 +20,7 @@ class NewRelic::Agent::Instrumentation::TaskInstrumentationTest < Test::Unit::Te
       assert_equal 0, @agent.stats_engine.get_stats_no_scope('Controller').call_count
       assert_equal 1, @agent.stats_engine.get_stats_no_scope('Controller/NewRelic::Agent::Instrumentation::TaskInstrumentationTest/inner_task_0').call_count
     end
     should "run_recursive" do
       run_task_inner(3)
       assert_equal 1, @agent.stats_engine.lookup_stats(
@@ -38,7 +38,7 @@ class NewRelic::Agent::Instrumentation::TaskInstrumentationTest < Test::Unit::Te
       assert_equal 1, @agent.stats_engine.get_stats_no_scope('Controller/NewRelic::Agent::Instrumentation::TaskInstrumentationTest/inner_task_3').call_count
       assert_equal 0, @agent.stats_engine.get_stats_no_scope('Controller').call_count
     end
     should "run_nested" do
       run_task_outer(3)
       @agent.stats_engine.metrics.sort.each do |n|
@@ -48,7 +48,7 @@ class NewRelic::Agent::Instrumentation::TaskInstrumentationTest < Test::Unit::Te
       assert_equal 1, @agent.stats_engine.get_stats_no_scope('Controller/NewRelic::Agent::Instrumentation::TaskInstrumentationTest/outer_task').call_count
       assert_equal 2, @agent.stats_engine.get_stats_no_scope('Controller/NewRelic::Agent::Instrumentation::TaskInstrumentationTest/inner_task_0').call_count
     end
     should "reentrancy" do
       assert_equal 0, NewRelic::Agent::BusyCalculator.busy_count
       run_task_inner(1)
@@ -60,7 +60,7 @@ class NewRelic::Agent::Instrumentation::TaskInstrumentationTest < Test::Unit::Te
       Controller/NewRelic::Agent::Instrumentation::TaskInstrumentationTest/inner_task_1
       ], @agent.stats_engine.metrics.grep(/^Controller/)
     end
     should "transaction" do
       assert_equal 0, @agent.transaction_sampler.scope_depth, "existing unfinished sample"
       assert_nil @agent.transaction_sampler.last_sample
@@ -81,7 +81,7 @@ class NewRelic::Agent::Instrumentation::TaskInstrumentationTest < Test::Unit::Te
       assert sample.params[:cpu_time] >= 0, "cpu time: #{sample.params[:cpu_time]},\n#{sample}"
       assert_equal '10', sample.params[:request_params][:level]
     end
     should "abort" do
       @acct = 'Redrocks'
       perform_action_with_newrelic_trace(:name => 'hello', :force => true, :params => { :account => @acct}) do
@@ -107,9 +107,9 @@ class NewRelic::Agent::Instrumentation::TaskInstrumentationTest < Test::Unit::Te
       sample = @agent.transaction_sampler.last_sample
       assert_not_nil sample
       assert_equal 'Redrocks', sample.params[:request_params][:account]
     end
     should "error_handling" do
       @agent.error_collector.ignore_error_filter
       @agent.error_collector.harvest_errors([])
@@ -119,7 +119,7 @@ class NewRelic::Agent::Instrumentation::TaskInstrumentationTest < Test::Unit::Te
         run_task_exception
       end
     end
     should "custom_params" do
       @agent.error_collector.stubs(:enabled).returns(true)
       @agent.error_collector.ignore_error_filter
@@ -135,13 +135,13 @@ class NewRelic::Agent::Instrumentation::TaskInstrumentationTest < Test::Unit::Te
       assert_not_nil error.params[:stack_trace]
       assert_not_nil error.params[:custom_params]
     end
     should "instrument_bg" do
       run_background_job
       stat_names = %w[OtherTransaction/Background/NewRelic::Agent::Instrumentation::TaskInstrumentationTest/run_background_job
                     OtherTransaction/Background/all
                     OtherTransaction/all].sort
       expected_but_missing = stat_names - @agent.stats_engine.metrics
       assert_equal 0, expected_but_missing.size, @agent.stats_engine.metrics.map  { |n|
         stat = @agent.stats_engine.get_stats_no_scope(n)
@@ -151,32 +151,32 @@ class NewRelic::Agent::Instrumentation::TaskInstrumentationTest < Test::Unit::Te
       assert_equal 1, @agent.stats_engine.get_stats_no_scope('OtherTransaction/Background/all').call_count
     end
   end
   private
   def run_task_inner(n)
     sleep 0.1
     return if n == 0
     assert_equal 1, NewRelic::Agent::BusyCalculator.busy_count
     run_task_inner(n-1)
   end
   def run_task_outer(n=0)
     assert_equal 1, NewRelic::Agent::BusyCalculator.busy_count
     run_task_inner(n)
     run_task_inner(n)
   end
   def run_task_exception
     NewRelic::Agent.add_custom_parameters(:custom_one => 'one custom val')
     assert_equal 1, NewRelic::Agent::BusyCalculator.busy_count
     raise "This is an error"
   end
   def run_background_job
     "This is a background job"
   end
   add_transaction_tracer :run_task_exception
   add_transaction_tracer :run_task_inner, :name => 'inner_task_#{args[0]}'
   add_transaction_tracer :run_task_outer, :name => 'outer_task', :params => '{ :level => args[0] }'

data/test/new_relic/agent/memcache_instrumentation_test.rb CHANGED

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper'))
+require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper'))
 memcached_ready = false
 classes = {
@@ -27,26 +27,26 @@ class NewRelic::Agent::MemcacheInstrumentationTest < Test::Unit::TestCase
   def setup
     NewRelic::Agent.manual_start
     @engine = NewRelic::Agent.instance.stats_engine
     @cache = MEMCACHED_CLASS.new('localhost')
     @cache.flush_all
     @key = 'schluessel'
   end
   def _call_test_method_in_web_transaction(method, *args)
     @engine.clear_stats
     perform_action_with_newrelic_trace(:name=>'action', :category => :controller) do
       @cache.send(method.to_sym, *[@key, *args])
     end
   end
   def _call_test_method_in_background_task(method, *args)
     @engine.clear_stats
     perform_action_with_newrelic_trace(:name => 'bg_task', :category => :task) do
       @cache.send(method.to_sym, *[@key, *args])
     end
   end
   def test_reads__web
     %w[get get_multi].each do |method|
       if @cache.class.method_defined?(method)
@@ -56,7 +56,7 @@ class NewRelic::Agent::MemcacheInstrumentationTest < Test::Unit::TestCase
       end
     end
   end
   def test_writes__web
     %w[incr decr delete].each do |method|
       if @cache.class.method_defined?(method)
@@ -65,7 +65,7 @@ class NewRelic::Agent::MemcacheInstrumentationTest < Test::Unit::TestCase
         compare_metrics expected_metrics, @engine.metrics.select{|m| m =~ /^memcache.*/i}
       end
     end
     %w[set add].each do |method|
       if @cache.class.method_defined?(method)
         expected_metrics = ["MemCache/#{method}", "MemCache/allWeb", "MemCache/#{method}:Controller/NewRelic::Agent::MemcacheInstrumentationTest/action"]
@@ -74,7 +74,7 @@ class NewRelic::Agent::MemcacheInstrumentationTest < Test::Unit::TestCase
       end
     end
   end
   def test_reads__background
     %w[get get_multi].each do |method|
       if @cache.class.method_defined?(method)
@@ -84,9 +84,9 @@ class NewRelic::Agent::MemcacheInstrumentationTest < Test::Unit::TestCase
       end
     end
   end
   def test_writes__background
     %w[incr decr delete].each do |method|
       expected_metrics = ["MemCache/#{method}", "MemCache/allOther", "MemCache/#{method}:OtherTransaction/Background/NewRelic::Agent::MemcacheInstrumentationTest/bg_task"]
       if @cache.class.method_defined?(method)
@@ -94,7 +94,7 @@ class NewRelic::Agent::MemcacheInstrumentationTest < Test::Unit::TestCase
         compare_metrics expected_metrics, @engine.metrics.select{|m| m =~ /^memcache.*/i}
       end
     end
     %w[set add].each do |method|
       expected_metrics = ["MemCache/#{method}", "MemCache/allOther", "MemCache/#{method}:OtherTransaction/Background/NewRelic::Agent::MemcacheInstrumentationTest/bg_task"]
       if @cache.class.method_defined?(method)
@@ -103,5 +103,5 @@ class NewRelic::Agent::MemcacheInstrumentationTest < Test::Unit::TestCase
       end
     end
   end
 end if memcached_ready