RubyGems - newrelic_rpm - Versions diffs - 3.9.9.275 → 3.10.0.279 - Mend

newrelic_rpm 3.9.9.275 → 3.10.0.279

Files changed (67) hide show

data.tar.gz.sig +0 -0
data/CHANGELOG +51 -0
data/config.dot +0 -3
data/lib/new_relic/agent.rb +7 -5
data/lib/new_relic/agent/agent.rb +4 -4
data/lib/new_relic/agent/instrumentation/active_job.rb +5 -8
data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb +17 -34
data/lib/new_relic/agent/instrumentation/grape.rb +60 -23
data/lib/new_relic/agent/instrumentation/merb/controller.rb +10 -2
data/lib/new_relic/agent/instrumentation/middleware_tracing.rb +33 -21
data/lib/new_relic/agent/instrumentation/rails/action_controller.rb +7 -3
data/lib/new_relic/agent/instrumentation/rails3/action_controller.rb +0 -9
data/lib/new_relic/agent/instrumentation/sinatra.rb +9 -12
data/lib/new_relic/agent/javascript_instrumentor.rb +1 -0
data/lib/new_relic/agent/new_relic_service.rb +9 -6
data/lib/new_relic/agent/parameter_filtering.rb +37 -0
data/lib/new_relic/agent/supported_versions.rb +7 -0
data/lib/new_relic/agent/traced_method_stack.rb +1 -1
data/lib/new_relic/agent/transaction.rb +182 -186
data/lib/new_relic/agent/vm/rubinius_vm.rb +93 -3
data/lib/new_relic/control/frameworks/rails.rb +1 -0
data/lib/new_relic/rack/agent_hooks.rb +15 -23
data/lib/new_relic/version.rb +2 -2
data/newrelic_rpm.gemspec +12 -5
data/test/agent_helper.rb +26 -14
data/test/multiverse/lib/multiverse/suite.rb +1 -5
data/test/multiverse/suites/activemerchant/Envfile +4 -1
data/test/multiverse/suites/agent_only/cross_application_tracing_test.rb +2 -12
data/test/multiverse/suites/agent_only/logging_test.rb +1 -1
data/test/multiverse/suites/agent_only/set_transaction_name_test.rb +4 -0
data/test/multiverse/suites/agent_only/synthetics_test.rb +1 -8
data/test/multiverse/suites/agent_only/testing_app.rb +1 -7
data/test/multiverse/suites/agent_only/xray_sessions_test.rb +11 -11
data/test/multiverse/suites/deferred_instrumentation/sinatra_test.rb +4 -0
data/test/multiverse/suites/grape/Envfile +1 -3
data/test/multiverse/suites/grape/grape_test.rb +87 -6
data/test/multiverse/suites/grape/grape_test_api.rb +5 -0
data/test/multiverse/suites/grape/grape_versioning_test.rb +67 -0
data/test/multiverse/suites/grape/grape_versioning_test_api.rb +72 -0
data/test/multiverse/suites/rack/example_app.rb +31 -1
data/test/multiverse/suites/rack/rack_auto_instrumentation_test.rb +11 -10
data/test/multiverse/suites/rack/rack_cascade_test.rb +46 -0
data/test/multiverse/suites/rack/rack_parameter_filtering_test.rb +40 -0
data/test/multiverse/suites/rails/Envfile +8 -0
data/test/multiverse/suites/rails/activejob_test.rb +16 -0
data/test/multiverse/suites/rails/gc_instrumentation_test.rb +4 -2
data/test/multiverse/suites/rails/parameter_capture_test.rb +49 -0
data/test/multiverse/suites/rails/rails3_app/app_rails3_plus.rb +12 -1
data/test/multiverse/suites/sinatra/sinatra_classic_test.rb +4 -0
data/test/multiverse/suites/sinatra/sinatra_modular_test.rb +4 -0
data/test/multiverse/suites/sinatra/sinatra_test_cases.rb +11 -0
data/test/new_relic/agent/instrumentation/controller_instrumentation_test.rb +0 -58
data/test/new_relic/agent/instrumentation/middleware_proxy_test.rb +49 -0
data/test/new_relic/agent/instrumentation/middleware_tracing_test.rb +26 -14
data/test/new_relic/agent/parameter_filtering_test.rb +39 -0
data/test/new_relic/agent/stats_engine/gc_profiler_test.rb +1 -1
data/test/new_relic/agent/transaction_test.rb +106 -2
data/test/new_relic/agent/vm/rubinius_vm_test.rb +38 -37
data/test/new_relic/agent_test.rb +8 -3
data/test/new_relic/filtering_test_app.rb +18 -0
data/test/new_relic/latest_changes_test.rb +1 -1
data/test/new_relic/rack/browser_monitoring_test.rb +4 -4
data/test/performance/lib/performance/instrumentation/gc_stats.rb +6 -4
data/test/performance/lib/performance/platform.rb +1 -0
data/test/performance/suites/thread_profiling.rb +12 -0
metadata +38 -15
metadata.gz.sig +2 -1

