rabbitek 0.3.0 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61812d7a27d392ac1fd654f0a181972b716be920d0e8d0579537f685d1d16d42
-  data.tar.gz: 800b02c54302fcd9c380ebb3effb63e38f28f85f4bfeb6e4731eb11385a92bbc
+  metadata.gz: a36ba46180d4c5e3c28d3d212ff2174c49ef00618f6d49c7defd49ec0768d5ae
+  data.tar.gz: 25167637efc19c059e73ff8796a19aef890e961ec3c7c891b2b9aba1429d1ef3
 SHA512:
-  metadata.gz: 736fd9459b74ab310078f10be4835b600acdec3c8e04093c6d5fa5c90a364a5f1de0f17f6ae4de56cdea56237e63fd0012773732b3a6501970aa55539d826727
-  data.tar.gz: 6c5d6d0a9b429cc88b0c844c78c3de40e0aacad2d98464c4897cfbecbba2b6b745d4823e2739b2fc995953c9273a32b1434052b0ce63d8929cbe4d767448d1b3
+  metadata.gz: 33d4cfcad4e769c15e556b93ba40e9c779aa16ab739a889bd2ec01728b1c84cae25096a559aaaf687875f792ad43789612903c9c6c3b4e222b5a3ba0d801df68
+  data.tar.gz: 22b95c1863b7d22d66c4b9f2eb02a18c734450ac09b3aa999dd6b5f316fa40e45f7f52b101e8924a1c2f2a1e2b8601ba6830b99c4948659825983927c393f421

data/CHANGELOG.md

@@ -1,3 +1,25 @@
+## v0.3.5
+
+Bugfix:
+* Fix OpenTracing support when there is no trace_id incoming with job.
+
+## v0.3.4
+
+Improvements:
+* Logging improvement
+
+## v0.3.3
+
+Improvements:
+* Failure in retry hook will result in additional logging and nacking job with requeue: true
+
+## v0.3.2
+
+## v0.3.1
+
+Bugfix:
+* Fix sentry integration while logging messages different than exceptions
+
 ## v0.3.0
 
 Improvements:

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rabbitek (0.3.0)
+    rabbitek (0.3.4)
       activesupport (> 3.0)
       bunny (~> 2.11.0)
       oj (~> 3.6)
@@ -11,43 +11,43 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.2.2)
-      actionpack (= 5.2.2)
+    actioncable (5.2.4.1)
+      actionpack (= 5.2.4.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.2)
-      actionpack (= 5.2.2)
-      actionview (= 5.2.2)
-      activejob (= 5.2.2)
+    actionmailer (5.2.4.1)
+      actionpack (= 5.2.4.1)
+      actionview (= 5.2.4.1)
+      activejob (= 5.2.4.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.2)
-      actionview (= 5.2.2)
-      activesupport (= 5.2.2)
-      rack (~> 2.0)
+    actionpack (5.2.4.1)
+      actionview (= 5.2.4.1)
+      activesupport (= 5.2.4.1)
+      rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.2)
-      activesupport (= 5.2.2)
+    actionview (5.2.4.1)
+      activesupport (= 5.2.4.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.2)
-      activesupport (= 5.2.2)
+    activejob (5.2.4.1)
+      activesupport (= 5.2.4.1)
       globalid (>= 0.3.6)
-    activemodel (5.2.2)
-      activesupport (= 5.2.2)
-    activerecord (5.2.2)
-      activemodel (= 5.2.2)
-      activesupport (= 5.2.2)
+    activemodel (5.2.4.1)
+      activesupport (= 5.2.4.1)
+    activerecord (5.2.4.1)
+      activemodel (= 5.2.4.1)
+      activesupport (= 5.2.4.1)
       arel (>= 9.0)
-    activestorage (5.2.2)
-      actionpack (= 5.2.2)
-      activerecord (= 5.2.2)
+    activestorage (5.2.4.1)
+      actionpack (= 5.2.4.1)
+      activerecord (= 5.2.4.1)
       marcel (~> 0.3.1)
-    activesupport (5.2.2)
+    activesupport (5.2.4.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -55,20 +55,20 @@ GEM
     amq-protocol (2.3.0)
     arel (9.0.0)
     ast (2.4.0)
-    builder (3.2.3)
+    builder (3.2.4)
     bunny (2.11.0)
       amq-protocol (~> 2.3.0)
     coderay (1.1.2)
-    concurrent-ruby (1.1.4)
-    crass (1.0.4)
+    concurrent-ruby (1.1.5)
+    crass (1.0.6)
     diff-lcs (1.3)
-    erubi (1.8.0)
+    erubi (1.9.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    i18n (1.5.2)
+    i18n (1.8.2)
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.1)
-    loofah (2.2.3)
+    loofah (2.4.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -79,11 +79,11 @@ GEM
     mimemagic (0.3.3)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
-    minitest (5.11.3)
-    nio4r (2.4.0)
-    nokogiri (1.10.3)
+    minitest (5.14.0)
+    nio4r (2.5.2)
+    nokogiri (1.10.7)
       mini_portile2 (~> 2.4.0)
-    oj (3.8.1)
+    oj (3.10.1)
     opentracing (0.5.0)
     parallel (1.12.1)
     parser (2.5.1.2)
@@ -92,30 +92,30 @@ GEM
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    rack (2.0.7)
+    rack (2.1.1)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.2.2)
-      actioncable (= 5.2.2)
-      actionmailer (= 5.2.2)
-      actionpack (= 5.2.2)
-      actionview (= 5.2.2)
-      activejob (= 5.2.2)
-      activemodel (= 5.2.2)
-      activerecord (= 5.2.2)
-      activestorage (= 5.2.2)
-      activesupport (= 5.2.2)
+    rails (5.2.4.1)
+      actioncable (= 5.2.4.1)
+      actionmailer (= 5.2.4.1)
+      actionpack (= 5.2.4.1)
+      actionview (= 5.2.4.1)
+      activejob (= 5.2.4.1)
+      activemodel (= 5.2.4.1)
+      activerecord (= 5.2.4.1)
+      activestorage (= 5.2.4.1)
+      activesupport (= 5.2.4.1)
       bundler (>= 1.3.0)
-      railties (= 5.2.2)
+      railties (= 5.2.4.1)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.4)
-      loofah (~> 2.2, >= 2.2.2)
-    railties (5.2.2)
-      actionpack (= 5.2.2)
-      activesupport (= 5.2.2)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
+    railties (5.2.4.1)
+      actionpack (= 5.2.4.1)
+      activesupport (= 5.2.4.1)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
@@ -144,16 +144,16 @@ GEM
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.10.0)
     slop (4.7.0)
