newrelic_rpm 3.6.3.111 → 3.6.4.113.beta

data/lib/new_relic/agent/thread_profiler.rb

@@ -140,7 +140,7 @@ EOF
 
           @worker_loop.run(@interval) do
             NewRelic::Agent.instance.stats_engine.
-              record_supportability_metrics_timed("ThreadProfiler/PollingTime") do
+              record_supportability_metric_timed("ThreadProfiler/PollingTime") do
 
               @poll_count += 1
               AgentThread.list.each do |t|
@@ -161,7 +161,7 @@ EOF
           mark_done
           ::NewRelic::Agent.logger.debug("Finished thread profile. #{@sample_count} backtraces, #{@failure_count} failures. Will send with next harvest.")
           NewRelic::Agent.instance.stats_engine.
-            record_supportability_metrics_count(@failure_count, "ThreadProfiler/BacktraceFailures")
+            record_supportability_metric_count("ThreadProfiler/BacktraceFailures", @failure_count)
         end
       end
 
@@ -197,7 +197,7 @@ EOF
         @flattened_nodes.sort!(&:order_for_pruning)
 
         NewRelic::Agent.instance.stats_engine.
-          record_supportability_metrics_count(@flattened_nodes.size, "ThreadProfiler/NodeCount")
+          record_supportability_metric_count("ThreadProfiler/NodeCount", @flattened_nodes.size)
 
         mark_for_pruning(@flattened_nodes, count_to_keep)
 

data/lib/new_relic/agent/transaction.rb

@@ -23,6 +23,7 @@ module NewRelic
       attr_accessor(:type, :exceptions, :filtered_params, :force_flag,
                     :jruby_cpu_start, :process_cpu_start, :database_metric_name)
       attr_reader :name
+      attr_reader :stats_hash
 
       # Give the current transaction a request context.  Use this to
       # get the URI and referer.  The request is interpreted loosely
@@ -30,12 +31,15 @@ module NewRelic
       attr_accessor :request
 
 
-      # Return the currently active transaction, or nil.  Call with +true+
-      # to create a new transaction if one is not already on the thread.
+      # Return the currently active transaction, or nil.
       def self.current
         self.stack.last
       end
 
+      def self.parent
+        self.stack[-2]
+      end
+
       def self.start(transaction_type, options={})
         txn = Transaction.new(transaction_type, options)
         txn.start(transaction_type)
@@ -44,9 +48,9 @@ module NewRelic
       end
 
       def self.stop(metric_name=nil, end_time=Time.now)
-        txn = self.stack.pop
+        txn = self.stack.last
         txn.stop(metric_name, end_time) if txn
-        return txn
+        return self.stack.pop
       end
 
       def self.stack
@@ -98,6 +102,7 @@ module NewRelic
         @force_flag = options[:force]
         @request = options[:request]
         @exceptions = {}
+        @stats_hash = StatsHash.new
         TransactionInfo.get.transaction = self
       end
 
@@ -119,6 +124,14 @@ module NewRelic
         @name_frozen
       end
 
+      def parent
+        has_parent? && self.class.stack[-2]
+      end
+
+      def root?
+        self.class.stack.size == 1
+      end
+
       def has_parent?
         self.class.stack.size > 1
       end
@@ -131,7 +144,6 @@ module NewRelic
 
         NewRelic::Agent::StatsEngine::GCProfiler.init
         agent.stats_engine.start_transaction
-        agent.stats_engine.push_transaction_stats
         transaction_sampler.notice_transaction(uri, filtered_params)
         sql_sampler.notice_transaction(uri, filtered_params)
       end
@@ -165,9 +177,8 @@ module NewRelic
         freeze_name
         log_underflow if @type.nil?
 
-        # these record metrics so need to be done before
-        # the pop
-        if self.class.stack.empty?
+        # these record metrics so need to be done before merging stats
+        if self.root?
           # this one records metrics and wants to happen
           # before the transaction sampler is finished
           if traced?
@@ -180,16 +191,20 @@ module NewRelic
         end
 
         record_exceptions
-        agent.stats_engine.pop_transaction_stats(@name)
+        merge_stats_hash
 
-        # these tear everything down so need to be done
-        # after the pop
-        if self.class.stack.empty?
+        # these tear everything down so need to be done after merging stats
+        if self.root?
           agent.events.notify(:transaction_finished, @name, end_time.to_f - start_time.to_f, overview_metrics)
           agent.stats_engine.end_transaction
         end
       end
 
+      def merge_stats_hash
+        stats = stats_hash.resolve_scopes(@name)
+        NewRelic::Agent.instance.stats_engine.merge!(stats)
+      end
+
       def record_exceptions
         @exceptions.each do |exception, options|
           options[:metric] = @name
@@ -268,13 +283,12 @@ module NewRelic
         (current) ? current.user_attributes : {}
       end
 
-      def record_apdex(metric_name)
+      def record_apdex(metric_name, end_time=Time.now)
         return unless recording_web_transaction? && NewRelic::Agent.is_execution_traced?
         metric_parser = NewRelic::MetricParser::MetricParser \
           .for_metric_named(metric_name)
 
-        t = Time.now
-        self.class.record_apdex(metric_parser, t - start_time, t - apdex_start, exceptions.any?)
+        self.class.record_apdex(metric_parser, end_time - start_time, end_time - apdex_start, exceptions.any?)
       end
 
       # Yield to a block that is run with a database metric name context.  This means

data/lib/new_relic/build.rb

@@ -1,2 +1,2 @@
-# GITSHA: cade932a16499e0064acab0ce40cc0c3d4574cc5
-module NewRelic; module VERSION; BUILD='111'; end; end
+# GITSHA: 2fa9f3b608f38bec0e49b2b29ded3c381e9f1409
+module NewRelic; module VERSION; BUILD='113.beta'; end; end

data/lib/new_relic/noticed_error.rb

@@ -10,12 +10,14 @@ class NewRelic::NoticedError
   attr_accessor :path, :timestamp, :params, :exception_class, :message
   attr_reader :exception_id
 
+  STRIPPED_EXCEPTION_REPLACEMENT_MESSAGE = "Message removed by New Relic 'strip_exception_messages' setting"
+
   def initialize(path, data, exception, timestamp = Time.now)
     @exception_id = exception.object_id
     @path = path
     @params = NewRelic::NoticedError.normalize_params(data)
 
-    @exception_class = exception.is_a?(Exception) ? exception.class.name : 'Error'
+    @exception_class = exception.class
 
     if exception.respond_to?('original_exception')
       @message = exception.original_exception.message.to_s
@@ -34,18 +36,24 @@ class NewRelic::NoticedError
     # clamp long messages to 4k so that we don't send a lot of
     # overhead across the wire
     @message = @message[0..4095] if @message.length > 4096
-    
-    # obfuscate error message if necessary
-    if NewRelic::Agent.config[:high_security]
-      @message = NewRelic::Agent::Database.obfuscate_sql(@message)
+
+    # replace error message if enabled
+    if NewRelic::Agent.config[:'strip_exception_messages.enabled'] && !whitelisted?
+      @message = STRIPPED_EXCEPTION_REPLACEMENT_MESSAGE
     end
-    
+
     @timestamp = timestamp
   end
 
+  def whitelisted?
+    NewRelic::Agent.config.stripped_exceptions_whitelist.find do |klass|
+      exception_class <= klass
+    end
+  end
+
   def ==(other)
     if other.respond_to?(:exception_id)
-      @exception_id == other.exception_id
+      exception_id == other.exception_id
     else
       false
     end
@@ -53,11 +61,19 @@ class NewRelic::NoticedError
 
   include NewRelic::Coerce
 
+  def exception_name_for_collector
+    if exception_class < Exception
+      exception_class.name
+    else
+      'Error'
+    end
+  end
+
   def to_collector_array(encoder=nil)
-    [ NewRelic::Helper.time_to_millis(@timestamp),
-      string(@path),
-      string(@message),
-      string(@exception_class),
-      @params ]
+    [ NewRelic::Helper.time_to_millis(timestamp),
+      string(path),
+      string(message),
+      string(exception_name_for_collector),
+      params ]
   end
 end

data/lib/new_relic/version.rb

@@ -12,7 +12,7 @@ module NewRelic
 
     MAJOR = 3
     MINOR = 6
-    TINY  = 3
+    TINY  = 4
 
     begin
       require File.join(File.dirname(__FILE__), 'build')

data/test/agent_helper.rb

@@ -154,6 +154,16 @@ def assert_metrics_not_recorded(not_expected)
   assert_equal([], found_but_not_expected, "Found unexpected metrics: [#{found_but_not_expected.join(', ')}]")
 end
 
+def assert_truthy(expected, msg = nil)
+  msg = build_message( msg, "Expected ? to be truthy", expected )
+  assert_block( msg ) { expected }
+end
+
+def assert_falsy(expected, msg = nil)
+  msg = build_message( msg, "Expected ? to be falsy", expected )
+  assert_block( msg ) { !expected }
+end
+
 # Mock up a transaction for testing purposes, optionally specifying a name and
 # transaction type. The given block will be executed within the context of the
 # dummy transaction.
@@ -195,6 +205,21 @@ def in_web_transaction(name='dummy')
   end
 end
 
+def with_config(config_hash, opts={})
+  opts = { :level => 0, :do_not_cast => false }.merge(opts)
+  if opts[:do_not_cast]
+    config = config_hash
+  else
+    config = NewRelic::Agent::Configuration::DottedHash.new(config_hash)
+  end
+  NewRelic::Agent.config.apply_config(config, opts[:level])
+  begin
+    yield
+  ensure
+    NewRelic::Agent.config.remove_config(config)
+  end
+end
+
 def freeze_time(now=Time.now)
   Time.stubs(:now).returns(now)
 end

data/test/multiverse/suites/agent_only/key_transactions_test.rb

@@ -2,17 +2,19 @@
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
+require File.join(File.dirname(__FILE__), '..', '..', '..', 'agent_helper')
+
 class KeyTransactionsTest < Test::Unit::TestCase
   class TestWidget
     include ::NewRelic::Agent::Instrumentation::ControllerInstrumentation
 
-    def key_txn(t0)
-      Time.stubs(:now).returns(t0 + 5)
+    def key_txn
+      advance_time(5)
     end
     add_transaction_tracer :key_txn
 
-    def other_txn(t0)
-      Time.stubs(:now).returns(t0 + 5)
+    def other_txn
+      advance_time(5)
     end
     add_transaction_tracer :other_txn
   end
@@ -31,9 +33,7 @@ class KeyTransactionsTest < Test::Unit::TestCase
     NewRelic::Agent.manual_start(:sync_startup => true,
                                  :force_reconnect => true)
 
-    # Important that this be stubbed before any of our add_transaction_tracer's
-    # end up getting run in the test methods
-    @now = stub_time_now
+    freeze_time
   end
 
   def teardown
@@ -46,7 +46,7 @@ class KeyTransactionsTest < Test::Unit::TestCase
   FAILING    = 2
 
   def test_applied_correct_apdex_t_to_key_txn
-    TestWidget.new.key_txn(@now)
+    TestWidget.new.key_txn
     NewRelic::Agent.instance.send(:harvest_and_send_timeslice_data)
 
     stats = $collector.reported_stats_for_metric('Apdex')[0]
@@ -55,7 +55,7 @@ class KeyTransactionsTest < Test::Unit::TestCase
   end
 
   def test_applied_correct_apdex_t_to_regular_txn
-    TestWidget.new.other_txn(@now)
+    TestWidget.new.other_txn
     NewRelic::Agent.instance.send(:harvest_and_send_timeslice_data)
 
     stats = $collector.reported_stats_for_metric('Apdex')[0]
@@ -64,8 +64,8 @@ class KeyTransactionsTest < Test::Unit::TestCase
   end
 
   def test_applied_correct_tt_theshold
-    TestWidget.new.key_txn(@now)
-    TestWidget.new.other_txn(@now)
+    TestWidget.new.key_txn
+    TestWidget.new.other_txn
 
     NewRelic::Agent.instance.send(:harvest_and_send_slowest_sample)
 

data/test/multiverse/suites/rails/request_statistics_test.rb

@@ -6,6 +6,7 @@
 
 require 'rails/test_help'
 require './app'
+require File.join(File.dirname(__FILE__), '..', '..', '..', 'agent_helper')
 
 class RequestStatsController < ApplicationController
   include Rails.application.routes.url_helpers
@@ -43,12 +44,22 @@ class RequestStatsTest < ActionController::TestCase
   # Tests
   #
 
-  def test_is_disabled_by_default
+  def test_is_enabled_by_default
     200.times { get :stats_action }
 
     NewRelic::Agent.agent.send(:harvest_and_send_analytic_event_data)
 
-    assert_nil $collector.agent_data.find {|post| post.action == 'analytic_event_data' }
+    assert_equal 1, $collector.calls_for('analytic_event_data').length
+  end
+
+  def test_doesnt_send_when_disabled
+    with_config( :'request_sampler.enabled' => false ) do
+      200.times { get :stats_action }
+
+      NewRelic::Agent.agent.send(:harvest_and_send_analytic_event_data)
+
+      assert_equal 0, $collector.calls_for('analytic_event_data').length
+    end
   end
 
   def test_request_times_should_be_reported_if_enabled
@@ -57,7 +68,7 @@ class RequestStatsTest < ActionController::TestCase
 
       NewRelic::Agent.agent.send(:harvest_and_send_analytic_event_data)
 
-      post = $collector.agent_data.find {|post| post.action == 'analytic_event_data' }
+      post = $collector.calls_for('analytic_event_data').first
 
       assert_not_nil( post )
       assert_kind_of Array, post.body
@@ -97,22 +108,5 @@ class RequestStatsTest < ActionController::TestCase
     assert_kind_of Time, Time.parse(object.to_s) rescue object
   end
 
-  # :TODO: Remove this if/when test_helper is available from multiverse tests
-  def with_config(config_hash, opts={})
-    opts = { :level => 0, :do_not_cast => false }.merge(opts)
-    if opts[:do_not_cast]
-      config = config_hash
-    else
-      config = NewRelic::Agent::Configuration::DottedHash.new(config_hash)
-    end
-    NewRelic::Agent.config.apply_config(config, opts[:level])
-    begin
-      yield
-    ensure
-      NewRelic::Agent.config.remove_config(config)
-    end
-  end
-
-
 end
 

data/test/multiverse/suites/resque/Envfile

@@ -16,7 +16,6 @@ RB
 
 before_suite do
   ENV["NEWRELIC_MULTIVERSE_REDIS_PORT"] = (20_000 + ($$ % 10_000)).to_s
-  ENV["NEWRELIC_MULTIVERSE_FAKE_COLLECTOR_PORT"] = (30_000 + ($$ % 10_000)).to_s
   system("echo 'port #{ENV["NEWRELIC_MULTIVERSE_REDIS_PORT"]}' | redis-server - > /dev/null &")
 end
 

data/test/multiverse/suites/resque/config/newrelic.yml

@@ -11,7 +11,7 @@ development:
   app_name: test
   host: 127.0.0.1
   api_host: 127.0.0.1
-  port: <%= ENV['NEWRELIC_MULTIVERSE_FAKE_COLLECTOR_PORT'] %>
+  port: <%= (30_000 + ($$ % 10_000)) %>
   transaction_tracer:
     record_sql: obfuscated
     enabled: true

data/test/multiverse/suites/resque/instrumentation_test.rb

@@ -13,106 +13,39 @@ require File.join(File.dirname(__FILE__), 'resque_setup')
 
 class ResqueTest < Test::Unit::TestCase
   JOB_COUNT = 5
-  COLLECTOR_PORT = ENV['NEWRELIC_MULTIVERSE_FAKE_COLLECTOR_PORT']
 
   def setup
     $collector ||= NewRelic::FakeCollector.new
     $collector.reset
-    $collector.run(COLLECTOR_PORT)
+    $collector.run
+
     $redis.del('queue:resque_test')
     $redis.set('index_key', 0)
     Resque::Stat.clear('processed')
-    @pidfile = "resque_test.#{$$}.pid"
-    JOB_COUNT.times do |i|
-      Resque.enqueue(JobForTesting, 'index_key', i + 1)
-    end
-  end
-
-  def teardown
-    File.unlink(@pidfile) if File.file?(@pidfile)
-  end
-
-  def start_worker(opts={})
-    if opts[:background]
-      start_worker_background(opts[:env_vars])
-    else
-      start_worker_child(opts[:env_vars])
-    end
-  end
-
-  def stop_worker(opts={})
-    opts[:background] ? stop_worker_background : stop_worker_child
-  end
-
-  def start_worker_child(env_vars=nil)
-    worker_cmd = "#{env_vars} QUEUE=* TERM_CHILD=1 bundle exec rake resque:work"
-    @worker_pid = Process.fork
-    Process.exec(worker_cmd) if @worker_pid.nil?
-  end
 