data/test/multiverse/suites/rack/rack_cascade_test.rb ADDED

@@ -0,0 +1,46 @@
+# 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__), 'example_app')
+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 RackCascadeTest < Minitest::Test
+    include MultiverseHelpers
+    setup_and_teardown_agent(
+      :beacon                 => 'beacon',
+      :browser_key            => 'browserKey',
+      :js_agent_loader        => 'loader',
+      :application_id         => '5',
+      :'rum.enabled'          => true,
+      :license_key            => 'a' * 40
+    )
+    include Rack::Test::Methods
+    def app
+      Rack::Builder.app do
+        use NewRelic::Rack::AgentHooks
+        use NewRelic::Rack::BrowserMonitoring
+        use ResponseCodeMiddleware
+        run Rack::Cascade.new([FirstCascadeExampleApp.new, SecondCascadeExampleApp.new])
+      end
+    end
+    def test_insert_js_does_not_fire_for_rack_cascade_404_responses
+      rsp = get '/', { 'body' => '<html><head></head><body></body></html>', 'override-response-code' => 404 }
+      refute(rsp.body.include?('script'), "\nExpected\n---\n#{rsp.body}\n---\nnot to include 'script'.")
+    end
+    def test_rack_cascade_transactions_are_named_for_the_last_app
+      rsp = get '/cascade'
+      assert_metrics_recorded('Controller/SecondCascadeExampleApp/call')
+    end
+  end
+end

data/test/multiverse/suites/rack/rack_parameter_filtering_test.rb ADDED

@@ -0,0 +1,40 @@
+# 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 'filtering_test_app'
+if NewRelic::Agent::Instrumentation::RackHelpers.rack_version_supported?
+  class RackParameterFilteringTest < Minitest::Test
+    include MultiverseHelpers
+    setup_and_teardown_agent
+    include Rack::Test::Methods
+    def app
+      Rack::Builder.app { run FilteringTestApp.new }
+    end
+    def test_file_upload_params_are_filtered
+      with_config(:capture_params => true) do
+        params = {
+          :title => "blah",
+          :file => Rack::Test::UploadedFile.new(__FILE__, 'text/plain')
+        }
+        post '/', params
+        assert_equal({"title" => "blah", "file" => "[FILE]"}, last_transaction_trace_request_params)
+      end
+    end
+    def test_apply_filters_returns_params_when_rails_is_not_present
+      with_config(:capture_params => true) do
+        params = {"name" => "name", "password" => "mypass"}
+        post '/', params
+        assert_equal params, last_transaction_trace_request_params
+      end
+    end
+  end
+end

data/test/multiverse/suites/rails/Envfile CHANGED

@@ -27,6 +27,13 @@ gemfile <<-RB
   gem 'minitest_tu_shim', :require => false
 RB
+gemfile <<-RB
+  gem 'rails', '~>3.2.20'
+  gem 'sinatra', '~> 1.4.5'
+  gem 'haml', '4.0.2'   # Getting load issues with haml 4.0.3
+  gem 'minitest_tu_shim', :require => false
+RB
 gemfile <<-RB
   gem 'rails', '~>3.1.12'
   gem 'haml', '4.0.2'   # Getting load issues with haml 4.0.3
@@ -46,5 +53,6 @@ if RUBY_VERSION <= '1.9.3' && (!defined?(RUBY_ENGINE) || RUBY_ENGINE != 'jruby')
     gem 'haml', '~> 3.1.0'   # last haml version that supports Rails 2
     gem 'minitest_tu_shim', :require => false
     gem 'sqlite3'
+    gem 'i18n', '0.6.11'
   RB
 end

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

@@ -40,6 +40,13 @@ class MyJobWithParams < ActiveJob::Base
   end
 end
+class MyFailure < ActiveJob::Base
+  def perform
+    raise ArgumentError.new("No it isn't!")
+  end
+end
 class ActiveJobTest < Minitest::Test
   include MultiverseHelpers
@@ -51,6 +58,7 @@ class ActiveJobTest < Minitest::Test
   def after_teardown
     unless passed?
+      puts "\nEmitting log from failure: #{self.name}"
       @log.rewind
       puts @log.read
     end
@@ -132,6 +140,14 @@ class ActiveJobTest < Minitest::Test
     MyJobWithParams.perform_later("1", "2")
     assert_equal(["1", "2"], MyJobWithParams.last_params)
   end
+  def test_captures_errors
+    # Because we're processing inline, we get the error raised here
+    assert_raises ArgumentError do
+      MyFailure.perform_later
+    end
+    assert_metrics_recorded(["Errors/all"])
+  end
 end
 end

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

@@ -4,9 +4,11 @@
 require './app'
-# GC instrumentation only works with REE or MRI >= 1.9.2
+# These tests only return consistent results for REE or MRI >= 1.9.2
 if NewRelic::LanguageSupport.ree? ||
-    (RUBY_VERSION >= '1.9.2' && !NewRelic::LanguageSupport.jruby?)
+    (RUBY_VERSION >= '1.9.2' &&
+     !NewRelic::LanguageSupport.jruby? &&
+     !NewRelic::LanguageSupport.rubinius?)
 class GcController < ApplicationController
   def gc_action

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

@@ -166,4 +166,53 @@ class ParameterCaptureTest < RailsMultiverseTest
     end
     assert_equal('/parameter_capture/sql', last_sql_trace.url)
   end
+  if Rails::VERSION::MAJOR > 2
+    def test_params_tts_should_be_filtered_when_serviced_by_rack_app
+      params = {"secret" => "shhhhhhh", "name" => "name"}
+      with_config(:capture_params => true) do
+        post '/filtering_test/', params
+      end
+      expected = {"secret" => "[FILTERED]", "name" => "name"}
+      assert_equal expected, last_transaction_trace_request_params
+    end
+    def test_params_on_errors_should_be_filtered_when_serviced_by_rack_app
+      params = {"secret" => "shhhhhhh", "name" => "name"}
+      with_config(:capture_params => true) do
+        post '/filtering_test?raise=1', params
+      end
+      expected = {"secret" => "[FILTERED]", "name" => "name", "raise" => "1"}
+      assert_equal expected, last_traced_error_request_params
+    end
+    def test_parameter_filtering_should_not_mutate_argument
+      input = { "foo" => "bar", "secret" => "baz" }
+      env   = { "action_dispatch.parameter_filter" => ["secret"] }
+      filtered = NewRelic::Agent::ParameterFiltering.apply_filters(env, input)
+      assert_equal({ "foo" => "bar", "secret" => "[FILTERED]" }, filtered)
+      assert_equal({ "foo" => "bar", "secret" => "baz" }, input)
+    end
+  end
+  if Rails::VERSION::MAJOR > 2 && defined?(Sinatra)
+    def test_params_tts_should_be_filtered_when_serviced_by_sinatra_app
+      params = {"secret" => "shhhhhhh", "name" => "name"}
+      with_config(:capture_params => true) do
+        get '/sinatra_app/', params
+      end
+      expected = {"secret" => "[FILTERED]", "name" => "name"}
+      assert_equal expected, last_transaction_trace_request_params
+    end
+    def test_params_on_errors_should_be_filtered_when_serviced_by_sinatra_app
+      params = {"secret" => "shhhhhhh", "name" => "name"}
+      with_config(:capture_params => true) do
+        get '/sinatra_app?raise=1', params
+      end
+      expected = {"secret" => "[FILTERED]", "name" => "name", "raise" => "1"}
+      assert_equal expected, last_traced_error_request_params
+    end
+  end
 end

