Skip to content

Commit 3e73b3b

Browse files
authored
Merge pull request #4068 from DataDog/rack-fix
fix rack 3/rackup situation on ruby 3.4
2 parents b3a00f4 + 923a3c0 commit 3e73b3b

File tree

4 files changed

+8
-1
lines changed

4 files changed

+8
-1
lines changed

appraisal/ruby-3.4.rb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,9 @@
125125
gem 'sneakers', '>= 2.12.0'
126126
gem 'sucker_punch'
127127
gem 'que', '>= 1.0.0'
128+
129+
# When Rack 3+ is used, we need rackup.
130+
gem 'rackup'
128131
end
129132

130133
[

gemfiles/ruby_3.4_contrib.gemfile

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gemfiles/ruby_3.4_contrib.gemfile.lock

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

spec/datadog/tracing/contrib/suite/integration_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
require 'rack'
1010
# `Rack::Handler::WEBrick` was extracted to the `rackup` gem in Rack 3.0
11-
require 'rackup' if Rack::VERSION[0] >= 3
11+
require 'rackup' if Gem::Version.new(Rack::RELEASE) >= Gem::Version.new('3')
1212
require 'webrick'
1313

1414
RSpec.describe 'contrib integration testing', :integration do

0 commit comments

Comments
 (0)