newrelic_rpm 3.9.9.275 → 3.10.0.279

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

@@ -9,10 +9,6 @@ class TestingApp
   attr_accessor :response, :headers
 
   def initialize
-    reset_headers
-  end
-
-  def reset_headers
     @headers = {'Content-Type' => 'text/html'}
   end
 
@@ -23,7 +19,7 @@ class TestingApp
       opts = {}
       if params['transaction_category']
         opts[:category] = params['transaction_category']
-        NewRelic::Agent::Transaction.stubs(:transaction_category_is_web?).returns(true)
+        NewRelic::Agent::TransactionState.tl_get.current_transaction.stubs(:similar_category?).returns true
       end
       NewRelic::Agent.set_transaction_name(params['transaction_name'], opts)
     end
@@ -34,6 +30,4 @@ class TestingApp
     sleep(params['sleep'].to_f) if params['sleep']
     [200, headers, [response]]
   end
-
-  include NewRelic::Agent::Instrumentation::Rack
 end

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

@@ -28,11 +28,11 @@ class XraySessionsTest < Minitest::Test
   end
 
   def app
-    @app ||= TestingApp.new
+    Rack::Builder.app { run TestingApp.new }
   end
 
   def test_tags_transaction_traces_with_xray_id
-    session = build_xray_session('key_transaction_name' => 'Controller/Middleware/Rack/A')
+    session = build_xray_session('key_transaction_name' => 'Controller/Rack/A')
     with_xray_sessions(session) do
       5.times { get '/?transaction_name=A' }
       trigger_harvest
@@ -43,12 +43,12 @@ class XraySessionsTest < Minitest::Test
 
     traces = posts.first.samples
     assert_equal(5, traces.size)
-    assert traces.all? { |t| t.metric_name == 'Controller/Middleware/Rack/A' }
+    assert traces.all? { |t| t.metric_name == 'Controller/Rack/A' }
     assert traces.all? { |t| t.xray_id == session['x_ray_id'] }
   end
 
   def test_does_not_collect_traces_for_non_xrayed_transactions
-    session = build_xray_session('key_transaction_name' => 'Controller/Middleware/Rack/A')
+    session = build_xray_session('key_transaction_name' => 'Controller/Rack/A')
     with_xray_sessions(session) do
       get '/?transaction_name=OtherThing'
       get '/?transaction_name=A'
@@ -63,8 +63,8 @@ class XraySessionsTest < Minitest::Test
   end
 
   def test_gathers_transaction_traces_from_multiple_concurrent_xray_sessions
-    sessionA = build_xray_session('x_ray_id' => 12, 'key_transaction_name' => 'Controller/Middleware/Rack/A')
-    sessionB = build_xray_session('x_ray_id' => 13, 'key_transaction_name' => 'Controller/Middleware/Rack/B')
+    sessionA = build_xray_session('x_ray_id' => 12, 'key_transaction_name' => 'Controller/Rack/A')
+    sessionB = build_xray_session('x_ray_id' => 13, 'key_transaction_name' => 'Controller/Rack/B')
 
     with_xray_sessions(sessionA, sessionB) do
       2.times do
@@ -80,14 +80,14 @@ class XraySessionsTest < Minitest::Test
     traces = posts.first.samples
     assert_equal(4, traces.size)
 
-    tracesA = traces.select { |t| t.metric_name == 'Controller/Middleware/Rack/A' }
-    tracesB = traces.select { |t| t.metric_name == 'Controller/Middleware/Rack/B' }
+    tracesA = traces.select { |t| t.metric_name == 'Controller/Rack/A' }
+    tracesB = traces.select { |t| t.metric_name == 'Controller/Rack/B' }
     assert_equal(2, tracesA.size, "Expected 2 traces for transaction A")
     assert_equal(2, tracesB.size, "Expected 2 traces for transaction B")
   end
 
   def test_gathers_thread_profiles
-    session = build_xray_session('key_transaction_name' => 'Controller/Middleware/Rack/A')
+    session = build_xray_session('key_transaction_name' => 'Controller/Rack/A')
     with_xray_sessions(session) do
       wait_for_backtrace_service_poll
       get '/?transaction_name=A&sleep=1'
