bunny 2.23.0 → 2.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b33407ce8bf5340f646d7f35f884b991da2c54b1e46e7c8bd31f65e75822cc22
-  data.tar.gz: 8b4242b14294c62a4310f6f4921eabb54414d930756495ab1c9130559475593f
+  metadata.gz: 20682c9d4288b25e0aec7dcf5ad54276c7494faa45da1101eeedafa4f0f52abf
+  data.tar.gz: e88c87ecce0902f284a2bf54540c322afd3ac4c1fa625fb109d08d325a4faafa
 SHA512:
-  metadata.gz: 7ecfba958caee454e1105cd500a1d2f632340b8358469420802b8fbf029abdedc742bdae39ff9d2ad1b04cc4a7d7fd6bc26b1ff11fc282118c6c05fb688ff661
-  data.tar.gz: 7b101718ac037ad85702432cdf865310e94c5a269348ceee714bc6e5630312415f87283360dbbe88577fa1b661ecc5e5f8086d59bbdd50098cfe5e528c757ea1
+  metadata.gz: 8c5668062269ae3be5c160a410432e712b110fc30f9fb6ddcde0c6ce14ddccc5c60e2c298eb21ce4a0512b4564f20833e4556e3d4532fd26918b674b4163ccb7
+  data.tar.gz: e621b5fd31913bf21d48380f0f8e198075f74e7bcec9c97feb17f32ae206b28551b87dd52c83640e72465afce98e12e5e611db940561ea9edbd3ef281f97169e

data/README.md

@@ -47,36 +47,33 @@ Specific examples:
 
 Modern Bunny versions support
 
- * CRuby 2.6 through 3.1 (inclusive)
+ * CRuby 3.2 through 3.4 (inclusive)
  * [TruffleRuby](https://www.graalvm.org/ruby/)
 
 For environments that use TLS, Bunny expects Ruby installations to use a recent enough OpenSSL version that
-**includes support for TLS 1.3**.
+**includes support for [TLS 1.3](https://www.rabbitmq.com/docs/ssl#tls1.3)**.
 
 ### JRuby
 
-Bunny works sufficiently well on JRuby but there are known
-JRuby bugs in versions prior to JRuby 9000 that cause high CPU burn. JRuby users should
-use [March Hare](http://rubymarchhare.info).
+Bunny no longer supports JRuby.
 
-Bunny `1.7.x` was the last version to support CRuby 1.9.3 and 1.8.7
+JRuby users should use [March Hare](http://rubymarchhare.info), which has a similar API
+and is built on top of the RabbitMQ Java client specifically for JRuby.
 
 
 ## Supported RabbitMQ Versions
 
-Modern Bunny releases target [currently supported RabbitMQ release series](https://www.rabbitmq.com/versions.html).
+Modern Bunny releases target [currently community supported RabbitMQ release series](https://www.rabbitmq.com/release-information).
 
+The protocol implemented by Bunny was first introduced in RabbitMQ 2.0 and has evolved
+via extensions and with next to no breaking changes, so all key Bunny operations can be used with a wide range
+of RabbitMQ versions, accounting for the few potentially breaking changes they
+may introduce, e.g. the idempotency of `queue.delete` operations.
 
-## Change Log
-
-Bunny is a mature library (started in early 2009) with
-a stable public API.
-
-Change logs per release series:
 
- * [main](https://github.com/ruby-amqp/bunny/blob/main/ChangeLog.md) (most notable changes for all release series)
- * [2.19.x](https://github.com/ruby-amqp/bunny/blob/2.19.x-stable/ChangeLog.md)
+## Change Log
 
+[Change log](https://github.com/ruby-amqp/bunny/blob/main/ChangeLog.md).
 
 
 ## Installation & Bundler Dependency
@@ -90,7 +87,7 @@ Change logs per release series:
 To use Bunny in a project managed with Bundler:
 
 ``` ruby
-gem "bunny", ">= 2.19.0"
+gem "bunny", ">= 2.23.0"
 ```
 
 ### With Rubygems
@@ -150,7 +147,7 @@ conn.close
 
 ### Getting Started
 
-For a 15 minute tutorial using more practical examples, see [Getting Started with RabbitMQ and Ruby using Bunny](http://rubybunny.info/articles/getting_started.html).
+For a 15 minute tutorial using more practical examples, see [Getting Started with RabbitMQ and Ruby using Bunny](https://github.com/ruby-amqp/bunny/blob/main/docs/guides/getting_started.md).
 
 ### Guides
 
@@ -168,15 +165,15 @@ Bunny documentation guides are [under `docs/guides` in this repository](https://
 
 Some highly relevant RabbitMQ documentation guides:
 
- * [Connections](https://www.rabbitmq.com/connections.html)
- * [Channels](https://www.rabbitmq.com/channels.html)
- * [Queues](https://www.rabbitmq.com/queues.html)
- * [Quorum queues](https://www.rabbitmq.com/quorum-queues.html)
- * [Streams](https://rabbitmq.com/streams.html) (Bunny can perform basic operations on streams even though it does not implement the [RabbitMQ Stream protocol](https://github.com/rabbitmq/rabbitmq-server/blob/v3.10.x/deps/rabbitmq_stream/docs/PROTOCOL.adoc))
- * [Publishers](https://www.rabbitmq.com/publishers.html)
- * [Consumers](https://www.rabbitmq.com/consumers.html)
- * Data safety: publisher and consumer [Confirmations](https://www.rabbitmq.com/confirms.html)
- * [Production Checklist](https://www.rabbitmq.com/production-checklist.html)
+ * [Connections](https://www.rabbitmq.com/docs/connections)
+ * [Channels](https://www.rabbitmq.com/docs/channels)
+ * [Queues](https://www.rabbitmq.com/docs/queues)
+ * [Quorum queues](https://www.rabbitmq.com/docs/quorum-queues)
+ * [Streams](https://rabbitmq.com/docs/streams) (Bunny can perform basic operations on streams even though it does not implement the [RabbitMQ Stream protocol](https://github.com/rabbitmq/rabbitmq-server/blob/v4.0.x/deps/rabbitmq_stream/docs/PROTOCOL.adoc))
+ * [Publishers](https://www.rabbitmq.com/docs/publishers)
+ * [Consumers](https://www.rabbitmq.com/docs/consumers)
+ * Data safety: publisher and consumer [Confirmations](https://www.rabbitmq.com/docs/confirms)
+ * [Production Checklist](https://www.rabbitmq.com/docs/production-checklist)
 
 ### API Reference
 
@@ -187,17 +184,14 @@ Some highly relevant RabbitMQ documentation guides:
 
 ### Mailing List
 
-[Bunny has a mailing list](http://groups.google.com/group/ruby-amqp). Please use it for all questions,
-investigations, and discussions. GitHub issues should be used for specific, well understood, actionable
-maintainers and contributors can work on.
-
-We encourage you to also join the [RabbitMQ mailing list](https://groups.google.com/forum/#!forum/rabbitmq-users)
-mailing list. Feel free to ask any questions that you may have.
+Please use [GitHub Discussions](https://github.com/ruby-amqp/bunny/discussions) for questions.
 
+GitHub issues should be used for specific, well understood, actionable
+maintainers and contributors can work on.
 
-## Continuous Integration
-
-[![Build Status](https://travis-ci.org/ruby-amqp/bunny.svg)](https://travis-ci.org/ruby-amqp/bunny/)
+We encourage you to keep an eye on [RabbitMQ Discussions](https://github.com/rabbitmq/rabbitmq-server/discussions),
+join the [RabbitMQ mailing list](https://groups.google.com/forum/#!forum/rabbitmq-users)
+and the [RabbitMQ Discord server](https://rabbitmq.com/discord).
 
 
 ### Reporting Issues

data/lib/amq/protocol/extensions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # @private
 module AMQ
   # @private

data/lib/bunny/authentication/credentials_encoder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Bunny
   # Contains credentials encoding implementations for various
   # authentication strategies.

data/lib/bunny/authentication/external_mechanism_encoder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "bunny/authentication/credentials_encoder"
 
 module Bunny

data/lib/bunny/authentication/plain_mechanism_encoder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "bunny/authentication/credentials_encoder"
 
 module Bunny

data/lib/bunny/channel.rb

@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+# frozen_string_literal: true
+
 require "thread"
 require "monitor"
 require "set"
@@ -13,11 +15,7 @@ require "bunny/delivery_info"
 require "bunny/return_info"
 require "bunny/message_properties"
 
-if defined?(JRUBY_VERSION)
-  require "bunny/concurrent/linked_continuation_queue"
-else
-  require "bunny/concurrent/continuation_queue"
-end
+require "bunny/concurrent/continuation_queue"
 
 module Bunny
   # ## Channels in RabbitMQ
@@ -163,6 +161,8 @@ module Bunny
     # @return [Integer] active basic.qos prefetch global mode
     attr_reader :prefetch_global
 
+    attr_reader :cancel_consumers_before_closing
+
     DEFAULT_CONTENT_TYPE = "application/octet-stream".freeze
     SHORTSTR_LIMIT = 255
 
@@ -218,6 +218,8 @@ module Bunny
       @uncaught_exception_handler = Proc.new do |e, consumer|
         @logger.error "Uncaught exception from consumer #{consumer.to_s}: #{e.inspect} @ #{e.backtrace[0]}"
       end
+
+      @cancel_consumers_before_closing = false
     end
 
     attr_reader :recoveries_counter
@@ -251,6 +253,23 @@ module Bunny
       # see bunny#528
       raise_if_no_longer_open!
 
+      # This is a best-effort attempt to cancel all consumers before closing the channel.
+      # Retries are extremely unlikely to succeed, and the channel itself is about to be closed,
+      # so we don't bother retrying.
+      if self.cancel_consumers_before_closing?
+       # cancelling a consumer involves using the same mutex, so avoid holding the lock
+        keys = @consumer_mutex.synchronize { @consumers.keys }
+        keys.each do |ctag|
+          begin
+            self.basic_cancel(ctag)
+          rescue Bunny::Exception
+            # ignore
+          rescue Bunny::ClientTimeout
+            # ignore
+          end
+        end
+      end
+
       @connection.close_channel(self)
       @status = :closed
       @work_pool.shutdown
@@ -295,6 +314,23 @@ module Bunny
 
     # @endgroup
 
+    # @group Other settings
+
+    def configure(&block)
+      block.call(self) if block_given?
+
+      self
+    end
+
+    def cancel_consumers_before_closing!
+      @cancel_consumers_before_closing = true
+    end
+
+    def cancel_consumers_before_closing?
+      !!@cancel_consumers_before_closing
+    end
+
+    # @endgroup
 
     #
     # Higher-level API, similar to amqp gem
@@ -412,7 +448,7 @@ module Bunny
     # @option opts [Boolean] :durable (false) Should this queue be durable?
     # @option opts [Boolean] :auto-delete (false) Should this queue be automatically deleted when the last consumer disconnects?
     # @option opts [Boolean] :exclusive (false) Should this queue be exclusive (only can be used by this connection, removed when the connection is closed)?
-    # @option opts [Hash] :arguments ({}) Additional optional arguments (typically used by RabbitMQ extensions and plugins)
+    # @option opts [Hash] :arguments ({}) Optional arguments (x-arguments)
     #
     # @return [Bunny::Queue] Queue that was declared or looked up in the cache
     # @see http://rubybunny.info/articles/queues.html Queues and Consumers guide
@@ -431,7 +467,7 @@ module Bunny
     # @param [String] name Queue name. Empty (server-generated) names are not supported by this method.
     # @param  [Hash]  opts  Queue properties and other options. Durability, exclusivity, auto-deletion options will be ignored.
     #
-    # @option opts [Hash] :arguments ({}) Additional optional arguments (typically used by RabbitMQ extensions and plugins)
+    # @option opts [Hash] :arguments ({}) Optional arguments (x-arguments)
     #
     # @return [Bunny::Queue] Queue that was declared
     # @see #durable_queue
@@ -452,7 +488,7 @@ module Bunny
     # @param [String] name Stream name. Empty (server-generated) names are not supported by this method.
     # @param  [Hash]  opts  Queue properties and other options. Durability, exclusivity, auto-deletion options will be ignored.
     #
-    # @option opts [Hash] :arguments ({}) Additional optional arguments (typically used by RabbitMQ extensions and plugins)
+    # @option opts [Hash] :arguments ({}) Optional arguments (x-arguments)
     #
     #
     # @return [Bunny::Queue] Queue that was declared
@@ -472,7 +508,7 @@ module Bunny
     # @param [String] name Queue name. Empty (server-generated) names are not supported by this method.
     # @param  [Hash]  opts  Queue properties and other options. Durability, exclusivity, auto-deletion options will be ignored.
     #
-    # @option opts [Hash] :arguments ({}) Additional optional arguments (typically used by RabbitMQ extensions and plugins)
+    # @option opts [Hash] :arguments ({}) Optional arguments (x-arguments)
     #
     # @return [Bunny::Queue] Queue that was declared
     # @see #queue
@@ -500,7 +536,10 @@ module Bunny
     # @see #queue
     # @api public
     def temporary_queue(opts = {})
-      queue("", opts.merge(:exclusive => true))
+      temporary_queue_opts = {
+        :exclusive => true
+      }
+      queue("", opts.merge(temporary_queue_opts))
     end
 
     # @endgroup
@@ -1027,15 +1066,24 @@ module Bunny
     # it was on is auto-deleted and this consumer was the last one, the queue will be deleted.
     #
     # @param [String] consumer_tag Consumer tag (unique identifier) to cancel
+    # @param [Hash] arguments ({}) Optional arguments
+    #
+    # @option opts [Boolean] :no_wait (false) if set to true, this method won't receive a response and will
+    #                                         immediately return nil
     #
-    # @return [AMQ::Protocol::Basic::CancelOk] RabbitMQ response
+    # @return [AMQ::Protocol::Basic::CancelOk] RabbitMQ response or nil, if the no_wait option is used
     # @see http://rubybunny.info/articles/queues.html Queues and Consumers guide
     # @api public
-    def basic_cancel(consumer_tag)
-      @connection.send_frame(AMQ::Protocol::Basic::Cancel.encode(@id, consumer_tag, false))
+    def basic_cancel(consumer_tag, opts = {})
+      no_wait = opts.fetch(:no_wait, false)
+      @connection.send_frame(AMQ::Protocol::Basic::Cancel.encode(@id, consumer_tag, no_wait))
 
-      with_continuation_timeout do
-        @last_basic_cancel_ok = wait_on_continuations
+      if no_wait
+        @last_basic_cancel_ok = nil
+      else
+        with_continuation_timeout do
+          @last_basic_cancel_ok = wait_on_continuations
+        end
       end
 
       # reduces thread usage for channels that don't have any
@@ -1070,13 +1118,15 @@ module Bunny
     #                                          connection is closed
     # @option opts [Boolean] passive (false)   If true, queue will be checked for existence. If it does not
     #                                          exist, {Bunny::NotFound} will be raised.
-    #
+    # @option opts [Hash] :arguments ({}) Optional queue arguments (x-arguments)
     # @return [AMQ::Protocol::Queue::DeclareOk] RabbitMQ response
     # @see http://rubybunny.info/articles/queues.html Queues and Consumers guide
     # @api public
     def queue_declare(name, opts = {})
       raise_if_no_longer_open!
 
+      Bunny::Queue.verify_type!(opts[:arguments]) if opts[:arguments]
+
       # strip trailing new line and carriage returns
       # just like RabbitMQ does
       safe_name = name.gsub(/[\r\n]/, "")
@@ -1256,7 +1306,7 @@ module Bunny
           opts.fetch(:durable, false),
           opts.fetch(:auto_delete, false),
           opts.fetch(:internal, false),
-          false, # nowait
+          opts.fetch(:no_wait, false),
           opts[:arguments]))
       with_continuation_timeout do
         @last_exchange_declare_ok = wait_on_continuations
@@ -2100,18 +2150,10 @@ module Bunny
       @basic_get_continuations = new_continuation
     end
 
-
-    if defined?(JRUBY_VERSION)
-      # @private
-      def new_continuation
-        Concurrent::LinkedContinuationQueue.new
-      end
-    else
-      # @private
-      def new_continuation
-        Concurrent::ContinuationQueue.new
-      end
-    end # if defined?
+    # @private
+    def new_continuation
+      Concurrent::ContinuationQueue.new
+    end
 
     # @private
     def guarding_against_stale_delivery_tags(tag, &block)

data/lib/bunny/channel_id_allocator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "thread"
 require "monitor"
 require "amq/int_allocator"

data/lib/bunny/concurrent/atomic_fixnum.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "set"
 require "thread"
 require "monitor"

data/lib/bunny/concurrent/condition.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "thread"
 require "monitor"
 

data/lib/bunny/concurrent/continuation_queue.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "thread"
 
 module Bunny

data/lib/bunny/concurrent/synchronized_sorted_set.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "set"
 require "thread"
 

data/lib/bunny/consumer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Bunny
   # Base class that represents consumer interface. Subclasses of this class implement
   # specific logic of handling consumer life cycle events. Note that when the only event

data/lib/bunny/consumer_tag_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Bunny
   # Used to generate consumer tags in the client
   class ConsumerTagGenerator

data/lib/bunny/consumer_work_pool.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "thread"
 
 module Bunny

data/lib/bunny/cruby/socket.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "socket"
 
 module Bunny
@@ -52,7 +54,7 @@ module Bunny
     def read_fully(count, timeout = nil)
       return nil if @__bunny_socket_eof_flag__
 
-      value = ''
+      value = +''
       begin
         loop do
           value << read_nonblock(count - value.bytesize)

data/lib/bunny/cruby/ssl_socket.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "socket"
 
 module Bunny
@@ -39,7 +41,7 @@ module Bunny
       def read_fully(count, timeout = nil)
         return nil if @__bunny_socket_eof_flag__
 
-        value = ''
+        value = +''
         begin
           loop do
             value << read_nonblock(count - value.bytesize)

data/lib/bunny/delivery_info.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "bunny/versioned_delivery_tag"
 
 module Bunny

data/lib/bunny/exceptions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Bunny
   # Base class for all Bunny exceptions
   # @api public

data/lib/bunny/exchange.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'amq/protocol'
 
 module Bunny

data/lib/bunny/framing.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Bunny
   # @private
   module Framing

data/lib/bunny/get_response.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "bunny/versioned_delivery_tag"
 
 module Bunny

data/lib/bunny/heartbeat_sender.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "thread"
 require "amq/protocol/client"
 require "amq/protocol/frame"

data/lib/bunny/message_properties.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Bunny
   # Wraps basic properties hash as returned by amq-protocol to
   # provide access to the delivery properties as immutable hash as

data/lib/bunny/queue.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "bunny/get_response"
 
 module Bunny
@@ -352,6 +354,14 @@ module Bunny
       s[:consumer_count]
     end
 
+    def self.verify_type!(args0 = {})
+      # be extra defensive
+      args = args0 || {}
+      q_type = args["x-queue-type"] || args[:"x-queue-type"]
+      throw ArgumentError.new(
+        "unsupported queue type #{q_type.inspect}, supported ones: #{Types::KNOWN.join(', ')}") if (q_type and !Types.known?(q_type))
+    end
+
     #
     # Recovery
     #
@@ -419,9 +429,7 @@ module Bunny
     end
 
     def verify_type!(args)
-      q_type = (args || {})["x-queue-type"]
-      throw ArgumentError.new(
-        "unsupported queue type #{q_type.inspect}, supported ones: #{Types::KNOWN.join(', ')}") if (q_type and !Types.known?(q_type))
+      self.class.verify_type!(args)
     end
   end
 end

data/lib/bunny/reader_loop.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "thread"
 
 module Bunny
@@ -76,7 +78,7 @@ module Bunny
 
       if !frame.final? || frame.method_class.has_content?
         header   = @transport.read_next_frame
-        content  = ''
+        content  = +''
 
         if header.body_size > 0
           loop do

data/lib/bunny/return_info.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Bunny
   # Wraps AMQ::Protocol::Basic::Return to
   # provide access to the delivery properties as immutable hash as

data/lib/bunny/session.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "socket"
 require "thread"
 require "monitor"
@@ -10,11 +12,7 @@ require "bunny/authentication/credentials_encoder"
 require "bunny/authentication/plain_mechanism_encoder"
 require "bunny/authentication/external_mechanism_encoder"
 
-if defined?(JRUBY_VERSION)
-  require "bunny/concurrent/linked_continuation_queue"
-else
-  require "bunny/concurrent/continuation_queue"
-end
+require "bunny/concurrent/continuation_queue"
 
 require "amq/protocol/client"
 require "amq/settings"
@@ -516,6 +514,8 @@ module Bunny
       begin
         ch.queue(name, :passive => true)
         true
+      rescue Bunny::ResourceLocked => _
+        true
       rescue Bunny::NotFound => _
         false
       ensure
@@ -1076,16 +1076,7 @@ module Bunny
           # this is the easiest way to wait until the loop
           # is guaranteed to have terminated
           @reader_loop.terminate_with(ShutdownSignal)
-          # joining the thread here may take forever
-          # on JRuby because sun.nio.ch.KQueueArrayWrapper#kevent0 is
-          # a native method that cannot be (easily) interrupted.
-          # So we use this ugly hack or else our test suite takes forever
-          # to run on JRuby (a new connection is opened/closed per example). MK.
-          if defined?(JRUBY_VERSION)
-            sleep 0.075
-          else
-            @reader_loop.join
-          end
+          @reader_loop.join
         else
           # single threaded mode, nothing to do. MK.
         end
@@ -1159,7 +1150,7 @@ module Bunny
       channel.synchronize do
         # see rabbitmq/rabbitmq-server#156
         if open?
-          data = frames.reduce("") { |acc, frame| acc << frame.encode }
+          data = frames.reduce(+"") { |acc, frame| acc << frame.encode }
           @transport.write(data)
           signal_activity!
         else
@@ -1270,7 +1261,7 @@ module Bunny
                                 negotiate_value(@client_heartbeat, connection_tune.heartbeat)
                               end
       @logger.debug { "Heartbeat interval negotiation: client = #{@client_heartbeat}, server = #{connection_tune.heartbeat}, result = #{@heartbeat}" }
-      @logger.info "Heartbeat interval used (in seconds): #{@heartbeat}"
+      @logger.debug "Heartbeat interval used (in seconds): #{@heartbeat}"
 
       # We set the read_write_timeout to twice the heartbeat value,
       # and then some padding for edge cases.
@@ -1409,16 +1400,9 @@ module Bunny
       Authentication::CredentialsEncoder.for_session(self)
     end
 
-    if defined?(JRUBY_VERSION)
-      # @private
-      def reset_continuations
-        @continuations = Concurrent::LinkedContinuationQueue.new
-      end
-    else
-      # @private
-      def reset_continuations
-        @continuations = Concurrent::ContinuationQueue.new
-      end
+    # @private
+    def reset_continuations
+      @continuations = Concurrent::ContinuationQueue.new
     end
 
     # @private

data/lib/bunny/socket.rb

@@ -1,14 +1,9 @@
-# See #165. MK.
-if defined?(JRUBY_VERSION)
-  require "bunny/jruby/socket"
+# frozen_string_literal: true
 
-  module Bunny
-    SocketImpl = JRuby::Socket
-  end
-else
-  require "bunny/cruby/socket"
+require "bunny/cruby/socket"
 
-  module Bunny
-    SocketImpl = Socket
-  end
-end
+module Bunny
+  # An alias for the standard MRI Socket,
+  # exists from the days of JRuby support.
+  SocketImpl = Socket
+end

data/lib/bunny/ssl_socket.rb

@@ -1,14 +1,9 @@
-# See #165. MK.
-if defined?(JRUBY_VERSION)
-  require "bunny/jruby/ssl_socket"
+# frozen_string_literal: true
 
-  module Bunny
-    SSLSocketImpl = JRuby::SSLSocket
-  end
-else
-  require "bunny/cruby/ssl_socket"
+require "bunny/cruby/ssl_socket"
 
-  module Bunny
-    SSLSocketImpl = SSLSocket
-  end
-end
+module Bunny
+  # An alias for the standard SSLSocket,
+  # exists from the days of JRuby support.
+  SSLSocketImpl = SSLSocket
+end

data/lib/bunny/test_kit.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# frozen_string_literal: true
 
 require "timeout"
 

data/lib/bunny/timeout.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Bunny
   Timeout = ::Timeout
 

data/lib/bunny/timestamp.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Bunny
   # Abstracts away the Ruby (OS) method of retriving timestamps.
   #

data/lib/bunny/transport.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "socket"
 require "thread"
 require "monitor"
@@ -151,51 +153,26 @@ module Bunny
       block.call(@tls_context) if @tls_context
     end
 
-    if defined?(JRUBY_VERSION)
-      # Writes data to the socket.
-      def write(data)
-        return write_without_timeout(data) unless @write_timeout
+    # Writes data to the socket. If read/write timeout was specified the operation will return after that
+    # amount of time has elapsed waiting for the socket.
+    def write(data)
+      return write_without_timeout(data) unless @write_timeout
 
-        begin
-          if open?
-            @writes_mutex.synchronize do
-              @socket.write(data)
-            end
-          end
-        rescue SystemCallError, Timeout::Error, Bunny::ConnectionError, IOError => e
-          @logger.error "Got an exception when sending data: #{e.message} (#{e.class.name})"
-          close
-          @status = :not_connected
-
-          if @session.automatically_recover?
-            @session.handle_network_failure(e)
-          else
-            @session_error_handler.raise(Bunny::NetworkFailure.new("detected a network failure: #{e.message}", e))
+      begin
+        if open?
+          @writes_mutex.synchronize do
+            @socket.write_nonblock_fully(data, @write_timeout)
           end
         end
-      end
-    else
-      # Writes data to the socket. If read/write timeout was specified the operation will return after that
-      # amount of time has elapsed waiting for the socket.
-      def write(data)
-        return write_without_timeout(data) unless @write_timeout
+      rescue SystemCallError, Timeout::Error, Bunny::ConnectionError, IOError => e
+        @logger.error "Got an exception when sending data: #{e.message} (#{e.class.name})"
+        close
+        @status = :not_connected
 
-        begin
-          if open?
-            @writes_mutex.synchronize do
-              @socket.write_nonblock_fully(data, @write_timeout)
-            end
-          end
-        rescue SystemCallError, Timeout::Error, Bunny::ConnectionError, IOError => e
-          @logger.error "Got an exception when sending data: #{e.message} (#{e.class.name})"
-          close
-          @status = :not_connected
-
-          if @session.automatically_recover?
-            @session.handle_network_failure(e)
-          else
-            @session_error_handler.raise(Bunny::NetworkFailure.new("detected a network failure: #{e.message}", e))
-          end
+        if @session.automatically_recover?
+          @session.handle_network_failure(e)
+        else
+          @session_error_handler.raise(Bunny::NetworkFailure.new("detected a network failure: #{e.message}", e))
         end
       end
     end
@@ -320,6 +297,7 @@ module Bunny
     end
 
     def initialize_socket
+      @logger.debug("Usong connection timeout of #{@connect_timeout} when connecting to #{@host}:#{@port}")
       begin
         @socket = Bunny::SocketImpl.open(@host, @port,
           :keepalive      => @opts[:keepalive],

data/lib/bunny/version.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module Bunny
   # @return [String] Version of the library
-  VERSION = "2.23.0"
+  VERSION = "2.24.0"
 end

data/lib/bunny/versioned_delivery_tag.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Bunny
   # Wraps a delivery tag (which is an integer) so that {Bunny::Channel} could
   # detect stale tags after connection recovery.

data/lib/bunny.rb

@@ -1,4 +1,5 @@
 # -*- encoding: utf-8; mode: ruby -*-
+# frozen_string_literal: true
 
 require "timeout"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bunny
 version: !ruby/object:Gem::Version
-  version: 2.23.0
+  version: 2.24.0
 platform: ruby
 authors:
 - Chris Duncan
@@ -9,10 +9,9 @@ authors:
 - Jakub Stastny aka botanicus
 - Michael S. Klishin
 - Stefan Kaes
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-01 00:00:00.000000000 Z
+date: 2025-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amq-protocol
@@ -21,9 +20,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -31,9 +27,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.3.1
 - !ruby/object:Gem::Dependency
   name: sorted_set
   requirement: !ruby/object:Gem::Requirement
@@ -74,7 +67,6 @@ files:
 - lib/bunny/concurrent/atomic_fixnum.rb
 - lib/bunny/concurrent/condition.rb
 - lib/bunny/concurrent/continuation_queue.rb
-- lib/bunny/concurrent/linked_continuation_queue.rb
 - lib/bunny/concurrent/synchronized_sorted_set.rb
 - lib/bunny/consumer.rb
 - lib/bunny/consumer_tag_generator.rb
@@ -87,8 +79,6 @@ files:
 - lib/bunny/framing.rb
 - lib/bunny/get_response.rb
 - lib/bunny/heartbeat_sender.rb
-- lib/bunny/jruby/socket.rb
-- lib/bunny/jruby/ssl_socket.rb
 - lib/bunny/message_properties.rb
 - lib/bunny/queue.rb
 - lib/bunny/reader_loop.rb
@@ -107,7 +97,7 @@ licenses:
 - MIT
 metadata:
   changelog_uri: https://github.com/ruby-amqp/bunny/blob/main/ChangeLog.md
-post_install_message:
+  source_code_uri: https://github.com/ruby-amqp/bunny/
 rdoc_options: []
 require_paths:
 - lib
@@ -122,8 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Popular easy to use Ruby client for RabbitMQ
 test_files: []

data/lib/bunny/concurrent/linked_continuation_queue.rb

@@ -1,61 +0,0 @@
-if !defined?(JRUBY_VERSION)
-  raise "Bunny::Concurrent::LinkedContinuationQueue can only be used on JRuby!"
-end
-
-require "java"
-
-java_import java.util.concurrent.LinkedBlockingQueue
-java_import java.util.concurrent.TimeUnit
-
-module Bunny
-  module Concurrent
-    # Continuation queue implementation for JRuby.
-    #
-    # On JRuby, we'd rather use reliable and heavily battle tested j.u.c.
-    # primitives with well described semantics than informally specified, clumsy
-    # and limited Ruby standard library parts.
-    #
-    # This is an implementation of the continuation queue on top of the linked blocking
-    # queue in j.u.c.
-    #
-    # Compared to the Ruby standard library Queue, there is one limitation: you cannot
-    # push a nil on the queue, it will fail with a null pointer exception.
-    # @private
-    class LinkedContinuationQueue
-      def initialize(*args, &block)
-        @q = LinkedBlockingQueue.new
-      end
-
-      def push(el, timeout_in_ms = nil)
-        if timeout_in_ms
-          @q.offer(el, timeout_in_ms, TimeUnit::MILLISECONDS)
-        else
-          @q.offer(el)
-        end
-      end
-      alias << push
-
-      def pop
-        @q.take
-      end
-
-      def poll(timeout_in_ms = nil)
-        if timeout_in_ms
-          v = @q.poll(timeout_in_ms, TimeUnit::MILLISECONDS)
-          raise ::Timeout::Error.new("operation did not finish in #{timeout_in_ms} ms") if v.nil?
-          v
-        else
-          @q.poll
-        end
-      end
-
-      def clear
-        @q.clear
-      end
-
-      def method_missing(selector, *args, &block)
-        @q.__send__(selector, *args, &block)
-      end
-    end
-  end
-end

data/lib/bunny/jruby/socket.rb

@@ -1,57 +0,0 @@
-require "bunny/cruby/socket"
-
-module Bunny
-  module JRuby
-    # TCP socket extension that uses Socket#readpartial to avoid excessive CPU
-    # burn after some time. See issue #165.
-    # @private
-    module Socket
-      include Bunny::Socket
-
-      def self.open(host, port, options = {})
-        socket = ::Socket.tcp(host, port, nil, nil,
-                              connect_timeout: options[:connect_timeout])
-        if ::Socket.constants.include?('TCP_NODELAY') || ::Socket.constants.include?(:TCP_NODELAY)
-          socket.setsockopt(::Socket::IPPROTO_TCP, ::Socket::TCP_NODELAY, true)
-        end
-        socket.setsockopt(::Socket::SOL_SOCKET, ::Socket::SO_KEEPALIVE, true) if options.fetch(:keepalive, true)
-        socket.extend self
-        socket.options = { :host => host, :port => port }.merge(options)
-        socket
-      rescue Errno::ETIMEDOUT
-        raise ClientTimeout
-      end
-
-      # Reads given number of bytes with an optional timeout
-      #
-      # @param [Integer] count How many bytes to read
-      # @param [Integer] timeout Timeout
-      #
-      # @return [String] Data read from the socket
-      # @api public
-      def read_fully(count, timeout = nil)
-        value = ''
-
-        begin
-          loop do
-            value << read_nonblock(count - value.bytesize)
-            break if value.bytesize >= count
-          end
-        rescue EOFError
-          # JRuby specific fix via https://github.com/jruby/jruby/issues/1694#issuecomment-54873532
-          IO.select([self], nil, nil, timeout)
-          retry
-        rescue *READ_RETRY_EXCEPTION_CLASSES
-          if IO.select([self], nil, nil, timeout)
-            retry
-          else
-            raise Timeout::Error, "IO timeout when reading #{count} bytes"
-          end
-        end
-
-        value
-      end # read_fully
-
-    end
-  end
-end

data/lib/bunny/jruby/ssl_socket.rb

@@ -1,58 +0,0 @@
-module Bunny
-  module JRuby
-    begin
-      require "bunny/cruby/ssl_socket"
-      require "openssl"
-
-      # TLS-enabled TCP socket that implements convenience
-      # methods found in Bunny::Socket.
-      class SSLSocket < Bunny::SSLSocket
-
-        def initialize(*args)
-          super
-          @__bunny_socket_eof_flag__ = false
-        end
-
-        # Reads given number of bytes with an optional timeout
-        #
-        # @param [Integer] count How many bytes to read
-        # @param [Integer] timeout Timeout
-        #
-        # @return [String] Data read from the socket
-        # @api public
-        def read_fully(count, timeout = nil)
-          return nil if @__bunny_socket_eof_flag__
-
-          value = ''
-          begin
-            loop do
-              value << read_nonblock(count - value.bytesize)
-              break if value.bytesize >= count
-            end
-          rescue EOFError => e
-            @__bunny_socket_eof_flag__ = true
-          rescue OpenSSL::SSL::SSLError => e
-            if e.message == "read would block"
-              if IO.select([self], nil, nil, timeout)
-                retry
-              else
-                raise Timeout::Error, "IO timeout when reading #{count} bytes"
-              end
-            else
-              raise e
-            end
-          rescue *READ_RETRY_EXCEPTION_CLASSES => e
-            if IO.select([self], nil, nil, timeout)
-              retry
-            else
-              raise Timeout::Error, "IO timeout when reading #{count} bytes"
-            end
-          end
-          value
-        end
-      end
-    rescue LoadError => le
-      puts "Could not load OpenSSL"
-    end
-  end
-end