shoryuken 3.3.1 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52e12e226493b5e6bd3b03fe20e72704be91e0a3
-  data.tar.gz: 01307631f8faa8eaec721440afd52ce5fabde0b5
+  metadata.gz: ca967b0796d5e97753b9d201edd7aaad2e1d5c44
+  data.tar.gz: 4984a4ee2243ba5d8b42bec2e0c0b68e15b92c9f
 SHA512:
-  metadata.gz: f9d451c4a642436008d1cdf60edd78d8e251fa56cc8ddc455792a85a997eb2acc601ff8a7743f3bfb5cfeadac5c8a9059490df63b5a2ec1dae3174eb4f868fd5
-  data.tar.gz: 9da2205a92ff6f92ce6befc0c61de49aa174529d5b704329341dd47e4aaa0a48288678d729c6b3f32695a46560136c5cfc230e7204316d6b9c759972a7a14d36
+  metadata.gz: 8143c4a34706093177109f9d822afc711c8c88cd51c2a64653e15b8054794327e59951fccbc5990992b7d568db3cd79a1e23a1a7ec33d7a7c29837e10534f187
+  data.tar.gz: 5925db2ddbd791708c59b05a59805ca711bb82c9ef059db849568f8de9fec1619d7b52eab26cced9bb7b7e713ffd11227292c4294bbf642a49e60c35096fcb5d

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## [v4.0.0] - 2018-11-01
+
+- Process messages to the same message group ID one by one
+  - [#530](https://github.com/phstc/shoryuken/pull/530)
+
 ## [v3.3.1] - 2018-10-30
 
 - Memoization of boolean causes extra calls to SQS

data/lib/shoryuken/fetcher.rb

@@ -47,13 +47,24 @@ module Shoryuken
     def receive_messages(queue, limit)
       options = receive_options(queue)
 
-      options[:max_number_of_messages]  = max_number_of_messages(limit, options)
+      shoryuken_queue = Shoryuken::Client.queues(queue.name)
+
+      # For FIFO queues we want to make sure we process one message per group at the time
+      # if we set max_number_of_messages greater than 1,
+      # SQS may return more than one message for the same message group
+      # since Shoryuken uses threads, it will try to process more than one at once
+      # > The message group ID is the tag that specifies that a message belongs to a specific message group.
+      # > Messages that belong to the same message group are always processed one by one,
+      # > in a strict order relative to the message group
+      # > (however, messages that belong to different message groups might be processed out of order).
+      # > https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/using-messagegroupid-property.html
+      options[:max_number_of_messages]  = shoryuken_queue.fifo? ? 1 : max_number_of_messages(limit, options)
       options[:message_attribute_names] = %w[All]
       options[:attribute_names]         = %w[All]
 
       options.merge!(queue.options)
 
-      Shoryuken::Client.queues(queue.name).receive_messages(options)
+      shoryuken_queue.receive_messages(options)
     end
 
     def max_number_of_messages(limit, options)

data/lib/shoryuken/version.rb

@@ -1,3 +1,3 @@
 module Shoryuken
-  VERSION = '3.3.1'.freeze
+  VERSION = '4.0.0'.freeze
 end

data/spec/shoryuken/fetcher_spec.rb

@@ -4,7 +4,7 @@ require 'shoryuken/fetcher'
 
 # rubocop:disable Metrics/BlockLength
 RSpec.describe Shoryuken::Fetcher do
-  let(:queue)        { instance_double('Shoryuken::Queue') }
+  let(:queue)        { instance_double('Shoryuken::Queue', fifo?: false) }
   let(:queue_name)   { 'default' }
   let(:queue_config) { Shoryuken::Polling::QueueConfiguration.new(queue_name, {}) }
   let(:group)        { 'default' }
@@ -100,5 +100,21 @@ RSpec.describe Shoryuken::Fetcher do
         subject.fetch(queue_config, limit)
       end
     end
+
+    context 'when FIFO' do
+      let(:limit) { 10 }
+      let(:queue) { instance_double('Shoryuken::Queue', fifo?: true) }
+
+      it 'polls one message at the time' do
+        # see https://github.com/phstc/shoryuken/pull/530
+
+        allow(Shoryuken::Client).to receive(:queues).with(queue_name).and_return(queue)
+        expect(queue).to receive(:receive_messages).with(
+          max_number_of_messages: 1, attribute_names: ['All'], message_attribute_names: ['All']
+        ).and_return([])
+
+        subject.fetch(queue_config, limit)
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shoryuken
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 4.0.0
 platform: ruby
 authors:
 - Pablo Cantero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-30 00:00:00.000000000 Z
+date: 2018-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler