newrelic_rpm 3.9.1.236 → 3.9.2.239

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

@@ -155,10 +155,32 @@ bazbangbarn:
 
     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, /ERROR.*Failed ERB processing/)
     assert_log_contains(log, /\(erb\):4/)
   end
 
+  def test_exclude_commented_out_erb_lines
+    config_contents = <<-YAML
+development:
+  foo: "success!!"
+test:
+  foo: "success!!"
+boom:
+  # <%= this is not ruby %>
+        YAML
+
+    path = File.join(File.dirname(__FILE__), 'config', 'newrelic.yml')
+    setup_config(path, {}, config_contents)
+    setup_agent
+
+    log = with_array_logger { NewRelic::Agent.manual_start }
+
+    assert_equal "success!!", NewRelic::Agent.config[:foo]
+
+    refute_log_contains(log, /ERROR.*Failed ERB processing/)
+    refute_log_contains(log, /\(erb\)/)
+  end
+
   def test_config_loads_from_env_NRCONFIG
     ENV["NRCONFIG"] = "/tmp/foo/bar.yml"
     assert_config_read_from("/tmp/foo/bar.yml")
@@ -184,4 +206,10 @@ bazbangbarn:
     failure_message = "Did not find '#{message}' in log. Log contained:\n#{lines.join('')}"
     assert (lines.any? { |line| line.match(message) }), failure_message
   end
+
+  def refute_log_contains(log, message)
+    lines = log.array
+    failure_message = "Found unexpected '#{message}' in log. Log contained:\n#{lines.join('')}"
+    refute (lines.any? { |line| line.match(message) }), failure_message
+  end
 end

data/test/multiverse/suites/curb/Envfile

@@ -2,8 +2,12 @@ suite_condition("Curb is not useful on JRuby") do
   RUBY_PLATFORM != 'java'
 end
 
+# There appears to be a bug in curb 0.8.6 that manifests in hangs of this suite
+# when run on Ruby 1.8.7 or REE, so don't run against that version on those
+# Rubies.
+curb_version_spec = RUBY_VERSION == "1.8.7" ? '0.8.5' : '~>0.8.6'
 gemfile <<-RB
-  gem 'curb', '~> 0.8.4'
+  gem 'curb', '#{curb_version_spec}'
   gem 'rack'
   gem 'json', :platforms => [:rbx, :mri_18]
 
@@ -12,7 +16,7 @@ gemfile <<-RB
 RB
 
 gemfile <<-RB
-  gem 'curb', '~> 0.8.4'
+  gem 'curb', '#{curb_version_spec}'
   gem 'rack'
   gem 'json', :platforms => [:rbx, :mri_18]
 RB

data/test/multiverse/suites/datamapper/Envfile

@@ -1,7 +1,3 @@
-suite_condition("Datamapper not supported in 1.8.6") do
-  RUBY_VERSION != '1.8.6'
-end
-
 omit_collector!
 
 gemfile <<-RB

data/test/multiverse/suites/deferred_instrumentation/Envfile

@@ -1,7 +1,3 @@
-suite_condition("Sinatra not compatible with 1.8.6") do
-  RUBY_VERSION != '1.8.6'
-end
-
 gemfile <<-RB
   gem 'sinatra', '~> 1.4.0', :require => false
   gem 'rack-test', :require => 'rack/test'

data/test/multiverse/suites/deferred_instrumentation/sinatra_test.rb

@@ -75,7 +75,7 @@ class DeferredSinatraTestApp < Sinatra::Base
     @filtered ? 'got filtered' : 'nope'
   end
 
-  get /\/regex.*/ do
+  get(/\/regex.*/) do
     "Yeah, regex's!"
   end
 end

data/test/multiverse/suites/excon/Envfile

@@ -1,9 +1,10 @@
-suite_condition("Excon not supported in 1.8.6") do
-  RUBY_VERSION != '1.8.6'
+if defined?(RUBY_ENGINE) && RUBY_ENGINE == "rbx"
+  # Excon 0.10.0 doesn't seem to work on Rubinius 2.2.10
+  excon_versions = %w(0.25.0 0.24.0 0.19.0 0.18.0)
+else
+  excon_versions = %w(0.25.0 0.24.0 0.19.0 0.18.0 0.10.0)
 end
 