@@ -115,7 +115,7 @@ class XraySessionsTest < Minitest::Test
     defaults = {
       "x_ray_id"              => next_xray_session_id,
       "xray_session_name"     => "Test XRay Session",
-      "key_transaction_name"  => "Controller/Middleware/Rack/Transaction",
+      "key_transaction_name"  => "Controller/Rack/Transaction",
       "requested_trace_count" => 10,
       "duration"              => 100,
       "sample_period"         => 0.1,
@@ -137,7 +137,7 @@ class XraySessionsTest < Minitest::Test
   def with_xray_sessions(*xray_metadatas)
     xray_session_ids = xray_metadatas.map { |m| m['x_ray_id'] }
     activate_cmd = build_active_xrays_command(xray_session_ids)
-    
+
     $collector.stub('get_xray_metadata', xray_metadatas)
     issue_command(activate_cmd)
 

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

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

data/test/multiverse/suites/grape/Envfile

@@ -1,7 +1,5 @@
 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
+  RUBY_VERSION >= '1.9.3'
 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)

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

@@ -29,32 +29,113 @@ class GrapeTest < Minitest::Test
       assert_raises(GrapeTestApiError) do
         get '/self_destruct'
       end
-      assert_metrics_recorded(['Errors/Controller/Rack/GrapeTestApi/self_destruct (GET)'])
+
+      expected_txn_name = 'Controller/Grape/GrapeTestApi/self_destruct (GET)'
+      assert_grape_metrics(expected_txn_name)
+      assert_metrics_recorded(["Errors/#{expected_txn_name}"])
     end
 
     def test_getting_a_list_of_grape_apes
       get '/grape_ape'
-      assert_metrics_recorded(['Controller/Rack/GrapeTestApi/grape_ape (GET)'])
+      assert_grape_metrics('Controller/Grape/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)'])
+      assert_grape_metrics('Controller/Grape/GrapeTestApi/grape_ape/:id (GET)')
     end
 
     def test_creating_a_grape_ape
       post '/grape_ape', {}
-      assert_metrics_recorded(['Controller/Rack/GrapeTestApi/grape_ape (POST)'])
+      assert_grape_metrics('Controller/Grape/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)'])
+      assert_grape_metrics('Controller/Grape/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)'])
+      assert_grape_metrics('Controller/Grape/GrapeTestApi/grape_ape/:id (DELETE)')
+    end
+
+    def test_transaction_renaming
+      get '/grape_ape/renamed'
+      # The second segment here is 'Rack' because of an idiosyncrasy of
+      # the set_transaction_name API: when you call set_transaction_name and
+      # don't provide an explicit category, you lock in the category prefix
+      # that was in use at the time you made the call.
+      #
+      # We may change this behavior in the future, once we have a better
+      # internal representation of the name and category of a transaction as
+      # truly separate entities.
+      #
+      assert_grape_metrics('Controller/Rack/RenamedTxn')
+      #assert_metrics_recorded(['Controller/Rack/RenamedTxn'])
+    end
+
+    def test_params_are_not_captured_with_capture_params_disabled
+      with_config(:capture_params => false) do
+        get '/grape_ape/10'
+        assert_equal({}, last_transaction_trace_request_params)
+      end
+    end
+
+    def test_route_params_are_captured
+      with_config(:capture_params => true) do
+        get '/grape_ape/10'
+        assert_equal({"id" => "10"}, last_transaction_trace_request_params)
+      end
+    end
+
+    def test_query_params_are_captured
+      with_config(:capture_params => true) do
+        get '/grape_ape?q=1234&foo=bar'
+        assert_equal({'q' => '1234', 'foo' => 'bar'}, last_transaction_trace_request_params)
+      end
+    end
+
+    def test_post_body_params_are_captured
+      with_config(:capture_params => true) do
+        post '/grape_ape', {'q' => '1234', 'foo' => 'bar'}.to_json, "CONTENT_TYPE" => "application/json"
+        assert_equal({'q' => '1234', 'foo' => 'bar'}, last_transaction_trace_request_params)
+      end
+    end
+
+    def test_post_body_with_nested_params_are_captured
+      with_config(:capture_params => true) do
+        params = {"ape" => {"first_name" => "koko", "last_name" => "gorilla"}}
+        post '/grape_ape', params.to_json, "CONTENT_TYPE" => "application/json"
+        assert_equal(params, last_transaction_trace_request_params)
+      end
+    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 '/grape_ape', params
+        assert_equal({"title" => "blah", "file" => "[FILE]"}, last_transaction_trace_request_params)
+      end
+    end
+
+    def test_404_with_params_does_not_capture_them
+      with_config(:capture_params => true) do
+        post '/grape_catfish', {"foo" => "bar"}
+        assert_equal({}, last_transaction_trace_request_params)
+      end
+    end
+
+    def assert_grape_metrics(expected_txn_name)
+      expected_segment_name = 'Middleware/Grape/GrapeTestApi/call'
+      assert_metrics_recorded([
+        expected_segment_name,
+        [expected_segment_name, expected_txn_name],
+        expected_txn_name
+      ])
     end
   end
 end

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

