Merge pull request #3345 from DataDog/add-rails-routing-instrumentation

Rakefile

@@ -261,6 +261,9 @@ TEST_METADATA = {
     'redis-4' => '❌ 2.1 / ❌ 2.2 / ❌ 2.3 / ✅ 2.4 / ✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ jruby',
     'redis-5' => '❌ 2.1 / ❌ 2.2 / ❌ 2.3 / ❌ 2.4 / ✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ jruby'
   },
+  'routetest' => {
+    'multi-rack-app' => '❌ 2.1 / ❌ 2.2 / ❌ 2.3 / ❌ 2.4 / ✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ jruby'
+  },
   'appsec:rack' => {
     # Non-deprecated form of Regexp.new does not backport to Rack 1.x, see: https://github.com/rack/rack/pull/1998
     'rack-1' => '✅ 2.1 / ✅ 2.2 / ✅ 2.3 / ✅ 2.4 / ✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ❌ 3.3 / ✅ jruby',
@@ -343,7 +346,7 @@ namespace :spec do
   task all: [:main, :benchmark,
              :rails, :railsredis, :railsredis_activesupport, :railsactivejob,
              :elasticsearch, :http, :redis, :sidekiq, :sinatra, :hanami, :hanami_autoinstrument,
-             :profiling]
+             :profiling, :routetest]
 
   desc '' # "Explicitly hiding from `rake -T`"
   RSpec::Core::RakeTask.new(:main) do |t, args|
@@ -378,6 +381,12 @@ namespace :spec do
     t.rspec_opts = args.to_a.join(' ')
   end
 
+  desc '' # "Explicitly hiding from `rake -T`"
+  RSpec::Core::RakeTask.new(:routetest) do |t, args|
+    t.pattern = 'spec/datadog/tracing/contrib/http_route_spec.rb'
+    t.rspec_opts = args.to_a.join(' ')
+  end
+
   desc '' # "Explicitly hiding from `rake -T`"
   RSpec::Core::RakeTask.new(:railsredis) do |t, args|
     t.pattern = 'spec/datadog/tracing/contrib/rails/**/*redis*_spec.rb'

appraisal/jruby-9.2.rb

@@ -289,3 +289,11 @@
 appraise 'core-old' do
   gem 'dogstatsd-ruby', '~> 4'
 end
+
+appraise 'multi-rack-app' do
+  gem 'sinatra'
+  gem 'rack-contrib'
+  gem 'rack-test' # Dev dependencies for testing rack-based code
+  gem 'grape'
+  gem 'rails', '~> 5.2.1'
+end

appraisal/jruby-9.3.rb

@@ -260,3 +260,11 @@
 appraise 'core-old' do
   gem 'dogstatsd-ruby', '~> 4'
 end
+
+appraise 'multi-rack-app' do
+  gem 'sinatra', '>= 3'
+  gem 'rack-contrib'
+  gem 'rack-test' # Dev dependencies for testing rack-based code
+  gem 'grape'
+  gem 'rails', '~> 5.2.1'
+end

appraisal/jruby-9.4.rb

@@ -166,3 +166,11 @@
 appraise 'core-old' do
   gem 'dogstatsd-ruby', '~> 4'
 end
+
+appraise 'multi-rack-app' do
+  gem 'sinatra', '>= 3'
+  gem 'rack-contrib'
+  gem 'rack-test' # Dev dependencies for testing rack-based code
+  gem 'grape'
+  gem 'rails', '~> 6.1.0'
+end

appraisal/ruby-2.5.rb

@@ -262,3 +262,11 @@
 appraise 'core-old' do
   gem 'dogstatsd-ruby', '~> 4'
 end
+
+appraise 'multi-rack-app' do
+  gem 'sinatra'
+  gem 'rack-contrib'
+  gem 'rack-test' # Dev dependencies for testing rack-based code
+  gem 'grape'
+  gem 'rails', '~> 5.2.1'
+end

appraisal/ruby-2.6.rb

@@ -263,3 +263,11 @@
 appraise 'core-old' do
   gem 'dogstatsd-ruby', '~> 4'
 end
+
+appraise 'multi-rack-app' do
+  gem 'sinatra', '>= 3'
+  gem 'rack-contrib'
+  gem 'rack-test' # Dev dependencies for testing rack-based code
+  gem 'grape'
+  gem 'rails', '~> 5.2.1'
+end

appraisal/ruby-2.7.rb

@@ -264,3 +264,11 @@
 appraise 'core-old' do
   gem 'dogstatsd-ruby', '~> 4'
 end
+
+appraise 'multi-rack-app' do
+  gem 'sinatra', '>= 3'
+  gem 'rack-contrib'
+  gem 'rack-test' # Dev dependencies for testing rack-based code
+  gem 'grape'
+  gem 'rails', '~> 5.2.1'
+end

appraisal/ruby-3.0.rb

@@ -177,3 +177,11 @@
 appraise 'core-old' do
   gem 'dogstatsd-ruby', '~> 4'
 end
+
+appraise 'multi-rack-app' do
+  gem 'sinatra', '>= 3'
+  gem 'rack-contrib'
+  gem 'rack-test' # Dev dependencies for testing rack-based code
+  gem 'grape'
+  gem 'rails', '~> 6.1.0'
+end

appraisal/ruby-3.1.rb

@@ -177,3 +177,11 @@
 appraise 'core-old' do
   gem 'dogstatsd-ruby', '~> 4'
 end
+
+appraise 'multi-rack-app' do
+  gem 'sinatra', '>= 3'
+  gem 'rack-contrib'
+  gem 'rack-test' # Dev dependencies for testing rack-based code
+  gem 'grape'
+  gem 'rails', '~> 6.1.0'
+end

appraisal/ruby-3.2.rb

@@ -177,3 +177,11 @@
 appraise 'core-old' do
   gem 'dogstatsd-ruby', '~> 4'
 end
+
+appraise 'multi-rack-app' do
+  gem 'sinatra', '>= 3'
+  gem 'rack-contrib'
+  gem 'rack-test' # Dev dependencies for testing rack-based code
+  gem 'grape'
+  gem 'rails', '~> 6.1.0'
+end

appraisal/ruby-3.3.rb

@@ -179,3 +179,11 @@
 appraise 'core-old' do
   gem 'dogstatsd-ruby', '~> 4'
 end
+
+appraise 'multi-rack-app' do
+  gem 'sinatra', '>= 3'
+  gem 'rack-contrib'
+  gem 'rack-test' # Dev dependencies for testing rack-based code
+  gem 'grape'
+  gem 'rails', '~> 6.1.0'
+end