bunny 2.21.0 → 2.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a51dd17b606b2363463849ba249e8bdff82f263237304def85c72d804a72cf9f
-  data.tar.gz: fc7754eb6f23de9759b515f9c98800ff24ecc0b1dea4d07a6a04f028362a91f2
+  metadata.gz: b33407ce8bf5340f646d7f35f884b991da2c54b1e46e7c8bd31f65e75822cc22
+  data.tar.gz: 8b4242b14294c62a4310f6f4921eabb54414d930756495ab1c9130559475593f
 SHA512:
-  metadata.gz: 522d80a40d4189fe483ad77f213f676afabbf6d27d834ebb84c6cf2c79f11060f11015e0b2fe92cf08e0fa5144244b94f7f36c785db43577722660e216b7039c
-  data.tar.gz: 7d2e4905752d86fadd6ac8d780970c4e8abd622cdb3b93aa94503bc4f03b3c658bbc6901c110bcf1dc16e18610aa2f7e57bae061525eb879b1d2e43ba4a3fcb2
+  metadata.gz: 7ecfba958caee454e1105cd500a1d2f632340b8358469420802b8fbf029abdedc742bdae39ff9d2ad1b04cc4a7d7fd6bc26b1ff11fc282118c6c05fb688ff661
+  data.tar.gz: 7b101718ac037ad85702432cdf865310e94c5a269348ceee714bc6e5630312415f87283360dbbe88577fa1b661ecc5e5f8086d59bbdd50098cfe5e528c757ea1

data/lib/bunny/channel.rb

@@ -378,7 +378,7 @@ module Bunny
     # @see http://rubybunny.info/articles/exchanges.html Exchanges and Publishing guide
     # @api public
     def default_exchange
-      Exchange.default(self)
+      @default_exchange ||= Exchange.default(self)
     end
 
     # Declares a headers exchange or looks it up in the cache of previously
@@ -396,7 +396,7 @@ module Bunny
     # @see http://rubybunny.info/articles/exchanges.html Exchanges and Publishing guide
     # @see http://rubybunny.info/articles/extensions.html RabbitMQ Extensions to AMQP 0.9.1 guide
     def exchange(name, opts = {})
-      Exchange.new(self, opts.fetch(:type, :direct), name, opts)
+      find_exchange(name) || Exchange.new(self, opts.fetch(:type, :direct), name, opts)
     end
 
     # @endgroup
@@ -1536,7 +1536,8 @@ module Bunny
     # @return [String]  Unique string.
     # @api plugin
     def generate_consumer_tag(name = "bunny")
-      "#{name}-#{Time.now.to_i * 1000}-#{Kernel.rand(999_999_999_999)}"
+      t = Bunny::Timestamp.now
+      "#{name}-#{t.to_i * 1000}-#{Kernel.rand(999_999_999_999)}"
     end
 
     # @endgroup
@@ -1819,7 +1820,7 @@ module Bunny
 
     # @private
     def channel_level_exception_after_operation_that_has_no_response?(method)
-      method.reply_code == 406 && method.reply_text =~ /unknown delivery tag/
+      method.reply_code == 406 && (method.reply_text =~ /unknown delivery tag/ || method.reply_text =~ /delivery acknowledgement on channel \d+ timed out/)
     end
 
     # @private

data/lib/bunny/concurrent/continuation_queue.rb

@@ -25,18 +25,19 @@ module Bunny
       end
 
       def poll(timeout_in_ms = nil)
-        timeout = timeout_in_ms ? timeout_in_ms / 1000.0 : nil
+        timeout_in_sec = timeout_in_ms ? timeout_in_ms / 1000.0 : nil
 
         @lock.synchronize do
-          timeout_strikes_at = Time.now.utc + (timeout || 0)
+          started_at = Bunny::Timestamp.monotonic
           while @q.empty?
-            wait = if timeout
-                     timeout_strikes_at - Time.now.utc
-                   else
-                     nil
-                   end
-            @cond.wait(@lock, wait)
-            raise ::Timeout::Error if wait && Time.now.utc >= timeout_strikes_at
+            wait = !(timeout_in_sec.nil?)
+            @cond.wait(@lock, timeout_in_sec)
+
+            if wait
+              ended_at = Bunny::Timestamp.monotonic
+              elapsed = ended_at - started_at
+              raise ::Timeout::Error if (elapsed > timeout_in_sec)
+            end
           end
           item = @q.shift
           item

data/lib/bunny/consumer_tag_generator.rb

@@ -8,7 +8,8 @@ module Bunny
 
     # @return [String] Generated consumer tag
     def generate
-      "#{Kernel.rand}-#{Time.now.to_i * 1000}-#{Kernel.rand(999_999_999_999)}"
+      t = Bunny::Timestamp.now
+      "#{Kernel.rand}-#{t.to_i * 1000}-#{Kernel.rand(999_999_999_999)}"
     end # generate
 
 
@@ -17,7 +18,8 @@ module Bunny
     # @return [String]  Unique string.
     # @api public
     def generate_prefixed(name = "bunny")
-      "#{name}-#{Time.now.to_i * 1000}-#{Kernel.rand(999_999_999_999)}"
+      t = Bunny::Timestamp.now
+      "#{name}-#{t.to_i * 1000}-#{Kernel.rand(999_999_999_999)}"
     end
   end
 end

