newrelic_rpm 3.8.0.218 → 3.8.1.221

data/test/environments/norails/Gemfile

@@ -16,3 +16,5 @@ platforms :rbx do
 end
 
 gem "newrelic_rpm", :path => "../../.."
+
+gem 'pry'

data/test/environments/rails21/Gemfile

@@ -20,3 +20,5 @@ else
   gem "mysql", "~>2.9.1"
   gem "sqlite3-ruby", "1.2.5"
 end
+
+gem 'pry'

data/test/environments/rails22/Gemfile

@@ -20,3 +20,5 @@ else
   gem "mysql", "~>2.9.1"
   gem "sqlite3"
 end
+
+gem 'pry'

data/test/environments/rails23/Gemfile

@@ -19,3 +19,5 @@ else
   gem "mysql", "~>2.9.1"
   gem "sqlite3-ruby", "1.2.5"
 end
+
+gem 'pry'

data/test/environments/rails30/Gemfile

@@ -18,3 +18,5 @@ else
   gem "mysql", "~>2.9.1"
   gem "sqlite3-ruby"
 end
+
+gem 'pry'

data/test/environments/rails31/Gemfile

@@ -18,3 +18,5 @@ else
   gem "mysql", "~>2.9.1"
   gem "sqlite3-ruby"
 end
+
+gem 'pry'

data/test/environments/rails32/Gemfile

@@ -20,3 +20,5 @@ platforms :ruby, :rbx do
   gem "mysql", "~>2.9.1"
   gem "sqlite3"
 end
+
+gem 'pry'

data/test/environments/rails40/Gemfile

@@ -40,3 +40,5 @@ platforms :rbx do
 end
 
 gem "newrelic_rpm", :path => "../../.."
+
+gem 'pry'

data/test/environments/rails41/Gemfile

@@ -32,3 +32,4 @@ platforms :rbx do
 end
 
 gem "newrelic_rpm", :path => "../../.."
+gem 'pry'

data/test/helpers/mongo_metric_builder.rb

@@ -19,7 +19,7 @@ module NewRelic
         metric_attributes = {}
 
         metrics.each do |metric|
-          metric_attributes[metric] = attributes
+          metric_attributes[metric] = attributes.dup
         end
 
         metric_attributes

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

@@ -87,11 +87,11 @@ class AuditLogTest < Minitest::Test
   def perform_actions
     reset_collector
 
-    NewRelic::Agent.instance.sql_sampler.notice_first_scope_push(nil)
+    NewRelic::Agent.instance.sql_sampler.on_start_transaction(nil)
     NewRelic::Agent.instance.sql_sampler.notice_sql("select * from test",
                                  "Database/test/select",
                                  nil, 1.5)
-    NewRelic::Agent.instance.sql_sampler.notice_scope_empty('txn')
+    NewRelic::Agent.instance.sql_sampler.on_finishing_transaction('txn')
     NewRelic::Agent.instance.send(:harvest_and_send_slowest_sql)
   end
 end

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

@@ -18,7 +18,10 @@ class CrossApplicationTracingTest < Minitest::Test
                            :encoding_key => "\0",
                            :trusted_account_ids => [1]) \
   do |collector|
-    collector.stub('connect', {"agent_run_id" => 666 })
+    collector.stub('connect', {
+      'agent_run_id' => 666,
+      'transaction_name_rules' => [{"match_expression" => "ignored_transaction",
+                                    "ignore"           => true}]})
   end
 
   def after_setup
@@ -47,4 +50,9 @@ class CrossApplicationTracingTest < Minitest::Test
     refute_nil last_response.headers["X-NewRelic-App-Data"]
     assert_metrics_recorded(['ClientApplication/1#234/all'])
   end
+
+  def test_cross_app_doesnt_modify_if_txn_is_ignored
+    get '/', {'transaction_name' => 'ignored_transaction'}, {'X-NewRelic-ID' => Base64.encode64('1#234')}
+    assert_nil last_response.headers["X-NewRelic-App-Data"]
+  end
 end

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

@@ -4,7 +4,7 @@
 
 if RUBY_VERSION >= '1.9'
 
-class CollectorExceptionHandlingTest < Minitest::Test
+class EncodingHandlingTest < Minitest::Test
   include MultiverseHelpers
 
   setup_and_teardown_agent

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

@@ -107,13 +107,13 @@ class LoggingTest < Minitest::Test
   def test_logs_missing_license_key
     running_agent_writes_to_log(
       { :license_key => false },
-      "No license key found in newrelic.yml config.")
+      "No license key found.")
   end
 
   def test_logs_blank_license_key
     running_agent_writes_to_log(
       { :license_key => '' },
-      "No license key found in newrelic.yml config.")
+      "No license key found.")
   end
 
   def test_logs_invalid_license_key

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

@@ -18,14 +18,13 @@ class MarshalingTest < Minitest::Test
     # create fake transaction trace
     time = freeze_time
     sampler = agent.transaction_sampler
-    sampler.notice_first_scope_push time
-    sampler.notice_transaction nil, {}
-    sampler.notice_push_scope "a"
-    sampler.notice_push_scope "ab"
+    sampler.on_start_transaction time, nil, {}
+    sampler.notice_push_frame "a"
+    sampler.notice_push_frame "ab"
     advance_time 1
-    sampler.notice_pop_scope "ab"
-    sampler.notice_pop_scope "a"
-    sampler.notice_scope_empty(OpenStruct.new(:name => 'path',
+    sampler.notice_pop_frame "ab"
+    sampler.notice_pop_frame "a"
+    sampler.on_finishing_transaction(OpenStruct.new(:name => 'path',
                                                :custom_parameters => {}))
 
     expected_sample = sampler.last_sample
@@ -69,11 +68,11 @@ class MarshalingTest < Minitest::Test
   end
 
   def test_sql_trace_data_marshalling
-    agent.sql_sampler.notice_first_scope_push(nil)
+    agent.sql_sampler.on_start_transaction(nil)
     agent.sql_sampler.notice_sql("select * from test",
                                   "Database/test/select",
                                   nil, 1.5)
-    agent.sql_sampler.notice_scope_empty('txn')
+    agent.sql_sampler.on_finishing_transaction('txn')
 
     agent.service.connect
     agent.send(:harvest_and_send_slowest_sql)

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

@@ -22,7 +22,13 @@ class RumAutoTest < Minitest::Test
   setup_and_teardown_agent(:application_id => 'appId',
                            :beacon => 'beacon',
                            :browser_key => 'browserKey',
-                           :js_agent_loader => JS_AGENT_LOADER)
+                           :js_agent_loader => JS_AGENT_LOADER) do |collector|
+    collector.stub('connect', {
+      'transaction_name_rules' => [{"match_expression" => "ignored_transaction",
+                                    "ignore"           => true}],
+      'agent_run_id' => 1,
+    })
+  end
 
   def after_setup
     @inner_app = TestingApp.new
@@ -76,6 +82,13 @@ class RumAutoTest < Minitest::Test
     assert_equal(last_response.body, body)
   end
 
+  def test_rum_headers_are_not_injected_in_ignored_txn
+    body = "<html><head><title>W00t!</title></head><body><p>Hello World</p></body></html>"
+    @inner_app.response = body
+    get '/', 'transaction_name' => 'ignored_transaction'
+    assert_equal(last_response.body, body)
+  end
+
   def assert_response_includes(*texts)
     texts.each do |text|
       assert_match(Regexp.new(text), last_response.body,

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

@@ -16,15 +16,17 @@ class SetTransactionNameTest < Minitest::Test
 
   class TestTransactor
     include ::NewRelic::Agent::Instrumentation::ControllerInstrumentation
-    def parent_txn
+    def parent_txn(child_category=nil)
       NewRelic::Agent.set_transaction_name('TestTransactor/parent')
       yield if block_given?
-      child_txn
+      child_txn(child_category)
     end
     add_transaction_tracer :parent_txn
 
-    def child_txn
-      NewRelic::Agent.set_transaction_name('TestTransactor/child', :category => :task)
+    def child_txn(category)
+      opts = {}
+      opts[:category] = category if category
+      NewRelic::Agent.set_transaction_name('TestTransactor/child', opts)
     end
     add_transaction_tracer :child_txn
 
@@ -34,27 +36,42 @@ class SetTransactionNameTest < Minitest::Test
     end
   end
 
-  def test_apply_to_metric_names
-    TestTransactor.new.parent_txn
+  def test_metric_names_when_child_has_different_category
+    TestTransactor.new.parent_txn(:task)
 
     assert_metrics_recorded([
       'Controller/TestTransactor/parent',
       'OtherTransaction/Background/TestTransactor/child',
-      [ 'OtherTransaction/Background/TestTransactor/child', 'Controller/TestTransactor/parent'],
+      ['OtherTransaction/Background/TestTransactor/child',
+        'Controller/TestTransactor/parent'],
       'Apdex/TestTransactor/parent'])
   end
 
+  def test_apply_to_metric_names
+    TestTransactor.new.parent_txn
+
+    assert_metrics_recorded([
+      'Controller/TestTransactor/child',
+      'Nested/Controller/TestTransactor/child',
+      'Nested/Controller/TestTransactor/parent',
+      ['Nested/Controller/TestTransactor/child',
+        'Controller/TestTransactor/child'],
+      ['Nested/Controller/TestTransactor/parent',
+        'Controller/TestTransactor/child'],
+      'Apdex/TestTransactor/child'])
+  end
+
   def test_apply_to_metric_scopes
     TestTransactor.new.parent_txn do
       trace_execution_scoped('Custom/something') {}
     end
     assert_metrics_recorded(['Custom/something',
-                             'Controller/TestTransactor/parent'])
+                             'Controller/TestTransactor/child'])
   end
 
   def test_apply_to_traced_transactions
     TestTransactor.new.parent_txn
-    assert_equal('Controller/TestTransactor/parent',
+    assert_equal('Controller/TestTransactor/child',
                  NewRelic::Agent.instance.transaction_sampler.last_sample \
                    .params[:path])
   end
@@ -63,16 +80,16 @@ class SetTransactionNameTest < Minitest::Test
     TestTransactor.new.parent_txn do
       NewRelic::Agent.notice_error(RuntimeError.new('toot'))
     end
-    assert_equal('Controller/TestTransactor/parent',
+    assert_equal('Controller/TestTransactor/child',
                  NewRelic::Agent.instance.error_collector.errors.last.path)
   end
 
   def test_set_name_is_subject_to_txn_name_rules
-    rule = NewRelic::Agent::RulesEngine::Rule.new('match_expression' => 'parent',
-                                                  'replacement'      => 'dad')
+    rule = NewRelic::Agent::RulesEngine::Rule.new('match_expression' => 'child',
+                                                  'replacement'      => 'kid')
     NewRelic::Agent.instance.transaction_rules << rule
     TestTransactor.new.parent_txn
-    assert_metrics_recorded(['Controller/TestTransactor/dad'])
+    assert_metrics_recorded(['Controller/TestTransactor/kid'])
   end
 
   def test_does_not_overwrite_name_when_set_by_RUM

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

@@ -61,8 +61,8 @@ class ThreadProfilingTest < Minitest::Test
   # go only let a few cycles through, so we check less than 10
 
   def test_thread_profiling
-    run_thread { NewRelic::Agent::Transaction.start(:controller, :request => stub) }
-    run_thread { NewRelic::Agent::Transaction.start(:task) }
+    run_transaction_in_thread(:type => :controller, :request => stub)
+    run_transaction_in_thread(:type => :task)
 
     issue_command(START_COMMAND)
 
@@ -80,8 +80,8 @@ class ThreadProfilingTest < Minitest::Test
 
   def test_thread_profiling_with_pruby_marshaller
     with_config(:marshaller => 'pruby') do
-      run_thread { NewRelic::Agent::Transaction.start(:controller, :request => stub) }
-      run_thread { NewRelic::Agent::Transaction.start(:task) }
+      run_transaction_in_thread(:type => :controller, :request => stub)
+      run_transaction_in_thread(:type => :task)
 
       issue_command(START_COMMAND)
 
@@ -118,13 +118,14 @@ class ThreadProfilingTest < Minitest::Test
   end
 
   # Runs a thread we expect to span entire test and be killed at the end
-  def run_thread
+  def run_transaction_in_thread(opts)
     q = Queue.new
     @threads ||= []
     @threads << Thread.new do
-      yield
-      q.push('.')
-      sleep # sleep until explicitly woken in join_background_threads
+      in_transaction(opts) do
+        q.push('.')
+        sleep # sleep until explicitly woken in join_background_threads
+      end
     end
     q.pop # block until the thread has had a chance to start up
   end

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

@@ -0,0 +1,43 @@
+# 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.join(File.dirname(__FILE__), '..', '..', '..', 'agent_helper')
+require 'multiverse_helpers'
+require 'transaction_ignoring_test_cases'
+
+class TransactionIgnoringTest < Minitest::Test
+
+  include MultiverseHelpers
+  include TransactionIgnoringTestCases
+
+  def trigger_transaction(txn_name)
+    TestWidget.new.run_transaction(txn_name)
+  end
+
+  def trigger_transaction_with_error(txn_name, error_msg)
+    TestWidget.new.run_transaction(txn_name) do
+      NewRelic::Agent.notice_error(error_msg)
+    end
+  end
+
+  def trigger_transaction_with_slow_sql(txn_name)
+    TestWidget.new.run_transaction(txn_name) do
+      NewRelic::Agent.instance.sql_sampler.notice_sql("select * from test",
+                                   "Database/test/select",
+                                   nil, 1.5)
+    end
+  end
+
+  class TestWidget
+    include ::NewRelic::Agent::Instrumentation::ControllerInstrumentation
+
+    def run_transaction(txn_name)
+      NewRelic::Agent.set_transaction_name(txn_name)
+      yield if block_given?
+    end
+
+    add_transaction_tracer :run_transaction
+  end
+
+end

data/test/multiverse/suites/config_file_loading/config_file_loading_test.rb

@@ -49,26 +49,31 @@ class ConfigFileLoadingTest < Minitest::Test
     FakeFS.deactivate!
   end
 
-  def setup_config(path, manual_config_options = {})
+  def setup_config(path, manual_config_options = {}, config_file_content=nil)
     teardown_agent
 
     FileUtils.mkdir_p(File.dirname(path))
     Dir.chdir @cwd
     File.open(path, 'w') do |f|
-      f.print <<-YAML
+      if config_file_content
+        f.write(config_file_content)
+      else
+        f.print <<-YAML
 development:
   foo: "success!!"
 test:
   foo: "success!!"
 bazbangbarn:
   i_am: "bazbangbarn"
-      YAML
+        YAML
+      end
     end
+
     setup_agent(manual_config_options)
   end
 
-  def assert_config_read_from(path)
-    setup_config(path)
+  def assert_config_read_from(path, manual_config_options={})
+    setup_config(path, manual_config_options)
     assert NewRelic::Agent.config[:foo] == "success!!", "Failed to read yaml config from #{path.inspect[0..100]}\n\n#{NewRelic::Agent.config.inspect[0..100]}"
   end
 
@@ -93,6 +98,67 @@ bazbangbarn:
     assert_config_read_from(ENV['HOME'] + "/.newrelic/newrelic.yml")
   end
 
+  def test_config_loads_from_config_path_option_to_manual_start
+    path = File.join(File.dirname(__FILE__), 'otherplace', 'newrelic.yml')
+    assert_config_read_from(path, :config_path => path)
+  end
+
+  def test_warning_logged_when_no_config_file
+    teardown_agent
+    setup_agent
+
+    log = with_array_logger { NewRelic::Agent.manual_start }
+
+    assert_log_contains(log, /WARN.*No configuration file found/)
+    assert_log_contains(log, /WARN.*Looked in these locations.*based on defaults/)
+  end
+
+  def test_warning_logged_when_no_config_file_manual_config
+    teardown_agent
+    setup_agent
+
+    log = with_array_logger do
+      NewRelic::Agent.manual_start(:config_path => 'otherplace/newrelic.yml')
+    end
+
+    assert_log_contains(log, /WARN.*No configuration file found/)
+    assert_log_contains(log, /WARN.*Looked in these locations.*based on API call.*otherplace\/newrelic\.yml/)
+  end
+
+  def test_warning_logged_when_no_config_file_environment_variable
+    ENV['NRCONFIG'] = 'otherplace/newrelic.yml'
+    teardown_agent
+    setup_agent
+
+    log = with_array_logger { NewRelic::Agent.manual_start }
+
+    assert_log_contains(log, /WARN.*No configuration file found/)
+    assert_log_contains(log, /WARN.*Looked in these locations.*based on environment variable.*otherplace\/newrelic\.yml/)
+  ensure
+    ENV['NRCONFIG'] = nil
+  end
+
+  def test_warning_logged_when_config_file_yaml_parsing_error
+    path = File.join(File.dirname(__FILE__), 'config', 'newrelic.yml')
+    setup_config(path, {}, '<< bogus junk')
+    setup_agent
+
+    log = with_array_logger { NewRelic::Agent.manual_start }
+
+    assert_log_contains(log, /ERROR.*Failed to read or parse configuration file at config\/newrelic\.yml/)
+  end
+
+  def test_warning_logged_when_config_file_erb_error
+    path = File.join(File.dirname(__FILE__), 'config', 'newrelic.yml')
+    setup_config(path, {}, "\n\n\n<%= this is not ruby %>") # the error is on line 4
+    setup_agent
+
+    log = with_array_logger { NewRelic::Agent.manual_start }
+
+    assert_log_contains(log, /ERROR.*Failed to read or parse configuration file at config\/newrelic\.yml/)
+    assert_log_contains(log, /\(erb\):4/)
+  end
+
   def test_config_loads_from_env_NRCONFIG
     ENV["NRCONFIG"] = "/tmp/foo/bar.yml"
     assert_config_read_from("/tmp/foo/bar.yml")
@@ -112,4 +178,10 @@ bazbangbarn:
     setup_config(path, {:env => 'bazbangbarn'} )
     assert_equal 'bazbangbarn', NewRelic::Agent.config[:i_am], "Agent.config did not load bazbangbarn config as requested"
   end
+
+  def assert_log_contains(log, message)
+    lines = log.array
+    failure_message = "Did not find '#{message}' in log. Log contained:\n#{lines.join('')}"
+    assert (lines.any? { |line| line.match(message) }), failure_message
+  end
 end