newrelic_rpm 3.9.6.257 → 3.9.7.266

data/test/new_relic/agent/transaction/synthetics_sample_buffer_test.rb

@@ -0,0 +1,38 @@
+# 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 NewRelic::Agent::Transaction
+  class SyntheticsSampleBufferTest < Minitest::Test
+    def setup
+      @buffer = SyntheticsSampleBuffer.new
+    end
+
+    def test_doesnt_store_if_not_synthetics
+      sample = stub(:synthetics_resource_id => nil)
+      @buffer.store(sample)
+      assert_empty @buffer.samples
+    end
+
+    def test_stores_if_synthetics
+      sample = stub(:synthetics_resource_id => 42)
+      @buffer.store(sample)
+      assert_equal [sample], @buffer.samples
+    end
+
+    def test_applies_limits
+      last_sample = nil
+
+      try_count = @buffer.capacity + 1
+      try_count.times do |i|
+        last_sample = stub(:synthetics_resource_id => i)
+        @buffer.store(last_sample)
+      end
+
+      assert_equal @buffer.capacity, @buffer.samples.length
+      refute_includes @buffer.samples, last_sample
+    end
+  end
+end

data/test/new_relic/agent/{request_sampler_test.rb → transaction_event_aggregator_test.rb}

@@ -5,14 +5,14 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper'))
 require File.expand_path(File.join(File.dirname(__FILE__),'..','data_container_tests'))
-require 'new_relic/agent/request_sampler'
+require 'new_relic/agent/transaction_event_aggregator'
 
-class NewRelic::Agent::RequestSamplerTest < Minitest::Test
+class NewRelic::Agent::TransactionEventAggregatorTest < Minitest::Test
 
   def setup
     freeze_time
     @event_listener = NewRelic::Agent::EventListener.new
-    @sampler = NewRelic::Agent::RequestSampler.new( @event_listener )
+    @sampler = NewRelic::Agent::TransactionEventAggregator.new(@event_listener)
   end
 
   # Helpers for DataContainerTests
@@ -207,7 +207,7 @@ class NewRelic::Agent::RequestSamplerTest < Minitest::Test
   end
 
   def test_resets_limits_on_harvest
-    with_sampler_config( :'request_sampler.max_samples_stored' => 100 ) do
+    with_sampler_config( :'analytics_events.max_samples_stored' => 100 ) do
       50.times { generate_request('before') }
       samples_before = @sampler.samples
       assert_equal 50, samples_before.size
@@ -243,6 +243,57 @@ class NewRelic::Agent::RequestSamplerTest < Minitest::Test
     assert_equal('404', code)
   end
 
+  def test_synthetics_aggregation_limits
+    with_sampler_config(:'synthetics.events_limit' => 10) do
+      20.times do
+        generate_request('synthetic', :synthetics_resource_id => 100)
+      end
+
+      assert_equal 10, @sampler.samples.size
+    end
+  end
+
+
+  def test_merging_synthetics_still_applies_limit
+    samples = with_sampler_config(:'synthetics.events_limit' => 20) do
+      20.times do
+        generate_request('synthetic', :synthetics_resource_id => 100)
+      end
+      @sampler.harvest!
+    end
+
+    with_sampler_config(:'synthetics.events_limit' => 10) do
+      @sampler.merge!(samples)
+      assert_equal 10, @sampler.samples.size
+    end
+  end
+
+  def test_synthetics_event_dropped_records_supportability_metrics
+    with_sampler_config(:'synthetics.events_limit' => 20) do
+      20.times do
+        generate_request('synthetic', :synthetics_resource_id => 100)
+      end
+
+      @sampler.harvest!
+
+      metric = 'Supportability/TransactionEventAggregator/synthetics_events_dropped'
+      assert_metrics_not_recorded(metric)
+    end
+  end
+
+  def test_synthetics_event_dropped_records_supportability_metrics
+    with_sampler_config(:'synthetics.events_limit' => 10) do
+      20.times do
+        generate_request('synthetic', :synthetics_resource_id => 100)
+      end
+
+      @sampler.harvest!
+
+      metric = 'Supportability/TransactionEventAggregator/synthetics_events_dropped'
+      assert_metrics_recorded(metric => { :call_count => 10 })
+    end
+  end
+
   #
   # Helpers
   #

