Merge branch 'fix/DEX-2915/update-http-health-check-req' into 'master'

[DEX-2915] fix: rack v3 support

Closes DEX-2915

See merge request nstmrt/rubygems/outbox!119

Author: Сатаров Юрий Сергеевич

Appraisals

@@ -11,15 +11,23 @@ versions_map = {
   "8.0" => %w[3.3]
 }
 
+rack_versions = %w[2.0 3.0]
+
 current_ruby_version = RUBY_VERSION.split(".").first(2).join(".")
 
 versions_map.each do |rails_version, ruby_versions|
-  ruby_versions.each do |ruby_version|
-    next if ruby_version != current_ruby_version
+  rack_versions.each do |rack_version|
+    ruby_versions.each do |ruby_version|
+      next if ruby_version != current_ruby_version
+
+      # rack v3 supported in Rails starting from 7.1
+      next if rails_version.to_f < 7.1 && rack_version.to_f > 2
 
-    appraise "rails-#{rails_version}" do
-      gem "rails", "~> #{rails_version}.0"
-      gem "concurrent-ruby", "1.3.4" if rails_version.to_f < 7.1
+      appraise "rails-#{rails_version}-rack-#{rack_version}" do
+        gem "rails", "~> #{rails_version}.0"
+        gem "rack", "~> #{rack_version}"
+        gem "concurrent-ruby", "1.3.4" if rails_version.to_f < 7.1
+      end
     end
   end
 end

CHANGELOG.md

@@ -13,6 +13,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Fixed
 
+## [6.20.0] - 2025-03-31
+
+### Fixed
+
+- Upgrade `http_health_check` dep
+
+### Added
+- Rack v3 support
+
 ## [6.19.2] - 2025-03-03
 
 ### Fixed

app/models/sbmt/outbox/base_item.rb

@@ -10,6 +10,8 @@ module Outbox
     class BaseItem < Outbox.active_record_base_class
       self.abstract_class = true
 
+      delegate :retriable?, to: :class
+
       class << self
         delegate :owner, :strict_order, to: :config
 
@@ -145,10 +147,6 @@ def touch_processed_at
         self.processed_at = Time.current
       end
 
-      def retriable?
-        self.class.retriable?
-      end
-
       def max_retries_exceeded?
         self.class.max_retries_exceeded?(errors_count)
       end

lib/sbmt/outbox/probes/metrics.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "rackup/handler/webrick" if Gem::Version.new(::Rack.release) >= Gem::Version.new("3")
+
 module Sbmt
   module Outbox
     module Probes
@@ -29,7 +31,7 @@ def yabeda_port
 
           def start_webrick(app, middlewares:, port:)
             Thread.new do
-              ::Rack::Handler::WEBrick.run(
+              webrick.run(
                 ::Rack::Builder.new do
                   middlewares.each do |middleware, options|
                     use middleware, **options
@@ -42,6 +44,12 @@ def start_webrick(app, middlewares:, port:)
             end
           end
 
+          def webrick
+            return ::Rack::Handler::WEBrick if Gem::Version.new(::Rack.release) < Gem::Version.new("3")
+
+            ::Rackup::Handler::WEBrick
+          end
+
           def autostart_yabeda_server?
             Sbmt::Outbox.yaml_config.dig(:metrics, :enabled) || false
           end

lib/sbmt/outbox/version.rb

@@ -2,6 +2,6 @@
 
 module Sbmt
   module Outbox
-    VERSION = "6.19.2"
+    VERSION = "6.20.0"
   end
 end

sbmt-outbox.gemspec

@@ -40,7 +40,7 @@ Gem::Specification.new do |s|
   s.add_dependency "thor", ">= 0.20", "< 2"
   s.add_dependency "redlock", "> 1.0", "< 3.0"
   s.add_dependency "redis-client", ">= 0.14.1", "< 1.0.0"
-  s.add_dependency "http_health_check", "~> 0.5"
+  s.add_dependency "http_health_check", ">= 0.5"
   s.add_dependency "ruby-limiter", "~> 2.3"
 
   s.add_development_dependency "appraisal"