-  def stop_worker_child
-    Process.kill("QUIT", @worker_pid)
-    Process.waitpid(@worker_pid)
-  end
-
-  def start_worker_background(env_vars=nil)
-    worker_cmd = "PIDFILE=#{@pidfile} TERM_CHILD=1 RESQUE_TERM_TIMEOUT=1 BACKGROUND=1 " +
-      "#{env_vars} QUEUE=* bundle exec rake resque:work"
-    system(worker_cmd)
-  end
+    # From multiverse, we only run the Resque jobs inline to check that we
+    # are properly instrumenting the methods. Testing of the forking/backgrounding
+    # will be done in our upcoming end-to-end testing suites
+    Resque.inline = true
 
-  def stop_worker_background
-    daemon_pid = File.read(@pidfile).to_i
-
-    tries = 0
-    while process_alive?(daemon_pid) && tries < 3
-      Process.kill('TERM', daemon_pid)
-      sleep 4 # default resque TERM timeout
-      tries += 1
+    JOB_COUNT.times do |i|
+      Resque.enqueue(JobForTesting, 'index_key', i + 1)
     end
 
-    if process_alive?(daemon_pid)
-      $stderr.puts "Oops. Daemon (pid #{daemon_pid}) is still running. Trying to halt it with SIGQUIT"
-      Process.kill('QUIT', daemon_pid)
-      sleep 1
-
-      # If it's still alive, someone will likely have to go kill the process manually. 
-      # Alternatively, we could kill -9 it, but I decided to err on the side of caution
-      if process_alive?(daemon_pid)
-        raise "Resque is zombified. You might have to clean up process #{daemon_pid} manually."
-      end
-    end
+    NewRelic::Agent.instance.send(:transmit_data)
   end
 
-  def process_alive?(pid)
-    Process.kill(0, pid)
-    return true
-  rescue Errno::ESRCH
-    return false
+  def test_all_jobs_ran
+    assert_equal(JOB_COUNT, $redis.get('index_key').to_i)
   end
 
-  def wait_for_jobs
-    time_for_jobs = 10
-    begin
-      Timeout.timeout(time_for_jobs) do
-        loop do
-          break if Resque.info[:processed] == JOB_COUNT
-          sleep(0.1) 
-        end
-      end
-    rescue Timeout::Error => err
-      completed = Resque.info[:processed]
-      raise err.exception("waiting #{time_for_jobs}s for completion of #{JOB_COUNT} jobs - got only #{completed}")
-    end
+  def test_agent_posts_correct_metric_data
+    assert_metric_and_call_count('Instance/Busy', 1)
+    assert_metric_and_call_count('OtherTransaction/ResqueJob/all', JOB_COUNT)
   end
 
-  def run_worker(opts={})
-    begin
-      start_worker(opts)
-      wait_for_jobs
-    ensure
-      stop_worker(opts)
-    end
+  def test_agent_still_running_after_inline_job
+    assert NewRelic::Agent.instance.started?
   end
 
   METRIC_VALUES_POSITION = 3
@@ -127,28 +60,4 @@ class ResqueTest < Test::Unit::TestCase
     call_count = metric[1][0]
     assert_equal(expected_call_count, call_count)
   end
-
-  def test_all_jobs_ran
-    run_worker
-    assert_equal(JOB_COUNT, $redis.get('index_key').to_i)
-  end
-
-  def test_agent_posts_correct_metric_data
-    run_worker
-    assert_metric_and_call_count('Instance/Busy', 1)
-    assert_metric_and_call_count('OtherTransaction/ResqueJob/all', JOB_COUNT)
-  end
-
-  if RUBY_VERSION >= '1.9'
-    def test_all_jobs_ran_background
-      run_worker(:background => true)
-      assert_equal(JOB_COUNT, $redis.get('index_key').to_i)
-    end
-
-    def test_agent_posts_correct_metric_data_background
-      run_worker(:background => true)
-      assert_metric_and_call_count('Instance/Busy', 1)
-      assert_metric_and_call_count('OtherTransaction/ResqueJob/all', JOB_COUNT)
-    end
-  end
 end