data/test/new_relic/agent/transaction_sampler_test.rb

@@ -42,6 +42,7 @@ class NewRelic::Agent::TransactionSamplerTest < Minitest::Test
                 :custom_parameters => {},
                 :cat_trip_id => '',
                 :cat_path_hash => '',
+                :is_synthetics_request? => false,
                 :filtered_params => {} )
   end
 
@@ -614,17 +615,6 @@ class NewRelic::Agent::TransactionSamplerTest < Minitest::Test
     end
   end
 
-  def test_stack_trace_scope
-    with_config(:'transaction_tracer.stack_trace_threshold' => 0) do
-      t = Time.now
-      @sampler.on_start_transaction(@state, t.to_f)
-      @sampler.notice_push_frame(@state, (t+1).to_f)
-
-      segment = @sampler.send(:tl_builder).current_segment
-      assert segment[:backtrace]
-    end
-  end
-
   def test_nil_stacktrace
     with_config(:'transaction_tracer.stack_trace_threshold' => 2) do
       @sampler.on_start_transaction(@state, Time.now.to_f)
@@ -839,6 +829,38 @@ class NewRelic::Agent::TransactionSamplerTest < Minitest::Test
     assert_equal path_hash, custom_params_from_last_sample[:'nr.path_hash']
   end
 
+  def test_synthetics_parameters_not_included_if_not_valid_synthetics_request
+    with_config(:'transaction_tracer.transaction_threshold' => 0.0) do
+      in_transaction do |txn|
+        txn.raw_synthetics_header = nil
+        txn.synthetics_payload = nil
+      end
+    end
+
+    sample = NewRelic::Agent.agent.transaction_sampler.harvest!.first
+
+    custom_params = sample.params[:custom_params]
+    assert_nil sample.synthetics_resource_id
+    assert_nil custom_params[:'nr.synthetics_resource_id']
+    assert_nil custom_params[:'nr.synthetics_job_id']
+    assert_nil custom_params[:'nr.synthetics_monitor_id']
+  end
+
+  def test_synthetics_parameters_included
+    in_transaction do |txn|
+      txn.raw_synthetics_header = ""
+      txn.synthetics_payload = [1, 1, 100, 200, 300]
+    end
+
+    sample = NewRelic::Agent.agent.transaction_sampler.harvest!.first
+
+    custom_params = sample.params[:custom_params]
+    assert_equal 100, sample.synthetics_resource_id
+    assert_equal 100, custom_params[:'nr.synthetics_resource_id']
+    assert_equal 200, custom_params[:'nr.synthetics_job_id']
+    assert_equal 300, custom_params[:'nr.synthetics_monitor_id']
+  end
+
   class Dummy
     include ::NewRelic::Agent::Instrumentation::ControllerInstrumentation
     def run(n)

data/test/new_relic/agent/transaction_state_test.rb

@@ -100,7 +100,6 @@ module NewRelic::Agent
       state.is_cross_app_caller = true
       state.client_cross_app_id = :client_cross_app_id
       state.referring_transaction_info = :referring_transaction_info
-      state.request_token = :request_token
       state.busy_entries = 1
       state.sql_sampler_transaction_data = Object.new
       state.transaction_sample_builder = Object.new

data/test/new_relic/agent/transaction_test.rb

@@ -343,24 +343,6 @@ class NewRelic::Agent::TransactionTest < Minitest::Test
     refute found_guid
   end
 
-  def test_end_fires_a_transaction_finished_event_with_guid_if_request_token_and_too_long
-    guid = nil
-    NewRelic::Agent.subscribe(:transaction_finished) do |payload|
-      guid = payload[:guid]
-    end
-
-    with_config(:apdex_t => 2.0) do
-      freeze_time
-      in_transaction do
-        state = NewRelic::Agent::TransactionState.tl_get
-        state.request_token = 'token'
-        advance_time 4.0
-      end
-    end
-
-    refute_empty guid
-  end
-
   def test_end_fires_a_transaction_finished_event_with_guid_if_referring_transaction
     guid = nil
     NewRelic::Agent.subscribe(:transaction_finished) do |payload|
