newrelic_rpm 3.8.0.218 → 3.8.1.221

data/test/new_relic/agent_test.rb

@@ -316,8 +316,9 @@ module NewRelic
       engine = NewRelic::Agent.instance.stats_engine
       engine.reset!
       Transactor.new.txn do
-        NewRelic::Agent::Transaction.current.freeze_name
-        NewRelic::Agent.set_transaction_name('new_name')
+        NewRelic::Agent::Transaction.current.freeze_name_and_execute_if_not_ignored do
+          NewRelic::Agent.set_transaction_name('new_name')
+        end
       end
       assert_nil engine.lookup_stats('Controller/new_name')
     end

data/test/new_relic/control_test.rb

@@ -10,6 +10,7 @@ class NewRelic::ControlTest < Minitest::Test
   def setup
     @control =  NewRelic::Control.instance
     raise 'oh geez, wrong class' unless NewRelic::Control.instance.is_a?(::NewRelic::Control::Frameworks::Test)
+    NewRelic::Agent.config.reset_to_defaults
   end
 
   def shutdown
@@ -135,8 +136,8 @@ class NewRelic::ControlTest < Minitest::Test
 
   def test_sql_tracer_disabled_with_record_sql_false
     with_config(:slow_sql => { :enabled => true, :record_sql => 'off' }) do
-      assert(!NewRelic::Agent::Agent.instance.sql_sampler.enabled?,
-             'sql tracer enabled when config calls for disabled')
+      refute NewRelic::Agent::Agent.instance.sql_sampler.enabled?,
+             'sql tracer enabled when config calls for disabled'
     end
   end
 
@@ -144,19 +145,19 @@ class NewRelic::ControlTest < Minitest::Test
     with_config(:'transaction_tracer.enabled' => false,
                 :'slow_sql.enabled' => true,
                 :developer_mode => false, :monitor_mode => true) do
-      assert(!NewRelic::Agent::Agent.instance.sql_sampler.enabled?,
-             'sql enabled when transaction tracer disabled')
+      refute NewRelic::Agent::Agent.instance.sql_sampler.enabled?,
+             'sql enabled when transaction tracer disabled'
     end
   end
 
   def test_sql_tracer_disabled_when_tt_disabled_by_server
-    with_config({:'slow_sql.enabled' => true,
-                  :'transaction_tracer.enabled' => true,
-                  :monitor_mode => true}, :level => 2) do
+    with_config({:'slow_sql.enabled'           => true,
+                 :'transaction_tracer.enabled' => true,
+                 :monitor_mode                 => true}, :level => 2) do
       NewRelic::Agent.instance.finish_setup('collect_traces' => false)
 
-      assert(!NewRelic::Agent::Agent.instance.sql_sampler.enabled?,
-             'sql enabled when tracing disabled by server')
+      refute NewRelic::Agent::Agent.instance.sql_sampler.enabled?,
+             'sql enabled when tracing disabled by server'
     end
   end
 

data/test/new_relic/fake_collector.rb

@@ -185,6 +185,8 @@ module NewRelic
           TransactionSampleDataPost.new(opts)
         when 'analytic_event_data'
           AnalyticEventDataPost.new(opts)
+        when 'error_data'
+          ErrorDataPost.new(opts)
         else
           new(opts)
         end
@@ -241,6 +243,10 @@ module NewRelic
         super
         @body[0][0][9] = unblob(@body[0][0][9]) if @format == :json
       end
+
+      def traces
+        @body[0]
+      end
     end
 
     class TransactionSampleDataPost < AgentPost
@@ -305,14 +311,40 @@ module NewRelic
         samples.first.metric_name
       end
     end
+
     class AnalyticEventDataPost < AgentPost
 
+      attr_reader :events
+
       def initialize(opts={})
-        opts[:run_id] = opts[:body].shift
-        opts[:body] = opts[:body].shift
+        super
+
+        @events = @body[1]
+      end
+    end
+
+    class ErrorDataPost < AgentPost
 
+      attr_reader :errors
+
+      def initialize(opts={})
         super
+        @errors = @body[1].map { |e| SubmittedError.new(e) }
+      end
+    end
+
+    class SubmittedError
+
+      attr_reader :timestamp, :path, :message, :exception_class_name, :params
+
+      def initialize(error_info)
+        @timestamp            = error_info[0]
+        @path                 = error_info[1]
+        @message              = error_info[2]
+        @exception_class_name = error_info[3]
+        @params               = error_info[4]
       end