-excon_versions = %w(0.25.0 0.24.0 0.19.0 0.18.0 0.10.0)
-
 excon_versions.each do |excon_version|
   gemfile <<-RB
     gem 'excon', '~> #{excon_version}'

data/test/multiverse/suites/excon/excon_test.rb

@@ -72,7 +72,7 @@ class ExconTest < Minitest::Test
       conn = Excon.new("#{default_url}?status=500")
       begin
         conn.request(:method => :get, :expects => [200])
-      rescue Excon::Errors::Error => e
+      rescue Excon::Errors::Error
         # meh
       end
 

data/test/multiverse/suites/httpclient/Envfile

@@ -1,7 +1,3 @@
-suite_condition("HTTPClient not supported in 1.8.6") do
-  RUBY_VERSION != '1.8.6'
-end
-
 httpclient_versions = %w(2.3.3 2.2.0)
 
 httpclient_versions.each do |httpclient_version|

data/test/multiverse/suites/marshalling/Envfile

@@ -0,0 +1,12 @@
+gemfile <<-RB
+  gem 'rack'
+RB
+
+# On Ruby 1.8.7 we need to explicitly run with the JSON gem to get JSON
+# serialization. Otherwise first env will run with pruby.
+if RUBY_VERSION < "1.9"
+gemfile <<-RB
+  gem 'json'
+  gem 'rack'
+RB
+end

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

@@ -0,0 +1,20 @@
+---
+development:
+  error_collector:
+    enabled: true
+  apdex_t: 0.24
+  ssl: false
+  monitor_mode: true
+  license_key: bootstrap_newrelic_admin_license_key_000
+  developer_mode: false
+  app_name: test
+  host: 127.0.0.1
+  api_host: 127.0.0.1
+  port: <%= $collector && $collector.port %>
+  transaction_tracer:
+    record_sql: obfuscated
+    enabled: true
+    stack_trace_threshold: 0.5
+  capture_params: false
+  browser_monitoring:
+    auto_instrument: true

data/test/multiverse/suites/marshalling/marshalling_test.rb

@@ -0,0 +1,60 @@
+# 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'
+
+# These tests are intended to exercise the basic marshalling functionality of
+# the agent in it's different permutations (Ruby and JSON)
+class MarshallingTest < Minitest::Test
+
+  include MultiverseHelpers
+
+  setup_and_teardown_agent
+
+  def test_sends_metrics
+    NewRelic::Agent.record_metric('Boo', 42)
+
+    transmit_data
+
+    result = $collector.calls_for('metric_data')
+    assert_equal 1, result.length
+    assert_includes result.first.metric_names, 'Boo'
+  end
+
+  def test_sends_errors
+    NewRelic::Agent.notice_error(StandardError.new("Boom"))
+
+    transmit_data
+
+    result = $collector.calls_for('error_data')
+    assert_equal 1, result.length
+    assert_equal 1, result.first.errors.length
+    assert_equal "StandardError", result.first.errors.first.exception_class_name
+  end
+
+  def test_sends_transaction_traces
+    with_config(:'transaction_tracer.transaction_threshold' => -1.0) do
+      Transactioner.new.do_it
+    end
+
+    transmit_data
+
+    result = $collector.calls_for('transaction_sample_data')
+    assert_equal 1, result.length
+    assert_equal "Controller/MarshallingTest::Transactioner/do_it", result.first.metric_name
+  end
+
+  class Transactioner
+    include NewRelic::Agent::Instrumentation::ControllerInstrumentation
+
+    def do_it
+    end
+
+    add_transaction_tracer :do_it
+  end
+
+  def transmit_data
+    NewRelic::Agent.instance.send(:transmit_data)
+  end
+end

data/test/multiverse/suites/mongo/helpers/mongo_operation_tests.rb

@@ -61,7 +61,7 @@ module MongoOperationTests
     @collection.save(@tribble)
 
     metrics = build_test_metrics(:save)
-    expected = metrics_with_attributes(metrics)
+    metrics_with_attributes(metrics)
 
     assert_metrics_not_recorded(['Datastore/operation/MongoDB/insert'])
   end

data/test/multiverse/suites/mongo/helpers/mongo_replica_set.rb

@@ -40,7 +40,7 @@ class MongoReplicaSet
     tries = 0
 
     begin
-      result = yield
+      yield
     rescue exception => e
       if message
         raise e unless e.message.include? message

data/test/multiverse/suites/mongo/helpers/mongo_server.rb

@@ -143,7 +143,7 @@ class MongoServer
     begin
       self.client = client_class.new('localhost', self.port, :connect_timeout => 10)
     rescue Mongo::ConnectionFailure => e
-      raise e unless message = "Failed to connect to a master node at localhost:#{port}"
+      raise e unless message == "Failed to connect to a master node at localhost:#{port}"
       retry
     end
   end
@@ -152,7 +152,7 @@ class MongoServer
     if pid
       begin
         Process.kill('TERM', pid)
-      rescue Errno::ESRCH => e
+      rescue Errno::ESRCH
         # fine if we're already gone...
       end
 
@@ -171,7 +171,7 @@ class MongoServer
   def running?
     return false unless pid
     Process.kill(0, pid) == 1
-  rescue Errno::ESRCH => e
+  rescue Errno::ESRCH
     false
   end
 
@@ -214,7 +214,7 @@ class MongoServer
     tries = 0
 
     begin
-      result = yield
+      yield
     rescue exception => e
       if message
         raise e unless e.message.include? message

data/test/multiverse/suites/padrino/Envfile

@@ -1,8 +1,3 @@
-suite_condition("Sinatra not compatible with 1.8.6 or Rubinius") do
-  is_rbx = defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'
-  RUBY_VERSION != '1.8.6' && !is_rbx # https://github.com/rubinius/rubinius/issues/2671
-end
-
 gemfile <<-RB
   # Gemspec from rubygems on this version gets illformed warnings on 1.8.7
   gem 'http_router', '0.11.0', :git => 'git://github.com/joshbuddy/http_router.git', :tag => 'v0.11.0'

data/test/multiverse/suites/padrino/padrino_test.rb

@@ -17,7 +17,7 @@ class PadrinoTestApp < Padrino::Application
     "please log in"
   end
 
-  get /\/regex.*/ do
+  get(/\/regex.*/) do
     "with extra regex's please!"
   end
 end

data/test/multiverse/suites/rack/rack_auto_instrumentation_test.rb

@@ -126,7 +126,7 @@ class RackAutoInstrumentationTest < Minitest::Test
   end
 
   def test_middleware_that_returns_early_middleware_all_has_correct_call_times
-    t0 = freeze_time
+    freeze_time
 
     get '/?return-early=true'
     assert_metrics_recorded('Middleware/all' => { :total_exclusive_time => 3.0, :call_count => 2 })

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

@@ -11,7 +11,7 @@ if NewRelic::LanguageSupport.ree? ||
 class GcController < ApplicationController
   def gc_action
     begin
-      profiler = NewRelic::Agent::StatsEngine::GCProfiler.init
+      NewRelic::Agent::StatsEngine::GCProfiler.init
       initial_gc_count = current_gc_count
 
       Timeout.timeout(5) do
@@ -19,6 +19,7 @@ class GcController < ApplicationController
           long_string = "01234567" * 100_000
           long_string = nil
           another_long_string = "01234567" * 100_000
+          another_long_string = nil
         end
       end
     rescue Timeout::Error

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

@@ -19,6 +19,21 @@ class IgnoredController < ApplicationController
   end
 end
 
