newrelic_rpm 4.1.0.333 → 4.2.0.334

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

@@ -1,12 +0,0 @@
-# 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.
-
-# this is a bit ugly, but Puma::Rack::Bundler isn't required by puma unless it's
-# running as a webserver. This terrible hack is to install our instrumentation
-# for these tests since our requests aren't served by an actual Puma webserver.
-if NewRelic::Agent::Instrumentation::RackHelpers.puma_rack_version_supported?
-  require 'puma/rack/builder' unless defined? Puma::Rack::Builder
-  require 'puma/rack/urlmap' unless defined? Puma::Rack::URLMap
-  DependencyDetection.detect!
-end

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

@@ -1,128 +0,0 @@
-# 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.
-
-# These tests confirm functionality when using the Rack::Builder class. In
-# particular, combinations of map, use and run should result in the right
-# metrics. In internals changed across Rack versions, so it's important to
-# check as our middleware and Rack instrumentation has grown.
-
-require 'multiverse_helpers'
-
-if NewRelic::Agent::Instrumentation::RackHelpers.rack_version_supported?
-
-class BuilderMapTest < 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',
-        'ApdexAll',
-        'HttpDispatcher',
-        'Middleware/all',
-        'Controller/Rack/BuilderMapTest::ExampleApp/call',
-        'Apdex/Rack/BuilderMapTest::ExampleApp/call',
-        'Middleware/Rack/BuilderMapTest::MiddlewareOne/call',
-        'Middleware/Rack/BuilderMapTest::MiddlewareTwo/call',
-        'Nested/Controller/Rack/BuilderMapTest::ExampleApp/call',
-        ['Middleware/Rack/BuilderMapTest::MiddlewareOne/call', 'Controller/Rack/BuilderMapTest::ExampleApp/call'],
-        ['Middleware/Rack/BuilderMapTest::MiddlewareTwo/call', 'Controller/Rack/BuilderMapTest::ExampleApp/call'],
-        ['Nested/Controller/Rack/BuilderMapTest::ExampleApp/call', 'Controller/Rack/BuilderMapTest::ExampleApp/call']
-      ])
-    end
-  end
-
-  def test_metrics_for_mapped_prefix
-    get '/prefix1'
-
-    assert_metrics_recorded([
-      'Apdex',
-      'ApdexAll',
-      'HttpDispatcher',
-      'Middleware/all',
-      'Controller/Rack/BuilderMapTest::PrefixAppOne/call',
-      'Apdex/Rack/BuilderMapTest::PrefixAppOne/call',
-      'Middleware/Rack/BuilderMapTest::MiddlewareOne/call',
-      'Middleware/Rack/BuilderMapTest::MiddlewareTwo/call',
-      'Nested/Controller/Rack/BuilderMapTest::PrefixAppOne/call',
-      ['Middleware/Rack/BuilderMapTest::MiddlewareOne/call', 'Controller/Rack/BuilderMapTest::PrefixAppOne/call'],
-      ['Middleware/Rack/BuilderMapTest::MiddlewareTwo/call', 'Controller/Rack/BuilderMapTest::PrefixAppOne/call'],
-      ['Nested/Controller/Rack/BuilderMapTest::PrefixAppOne/call', 'Controller/Rack/BuilderMapTest::PrefixAppOne/call']
-    ])
-  end
-
-  def test_metrics_for_mapped_prefix_with_extra_middleware
-    get '/prefix2'
-
-    assert_metrics_recorded([
-      'Apdex',
-      'ApdexAll',
-      'HttpDispatcher',
-      'Middleware/all',
-      'Controller/Rack/BuilderMapTest::PrefixAppTwo/call',
-      'Apdex/Rack/BuilderMapTest::PrefixAppTwo/call',
-      'Middleware/Rack/BuilderMapTest::MiddlewareOne/call',
-      'Middleware/Rack/BuilderMapTest::MiddlewareTwo/call',
-      'Middleware/Rack/BuilderMapTest::MiddlewareThree/call',
-      'Nested/Controller/Rack/BuilderMapTest::PrefixAppTwo/call',
-      ['Middleware/Rack/BuilderMapTest::MiddlewareOne/call', 'Controller/Rack/BuilderMapTest::PrefixAppTwo/call'],
-      ['Middleware/Rack/BuilderMapTest::MiddlewareTwo/call', 'Controller/Rack/BuilderMapTest::PrefixAppTwo/call'],
-      ['Middleware/Rack/BuilderMapTest::MiddlewareThree/call', 'Controller/Rack/BuilderMapTest::PrefixAppTwo/call'],
-      ['Nested/Controller/Rack/BuilderMapTest::PrefixAppTwo/call', 'Controller/Rack/BuilderMapTest::PrefixAppTwo/call']
-    ])
-  end
-end
-
-end

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

@@ -1,17 +0,0 @@
----
-development:
-  error_collector:
-    enabled: true
-  apdex_t: 0.5
-  ssl: false
-  monitor_mode: true
-  license_key: bootstrap_newrelic_admin_license_key_000
-  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/rack/example_app.rb