+
     end
   end
 

data/test/new_relic/http_client_test_cases.rb

@@ -381,8 +381,6 @@ module HttpClientTestCases
   end
 
   def test_doesnt_misbehave_when_transaction_tracing_is_disabled
-    @engine.transaction_sampler = nil
-
     # The error should have any other consequence other than logging the error, so
     # this will capture logs
     logger = NewRelic::Agent::MemoryLogger.new
@@ -394,9 +392,6 @@ module HttpClientTestCases
 
     refute_match( /undefined method `rename_scope_segment" for nil:NilClass/i,
                      logger.messages.flatten.map {|log| log.to_s }.join(" ") )
-
-  ensure
-    @engine.transaction_sampler = NewRelic::Agent.agent.transaction_sampler
   end
 
   def test_includes_full_url_in_transaction_trace

data/test/new_relic/license_test.rb

@@ -63,7 +63,7 @@ class LicenseTest < Minitest::Test
       # skip directories
       !File.file?(path) ||
       # skip binary files
-      %w| .sqlite3 .log .png .ico .gif .gem |.include?(File.extname(path)) ||
+      %w| .sqlite3 .log .png .ico .gif .pdf .gem |.include?(File.extname(path)) ||
       # skip this file
       File.expand_path(__FILE__) == path ||
       # skip rpm_test_app and other stuff that ends up in tmp
@@ -71,7 +71,9 @@ class LicenseTest < Minitest::Test
       # skip the auto-generated build.rb file
       path =~ %r{lib/new_relic/build\.rb} ||
       # skip tags file
-      path =~ %r{/tags$}i
+      path =~ %r{/tags$}i ||
+      # skip multiverse auto-generated gemfiles
+      path =~ %r{/test/multiverse/suites/.*/Gemfile\.\d+(\.lock)?$}
     )
   end
 

data/test/new_relic/local_environment_test.rb

@@ -10,22 +10,17 @@ class NewRelic::LocalEnvironmentTest < Minitest::Test
   end
 
   def test_passenger
-    class << self
-      module ::PhusionPassenger
-      end
-    end
-    NewRelic::Agent.reset_config
-    e = NewRelic::LocalEnvironment.new
-    assert_equal :passenger, e.discovered_dispatcher
-    assert_equal :passenger, NewRelic::Agent.config[:dispatcher]
-
-    with_config(:app_name => 'myapp') do
+    with_constant_defined(:PhusionPassenger, Module.new) do
+      NewRelic::Agent.reset_config
       e = NewRelic::LocalEnvironment.new
       assert_equal :passenger, e.discovered_dispatcher
-    end
+      assert_equal :passenger, NewRelic::Agent.config[:dispatcher]
 
-  ensure
-    Object.send(:remove_const, :PhusionPassenger)
+      with_config(:app_name => 'myapp') do
+        e = NewRelic::LocalEnvironment.new
+        assert_equal :passenger, e.discovered_dispatcher
+      end
+    end
   end
 
   # LocalEnvironment won't talk to ObjectSpace on JRuby, and these tests are
@@ -34,22 +29,13 @@ class NewRelic::LocalEnvironmentTest < Minitest::Test
     def test_mongrel_only_checks_once
       return unless NewRelic::LanguageSupport.object_space_usable?
 
-      define_mongrel
-
-      ObjectSpace.expects(:each_object).with(::Mongrel::HttpServer).once
-
-      e = NewRelic::LocalEnvironment.new
-      5.times { e.mongrel }
-      assert_nil e.mongrel
-    ensure
-      Object.send(:remove_const, :Mongrel) if defined?(Mongrel)
-    end
-  end
+      with_constant_defined(:'Mongrel', Module.new) do
+        with_constant_defined(:'Mongrel::HttpServer', Class.new) do
+          ObjectSpace.expects(:each_object).with(::Mongrel::HttpServer).once
 
-  def define_mongrel
-    class << self
-      module ::Mongrel
-        class HttpServer
+          e = NewRelic::LocalEnvironment.new
+          5.times { e.mongrel }
+          assert_nil e.mongrel
         end
       end
     end

data/test/new_relic/multiverse_helpers.rb

@@ -50,8 +50,8 @@ module MultiverseHelpers
     NewRelic::Agent.config.reset_to_defaults
 
     # Renaming rules don't get cleared on connect--only appended to
-    NewRelic::Agent.instance.transaction_rules.rules.clear
-    NewRelic::Agent.instance.stats_engine.metric_rules.rules.clear
+    NewRelic::Agent.instance.transaction_rules.clear
+    NewRelic::Agent.instance.stats_engine.metric_rules.clear
 
     # Clear out lingering stats we didn't transmit
     NewRelic::Agent.drop_buffered_data

data/test/new_relic/rack/developer_mode_test.rb

@@ -23,11 +23,10 @@ class DeveloperModeTest < Minitest::Test
   def setup
     @test_config = { :developer_mode => true }
     NewRelic::Agent.config.apply_config(@test_config)
-    @sampler = NewRelic::Agent::TransactionSampler.new
-    run_sample_trace_on(@sampler, '/here')
-    run_sample_trace_on(@sampler, '/there')
-    run_sample_trace_on(@sampler, '/somewhere')
-    NewRelic::Agent.instance.stubs(:transaction_sampler).returns(@sampler)
+    run_sample_trace('/here')
+    run_sample_trace('/there')
+    run_sample_trace('/somewhere')
+    @sampler = NewRelic::Agent.instance.transaction_sampler
   end
 
   def teardown

data/test/new_relic/transaction_ignoring_test_cases.rb

@@ -0,0 +1,104 @@
+# 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 'multiverse_helpers'
+
+module TransactionIgnoringTestCases
+
+  include MultiverseHelpers
+
+  TXN_PREFIX = 'Controller/'
+
+  setup_and_teardown_agent do |collector|
+    collector.stub('connect', {
+      'transaction_name_rules' => [{"match_expression" => "ignored_transaction",
+                                    "ignore"           => true}],
+      'agent_run_id' => 1,
+    })
+  end
+
+  # Test classes that include this module are expected to define:
+  #   trigger_transaction(txn_name)
+  #   trigger_transaction_with_error(txn_name, error_msg)
+  #   trigger_transaction_with_slow_sql(txn_name)
+
+
+  def test_does_not_record_metrics_for_ignored_transaction
+    trigger_transaction('accepted_transaction')
+    trigger_transaction('ignored_transaction')
+
+    NewRelic::Agent.instance.send(:harvest_and_send_timeslice_data)
+
+    stats = $collector.reported_stats_for_metric(TXN_PREFIX+'accepted_transaction')
+    assert_equal(1, stats.size)
+
+    stats = $collector.reported_stats_for_metric(TXN_PREFIX+'ignored_transaction')
+    assert_equal(0, stats.size)
+  end
+
+  def test_does_not_record_traced_errors_for_ignored_transactions
+    trigger_transaction_with_error('ignored_transaction',  'Buffy dies :(')
+    trigger_transaction_with_error('accepted_transaction', 'Buffy lives :)')
+
+    NewRelic::Agent.instance.send(:harvest_and_send_errors)
+
+    posts = $collector.calls_for('error_data')
+    assert_equal(1, posts.size)
+
+    errors = posts.first.errors
+
+    assert_equal(1, errors.size)
+    assert_equal('Buffy lives :)', errors.first.message)
+  end
+
+  def test_does_not_record_transaction_trace_for_ignored_transactions
+    with_config(:'transaction_tracer.transaction_threshold' => 0) do
+      trigger_transaction('accepted_transaction')
+      NewRelic::Agent.instance.send(:harvest_and_send_transaction_traces)
+      assert_equal(1, $collector.calls_for('transaction_sample_data').size)
+
+      trigger_transaction('ignored_transaction')
+      NewRelic::Agent.instance.send(:harvest_and_send_transaction_traces)
+      assert_equal(1, $collector.calls_for('transaction_sample_data').size)
+    end
+  end
+
+  def test_does_not_record_analytics_for_ignored_transactions
+    trigger_transaction('ignored_transaction')
+    trigger_transaction('accepted_transaction')
+
+    NewRelic::Agent.instance.send(:harvest_and_send_analytic_event_data)
+
+    posts = $collector.calls_for('analytic_event_data')
+    assert_equal(1, posts.size)
+
+    events = posts.first.events
+
+    assert_equal(1, events.size)
+    assert_equal(TXN_PREFIX+'accepted_transaction', events.first[0]['name'])
+  end
+
+  def test_does_not_record_sql_traces_for_ignored_transactions
+    trigger_transaction_with_slow_sql('ignored_transaction')
+    trigger_transaction_with_slow_sql('accepted_transaction')
+
+    NewRelic::Agent.instance.send(:harvest_and_send_slowest_sql)
+
+    posts = $collector.calls_for('sql_trace_data')
+    assert_equal(1, posts.size)
+
+    traces = posts.first.traces
+
+    assert_equal(1, traces.size)
+
+    trace = traces.first
+
+    # From SqlTrace#to_collector_array
+    # 0 -> path
+    # 5 -> call_count
+    assert_equal(TXN_PREFIX+'accepted_transaction', trace[0])
+    assert_equal(1, trace[5])
+  end
+
+end

data/test/new_relic/transaction_sample_test.rb

@@ -12,6 +12,9 @@ class NewRelic::TransactionSampleTest < Minitest::Test
   def setup
     @test_config = { :developer_mode => true }
     NewRelic::Agent.config.apply_config(@test_config)
+
+    NewRelic::Agent.agent.transaction_sampler.reset!
+
     @connection_stub = Mocha::Mockery.instance.named_mock('connection')
     @connection_stub.stubs(:execute).returns(dummy_mysql_explain_result({'foo' => 'bar'}))
 
@@ -23,6 +26,7 @@ class NewRelic::TransactionSampleTest < Minitest::Test
     else
       @marshaller = NewRelic::Agent::NewRelicService::PrubyMarshaller.new
     end
+
   end
 
   def teardown
@@ -130,6 +134,8 @@ class NewRelic::TransactionSampleTest < Minitest::Test
   end
 
   def test_not_record_transactions
+    NewRelic::Agent.instance.transaction_sampler.reset!
+
     NewRelic::Agent.disable_transaction_tracing do
       t = make_sql_transaction(::SQL_STATEMENT, ::SQL_STATEMENT)
       assert t.nil?
@@ -214,15 +220,16 @@ class NewRelic::TransactionSampleTest < Minitest::Test
   end
 
   def test_count_segments
-    transaction = run_sample_trace_on(NewRelic::Agent::TransactionSampler.new) do |sampler|
-      sampler.notice_push_scope "level0"
-      sampler.notice_push_scope "level-1"
-      sampler.notice_push_scope "level-2"
+    transaction = run_sample_trace do |sampler|
+      sampler.notice_push_frame "level0"
+      sampler.notice_push_frame "level-1"
+      sampler.notice_push_frame "level-2"
       sampler.notice_sql(::SQL_STATEMENT, {}, 0)
-      sampler.notice_pop_scope "level-2"
-      sampler.notice_pop_scope "level-1"
-      sampler.notice_pop_scope "level0"
+      sampler.notice_pop_frame "level-2"
+      sampler.notice_pop_frame "level-1"
+      sampler.notice_pop_frame "level0"
     end
+
     assert_equal 6, transaction.count_segments
   end
 

data/test/performance/lib/performance/instrumentation/gc_stats.rb

@@ -5,7 +5,7 @@
 module Performance
   module Instrumentation
     class MRIGCStats < Instrumentor
-      platforms :mri_193, :mri_20
+      platforms :mri_193, :mri_20, :mri_21
       on_by_default
 
       def before(*)
@@ -17,9 +17,12 @@ module Performance
       end
 
       def results
+        heap_live_before = @stats_before[:heap_live_num] || @stats_before[:heap_live_slot]
+        heap_live_after  = @stats_after[:heap_live_num]  || @stats_after[:heap_live_slot]
+
         res = {
-          :gc_runs => @stats_after[:count] - @stats_before[:count],
-          :live_objects => @stats_after[:heap_live_num] - @stats_before[:heap_live_num]
+          :gc_runs      => @stats_after[:count] - @stats_before[:count],
+          :live_objects => heap_live_after      - heap_live_before
         }
         if RUBY_VERSION >= "2.0.0"
           res[:allocations] = @stats_after[:total_allocated_object] - @stats_before[:total_allocated_object]

data/test/performance/suites/transaction_tracing.rb

@@ -49,7 +49,10 @@ class TransactionTracingPerfTests < Performance::TestCase
 
   def setup
     @dummy = klass(true).new
-    NewRelic::Agent.manual_start(:developer_mode => false)
+    NewRelic::Agent.manual_start(
+      :developer_mode => false,
+      :monitor_mode   => false
+    )
   end
 
   def teardown

data/test/test_helper.rb

@@ -171,39 +171,6 @@ def load_cross_agent_test(name)
   NewRelic::JSONWrapper.load(data)
 end
 
-class ArrayLogDevice
-  def initialize( array=[] )
-    @array = array
-  end
-  attr_reader :array
-
-  def write( message )
-    @array << message
-  end
-
-  def close; end
-end
-
-def with_array_logger( level=:info )
-  orig_logger = NewRelic::Agent.logger
-  config = {
-      :log_file_path => nil,
-      :log_file_name => nil,
-      :log_level => level,
-    }
-  logdev = ArrayLogDevice.new
-  override_logger = Logger.new( logdev )
-  NewRelic::Agent.logger = NewRelic::Agent::AgentLogger.new("", override_logger)
-
-  with_config(config) do
-    yield
-  end
-
-  return logdev
-ensure
-  NewRelic::Agent.logger = orig_logger
-end
-
 def dummy_mysql_explain_result(hash=nil)
   hash ||= {
     'Id' => '1',
@@ -225,34 +192,38 @@ end
 module TransactionSampleTestHelper
   module_function
   def make_sql_transaction(*sql)
-    sampler = NewRelic::Agent::TransactionSampler.new
-    sampler.notice_first_scope_push Time.now.to_f
-    sampler.notice_transaction(nil, :jim => "cool")
-    sampler.notice_push_scope "a"
-    explainer = NewRelic::Agent::Instrumentation::ActiveRecord::EXPLAINER
-    sql.each {|sql_statement| sampler.notice_sql(sql_statement, {:adapter => "mysql"}, 0, &explainer) }
-    sleep 0.02
-    yield if block_given?
-    sampler.notice_pop_scope "a"
-    sampler.notice_scope_empty(stub('txn', :name => '/path', :custom_parameters => {}, :guid => 'a guid'))
-
-    sampler.last_sample
+    sampler = nil
+
+    in_transaction('/path') do
+      sampler = NewRelic::Agent.instance.transaction_sampler
+      sampler.notice_push_frame "a"
+      explainer = NewRelic::Agent::Instrumentation::ActiveRecord::EXPLAINER
+      sql.each {|sql_statement| sampler.notice_sql(sql_statement, {:adapter => "mysql"}, 0, &explainer) }
+      sleep 0.02
+      yield if block_given?
+      sampler.notice_pop_frame "a"
+    end
+
+    return sampler.last_sample
   end
 
-  def run_sample_trace_on(sampler, path='/path')
-    sampler.notice_first_scope_push Time.now.to_f
-    sampler.notice_transaction(path, {})
-    sampler.notice_push_scope "Controller/sandwiches/index"
-    sampler.notice_sql("SELECT * FROM sandwiches WHERE bread = 'wheat'", {}, 0)
-    sampler.notice_push_scope "ab"
-    sampler.notice_sql("SELECT * FROM sandwiches WHERE bread = 'white'", {}, 0)
-    yield sampler if block_given?
-    sampler.notice_pop_scope "ab"
-    sampler.notice_push_scope "lew"
-    sampler.notice_sql("SELECT * FROM sandwiches WHERE bread = 'french'", {}, 0)
-    sampler.notice_pop_scope "lew"
-    sampler.notice_pop_scope "Controller/sandwiches/index"
-    sampler.notice_scope_empty(stub('txn', :name => path, :custom_parameters => {}, :guid => 'a guid'))
-    sampler.last_sample
+  def run_sample_trace(path='/path')
+    sampler = nil
+
+    request = stub(:uri => path)
+
+    in_transaction("Controller/sandwiches/index", :request => request) do
+      sampler = NewRelic::Agent.instance.transaction_sampler
+      sampler.notice_sql("SELECT * FROM sandwiches WHERE bread = 'wheat'", {}, 0)
+      sampler.notice_push_frame "ab"
+      sampler.notice_sql("SELECT * FROM sandwiches WHERE bread = 'white'", {}, 0)
+      yield sampler if block_given?
+      sampler.notice_pop_frame "ab"
+      sampler.notice_push_frame "lew"
+      sampler.notice_sql("SELECT * FROM sandwiches WHERE bread = 'french'", {}, 0)
+      sampler.notice_pop_frame "lew"
+    end
+
+    return sampler.last_sample
   end
 end