+class ParentController < ApplicationController
+  newrelic_ignore_apdex
+
+  def foo(*args); end
+
+  add_transaction_tracer :foo
+end
+
+class ChildController < ParentController
+  def bar(*args); end
+
+  add_transaction_tracer :bar
+end
+
+
 class IgnoredActionsTest < RailsMultiverseTest
   include MultiverseHelpers
 
@@ -54,4 +69,11 @@ class IgnoredActionsTest < RailsMultiverseTest
     get 'ignored/action_to_ignore', nil, {'X-NewRelic-ID' => Base64.encode64('1#234')}
     assert_nil @response.headers["X-NewRelic-App-Data"]
   end
+
+  def test_apdex_ignored_if_ignored_in_parent_class
+    get 'child/foo'
+    get 'child/bar'
+
+    assert_metrics_not_recorded("Apdex")
+  end
 end

data/test/multiverse/suites/rails/rails2_app/config/boot.rb

@@ -64,7 +64,7 @@ module Rails
       else
         gem 'rails'
       end
-    rescue Gem::LoadError => load_error
+    rescue Gem::LoadError
       $stderr.puts %(Missing the Rails #{version} gem. Please `gem install -v=#{version} rails`, update your RAILS_GEM_VERSION setting in config/environment.rb for the Rails version you do have installed, or comment out RAILS_GEM_VERSION to use the latest version installed.)
       exit 1
     end
@@ -121,7 +121,7 @@ class Rails::Boot
 
     Rails::Initializer.run(:set_load_path)
   end
-end  
+end
 
 # All that for this:
 Rails.boot!

data/test/multiverse/suites/rails/rails2_app/config/routes.rb

@@ -13,6 +13,7 @@ ActionController::Routing::Routes.draw do |map|
   map.connect 'views/:action',               :controller => 'views'
   map.connect 'ignored/:action',             :controller => 'ignored'
   map.connect 'parameter_capture/:action',   :controller => 'parameter_capture'
+  map.connect 'child/:action',               :controller => 'child'
 
   map.connect ':controller/:action'
 end

data/test/multiverse/suites/resque/Envfile

@@ -1,7 +1,3 @@
-suite_condition("Resque tests not compatible with 1.8.6") do
-  RUBY_VERSION != '1.8.6'
-end
-
 gemfile <<-RB
   gem 'resque', '1.23.0'
   gem 'json'

data/test/multiverse/suites/sequel/Envfile

@@ -1,8 +1,3 @@
-suite_condition("Sequel not supported in 1.8.6") do
-  RUBY_VERSION != '1.8.6'
-end
-
-
 gemfile <<-RB
   gem 'newrelic_rpm', :require => false, :path => File.expand_path('../../../../')
   gem 'jdbc-sqlite3', '3.7.2', :platform => :jruby

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

@@ -80,7 +80,7 @@ get '/ignored' do
   "don't trace me bro"
 end
 
-get /\/regex.*/ do
+get(/\/regex.*/) do
   "Yeah, regex's!"
 end
 

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

@@ -76,7 +76,7 @@ class SinatraModularTestApp < Sinatra::Base
     "don't trace me bro"
   end
 
-  get /\/regex.*/ do
+  get(/\/regex.*/) do
     "Yeah, regex's!"
   end
 end

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

@@ -114,4 +114,26 @@ module SinatraTestCases
     assert_equal 200, last_response.status
     assert_metrics_not_recorded(["Controller/Sinatra/#{app_name}/GET ignored"])
   end
+
+  def test_rack_request_params_errors_are_swallowed
+    fail_on_second_params_call
+
+    get '/pass'
+    assert_equal 200, last_response.status
+  end
+
+  def test_rack_request_params_errors_are_logged
+    NewRelic::Agent.logger.stubs(:debug)
+    NewRelic::Agent.logger.expects(:debug).with("Failed to get params from Rack request.", kind_of(StandardError)).at_least_once
+
+    fail_on_second_params_call
+
+    get '/pass'
+  end
+
+  def fail_on_second_params_call
+    Sinatra::Request.any_instance.
+      stubs(:params).returns({}).
+      then.raises("Rack::Request#params error")
+  end
 end