newrelic_rpm 3.5.7.59 → 3.5.8.64.beta

data/test/new_relic/agent/transaction_info_test.rb

@@ -9,46 +9,98 @@ class NewRelic::Agent::TransactionInfoTest < Test::Unit::TestCase
     @request_with_double_quotes = OpenStruct.new(:cookies => {'NRAGENT' => 'tk="""deadbeef"""'})
     @request_with_single_quotes = OpenStruct.new(:cookies => {'NRAGENT' => "tk='''deadbeef'''"})
     @request_with_multi_lt = OpenStruct.new(:cookies => {'NRAGENT' => 'tk=<<<deadbeef'})
-    @request_with_multi_gt = OpenStruct.new(:cookies => {'NRAGENT' => 'tk=>>>deadbeef'}) 
+    @request_with_multi_gt = OpenStruct.new(:cookies => {'NRAGENT' => 'tk=>>>deadbeef'})
     @request_with_bare_token = OpenStruct.new(:cookies => {'NRAGENT' => 0xdeadbeef})
     @request_with_nil_token = OpenStruct.new(:cookies => {'NRAGENT' => nil})
   end
-  
+
   def test_get_token_safe_token_returned_untouched
     assert_equal("12345678", NewRelic::Agent::TransactionInfo.get_token(@request))
   end
 
   def test_get_token_with_embedded_tags_sanitized
-  	assert_equal("",NewRelic::Agent::TransactionInfo.get_token(@request_with_embedded_tag))
+    assert_equal("",NewRelic::Agent::TransactionInfo.get_token(@request_with_embedded_tag))
   end
 
   def test_get_token_with_embedded_utf8_js_sanitized
-  	assert_equal("1234&amp;#34&amp;#93&amp;#41&amp;#595678",
-  		NewRelic::Agent::TransactionInfo.get_token(@request_with_embedded_utf8_encoded_js))	
+    assert_equal("1234&amp;#34&amp;#93&amp;#41&amp;#595678",
+                 NewRelic::Agent::TransactionInfo.get_token(@request_with_embedded_utf8_encoded_js))
   end
 
   def test_get_token_replaces_double_quoted_token_with_empty_string
-  	assert_equal("", NewRelic::Agent::TransactionInfo.get_token(@request_with_double_quotes))
+    assert_equal("", NewRelic::Agent::TransactionInfo.get_token(@request_with_double_quotes))
   end
 
   def test_get_token_replaces_single_quoted_toket_with_empty_string
-  	assert_equal("", NewRelic::Agent::TransactionInfo.get_token(@request_with_single_quotes))
+    assert_equal("", NewRelic::Agent::TransactionInfo.get_token(@request_with_single_quotes))
   end
 
   def test_get_token_replaces_token_started_with_multiple_Lt_with_empty_string
-  	assert_equal("", NewRelic::Agent::TransactionInfo.get_token(@request_with_multi_lt))
+    assert_equal("", NewRelic::Agent::TransactionInfo.get_token(@request_with_multi_lt))
   end
 
   def test_get_token_replaces_token_started_with_multiple_gt_with_empty_string
-  	assert_equal("", NewRelic::Agent::TransactionInfo.get_token(@request_with_multi_gt))
+    assert_equal("", NewRelic::Agent::TransactionInfo.get_token(@request_with_multi_gt))
   end
 
   def test_get_token_bare_value_replaced_with_nil
-  	assert_equal(nil,NewRelic::Agent::TransactionInfo.get_token(@request_with_bare_token))
+    assert_equal(nil,NewRelic::Agent::TransactionInfo.get_token(@request_with_bare_token))
   end
 
   def test_get_token_nil_token_returns_nil_token
-  	assert_equal(nil,NewRelic::Agent::TransactionInfo.get_token(@request_with_ni_token))
+    assert_equal(nil,NewRelic::Agent::TransactionInfo.get_token(@request_with_ni_token))
+  end
+
+  def test_has_correct_apdex_t_for_tansaction
+    txn_info = NewRelic::Agent::TransactionInfo.get
+    config = { :web_transactions_apdex => {'Controller/foo/bar' => 1.5},
+      :apdex_t => 2.0 }
+
+    with_config(config, :do_not_cast => true) do
+      txn_info.transaction_name = 'Controller/foo/bar'
+      assert_equal 1.5, txn_info.apdex_t
+      txn_info.transaction_name = 'Controller/some/other/txn'
+      assert_equal 2.0, txn_info.apdex_t
+    end
   end
 
+  def test_has_correct_transaction_trace_threshold_when_default
+    txn_info = NewRelic::Agent::TransactionInfo.get
+    config = { :web_transactions_apdex => {'Controller/foo/bar' => 1.5},
+      :apdex_t => 2.0 }
+
+    with_config(config, :do_not_cast => true) do
+      txn_info.transaction_name = 'Controller/foo/bar'
+      assert_equal 6.0, txn_info.transaction_trace_threshold
+      txn_info.transaction_name = 'Controller/some/other/txn'
+      assert_equal 8.0, txn_info.transaction_trace_threshold
+    end
+  end
+
+  def test_has_correct_transaction_trace_threshold_when_specified
+    txn_info = NewRelic::Agent::TransactionInfo.get
+    config = {
+      :web_transactions_apdex => {'Controller/foo/bar' => 1.5},
+      :apdex_t => 2.0,
+      :'transaction_tracer.transaction_threshold' => 4.0
+    }
+
+    with_config(config, :do_not_cast => true) do
+      txn_info.transaction_name = 'Controller/foo/bar'
+      assert_equal 4.0, txn_info.transaction_trace_threshold
+      txn_info.transaction_name = 'Controller/some/other/txn'
+      assert_equal 4.0, txn_info.transaction_trace_threshold
+    end
+  end
+
+  def test_transaction_name
+    NewRelic::Agent::TransactionInfo.reset
+    txn = NewRelic::Agent::TransactionInfo.get
+    assert_equal(NewRelic::Agent::TransactionInfo::DEFAULT_TRANSACTION_NAME,
+      txn.transaction_name)
+    assert_equal(false, txn.transaction_name_set?)
+    txn.transaction_name = "foobar"
+    assert_equal("foobar", txn.transaction_name)
+    assert_equal(true, txn.transaction_name_set?)
+  end
 end

data/test/new_relic/agent/transaction_sample_builder_test.rb

@@ -102,7 +102,7 @@ class NewRelic::Agent::TransationSampleBuilderTest < Test::Unit::TestCase
 
     should_be_a_copy = sample.omit_segments_with('OMIT NOTHING')
     validate_segment should_be_a_copy.root_segment, false
-    
+
     assert_equal sample.params, should_be_a_copy.params
     assert_equal(sample.root_segment.to_debug_str(0),
                  should_be_a_copy.root_segment.to_debug_str(0))
@@ -169,7 +169,7 @@ class NewRelic::Agent::TransationSampleBuilderTest < Test::Unit::TestCase
     @builder.finish_trace(Time.now.to_f)
     validate_builder
   end
-  
+
   def test_trace_should_not_record_more_than_segment_limit
     with_config(:'transaction_tracer.limit_segments' => 3) do
       8.times {|i| build_segment i.to_s }
@@ -177,6 +177,13 @@ class NewRelic::Agent::TransationSampleBuilderTest < Test::Unit::TestCase
     end
   end
 
+  def test_finish_trace_records_threshold
+    NewRelic::Agent::TransactionInfo.get.stubs(:transaction_trace_threshold) \
+      .returns(2.0)
+    @builder.finish_trace
+    assert_equal 2.0, @builder.sample.threshold
+  end
+
   # regression
   def test_trace_should_log_segment_reached_once
     with_config(:'transaction_tracer.limit_segments' => 3) do
@@ -184,7 +191,7 @@ class NewRelic::Agent::TransationSampleBuilderTest < Test::Unit::TestCase
       8.times {|i| build_segment i.to_s }
     end
   end
-  
+
   def validate_builder(check_names = true)
     validate_segment @builder.sample.root_segment, check_names
   end

data/test/new_relic/agent/transaction_sampler_test.rb

@@ -227,10 +227,9 @@ class NewRelic::Agent::TransactionSamplerTest < Test::Unit::TestCase
   end
 
   def test_store_slowest_sample_new_is_slowest
-    old_sample = mock('old_sample')
-    new_sample = mock('new_sample')
+    old_sample = stub('old_sample', :duration => 3.0, :threshold => 1.0)
+    new_sample = stub('new_sample', :duration => 4.0, :threshold => 1.0)
     @sampler.instance_eval { @slowest_sample = old_sample }
-    @sampler.expects(:slowest_sample?).with(old_sample, new_sample).returns(true)
 
     @sampler.store_slowest_sample(new_sample)
 
@@ -248,6 +247,15 @@ class NewRelic::Agent::TransactionSamplerTest < Test::Unit::TestCase
     assert_equal(old_sample, @sampler.instance_variable_get('@slowest_sample'))
   end
 
+  def test_store_slowest_sample_does_not_store_if_faster_than_threshold
+    old_sample = stub('old_sample', :duration => 1.0, :threshold => 0.5)
+    new_sample = stub('new_sample', :duration => 2.0, :threshold => 4.0)
+    @sampler.instance_eval { @slowest_sample = old_sample }
+    @sampler.store_slowest_sample(new_sample)
+
+    assert_equal(old_sample, @sampler.instance_variable_get('@slowest_sample'))
+  end
+
   def test_slowest_sample_no_sample
     old_sample = nil
     new_sample = mock('new_sample')
@@ -269,7 +277,7 @@ class NewRelic::Agent::TransactionSamplerTest < Test::Unit::TestCase
     new_sample.expects(:duration).returns(1.0)
     assert_equal(true, @sampler.slowest_sample?(old_sample, new_sample))
   end
-    
+
   def test_truncate_samples_no_samples
     @sampler.instance_eval { @max_samples = 10 }
     @sampler.instance_eval { @samples = [] }
@@ -358,7 +366,7 @@ class NewRelic::Agent::TransactionSamplerTest < Test::Unit::TestCase
     @sampler.send(:notice_extra_data, nil, nil, nil)
   end
 
-  def test_notice_extra_data_no_segment
+  def test_notice_extra_data_no_builder
     builder = mock('builder')
     @sampler.expects(:builder).returns(builder).twice
     builder.expects(:current_segment).returns(nil)
@@ -373,7 +381,8 @@ class NewRelic::Agent::TransactionSamplerTest < Test::Unit::TestCase
     builder.expects(:current_segment).returns(segment)
     segment.expects(:[]).with(key).returns(nil)
     @sampler.expects(:append_new_message).with(nil, 'a message').returns('a message')
-    @sampler.expects(:truncate_message).with('a message').returns('truncated_message')
+    NewRelic::Agent::TransactionSampler.expects(:truncate_message) \
+      .with('a message').returns('truncated_message')
     segment.expects(:[]=).with(key, 'truncated_message')
     @sampler.expects(:append_backtrace).with(segment, 1.0)
     @sampler.send(:notice_extra_data, 'a message', 1.0, key)
@@ -381,12 +390,12 @@ class NewRelic::Agent::TransactionSamplerTest < Test::Unit::TestCase
 
   def test_truncate_message_short_message
     message = 'a message'
-    assert_equal(message, @sampler.truncate_message(message))
+    assert_equal(message, NewRelic::Agent::TransactionSampler.truncate_message(message))
   end
 
   def test_truncate_message_long_message
     message = 'a' * 16384
-    truncated_message = @sampler.truncate_message(message)
+    truncated_message = NewRelic::Agent::TransactionSampler.truncate_message(message)
     assert_equal(16384, truncated_message.length)
     assert_equal('a' * 16381 + '...', truncated_message)
   end
@@ -558,17 +567,6 @@ class NewRelic::Agent::TransactionSamplerTest < Test::Unit::TestCase
     end
   end
 
-  def test_add_samples_to_under_threshold
-    result = []
-    sample = mock('sample')
-    sample.expects(:duration).returns(1.0).at_least_once
-    @sampler.instance_eval { @slowest_sample = sample }
-    @sampler.expects(:add_random_sample_to).with([])
-    with_config(:'transaction_tracer.transaction_threshold' => 2.0) do
-      assert_equal([], @sampler.add_samples_to(result))
-    end
-  end
-
   def test_add_samples_to_two_sample_enter_one_sample_leave
     slower_sample = mock('slower')
     slower_sample.expects(:duration).returns(10.0).at_least_once
@@ -667,23 +665,23 @@ class NewRelic::Agent::TransactionSamplerTest < Test::Unit::TestCase
   end
 
   def test_sample_tree
-    assert_equal 0, @sampler.scope_depth
+    with_config(:'transaction_tracer.transaction_threshold' => 0.0) do
+      assert_equal 0, @sampler.scope_depth
 
-    @sampler.notice_first_scope_push Time.now.to_f
-    @sampler.notice_transaction "/path", nil, {}
-    @sampler.notice_push_scope "a"
+      @sampler.notice_first_scope_push Time.now.to_f
+      @sampler.notice_transaction "/path", nil, {}
+      @sampler.notice_push_scope "a"
 
-    @sampler.notice_push_scope "b"
-    @sampler.notice_pop_scope "b"
+      @sampler.notice_push_scope "b"
+      @sampler.notice_pop_scope "b"
 
-    @sampler.notice_push_scope "c"
-    @sampler.notice_push_scope "d"
-    @sampler.notice_pop_scope "d"
-    @sampler.notice_pop_scope "c"
+      @sampler.notice_push_scope "c"
+      @sampler.notice_push_scope "d"
+      @sampler.notice_pop_scope "d"
+      @sampler.notice_pop_scope "c"
 
-    @sampler.notice_pop_scope "a"
-    @sampler.notice_scope_empty
-    with_config(:'transaction_tracer.transaction_threshold' => 0.0) do
+      @sampler.notice_pop_scope "a"
+      @sampler.notice_scope_empty
       sample = @sampler.harvest([]).first
       assert_equal "ROOT{a{b,c{d}}}", sample.to_s_compact
     end
@@ -696,22 +694,22 @@ class NewRelic::Agent::TransactionSamplerTest < Test::Unit::TestCase
     MockGCStats.mock_values = [0,0,0,1,0,0,1,0,0,0,0,0,0,0,0]
     assert_equal 0, @sampler.scope_depth
 
-    @sampler.notice_first_scope_push Time.now.to_f
-    @sampler.notice_transaction "/path", nil, {}
-    @sampler.notice_push_scope "a"
+    with_config(:'transaction_tracer.transaction_threshold' => 0.0) do
+      @sampler.notice_first_scope_push Time.now.to_f
+      @sampler.notice_transaction "/path", nil, {}
+      @sampler.notice_push_scope "a"
 
-    @sampler.notice_push_scope "b"
-    @sampler.notice_pop_scope "b"
+      @sampler.notice_push_scope "b"
+      @sampler.notice_pop_scope "b"
 
-    @sampler.notice_push_scope "c"
-    @sampler.notice_push_scope "d"
-    @sampler.notice_pop_scope "d"
-    @sampler.notice_pop_scope "c"
+      @sampler.notice_push_scope "c"
+      @sampler.notice_push_scope "d"
+      @sampler.notice_pop_scope "d"
+      @sampler.notice_pop_scope "c"
 
-    @sampler.notice_pop_scope "a"
-    @sampler.notice_scope_empty
+      @sampler.notice_pop_scope "a"
+      @sampler.notice_scope_empty
 
-    with_config(:'transaction_tracer.transaction_threshold' => 0.0) do
       sample = @sampler.harvest([]).first
       assert_equal "ROOT{a{b,c{d}}}", sample.to_s_compact
     end
@@ -730,14 +728,13 @@ class NewRelic::Agent::TransactionSamplerTest < Test::Unit::TestCase
   # sample traces, for example. It's unfortunate, but we can't
   # reliably turn off GC on all versions of ruby under test
   def test_harvest_slowest
-    run_sample_trace(0,0.1)
-    run_sample_trace(0,0.1)
-    # two second duration
-    run_sample_trace(0,2)
-    run_sample_trace(0,0.1)
-    run_sample_trace(0,0.1)
-
     with_config(:'transaction_tracer.transaction_threshold' => 0.0) do
+      run_sample_trace(0,0.1)
+      run_sample_trace(0,0.1)
+      # two second duration
+      run_sample_trace(0,2)
+      run_sample_trace(0,0.1)
+      run_sample_trace(0,0.1)
 
       slowest = @sampler.harvest(nil)[0]
       first_duration = slowest.duration
@@ -758,8 +755,8 @@ class NewRelic::Agent::TransactionSamplerTest < Test::Unit::TestCase
   end
 
   def test_prepare_to_send
-    run_sample_trace { sleep 0.002 }
     sample = with_config(:'transaction_tracer.transaction_threshold' => 0.0) do
+      run_sample_trace { sleep 0.002 }
       @sampler.harvest(nil)[0]
     end
 
@@ -786,43 +783,43 @@ class NewRelic::Agent::TransactionSamplerTest < Test::Unit::TestCase
   end
 
   def test_sample_with_parallel_paths
-    assert_equal 0, @sampler.scope_depth
+    with_config(:'transaction_tracer.transaction_threshold' => 0.0) do
+      assert_equal 0, @sampler.scope_depth
 
-    @sampler.notice_first_scope_push Time.now.to_f
-    @sampler.notice_transaction "/path", nil, {}
-    @sampler.notice_push_scope "a"
+      @sampler.notice_first_scope_push Time.now.to_f
+      @sampler.notice_transaction "/path", nil, {}
+      @sampler.notice_push_scope "a"
 
-    assert_equal 1, @sampler.scope_depth
+      assert_equal 1, @sampler.scope_depth
 
-    @sampler.notice_pop_scope "a"
-    @sampler.notice_scope_empty
+      @sampler.notice_pop_scope "a"
+      @sampler.notice_scope_empty
 
-    assert_equal 0, @sampler.scope_depth
+      assert_equal 0, @sampler.scope_depth
 
-    @sampler.notice_first_scope_push Time.now.to_f
-    @sampler.notice_transaction "/path", nil, {}
-    @sampler.notice_push_scope "a"
-    @sampler.notice_pop_scope "a"
-    @sampler.notice_scope_empty
+      @sampler.notice_first_scope_push Time.now.to_f
+      @sampler.notice_transaction "/path", nil, {}
+      @sampler.notice_push_scope "a"
+      @sampler.notice_pop_scope "a"
+      @sampler.notice_scope_empty
 
-    assert_equal 0, @sampler.scope_depth
-    with_config(:'transaction_tracer.transaction_threshold' => 0.0) do
+      assert_equal 0, @sampler.scope_depth
       sample = @sampler.harvest(nil).first
       assert_equal "ROOT{a}", sample.to_s_compact
     end
   end
 
   def test_double_scope_stack_empty
-    @sampler.notice_first_scope_push Time.now.to_f
-    @sampler.notice_transaction "/path", nil, {}
-    @sampler.notice_push_scope "a"
-    @sampler.notice_pop_scope "a"
-    @sampler.notice_scope_empty
-    @sampler.notice_scope_empty
-    @sampler.notice_scope_empty
-    @sampler.notice_scope_empty
-
     with_config(:'transaction_tracer.transaction_threshold' => 0.0) do
+      @sampler.notice_first_scope_push Time.now.to_f
+      @sampler.notice_transaction "/path", nil, {}
+      @sampler.notice_push_scope "a"
+      @sampler.notice_pop_scope "a"
+      @sampler.notice_scope_empty
+      @sampler.notice_scope_empty
+      @sampler.notice_scope_empty
+      @sampler.notice_scope_empty
+
       assert_not_nil @sampler.harvest(nil)[0]
     end
   end
@@ -909,11 +906,10 @@ class NewRelic::Agent::TransactionSamplerTest < Test::Unit::TestCase
   def test_param_capture
     [true, false].each do |capture|
       with_config(:capture_params => capture) do
-        @sampler.notice_first_scope_push Time.now.to_f
-        @sampler.notice_transaction('/path', nil, {:param => 'hi'})
-        @sampler.notice_scope_empty
-
         tt = with_config(:'transaction_tracer.transaction_threshold' => 0.0) do
+          @sampler.notice_first_scope_push Time.now.to_f
+          @sampler.notice_transaction('/path', nil, {:param => 'hi'})
+          @sampler.notice_scope_empty
           @sampler.harvest(nil)[0]
         end
 
@@ -936,6 +932,22 @@ class NewRelic::Agent::TransactionSamplerTest < Test::Unit::TestCase
     end
   end
 
+  def test_renaming_current_segment_midflight
+    @sampler.start_builder
+    @sampler.notice_push_scope( 'External/www.google.com/all' )
+    @sampler.rename_scope_segment( 'External/www.google.com/Net::HTTP/GET' )
+    assert_nothing_raised do
+      @sampler.notice_pop_scope( 'External/www.google.com/Net::HTTP/GET' )
+    end
+  end
+
+  def test_adding_segment_parameters
+    @sampler.start_builder
+    @sampler.notice_push_scope( 'External/www.google.com/all' )
+    @sampler.add_segment_parameters( :transaction_guid => '97612F92E6194080' )
+    assert_equal '97612F92E6194080', @sampler.builder.current_segment[:transaction_guid]
+  end
+
   private
 
   def run_sample_trace(start = Time.now.to_f, stop = nil)

data/test/new_relic/agent_test.rb

@@ -42,7 +42,7 @@ module NewRelic
     def test_finish_setup_applied_server_side_config
       with_config({ :'transction_tracer.enabled' => true,
                     'error_collector.enabled' => true,
-                    :log_level => 'info' }, 2) do
+                    :log_level => 'info' }, :level => 2) do
         NewRelic::Agent.instance.finish_setup('log_level' => 'debug',
          'agent_config' => { 'transaction_tracer.enabled' => false },
                                          'collect_errors' => false)
@@ -78,10 +78,6 @@ module NewRelic
           NewRelic::Agent.instance.stats_engine.get_stats_no_scope(metric) \
             .record_data_point(1.0)
 
-          # ensure that cached metric ids don't interfere with metric merging
-          NewRelic::Agent.agent.instance_variable_set(:@metric_ids,
-                            { NewRelic::MetricSpec.new('Instance/Busy') => 1 })
-
           NewRelic::Agent::PipeChannelManager.listener.close_all_pipes
           NewRelic::Agent.register_report_channel(:agent_test) # before fork
           pid = Process.fork do
@@ -237,6 +233,40 @@ module NewRelic
       NewRelic::Agent::PipeChannelManager.listener.close_all_pipes
     end
 
+    def test_record_metric
+      dummy_engine = NewRelic::Agent.agent.stats_engine
+      dummy_engine.expects(:record_metric).with('foo', 12)
+      NewRelic::Agent.record_metric('foo', 12)
+    end
+
+    def test_record_metric_accepts_hash
+      dummy_engine = NewRelic::Agent.agent.stats_engine
+      stats_hash = {
+        :count => 12,
+        :total => 42,
+        :min   => 1,
+        :max   => 5,
+        :sum_of_squares => 999
+      }
+      expected_stats = NewRelic::Agent::Stats.new()
+      expected_stats.call_count = 12
+      expected_stats.total_call_time = 42
+      expected_stats.total_exclusive_time = 42
+      expected_stats.min_call_time = 1
+      expected_stats.max_call_time = 5
+      expected_stats.sum_of_squares = 999
+      dummy_engine.expects(:record_metric).with('foo', expected_stats)
+      NewRelic::Agent.record_metric('foo', stats_hash)
+    end
+
+    def test_increment_metric
+      dummy_engine = NewRelic::Agent.agent.stats_engine
+      dummy_stats = mock
+      dummy_stats.expects(:increment_count).with(12)
+      dummy_engine.expects(:record_metric).with('foo').yields(dummy_stats)
+      NewRelic::Agent.increment_metric('foo', 12)
+    end
+
     private
 
     def mocked_agent