newrelic_rpm 3.14.1.311 → 3.14.2.312

data/test/multiverse/suites/sinatra/nested_middleware_test.rb

@@ -28,12 +28,20 @@ class NestedMiddlewareTest < Minitest::Test
 
   def test_inner_transaction
     get '/main'
-    assert_metrics_recorded(["Controller/Sinatra/MainApp/GET main"])
+    assert_metrics_recorded(["Controller/Sinatra/MainApp/#{name_for_route('main')}"])
     assert_metrics_not_recorded(["Controller/Sinatra/MiddlewareApp/GET (unknown)"])
   end
 
   def test_outer_transaction
     get '/middle'
-    assert_metrics_recorded(["Controller/Sinatra/MiddlewareApp/GET middle"])
+    assert_metrics_recorded(["Controller/Sinatra/MiddlewareApp/#{name_for_route('middle')}"])
+  end
+
+  def name_for_route path
+    if last_request.env.key? 'sinatra.route'
+      "GET /#{path}"
+    else
+      "GET #{path}"
+    end
   end
 end

data/test/multiverse/suites/sinatra/sinatra_classic_test.rb

@@ -21,6 +21,10 @@ configure do
   end
 end
 
+get '/' do
+  "root path"
+end
+
 get '/user/login' do
   "please log in"
 end

data/test/multiverse/suites/sinatra/sinatra_metric_explosion_test.rb

@@ -42,9 +42,15 @@ class SinatraMetricExplosionTest < Minitest::Test
 
   def test_transaction_name_from_route
     get '/hello/world'
+
+    segment = if last_request.env.key? 'sinatra.route'
+      'GET /hello/:name'
+    else
+      'GET hello/([^/?#]+)'
+    end
     assert_metrics_recorded([
-      'Controller/Sinatra/SinatraTestApp/GET hello/([^/?#]+)',
-      'Apdex/Sinatra/SinatraTestApp/GET hello/([^/?#]+)'
+      "Controller/Sinatra/SinatraTestApp/#{segment}",
+      "Apdex/Sinatra/SinatraTestApp/#{segment}"
     ])
   end
 

data/test/multiverse/suites/sinatra/sinatra_modular_test.rb

@@ -21,6 +21,10 @@ class SinatraModularTestApp < Sinatra::Base
     end
   end
 
+  get '/' do
+    "root path"
+  end
+
   get '/user/login' do
     "please log in"
   end

data/test/multiverse/suites/sinatra/sinatra_parameter_capture_test.rb

@@ -68,8 +68,10 @@ class SinatraParameterCaptureTest < Minitest::Test
     post '/capture_test'
 
     expected = {
+      "response.headers.contentLength" => last_response.content_length.to_i,
       "response.headers.contentType" => last_response.content_type,
       "request.headers.contentLength" => last_request.content_length.to_i,
+      "request.headers.contentType" => last_request.content_type,
       "request.headers.host" => last_request.host,
       "request.method" => last_request.request_method
     }

data/test/multiverse/suites/sinatra/sinatra_test_cases.rb

@@ -10,6 +10,65 @@ module SinatraTestCases
   include Rack::Test::Methods
   include MultiverseHelpers
 
+  module SinatraRouteNaming
+    # get '/route/:name'
+    def route_name_segment
+      'GET /route/:name'
+    end
+
+    # get '/route/no_match'
+    def route_no_match_segment
+      'GET /route/no_match'
+    end
+
+    # get /\/regex.*/
+    def regex_segment
+      'GET (?-mix:\/regex.*)'
+    end
+
+    # get '/precondition'
+    def precondition_segment
+      'GET /precondition'
+    end
+
+    #get '/ignored'
+    def ignored_segment
+      'GET /ignored'
+    end
+  end
+
+  module NRRouteNaming
+    # get '/route/:name'
+    def route_name_segment
+      'GET route/([^/?#]+)'
+    end
+
+    # get '/route/no_match'
+    def route_no_match_segment
+      'GET route/no_match'
+    end
+
+    # get /\/regex.*/
+    def regex_segment
+      'GET regex.*'
+    end
+
+    # get '/precondition'
+    def precondition_segment
+      'GET precondition'
+    end
+
+    #get '/ignored'
+    def ignored_segment
+      'GET ignored'
+    end
+  end
+
+  if Sinatra::VERSION >= '1.4.3'
+    include SinatraRouteNaming
+  else
+    include NRRouteNaming
+  end
 
   def app
     raise "Must implement app on your test case"
@@ -69,27 +128,30 @@ module SinatraTestCases
   def test_correct_pattern
     get '/route/match'
     assert_equal 'first route', last_response.body
-    assert_metrics_recorded(["Controller/Sinatra/#{app_name}/GET route/([^/?#]+)"])
+    assert_metrics_recorded(["Controller/Sinatra/#{app_name}/#{route_name_segment}"])
   end
 
   def test_finds_second_route
     get '/route/no_match'
     assert_equal 'second route', last_response.body
-    assert_metrics_recorded(["Controller/Sinatra/#{app_name}/GET route/no_match"])
+    assert_metrics_recorded(["Controller/Sinatra/#{app_name}/#{route_no_match_segment}"])
   end
 
   def test_with_regex_pattern
     get '/regexes'
     assert_equal "Yeah, regex's!", last_response.body
-    assert_metrics_recorded(["Controller/Sinatra/#{app_name}/GET regex.*"])
+    assert_metrics_recorded(["Controller/Sinatra/#{app_name}/#{regex_segment}"])
   end
 
-  def test_set_unknown_transaction_name_if_error_in_routing
-    ::NewRelic::Agent::Instrumentation::Sinatra::TransactionNamer \
-      .stubs(:http_verb).raises(StandardError.new('madness'))
+  # this test is not applicable to environments that use sinatra.route for txn naming
+  if self.include? NRRouteNaming
+    def test_set_unknown_transaction_name_if_error_in_routing
+      ::NewRelic::Agent::Instrumentation::Sinatra::TransactionNamer \
+        .stubs(:http_verb).raises(StandardError.new('madness'))
 
-    get '/user/login'
-    assert_metrics_recorded(["Controller/Sinatra/#{app_name}/(unknown)"])
+      get '/user/login'
+      assert_metrics_recorded(["Controller/Sinatra/#{app_name}/(unknown)"])
+    end
   end
 
   # https://support.newrelic.com/tickets/31061
@@ -98,7 +160,7 @@ module SinatraTestCases
 
     assert_equal 200, last_response.status
     assert_equal 'precondition only happened once', last_response.body
-    assert_metrics_recorded(["Controller/Sinatra/#{app_name}/GET precondition"])
+    assert_metrics_recorded(["Controller/Sinatra/#{app_name}/#{precondition_segment}"])
   end
 
   def test_filter
@@ -112,7 +174,7 @@ module SinatraTestCases
     get '/ignored'
 
     assert_equal 200, last_response.status
-    assert_metrics_not_recorded(["Controller/Sinatra/#{app_name}/GET ignored"])
+    assert_metrics_not_recorded(["Controller/Sinatra/#{app_name}/#{ignored_segment}"])
   end
 
   def test_rack_request_params_errors_are_swallowed
@@ -136,4 +198,11 @@ module SinatraTestCases
       stubs(:params).returns({}).
       then.raises("Rack::Request#params error")
   end
+
+  def test_root_path_naming
+    get '/'
+
+    assert_metrics_recorded ["Controller/Sinatra/#{app_name}/GET /"]
+    refute_metrics_recorded ["Controller/Sinatra/#{app_name}/GET "]
+  end
 end

data/test/new_relic/agent/agent_test.rb

@@ -236,7 +236,7 @@ module NewRelic
         @agent.stats_engine.expects(:merge!).never
         @agent.error_collector.expects(:merge!).never
         @agent.transaction_sampler.expects(:merge!).never
-        @agent.instance_variable_get(:@transaction_event_aggregator).expects(:merge!).never
+        @agent.transaction_event_aggregator.expects(:merge!).never
         @agent.sql_sampler.expects(:merge!).never
         @agent.merge_data_for_endpoint(:metric_data, [])
         @agent.merge_data_for_endpoint(:transaction_sample_data, [])