@@ -438,6 +420,23 @@ class NewRelic::Agent::TransactionTest < Minitest::Test
     end
   end
 
+  def test_guid_in_finish_event_payload_if_incoming_synthetics_header
+    keys = []
+    NewRelic::Agent.subscribe(:transaction_finished) do |payload|
+      keys = payload.keys
+    end
+
+    raw_synthetics_header = 'dummy data'
+    synthetics_payload    = [123, 456, 789, 111]
+
+    in_transaction do |txn|
+      txn.raw_synthetics_header = raw_synthetics_header
+      txn.synthetics_payload    = synthetics_payload
+    end
+
+    assert_includes keys, :guid
+  end
+
   def test_cross_app_fields_in_finish_event_payload
     keys = []
     NewRelic::Agent.subscribe(:transaction_finished) do |payload|
@@ -464,7 +463,6 @@ class NewRelic::Agent::TransactionTest < Minitest::Test
       advance_time(10)
 
       state = NewRelic::Agent::TransactionState.tl_get
-      state.request_token = 'token'
       state.is_cross_app_caller = false
     end
 
@@ -472,6 +470,73 @@ class NewRelic::Agent::TransactionTest < Minitest::Test
     refute_includes keys, :cat_path_hash
   end
 
+  def test_is_not_synthetic_request_without_payload
+    in_transaction do |txn|
+      txn.raw_synthetics_header = ""
+      refute txn.is_synthetics_request?
+    end
+  end
+
+  def test_is_not_synthetic_request_without_header
+    in_transaction do |txn|
+      txn.synthetics_payload = [1,2,3,4,5]
+      refute txn.is_synthetics_request?
+    end
+  end
+
+  def test_is_synthetic_request
+    in_transaction do |txn|
+      txn.raw_synthetics_header = ""
+      txn.synthetics_payload = [1,2,3,4,5]
+      assert txn.is_synthetics_request?
+    end
+  end
+
+  def test_synthetics_accessors
+    in_transaction do
+      state = NewRelic::Agent::TransactionState.tl_get
+      txn = state.current_transaction
+      txn.synthetics_payload = [1,2,3,4,5]
+
+      assert_equal 1, txn.synthetics_version
+      assert_equal 2, txn.synthetics_account_id
+      assert_equal 3, txn.synthetics_resource_id
+      assert_equal 4, txn.synthetics_job_id
+      assert_equal 5, txn.synthetics_monitor_id
+    end
+  end
+
+  def test_synthetics_fields_in_finish_event_payload
+    keys = []
+    NewRelic::Agent.subscribe(:transaction_finished) do |payload|
+      keys = payload.keys
+    end
+
+    in_transaction do |txn|
+      txn.raw_synthetics_header = "something"
+      txn.synthetics_payload = [1, 1, 100, 200, 300]
+    end
+
+    assert_includes keys, :synthetics_resource_id
+    assert_includes keys, :synthetics_job_id
+    assert_includes keys, :synthetics_monitor_id
+  end
+
+  def test_synthetics_fields_not_in_finish_event_payload_if_no_cross_app_calls
+    keys = []
+    NewRelic::Agent.subscribe(:transaction_finished) do |payload|
+      keys = payload.keys
+    end
+
+    in_transaction do |txn|
+      # Make totally sure we're not synthetic
+      txn.raw_synthetics_header = nil
+    end
+
+    refute_includes keys, :synthetics_resource_id
+    refute_includes keys, :synthetics_job_id
+    refute_includes keys, :synthetics_monitor_id
+  end
   def test_logs_warning_if_a_non_hash_arg_is_passed_to_add_custom_params
     expects_logging(:warn, includes("add_custom_parameters"))
     in_transaction do
@@ -947,6 +1012,43 @@ class NewRelic::Agent::TransactionTest < Minitest::Test
     end
   end
 
