newrelic_rpm 3.9.7.266 → 3.9.8.273

data/test/multiverse/suites/grape/Envfile

@@ -0,0 +1,15 @@
+suite_condition("Grape is only supported for versions >= 1.9.3") do
+  # Grape instrumentation is not ready to go live yet.
+  # When set, should require 1.9.3 or greater
+  false
+end
+
+versions = %w(0.9.0 0.8.0 0.7.0 0.6.1 0.5.0 0.4.1 0.3.2 0.2.6 0.2.0 0.1.5)
+
+versions.each do |version|
+  gemfile <<-RB
+    gem 'rack'
+    gem 'rack-test'
+    gem 'grape', '~> #{version}'
+  RB
+end

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

@@ -0,0 +1,18 @@
+---
+development:
+  error_collector:
+    enabled: true
+  apdex_t: 0.5
+  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
+  transaction_tracer:
+    record_sql: obfuscated
+    enabled: true
+    stack_trace_threshold: 0.5
+    transaction_threshold: 1.0
+  capture_params: false

data/test/multiverse/suites/grape/grape_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 "grape"
+require "newrelic_rpm"
+require 'multiverse_helpers'
+require './grape_test_api'
+
+require File.join(File.dirname(__FILE__), "..", "..", "..", "agent_helper")
+
+class GrapeTest < Minitest::Test
+  include Rack::Test::Methods
+  include MultiverseHelpers
+
+  setup_and_teardown_agent
+
+  unless ::Grape::VERSION == '0.1.5'
+    def app
+      Rack::Builder.app { run GrapeTestApi.new }
+    end
+
+    def test_nonexistent_route
+      get '/not_grape_ape'
+      assert_no_metrics_match(/grape_ape/)
+    end
+
+    def test_route_raises_an_error
+      assert_raises(GrapeTestApiError) do
+        get '/self_destruct'
+      end
+      assert_metrics_recorded(['Errors/Controller/Rack/GrapeTestApi/self_destruct (GET)'])
+    end
+
+    def test_getting_a_list_of_grape_apes
+      get '/grape_ape'
+      assert_metrics_recorded(['Controller/Rack/GrapeTestApi/grape_ape (GET)'])
+    end
+
+    def test_showing_a_grape_ape
+      get '/grape_ape/1'
+      assert_metrics_recorded(['Controller/Rack/GrapeTestApi/grape_ape/:id (GET)'])
+    end
+
+    def test_creating_a_grape_ape
+      post '/grape_ape', {}
+      assert_metrics_recorded(['Controller/Rack/GrapeTestApi/grape_ape (POST)'])
+    end
+
+    def test_updating_a_grape_ape
+      put '/grape_ape/1', {}
+      assert_metrics_recorded(['Controller/Rack/GrapeTestApi/grape_ape/:id (PUT)'])
+    end
+
+    def test_deleting_a_grape_ape
+      delete '/grape_ape/1'
+      assert_metrics_recorded(['Controller/Rack/GrapeTestApi/grape_ape/:id (DELETE)'])
+    end
+  end
+end

data/test/multiverse/suites/grape/grape_test_api.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 'grape'
+
+class GrapeTestApiError < StandardError; end
+class GrapeTestApi < Grape::API
+  # namespace, group, resource, and resources all do the same thing.
+  # They are aliases for namespace.
+
+  get :self_destruct do
+    raise GrapeTestApiError.new("I'm sorry Dave, I'm afraid I can't do that.")
+  end
+
+  namespace :grape_ape do
+    get do
+      'List grape apes!'
+    end
+
+    get ':id' do
+      'Show grape ape!'
+    end
+  end
+
+  resource :grape_ape do
+    post do
+      'Create grape ape!'
+    end
+  end
+
+  resources :grape_ape do
+    put ':id' do
+      'Update grape ape!'
+    end
+  end
+
+  group :grape_ape do
+    delete ':id' do
+      'Destroy grape ape!'
+    end
+  end
+end

data/test/multiverse/suites/grape/unsupported_version_test.rb

@@ -0,0 +1,31 @@
+# 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 "grape"
+require "newrelic_rpm"
+require 'multiverse_helpers'
+require './grape_test_api'
+
+require File.join(File.dirname(__FILE__), "..", "..", "..", "agent_helper")
+
+class UnsupportedGrapeTest < Minitest::Test
+  include Rack::Test::Methods
+  include MultiverseHelpers
+
+  if ::Grape::VERSION == '0.1.5'
+    def app
+      GrapeTestApi
+    end
+
+    def test_unsupported_version
+      get '/grape_ape'
+      get '/grape_ape/1'
+      post '/grape_ape', {}
+      put '/grape_ape/1', {}
+      delete '/grape_ape/1'
+
+      assert_no_metrics_match(/grape_ape/)
+    end
+  end
+end

data/test/multiverse/suites/json/Envfile

@@ -1,8 +1,10 @@
-all_versions = [ '~> 1.8.1', '~> 1.7.7', '~> 1.6.8', '~> 1.5.5' ]
+all_versions = [ '~> 1.8.1' ]
+before_2_2_0 = [ '~> 1.7.7', '~> 1.6.8', '~> 1.5.5' ]
 before_2_0_0 = [ '~> 1.4.6', '~> 1.2.4', '~> 1.1.9' ]
 before_1_9_2 = [ '1.1.2' ]
 
 json_gems = all_versions.dup
+json_gems += before_2_2_0 if RUBY_VERSION < '2.2.0'
 json_gems += before_2_0_0 if RUBY_VERSION < '2.0.0'
 json_gems += before_1_9_2 if RUBY_VERSION < '1.9.2'
 

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

@@ -0,0 +1,54 @@
+# 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 'new_relic/rack/browser_monitoring'
+require 'new_relic/rack/agent_hooks'
+require 'new_relic/rack/error_collector'
+
+if NewRelic::Agent::Instrumentation::RackHelpers.rack_version_supported?
+
+class RackEnvMutationTest < Minitest::Test
+  attr_accessor :inner_app
+
+  include MultiverseHelpers
+  include Rack::Test::Methods
+
+  setup_and_teardown_agent
+
+  class BadApp
+    def call(env)
+      Thread.new do
+        100.times do
+          env.each do |k, v|
+            # allow main thread to run while we're still in the middle of
+            # iterating
+            Thread.pass
+          end
+        end
+      end
+
+      # Give the thread we just spawned a chance to start up
+      Thread.pass
+
+      [200, {}, ['cool story']]
+    end
+  end
+
+  def app
+    inner_app = BadApp.new
+    Rack::Builder.app do
+      use NewRelic::Rack::AgentHooks
+      run inner_app
+    end
+  end
+
+  def test_safe_from_iterations_over_rack_env_from_background_threads
+    100.times do
+      get '/'
+    end
+  end
+end
+
+end

data/test/multiverse/suites/rails/Envfile

@@ -1,6 +1,6 @@
 if RUBY_VERSION >= '1.9.3'
   gemfile <<-RB
-    gem 'rails', '~>4.2.0.beta4'
+    gem 'rails', '~>4.2.0.rc1'
     gem 'haml', :require => false
     gem 'minitest', '5.2.3'
   RB

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

@@ -97,7 +97,8 @@ class ViewInstrumentationTest < RailsMultiverseTest
     end
   end
 
-  (ViewsController.action_methods - ['raise_render']).each do |method|
+  # https://github.com/rails/rails/pull/17862 for 4.2.0.rc1 _generate_paths_by_default
+  (ViewsController.action_methods - ['raise_render', '_generate_paths_by_default']).each do |method|
 
     # proc rendering doesn't work on Rails 2
     next if method == 'proc_render' && Rails::VERSION::MAJOR <= 2

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

@@ -0,0 +1,54 @@
+# 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')
+
+if NewRelic::LanguageSupport.can_fork?
+
+class ResqueMarshallingTest < Minitest::Test
+
+  include MultiverseHelpers
+  include MarshallingTestCases
+
+  setup_and_teardown_agent
+
+  class DummyJob
+    extend Resque::Plugins::NewRelicInstrumentation
+  end
+
+  def invoke_hook(name, *args)
+    hooks = Array(Resque.send(name))
+    hooks.each { |h| h.call(*args) }
+  end
+
+  def around_each
+    invoke_hook(:before_first_fork)
+
+    # We just need something that responds to object_id here, because our
+    # Resque instrumentation uses that to assign a unique identifier to the pipe
+    # that will be used to send data about this job.
+    job = Object.new
+
+    invoke_hook(:before_fork, job)
+
+    child_pid = Process.fork
+
+    if child_pid
+      Process.wait(child_pid)
+    else
+      invoke_hook(:after_fork, job)
+      DummyJob.around_perform_with_monitoring do
+        yield
+      end
+      exit
+    end
+  end
+
+  def after_each
+    NewRelic::Agent::PipeChannelManager.listener.stop
+  end
+end
+
+end

data/test/multiverse/suites/typhoeus/Envfile

@@ -1,9 +1,9 @@
-suite_condition("Typhoeus excluded on 1.8.7 non-REE") do
-  # Under Ruby 1.8.7 (but not REE), there are persistent segfaults with Typhoeus
+suite_condition("Typhoeus excluded on 1.8.7") do
+  # Under Ruby 1.8.7 there are periodic segfaults with Typhoeus
   # and the Ruby agent. This predated our Typhoeus instrumentation, but given
   # usage levels and obscurity of the issue, it isn't worth deeper digging.
-  # Just use REE, or better yet >= 1.9
-  (RUBY_VERSION != '1.8.7' || RUBY_DESCRIPTION =~ /Enterprise/)
+  # Just use >= 1.9
+  RUBY_VERSION > '1.8.7'
 end
 
 gemfile <<-RB

data/test/new_relic/agent/agent_test.rb

@@ -597,6 +597,43 @@ module NewRelic
         @agent.stop_event_loop
       end
 
+      def test_doesnt_wire_up_utilization_in_resque_child
+        fake_loop = create_utilization_loop
+        fake_loop.expects(:on).with(:report_utilization_data).never
+
+        @agent.stubs(:in_resque_child_process?).returns(true)
+
+        with_config(:collect_utilization => true) do
+          @agent.create_and_run_event_loop
+        end
+      end
+
+      def test_wires_up_utilization_when_not_in_resque
+        fake_loop = create_utilization_loop
+        fake_loop.expects(:on).with(:report_utilization_data).once
+
+        @agent.stubs(:in_resque_child_process?).returns(false)
+
+        with_config(:collect_utilization => true) do
+          @agent.create_and_run_event_loop
+        end
+      end
+
+      def create_utilization_loop
+        fake_loop = stub
+        fake_loop.stubs(:on).with(:report_utilization_data)
+        fake_loop.stubs(:on).with(:report_data)
+        fake_loop.stubs(:on).with(:report_event_data)
+        fake_loop.stubs(:on).with(:reset_log_once_keys)
+
+        fake_loop.stubs(:fire)
+        fake_loop.stubs(:fire_every)
+        fake_loop.stubs(:run)
+
+        @agent.stubs(:create_event_loop).returns(fake_loop)
+        fake_loop
+      end
+
       def test_untraced_graceful_disconnect_logs_errors
         NewRelic::Agent.stubs(:disable_all_tracing).raises(TestError, 'test')
         ::NewRelic::Agent.logger.expects(:error).with(is_a(TestError))

data/test/new_relic/agent/configuration/default_source_test.rb

@@ -110,6 +110,20 @@ module NewRelic::Agent::Configuration
       end
     end
 
+    def test_config_search_paths_with_home
+      with_environment("HOME" => "/home") do
+        paths = DefaultSource.config_search_paths.call()
+        assert_includes paths, "/home/.newrelic/newrelic.yml"
+        assert_includes paths, "/home/newrelic.yml"
+      end
+    end
+
+    def test_config_search_path_in_warbler
+      with_environment("GEM_HOME" => "/some/path.jar!") do
+        assert_includes DefaultSource.config_search_paths.call(), "/some/path.jar!/path/config/newrelic.yml"
+      end
+    end
+
     def get_config_value_class(value)
       type = value.class
 

data/test/new_relic/agent/custom_event_aggregator_test.rb

@@ -72,7 +72,7 @@ module NewRelic::Agent
       end
     end
 
-    def test_record_adds_type_and_timestamp_and_source
+    def test_record_adds_type_and_timestamp
       t0 = Time.now
       @aggregator.record(:type_a, :foo => :bar, :baz => :qux)
 
@@ -81,8 +81,8 @@ module NewRelic::Agent
       assert_equal(1, events.size)
       event = events.first
 
-      assert_equal({ 'type' => 'type_a', 'timestamp' => t0.to_i, 'source' => 'Agent' }, event[0])
-      assert_equal({ 'foo'  => 'bar'   , 'baz'       => 'qux'                        }, event[1])
+      assert_equal({ 'type' => 'type_a', 'timestamp' => t0.to_i }, event[0])
+      assert_equal({ 'foo'  => 'bar'   , 'baz'       => 'qux'   }, event[1])
     end
   end
 end

data/test/new_relic/agent/error_collector/notice_error_test.rb

@@ -143,7 +143,7 @@ class NewRelic::Agent::ErrorCollector::NoticeErrorTest < Minitest::Test
   def test_skip_notice_error_is_true_if_the_error_collector_is_disabled
     error = mocked_error
     with_error_collector_config(:'error_collector.enabled' => false) do |error_collector|
-      assert error_collector.skip_notice_error?(error)
+      assert error_collector.skip_notice_error?(NewRelic::Agent::TransactionState.tl_get, error)
     end
   end
 
@@ -151,7 +151,7 @@ class NewRelic::Agent::ErrorCollector::NoticeErrorTest < Minitest::Test
     error = nil
     with_error_collector_config(:'error_collector.enabled' => true) do |error_collector|
       error_collector.expects(:error_is_ignored?).with(error).returns(false)
-      assert error_collector.skip_notice_error?(error)
+      assert error_collector.skip_notice_error?(NewRelic::Agent::TransactionState.tl_get, error)
     end
   end
 
@@ -159,7 +159,7 @@ class NewRelic::Agent::ErrorCollector::NoticeErrorTest < Minitest::Test
     error = mocked_error
     with_error_collector_config(:'error_collector.enabled' => true) do |error_collector|
       error_collector.expects(:error_is_ignored?).with(error).returns(true)
-      assert error_collector.skip_notice_error?(error)
+      assert error_collector.skip_notice_error?(NewRelic::Agent::TransactionState.tl_get, error)
     end
   end
 
@@ -167,7 +167,7 @@ class NewRelic::Agent::ErrorCollector::NoticeErrorTest < Minitest::Test
     error = mocked_error
     with_error_collector_config(:'error_collector.enabled' => true) do |error_collector|
       error_collector.expects(:error_is_ignored?).with(error).returns(false)
-      assert !error_collector.skip_notice_error?(error)
+      assert !error_collector.skip_notice_error?(NewRelic::Agent::TransactionState.tl_get, error)
     end
   end