newrelic_rpm 3.8.1.221 → 3.9.0.229

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

@@ -1,7 +1,6 @@
 ---
 development:
   error_collector:
-    capture_source: true
     enabled: true
   apdex_t: 0.5
   ssl: false

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

@@ -1,7 +1,6 @@
 ---
 development:
   error_collector:
-    capture_source: true
     enabled: true
   apdex_t: 0.5
   ssl: false

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

@@ -1,7 +1,6 @@
 ---
 development:
   error_collector:
-    capture_source: true
     enabled: true
   apdex_t: 0.5
   ssl: false

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

@@ -1,7 +1,6 @@
 ---
 development:
   error_collector:
-    capture_source: true
     enabled: true
   apdex_t: 0.5
   ssl: false

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

@@ -1,7 +1,6 @@
 ---
 development:
   error_collector:
-    capture_source: true
     enabled: true
   apdex_t: 0.5
   ssl: false

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

@@ -1,7 +1,6 @@
 ---
 development:
   error_collector:
-    capture_source: true
     enabled: true
   apdex_t: 0.5
   ssl: false

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

@@ -1,7 +1,6 @@
 ---
 development:
   error_collector:
-    capture_source: true
     enabled: true
   apdex_t: 0.5
   ssl: false

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

@@ -1,7 +1,6 @@
 ---
 development:
   error_collector:
-    capture_source: true
     enabled: true
   apdex_t: 0.5
   ssl: false

data/test/multiverse/suites/rack/Envfile

@@ -0,0 +1,25 @@
+gemfile <<-RB
+  gem 'rack', '~>1.5.0'
+  gem 'rack-test'
+RB
+
+gemfile <<-RB
+  gem 'rack', '1.4.5'
+  gem 'rack-test'
+RB
+
+gemfile <<-RB
+  gem 'rack', '1.2.8'
+  gem 'rack-test'
+RB
+
+gemfile <<-RB
+  gem 'rack', '1.1.0'
+  gem 'rack-test'
+RB
+
+# unsupported version
+gemfile <<-RB
+  gem 'rack', '1.0.1'
+  gem 'rack-test'
+RB

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

@@ -0,0 +1,50 @@
+# 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.
+
+class ExampleApp
+  def call(env)
+    ['200', {'Content-Type' => 'text/html', 'ExampleApp' => '0'}, ['A barebones rack app.']]
+  end
+end
+
+class MiddlewareOne
+  def initialize(app)
+    @app = app
+  end
+
+  def call(env)
+    advance_time(1)
+    status, headers, body = @app.call(env)
+    headers['MiddlewareOne'] = '1'
+
+    advance_time(1)
+    [status, headers, body]
+  end
+end
+
+class MiddlewareTwo
+  def initialize(app, tag, &blk)
+    @app = app
+    @tag = tag
+    @block = blk
+  end
+
+  def call(env)
+    advance_time(1)
+    request = Rack::Request.new(env)
+
+    if request.params['return-early']
+      status, headers, body = '200', {}, ['Hi']
+    else
+      status, headers, body = @app.call(env)
+    end
+
+    headers['MiddlewareTwo'] = '2'
+    headers['MiddlewareTwoTag'] = @tag
+
+    @block.call(headers)
+
+    [status, headers, body]
+  end
+end

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

@@ -0,0 +1,66 @@
+# 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')
+
+if NewRelic::Agent::Instrumentation::RackHelpers.rack_version_supported?
+
+class NestedNonRackAppTest < Minitest::Test
+  include MultiverseHelpers
+
+  setup_and_teardown_agent
+
+  include Rack::Test::Methods
+
+  class ExampleMiddleware
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      @app.call(env)
+    end
+  end
+
+  class RailsishApp
+    include ::NewRelic::Agent::Instrumentation::ControllerInstrumentation
+
+    def call(env)
+      perform_action_with_newrelic_trace(:category => :controller, :name => 'inner') do
+        [200, {}, ['hey']]
+      end
+    end
+  end
+
+  def app
+    Rack::Builder.app do
+      use ExampleMiddleware
+      run RailsishApp.new
+    end
+  end
+
+  def test_outermost_middleware_contributes_to_middleware_all_if_txn_name_is_non_rack
+    get '/'
+
+    assert_metrics_recorded_exclusive(
+      [
+        "Apdex",
+        "Apdex/NestedNonRackAppTest::RailsishApp/inner",
+        "Controller/NestedNonRackAppTest::RailsishApp/inner",
+        "HttpDispatcher",
+        "Middleware/all",
+        "Middleware/Rack/NestedNonRackAppTest::ExampleMiddleware/call",
+        ["Middleware/Rack/NestedNonRackAppTest::ExampleMiddleware/call", "Controller/NestedNonRackAppTest::RailsishApp/inner"],
+        "Nested/Controller/NestedNonRackAppTest::RailsishApp/inner",
+        ["Nested/Controller/NestedNonRackAppTest::RailsishApp/inner", "Controller/NestedNonRackAppTest::RailsishApp/inner"],
+        "Nested/Controller/Rack/NestedNonRackAppTest::RailsishApp/call",
+        ["Nested/Controller/Rack/NestedNonRackAppTest::RailsishApp/call", "Controller/NestedNonRackAppTest::RailsishApp/inner"]
+      ],
+      :ignore_filter => /^Supportability\/EnvironmentReport/
+    )
+  end
+end
+
+end

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

@@ -0,0 +1,143 @@
+# 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 RackAutoInstrumentationTest < Minitest::Test
+  include MultiverseHelpers
+
+  setup_and_teardown_agent
+
+  include Rack::Test::Methods
+
+  def app
+    Rack::Builder.app do
+      use MiddlewareOne
+      use MiddlewareTwo, 'the correct tag' do |headers|
+        headers['MiddlewareTwoBlockTag'] = 'the block tag'
+      end
+      use NewRelic::Rack::BrowserMonitoring
+      use NewRelic::Rack::AgentHooks
+      use NewRelic::Rack::ErrorCollector
+      run ExampleApp.new
+    end
+  end
+
+  def test_middleware_gets_used
+    get '/'
+    assert last_response.headers['MiddlewareOne']
+    assert last_response.headers['MiddlewareTwo']
+  end
+
+  def test_status_code_is_preserved
+    get '/'
+    assert_equal 200, last_response.status
+  end
+
+  def test_header_is_preserved
+    get '/'
+    assert last_response.headers['ExampleApp']
+  end
+
+  def test_body_is_preserved
+    get '/'
+    assert_equal 'A barebones rack app.', last_response.body
+  end
+
+  def test_non_agent_middlewares_do_not_record_metrics_if_disabled_by_config
+    with_config(:disable_middleware_instrumentation => true) do
+      get '/'
+    end
+    assert_metrics_recorded_exclusive(
+      [
+        "Apdex",
+        "HttpDispatcher",
+        "Middleware/all",
+        "Apdex/Middleware/Rack/NewRelic::Rack::ErrorCollector/call",
+        "Controller/Middleware/Rack/NewRelic::Rack::ErrorCollector/call",
+        "Middleware/Rack/NewRelic::Rack::ErrorCollector/call",
+        "Middleware/Rack/NewRelic::Rack::BrowserMonitoring/call",
+        "Middleware/Rack/NewRelic::Rack::AgentHooks/call",
+        ["Middleware/Rack/NewRelic::Rack::ErrorCollector/call",    "Controller/Middleware/Rack/NewRelic::Rack::ErrorCollector/call"],
+        ["Middleware/Rack/NewRelic::Rack::BrowserMonitoring/call", "Controller/Middleware/Rack/NewRelic::Rack::ErrorCollector/call"],
+        ["Middleware/Rack/NewRelic::Rack::AgentHooks/call",        "Controller/Middleware/Rack/NewRelic::Rack::ErrorCollector/call"],
+      ],
+      :ignore_filter => /^Supportability\/EnvironmentReport/
+    )
+  end
+
+  def test_middlewares_record_metrics
+    NewRelic::Agent.drop_buffered_data
+    get '/'
+    assert_metrics_recorded_exclusive(
+      [
+        "Apdex",
+        "HttpDispatcher",
+        "Middleware/all",
+        "Apdex/Rack/ExampleApp/call",
+        "Controller/Rack/ExampleApp/call",
+        "Middleware/Rack/MiddlewareOne/call",
+        "Middleware/Rack/MiddlewareTwo/call",
+        "Middleware/Rack/NewRelic::Rack::ErrorCollector/call",
+        "Middleware/Rack/NewRelic::Rack::BrowserMonitoring/call",
+        "Middleware/Rack/NewRelic::Rack::AgentHooks/call",
+        "Nested/Controller/Rack/ExampleApp/call",
+        ["Middleware/Rack/NewRelic::Rack::ErrorCollector/call",    "Controller/Rack/ExampleApp/call"],
+        ["Middleware/Rack/NewRelic::Rack::BrowserMonitoring/call", "Controller/Rack/ExampleApp/call"],
+        ["Middleware/Rack/NewRelic::Rack::AgentHooks/call",        "Controller/Rack/ExampleApp/call"],
+        ["Middleware/Rack/MiddlewareOne/call", "Controller/Rack/ExampleApp/call"],
+        ["Middleware/Rack/MiddlewareTwo/call", "Controller/Rack/ExampleApp/call"],
+        ["Nested/Controller/Rack/ExampleApp/call",    "Controller/Rack/ExampleApp/call"]
+      ],
+      :ignore_filter => /^Supportability\/EnvironmentReport/
+    )
+  end
+
+  def test_middlewares_record_queue_time
+    t0 = freeze_time
+    advance_time(5.0)
+    get '/', {}, { 'HTTP_X_REQUEST_START' => "t=#{t0.to_f}" }
+
+    assert_metrics_recorded(
+      'WebFrontend/QueueTime' => { :total_call_time => 5.0 }
+    )
+  end
+
+  def test_middleware_that_returns_early_records_middleware_rollup_metric
+    get '/?return-early=true'
+    assert_metrics_recorded_exclusive([
+      "Apdex",
+      "HttpDispatcher",
+      "Middleware/all",
+      "Apdex/Middleware/Rack/MiddlewareTwo/call",
+      "Controller/Middleware/Rack/MiddlewareTwo/call",
+      "Middleware/Rack/MiddlewareOne/call",
+      "Middleware/Rack/MiddlewareTwo/call",
+      ["Middleware/Rack/MiddlewareOne/call", "Controller/Middleware/Rack/MiddlewareTwo/call"],
+      ["Middleware/Rack/MiddlewareTwo/call", "Controller/Middleware/Rack/MiddlewareTwo/call"]
+    ])
+  end
+
+  def test_middleware_that_returns_early_middleware_all_has_correct_call_times
+    t0 = freeze_time
+
+    get '/?return-early=true'
+    assert_metrics_recorded('Middleware/all' => { :total_exclusive_time => 3.0, :call_count => 2 })
+  end
+
+  def test_middleware_created_with_args_works
+    get '/'
+
+    assert_equal('the correct tag', last_response.headers['MiddlewareTwoTag'])
+    assert_equal('the block tag',   last_response.headers['MiddlewareTwoBlockTag'])
+  end
+end
+
+end

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

@@ -0,0 +1,45 @@
+# 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'
+
+if !NewRelic::Agent::Instrumentation::RackHelpers.rack_version_supported?
+
+class RackUnsupportedVersionTest < Minitest::Test
+  include MultiverseHelpers
+
+  setup_and_teardown_agent
+
+  include Rack::Test::Methods
+
+  class SimpleMiddleware
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      @app.call(env)
+    end
+  end
+
+  class ExampleApp
+    def call(env)
+      [200, {}, [self.class.name]]
+    end
+  end
+
+  def app
+    Rack::Builder.app do
+      use SimpleMiddleware
+      run ExampleApp.new
+    end
+  end
+
+  def test_no_instrumentation_when_not_supported
+    get '/'
+    assert_metrics_recorded_exclusive([])
+  end
+end
+
+end

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

@@ -0,0 +1,120 @@
+# 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'
+
+if NewRelic::Agent::Instrumentation::RackHelpers.rack_version_supported?
+
+class UrlMapTest < Minitest::Test
+  include MultiverseHelpers
+
+  setup_and_teardown_agent
+
+  include Rack::Test::Methods
+
+  class SimpleMiddleware
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      @app.call(env)
+    end
+  end
+
+  class MiddlewareOne   < SimpleMiddleware; end
+  class MiddlewareTwo   < SimpleMiddleware; end
+  class MiddlewareThree < SimpleMiddleware; end
+
+  class ExampleApp
+    def call(env)
+      [200, {}, [self.class.name]]
+    end
+  end
+
+  class PrefixAppOne < ExampleApp; end
+  class PrefixAppTwo < ExampleApp; end
+
+  def app
+    Rack::Builder.app do
+      use MiddlewareOne
+      use MiddlewareTwo
+
+      map '/prefix1' do
+        run PrefixAppOne.new
+      end
+
+      map '/prefix2' do
+        use MiddlewareThree
+        run PrefixAppTwo.new
+      end
+
+      # Rack versions prior to 1.4 did not support combining map and run at the
+      # top-level in the same Rack::Builder.
+      if Rack::VERSION[1] >= 4
+        run ExampleApp.new
+      end
+    end
+  end
+
+  if Rack::VERSION[1] >= 4
+    def test_metrics_for_default_prefix
+      get '/'
+
+      assert_metrics_recorded_exclusive([
+        'Apdex',
+        'HttpDispatcher',
+        'Middleware/all',
+        'Controller/Rack/UrlMapTest::ExampleApp/call',
+        'Apdex/Rack/UrlMapTest::ExampleApp/call',
+        'Middleware/Rack/UrlMapTest::MiddlewareOne/call',
+        'Middleware/Rack/UrlMapTest::MiddlewareTwo/call',
+        'Nested/Controller/Rack/UrlMapTest::ExampleApp/call',
+        ['Middleware/Rack/UrlMapTest::MiddlewareOne/call', 'Controller/Rack/UrlMapTest::ExampleApp/call'],
+        ['Middleware/Rack/UrlMapTest::MiddlewareTwo/call', 'Controller/Rack/UrlMapTest::ExampleApp/call'],
+        ['Nested/Controller/Rack/UrlMapTest::ExampleApp/call', 'Controller/Rack/UrlMapTest::ExampleApp/call']
+      ])
+    end
+  end
+
+  def test_metrics_for_mapped_prefix
+    get '/prefix1'
+
+    assert_metrics_recorded_exclusive([
+      'Apdex',
+      'HttpDispatcher',
+      'Middleware/all',
+      'Controller/Rack/UrlMapTest::PrefixAppOne/call',
+      'Apdex/Rack/UrlMapTest::PrefixAppOne/call',
+      'Middleware/Rack/UrlMapTest::MiddlewareOne/call',
+      'Middleware/Rack/UrlMapTest::MiddlewareTwo/call',
+      'Nested/Controller/Rack/UrlMapTest::PrefixAppOne/call',
+      ['Middleware/Rack/UrlMapTest::MiddlewareOne/call', 'Controller/Rack/UrlMapTest::PrefixAppOne/call'],
+      ['Middleware/Rack/UrlMapTest::MiddlewareTwo/call', 'Controller/Rack/UrlMapTest::PrefixAppOne/call'],
+      ['Nested/Controller/Rack/UrlMapTest::PrefixAppOne/call', 'Controller/Rack/UrlMapTest::PrefixAppOne/call']
+    ])
+  end
+
+  def test_metrics_for_mapped_prefix_with_extra_middleware
+    get '/prefix2'
+
+    assert_metrics_recorded_exclusive([
+      'Apdex',
+      'HttpDispatcher',
+      'Middleware/all',
+      'Controller/Rack/UrlMapTest::PrefixAppTwo/call',
+      'Apdex/Rack/UrlMapTest::PrefixAppTwo/call',
+      'Middleware/Rack/UrlMapTest::MiddlewareOne/call',
+      'Middleware/Rack/UrlMapTest::MiddlewareTwo/call',
+      'Middleware/Rack/UrlMapTest::MiddlewareThree/call',
+      'Nested/Controller/Rack/UrlMapTest::PrefixAppTwo/call',
+      ['Middleware/Rack/UrlMapTest::MiddlewareOne/call', 'Controller/Rack/UrlMapTest::PrefixAppTwo/call'],
+      ['Middleware/Rack/UrlMapTest::MiddlewareTwo/call', 'Controller/Rack/UrlMapTest::PrefixAppTwo/call'],
+      ['Middleware/Rack/UrlMapTest::MiddlewareThree/call', 'Controller/Rack/UrlMapTest::PrefixAppTwo/call'],
+      ['Nested/Controller/Rack/UrlMapTest::PrefixAppTwo/call', 'Controller/Rack/UrlMapTest::PrefixAppTwo/call']
+    ])
+  end
+end
+
+end