data/lib/bunny/heartbeat_sender.rb

@@ -17,7 +17,7 @@ module Bunny
       @logger    = logger
       @mutex     = Monitor.new
 
-      @last_activity_time = Time.now
+      @last_activity_time = Bunny::Timestamp.monotonic
     end
 
     def start(period = 30)
@@ -38,7 +38,7 @@ module Bunny
     end
 
     def signal_activity!
-      @last_activity_time = Time.now
+      @last_activity_time = Bunny::Timestamp.monotonic
     end
 
     protected
@@ -53,14 +53,14 @@ module Bunny
       rescue IOError => ioe
         @logger.error "I/O error in the hearbeat sender: #{ioe.message}"
         stop
-      rescue Exception => e
+      rescue ::Exception => e
         @logger.error "Error in the hearbeat sender: #{e.message}"
         stop
       end
     end
 
     def beat
-      now = Time.now
+      now = Bunny::Timestamp.monotonic
 
       if now > (@last_activity_time + @interval)
         @logger.debug { "Sending a heartbeat, last activity time: #{@last_activity_time}, interval (s): #{@interval}" }

data/lib/bunny/session.rb

@@ -128,6 +128,7 @@ module Bunny
     # @option connection_string_or_opts [Integer] :reset_recovery_attempts_after_reconnection (true) Should recovery attempt counter be reset after successful reconnection? When set to false, the attempt counter will last through the entire lifetime of the connection object.
     # @option connection_string_or_opts [Proc] :recovery_attempt_started (nil) Will be called before every connection recovery attempt
     # @option connection_string_or_opts [Proc] :recovery_completed (nil) Will be called after successful connection recovery
+    # @option connection_string_or_opts [Proc] :recovery_attempts_exhausted (nil) Will be called when the connection recovery failed after the specified amount of recovery attempts
     # @option connection_string_or_opts [Boolean] :recover_from_connection_close (true) Should this connection recover after receiving a server-sent connection.close (e.g. connection was force closed)?
     # @option connection_string_or_opts [Object] :session_error_handler (Thread.current) Object which responds to #raise that will act as a session error handler. Defaults to Thread.current, which will raise asynchronous exceptions in the thread that created the session.
     #
@@ -225,6 +226,7 @@ module Bunny
 
       @recovery_attempt_started = opts[:recovery_attempt_started]
       @recovery_completed       = opts[:recovery_completed]
+      @recovery_attempts_exhausted          = opts[:recovery_attempts_exhausted]
 
       @session_error_handler = opts.fetch(:session_error_handler, Thread.current)
 
@@ -553,6 +555,12 @@ module Bunny
       @recovery_completed = block
     end
 
+    # Defines a callable (e.g. a block) that will be called
+    # when the connection recovery failed after the specified
+    # numbers of recovery attempts.
+    def after_recovery_attempts_exhausted(&block)
+      @recovery_attempts_exhausted = block
+    end
 
     #
     # Implementation
@@ -809,6 +817,7 @@ module Bunny
           @transport.close
           self.close(false)
           @manually_closed = false
+          notify_of_recovery_attempts_exhausted
         end
       else
         raise e
@@ -859,6 +868,11 @@ module Bunny
       @recovery_completed.call if @recovery_completed
     end
 
+    # @private
+    def notify_of_recovery_attempts_exhausted
+      @recovery_attempts_exhausted.call if @recovery_attempts_exhausted
+    end
+
     # @private
     def instantiate_connection_level_exception(frame)
       case frame

data/lib/bunny/timestamp.rb

@@ -0,0 +1,22 @@
+module Bunny
+  # Abstracts away the Ruby (OS) method of retriving timestamps.
+  #
+  # @private
+  class Timestamp
+    def self.now
+      ::Time.now
+    end
+
+    def self.monotonic
+      Process.clock_gettime(Process::CLOCK_MONOTONIC)
+    end
+
+    def self.non_monotonic
+      ::Time.now
+    end
+
+    def self.non_monotonic_utc
+      self.non_monotonic.utc
+    end
+  end
+end

data/lib/bunny/version.rb

@@ -2,5 +2,5 @@
 
 module Bunny
   # @return [String] Version of the library
-  VERSION = "2.21.0"
+  VERSION = "2.23.0"
 end

data/lib/bunny.rb

@@ -10,7 +10,7 @@ require "bunny/framing"
 require "bunny/exceptions"
 
 require "bunny/socket"
-
+require "bunny/timestamp"
 require "bunny/timeout"
 
 begin

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bunny
 version: !ruby/object:Gem::Version
-  version: 2.21.0
+  version: 2.23.0
 platform: ruby
 authors:
 - Chris Duncan
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-08 00:00:00.000000000 Z
+date: 2024-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amq-protocol
@@ -98,13 +98,15 @@ files:
 - lib/bunny/ssl_socket.rb
 - lib/bunny/test_kit.rb
 - lib/bunny/timeout.rb
+- lib/bunny/timestamp.rb
 - lib/bunny/transport.rb
 - lib/bunny/version.rb
 - lib/bunny/versioned_delivery_tag.rb
 homepage: http://rubybunny.info
 licenses:
 - MIT
-metadata: {}
+metadata:
+  changelog_uri: https://github.com/ruby-amqp/bunny/blob/main/ChangeLog.md
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -120,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: Popular easy to use Ruby client for RabbitMQ