@@ -270,8 +270,8 @@ module NewRelic
 
       def test_harvest_and_send_analytic_event_data_merges_in_samples_on_failure
         service = @agent.service
-        transaction_event_aggregator = @agent.instance_variable_get(:@transaction_event_aggregator)
-        samples = [mock('some analytics event')]
+        transaction_event_aggregator = @agent.transaction_event_aggregator
+        samples = [{:reservoir_size => 100, :events_seen => 1}, [mock('some analytics event')]]
 
         transaction_event_aggregator.expects(:harvest!).returns(samples)
         transaction_event_aggregator.expects(:merge!).with(samples)

data/test/new_relic/agent/aws_info_test.rb

@@ -27,8 +27,7 @@ module NewRelic::Agent
       Net::HTTP.stubs(:get).returns("j" * 1000)
 
       NewRelic::Agent.logger.stubs(:debug)
-      NewRelic::Agent.logger.expects(:debug).with(anything,
-                                                  instance_of(NewRelic::Agent::AWSInfo::ResponseError))
+      NewRelic::Agent.logger.expects(:debug).with(anything)
 
       AWSInfo.new
     end

data/test/new_relic/agent/configuration/orphan_configuration_test.rb

@@ -35,6 +35,7 @@ class OrphanedConfigTest < Minitest::Test
   DEFAULT_VALUE_OF_PATTERN  = /:default\s*=>\s*value_of\(:['"]?([a-z\._]+)['"]?\)\s*/
   REGISTER_CALLBACK_PATTERN = /register_callback\(:['"]?([a-z\._]+)['"]?\)/
   NAMED_DEPENDENCY_PATTERN  = /^\s*named[ (]+\:?([a-z0-9\._]+).*$/
+  EVENT_BUFFER_MACRO_PATTERN = /(capacity_key|enabled_key)\s+:['"]?([a-z\._]+)['"]?/
 
   def test_all_default_source_config_keys_are_used_in_the_agent
     non_test_files.each do |file|
@@ -43,6 +44,7 @@ class OrphanedConfigTest < Minitest::Test
         captures << line.scan(AGENT_CONFIG_PATTERN)
         captures << line.scan(DEFAULT_VALUE_OF_PATTERN)
         captures << line.scan(REGISTER_CALLBACK_PATTERN)
+        captures << line.scan(EVENT_BUFFER_MACRO_PATTERN)
         captures << line.scan(NAMED_DEPENDENCY_PATTERN).map(&method(:disable_name))
 
         captures.flatten.map do |key|

data/test/new_relic/agent/custom_event_aggregator_test.rb

@@ -35,7 +35,9 @@ module NewRelic::Agent
         @aggregator.record(:footype, :number => i)
       end
 
-      results = @aggregator.harvest!
+      metadata, results = @aggregator.harvest!
+      assert_equal(max_samples, metadata[:reservoir_size])
+      assert_equal(n, metadata[:events_seen])
       assert_equal(max_samples, results.size)
     end
 
@@ -48,7 +50,9 @@ module NewRelic::Agent
 
       new_max_samples = orig_max_samples - 10
       with_config(:'custom_insights_events.max_samples_stored' => new_max_samples) do
-        results = @aggregator.harvest!
+        metadata, results = @aggregator.harvest!
+        assert_equal(new_max_samples, metadata[:reservoir_size])
+        assert_equal(orig_max_samples, metadata[:events_seen])
         assert_equal(new_max_samples, results.size)
       end
     end
@@ -66,7 +70,7 @@ module NewRelic::Agent
 
         @aggregator.merge!(old_events)
 
-        events = @aggregator.harvest!
+        _, events = @aggregator.harvest!
 
         assert_equal(10, events.size)
       end
@@ -76,7 +80,7 @@ module NewRelic::Agent
       t0 = Time.now
       @aggregator.record(:type_a, :foo => :bar, :baz => :qux)
 
-      events = @aggregator.harvest!
+      _, events = @aggregator.harvest!
 
       assert_equal(1, events.size)
       event = events.first
@@ -84,5 +88,40 @@ module NewRelic::Agent
       assert_equal({ 'type' => 'type_a', 'timestamp' => t0.to_i }, event[0])
       assert_equal({ 'foo'  => 'bar'   , 'baz'       => 'qux'   }, event[1])
     end
+
+    def test_sample_counts_are_correct_after_merge
+      with_config :'custom_insights_events.max_samples_stored' => 5 do
+        buffer = @aggregator.instance_variable_get :@buffer
+
+        4.times { @aggregator.record(:t, :foo => :bar) }
+        last_harvest = @aggregator.harvest!
+
+        assert_equal 4, buffer.seen_lifetime
+        assert_equal 4, buffer.captured_lifetime
+        assert_equal 4, last_harvest[0][:events_seen]
+
+        4.times { @aggregator.record(:t, :foo => :bar) }
+        @aggregator.merge! last_harvest
+
+        reservoir_stats, samples = @aggregator.harvest!
+
+        assert_equal 5, samples.size
+        assert_equal 8, reservoir_stats[:events_seen]
+        assert_equal 8, buffer.seen_lifetime
+        assert_equal 5, buffer.captured_lifetime
+      end
+    end
+
+    def test_records_supportability_metrics_after_harvest
+      with_config :'custom_insights_events.max_samples_stored' => 5 do
+        engine = NewRelic::Agent.instance.stats_engine
+        engine.expects(:tl_record_supportability_metric_count).with("Events/Customer/Seen", 9)
+        engine.expects(:tl_record_supportability_metric_count).with("Events/Customer/Sent", 5)
+        engine.expects(:tl_record_supportability_metric_count).with("Events/Customer/Dropped", 4)
+
+        9.times { @aggregator.record(:t, :foo => :bar) }
+        @aggregator.harvest!
+      end
+    end
   end
 end

data/test/new_relic/agent/error_collector_test.rb

@@ -265,7 +265,7 @@ class NewRelic::Agent::ErrorCollectorTest < Minitest::Test
 
   def test_skip_notice_error_is_true_if_the_error_collector_is_disabled
     error = StandardError.new
-    with_config(:'error_collector.enabled' => false) do
+    with_config(:'error_collector.enabled' => false, :'error_collector.capture_events' => false) do
       assert @error_collector.skip_notice_error?(error)
     end
   end

data/test/new_relic/agent/error_event_aggregator_test.rb

@@ -38,10 +38,10 @@ module NewRelic
 
         intrinsics, *_ = last_error_event
 
-        assert_equal "TransactionError", intrinsics[:type]
-        assert_in_delta Time.now.to_f, intrinsics[:timestamp], 0.001
-        assert_equal "RuntimeError", intrinsics[:'error.class']
-        assert_equal "Big Controller!", intrinsics[:'error.message']
+        assert_equal 'TransactionError', intrinsics['type']
+        assert_in_delta Time.now.to_f, intrinsics['timestamp'], 0.001
+        assert_equal "RuntimeError", intrinsics['error.class']
+        assert_equal "Big Controller!", intrinsics['error.message']
       end
 
       def test_generates_event_from_error
@@ -49,81 +49,13 @@ module NewRelic
 
         intrinsics, *_ = last_error_event
 
-        assert_equal "TransactionError", intrinsics[:type]
-        assert_in_delta Time.now.to_f, intrinsics[:timestamp], 0.001
-        assert_equal "RuntimeError", intrinsics[:'error.class']
-        assert_equal "Big Controller!", intrinsics[:'error.message']
-        assert_equal "Controller/blogs/index", intrinsics[:transactionName]
-        assert_equal 0.1, intrinsics[:duration]
-        assert_equal 80, intrinsics[:port]
-      end
-
-      def test_event_includes_synthetics
-        generate_error :payload_options => {
-          :synthetics_resource_id=>3,
-          :synthetics_job_id=>4,
-          :synthetics_monitor_id=>5
-        }
-
-        intrinsics, *_ = last_error_event
-
-        assert_equal 3, intrinsics[:'nr.syntheticsResourceId']
-        assert_equal 4, intrinsics[:'nr.syntheticsJobId']
-        assert_equal 5, intrinsics[:'nr.syntheticsMonitorId']
-      end
-
-      def test_includes_mapped_metrics
-        metrics = NewRelic::Agent::TransactionMetrics.new
-        metrics.record_unscoped 'Datastore/all', 10
-        metrics.record_unscoped 'GC/Transaction/all', 11
-        metrics.record_unscoped 'WebFrontend/QueueTime', 12
-        metrics.record_unscoped 'External/allWeb', 13
-
-        generate_error :payload_options => {:metrics => metrics}
-
-        intrinsics, *_ = last_error_event
-
-        assert_equal 10.0, intrinsics["databaseDuration"]
-        assert_equal 1, intrinsics["databaseCallCount"]
-        assert_equal 11.0, intrinsics["gcCumulative"]
-        assert_equal 12.0, intrinsics["queueDuration"]
-        assert_equal 13.0, intrinsics["externalDuration"]
-        assert_equal 1, intrinsics["externalCallCount"]
-      end
-
-      def test_includes_cat_attributes
-        generate_error :payload_options => {:guid => "GUID", :referring_transaction_guid=>"REFERRING_GUID"}
-
-        intrinsics, *_ = last_error_event
-
-        assert_equal "GUID", intrinsics[:"nr.transactionGuid"]
-        assert_equal "REFERRING_GUID", intrinsics[:"nr.referringTransactionGuid"]
-      end
-
-      def test_includes_custom_attributes
-        attrs = {"user" => "Wes Mantooth", "channel" => 9}
-
-        attributes = Transaction::Attributes.new(NewRelic::Agent.instance.attribute_filter)
-        attributes.merge_custom_attributes attrs
-
-        generate_error :error_options => {:attributes => attributes}
-
-        _, custom_attrs, _ = last_error_event
-
-        assert_equal attrs, custom_attrs
-      end
-
-      def test_includes_agent_attributes
-        attributes = Transaction::Attributes.new(NewRelic::Agent.instance.attribute_filter)
-        attributes.add_agent_attribute :'request.headers.referer', "http://blog.site/home", AttributeFilter::DST_ERROR_COLLECTOR
-        attributes.add_agent_attribute :httpResponseCode, "200", AttributeFilter::DST_ERROR_COLLECTOR
-
-        generate_error :error_options => {:attributes => attributes}
-
-        _, _, agent_attrs = last_error_event
-
-        expected = {:"request.headers.referer" => "http://blog.site/home", :httpResponseCode => "200"}
-        assert_equal expected, agent_attrs
+        assert_equal 'TransactionError', intrinsics['type']
+        assert_in_delta Time.now.to_f, intrinsics['timestamp'], 0.001
+        assert_equal "RuntimeError", intrinsics['error.class']
+        assert_equal "Big Controller!", intrinsics['error.message']
+        assert_equal "Controller/blogs/index", intrinsics['transactionName']
+        assert_equal 0.1, intrinsics['duration']
+        assert_equal 80, intrinsics['port']
       end
 
       def test_respects_max_samples_stored
@@ -171,7 +103,7 @@ module NewRelic
 
       def test_sample_counts_are_correct_after_merge
         with_config :'error_collector.max_event_samples_stored' => 5 do
-          buffer = error_event_aggregator.instance_variable_get :@error_event_buffer
+          buffer = error_event_aggregator.instance_variable_get :@buffer
 
           4.times { generate_error }
           last_harvest = error_event_aggregator.harvest!
@@ -260,7 +192,7 @@ module NewRelic
       def reset_error_event_buffer_state
         # this is not ideal, but we need to reset these counts to clear out state
         # between tests
-        buffer = error_event_aggregator.instance_variable_get :@error_event_buffer
+        buffer = error_event_aggregator.instance_variable_get :@buffer
         buffer.instance_variable_set :@seen_lifetime, 0
         buffer.instance_variable_set :@captured_lifetime, 0
       end