@@ -1,119 +0,0 @@
-# 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)
-    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
-  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
-
-class ResponseCodeMiddleware
-  def initialize(app)
-    @app = app
-  end
-
-  def call(env)
-    req = Rack::Request.new(env)
-
-    result = @app.call(env)
-
-    if req.params['override-response-code']
-      response_code = req.params['override-response-code'].to_i
-    else
-      response_code = result[0]
-    end
-
-    [response_code, result[1], result[2]]
-  end
-end
-
-class ResponseContentTypeMiddleware
-  def initialize(app)
-    @app = app
-  end
-
-  def call(env)
-    req = Rack::Request.new(env)
-
-    status, headers, body = @app.call(env)
-
-    if req.params['override-content-type']
-      content_type = req.params['override-content-type']
-      headers.update("Content-Type" => content_type)
-    end
-
-    [status, headers, body]
-  end
-end

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

@@ -1,49 +0,0 @@
-# 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.
-
-if NewRelic::Agent::Instrumentation::RackHelpers.rack_version_supported?
-
-require File.join(File.dirname(__FILE__), 'example_app')
-require 'new_relic/rack/browser_monitoring'
-require 'new_relic/rack/agent_hooks'
-
-class HttpResponseCodeTest < Minitest::Test
-  include MultiverseHelpers
-
-  setup_and_teardown_agent
-
-  include Rack::Test::Methods
-
-  def app
-    Rack::Builder.app do
-      use ResponseCodeMiddleware
-      use NewRelic::Rack::AgentHooks
-      run ExampleApp.new
-    end
-  end
-
-  def test_records_http_response_code_on_analytics_events
-    rsp = get '/', { 'override-response-code' => 404 }
-    assert_equal(404, rsp.status)
-    assert_equal("404", get_last_analytics_event[2][:httpResponseCode])
-
-    rsp = get '/', { 'override-response-code' => 302 }
-    assert_equal(302, rsp.status)
-    assert_equal("302", get_last_analytics_event[2][:httpResponseCode])
-  end
-
-  def test_skips_http_response_code_if_middleware_tracing_disabled
-    with_config(:disable_middleware_instrumentation => true) do
-      rsp = get '/', { 'override-response-code' => 404 }
-      assert_equal(404, rsp.status)
-      assert_nil get_last_analytics_event[2][:httpResponseCode]
-
-      rsp = get '/', { 'override-response-code' => 302 }
-      assert_equal(302, rsp.status)
-      assert_nil get_last_analytics_event[2][:httpResponseCode]
-    end
-  end
-end
-
-end

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

@@ -1,66 +0,0 @@
-# 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 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",
-        "ApdexAll",
-        "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/
-    )
-  end
-end
-
-end

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

@@ -1,84 +0,0 @@
-# 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.
-
-if NewRelic::Agent::Instrumentation::RackHelpers.puma_rack_version_supported?
-
-class PumaRackBuilderTest < Minitest::Test
-  include MultiverseHelpers
-
-  class ExampleApp
-    def call env
-      [200, {'Content-Type' => 'text/html'}, ['Hello!']]
-    end
-  end
-
-  class MiddlewareOne
-    def initialize app
-      @app = app
-    end
-
-    def call env
-      env['MiddlewareOne'] = true
-      @app.call env
-    end
-  end
-
-  class MiddlewareTwo
-    def initialize app
-      @app = app
-    end
-
-    def call env
-      env['MiddlewareTwo'] = true
-      @app.call env
-    end
-  end
-
-  def setup
-    @app = build_app
-    @env = {}
-  end
-
-  def teardown
-    NewRelic::Agent.drop_buffered_data
-  end
-
-  def build_app
-    Puma::Rack::Builder.app do
-      use MiddlewareOne
-      use MiddlewareTwo
-      run ExampleApp.new
-    end
-  end
-
-
-  def test_middlewares_are_visited_with_puma_rack
-    @app.call @env
-    assert @env['MiddlewareOne'], 'Expected MiddlewareOne to be present and true in env'
-    assert @env['MiddlewareTwo'], 'Expected MiddlewareTwo to be present and true in env'
-  end
-
-  def test_puma_rack_builder_is_auto_instrumented
-    @app.call @env
-
-    assert_metrics_recorded_exclusive(
-      [
-        "Apdex",
-        "ApdexAll",
-        "HttpDispatcher",
-        "Middleware/all",
-        "Apdex/Rack/PumaRackBuilderTest::ExampleApp/call",
-        "Controller/Rack/PumaRackBuilderTest::ExampleApp/call",
-        "Middleware/Rack/PumaRackBuilderTest::MiddlewareOne/call",
-        "Middleware/Rack/PumaRackBuilderTest::MiddlewareTwo/call",
-        "Nested/Controller/Rack/PumaRackBuilderTest::ExampleApp/call",
-        ["Middleware/Rack/PumaRackBuilderTest::MiddlewareOne/call", "Controller/Rack/PumaRackBuilderTest::ExampleApp/call"],
-        ["Middleware/Rack/PumaRackBuilderTest::MiddlewareTwo/call", "Controller/Rack/PumaRackBuilderTest::ExampleApp/call"],
-        ["Nested/Controller/Rack/PumaRackBuilderTest::ExampleApp/call", "Controller/Rack/PumaRackBuilderTest::ExampleApp/call"]
-      ],
-      :ignore_filter => /^Supportability/
-    )
-  end
-end
-end