Merge pull request #3539 from DataDog/revert-http-route-tagging

Revert http route tagging
DataDog · Mar 19, 2024 · d5b36e7 · d5b36e7
2 parents 1ed3614 + 8cff34b
commit d5b36e7
Show file tree

Hide file tree

Showing 22 changed files with 8 additions and 914 deletions.
diff --git a/Rakefile b/Rakefile
@@ -262,9 +262,6 @@ 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',
@@ -347,7 +344,7 @@ namespace :spec do
   task all: [:main, :benchmark,
              :rails, :railsredis, :railsredis_activesupport, :railsactivejob,
              :elasticsearch, :http, :redis, :sidekiq, :sinatra, :hanami, :hanami_autoinstrument,
-             :profiling, :routetest]
+             :profiling]
 
   desc '' # "Explicitly hiding from `rake -T`"
   RSpec::Core::RakeTask.new(:main) do |t, args|
@@ -382,12 +379,6 @@ 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'

diff --git a/appraisal/jruby-9.2.rb b/appraisal/jruby-9.2.rb
@@ -289,11 +289,3 @@
 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
diff --git a/appraisal/jruby-9.3.rb b/appraisal/jruby-9.3.rb
@@ -260,11 +260,3 @@
 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
diff --git a/appraisal/jruby-9.4.rb b/appraisal/jruby-9.4.rb
@@ -166,11 +166,3 @@
 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
diff --git a/appraisal/ruby-2.5.rb b/appraisal/ruby-2.5.rb
@@ -262,11 +262,3 @@
 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
diff --git a/appraisal/ruby-2.6.rb b/appraisal/ruby-2.6.rb
@@ -263,11 +263,3 @@
 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
diff --git a/appraisal/ruby-2.7.rb b/appraisal/ruby-2.7.rb
@@ -264,11 +264,3 @@
 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
diff --git a/appraisal/ruby-3.0.rb b/appraisal/ruby-3.0.rb
@@ -177,11 +177,3 @@
 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
diff --git a/appraisal/ruby-3.1.rb b/appraisal/ruby-3.1.rb
@@ -177,11 +177,3 @@
 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
diff --git a/appraisal/ruby-3.2.rb b/appraisal/ruby-3.2.rb
@@ -177,11 +177,3 @@
 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
diff --git a/appraisal/ruby-3.3.rb b/appraisal/ruby-3.3.rb
@@ -179,11 +179,3 @@
 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
diff --git a/gemfiles/ruby_3.1_multi_rack_app.gemfile b/gemfiles/ruby_3.1_multi_rack_app.gemfile