freddy 2.9.0 → 2.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d37275d237bbe49c30c6ad3c93e40b30d9b3dc631d8f8156ec1812b051010c52
-  data.tar.gz: 242f0523cb85e38ed9d295f2c99dc1668b8727fb5246fde4464018160796dfc7
+  metadata.gz: 0a0e451c899d3459fd4829f99e633035fa7e9c5499d0b30719b542557cb741cc
+  data.tar.gz: 9524f49be933a3f4b664111e8e06120e12bae0498379c2b8fb49820a90109404
 SHA512:
-  metadata.gz: 9eabd4eb896cadfc8d43a64e4092b59ee7248b6d58e2674819951e478de8257f4e5ab4ccbffad7a0e1ca1ef3009f56a83a303fbc269711ad8fd2678ff5935606
-  data.tar.gz: 3572bf85e93a9a741b6366c4fcd6c9634c4487b5a3254b8a8960947393f9dc92676d084b0a98f18feb3ed5c2fe36a39415d58fb2027be146acfdf68f2c637a0e
+  metadata.gz: 7af1a8a054e2fa285939f94b6dc696b249a6c83a0659802cd60fb88dea6e1aa067bf2dbd22b09a7cbfb75e3c0e579535801f9f10849f90302211f9d60847d96b
+  data.tar.gz: 11eeba115b4677a1523c95f365ce4cd87a1e5c33d649b7a548effb0a2760b1d43c2f1778e38fafa2ba2ab4007db075d13e6846d78cf5df4f18ef79aca862e67d

data/.github/workflows/ci.yml

@@ -14,7 +14,7 @@ jobs:
         ruby-version: ['3.2']
     services:
       rabbitmq:
-        image: public.ecr.aws/docker/library/rabbitmq:3.13.7
+        image: public.ecr.aws/docker/library/rabbitmq:4.0
         ports:
           - 5672:5672
         options: --health-cmd "rabbitmqctl node_health_check" --health-interval 10s --health-timeout 5s --health-retries 5

data/.ruby-version

@@ -1 +1 @@
-3.3.6
+3.3.8

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    freddy (2.9.0)
-      bunny (~> 2.11)
+    freddy (2.11.0)
+      bunny (~> 2.24)
       concurrent-ruby (~> 1.0)
       oj (~> 3.6)
       opentelemetry-api (~> 1.0)
@@ -19,7 +19,7 @@ GEM
       amq-protocol (~> 2.3)
       sorted_set (~> 1, >= 1.0.2)
     coderay (1.1.3)
-    concurrent-ruby (1.3.1)
+    concurrent-ruby (1.3.5)
     diff-lcs (1.4.4)
     hamster (3.0.0)
       concurrent-ruby (~> 1.0)
@@ -29,7 +29,7 @@ GEM
     oj (3.16.10)
       bigdecimal (>= 3.0)
       ostruct (>= 0.2)
-    opentelemetry-api (1.1.0)
+    opentelemetry-api (1.5.0)
     opentelemetry-common (0.19.6)
       opentelemetry-api (~> 1.0)
     opentelemetry-registry (0.2.0)
@@ -39,7 +39,7 @@ GEM
       opentelemetry-common (~> 0.19.3)
       opentelemetry-registry (~> 0.2)
       opentelemetry-semantic_conventions
-    opentelemetry-semantic_conventions (1.10.0)
+    opentelemetry-semantic_conventions (1.11.0)
       opentelemetry-api (~> 1.0)
     ostruct (0.6.1)
     parallel (1.26.3)
@@ -107,4 +107,4 @@ DEPENDENCIES
   rubocop-rspec (~> 3.3)
 
 BUNDLED WITH
-   2.3.9
+   2.5.22

data/freddy.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'bunny', '~> 2.11'
+  spec.add_dependency 'bunny', '~> 2.24'
   spec.add_dependency 'concurrent-ruby', '~> 1.0'
   spec.add_dependency 'oj', '~> 3.6'
   spec.add_dependency 'opentelemetry-api', '~> 1.0'

data/lib/freddy/consumers/respond_to_consumer.rb

@@ -7,11 +7,12 @@ class Freddy
         new(**attrs).consume(&)
       end
 
-      def initialize(thread_pool:, destination:, channel:, handler_adapter_factory:)
+      def initialize(thread_pool:, destination:, channel:, handler_adapter_factory:, options:)
         @consume_thread_pool = thread_pool
         @destination = destination
         @channel = channel
         @handler_adapter_factory = handler_adapter_factory
+        @options = options
       end
 
       def consume
@@ -28,7 +29,9 @@ class Freddy
       private
 
       def consume_from_destination(&block)
-        @channel.queue(@destination).subscribe(manual_ack: true) do |delivery|
+        @channel.queue(
+          @destination, durable: durable?, no_declare: no_declare?
+        ).subscribe(manual_ack: true) do |delivery|
           process_message(delivery, &block)
         end
       end
@@ -42,6 +45,14 @@ class Freddy
           @channel.acknowledge(delivery.tag, false)
         end
       end
+
+      def durable?
+        @options.fetch(:durable, true)
+      end
+
+      def no_declare?
+        @options.fetch(:no_declare, Freddy::DEFAULT_NO_DECLARE)
+      end
     end
   end
 end

data/lib/freddy/consumers/tap_into_consumer.rb

@@ -12,8 +12,6 @@ class Freddy
         @patterns = patterns
         @channel = channel
         @options = options
-
-        raise 'Do not use durable queues without specifying a group' if durable? && !group
       end
 
       def consume(&block)
@@ -33,7 +31,7 @@ class Freddy
 
         queue =
           if group
-            @channel.queue("groups.#{group}", durable: durable?)
+            @channel.queue("groups.#{group}", durable: durable?, no_declare: no_declare?)
           else
             @channel.queue('', exclusive: true)
           end
@@ -70,7 +68,11 @@ class Freddy
       end
 
       def durable?
-        @options.fetch(:durable, false)
+        @options.fetch(:durable, true)
+      end
+
+      def no_declare?
+        @options.fetch(:no_declare, Freddy::DEFAULT_NO_DECLARE)
       end
 
       def on_exception

data/lib/freddy/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class Freddy
-  VERSION = '2.9.0'
+  VERSION = '2.11.0'
 end

data/lib/freddy.rb

@@ -12,6 +12,7 @@ Dir["#{File.dirname(__FILE__)}/freddy/*.rb"].each(&method(:require))
 class Freddy
   FREDDY_TOPIC_EXCHANGE_NAME = 'freddy-topic'
   DEFAULT_MAX_CONCURRENCY = 4
+  DEFAULT_NO_DECLARE = false
 
   # Creates a new freddy instance
   #
@@ -24,14 +25,17 @@ class Freddy
   # @option config [String] :user ('guest')
   # @option config [String] :pass ('guest')
   # @option config [Integer] :max_concurrency (4)
+  # @option config [Boolean] :no_declare (false)
   #
   # @return [Freddy]
   #
   # @example
   #   Freddy.build(Logger.new($stdout), user: 'thumper', pass: 'howdy')
-  def self.build(logger = Logger.new($stdout), max_concurrency: DEFAULT_MAX_CONCURRENCY, **config)
+  def self.build(
+    logger = Logger.new($stdout), max_concurrency: DEFAULT_MAX_CONCURRENCY, no_declare: DEFAULT_NO_DECLARE, **config
+  )
     connection = Adapters.determine.connect(config)
-    new(connection, logger, max_concurrency)
+    new(connection, logger, max_concurrency, no_declare)
   end
 
   # @private
@@ -39,10 +43,11 @@ class Freddy
     @tracer ||= OpenTelemetry.tracer_provider.tracer('freddy', Freddy::VERSION)
   end
 
