rabbit_messaging 1.9.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38dfb0f21f2e7b583ed1fab761768332e01bd18b68ad1ebd4bb66a0168d1c57e
-  data.tar.gz: b5c19ca62b8d7157ae8a8718d26ec888e53a677b4cac6474204b8dbf3531aff2
+  metadata.gz: d298261bbcdb67fa9e0a784af3caa96a327a78c53a690eba4a04bd275e5d7d87
+  data.tar.gz: 25597ce02a4ff8a14805bfcc0e93356eac64d625327d786e86f35a7b5fa5b3ad
 SHA512:
-  metadata.gz: 2ee5d32fa8ef2c1dbdc4df42d49d47039f4e20f2f5f6f4bbb98717ba1ee35c6b643e55bbc18d8ba2d6f4e8bcbc1f6d00cfcd163dd8017ea5c673fef919b4370e
-  data.tar.gz: ebb8390a9e8c042fc0cac96dda5a591ddf563c818adc730321cf693a5a9abc867d13f8704e37e7adc8171373b08f7c93b34e0677b6c6de7a134ba3b9bdc4bb2c
+  metadata.gz: ee5d09d524dff393bfbf5f1c159c496fdf4b8c28d849ea8b34782400aba76cf32af4ea5a066f008c95e224c6a3a275938baa5552a0ee39ae010f5e69fc5bf4c0
+  data.tar.gz: e75cf6c1468c337b8ab5b96bfdbc45cfc7a7fd5421849bc7123d0bb2f9090ed4656a7736476d9166c122c58f6f8a88979d7b6c2bd13ee400cd3bbe9770a6af41

data/.github/workflows/test.yml

@@ -32,7 +32,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ["3.1", "3.2", "3.3", "3.4"]
+        ruby: ["3.2", "3.3", "3.4"]
 
     steps:
       - uses: actions/checkout@v2

data/.rubocop.yml

@@ -3,7 +3,7 @@ inherit_gem:
 
 AllCops:
   DisplayCopNames: true
-  TargetRubyVersion: 3.0
+  TargetRubyVersion: 3.2
   SuggestExtensions: false
   Include:
     - lib/**/*.rb

data/CHANGELOG.md

@@ -1,6 +1,33 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [2.0.0] - 2026-09-23
+### Changed
+- Upgraded `bunny` dependency to `~> 3.0`.
+- Minimum supported Ruby version is now 3.2, as required by Bunny 3.
+- `kicks` dependency now requires `>= 3.4`, the first version built on Bunny 3.
+
+### Removed
+- Dropped support for Ruby 3.0 and 3.1.
+
+### Fixed
+- `Rabbit::Publishing::Message` no longer raises `NoMethodError` when `headers` is
+  `nil` (regression in 1.8.0); such headers are published as an empty hash.
+- `Rabbit::EventHandler.inherited` no longer overwrites a queue,
+  `ignore_queue_conversion` or job configs the subclass assigned before calling
+  `super` (the queue overwrite was introduced in 1.9.0).
+- Publishing during a reconnect is retried again. Bunny 3.1+ raises
+  `Bunny::ChannelAlreadyClosed` instead of `Bunny::ConnectionClosedError` there,
+  which used to reach the caller. A publish already waiting for publisher confirms
+  when the connection drops still fails with `Rabbit::MessageNotDelivered` after
+  `continuation_timeout`.
+- A channel the broker closed (e.g. a missing exchange) is retried once on a fresh
+  channel instead of `connection_reset_max_retries` times, and no longer fails an
+  unrelated publish that picks it from the pool.
+- Rebuilding the channels pool no longer leaks the old connection: it is closed
+  (after recovery, if it is still recovering), concurrent failures rebuild the
+  pool once, and close errors go to `exception_notifier`.
+
 ## [1.9.0] - 2026-04-23
 ### Added
 - Fixed `queue` class variable inheritance for `queue_as` method.

data/Gemfile.lock

@@ -8,9 +8,9 @@ GIT
 PATH
   remote: .
   specs:
-    rabbit_messaging (1.9.0)
-      bunny (~> 2.0)
-      kicks
+    rabbit_messaging (2.0.0)
+      bunny (~> 3.0)
+      kicks (>= 3.4)
       msgpack
       zlib
 
