newrelic_rpm 3.7.0.174.beta → 3.7.0.177

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

@@ -14,7 +14,7 @@ class NewRelic::Agent::MetricStatsTest < Test::Unit::TestCase
   end
 
   def teardown
-    @engine.harvest
+    @engine.reset!
     super
   end
 
@@ -46,7 +46,7 @@ class NewRelic::Agent::MetricStatsTest < Test::Unit::TestCase
     assert_equal 2, @engine.get_stats("c").call_count
     assert_equal 4, @engine.get_stats("c").total_call_time
 
-    harvested = @engine.harvest
+    harvested = @engine.harvest!
 
     # after harvest, all the metrics should be reset
     assert_equal 0, @engine.get_stats("a").call_count
@@ -73,7 +73,7 @@ class NewRelic::Agent::MetricStatsTest < Test::Unit::TestCase
     @engine.get_stats_no_scope('Custom/foo/3/bar/44').record_data_point(1)
     @engine.get_stats_no_scope('Custom/foo/5/bar/66').record_data_point(1)
 
-    harvested = @engine.harvest
+    harvested = @engine.harvest!
 
     assert !harvested.has_key?(NewRelic::MetricSpec.new('Custom/foo/1/bar/22'))
     assert !harvested.has_key?(NewRelic::MetricSpec.new('Custom/foo/3/bar/44'))
@@ -87,7 +87,7 @@ class NewRelic::Agent::MetricStatsTest < Test::Unit::TestCase
     s.trace_call 1
     assert_equal 1, @engine.get_stats("a").call_count
 
-    harvest = @engine.harvest
+    harvest = @engine.harvest!
 
     s = @engine.get_stats "a"
     assert_equal 0, s.call_count
@@ -97,7 +97,7 @@ class NewRelic::Agent::MetricStatsTest < Test::Unit::TestCase
     # this should merge the contents of the previous harvest,
     # so the stats for metric "a" should have 2 data points
     @engine.merge!(harvest)
-    harvest = @engine.harvest
+    harvest = @engine.harvest!
     stats = harvest.fetch(NewRelic::MetricSpec.new("a"))
     assert_equal 2, stats.call_count
     assert_equal 3, stats.total_call_time
@@ -120,7 +120,7 @@ class NewRelic::Agent::MetricStatsTest < Test::Unit::TestCase
 
   def test_harvest_adds_harvested_at_time
     t0 = freeze_time
-    result = @engine.harvest
+    result = @engine.harvest!
     assert_equal(t0, result.harvested_at)
   end
 

data/test/new_relic/agent/stats_engine_test.rb

@@ -3,7 +3,7 @@
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..', 'test_helper'))
-
+require File.expand_path(File.join(File.dirname(__FILE__),'..','data_container_tests'))
 
 class NewRelic::Agent::StatsEngineTest < Test::Unit::TestCase
   def setup
@@ -15,11 +15,27 @@ class NewRelic::Agent::StatsEngineTest < Test::Unit::TestCase
   end
 
   def teardown
-    @engine.harvest
+    @engine.reset!
     mocha_teardown
     super
   end
 
+  # Helpers for DataContainerTests
+
+  def create_container
+    NewRelic::Agent::StatsEngine.new
+  end
+
+  def populate_container(engine, n)
+    n.times do |i|
+      engine.record_metrics("metric#{i}", i)
+    end
+  end
+
+  include NewRelic::DataContainerTests
+
+  # Tests
+
   def test_scope
     @engine.push_scope(:scope1)
     assert_equal 1, @engine.scope_stack.size

data/test/new_relic/agent/transaction_sampler_test.rb

@@ -3,6 +3,7 @@
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper'))
+require File.expand_path(File.join(File.dirname(__FILE__),'..','data_container_tests'))
 
 class NewRelic::Agent::TransactionSamplerTest < Test::Unit::TestCase
 
@@ -45,6 +46,23 @@ class NewRelic::Agent::TransactionSamplerTest < Test::Unit::TestCase
     NewRelic::Agent.instance.instance_variable_set(:@transaction_sampler, @old_sampler)
   end
 
+  # Helpers for DataContainerTests
+
+  def create_container
+    @sampler
+  end
+
+  def populate_container(sampler, n)
+    n.times do |i|
+      sample = sample_with(:duration => 1, :transaction_name => "t#{i}", :force_persist => true)
+      @sampler.store_sample(sample)
+    end
+  end
+
+  include NewRelic::DataContainerTests
+
+  # Tests
+
   def test_notice_first_scope_push_default
     @sampler.expects(:start_builder).with(100.0)
     @sampler.notice_first_scope_push(Time.at(100))
@@ -200,8 +218,6 @@ class NewRelic::Agent::TransactionSamplerTest < Test::Unit::TestCase
     segment = mock('segment')
     @sampler.expects(:builder).returns(builder).twice
     builder.expects(:current_segment).returns(segment)
-    segment.expects(:[]).with(key).returns(nil)
-    @sampler.expects(:append_new_message).with(nil, 'a message').returns('a message')
     NewRelic::Agent::TransactionSampler.expects(:truncate_message) \
       .with('a message').returns('truncated_message')
     segment.expects(:[]=).with(key, 'truncated_message')
@@ -209,30 +225,6 @@ class NewRelic::Agent::TransactionSamplerTest < Test::Unit::TestCase
     @sampler.send(:notice_extra_data, 'a message', 1.0, key)
   end
 
-  def test_truncate_message_short_message
-    message = 'a message'
-    assert_equal(message, NewRelic::Agent::TransactionSampler.truncate_message(message))
-  end
-
-  def test_truncate_message_long_message
-    message = 'a' * 16384
-    truncated_message = NewRelic::Agent::TransactionSampler.truncate_message(message)
-    assert_equal(16384, truncated_message.length)
-    assert_equal('a' * 16381 + '...', truncated_message)
-  end
-
-  def test_append_new_message_no_old_message
-    old_message = nil
-    new_message = 'a message'
-    assert_equal(new_message, @sampler.append_new_message(old_message, new_message))
-  end
-
-  def test_append_new_message_with_old_message
-    old_message = 'old message'
-    new_message = ' a message'
-    assert_equal("old message;\n a message", @sampler.append_new_message(old_message, new_message))
-  end
-
   def test_append_backtrace_under_duration
     with_config(:'transaction_tracer.stack_trace_threshold' => 2.0) do
       segment = mock('segment')
@@ -271,7 +263,7 @@ class NewRelic::Agent::TransactionSamplerTest < Test::Unit::TestCase
   def test_harvest_when_disabled
     with_config(:'transaction_tracer.enabled' => false,
                 :developer_mode => false) do
-      assert_equal([], @sampler.harvest)
+      assert_equal([], @sampler.harvest!)
     end
   end
 
@@ -281,26 +273,26 @@ class NewRelic::Agent::TransactionSamplerTest < Test::Unit::TestCase
       @last_sample = 'a sample'
     end
 
-    assert_equal([], @sampler.harvest)
+    assert_equal([], @sampler.harvest!)
 
     # make sure the samples have been cleared
     assert_equal(nil, @sampler.instance_variable_get('@last_sample'))
   end
 
   def test_harvest_no_data
-    assert_equal([], @sampler.harvest)
+    assert_equal([], @sampler.harvest!)
   end
 
   def test_add_samples_holds_onto_previous_result
     sample = sample_with(:duration => 1)
     @sampler.merge!([sample])
-    assert_equal([sample], @sampler.harvest)
+    assert_equal([sample], @sampler.harvest!)
   end
 
   def test_merge_avoids_dups
     sample = sample_with(:duration => 1)
     @sampler.merge!([sample, sample])
-    assert_equal([sample], @sampler.harvest)
+    assert_equal([sample], @sampler.harvest!)
   end
 
   def test_harvest_avoids_dups_from_harvested_samples
@@ -308,20 +300,20 @@ class NewRelic::Agent::TransactionSamplerTest < Test::Unit::TestCase
     @sampler.store_sample(sample)
     @sampler.store_sample(sample)
 
-    assert_equal([sample], @sampler.harvest)
+    assert_equal([sample], @sampler.harvest!)
   end
 
   def test_merge_avoids_dups_from_forced
     sample = sample_with(:duration => 1, :force_persist => true)
     @sampler.merge!([sample, sample])
-    assert_equal([sample], @sampler.harvest)
+    assert_equal([sample], @sampler.harvest!)
   end
 
   def test_harvest_adding_slowest
     sample = sample_with(:duration => 2.5, :force_persist => false)
     @sampler.store_sample(sample)
 
-    assert_equal([sample], @sampler.harvest)
+    assert_equal([sample], @sampler.harvest!)
   end
 
   def test_harvest_new_slower_sample_replaces_older
@@ -331,7 +323,7 @@ class NewRelic::Agent::TransactionSamplerTest < Test::Unit::TestCase
     @sampler.store_sample(slower_sample)
     @sampler.merge!([faster_sample])
 
-    assert_equal([slower_sample], @sampler.harvest)
+    assert_equal([slower_sample], @sampler.harvest!)
   end
 
   def test_harvest_keep_older_slower_sample
@@ -341,7 +333,7 @@ class NewRelic::Agent::TransactionSamplerTest < Test::Unit::TestCase
     @sampler.store_sample(faster_sample)
     @sampler.merge!([slower_sample])
 
-    assert_equal([slower_sample], @sampler.harvest)
+    assert_equal([slower_sample], @sampler.harvest!)
   end
 
   def test_harvest_keep_force_persist_in_previous_results
@@ -349,7 +341,7 @@ class NewRelic::Agent::TransactionSamplerTest < Test::Unit::TestCase
     forced_sample = sample_with(:duration => 1, :force_persist => true)
 
     @sampler.merge!([unforced_sample, forced_sample])
-    result = @sampler.harvest
+    result = @sampler.harvest!
 
     assert_includes(result, unforced_sample)
     assert_includes(result, forced_sample)
@@ -362,7 +354,7 @@ class NewRelic::Agent::TransactionSamplerTest < Test::Unit::TestCase
     unforced_sample = sample_with(:duration => 10, :force_persist => false)
     @sampler.store_sample(unforced_sample)
 
-    result = @sampler.harvest
+    result = @sampler.harvest!
 
     assert_includes(result, unforced_sample)
     assert_includes(result, forced_sample)
@@ -375,7 +367,7 @@ class NewRelic::Agent::TransactionSamplerTest < Test::Unit::TestCase
     old_forced = sample_with(:duration => 1, :force_persist => true)
 
     @sampler.merge!([old_forced])
-    result = @sampler.harvest
+    result = @sampler.harvest!
 
     assert_includes(result, new_forced)
     assert_includes(result, old_forced)
@@ -398,7 +390,7 @@ class NewRelic::Agent::TransactionSamplerTest < Test::Unit::TestCase
     result = nil
     with_active_xray_session("Active/xray") do
       @sampler.merge!(previous)
-      result = @sampler.harvest
+      result = @sampler.harvest!
     end
 
     expected = [slowest]
@@ -424,7 +416,7 @@ class NewRelic::Agent::TransactionSamplerTest < Test::Unit::TestCase
       end
     end
 
-    result = @sampler.harvest
+    result = @sampler.harvest!
 
     expected = [slowest]
     expected = expected.concat(forced_samples.last(FORCE_PERSIST_MAX))
@@ -449,7 +441,7 @@ class NewRelic::Agent::TransactionSamplerTest < Test::Unit::TestCase
       @sampler.store_sample(sample)
     end
 
-    result = @sampler.harvest
+    result = @sampler.harvest!
     assert_equal NewRelic::Agent::Transaction::TransactionSampleBuffer::SINGLE_BUFFER_MAX, result.length
   end
 
@@ -513,7 +505,7 @@ class NewRelic::Agent::TransactionSamplerTest < Test::Unit::TestCase
 
       @sampler.notice_pop_scope "a"
       @sampler.notice_scope_empty(@txn)
-      sample = @sampler.harvest.first
+      sample = @sampler.harvest!.first
       assert_equal "ROOT{a{b,c{d}}}", sample.to_s_compact
     end
   end
@@ -540,7 +532,7 @@ class NewRelic::Agent::TransactionSamplerTest < Test::Unit::TestCase
       @sampler.notice_pop_scope "a"
       @sampler.notice_scope_empty(@txn)
 
-      sample = @sampler.harvest.first
+      sample = @sampler.harvest!.first
       assert_equal "ROOT{a{b,c{d}}}", sample.to_s_compact
     end
   ensure
@@ -559,7 +551,7 @@ class NewRelic::Agent::TransactionSamplerTest < Test::Unit::TestCase
       run_sample_trace(0,0.1)
       run_sample_trace(0,0.1)
 
-      slowest = @sampler.harvest[0]
+      slowest = @sampler.harvest![0]
       first_duration = slowest.duration
       assert((first_duration.round >= 2),
              "expected sample duration = 2, but was: #{slowest.duration.inspect}")
@@ -567,13 +559,13 @@ class NewRelic::Agent::TransactionSamplerTest < Test::Unit::TestCase
       # 1 second duration
       run_sample_trace(0,1)
       @sampler.merge!([slowest])
-      not_as_slow = @sampler.harvest[0]
+      not_as_slow = @sampler.harvest![0]
       assert((not_as_slow == slowest), "Should re-harvest the same transaction since it should be slower than the new transaction - expected #{slowest.inspect} but got #{not_as_slow.inspect}")
 
       run_sample_trace(0,10)
 
       @sampler.merge!([slowest])
-      new_slowest = @sampler.harvest[0]
+      new_slowest = @sampler.harvest![0]
       assert((new_slowest != slowest), "Should not harvest the same trace since the new one should be slower")
       assert_equal(new_slowest.duration.round, 10, "Slowest duration must be = 10, but was: #{new_slowest.duration.inspect}")
     end
@@ -582,7 +574,7 @@ class NewRelic::Agent::TransactionSamplerTest < Test::Unit::TestCase
   def test_prepare_to_send
     sample = with_config(:'transaction_tracer.transaction_threshold' => 0.0) do
       run_sample_trace { sleep 0.002 }
-      @sampler.harvest[0]
+      @sampler.harvest![0]
     end
 
     ready_to_send = sample.prepare_to_send!
@@ -643,7 +635,7 @@ class NewRelic::Agent::TransactionSamplerTest < Test::Unit::TestCase
       @sampler.notice_scope_empty(@txn)
       @sampler.notice_scope_empty(@txn)
 
-      assert_not_nil @sampler.harvest[0]
+      assert_not_nil @sampler.harvest![0]
     end
   end
 
@@ -733,7 +725,7 @@ class NewRelic::Agent::TransactionSamplerTest < Test::Unit::TestCase
           @sampler.notice_first_scope_push Time.now.to_f
           @sampler.notice_transaction(nil, :param => 'hi')
           @sampler.notice_scope_empty(@txn)
-          @sampler.harvest[0]
+          @sampler.harvest![0]
         end
 
         assert_equal (capture ? 1 : 0), tt.params[:request_params].length
@@ -745,13 +737,18 @@ class NewRelic::Agent::TransactionSamplerTest < Test::Unit::TestCase
     with_config(:'transaction_tracer.limit_segments' => 3) do
       run_sample_trace do
         @sampler.notice_push_scope
-        @sampler.notice_sql("SELECT * FROM sandwiches WHERE bread = 'hallah'", {}, 0)
+        @sampler.notice_sql("SELECT * FROM sandwiches WHERE bread = 'challah'", {}, 0)
         @sampler.notice_push_scope
         @sampler.notice_sql("SELECT * FROM sandwiches WHERE bread = 'semolina'", {}, 0)
         @sampler.notice_pop_scope "a11"
         @sampler.notice_pop_scope "a1"
       end
       assert_equal 3, @sampler.last_sample.count_segments
+
+      expected_sql = "SELECT * FROM sandwiches WHERE bread = 'challah'"
+      deepest_segment = find_last_transaction_segment(@sampler.last_sample)
+      assert_equal([], deepest_segment.called_segments)
+      assert_equal(expected_sql, deepest_segment[:sql])
     end
   end
 
@@ -782,7 +779,7 @@ class NewRelic::Agent::TransactionSamplerTest < Test::Unit::TestCase
 
       samples = nil
       assert_nothing_raised do
-        samples = @sampler.harvest
+        samples = @sampler.harvest!
       end
       assert_equal(1, samples.size)
 
@@ -809,6 +806,54 @@ class NewRelic::Agent::TransactionSamplerTest < Test::Unit::TestCase
     end
   end
 
+  def test_harvest_prepare_samples
+    samples = [mock('TT0'), mock('TT1')]
+    samples[0].expects(:prepare_to_send!)
+    samples[1].expects(:prepare_to_send!)
+    @sampler.stubs(:harvest_from_sample_buffers).returns(samples)
+    prepared = @sampler.harvest!
+    assert_equal(samples, prepared)
+  end
+
+  def test_harvest_prepare_samples_with_error
+    samples = [mock('TT0'), mock('TT1')]
+    samples[0].expects(:prepare_to_send!).raises('an error')
+    samples[1].expects(:prepare_to_send!)
+    @sampler.stubs(:harvest_from_sample_buffers).returns(samples)
+    prepared = @sampler.harvest!
+    assert_equal([samples[1]], prepared)
+  end
+
+  def test_custom_params_omitted_if_config_says_so
+    config = {
+      :'transaction_tracer.transaction_threshold' => 0.0,
+      :'capture_attributes.traces' => false
+    }
+    with_config(config) do
+      in_transaction do
+        NewRelic::Agent.add_custom_parameters(:foo => 'bar')
+      end
+    end
+    sample = NewRelic::Agent.agent.transaction_sampler.harvest![0]
+    custom_params = sample.params[:custom_params]
+    assert_false(custom_params.keys.include?(:foo))
+  end
+
+  def test_custom_params_included_if_config_says_so
+    config = {
+      :'transaction_tracer.transaction_threshold' => 0.0,
+      :'capture_attributes.traces' => true
+    }
+    with_config(config) do
+      in_transaction do
+        NewRelic::Agent.add_custom_parameters(:foo => 'bar')
+      end
+    end
+    sample = NewRelic::Agent.agent.transaction_sampler.harvest![0]
+    custom_params = sample.params[:custom_params]
+    assert(custom_params.keys.include?(:foo), "Expected custom param on TT because capture_attributes.traces is true")
+  end
+
   class Dummy
     include ::NewRelic::Agent::Instrumentation::ControllerInstrumentation
     def run(n)
@@ -823,7 +868,7 @@ class NewRelic::Agent::TransactionSamplerTest < Test::Unit::TestCase
   def sadly_do_not_test_harvest_during_transaction_safety
     n = 3000
     harvester = Thread.new do
-      n.times { @sampler.harvest }
+      n.times { @sampler.harvest! }
     end
 
     assert_nothing_raised { Dummy.new.run(n) }

data/test/new_relic/agent/transaction_state_test.rb

@@ -71,5 +71,49 @@ module NewRelic::Agent
       assert_equal 5.0, timings.app_time_in_seconds
       assert_equal transaction.name, timings.transaction_name
     end
+
+    GUID = "goo-id"
+
+    def test_request_guid_to_include
+      with_config(:apdex_t => 2.0) do
+        freeze_time
+
+        state.request_token = "token"
+        state.request_guid = GUID
+        state.transaction = NewRelic::Agent::Transaction.new
+
+        advance_time(4.0)
+
+        assert_equal GUID, state.request_guid_to_include
+      end
+    end
+
+    def test_requst_guid_excluded_if_request_fast_enough
+      with_config(:apdex_t => 2.0) do
+        freeze_time
+
+        state.request_token = "token"
+        state.request_guid = GUID
+        state.transaction = NewRelic::Agent::Transaction.new
+
+        advance_time(1.0)
+
+        assert_equal "", state.request_guid_to_include
+      end
+    end
+
+    def test_request_guid_excluded_if_no_token
+      with_config(:apdex_t => 2.0) do
+        freeze_time
+
+        state.request_token = nil
+        state.request_guid = GUID
+        state.transaction = NewRelic::Agent::Transaction.new
+
+        advance_time(4.0)
+
+        assert_equal "", state.request_guid_to_include
+      end
+    end
   end
 end