+  def test_doesnt_record_queue_time_if_it_is_zero
+    in_transaction('boo') do
+      # nothing
+    end
+    assert_metrics_not_recorded(['WebFrontend/QueueTime'])
+  end
+
+  def test_doesnt_record_scoped_queue_time_metric
+    t0 = freeze_time
+    advance_time 10.0
+    in_transaction('boo', :apdex_start_time => t0) do
+      # nothing
+    end
+    assert_metrics_recorded('WebFrontend/QueueTime' => { :call_count => 1, :total_call_time => 10.0 })
+    assert_metrics_not_recorded(
+      [['WebFrontend/QueueTime', 'boo']]
+    )
+  end
+
+  def test_doesnt_record_crazy_high_queue_times
+    t0 = freeze_time(Time.at(10.0))
+    advance_time(40 * 365 * 24 * 60 * 60) # 40 years
+    in_transaction('boo', :apdex_start_time => t0) do
+      # nothing
+    end
+    assert_metrics_not_recorded(['WebFrontend/QueueTime'])
+  end
+
+  def test_background_transactions_with_ignore_rules_are_ok
+    with_config(:'rules.ignore_url_regexes' => ['foobar']) do
+      in_transaction('foo') do
+      end
+    end
+
+    assert_metrics_recorded(['foo'])
+  end
+
   def assert_has_custom_parameter(txn, key, value = key)
     assert_equal(value, txn.custom_parameters[key])
   end

data/test/new_relic/coerce_test.rb

@@ -104,11 +104,46 @@ class CoerceTest < Minitest::Test
     )
   end
 
-  def test_event_params_coerce_only_allow_values_that_are_strings_symbols_floats_or_ints
+  def test_event_params_coerce_only_allow_values_that_are_strings_symbols_floats_or_ints_or_bools
     assert_equal(
-      {'foo' => 1.0, 'bar' => 2, 'bang' => 'woot', 'ok' => 'dokey'},
+      {
+        'foo'    => 1.0,
+        'bar'    => 2,
+        'bang'   => 'woot',
+        'ok'     => 'dokey',
+        'truthy' => true,
+        'falsy'  => false
+      },
       event_params(
-        {'foo' => 1.0, 'bar' => 2, 'bang' => 'woot', 'ok' => :dokey, 'bad' => [], 'worse' => {}, 'nope' => Rational(1)}
+        {
+          'foo'    => 1.0,
+          'bar'    => 2,
+          'bang'   => 'woot',
+          'ok'     => :dokey,
+          'bad'    => [],
+          'worse'  => {},
+          'nope'   => Rational(1),
+          'truthy' => true,
+          'falsy'  => false
+        }
+      )
+    )
+  end
+
+  def test_event_params_turns_nan_or_infinity_into_null
+    assert_equal(
+      {
+        'nan'  => nil,
+        'inf'  => nil,
+        'ninf' => nil
+      },
+      event_params(
+        {
+          # Ruby 1.8.7 doesn't have Float::NAN, INFINITY so we have to hack it
+          'nan'  => 0.0  / 0.0,
+          'inf'  => 1.0  / 0.0,
+          'ninf' => -1.0 / 0.0
+        }
       )
     )
   end

data/test/new_relic/control_test.rb

@@ -227,5 +227,6 @@ class NewRelic::ControlTest < Minitest::Test
     NewRelic::Agent.instance.harvest_samplers.clear
     NewRelic::Agent.instance.instance_variable_set(:@connect_state, :pending)
     NewRelic::Agent.instance.instance_variable_set(:@worker_thread, nil)
+    NewRelic::Agent.instance.harvester.instance_variable_set(:@starting_pid, nil)
   end
 end

data/test/new_relic/fake_collector.rb

@@ -54,8 +54,8 @@ module NewRelic
 
     attr_accessor :agent_data, :mock
 
-    def initialize(ssl=false)
-      super(DEFAULT_PORT, ssl)
+    def initialize
+      super(DEFAULT_PORT)
       @id_counter = 0
       @mock = {
         'get_redirect_host'       => Response.new(200, {'return_value' => 'localhost'}),
@@ -284,6 +284,10 @@ module NewRelic
         def xray_id
           @body[8]
         end
+
+        def synthetics_resource_id
+          @body[9]
+        end
       end
 
       class SubmittedTransactionTraceTree