newrelic_rpm 3.14.1.311 → 3.14.2.312

data/test/multiverse/suites/capistrano/Envfile

@@ -2,17 +2,23 @@ suite_condition("Capistrano 3 not supported in 1.8.7 and flaky on JRuby") do
   RUBY_VERSION != '1.8.7' && RUBY_PLATFORM != 'java'
 end
 
+boilerplate = <<-BOILERPLATE
+  gem 'rack'
+  gem 'net-ssh', '2.9.2' if RUBY_VERSION <= '1.9.3'
+  gem 'i18n', '< 0.7.0' if RUBY_VERSION < '1.9.3'
+BOILERPLATE
+
 gemfile <<-RB
   gem 'capistrano', '~>3.2.1'
-  gem 'rack'
+  #{boilerplate}
 RB
 
 gemfile <<-RB
   gem 'capistrano', '~>3.1.0'
-  gem 'rack'
+  #{boilerplate}
 RB
 
 gemfile <<-RB
   gem 'capistrano', '~>3.0.1'
-  gem 'rack'
+  #{boilerplate}
 RB

data/test/multiverse/suites/capistrano2/Envfile

@@ -5,4 +5,8 @@ end
 gemfile <<-RB
   gem 'capistrano', '~>2.15.5'
   gem 'rack'
+  if RUBY_VERSION <= '1.9.3'
+    gem 'highline', '1.6.21'
+    gem 'net-ssh', '2.9.2'
+  end
 RB

data/test/multiverse/suites/config_file_loading/Envfile

@@ -3,7 +3,7 @@ omit_collector!
 gemfile <<-RB
   # stub file system so we can test that newrelic.yml can be loaded from
   # various places.
-  gem 'fakefs', :require => 'fakefs/safe'
+  gem 'fakefs', '0.5.4', :require => 'fakefs/safe' # 0.5.4 required for 1.8.7 compatibility.
 
   # Because we delay the agent, order of jruby-openssl matters
   gem 'jruby-openssl', '~> 0.9.10', :platforms => [:jruby]

data/test/multiverse/suites/curb/Envfile

@@ -12,7 +12,7 @@ gemfile <<-RB
   gem 'json', :platforms => [:rbx, :mri_18]
 
   # We try translating URIs through Addressable if it's there, so test with it.
-  gem 'addressable', :require => 'addressable/uri'
+  gem 'addressable', '2.3.8', :require => 'addressable/uri' # addressable >= 2.4.0 does not support Ruby 1.8.7
 RB
 
 gemfile <<-RB

data/test/multiverse/suites/datamapper/Envfile

@@ -12,6 +12,7 @@ gemfile <<-RB
   gem 'json', '>= 1.8.1'
   gem 'datamapper', '~> 1.2.0', :require => 'data_mapper'
   gem 'dm-ar-finders', '~> 1.2.0'
+  gem 'addressable', '2.3.8', :require => 'addressable/uri' # addressable >= 2.4.0 does not support Ruby 1.8.7
   #{adapter_gems}
 RB
 
@@ -19,12 +20,14 @@ if RUBY_VERSION < '2.0.0'
 gemfile <<-RB
   gem 'datamapper', '~> 1.1.0'
   gem 'dm-ar-finders', '~> 1.1.0'
+  gem 'addressable', :require => 'addressable/uri'
   #{adapter_gems}
 RB
 
 gemfile <<-RB
   gem 'datamapper', '~> 1.0.2'
   gem 'dm-ar-finders', '~> 1.0.2'
+  gem 'addressable', '2.3.8', :require => 'addressable/uri' # addressable >= 2.4.0 does not support Ruby 1.8.7
   #{adapter_gems}
 RB
 end

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

@@ -2,12 +2,12 @@
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'sinatra', 'sinatra_test_cases'))
-require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'helpers', 'exceptions'))
-
 require 'newrelic_rpm'
 require 'sinatra'
 
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'sinatra', 'sinatra_test_cases'))
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'helpers', 'exceptions'))
+
 class DeferredSinatraTestApp < Sinatra::Base
   include NewRelic::Agent::Instrumentation::Rack
   include NewRelic::TestHelpers::Exceptions
@@ -25,6 +25,10 @@ class DeferredSinatraTestApp < Sinatra::Base
     end
   end
 
+  get '/' do
+    "root path"
+  end
+
   get '/user/login' do
     "please log in"
   end

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

@@ -195,8 +195,10 @@ class GrapeTest < Minitest::Test
         post '/grape_ape'
 
         expected = {
+          "response.headers.contentLength" => last_response.content_length.to_i,
           "response.headers.contentType" => last_response.content_type,
           "request.headers.contentLength" => last_request.content_length.to_i,
+          "request.headers.contentType" => last_request.content_type,
           "request.headers.host" => last_request.host,
           "request.method" => last_request.request_method
         }

data/test/multiverse/suites/padrino/Envfile

@@ -1,14 +1,15 @@
+if RUBY_VERSION > '1.8.7' # padrino-core 0.11.0 requires http_router 0.11.0 which has syntax errors in 1.8.7.
 gemfile <<-RB
-  # Gemspec from rubygems on this version gets illformed warnings on 1.8.7
-  gem 'http_router', '0.11.0', :git => 'git://github.com/joshbuddy/http_router.git', :tag => 'v0.11.0'
-
   gem 'activesupport', '~> 3'
   gem 'padrino', '~> 0.11.0'
   gem 'rack-test', :require => 'rack/test'
+  gem 'i18n', '< 0.7' if RUBY_VERSION < '1.9.3' # i18n >= 0.7.0 only works on Ruby 1.9.3 and newer
 RB
+end
 
 gemfile <<-RB
   gem 'activesupport', '~> 3'
   gem 'padrino', '~> 0.10.0'
   gem 'rack-test', :require => 'rack/test'
+  gem 'i18n', '< 0.7' if RUBY_VERSION < '1.9.3' # i18n >= 0.7.0 only works on Ruby 1.9.3 and newer
 RB

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

@@ -11,6 +11,8 @@ development:
   app_name: test
   host: 127.0.0.1
   api_host: 127.0.0.1
+  port: <%= $collector && $collector.port %>
+
   transaction_tracer:
     record_sql: obfuscated
     enabled: true

data/test/multiverse/suites/rack/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/rack/nested_non_rack_app_test.rb

@@ -58,7 +58,7 @@ class NestedNonRackAppTest < Minitest::Test
         "Nested/Controller/Rack/NestedNonRackAppTest::RailsishApp/call",
         ["Nested/Controller/Rack/NestedNonRackAppTest::RailsishApp/call", "Controller/NestedNonRackAppTest::RailsishApp/inner"]
       ],
-      :ignore_filter => /^Supportability\/EnvironmentReport/
+      :ignore_filter => /^Supportability/
     )
   end
 end

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

@@ -62,20 +62,23 @@ class PumaRackBuilderTest < Minitest::Test
   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"]
-    ]
+    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

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

@@ -77,7 +77,7 @@ class RackAutoInstrumentationTest < Minitest::Test
         ["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/
+      :ignore_filter => /^Supportability/
     )
   end
 
@@ -122,18 +122,21 @@ class RackAutoInstrumentationTest < Minitest::Test
   def test_middleware_that_returns_early_records_middleware_rollup_metric
     get '/?return-early=true'
 
-    assert_metrics_recorded_exclusive([
-      "Apdex",
-      "ApdexAll",
-      "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"]
-    ])
+    assert_metrics_recorded_exclusive(
+      [
+        "Apdex",
+        "ApdexAll",
+        "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"]
+      ],
+      :ignore_filter => /^Supportability/
+    )
   end
 
   def test_middleware_that_returns_early_middleware_all_has_correct_call_times

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

@@ -36,7 +36,7 @@ class RackUnsupportedVersionTest < Minitest::Test
 
   def test_no_instrumentation_when_not_supported
     get '/'
-    assert_metrics_recorded_exclusive([])
+    assert_metrics_recorded_exclusive([], :ignore_filter => /^Supportability/)
   end
 end
 

data/test/multiverse/suites/rails/Envfile

@@ -26,6 +26,7 @@ gemfile <<-RB
   gem 'i18n', '~>0.6.11'
   gem 'haml', '4.0.2'   # Getting load issues with haml 4.0.3
   gem 'minitest_tu_shim', :require => false
+  gem 'rack-cache', '< 1.3' if RUBY_VERSION < '1.9.3' # rack-cache 1.3.0 only supports >= 1.9.3
 RB
 
 gemfile <<-RB
@@ -34,6 +35,7 @@ gemfile <<-RB
   gem 'sinatra', '~> 1.4.5'
   gem 'haml', '4.0.2'   # Getting load issues with haml 4.0.3
   gem 'minitest_tu_shim', :require => false
+  gem 'rack-cache', '< 1.3' if RUBY_VERSION < '1.9.3' # rack-cache 1.3.0 only supports >= 1.9.3
 RB
 
 gemfile <<-RB
@@ -41,12 +43,14 @@ gemfile <<-RB
   gem 'i18n', '~>0.6.11'
   gem 'haml', '4.0.2'   # Getting load issues with haml 4.0.3
   gem 'minitest_tu_shim', :require => false
+  gem 'rack-cache', '< 1.3' if RUBY_VERSION < '1.9.3' # rack-cache 1.3.0 only supports >= 1.9.3
 RB
 
 gemfile <<-RB
   gem 'rails', '~>3.0.20'
   gem 'haml', '4.0.2'   # Getting load issues with haml 4.0.3
   gem 'minitest_tu_shim', :require => false
+  gem 'rack-cache', '< 1.3' if RUBY_VERSION < '1.9.3' # rack-cache 1.3.0 only supports >= 1.9.3
 RB
 
 if RUBY_VERSION <= '1.9.3' && (!defined?(RUBY_ENGINE) || RUBY_ENGINE != 'jruby')
@@ -57,5 +61,6 @@ if RUBY_VERSION <= '1.9.3' && (!defined?(RUBY_ENGINE) || RUBY_ENGINE != 'jruby')
     gem 'minitest_tu_shim', :require => false
     gem 'sqlite3'
     gem 'i18n', '0.6.11'
+    gem 'rack-cache', '< 1.3' if RUBY_VERSION < '1.9.3' # rack-cache 1.3.0 only supports >= 1.9.3
   RB
 end

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

@@ -225,9 +225,18 @@ class ParameterCaptureTest < RailsMultiverseTest
       expected = {
         "response.headers.contentType" => "#{response.content_type}; charset=#{response.charset}",
         "request.headers.contentLength" => request.content_length.to_i,
+        "request.headers.contentType" => request.content_type,
         "request.headers.host" => request.host,
         "request.headers.accept" => request.accept
       }
+
+      # ActionController::IntegrationTest sets this header whereas ActionDispatch::IntegrationTest
+      # does not. Since we test using both we need to conditionally expect content_length to be set.
+
+      unless defined?(ActionDispatch::IntegrationTest)
+        expected["response.headers.contentLength"] = response.content_length
+      end
+
       actual = agent_attributes_for_single_event_posted_without_ignored_attributes
 
       # request method may be a symbol or string based on Rails versions

data/test/multiverse/suites/rake/Envfile

@@ -14,6 +14,7 @@ RB
 else
 gemfile <<-RB
   gem 'rack'
+  gem 'rack-cache', '1.2' # rack-cache >= 1.3.0 only works on Ruby 1.9.3 and newer
   gem 'rake', '~> 10.4'
   gem 'rails', '~> 3.2.21'
   gem 'i18n', '~>0.6.11'
@@ -33,5 +34,5 @@ RB
 gemfile <<-RB
   gem 'rack'
   gem 'rake', '~> 10.4'
-  gem 'newrelic-rake' # Can't coexist with third-party instrumentation
+  gem 'newrelic-rake', :require => false # Can't coexist with third-party instrumentation
 RB

data/test/multiverse/suites/redis/redis_instrumentation_test.rb

@@ -11,7 +11,7 @@ class NewRelic::Agent::Instrumentation::RedisInstrumentationTest < Minitest::Tes
 
   def after_setup
     super
-    @redis = Redis.new
+    @redis = Redis.new(:timeout => 25) # Default is 5 secs; a flushall takes longer on a busy box (i.e. CI)
 
     # Creating a new client doesn't actually establish a connection, so make
     # sure we do that by issuing a dummy get command, and then drop metrics

data/test/multiverse/suites/sidekiq/Envfile

@@ -11,6 +11,24 @@ if RUBY_VERSION >= '2.0.0' || (RUBY_PLATFORM == 'java')
 
     gem 'newrelic_rpm', :require => false, :path => File.expand_path('../../../../')
   RB
+
+  gemfile <<-RB
+    gem 'json'
+    gem 'sidekiq', '~> 4.0.0'
+    gem 'rack'
+    gem 'newrelic_rpm', :require => false, :path => File.expand_path('../../../../')
+  RB
+end
+
+if RUBY_VERSION >= '2.0.0' && RUBY_PLATFORM != 'java'
+  # We skip testing Sidekiq 3.5.3 on JRuby due to an error in Sidekiq's shutdown:
+  # https://github.com/mperham/sidekiq/issues/2703
+  gemfile <<-RB
+    gem 'json'
+    gem 'sidekiq', '~> 3.5.3'
+    gem 'rack'
+    gem 'newrelic_rpm', :require => false, :path => File.expand_path('../../../../')
+  RB
 end
 
 gemfile <<-RB

data/test/multiverse/suites/sidekiq/sidekiq_instrumentation_test.rb

@@ -14,6 +14,7 @@ require 'logger'
 require 'stringio'
 
 require 'fake_collector'
+require File.join(File.dirname(__FILE__), "test_model")
 require File.join(File.dirname(__FILE__), "test_worker")
 
 class SidekiqTest < Minitest::Test
@@ -21,7 +22,7 @@ class SidekiqTest < Minitest::Test
 
   ROLLUP_METRIC            = 'OtherTransaction/SidekiqJob/all'
   TRANSACTION_NAME         = 'OtherTransaction/SidekiqJob/TestWorker/perform'
-  DELAYED_TRANSACTION_NAME = 'OtherTransaction/SidekiqJob/TestWorker/record'
+  DELAYED_TRANSACTION_NAME = 'OtherTransaction/SidekiqJob/TestModel/do_work'
   DELAYED_FAILED_TXN_NAME  = 'OtherTransaction/SidekiqJob/Sidekiq::Extensions::DelayedClass/perform'
 
   include MultiverseHelpers
@@ -51,7 +52,7 @@ class SidekiqTest < Minitest::Test
 
   def run_delayed
     run_and_transmit do |i|
-      TestWorker.delay(:queue => SidekiqServer.instance.queue_name, :retry => false).record('jobs_completed', i + 1)
+      TestModel.delay(:queue => SidekiqServer.instance.queue_name, :retry => false).do_work
     end
   end
 
@@ -131,18 +132,18 @@ class SidekiqTest < Minitest::Test
   end
 
   # In <= 2.x of Sidekiq, internal errors (or potentially errors further out
-  # the middleware stack) wouldn't get noticed, but there was no propery hook
-  # to catch it. 3.x+ gives us a error_handler, so only add our misbehaving
+  # the middleware stack) wouldn't get noticed, but there was no proper hook
+  # to catch it. 3.x+ gives us an error_handler, so only add our misbehaving
   # middleware for those cases.
   if Sidekiq::VERSION >= '3'
     def test_captures_sidekiq_internal_errors
-      # Ugly, but need to coerce an internal error in Sidekiq that doesn't bail
-      # from processing entirely. This fouls up Sidekiq::Processor#stats in a
-      # spot that calls handle exception but doesn't die.
-      Redis.any_instance.stubs(:hmset).raises("Uh oh")
-      run_jobs
+      # When testing internal Sidekiq error capturing, we're looking to
+      # ensure Sidekiq properly forwards errors to our custom error handler
+      # in order for us to notice the error.
 
-      assert_error_for_each_job(nil)
+      exception = StandardError.new('foo')
+      NewRelic::Agent.expects(:notice_error).with(exception)
+      Sidekiq::CLI.instance.handle_exception(exception)
     end
   end
 

data/test/multiverse/suites/sidekiq/test_model.rb

@@ -0,0 +1,12 @@
+# 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 class is used to test Sidekiq's Delayed Extensions
+# which give the framework an interface like Delayed Job.
+# The Delayed Extensions cannot be used to operate directly
+# on a Sidekiq Worker.
+class TestModel
+  def self.do_work
+  end
+end

data/test/multiverse/suites/sinatra/ignoring_test.rb

@@ -82,23 +82,26 @@ class SinatraIgnoreTest < SinatraTestCase
 
   def test_seen_route
     get_and_assert_ok '/record'
+    segment = name_for_route 'record'
     assert_metrics_recorded([
-      "Controller/Sinatra/#{app_name}/GET record",
-      "Apdex/Sinatra/#{app_name}/GET record"])
+      "Controller/Sinatra/#{app_name}/#{segment}",
+      "Apdex/Sinatra/#{app_name}/#{segment}"])
   end
 
   def test_ignores_exact_match
     get_and_assert_ok '/ignore'
+    segment = name_for_route 'ignore'
     assert_metrics_not_recorded([
-      "Controller/Sinatra/#{app_name}/GET ignore",
-      "Apdex/Sinatra/#{app_name}/GET ignore"])
+      "Controller/Sinatra/#{app_name}/#{segment}",
+      "Apdex/Sinatra/#{app_name}/#{segment}"])
   end
 
   def test_ignores_by_splats
     get_and_assert_ok '/splattered'
+    segment = name_for_route 'splattered'
     assert_metrics_not_recorded([
-      "Controller/Sinatra/#{app_name}/GET splattered",
-      "Apdex/Sinatra/#{app_name}/GET splattered"])
+      "Controller/Sinatra/#{app_name}/#{segment}",
+      "Apdex/Sinatra/#{app_name}/#{segment}"])
   end
 
   def test_ignores_can_be_declared_in_batches
@@ -106,59 +109,74 @@ class SinatraIgnoreTest < SinatraTestCase
     get_and_assert_ok '/v2'
     get_and_assert_ok '/v3'
 
+    v1_segment = name_for_route 'v1'
+    v2_segment = name_for_route 'v2'
+    v3_segment = name_for_route 'v3'
+
     assert_metrics_not_recorded([
-      "Controller/Sinatra/#{app_name}/GET v1",
-      "Controller/Sinatra/#{app_name}/GET v2",
-      "Apdex/Sinatra/#{app_name}/GET v1",
-      "Apdex/Sinatra/#{app_name}/GET v2"])
+      "Controller/Sinatra/#{app_name}/#{v1_segment}",
+      "Controller/Sinatra/#{app_name}/#{v2_segment}",
+      "Apdex/Sinatra/#{app_name}/#{v1_segment}",
+      "Apdex/Sinatra/#{app_name}/#{v2_segment}"])
 
     assert_metrics_recorded([
-      "Controller/Sinatra/#{app_name}/GET v3",
-      "Apdex/Sinatra/#{app_name}/GET v3"])
+      "Controller/Sinatra/#{app_name}/#{v3_segment}",
+      "Apdex/Sinatra/#{app_name}/#{v3_segment}"])
   end
 
   def test_seen_with_regex
     get_and_assert_ok '/regex_seen'
+    segment = name_for_route 'regex_seen'
     assert_metrics_recorded([
-      "Controller/Sinatra/#{app_name}/GET regex_seen",
-      "Apdex/Sinatra/#{app_name}/GET regex_seen"])
+      "Controller/Sinatra/#{app_name}/#{segment}",
+      "Apdex/Sinatra/#{app_name}/#{segment}"])
   end
 
   def test_ignores_by_regex
     get_and_assert_ok '/skip_regex'
+    segment = name_for_route 'skip_regex'
     assert_metrics_not_recorded([
-      "Controller/Sinatra/#{app_name}/GET skip_regex",
-      "Apdex/Sinatra/#{app_name}/GET skip_regex"])
+      "Controller/Sinatra/#{app_name}/#{segment}",
+      "Apdex/Sinatra/#{app_name}/#{segment}"])
   end
 
   def test_ignore_apdex
     get_and_assert_ok '/no_apdex'
-    assert_metrics_recorded(["Controller/Sinatra/#{app_name}/GET no_apdex"])
-    assert_metrics_not_recorded(["Apdex/Sinatra/#{app_name}/GET no_apdex"])
+    segment = name_for_route 'no_apdex'
+    assert_metrics_recorded(["Controller/Sinatra/#{app_name}/#{segment}"])
+    assert_metrics_not_recorded(["Apdex/Sinatra/#{app_name}/#{segment}"])
   end
 
   def test_ignore_enduser_should_only_apply_to_specified_route
     get_and_assert_ok '/enduser'
-
+    segment = name_for_route 'enduser'
     refute_enduser_ignored(last_response)
     assert_metrics_recorded([
-      "Controller/Sinatra/#{app_name}/GET enduser",
-      "Apdex/Sinatra/#{app_name}/GET enduser"])
+      "Controller/Sinatra/#{app_name}/#{segment}",
+      "Apdex/Sinatra/#{app_name}/#{segment}"])
   end
 
   def test_ignore_enduser
     get_and_assert_ok '/no_enduser'
-
+    segment = name_for_route 'no_enduser'
     assert_enduser_ignored(last_response)
     assert_metrics_recorded([
-      "Controller/Sinatra/#{app_name}/GET no_enduser",
-      "Apdex/Sinatra/#{app_name}/GET no_enduser"])
+      "Controller/Sinatra/#{app_name}/#{segment}",
+      "Apdex/Sinatra/#{app_name}/#{segment}"])
   end
 
   def test_ignore_errors_in_ignored_transactions
     get '/ignored_erroring'
     assert_metrics_not_recorded(["Errors/all"])
   end
+
+  def name_for_route path
+    if last_request.env.key? 'sinatra.route'
+      "GET /#{path}"
+    else
+      "GET #{path}"
+    end
+  end
 end
 
 # Blanket ignore for whole app if newrelic_ignore called without parameters
@@ -198,7 +216,7 @@ class SinatraIgnoreApdexAndEndUserTest < SinatraTestCase
 
   def test_ignores_apdex
     get_and_assert_ok '/'
-    assert_metrics_not_recorded(["Apdex/Sinatra/#{app.to_s}/GET "])
+    assert_metrics_not_recorded(["Apdex/Sinatra/#{app.to_s}/GET /"])
   end
 
   def test_ignores_enduser