-    sprockets (3.7.2)
+    sprockets (4.0.0)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.2.1)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    thor (0.20.3)
+    thor (1.0.1)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.6)
       thread_safe (~> 0.1)
     unicode-display_width (1.4.0)
     websocket-driver (0.7.1)
@@ -173,4 +173,4 @@ DEPENDENCIES
   rubocop (~> 0.58.0)
 
 BUNDLED WITH
-   2.0.1
+   2.0.2

data/lib/rabbitek/cli.rb

@@ -77,7 +77,8 @@ module Rabbitek
     end
 
     def boot_consumers
-      (1..configuration[:threads]).each_with_object([]) do |_, arr|
+      (1..configuration[:threads]).each_with_object([]) do |i, arr|
+        debug "Booting thread ##{i}"
         arr << Starter.new(Rabbitek.bunny_connection, configuration).start
       end
     end

data/lib/rabbitek/loggable.rb

@@ -15,7 +15,7 @@ module Rabbitek
     def error(msg)
       log_msg(:error, msg)
       NewRelic::Agent.notice_error(msg) if Rabbitek.config.enable_newrelic && Object.const_defined?('NewRelic')
-      Raven.capture_exception(msg) if Rabbitek.config.enable_sentry && Object.const_defined?('Raven')
+      raven_capture_error(msg) if Rabbitek.config.enable_sentry && Object.const_defined?('Raven')
       true
     end
 
@@ -46,5 +46,9 @@ module Rabbitek
     def class_name(msg)
       msg.is_a?(Hash) && msg[:class_name] ? msg.delete(:class_name) : self.class.name
     end
+
+    def raven_capture_error(msg)
+      msg.is_a?(Exception) ? Raven.capture_exception(msg) : Raven.capture_message(msg.to_s)
+    end
   end
 end

data/lib/rabbitek/server/consumer.rb

@@ -21,6 +21,10 @@ module Rabbitek
       channel.ack(delivery_info.delivery_tag, multiple)
     end
 
+    def nack!(delivery_info, multiple = false, requeue = true)
+      channel.nack(delivery_info.delivery_tag, multiple, requeue)
+    end
+
     def logger
       Rabbitek.logger
     end

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

@@ -8,12 +8,29 @@ module Rabbitek
       ##
       # Hook to retry failed jobs
       class Retry < Rabbitek::ServerHook
+        include Loggable
+
         def call(consumer, message)
           super
         rescue StandardError
-          Retryer.call(consumer, message) unless consumer.batch_size
+          retry_message(consumer, message) unless consumer.batch_size
           raise
         end
+
+        private
+
+        def retry_message(consumer, message)
+          Retryer.call(consumer, message)
+        rescue StandardError => e
+          error(
+            message: 'Critical error while retrying. Nacking and requeueing message',
+            consumer: message.delivery_info.routing_key,
+            jid: consumer.jid,
+            error: e.to_s
+          )
+
+          consumer.nack!(message.delivery_info)
+        end
       end
     end
   end

data/lib/rabbitek/utils/open_tracing.rb

@@ -55,7 +55,10 @@ module Rabbitek
         private
 
         def server_references(message_properties)
-          ::OpenTracing::Reference.follows_from(extract(message_properties))
+          ctx = extract(message_properties)
+          return unless ctx
+
+          ::OpenTracing::Reference.follows_from(ctx)
         end
 
         def extract(message_properties)

data/lib/rabbitek/version.rb

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

data/rabbitek.gemspec

@@ -14,9 +14,15 @@ Gem::Specification.new do |spec|
   spec.description   = 'High performance background job processing'
   spec.homepage      = 'http://boostcom.no'
 
+  spec.license = 'MIT'
+
+  spec.metadata['source_code_uri'] = 'https://github.com/Boostcom/rabbitek'
+  spec.metadata['changelog_uri'] = 'https://github.com/Boostcom/rabbitek/blob/master/CHANGELOG.md'
+  spec.metadata['bug_tracker_uri'] = 'https://github.com/Boostcom/rabbitek/issues'
+
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path(__dir__)) do
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
   spec.bindir        = 'exe'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rabbitek
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.5
 platform: ruby
 authors:
 - Boostcom
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-25 00:00:00.000000000 Z
+date: 2020-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -215,8 +215,12 @@ files:
 - lib/rabbitek/version.rb
 - rabbitek.gemspec
 homepage: http://boostcom.no
-licenses: []
-metadata: {}
+licenses:
+- MIT
+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: 
 rdoc_options: []
 require_paths: