Merge pull request #4068 from DataDog/rack-fix

fix rack 3/rackup situation on ruby 3.4
DataDog · Nov 5, 2024 · 3e73b3b · 3e73b3b
2 parents b3a00f4 + 923a3c0
commit 3e73b3b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 1 deletion.
diff --git a/appraisal/ruby-3.4.rb b/appraisal/ruby-3.4.rb
@@ -125,6 +125,9 @@
   gem 'sneakers', '>= 2.12.0'
   gem 'sucker_punch'
   gem 'que', '>= 1.0.0'
+
+  # When Rack 3+ is used, we need rackup.
+  gem 'rackup'
 end
 
 [

diff --git a/gemfiles/ruby_3.4_contrib.gemfile b/gemfiles/ruby_3.4_contrib.gemfile
diff --git a/gemfiles/ruby_3.4_contrib.gemfile.lock b/gemfiles/ruby_3.4_contrib.gemfile.lock
diff --git a/spec/datadog/tracing/contrib/suite/integration_spec.rb b/spec/datadog/tracing/contrib/suite/integration_spec.rb
@@ -8,7 +8,7 @@
 
 require 'rack'
 # `Rack::Handler::WEBrick` was extracted to the `rackup` gem in Rack 3.0
-require 'rackup' if Rack::VERSION[0] >= 3
+require 'rackup' if Gem::Version.new(Rack::RELEASE) >= Gem::Version.new('3')
 require 'webrick'
 
 RSpec.describe 'contrib integration testing', :integration do