data/test/multiverse/suites/rails/rails3_app/app_rails3_plus.rb CHANGED

@@ -5,6 +5,7 @@
 require 'action_controller/railtie'
 require 'active_model'
 require 'rails/test_help'
+require 'filtering_test_app'
 # We define our single Rails application here, one time, upon the first inclusion
 # Tests should feel free to define their own Controllers locally, but if they
@@ -33,7 +34,6 @@ if !defined?(MyApp)
       @name = 'InstanceMiddleware'
     end
-    # Yes, this is nuts. See the comment above initialize_with_new_relic_trace.
     def new(app)
       @app = app
       self
@@ -46,6 +46,15 @@ if !defined?(MyApp)
     end
   end
+  if defined?(Sinatra)
+    class SinatraTestApp < Sinatra::Base
+      get '/' do
+        raise "Intentional error" if params["raise"]
+        "SinatraTestApp#index"
+      end
+    end
+  end
   class MyApp < Rails::Application
     # We need a secret token for session, cookies, etc.
     config.active_support.deprecation = :log
@@ -69,6 +78,8 @@ if !defined?(MyApp)
         :constraints => lambda do |_|
           raise ActionController::RoutingError.new('this is an uncaught routing error')
         end)
+    mount SinatraTestApp, :at => '/sinatra_app' if defined?(Sinatra)
+    post '/filtering_test' => FilteringTestApp.new
     get '/:controller(/:action(/:id))'
   end

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

@@ -84,6 +84,10 @@ get(/\/regex.*/) do
   "Yeah, regex's!"
 end
+post '/files' do
+  "file uploaded"
+end
 module Sinatra
   class Application < Base
     # Override to not accidentally start the app in at_exit handler

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

@@ -79,6 +79,10 @@ class SinatraModularTestApp < Sinatra::Base
   get(/\/regex.*/) do
     "Yeah, regex's!"
   end
+  post '/files' do
+    "file uploaded"
+  end
 end
 class SinatraModularTest < Minitest::Test

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

@@ -131,6 +131,17 @@ module SinatraTestCases
     get '/pass'
   end
+  def test_file_upload_params_are_filtered
+    with_config(:capture_params => true) do
+      params = {
+        :title => "blah",
+        :file => Rack::Test::UploadedFile.new(__FILE__, 'text/plain')
+      }
+      post '/files', params
+      assert_equal({"title" => "blah", "file" => "[FILE]"}, last_transaction_trace_request_params)
+    end
+  end
   def fail_on_second_params_call
     Sinatra::Request.any_instance.
       stubs(:params).returns({}).

data/test/new_relic/agent/instrumentation/controller_instrumentation_test.rb CHANGED

@@ -51,17 +51,6 @@ module NewRelic::Agent::Instrumentation
       alias_method :perform_action, :perform_action_with_newrelic_trace
     end
-    def test_non_block_form
-      state =  NewRelic::Agent::TransactionState.tl_get
-      state.push_traced(false)
-      object = TestNonBlockObject.new
-      object.perform_action
-      assert object.called
-    ensure
-      state.pop_traced if state
-    end
     def setup
       NewRelic::Agent.drop_buffered_data
       @object = TestObject.new
@@ -275,14 +264,6 @@ module NewRelic::Agent::Instrumentation
       assert TestObject.already_added_transaction_tracer?(TestObject, with_method_name)
     end
-    # ControllerInstrumentation historically was used to instrument Rails 2
-    # controllers, and in this case is called without a block. In that case, and
-    # that case *only*, we want to try to call params on the host object to
-    # extract request params.
-    #
-    # In the more modern usage where it's called with a block we do *not* want to
-    # call params on the host object. This is important because doing so could
-    # actually crash in some cases.
     def test_should_not_call_params_on_host_if_called_with_block
       host_class = Class.new do
         include ControllerInstrumentation
@@ -304,45 +285,6 @@ module NewRelic::Agent::Instrumentation
       host.doit
     end
-    def test_should_not_call_params_on_host_if_no_block_given_but_does_not_respond_to_params
-      host_class = Class.new do
-        include ControllerInstrumentation
-        def doit
-          perform_action_with_newrelic_trace
-        end
-        def perform_action_without_newrelic_trace; end
-      end
-      host = host_class.new
-      refute host.respond_to?(:params)
-      host.doit
-    end
-    def test_should_call_params_on_host_if_no_block_given_and_host_responds
-      host_class = Class.new do
-        include ControllerInstrumentation
-        attr_reader :params_called
-        def params
-          @params_called = true
-          {}
-        end
-        def doit
-          perform_action_with_newrelic_trace
-        end
-        def perform_action_without_newrelic_trace; end
-      end
-      host = host_class.new
-      host.doit
-      assert host.params_called
-    end
     class UserError < StandardError
     end

data/test/new_relic/agent/instrumentation/middleware_proxy_test.rb CHANGED

@@ -185,5 +185,54 @@ class NewRelic::Agent::Instrumentation::MiddlewareProxyTest < Minitest::Test
     assert_metrics_recorded('Controller/Rack/GreatClass/call')
   end
+  def test_should_emit_events_once
+    app = Proc.new { |env| [200, {}, ["nothing"]]}
+    middleware = Proc.new { |env| app.call(env) }
+    wrapped_app = NewRelic::Agent::Instrumentation::MiddlewareProxy.wrap(app, true)
+    wrapped_middleware = NewRelic::Agent::Instrumentation::MiddlewareProxy.wrap(middleware, true)
+    before_call_count = 0
+    after_call_count = 0
+    NewRelic::Agent.instance.events.subscribe(:before_call) { before_call_count += 1 }
+    NewRelic::Agent.instance.events.subscribe(:after_call) { after_call_count += 1 }
+    result = wrapped_middleware.call({})
+    assert_equal 1, before_call_count
+    assert_equal 1, after_call_count
+  end
+  def test_before_call_should_receive_rack_env_hash
+    app = Proc.new { |env| [200, {}, ["nothing"]]}
+    wrapped_app = NewRelic::Agent::Instrumentation::MiddlewareProxy.wrap(app, true)
+    original_env = {}
+    env_from_before_call = nil
+    NewRelic::Agent.instance.events.subscribe(:before_call) { |env| env_from_before_call = env }
+    wrapped_app.call(original_env)
+    assert_same original_env, env_from_before_call
+  end
+  def test_before_call_should_receive_rack_env_hash
+    app = Proc.new { |env| [200, {}, ["nothing"]] }
+    wrapped_app = NewRelic::Agent::Instrumentation::MiddlewareProxy.wrap(app, true)
+    original_env = {}
+    env_from_after_call = nil
+    result_from_after_call = nil
+    NewRelic::Agent.instance.events.subscribe(:after_call) do |env, result|
+      env_from_after_call = env
+      result_from_after_call = result
+    end
+    result = wrapped_app.call(original_env)
+    assert_same original_env, env_from_after_call
+    assert_same result, result_from_after_call
+  end
 end

data/test/new_relic/agent/instrumentation/middleware_tracing_test.rb CHANGED

@@ -9,29 +9,41 @@ class NewRelic::Agent::Instrumentation::MiddlewareTracingTest < Minitest::Test
   class UserError < StandardError
   end
-  def test_dont_block_errors_during_malfunctioning_transaction
-    middleware_class = Class.new do
-      include NewRelic::Agent::Instrumentation::MiddlewareTracing
+  class HostClass
+    include NewRelic::Agent::Instrumentation::MiddlewareTracing
+    attr_reader :category
-      attr_reader :category
+    def initialize(&blk)
+      @action = blk
+    end
-      def target
-        self
-      end
+    def target
+      self
+    end
-      def transaction_options
-        {}
-      end
+    def transaction_options
+      {}
+    end
-      def traced_call(env)
-        raise UserError.new
-      end
+    def traced_call(env)
+      @action.call
     end
+  end
+  def test_dont_block_errors_during_malfunctioning_transaction
     NewRelic::Agent::Transaction.stubs(:start).returns(nil)
+    middleware = HostClass.new { raise UserError }
     assert_raises(UserError) do
-      middleware_class.new.call({})
+      middleware.call({})
     end
   end
+  def test_dont_raise_when_transaction_start_fails
+    NewRelic::Agent::Transaction.stubs(:start).returns(nil)
+    middleware = HostClass.new { [200, {}, ['hi!']] }
+    middleware.call({})
+  end
 end