newrelic_rpm 3.7.0.174.beta → 3.7.0.177

data/lib/new_relic/cli/deployments.rb

@@ -47,7 +47,7 @@ class NewRelic::Cli::Deployments < NewRelic::Cli::Command
   end
 
   def setup_logging(env)
-    NewRelic::Agent.logger = NewRelic::Agent::AgentLogger.new(NewRelic::Agent.config)
+    NewRelic::Agent.logger = NewRelic::Agent::AgentLogger.new
     NewRelic::Agent.logger.info("Running Capistrano from '#{env}' environment for application '#{@appname}'")
   end
 

data/lib/new_relic/control/instance_methods.rb

@@ -59,7 +59,7 @@ module NewRelic
 
         # Be sure to only create once! RUBY-1020
         if ::NewRelic::Agent.logger.is_startup_logger?
-          ::NewRelic::Agent.logger = NewRelic::Agent::AgentLogger.new(Agent.config, root, options.delete(:log))
+          ::NewRelic::Agent.logger = NewRelic::Agent::AgentLogger.new(root, options.delete(:log))
         end
 
         # Merge the stringified options into the config as overrides:

data/lib/new_relic/helper.rb

@@ -13,7 +13,9 @@ module NewRelic
     if RUBY_VERSION >= '1.9'
       def correctly_encoded(string)
         return string unless string.is_a? String
-        string.valid_encoding? ? string : string.force_encoding("ASCII-8BIT")
+        # The .dup here is intentional, since force_encoding mutates the target,
+        # and we don't know who is going to use this string downstream of us.
+        string.valid_encoding? ? string : string.dup.force_encoding("ASCII-8BIT")
       end
     else
       #noop

data/lib/new_relic/rack/browser_monitoring.rb

@@ -46,7 +46,7 @@ module NewRelic::Rack
         !headers['Content-Disposition'].to_s.include?('attachment')
     end
 
-    X_UA_COMPATIBLE_RE = /<\s*meta[^>]+http-equiv=['"]x-ua-compatible['"][^>]*>/im.freeze
+    X_UA_COMPATIBLE_RE = /<\s*meta[^>]+http-equiv\s*=\s*['"]x-ua-compatible['"][^>]*>/im.freeze
 
     def autoinstrument_source(response, headers)
       source = gather_source(response)
@@ -63,7 +63,6 @@ module NewRelic::Rack
 
         if insertion_index
           source = source[0...insertion_index] <<
-            NewRelic::Agent.browser_timing_footer <<   # sic, footer is now considered "config". Rename soon?
             NewRelic::Agent.browser_timing_header <<
             source[insertion_index..-1]
         else

data/lib/new_relic/transaction_sample.rb

@@ -183,18 +183,13 @@ module NewRelic
     end
 
     # Return a new transaction sample that can be sent to the New
-    # Relic service. This involves potentially one or more of the
-    # following options
-    #
-    #   :explain_sql : run EXPLAIN on all queries whose response times equal the value for this key
-    #       (for example :explain_sql => 2.0 would explain everything over 2 seconds.  0.0 would explain everything.)
-    #   :record_sql => [ :raw | :obfuscated] : copy over the sql, obfuscating if necessary
-    def prepare_to_send!(options={})
+    # Relic service.
+    def prepare_to_send!
       return self if @prepared
 
-      if options[:record_sql]
-        collect_explain_plans!(options[:explain_sql]) if options[:explain_sql]
-        prepare_sql_for_transmission!(options[:record_sql])
+      if Agent::Database.should_record_sql?
+        collect_explain_plans!
+        prepare_sql_for_transmission!
       else
         strip_sql!
       end
@@ -260,7 +255,9 @@ module NewRelic
       end
     end
 
-    def collect_explain_plans!(threshold)
+    def collect_explain_plans!
+      return unless Agent::Database.should_collect_explain_plans?
+      threshold = Agent.config[:'transaction_tracer.explain_threshold']
       each_segment do |segment|
         if segment[:sql] && segment.duration > threshold
           segment[:explain_plan] = segment.explain_sql
@@ -268,14 +265,15 @@ module NewRelic
       end
     end
 
-    def prepare_sql_for_transmission!(strategy)
+    def prepare_sql_for_transmission!
+      strategy = Agent::Database.record_sql_method
       each_segment do |segment|
         if segment[:sql]
           segment[:sql] = case strategy
           when :raw
             segment[:sql].to_s
           when :obfuscated
-            NewRelic::Agent::Database.obfuscate_sql(segment[:sql]).to_s
+            Agent::Database.obfuscate_sql(segment[:sql]).to_s
           end
         end
       end

data/lib/newrelic_rpm.rb

@@ -21,6 +21,7 @@
 # For other frameworks, or to manage the agent manually, invoke NewRelic::Agent#manual_start
 # directly.
 #
+
 require 'new_relic/control'
 if defined?(Merb) && defined?(Merb::BootLoader)
   module NewRelic

data/test/agent_helper.rb

@@ -97,6 +97,12 @@ unless defined?( assert_not_includes )
   end
 end
 
+unless defined?( assert_empty )
+  def assert_empty(collection, msg=nil)
+    assert collection.empty?, msg
+  end
+end
+
 def assert_equal_unordered(left, right)
   assert_equal(left.length, right.length, "Lengths don't match. #{left.length} != #{right.length}")
   left.each { |element| assert_includes(right, element) }
@@ -241,10 +247,16 @@ def in_web_transaction(name='dummy')
   end
 end
 
-def find_last_transaction_segment
-  builder = NewRelic::Agent.agent.transaction_sampler.builder
+def find_last_transaction_segment(transaction_sample=nil)
+  if transaction_sample
+    root_segment = transaction_sample.root_segment
+  else
+    builder = NewRelic::Agent.agent.transaction_sampler.builder
+    root_segment = builder.current_segment
+  end
+
   last_segment = nil
-  builder.current_segment.each_segment {|s| last_segment = s }
+  root_segment.each_segment {|s| last_segment = s }
 
   return last_segment
 end
@@ -314,8 +326,11 @@ def with_debug_logging
   orig_logger = NewRelic::Agent.logger
   $stderr.puts '', '---', ''
   NewRelic::Agent.logger =
-    NewRelic::Agent::AgentLogger.new( {:log_level => 'debug'}, '', Logger.new($stderr) )
-  yield
+    NewRelic::Agent::AgentLogger.new('', Logger.new($stderr) )
+
+  with_config(:log_level => 'debug') do
+    yield
+  end
 ensure
   NewRelic::Agent.logger = orig_logger
 end

data/test/environments/lib/environments/runner.rb

@@ -18,6 +18,7 @@ module Environments
       "1.9.2"       => ["rails21", "rails22", "rails40"],
       "1.9.3"       => ["rails21", "rails22"],
       "2.0.0"       => ["rails21", "rails22", "rails23"],
+      "2.1.0"       => ["rails21", "rails22", "rails23"],
       "jruby-1.6"   => ["rails40"],
       "jruby-1.7"   => ["rails21", "rails22", "rails23"],
       "rbx-2.0"     => ["rails21", "rails22", "rails23", "rails30", "rails31", "rails32"],

data/test/helpers/file_searching.rb

@@ -0,0 +1,28 @@
+# 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.
+
+module NewRelic
+  module TestHelpers
+    module FileSearching
+      def all_rb_files
+        pattern = File.expand_path(gem_root + "/**/*.rb")
+        Dir[pattern]
+      end
+
+      def all_rb_and_js_files
+        pattern = File.expand_path(gem_root + "/**/*.{rb,js}")
+        Dir[pattern]
+      end
+
+      def all_files
+        pattern = File.expand_path(gem_root + "/**/*")
+        Dir[pattern]
+      end
+
+      def gem_root
+        File.expand_path(File.dirname(__FILE__) + "/../../")
+      end
+    end
+  end
+end

data/test/multiverse/lib/multiverse/suite.rb

@@ -143,6 +143,10 @@ module Multiverse
       trigger_test_run
     end
 
+    def should_serialize?
+      ENV['SERIALIZE']
+    end
+
     # Load the test suite's environment and execute it.
     #
     # Normally we fork to do this, and wait for the child to exit, to avoid
@@ -154,16 +158,31 @@ module Multiverse
         puts yellow("SKIPPED #{directory.inspect}: #{environments.skip_message}")
         return
       end
-      puts yellow("\nRunning #{directory.inspect} in #{environments.size} environments")
+
+      label = should_serialize? ? 'serial' : 'parallel'
+      puts yellow("\nRunning #{directory.inspect} in #{environments.size} environments in #{label}")
+
       environments.before.call if environments.before
+      if should_serialize?
+        execute_serial
+      else
+        execute_parallel
+      end
+      environments.after.call if environments.after
+    end
 
+    def execute_serial
+      environments.each_with_index do |gemfile_text, i|
+        execute_with_pipe(i)
+      end
+    end
+
+    def execute_parallel
       threads = []
       environments.each_with_index do |gemfile_text, i|
-        threads << execute_with_pipe(i)
+        threads << Thread.new { execute_with_pipe(i) }
       end
       threads.each {|t| t.join}
-
-      environments.after.call if environments.after
     end
 
     def with_clean_env
@@ -177,24 +196,22 @@ module Multiverse
     end
 
     def execute_with_pipe(env)
-      Thread.new do
-        with_clean_env do
-          suite = File.basename(directory)
-          IO.popen("#{__FILE__} #{directory} #{env} '#{seed}' '#{names.join(",")}'") do |io|
-            OutputCollector.write(suite, env, yellow("Running #{suite.inspect} for Envfile entry #{env}\n"))
-            OutputCollector.write(suite, env, yellow("Starting tests in child PID #{io.pid}\n"))
-            until io.eof do
-              chars = io.read
-              OutputCollector.write(suite, env, chars)
-            end
-            OutputCollector.suite_report(suite, env)
+      with_clean_env do
+        suite = File.basename(directory)
+        IO.popen("#{__FILE__} #{directory} #{env} '#{seed}' '#{names.join(",")}'") do |io|
+          OutputCollector.write(suite, env, yellow("Running #{suite.inspect} for Envfile entry #{env}\n"))
+          OutputCollector.write(suite, env, yellow("Starting tests in child PID #{io.pid}\n"))
+          until io.eof do
+            chars = io.read
+            OutputCollector.write(suite, env, chars)
           end
+          OutputCollector.suite_report(suite, env)
+        end
 
-          if $? != 0
-            OutputCollector.failed(suite, env)
-          end
-          Multiverse::Runner.notice_exit_status $?
+        if $? != 0
+          OutputCollector.failed(suite, env)
         end
+        Multiverse::Runner.notice_exit_status $?
       end
     end
 

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

@@ -0,0 +1,49 @@
+# 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.
+
+# RUBY-839 make sure there is no STDOUT chatter
+require 'open3'
+
+class CollectorExceptionHandlingTest < MiniTest::Unit::TestCase
+  include MultiverseHelpers
+
+  setup_and_teardown_agent
+
+  def test_should_reconnect_on_force_restart_exception
+    $collector.reset
+
+    payload = { 'error_type' => 'NewRelic::Agent::ForceRestartException' }
+    $collector.stub_exception('metric_data', payload).once
+
+    with_config(:data_report_period => 0) do
+      worker_loop = NewRelic::Agent::WorkerLoop.new(:limit => 1)
+      NewRelic::Agent.agent.stubs(:create_worker_loop).returns(worker_loop)
+      # there's a call to sleep in handle_force_restart that we want to skip
+      NewRelic::Agent.agent.stubs(:sleep)
+      NewRelic::Agent.agent.deferred_work!({})
+    end
+
+    assert_equal(2, $collector.calls_for('connect').size)
+
+    # We expect one metric_data post that the collector responds to with the
+    # ForceRestartException, and then another that gets through successfully.
+    metric_data_calls = $collector.calls_for('metric_data')
+    assert_equal(2, metric_data_calls.size)
+    refute_equal(metric_data_calls[0].run_id, metric_data_calls[1].run_id)
+  end
+
+  def test_should_stop_reporting_after_force_disconnect
+    $collector.reset
+
+    payload = { 'error_type' => 'NewRelic::Agent::ForceDisconnectException' }
+    $collector.stub_exception('metric_data', payload).once
+
+    with_config(:data_report_period => 0) do
+      NewRelic::Agent.agent.deferred_work!({})
+    end
+
+    assert_equal(1, $collector.calls_for('connect').size)
+    assert_equal(1, $collector.calls_for('metric_data').size)
+  end
+end

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

@@ -12,7 +12,7 @@ class HttpResponseCodeTest < MiniTest::Unit::TestCase
   setup_and_teardown_agent
 
   def test_request_entity_too_large
-    $collector.mock['metric_data'] = [413, {'exception' => {'error_type' => 'RuntimeError', 'message' => 'too much'}}]
+    $collector.stub_exception('metric_data', {'error_type' => 'RuntimeError', 'message' => 'too much'}, 413)
 
     NewRelic::Agent.increment_metric('Custom/too_big')
     assert_metrics_recorded(['Custom/too_big'])
@@ -25,7 +25,7 @@ class HttpResponseCodeTest < MiniTest::Unit::TestCase
   end
 
   def test_unsupported_media_type
-    $collector.mock['metric_data'] = [415, {'exception' => {'error_type' => 'RuntimeError', 'message' => 'looks bad'}}]
+    $collector.stub_exception('metric_data', {'error_type' => 'RuntimeError', 'message' => 'looks bad'}, 415)
 
     NewRelic::Agent.increment_metric('Custom/too_big')
     assert_metrics_recorded(['Custom/too_big'])

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

@@ -19,8 +19,10 @@ class RumAutoTest < MiniTest::Unit::TestCase
   LOADER_REGEX = "\n<script.*>JS_AGENT_LOADER</script>"
   CONFIG_REGEX = "\n<script.*>.*NREUM.info=.*</script>"
 
-  setup_and_teardown_agent(:browser_key => 'browserKey', :application_id => 'appId',
-                            :beacon => 'beacon', :js_agent_loader => JS_AGENT_LOADER)
+  setup_and_teardown_agent(:application_id => 'appId',
+                           :beacon => 'beacon',
+                           :browser_key => 'browserKey',
+                           :js_agent_loader => JS_AGENT_LOADER)
 
   def after_setup
     @inner_app = TestingApp.new

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

@@ -25,7 +25,7 @@ class ServiceTimeoutTest < MiniTest::Unit::TestCase
 
     service = NewRelic::Agent::NewRelicService.new('deadbeef', server)
 
-    assert_raises Timeout::Error do
+    assert_raises NewRelic::Agent::ServerConnectionException do
       service.send('send_request',
                    :uri => '/agent_listener/8/bd0e1d52adade840f7ca727d29a86249e89a6f1c/get_redirect_host',
                    :encoding => 'UTF-8', :collector => server, :data => 'blah')

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

@@ -9,8 +9,10 @@ class SetTransactionNameTest < MiniTest::Unit::TestCase
 
   include MultiverseHelpers
 
-  setup_and_teardown_agent(:browser_key => 'browserKey', :application_id => 'appId',
-                           :beacon => 'beacon', :episodes_file => 'this_is_my_file')
+  setup_and_teardown_agent(:application_id => 'appId',
+                           :beacon => 'beacon',
+                           :browser_key => 'browserKey',
+                           :js_agent_loader => 'loader')
 
   class TestTransactor
     include ::NewRelic::Agent::Instrumentation::ControllerInstrumentation
@@ -75,8 +77,9 @@ class SetTransactionNameTest < MiniTest::Unit::TestCase
 
   def test_does_not_overwrite_name_when_set_by_RUM
     TestTransactor.new.parent_txn do
-      NewRelic::Agent.browser_timing_header
-      NewRelic::Agent.browser_timing_footer
+      # Transaction name is only frozen if RUM is actually injected
+      refute_empty NewRelic::Agent.browser_timing_header
+
       NewRelic::Agent.set_transaction_name('this/should/not/work')
     end
     assert_metrics_not_recorded(['Controller/this/should/not/work'])

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

@@ -113,6 +113,7 @@ class ThreadProfilingTest < MiniTest::Unit::TestCase
   def issue_command(cmd)
     $collector.stub('get_agent_commands', cmd)
     agent.send(:check_for_and_handle_agent_commands)
+    $collector.stub('get_agent_commands', [])
   end
 
   # Runs a thread we expect to span entire test and be killed at the end
@@ -129,7 +130,7 @@ class ThreadProfilingTest < MiniTest::Unit::TestCase
   end
 
   def harvest
-    agent.send(:transmit_data, true)
+    agent.shutdown
   end
 
   def assert_saw_traces(profile_data, type)

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

@@ -58,6 +58,11 @@ class ErrorController < ApplicationController
   def middleware_error
     render :text => 'everything went great'
   end
+
+  def error_with_custom_params
+    NewRelic::Agent.add_custom_parameters(:texture => 'chunky')
+    raise 'bad things'
+  end
 end
 
 class IgnoredError < StandardError; end
@@ -75,7 +80,7 @@ class ErrorsWithoutSSCTest < ActionDispatch::IntegrationTest
 
   # Let base class override this without moving where we start the agent
   def setup_collector_mocks
-    $collector.mock['connect'] = [200, {'return_value' => {"agent_run_id" => 666 }}]
+    $collector.stub('connect', {"agent_run_id" => 666 }, 200)
   end
 
   def last_error
@@ -202,8 +207,33 @@ class ErrorsWithoutSSCTest < ActionDispatch::IntegrationTest
     assert_error_reported_once('middleware error', nil, nil)
   end
 
+  # These really shouldn't be skipped for Rails 4, see RUBY-1242
+  if ::Rails::VERSION::MAJOR.to_i < 4
+    def test_captured_errors_should_include_custom_params
+      get '/error/error_with_custom_params'
+      assert_error_reported_once('bad things')
+      error = errors_with_message('bad things').first
+      custom_params = error.params[:custom_params]
+      assert_equal({:texture => 'chunky'}, custom_params)
+    end
+
+    def test_captured_errors_should_not_include_custom_params_if_config_says_no
+      with_config(:'capture_attributes.traces' => false) do
+        get '/error/error_with_custom_params'
+      end
+      assert_error_reported_once('bad things')
+      error = errors_with_message('bad things').first
+      custom_params = error.params[:custom_params]
+      assert_equal({}, custom_params)
+    end
+  end
+
  protected
 
+  def errors_with_message(message)
+    @error_collector.errors.select{|error| error.message == message}
+  end
+
   def assert_errors_reported(message, queued_count, total_count=queued_count, txn_name=nil, apdex_f=1)
     expected = { :call_count => total_count }
     assert_metrics_recorded("Errors/all" => expected)
@@ -214,7 +244,7 @@ class ErrorsWithoutSSCTest < ActionDispatch::IntegrationTest
     end
 
     assert_equal(queued_count,
-      @error_collector.errors.select{|error| error.message == message}.size,
+      errors_with_message(message).size,
       "Wrong number of errors with message #{message.inspect} found")
   end
 
@@ -225,14 +255,14 @@ end
 
 class ErrorsWithSSCTest < ErrorsWithoutSSCTest
   def setup_collector_mocks
-    $collector.mock['connect'] = [200, {'return_value' => {
+    $collector.stub('connect', {
       "listen_to_server_config" => true,
       "agent_run_id" => 1,
       "error_collector.ignore_errors" => 'IgnoredError,ServerIgnoredError',
       "error_collector.enabled" => true,
       "error_collector.capture_source" => true,
       "collect_errors" => true
-    }}]
+    }, 200)
   end
 
   def test_should_notice_server_ignored_error_if_no_server_side_config