-  def initialize(connection, logger, max_concurrency)
+  def initialize(connection, logger, max_concurrency, no_declare)
     @connection = connection
     @logger = logger
     @prefetch_buffer_size = max_concurrency
+    @no_declare = no_declare
 
     @send_and_forget_producer = Producers::SendAndForgetProducer.new(
       connection.create_channel, logger
@@ -77,18 +82,21 @@ class Freddy
   #       handler.error(message: 'Can not do')
   #     end
   #   end
-  def respond_to(destination, &)
+  def respond_to(destination, options = {}, &)
     @logger.info "Listening for requests on #{destination}"
 
     channel = @connection.create_channel(prefetch: @prefetch_buffer_size)
     producer = Producers::ReplyProducer.new(channel, @logger)
     handler_adapter_factory = MessageHandlerAdapters::Factory.new(producer)
 
+    options[:no_declare] = options[:no_declare] || @no_declare
+
     Consumers::RespondToConsumer.consume(
       thread_pool: Concurrent::FixedThreadPool.new(@prefetch_buffer_size),
       destination: destination,
       channel: channel,
       handler_adapter_factory: handler_adapter_factory,
+      options: options,
       &
     )
   end
@@ -107,8 +115,9 @@ class Freddy
   #   only one of the listeners in given group will receive a message. All
   #   listeners will receive a message if the group is not specified.
   # @option options [Boolean] :durable
-  #   Should the consumer queue be durable? Default is `false`. This option can
-  #   be used only in combination with option `:group`.
+  #   Should the consumer queue be durable? Default is `nil` - let server decide.
+  #   This option can be used only in combination with option `:group`.
+  #   Note that queues *must be durable* with "quorum" queue types.
   # @option options [Boolean] :on_exception
   #   Defines consumer's behaviour when the callback fails to process a message
   #   and raises an exception. Can be one of `:ack`, `:reject` or `:requeue`.
@@ -135,6 +144,8 @@ class Freddy
   def tap_into(pattern_or_patterns, options = {}, &)
     @logger.debug "Tapping into messages that match #{pattern_or_patterns}"
 
+    options[:no_declare] = options[:no_declare] || @no_declare
+
     Consumers::TapIntoConsumer.consume(
       thread_pool: Concurrent::FixedThreadPool.new(@prefetch_buffer_size),
       patterns: Array(pattern_or_patterns),

data/spec/freddy/consumers/respond_to_consumer_spec.rb

@@ -6,7 +6,8 @@ describe Freddy::Consumers::RespondToConsumer do
       thread_pool: thread_pool,
       destination: destination,
       channel: channel,
-      handler_adapter_factory: msg_handler_adapter_factory
+      handler_adapter_factory: msg_handler_adapter_factory,
+      options: options
     )
   end
 
@@ -17,6 +18,7 @@ describe Freddy::Consumers::RespondToConsumer do
   let(:msg_handler_adapter) { Freddy::MessageHandlerAdapters::NoOpHandler.new }
   let(:prefetch_buffer_size) { 2 }
   let(:thread_pool) { Concurrent::FixedThreadPool.new(prefetch_buffer_size) }
+  let(:options) { { durable: false } }
 
   after do
     connection.close

data/spec/integration/tap_into_with_group_spec.rb

@@ -11,11 +11,6 @@ describe 'Tapping into with group identifier' do
 
   after { [deliverer, responder1, responder2].each(&:close) }
 
-  it 'raises an exception if option :durable is provided without group' do
-    expect { responder1.tap_into(destination, durable: true) }
-      .to raise_error(RuntimeError)
-  end
-
   it 'receives a message once' do
     msg_counter = Hamster::MutableSet[]
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: freddy
 version: !ruby/object:Gem::Version
-  version: 2.9.0
+  version: 2.11.0
 platform: ruby
 authors:
 - Glia TechMovers
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: '2.24'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: '2.24'
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement