rabbit_messaging 1.0.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: adcd319db8ad3bcb74289ff4bd1f0f3d2d7015044ade65ac73a016fd09cf87a4
-  data.tar.gz: 2b426a968cf747ce0cd9eeada6a288b62a4e82bd60e76d7ba5c8b2dd5fd2da17
+  metadata.gz: 56d7ea296071a64801f4a2728f6178dc479504c5ea4185b7ec2ac78276489740
+  data.tar.gz: fdd63b118cd167087636dd7f0079849336e28c88fbacb8fb526720e4448f0118
 SHA512:
-  metadata.gz: 98564c255873239d0da6a01442c72041c1e12d1d9839ffad98bb04ed5e0bb450e3fbb007db7562d362e34be7e47160f53263430ff46d9f57115d1de89001548b
-  data.tar.gz: f12dc92841506cbdf959bbdca6b3f8d6739591aec6eb83cc4f3275074725b91ee2ad56890489c9e311e6551de1a4ac867fb6fabd55d1addbd18f79a1739d3a02
+  metadata.gz: ffd3d472c535d2b128e7006a4da8378f7ce845825aae09dcbd788663de1633fd18b90b13749bf412615940ef26ab3b929f27ee91efaaa502e15624a77ac0e562
+  data.tar.gz: 269eb1e196069f9e8cfa68292b78d7a03a04d71baaf13fe0595565346cf48c92a9ada9e00959ab0e97643c972f424537057f182004dc553447367541e67a8b2d

data/.github/workflows/test.yml

@@ -13,12 +13,10 @@ jobs:
       - uses: actions/checkout@v2
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.0"
+          ruby-version: "3.4"
           bundler-cache: true
       - name: Run Linter
         run: bundle exec rubocop
-      - name: Run audit
-        run: bundle exec rake bundle:audit
       - name: Run specs
         run: bundle exec rspec
       - name: Coveralls
@@ -34,7 +32,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ["3.0", "3.1", "3.2", "3.3"]
+        ruby: ["3.1", "3.2", "3.3", "3.4"]
 
     steps:
       - uses: actions/checkout@v2

data/.rubocop.yml

@@ -26,3 +26,6 @@ Style/Alias:
 Style/HashConversion:
   Exclude:
     - spec/**/*
+
+RSpec/ExampleLength:
+  Max: 50

data/CHANGELOG.md

@@ -1,6 +1,16 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [1.2.0] - 2025-02-10
+### Added
+- Add `ExponentialBackoffHandler` for handling errors in rabbit messages
+- Optional `queue_suffix` config for read queues
+
+## [1.1.0] - 2024-12-06
+### Added
+- **Receiving**
+  - Support for custom receiving job config which is placed in receiving event handler;
+
 ## [1.0.0] - 2024-10-23
 ### Changed
 - Remove `sneakers` gem in favour of [kicks](https://github.com/ruby-amqp/kicks)

data/Gemfile

@@ -3,8 +3,9 @@
 source "https://rubygems.org"
 gemspec
 
+gem "benchmark"
 gem "bundler"
-gem "bundler-audit"
+gem "ostruct"
 gem "pry"
 gem "rails"
 gem "rake"
@@ -13,3 +14,4 @@ gem "rspec-its"
 gem "rubocop-config-umbrellio"
 gem "simplecov"
 gem "simplecov-lcov"
+gem "sneakers_handlers", github: "umbrellio/sneakers_handlers"

data/Gemfile.lock

@@ -1,7 +1,14 @@
+GIT
+  remote: https://github.com/umbrellio/sneakers_handlers.git
+  revision: d4948218a76f2e510a14a72437f4dbd1ecdbef79
+  specs:
+    sneakers_handlers (0.1.0)
+      kicks
+
 PATH
   remote: .
   specs:
-    rabbit_messaging (1.0.0)
+    rabbit_messaging (1.2.0)
       bunny (~> 2.0)
       kicks (~> 3)
       lamian
@@ -88,11 +95,9 @@ GEM
     amq-protocol (2.3.2)
     ast (2.4.2)
     base64 (0.2.0)
+    benchmark (0.4.0)
     bigdecimal (3.1.8)
     builder (3.3.0)
-    bundler-audit (0.9.2)
-      bundler (>= 1.2.0, < 3)
-      thor (~> 1.0)
     bunny (2.23.0)
       amq-protocol (~> 2.3, >= 2.3.1)
       sorted_set (~> 1, >= 1.0.2)
@@ -124,7 +129,7 @@ GEM
       rails (>= 4.2)
     language_server-protocol (3.17.0.3)
     logger (1.6.1)
-    loofah (2.22.0)
+    loofah (2.23.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.8.1)
@@ -135,7 +140,7 @@ GEM
     marcel (1.0.4)
     method_source (1.1.0)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.7)
+    mini_portile2 (2.8.8)
     minitest (5.25.1)
     mutex_m (0.2.0)
     net-imap (0.4.17)
@@ -148,9 +153,10 @@ GEM
     net-smtp (0.5.0)
       net-protocol
     nio4r (2.7.3)
-    nokogiri (1.16.7)
+    nokogiri (1.16.8)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
+    ostruct (0.6.1)
     parallel (1.26.3)
     parser (3.3.5.0)
       ast (~> 2.4.1)
@@ -187,9 +193,9 @@ GEM
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.0)
+    rails-html-sanitizer (1.6.1)
       loofah (~> 2.21)
-      nokogiri (~> 1.14)
+      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
     railties (7.1.4.1)
       actionpack (= 7.1.4.1)
       activesupport (= 7.1.4.1)
@@ -293,8 +299,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  benchmark
   bundler
-  bundler-audit
+  ostruct
   pry
   rabbit_messaging!
   rails
@@ -304,6 +311,7 @@ DEPENDENCIES
   rubocop-config-umbrellio
   simplecov
   simplecov-lcov
+  sneakers_handlers!
 
 BUNDLED WITH
-   2.3.20
+   2.6.3

data/README.md

@@ -33,38 +33,42 @@ require "rabbit_messaging"
 
 - `Rabbit.config` provides setters for following options:
 
-  * `group_id` (`Symbol`), *required*
+  - `group_id` (`Symbol`), *required*
 
     Shared identifier which used to select api. As usual, it should be same as default project_id
     (I.e. we have project 'support', which runs only one application in production.
     So on, it's group_id should be :support)
 
-  * `project_id` (`Symbol`), *required*
+  - `project_id` (`Symbol`), *required*
 
     Personal identifier which used to select exact service.
     As usual, it should be same as default project_id with optional stage_id.
     (I.e. we have project 'support', in production it's project_id is :support,
     but in staging it uses :support1 and :support2 ids for corresponding stages)
 
+  - `queue_suffix` (`String`)
 
-  * `exception_notifier` (`Proc`)
+    Optional suffix added to the read queue name. For example, in case of `group_id = "grp"`, `project_id = "prj"` and
+    `queue_suffix = "sfx"`, Rabbit will read from queue named `"grp.prj.sfx"`.
+
+  - `exception_notifier` (`Proc`)
     You must provide your own notifier like this to notify about exceptions:
-  
+
     ```ruby
       config.exception_notifier = proc { |e| MyCoolNotifier.notify!(e) }
     ```
 
-  * `hooks` (`Hash`)
+  - `hooks` (`Hash`)
 
     :before_fork and :after_fork hooks, used same way as in unicorn / puma / que / etc
 
-  * `environment` (one of `:test`, `:development`, `:production`), *default:* `:production`
+  - `environment` (one of `:test`, `:development`, `:production`), *default:- `:production`
 
     Internal environment of gem.
 
-      * `:test` environment stubs publishing and does not suppress errors
-      * `:development` environment auto-creates queues and uses default exchange
-      * `:production` environment enables handlers caching and gets maximum strictness
+    - `:test` environment stubs publishing and does not suppress errors
+    - `:development` environment auto-creates queues and uses default exchange
+    - `:production` environment enables handlers caching and gets maximum strictness
 
     By default gem skips publishing in test and development environments.
     If you want to change that then manually set `Rabbit.skip_publishing_in` with an array of environments.
@@ -73,13 +77,13 @@ require "rabbit_messaging"
      Rabbit.skip_publishing_in = %i[test]
     ```
 
-  * `receiving_job_class_callable` (`Proc`)
+  - `receiving_job_class_callable` (`Proc`)
 
     Custom ActiveJob subclass to work with received messages. Receives the following attributes as `kwarg`-arguments:
 
-    * `:arguments` - information about message type (`type`), application id (`app_id`), message id (`message_id`);
-    * `:delivery_info` - information about `exchange`, `routing_key`, etc;
-    * `:message` - received RabbitMQ message (often in a `string` format);
+    - `:arguments` - information about message type (`type`), application id (`app_id`), message id (`message_id`);
+    - `:delivery_info` - information about `exchange`, `routing_key`, etc;
+    - `:message` - received RabbitMQ message (often in a `string` format);
 
     ```ruby
     {
@@ -93,7 +97,7 @@ require "rabbit_messaging"
     }
     ```
 
-  * `before_receiving_hooks, after_receiving_hooks` (`Array of Procs`)
+  - `before_receiving_hooks, after_receiving_hooks` (`Array of Procs`)
 
     Before and after hooks with message processing in the middle. Where `before_receiving_hooks` and `after_receiving_hooks` are empty arrays by default.
 
@@ -107,8 +111,22 @@ require "rabbit_messaging"
 
       config.after_receiving_hooks.append(proc { |message, arguments| do_stuff_3 })
       config.after_receiving_hooks.append(proc { |message, arguments| do_stuff_4 })
+    ```
+
+  - `use_backoff_handler` (`Boolean`)
+
+    If set to `true`, use `ExponentialBackoffHandler`. You will also need add the following line to your Gemfile:
 
+    ```ruby
+    gem "sneakers_handlers", github: "umbrellio/sneakers_handlers"
     ```
+
+    See https://github.com/umbrellio/sneakers_handlers for more details.
+
+
+  - `backoff_handler_max_retries` (`Integer`)
+
+    Number of retries that `ExponentialBackoffHandler` will use before sending job to the error queue. 5 by default.
 ---
 
 ### Client
@@ -127,16 +145,16 @@ Rabbit.publish(
 
 - This code sends messages via basic_publish with following parameters:
 
-  * `routing_key`: `"support"`
-  * `exchange`: `"group_id.project_id.fanout"` (default is `"group_id.poject_id"`)
-  * `mandatory`: `true` (same as confirm_select)
+  - `routing_key`: `"support"`
+  - `exchange`: `"group_id.project_id.fanout"` (default is `"group_id.poject_id"`)
+  - `mandatory`: `true` (same as confirm_select)
 
     It is set to raise error if routing failed
 
-  * `persistent`: `true`
-  * `type`: `"ping"`
-  * `content_type`: `"application/json"` (always)
-  * `app_id`: `"group_id.project_id"`
+  - `persistent`: `true`
+  - `type`: `"ping"`
+  - `content_type`: `"application/json"` (always)
+  - `app_id`: `"group_id.project_id"`
 
 - Messages are logged to `/log/rabbit.log`
 

data/Rakefile

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "bundler/gem_tasks"
-require "bundler/audit/task"
 require "rspec/core/rake_task"
 require "rubocop"
 require "rubocop-rspec"
@@ -17,6 +16,5 @@ RuboCop::RakeTask.new(:rubocop) do |t|
 end
 
 RSpec::Core::RakeTask.new(:rspec)
-Bundler::Audit::Task.new
 
 task default: :rspec

data/bin/console

@@ -1,5 +1,9 @@
 #!/usr/bin/env ruby
 
+# Required for tainbox :(
+require "active_support/deprecation"
+require "active_support/deprecator"
+
 require "bundler/setup"
 require "rabbit_messaging"
 

data/lib/rabbit/daemon.rb

@@ -18,25 +18,34 @@ module Rabbit
         Lamian.extend_logger(logger)
       end
 
+      self.logger = logger
+
       Sneakers.configure(**sneakers_config(logger: logger))
       Sneakers.server = true
 
       Rabbit.config.validate!
-      Receiving::Worker.from_queue(Rabbit.config.read_queue)
+
+      Receiving::Worker.from_queue(Rabbit.config.read_queue, **worker_options)
       Sneakers::Runner.new([Receiving::Worker]).run
     end
 
     def config
-      Rails.application.config_for("sneakers").symbolize_keys
+      @config ||= Rails.application.config_for("sneakers").symbolize_keys
     end
 
     def connection
-      bunny_config = config.delete(:bunny_options).to_h.symbolize_keys
-      Bunny.new(bunny_config)
+      @connection ||= begin
+        bunny_config = config.delete(:bunny_options).to_h.symbolize_keys
+        bunny_logger = logger.dup
+        bunny_logger.level = bunny_config.delete(:log_level) || :info
+        Bunny.new(**bunny_config, logger: bunny_logger)
+      end
     end
 
     private
 
+    attr_accessor :logger
+
     def sneakers_config(logger:)
       {
         connection: connection,
@@ -51,5 +60,20 @@ module Rabbit
         **config,
       }
     end
+
+    def worker_options
+      return {} unless Rabbit.config.use_backoff_handler
+
+      require "sneakers_handlers"
+
+      {
+        handler: SneakersHandlers::ExponentialBackoffHandler,
+        max_retries: Rabbit.config.backoff_handler_max_retries,
+        arguments: {
+          "x-dead-letter-exchange" => "#{Rabbit.config.read_queue}.dlx",
+          "x-dead-letter-routing-key" => "#{Rabbit.config.read_queue}.dlx",
+        },
+      }
+    end
   end
 end

data/lib/rabbit/event_handler.rb

@@ -12,6 +12,7 @@ class Rabbit::EventHandler
 
   class_attribute :queue
   class_attribute :ignore_queue_conversion, default: false
+  class_attribute :additional_job_configs, default: {}
 
   class << self
     private
@@ -19,6 +20,14 @@ class Rabbit::EventHandler
     def queue_as(queue = nil, &block)
       self.queue = queue || block
     end
+
+    def job_config(**config_opts)
+      additional_job_configs.merge!(config_opts)
+    end
+
+    def job_configs(**config_opts)
+      self.additional_job_configs = config_opts
+    end
   end
 
   def initialize(message)

data/lib/rabbit/publishing.rb

@@ -50,11 +50,11 @@ module Rabbit
       @logger ||= Rabbit.config.publish_logger
 
       metadata = [
-        message.real_exchange_name, message.routing_key, message.headers,
+        message.real_exchange_name, message.routing_key, JSON.dump(message.headers),
         message.event, message.confirm_select? ? "confirm" : "no-confirm"
       ]
 
-      @logger.debug "#{metadata.join ' / '}: #{message.data}"
+      @logger.debug "#{metadata.join ' / '}: #{JSON.dump(message.data)}"
     end
   end
 end

data/lib/rabbit/receiving/receive.rb

@@ -28,7 +28,7 @@ class Rabbit::Receiving::Receive
 
   def process_message
     job_class
-      .set(queue: queue)
+      .set(queue: queue_name, **job_configs)
       .perform_later(message, message_info)
   end
 
@@ -53,7 +53,15 @@ class Rabbit::Receiving::Receive
   end
 
   def queue
-    Rabbit::Receiving::Queue.new(message, arguments).name
+    @queue ||= Rabbit::Receiving::Queue.new(message, arguments)
+  end
+
+  def job_configs
+    queue.handler.additional_job_configs
+  end
+
+  def queue_name
+    queue.name
   end
 
   def job_class

data/lib/rabbit/version.rb

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

data/lib/rabbit.rb

@@ -16,10 +16,11 @@ module Rabbit
   class Config
     include Tainbox
 
-    attribute :group_id, Symbol
-    attribute :project_id, Symbol
+    attribute :group_id, :Symbol
+    attribute :project_id, :Symbol
+    attribute :queue_suffix, :String
     attribute :hooks, default: {}
-    attribute :environment, Symbol, default: :production
+    attribute :environment, :Symbol, default: :production
     attribute :queue_name_conversion
     attribute :receiving_job_class_callable
     attribute :handler_resolver_callable
@@ -27,6 +28,8 @@ module Rabbit
     attribute :before_receiving_hooks, default: []
     attribute :after_receiving_hooks, default: []
     attribute :skip_publishing_in, default: %i[test development]
+    attribute :use_backoff_handler, :Boolean, default: false
+    attribute :backoff_handler_max_retries, Integer, default: 6
 
     attribute :receive_logger, default: lambda {
       Logger.new(Rails.root.join("log", "incoming_rabbit_messages.log"))
@@ -58,7 +61,9 @@ module Rabbit
       [group_id, project_id].join(".")
     end
 
-    alias_method :read_queue, :app_name
+    def read_queue
+      [app_name, queue_suffix].reject { |x| x.nil? || x.empty? }.join(".")
+    end
   end
 
   extend self

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: rabbit_messaging
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Umbrellio
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-23 00:00:00.000000000 Z
+date: 2025-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -124,7 +123,6 @@ files:
 homepage: https://github.com/umbrellio/rabbit_messaging
 licenses: []
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -139,8 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.6.3
 specification_version: 4
 summary: Rabbit (Rabbit Messaging)
 test_files: []