@@ -18,6 +18,11 @@ class GrapeTestApi < Grape::API
       'List grape apes!'
     end
 
+    get 'renamed' do
+      ::NewRelic::Agent.set_transaction_name("RenamedTxn")
+      'Totally renamed it.'
+    end
+
     get ':id' do
       'Show grape ape!'
     end

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

@@ -0,0 +1,67 @@
+# 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.
+
+unless ::Grape::VERSION == '0.1.5'
+  require 'multiverse_helpers'
+  require './grape_versioning_test_api'
+
+  require File.join(File.dirname(__FILE__), "..", "..", "..", "agent_helper")
+
+  class GrapeVersioningTest < Minitest::Test
+    include Rack::Test::Methods
+    include MultiverseHelpers
+
+    setup_and_teardown_agent
+
+    def app
+      clazz = @app_class
+      Rack::Builder.app { run clazz.new }
+    end
+
+    def test_version_from_path_is_recorded_in_transaction_name
+      @app_class = GrapeVersioning::ApiV1
+      get '/v1/fish'
+      assert_metrics_recorded('Controller/Grape/GrapeVersioning::ApiV1-v1/fish (GET)')
+    end
+
+    def test_version_is_stripped_when_requesting_root_route
+      @app_class = GrapeVersioning::ApiV1
+      get '/v1'
+      assert_metrics_recorded('Controller/Grape/GrapeVersioning::ApiV1-v1/ (GET)')
+    end
+
+    def test_version_is_stripped_when_requesting_root_route_with_trailing_slash
+      @app_class = GrapeVersioning::ApiV1
+      get '/v1/'
+      assert_metrics_recorded('Controller/Grape/GrapeVersioning::ApiV1-v1/ (GET)')
+    end
+
+    def test_version_from_param_version_is_recorded_in_transaction_name
+      @app_class = GrapeVersioning::ApiV2
+      get '/fish?apiver=v2'
+      assert_metrics_recorded('Controller/Grape/GrapeVersioning::ApiV2-v2/fish (GET)')
+    end
+
+    def test_version_from_header_is_recorded_in_transaction_name
+      @app_class = GrapeVersioning::ApiV3
+      get '/fish', {}, 'HTTP_ACCEPT' => 'application/vnd.newrelic-v3+json'
+      assert_metrics_recorded('Controller/Grape/GrapeVersioning::ApiV3-v3/fish (GET)')
+    end
+
+    #version from http accept header is not supported in older versions of grape
+    if NewRelic::VersionNumber.new(Grape::VERSION) >= NewRelic::VersionNumber.new('4.0.0')
+      def test_version_from_accept_version_header_is_recorded_in_transaction_name
+        @app_class = GrapeVersioning::ApiV4
+        get '/fish', {}, 'HTTP_ACCEPT_VERSION' => 'v4'
+        assert_metrics_recorded('Controller/Grape/GrapeVersioning::ApiV4-v4/fish (GET)')
+      end
+    end
+
+    def test_app_not_using_versioning_does_not_record_version_in_transaction_name
+      @app_class = GrapeVersioning::Unversioned
+      get '/fish'
+      assert_metrics_recorded('Controller/Grape/GrapeVersioning::Unversioned/fish (GET)')
+    end
+  end
+end

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

@@ -0,0 +1,72 @@
+# 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.
+
+unless ::Grape::VERSION == '0.1.5'
+  module GrapeVersioning
+    class ApiV1 < Grape::API
+      version 'v1'
+
+      format :json
+
+      get do
+        "root"
+      end
+
+      resource :fish do
+        get do
+          "api v1"
+        end
+      end
+    end
+
+    class ApiV2 < Grape::API
+      version 'v2', :using => :param
+
+      format :json
+
+      resource :fish do
+        get do
+          "api v2"
+        end
+      end
+    end
+
+    class ApiV3 < Grape::API
+      version 'v3', :using => :header, :vendor => "newrelic"
+
+      format :json
+
+      resource :fish do
+        get do
+          "api v3"
+        end
+      end
+    end
+
+    class ApiV4 < Grape::API
+      #version from http accept header is not supported in older versions of grape
+      if NewRelic::VersionNumber.new(Grape::VERSION) >= NewRelic::VersionNumber.new('4.0.0')
+        version 'v4', :using => :accept_version_header
+      end
+
+      format :json
+
+      resource :fish do
+        get do
+          "api v4"
+        end
+      end
+    end
+
+    class Unversioned < Grape::API
+      format :json
+
+      resource :fish do
+        get do
+          "api v5"
+        end
+      end
+    end
+  end
+end

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

@@ -4,8 +4,38 @@
 
 class ExampleApp
   def call(env)
-    ['200', {'Content-Type' => 'text/html', 'ExampleApp' => '0'}, ['A barebones rack app.']]
+    req = Rack::Request.new(env)
+    body = req.params['body'] || 'A barebones rack app.'
+
+    status = '404' unless req.path == '/'
+    [status || '200', {'Content-Type' => 'text/html', 'ExampleApp' => '0'}, [body]]
+  end
+end
+
+class FirstCascadeExampleApp
+  include NewRelic::Agent::Instrumentation::ControllerInstrumentation
+
+  def call(env)
+    req = Rack::Request.new(env)
+    body = req.params['body'] || 'A barebones rack cascade app.'
+
+    status = '404' unless req.path == '/'
+    [status || '200', {'Content-Type' => 'text/html', 'FirstCascadeExampleApp' => '0'}, [body]]
+  end
+  add_transaction_tracer :call
+end
+
+class SecondCascadeExampleApp
+  include NewRelic::Agent::Instrumentation::ControllerInstrumentation
+
+  def call(env)
+    req = Rack::Request.new(env)
+    body = req.params['body'] || 'A barebones rack cascade app.'
+
+    status = '404' unless req.path == '/'
+    [status || '200', {'Content-Type' => 'text/html', 'SecondCascadeExampleApp' => '0'}, [body]]
   end
+  add_transaction_tracer :call
 end
 
 class MiddlewareOne

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

@@ -101,13 +101,14 @@ class RackAutoInstrumentationTest < Minitest::Test
   end
 
   def test_middlewares_record_queue_time
-    t0 = freeze_time
-    advance_time(5.0)
-    get '/', {}, { 'HTTP_X_REQUEST_START' => "t=#{t0.to_f}" }
+    freeze_time do |t0|
+      advance_time(5.0)
+      get '/', {}, { 'HTTP_X_REQUEST_START' => "t=#{t0.to_f}" }
 
-    assert_metrics_recorded(
-      'WebFrontend/QueueTime' => { :total_call_time => 5.0 }
-    )
+      assert_metrics_recorded(
+        'WebFrontend/QueueTime' => { :total_call_time => 5.0 }
+      )
+    end
   end
 
   def test_middleware_that_returns_early_records_middleware_rollup_metric
@@ -126,10 +127,10 @@ class RackAutoInstrumentationTest < Minitest::Test
   end
 
   def test_middleware_that_returns_early_middleware_all_has_correct_call_times
-    freeze_time
-
-    get '/?return-early=true'
-    assert_metrics_recorded('Middleware/all' => { :total_exclusive_time => 3.0, :call_count => 2 })
+    freeze_time do
+      get '/?return-early=true'
+      assert_metrics_recorded('Middleware/all' => { :total_exclusive_time => 3.0, :call_count => 2 })
+    end
   end
 
   def test_middleware_created_with_args_works