@@ -38,13 +38,15 @@ GEM
       minitest (>= 5.1)
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
-    amq-protocol (2.3.2)
+    amq-protocol (2.9.0)
     ast (2.4.2)
     base64 (0.2.0)
     benchmark (0.4.0)
     bigdecimal (3.1.9)
-    bunny (2.23.0)
-      amq-protocol (~> 2.3, >= 2.3.1)
+    bunny (3.4.0)
+      amq-protocol (~> 2.9)
+      logger (~> 1, >= 1.7)
+      openssl (>= 3.3)
       sorted_set (~> 1, >= 1.0.2)
     coderay (1.1.3)
     concurrent-ruby (1.3.5)
@@ -58,17 +60,18 @@ GEM
       concurrent-ruby (~> 1.0)
     io-console (0.8.0)
     json (2.10.0)
-    kicks (3.2.0)
-      bunny (~> 2.19)
+    kicks (3.4.0)
+      bunny (~> 3.0)
       concurrent-ruby (~> 1.0)
       rake (>= 12.3, < 14.0)
       serverengine (~> 2.1)
       thor
     language_server-protocol (3.17.0.4)
-    logger (1.6.5)
+    logger (1.7.0)
     method_source (1.1.0)
     minitest (5.25.4)
     msgpack (1.8.0)
+    openssl (4.0.2)
     parallel (1.26.3)
     parser (3.3.7.1)
       ast (~> 2.4.1)

data/README.md

@@ -2,6 +2,11 @@
 
 Provides client and server support for RabbitMQ
 
+## Requirements
+
+- Ruby >= 3.2
+- Bunny ~> 3.0 (requires OpenSSL with TLS 1.3 support)
+
 ## Installation
 
 ```ruby

data/lib/rabbit/event_handler.rb

@@ -10,9 +10,9 @@ class Rabbit::EventHandler
 
     def inherited(subclass)
       super
-      subclass.ignore_queue_conversion = false
-      subclass.additional_job_configs = {}
-      subclass.queue = queue
+      subclass.ignore_queue_conversion ||= false
+      subclass.additional_job_configs ||= {}
+      subclass.queue ||= queue
     end
 
     private

data/lib/rabbit/publishing/channels_pool.rb

@@ -15,9 +15,14 @@ module Rabbit
         end
 
         def pop
-          add_channel if size.zero?
+          loop do
+            add_channel if size.zero?
 
-          super
+            channel = super
+            return channel if channel.open? || !ChannelsPool.live?(@session)
+
+            @ch_dec_mon.synchronize { @ch_size -= 1 }
+          end
         end
         alias_method :deq, :pop
 
@@ -53,7 +58,12 @@ module Rabbit
         end
       end
 
+      def self.live?(session)
+        !session.nil? && session.open? && !session.recovering_from_network_failure?
+      end
+
       def initialize(session)
+        @session = session
         max_size = session.channel_max
 
         @pools = {
@@ -62,12 +72,25 @@ module Rabbit
         }.freeze
       end
 
+      def close
+        @session.after_recovery_completed { Thread.new { close_session } }
+        close_session unless @session.recovering_from_network_failure?
+      end
+
       def with_channel(confirm)
         pool = @pools[confirm]
         ch = pool.deq
         yield ch
       ensure
-        pool.enq ch
+        pool.enq ch if ch
+      end
+
+      private
+
+      def close_session
+        @session.close(false)
+      rescue StandardError => error
+        Rabbit.config.exception_notifier.call(error)
       end
     end
   end

data/lib/rabbit/publishing/message.rb

@@ -25,9 +25,9 @@ module Rabbit::Publishing
       self.exchange_name = Array(exchange_name)
       self.confirm_select = confirm_select
       self.realtime = realtime
-      self.headers = headers
+      self.headers = headers.to_h
       self.message_id = message_id
-      self.compress = headers.with_indifferent_access.fetch(:compress, false)
+      self.compress = self.headers.with_indifferent_access.fetch(:compress, false)
     end
 
     def to_hash

data/lib/rabbit/publishing.rb

@@ -10,34 +10,29 @@ module Rabbit
 
     MUTEX = Mutex.new
 
-    def publish(msg) # rubocop:disable Metrics/MethodLength
+    def publish(msg)
       return if Rabbit.config.skip_publish?
 
       attempt = 0
+      retried_on_live_connection = false
       begin
-        pool.with_channel msg.confirm_select? do |ch|
-          ch.basic_publish *msg.basic_publish_args
+        current_pool = pool
+        deliver(current_pool, msg)
+      rescue Bunny::ChannelAlreadyClosed => error
+        if ChannelsPool.live?(error.channel&.connection)
+          raise error if retried_on_live_connection
 
-          raise MessageNotDelivered, "RabbitMQ message not delivered: #{msg}" \
-            if msg.confirm_select? && !ch.wait_for_confirms
-
-          log msg
-        end
-      rescue *Rabbit.config.connection_reset_exceptions => error
-        attempt += 1
-        if attempt <= Rabbit.config.connection_reset_max_retries
-          sleep(Rabbit.config.connection_reset_timeout)
-          reinitialize_channels_pool
+          retried_on_live_connection = true
           retry
-        else
-          raise error
         end
+
+        attempt = reconnect_or_raise(error, attempt, current_pool)
+        retry
+      rescue *Rabbit.config.connection_reset_exceptions => error
+        attempt = reconnect_or_raise(error, attempt, current_pool)
+        retry
       rescue Timeout::Error
-        raise MessageNotDelivered, <<~MESSAGE
-          Timeout while sending message #{msg}. Possible reasons:
-            - #{msg.real_exchange_name} exchange is not found
-            - RabbitMQ is extremely high loaded
-        MESSAGE
+        raise MessageNotDelivered, timeout_message(msg)
       end
     end
 
@@ -47,6 +42,17 @@ module Rabbit
 
     private
 
+    def deliver(channels_pool, msg)
+      channels_pool.with_channel msg.confirm_select? do |ch|
+        ch.basic_publish *msg.basic_publish_args
+
+        raise MessageNotDelivered, "RabbitMQ message not delivered: #{msg}" \
+          if msg.confirm_select? && !ch.wait_for_confirms
+
+        log msg
+      end
+    end
+
     def create_queue_if_not_exists(channel, message)
       channel.queue(message.routing_key, durable: true)
     end
@@ -71,8 +77,31 @@ module Rabbit
       log_by_parts(message, metadata: metadata)
     end
 
-    def reinitialize_channels_pool
-      MUTEX.synchronize { @pool = ChannelsPool.new(create_client) }
+    def timeout_message(msg)
+      <<~MESSAGE
+        Timeout while sending message #{msg}. Possible reasons:
+          - #{msg.real_exchange_name} exchange is not found
+          - RabbitMQ is extremely high loaded
+      MESSAGE
+    end
+
+    def reconnect_or_raise(error, attempt, failed_pool)
+      attempt += 1
+      raise error if attempt > Rabbit.config.connection_reset_max_retries
+
+      sleep(Rabbit.config.connection_reset_timeout)
+      reinitialize_channels_pool(failed_pool)
+      attempt
+    end
+
+    def reinitialize_channels_pool(failed_pool)
+      MUTEX.synchronize do
+        return unless @pool.equal?(failed_pool)
+
+        @pool = ChannelsPool.new(create_client)
+      end
+
+      failed_pool&.close
     end
 
     def log_compressed(message_for_publish, metadata:)

data/lib/rabbit/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Rabbit
-  VERSION = "1.9.0"
+  VERSION = "2.0.0"
 end

data/rabbit_messaging.gemspec

@@ -5,7 +5,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "rabbit/version"
 
 Gem::Specification.new do |spec|
-  spec.required_ruby_version = ">= 3.0"
+  spec.required_ruby_version = ">= 3.2"
 
   spec.name    = "rabbit_messaging"
   spec.version = Rabbit::VERSION
@@ -19,8 +19,8 @@ Gem::Specification.new do |spec|
   spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^spec/}) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "bunny", "~> 2.0"
-  spec.add_dependency "kicks"
+  spec.add_dependency "bunny", "~> 3.0"
+  spec.add_dependency "kicks", ">= 3.4"
   spec.add_dependency "msgpack"
   spec.add_dependency "zlib"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rabbit_messaging
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Umbrellio
@@ -15,28 +15,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: kicks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: msgpack
   requirement: !ruby/object:Gem::Requirement
@@ -119,7 +119,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="