rabbitek 0.4.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1f7cc70de57fb560439fe5e93b30b76e419d8e00dcea7379c6b3fe4aa4a6325
-  data.tar.gz: 1eb6bd702c62d2e9cd44f97211cfbe6769c58db9f032073bf0361a137d5c16e9
+  metadata.gz: 8c5f09ef286a1f37a026cf370fce7fb800b68da92abff95ee56f1ef5408fd6e3
+  data.tar.gz: da008b7f6a410ee65d63b879229df6418455ef688d3b8b7a0e4deb1ec685b985
 SHA512:
-  metadata.gz: 398811e481a4b197ddaea89a52448d76e158576156aacffb5c3801d0b3122bfb3df1770e15c348500fd5fe59a172b3bdb3d8f0c52e4642a9306a7d983a8c616f
-  data.tar.gz: fcc347a951e4530f723e8d754a58b111b7463cc175a3944249296db049b070898b1b44e509633c7af2c8d633c6fa2fb8c45908c3e09e6fa87c677ef327db8c5c
+  metadata.gz: 8c32c7beb1a29a53a25b8a3e936126c6c54b070d5a62b81dd07e0103d07a5e541669083fbd7a28d9816cdcf7cff939d988b95d47690f3a57c00b00308b3c07c6
+  data.tar.gz: 0e32bceb540529fd08e6647f8e5dd71bd251f26f147c3c5e89fc5ec71c3f4ec2490fe0172e9fe98719d34c3c5b6724809461c42c80771949c6dbd41198ab847d

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    rabbitek (0.4.0)
+    rabbitek (0.8.1)
       activesupport (> 3.0)
       bunny (~> 2.11.0)
-      oj (~> 3.6)
+      oj (> 2.0.0)
       opentracing (~> 0.4)
       slop (~> 4.0)
-      yabeda
+      yabeda (>= 0.6.0)
 
 GEM
   remote: https://rubygems.org/
@@ -53,14 +53,15 @@ GEM
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    amq-protocol (2.3.0)
+    amq-protocol (2.3.2)
     arel (9.0.0)
     ast (2.4.0)
+    bigdecimal (2.0.0)
     builder (3.2.4)
     bunny (2.11.0)
       amq-protocol (~> 2.3.0)
     coderay (1.1.2)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.6)
     crass (1.0.6)
     diff-lcs (1.3)
     dry-initializer (3.0.3)
@@ -85,7 +86,8 @@ GEM
     nio4r (2.5.2)
     nokogiri (1.10.7)
       mini_portile2 (~> 2.4.0)
-    oj (3.10.0)
+    oj (3.10.9)
+      bigdecimal (~> 2.0)
     opentracing (0.5.0)
     parallel (1.12.1)
     parser (2.5.1.2)
@@ -145,7 +147,7 @@ GEM
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.10.0)
-    slop (4.7.0)
+    slop (4.8.2)
     sprockets (4.0.0)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -161,7 +163,7 @@ GEM
     websocket-driver (0.7.1)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.4)
-    yabeda (0.3.0)
+    yabeda (0.7.0)
       concurrent-ruby
       dry-initializer
 
@@ -178,4 +180,4 @@ DEPENDENCIES
   rubocop (~> 0.58.0)
 
 BUNDLED WITH
-   2.0.2
+   2.1.4

data/lib/rabbitek.rb

@@ -58,11 +58,12 @@ end
 
 Yabeda.configure do
   group :rabbitek do
-    counter   :processed_messages_count, comment: 'Total number of all messages'
-    counter   :errored_messages_count, comment: 'Total number of errored messages'
+    counter   :processed_messages_count, comment: 'Total number of all messages', tags: %i[consumer]
+    counter   :errored_messages_count, comment: 'Total number of errored messages', tags: %i[consumer]
     histogram :processed_messages_runtime do
       comment 'How long it takes to process message'
       unit :seconds
+      tags %i[consumer]
       buckets [0.1, 0.5, 1, 5, 10, 30, 60]
     end
   end

data/lib/rabbitek/cli.rb

@@ -14,9 +14,12 @@ module Rabbitek
   class CLI
     include ::Rabbitek::Loggable
 
-    def run
+    def run # rubocop:disable Metrics/AbcSize
       opts
       require_application
+
+      Yabeda.configure! unless Yabeda.already_configured?
+
       map_consumer_workers!
 
       start_log

data/lib/rabbitek/server/batcher.rb

@@ -6,7 +6,7 @@ module Rabbitek
   class Batcher
     def initialize(consumer)
       @consumer = consumer
-      @batch_size = consumer.batch_size
+      @batch_size = consumer.opts[:batch][:of]
       @batch = []
     end
 

data/lib/rabbitek/server/consumer.rb

@@ -52,16 +52,16 @@ module Rabbitek
       Message.new(delivery_info: delivery_info, properties: properties, payload: payload)
     end
 
-    def batch_size
-      self.class.batch
+    def opts
+      self.class.opts
     end
 
     module ClassMethods # rubocop:disable Style/Documentation
-      attr_accessor :rabbit_options_hash, :batch
+      attr_accessor :rabbit_options_hash, :opts
 
       def rabbit_options(opts)
         self.rabbit_options_hash = default_rabbit_options(opts).with_indifferent_access.merge(opts)
-        self.batch = opts[:batch]
+        self.opts = opts
       end
 
       def perform_async(payload, opts: {}, channel: nil)

data/lib/rabbitek/server/hooks/retry.rb

@@ -13,7 +13,7 @@ module Rabbitek
         def call(consumer, message)
           super
         rescue StandardError
-          retry_message(consumer, message) unless consumer.batch_size
+          retry_message(consumer, message) unless consumer.opts[:batch]
           raise
         end
 

data/lib/rabbitek/server/message_processor.rb

@@ -33,18 +33,18 @@ module Rabbitek
     def_delegators :starter, :channel, :work_queue, :retry_or_delayed_queue, :retry_or_delayed_exchange
 
     def run_job(modified_consumer, message)
-      if modified_consumer.class.batch
+      if modified_consumer.opts[:batch]
         run_job_batched(modified_consumer, message)
       else
         modified_consumer.perform(message)
-        modified_consumer.ack!(message.delivery_info)
+        modified_consumer.ack!(message.delivery_info) unless modified_consumer.opts[:manual_ack]
       end
     end
 
     def run_job_batched(modified_consumer, message)
       Batcher.new(modified_consumer).perform(message) do |batch|
         modified_consumer.perform(batch)
-        modified_consumer.ack!(batch.last.delivery_info, true)
+        modified_consumer.ack!(batch.last.delivery_info, true) unless modified_consumer.opts[:manual_ack]
       end
     end
 

data/lib/rabbitek/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Rabbitek
-  VERSION = '0.4.0'
+  VERSION = '0.8.1'
 end

data/rabbitek.gemspec

@@ -31,10 +31,10 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'activesupport', '> 3.0'
   spec.add_dependency 'bunny', '~> 2.11.0'
-  spec.add_dependency 'oj', '~> 3.6'
+  spec.add_dependency 'oj', '> 2.0.0'
   spec.add_dependency 'opentracing', '~> 0.4'
   spec.add_dependency 'slop', '~> 4.0'
-  spec.add_dependency 'yabeda'
+  spec.add_dependency 'yabeda', '>= 0.6.0'
 
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'pry'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rabbitek
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Boostcom
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-01-16 00:00:00.000000000 Z
+date: 2020-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -42,16 +42,16 @@ dependencies:
   name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: opentracing
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -236,7 +236,7 @@ metadata:
   source_code_uri: https://github.com/Boostcom/rabbitek
   changelog_uri: https://github.com/Boostcom/rabbitek/blob/master/CHANGELOG.md
   bug_tracker_uri: https://github.com/Boostcom/rabbitek/issues
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -251,8 +251,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: High performance background job processing
 test_files: []