newrelic_rpm 3.9.5.251 → 3.9.6.257

data/test/multiverse/suites/rails/Envfile

@@ -1,12 +1,12 @@
 if RUBY_VERSION >= '1.9.3'
   gemfile <<-RB
-    gem 'rails', '~>4.2.0.beta1'
+    gem 'rails', '~>4.2.0.beta2'
     gem 'haml', :require => false
     gem 'minitest', '5.2.3'
   RB
 
   gemfile <<-RB
-    gem 'rails', '~>4.1.0'
+    gem 'rails', '~>4.1.6'
     # Multiverse has an incompatibility with Minitest 5.3.0, so lock here for
     # now
     gem 'minitest', '5.2.3'
@@ -16,7 +16,7 @@ if RUBY_VERSION >= '1.9.3'
   RB
 
   gemfile <<-RB
-    gem 'rails', '~>4.0.4'
+    gem 'rails', '~>4.0.10'
     gem 'haml', '4.0.2'   # Getting load issues with haml 4.0.3
   RB
 end

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

@@ -0,0 +1,137 @@
+# 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'
+require File.expand_path(File.join(__FILE__, '..', 'app'))
+
+require 'logger'
+require 'stringio'
+
+# ActiveJob is in Rails 4.2+, so make sure we're on an allowed version before
+# we try to load. Previously just tried to require it, but that had load issues
+# on Rubinius.
+if Rails::VERSION::STRING >= "4.2.0"
+
+require 'active_job'
+
+ActiveJob::Base.queue_adapter = :inline
+
+class MyJob < ActiveJob::Base
+  def perform
+    # Nothing needed!
+  end
+end
+
+class MyJobWithAlternateQueue < ActiveJob::Base
+  queue_as :my_jobs
+
+  def perform
+  end
+end
+
+class MyJobWithParams < ActiveJob::Base
+  def self.last_params
+    @@last_params
+  end
+
+  def perform(first, last)
+    @@last_params = [first, last]
+  end
+end
+
+class ActiveJobTest < Minitest::Test
+
+  include MultiverseHelpers
+
+  setup_and_teardown_agent do
+    @log = StringIO.new
+    ActiveJob::Base.logger = ::Logger.new(@log)
+  end
+
+  def after_teardown
+    unless passed?
+      @log.rewind
+      puts @log.read
+    end
+  end
+
+  ENQUEUE_PREFIX = "MessageBroker/ActiveJob::Inline/Queue/Produce/Named"
+  PERFORM_PREFIX = "MessageBroker/ActiveJob::Inline/Queue/Consume/Named"
+
+  PERFORM_TRANSACTION_NAME   = 'OtherTransaction/ActiveJob::Inline/MyJob/execute'
+  PERFORM_TRANSACTION_ROLLUP = 'OtherTransaction/ActiveJob::Inline/all'
+
+  def test_record_enqueue_metrics
+    in_web_transaction do
+      MyJob.perform_later
+    end
+
+    assert_metrics_recorded("#{ENQUEUE_PREFIX}/default")
+  end
+
+  def test_record_enqueue_metrics_with_alternate_queue
+    in_web_transaction do
+      MyJobWithAlternateQueue.perform_later
+    end
+
+    assert_metrics_recorded("#{ENQUEUE_PREFIX}/my_jobs")
+  end
+
+  def test_record_perform_metrics_in_web
+    in_web_transaction do
+      MyJob.perform_later
+    end
+
+    assert_metrics_recorded("#{PERFORM_PREFIX}/default")
+  end
+
+  def test_record_perform_metrics_with_alternate_queue_in_web
+    in_web_transaction do
+      MyJobWithAlternateQueue.perform_later
+    end
+
+    assert_metrics_recorded("#{PERFORM_PREFIX}/my_jobs")
+  end
+
+  def test_doesnt_record_perform_metrics_from_background
+    in_background_transaction do
+      MyJob.perform_later
+    end
+
+    assert_metrics_not_recorded("#{PERFORM_PREFIX}/default")
+  end
+
+  def test_starts_transaction_if_there_isnt_one
+    MyJob.perform_later
+    assert_metrics_recorded([PERFORM_TRANSACTION_ROLLUP,
+                             PERFORM_TRANSACTION_NAME])
+  end
+
+  def test_nests_other_transaction_if_already_running
+    in_background_transaction do
+      MyJob.perform_later
+    end
+
+    assert_metrics_recorded([PERFORM_TRANSACTION_ROLLUP,
+                             PERFORM_TRANSACTION_NAME])
+  end
+
+  # If running tasks inline, either in a dev environment or from
+  # misconfiguration we shouldn't accidentally rename our web transaction
+  def test_doesnt_nest_transactions_if_in_web
+    in_web_transaction do
+      MyJob.perform_later
+    end
+
+    assert_metrics_not_recorded([PERFORM_TRANSACTION_ROLLUP,
+                                 PERFORM_TRANSACTION_NAME])
+  end
+
+  def test_doesnt_interfere_with_params_on_job
+    MyJobWithParams.perform_later("1", "2")
+    assert_equal(["1", "2"], MyJobWithParams.last_params)
+  end
+end
+
+end

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

@@ -94,7 +94,6 @@ class ErrorsWithoutSSCTest < RailsMultiverseTest
       assert NewRelic::Agent.config[:agent_enabled]
       assert NewRelic::Agent.config[:'error_collector.enabled']
       assert @error_collector.enabled?
-      assert Rails.application.config.middleware.include?(NewRelic::Rack::ErrorCollector)
     end
 
     def test_should_capture_routing_error
@@ -113,9 +112,17 @@ class ErrorsWithoutSSCTest < RailsMultiverseTest
     end
 
     def test_should_capture_request_uri_and_params
-      get '/bad_route?eat=static'
-      assert_equal('/bad_route', last_error.params[:request_uri])
-      assert_equal({'eat' => 'static'}, last_error.params[:request_params])
+      get '/error/controller_error?eat=static'
+      assert_equal('/error/controller_error', last_error.params[:request_uri])
+
+      expected_params = { 'eat' => 'static' }
+
+      if Rails::VERSION::MAJOR == 3
+        expected_params['action']     = 'controller_error'
+        expected_params['controller'] = 'error'
+      end
+
+      assert_equal(expected_params, last_error.params[:request_params])
     end
   end
 
@@ -179,7 +186,7 @@ class ErrorsWithoutSSCTest < RailsMultiverseTest
     assert_equal('whatever', params['other'])
   end
 
-  def test_should_apply_parameter_filtering_for_errors_captured_by_rack_error_collector
+  def test_should_apply_parameter_filtering_for_non_standard_errors
     get '/error/exception_error?secret=shouldnotbecaptured&other=whatever'
     params = last_error.params[:request_params]
     assert_equal('[FILTERED]', params['secret'])
@@ -198,11 +205,11 @@ class ErrorsWithoutSSCTest < RailsMultiverseTest
            'Noticed an error that should have been ignored')
   end
 
-  def test_should_treat_apdex_as_success_when_ignored_error_class_noticed
+  def test_should_not_fail_apdex_for_ignored_error_class_noticed
     get '/error/ignored_error'
     assert_metrics_recorded({
-      'Apdex'                     => { :apdex_s => 1, :apdex_t => 0, :apdex_f => 0 },
-      'Apdex/error/ignored_error' => { :apdex_s => 1, :apdex_t => 0, :apdex_f => 0 }
+      'Apdex'                     => { :apdex_f => 0 },
+      'Apdex/error/ignored_error' => { :apdex_f => 0 }
     })
   end
 

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

@@ -47,6 +47,41 @@ class ParameterCaptureTest < RailsMultiverseTest
     assert_equal({}, last_transaction_trace_request_params)
   end
 
+  def test_uri_on_traced_errors_never_contains_query_string
+    with_config(:capture_params => false) do
+      get '/parameter_capture/error?other=1234&secret=4567'
+    end
+    assert_equal('/parameter_capture/error', last_traced_error.params[:request_uri])
+
+    with_config(:capture_params => true) do
+      get '/parameter_capture/error?other=1234&secret=4567'
+    end
+    assert_equal('/parameter_capture/error', last_traced_error.params[:request_uri])
+  end
+
+  def test_referrer_on_traced_errors_never_contains_query_string
+    with_config(:capture_params => false) do
+      get '/parameter_capture/error?other=1234&secret=4567', {}, { 'HTTP_REFERER' => '/foo/bar?other=123&secret=456' }
+    end
+    assert_equal('/foo/bar', last_traced_error.params[:request_referer])
+    with_config(:capture_params => true) do
+      get '/parameter_capture/error?other=1234&secret=4567', {}, { 'HTTP_REFERER' => '/foo/bar?other=123&secret=456' }
+    end
+    assert_equal('/foo/bar', last_traced_error.params[:request_referer])
+  end
+
+  def test_uri_on_tts_never_contains_query_string
+    with_config(:capture_params => false) do
+      get '/parameter_capture/transaction?other=1234&secret=4567'
+    end
+    assert_equal('/parameter_capture/transaction', last_transaction_trace.params[:uri])
+
+    with_config(:capture_params => true) do
+      get '/parameter_capture/transaction?other=1234&secret=4567'
+    end
+    assert_equal('/parameter_capture/transaction', last_transaction_trace.params[:uri])
+  end
+
   def test_filters_parameters_on_traced_errors
     with_config(:capture_params => true) do
       get '/parameter_capture/error?other=1234&secret=4567'
@@ -76,32 +111,17 @@ class ParameterCaptureTest < RailsMultiverseTest
     assert_equal({}, last_transaction_trace_request_params)
   end
 
-  if Rails::VERSION::MAJOR.to_i >= 3
-    # NewRelic::Rack::ErrorCollector grabs things out of the request so
-    # we get the actual params even if we never got to a controller
-    def test_sees_error_params_even_when_bailing_before_rails_if_enabled
-      with_config(:capture_params => true) do
-        get '/middleware_error/before?other=1234&secret=4567'
-      end
-
-      captured_params = last_traced_error_request_params
-      assert_equal('[FILTERED]', captured_params['secret'])
-      assert_equal('1234',       captured_params['other'])
-    end
-  else
-    def test_sees_error_params_even_when_bailing_before_rails_if_enabled
-      with_config(:capture_params => true) do
-        get '/middleware_error/before?other=1234&secret=4567'
-      end
-      assert_nil last_traced_error_request_params
+  def test_no_params_captured_on_error_when_bails_before_rails_even_when_enabled
+    with_config(:capture_params => true) do
+      get '/middleware_error/before?other=1234&secret=4567'
     end
+    assert_nil last_traced_error_request_params
   end
 
   def test_no_params_captured_on_tt_when_bails_before_rails_even_when_enabled
     with_config(:capture_params => true) do
       get '/middleware_error/before?other=1234&secret=4567'
     end
-
     assert_equal({}, last_transaction_trace_request_params)
   end
 

data/test/multiverse/suites/sequel/Envfile

@@ -1,34 +1,34 @@
 gemfile <<-RB
   gem 'newrelic_rpm', :require => false, :path => File.expand_path('../../../../')
   gem 'jdbc-sqlite3', '3.7.2', :platform => :jruby
-  gem 'sqlite3', '1.3.7', :platform => :ruby
+  gem 'sqlite3', :platform => :ruby
   gem 'sequel', '2.9.0'
 RB
 
 gemfile <<-RB
   gem 'newrelic_rpm', :require => false, :path => File.expand_path('../../../../')
   gem 'jdbc-sqlite3', '3.7.2', :platform => :jruby
-  gem 'sqlite3', '1.3.7', :platform => :ruby
+  gem 'sqlite3', :platform => :ruby
   gem 'sequel', '3.34.0'
 RB
 
 gemfile <<-RB
   gem 'newrelic_rpm', :require => false, :path => File.expand_path('../../../../')
   gem 'jdbc-sqlite3', '3.7.2', :platform => :jruby
-  gem 'sqlite3', '1.3.7', :platform => :ruby
+  gem 'sqlite3', :platform => :ruby
   gem 'sequel', '3.36.1'
 RB
 
 gemfile <<-RB
   gem 'newrelic_rpm', :require => false, :path => File.expand_path('../../../../')
   gem 'jdbc-sqlite3', '3.7.2', :platform => :jruby
-  gem 'sqlite3', '1.3.7', :platform => :ruby
+  gem 'sqlite3', :platform => :ruby
   gem 'sequel', '3.47.0'
 RB
 
 gemfile <<-RB
   gem 'newrelic_rpm', :require => false, :path => File.expand_path('../../../../')
   gem 'jdbc-sqlite3', '3.7.2', :platform => :jruby
-  gem 'sqlite3', '1.3.7', :platform => :ruby
+  gem 'sqlite3', :platform => :ruby
   gem 'sequel', '4.0.0'
 RB

data/test/multiverse/suites/sidekiq/Envfile

@@ -6,7 +6,7 @@ end
 if RUBY_VERSION >= '2.0.0' || (RUBY_PLATFORM == 'java')
   gemfile <<-RB
     gem 'json'
-    gem 'sidekiq', '~> 3.0.0'
+    gem 'sidekiq', '~> 3.2.0'
     gem 'rack'
 
     # Work around for https://github.com/celluloid/celluloid/issues/457
@@ -18,7 +18,7 @@ end
 
 gemfile <<-RB
   gem 'json'
-  gem 'sidekiq', '~> 2.17.7'
+  gem 'sidekiq', '~> 2.17.8'
   gem 'rack'
   gem 'newrelic_rpm', :require => false, :path => File.expand_path('../../../../')
 RB

data/test/multiverse/suites/sinatra/Envfile

@@ -9,6 +9,7 @@ gemfile <<-RB
 RB
 
 gemfile <<-RB
-  gem 'sinatra', '~> 1.2.9'
+  gem 'backports', '~> 3.6.1'
+  gem 'sinatra',   '~> 1.2.9'
   gem 'rack-test', :require => 'rack/test'
 RB

data/test/multiverse/suites/yajl/Envfile

@@ -0,0 +1,13 @@
+suite_condition("Yajl not supported for JRuby") do
+  RUBY_PLATFORM != 'java'
+end
+
+gemfile <<-RB
+  gem 'rack'
+  gem 'yajl-ruby', '~> 1.2.1'
+RB
+
+gemfile <<-RB
+  gem 'rack'
+  gem 'yajl-ruby', '~> 1.1.0'
+RB

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

@@ -0,0 +1,21 @@
+---
+development:
+  error_collector:
+    enabled: true
+  apdex_t: 0.24
+  ssl: false
+  log_level: debug
+  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/yajl/yajl_test.rb

@@ -0,0 +1,19 @@
+# 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'
+require File.join(File.dirname(__FILE__), '..', '..', '..', 'new_relic', 'marshalling_test_cases')
+
+# This is the problematic thing that overrides our JSON marshalling
+require 'yajl/json_gem'
+
+class YajlTest < Minitest::Test
+
+  include MultiverseHelpers
+  include MarshallingTestCases
+
+  setup_and_teardown_agent do
+    Yajl::Encoder.expects(:encode).never
+  end
+end

data/test/new_relic/agent/agent_logger_test.rb

@@ -348,6 +348,16 @@ class AgentLoggerTest < Minitest::Test
     assert_logged log_message.reverse
   end
 
+  def test_clear_already_logged
+    logger = create_basic_logger
+    logger.log_once(:warn, :clear_already_logged, "Kill me")
+
+    refute_empty logger.already_logged
+    logger.clear_already_logged
+
+    assert_empty logger.already_logged
+  end
+
   #
   # Helpers
   #

data/test/new_relic/agent/agent_test.rb

@@ -343,7 +343,6 @@ module NewRelic
       def test_connect_settings_includes_labels_from_semicolon_separated_config
         with_config(:labels => "Server:East;Server:West;") do
           expected = [
-            {"label_type"=>"Server", "label_value"=>"East"},
             {"label_type"=>"Server", "label_value"=>"West"}
           ]
           assert_equal expected, @agent.connect_settings[:labels]
@@ -594,6 +593,13 @@ module NewRelic
         assert !config_classes.include?(NewRelic::Agent::Configuration::ManualSource)
         assert !config_classes.include?(NewRelic::Agent::Configuration::ServerSource)
       end
+
+      def test_log_ignore_url_regexes
+        with_config(:rules => { :ignore_url_regexes => ['foo', 'bar', 'baz'] }) do
+          expects_logging(:info, includes("/foo/, /bar/, /baz/"))
+          @agent.log_ignore_url_regexes
+        end
+      end
     end
 
     class AgentStartingTest < Minitest::Test