shoryuken 7.0.2 → 7.0.4

data/spec/lib/shoryuken/queue_spec.rb

@@ -99,6 +99,43 @@ RSpec.describe Shoryuken::Queue do
 
         subject.delete_messages(entries: entries)
       end
+
+      it 'returns true' do
+        failure = double(id: 'id', code: 'code', message: '...', sender_fault: false)
+        allow(sqs).to receive(:delete_message_batch).and_return(double(failed: [failure]))
+        allow(subject).to receive(:logger).and_return(double('Logger', error: nil))
+
+        expect(subject.delete_messages(entries: entries)).to be true
+      end
+    end
+
+    context 'when several deletes fail' do
+      let(:failures) do
+        [
+          double(id: '1', code: 'c1', message: 'm1', sender_fault: false),
+          double(id: '2', code: 'c2', message: 'm2', sender_fault: true)
+        ]
+      end
+
+      it 'logs every failure, not just the first' do
+        logger = double('Logger')
+        allow(sqs).to receive(:delete_message_batch).and_return(double(failed: failures))
+        allow(subject).to receive(:logger).and_return(logger)
+
+        # Real Logger#error returns true; that truthy return made the old `any?`
+        # short-circuit after the first failure, so the rest went unlogged.
+        expect(logger).to receive(:error).twice.and_return(true)
+
+        subject.delete_messages(entries: entries)
+      end
+    end
+
+    context 'when all deletes succeed' do
+      it 'returns false' do
+        allow(sqs).to receive(:delete_message_batch).and_return(double(failed: []))
+
+        expect(subject.delete_messages(entries: entries)).to be false
+      end
     end
   end
 
@@ -150,6 +187,32 @@ RSpec.describe Shoryuken::Queue do
         subject.send_message(message_body: 'original')
       end
     end
+
+    context 'when FIFO' do
+      before { allow(subject).to receive(:fifo?).and_return(true) }
+
+      it 'auto-generates message_group_id and message_deduplication_id by default' do
+        expect(sqs).to receive(:send_message) do |arg|
+          expect(arg[:message_group_id]).to eq described_class::MESSAGE_GROUP_ID
+          expect(arg[:message_deduplication_id]).to be
+        end
+
+        subject.send_message(message_body: 'msg1')
+      end
+
+      context 'and Shoryuken.fifo_message_deduplication is disabled' do
+        before { Shoryuken.fifo_message_deduplication = false }
+
+        it 'does not auto-generate a message_deduplication_id' do
+          expect(sqs).to receive(:send_message) do |arg|
+            expect(arg[:message_group_id]).to eq described_class::MESSAGE_GROUP_ID
+            expect(arg).not_to have_key(:message_deduplication_id)
+          end
+
+          subject.send_message(message_body: 'msg1')
+        end
+      end
+    end
   end
 
   describe '#send_messages' do
@@ -196,6 +259,26 @@ RSpec.describe Shoryuken::Queue do
 
           subject.send_messages([{ message_body: 'msg1', message_attributes: { attr: 'attr1' } }])
         end
+
+        it 'derives the id from the full body, so bodies differing only in an embedded id are not deduplicated' do
+          # Guards the ActiveJob opt-out path: when the adapter omits its own id
+          # (active_job dedup disabled), this fallback still hashes the full body
+          # - which for ActiveJob includes the per-enqueue job_id - so distinct
+          # enqueues get distinct ids and are NOT silently collapsed by SQS.
+          expect(sqs).to receive(:send_message_batch) do |arg|
+            ids = arg[:entries].map { |e| e[:message_deduplication_id] }
+
+            expect(ids).to all(be)
+            expect(ids.uniq.length).to eq(2)
+          end
+
+          subject.send_messages(
+            [
+              { message_body: JSON.dump('job_id' => 'a', 'arguments' => ['same']) },
+              { message_body: JSON.dump('job_id' => 'b', 'arguments' => ['same']) }
+            ]
+          )
+        end
       end
 
       context 'and message_group_id and message_deduplication_id are present' do
@@ -217,6 +300,33 @@ RSpec.describe Shoryuken::Queue do
           )
         end
       end
+
+      context 'and Shoryuken.fifo_message_deduplication is disabled' do
+        before { Shoryuken.fifo_message_deduplication = false }
+
+        it 'does not auto-generate a message_deduplication_id' do
+          expect(sqs).to receive(:send_message_batch) do |arg|
+            first_entry = arg[:entries].first
+
+            expect(first_entry[:message_group_id]).to eq described_class::MESSAGE_GROUP_ID
+            expect(first_entry).not_to have_key(:message_deduplication_id)
+          end
+
+          subject.send_messages([{ message_body: 'msg1', message_attributes: { attr: 'attr1' } }])
+        end
+
+        it 'still honors an explicit message_deduplication_id' do
+          expect(sqs).to receive(:send_message_batch) do |arg|
+            first_entry = arg[:entries].first
+
+            expect(first_entry[:message_deduplication_id]).to eq 'my id'
+          end
+
+          subject.send_messages(
+            [{ message_body: 'msg1', message_attributes: { attr: 'attr1' }, message_deduplication_id: 'my id' }]
+          )
+        end
+      end
     end
 
     it 'accepts an array of string' do
@@ -228,6 +338,19 @@ RSpec.describe Shoryuken::Queue do
 
       subject.send_messages(%w[msg1 msg2])
     end
+
+    context 'when some sends fail' do
+      it 'logs each failure (so bulk/enqueue_all drops are not silent)' do
+        failure = double(id: '1', code: 'code', message: '...', sender_fault: false)
+        logger = double('Logger')
+        allow(sqs).to receive(:send_message_batch).and_return(double(failed: [failure]))
+        allow(subject).to receive(:logger).and_return(logger)
+
+        expect(logger).to receive(:error)
+
+        subject.send_messages(entries: [{ id: '0', message_body: 'msg1' }])
+      end
+    end
   end
 
   describe '#fifo?' do

data/spec/lib/shoryuken/util_spec.rb

@@ -69,5 +69,31 @@ describe 'Shoryuken::Util' do
       expect(value_holder).to receive(:value=).with([:with_options, { my_option: :some_option }])
       subject.fire_event(:some_event, false, my_option: :some_option)
     end
+
+    it 'fires handlers in reverse order consistently across repeated reverse firings' do
+      order = []
+      Shoryuken.options[:lifecycle_events][:some_event] = [
+        ->(_) { order << :a },
+        ->(_) { order << :b },
+        ->(_) { order << :c }
+      ]
+
+      # e.g. :shutdown is fired with reverse: true and can fire more than once
+      # (stop then stop!); every firing must use the same reversed order.
+      subject.fire_event(:some_event, true)
+      subject.fire_event(:some_event, true)
+
+      expect(order).to eq(%i[c b a c b a])
+    end
+
+    it 'does not mutate the stored handler array when firing in reverse' do
+      handlers = [->(_) {}, ->(_) {}]
+      original = handlers.dup
+      Shoryuken.options[:lifecycle_events][:some_event] = handlers
+
+      subject.fire_event(:some_event, true)
+
+      expect(Shoryuken.options[:lifecycle_events][:some_event]).to eq(original)
+    end
   end
 end

data/spec/lib/shoryuken/worker/default_executor_spec.rb

@@ -101,5 +101,18 @@ RSpec.describe Shoryuken::Worker::DefaultExecutor do
 
       TestWorker.perform_async('delayed message', queue: new_queue)
     end
+
+    it 'does not mutate the caller-supplied options hash' do
+      allow(sqs_queue).to receive(:send_message)
+
+      options = { queue: queue, message_attributes: { 'custom' => { string_value: 'v', data_type: 'String' } } }
+
+      TestWorker.perform_async('message', options)
+
+      # :queue must not be deleted, :message_body must not be injected, and the
+      # nested message_attributes must not gain shoryuken_class - otherwise a
+      # reused options hash would reroute/corrupt later enqueues.
+      expect(options).to eq(queue: queue, message_attributes: { 'custom' => { string_value: 'v', data_type: 'String' } })
+    end
   end
 end

data/spec/lib/shoryuken/worker/inline_executor_spec.rb

@@ -25,6 +25,18 @@ RSpec.describe Shoryuken::Worker::InlineExecutor do
 
       TestWorker.perform_async('test', message_attributes: custom_attributes)
     end
+
+    it 'does not mutate the caller-supplied options hash' do
+      allow_any_instance_of(TestWorker).to receive(:perform)
+
+      options = { queue: 'a_queue', message_attributes: { 'custom' => { string_value: 'v', data_type: 'String' } } }
+
+      TestWorker.perform_async('test', options)
+
+      # :queue and :message_attributes must survive intact so a reused options
+      # hash routes later jobs correctly instead of falling back to the default.
+      expect(options).to eq(queue: 'a_queue', message_attributes: { 'custom' => { string_value: 'v', data_type: 'String' } })
+    end
   end
 
   describe '.perform_in' do

data/spec/shared_examples_for_active_job.rb

@@ -55,6 +55,24 @@ RSpec.shared_examples 'active_job_adapters' do
         subject.enqueue(job)
       end
 
+      context 'when active_job_fifo_message_deduplication is disabled' do
+        before { Shoryuken.active_job_fifo_message_deduplication = false }
+
+        it 'does not set an auto-generated message_deduplication_id' do
+          expect(queue).to receive(:send_message) do |hash|
+            expect(hash).not_to have_key(:message_deduplication_id)
+          end
+          subject.enqueue(job)
+        end
+
+        it 'still honors an explicit message_deduplication_id' do
+          expect(queue).to receive(:send_message) do |hash|
+            expect(hash[:message_deduplication_id]).to eq('explicit-id')
+          end
+          subject.enqueue(job, message_deduplication_id: 'explicit-id')
+        end
+      end
+
       context 'with message_deduplication_id' do
         context 'when message_deduplication_id is specified in options' do
           it 'should enqueue a message with the deduplication_id specified in options' do

data/spec/spec_helper.rb

@@ -1,10 +1,14 @@
 # frozen_string_literal: true
 
-Warning[:performance] = true if RUBY_VERSION >= '3.3'
-Warning[:deprecated] = true
+require 'warning'
+
 $VERBOSE = true
 
-require 'warning'
+if Warning.respond_to?(:categories)
+  (Warning.categories - %i[experimental]).each do |cat|
+    Warning[cat] = true
+  end
+end
 
 Warning.process do |warning|
   # Only check warnings from our code (not dependencies)
@@ -13,10 +17,6 @@ Warning.process do |warning|
   # Filter out warnings we don't care about in specs
   next if warning.include?('_spec')
 
-  # We redefine methods to simulate various scenarios in tests
-  next if warning.include?('previous definition of')
-  next if warning.include?('method redefined')
-
   # Ignore vendor and bundle directories
   next if warning.include?('vendor/')
   next if warning.include?('bundle/')
@@ -43,23 +43,23 @@ Dotenv.load
 unless ENV['SIMPLECOV_DISABLED']
   require 'simplecov'
   SimpleCov.start do
-  add_filter '/spec/'
-  add_filter '/test_workers/'
-  add_filter '/examples/'
-  add_filter '/vendor/'
-  add_filter '/.bundle/'
-
-  add_group 'Library', 'lib/'
-  add_group 'ActiveJob', 'lib/active_job'
-  add_group 'Middleware', 'lib/shoryuken/middleware'
-  add_group 'Polling', 'lib/shoryuken/polling'
-  add_group 'Workers', 'lib/shoryuken/worker'
-  add_group 'Helpers', 'lib/shoryuken/helpers'
+  skip '/spec/'
+  skip '/test_workers/'
+  skip '/examples/'
+  skip '/vendor/'
+  skip '/.bundle/'
+
+  group 'Library', 'lib/'
+  group 'ActiveJob', 'lib/active_job'
+  group 'Middleware', 'lib/shoryuken/middleware'
+  group 'Polling', 'lib/shoryuken/polling'
+  group 'Workers', 'lib/shoryuken/worker'
+  group 'Helpers', 'lib/shoryuken/helpers'
 
   enable_coverage :branch
 
   minimum_coverage 89
-  minimum_coverage_by_file 60
+  coverage(:line) { minimum 60, per: :file }
   end
 end
 
@@ -77,6 +77,24 @@ class TestWorker
   def perform(sqs_msg, body); end
 end
 
+# Emit a full Ruby thread dump when the process receives USR1.  The CI
+# watchdog (specs.yml) sends this signal when unit specs run longer than
+# expected so we can see exactly which thread is stuck without waiting for the
+# job-level timeout to kill the process silently.
+if Signal.list.key?('USR1')
+  Signal.trap('USR1') do
+    # Signal handlers run in a restricted context; use a plain IO write
+    # rather than puts/logger to stay async-signal safe.
+    output = +"\n=== Thread dump (USR1 watchdog) ===\n"
+    Thread.list.each do |t|
+      output << "--- Thread #{t.object_id} [#{t.status}] ---\n"
+      output << ((t.backtrace || ['(no backtrace)']).join("\n")) << "\n"
+    end
+    output << "=== End thread dump ===\n"
+    $stderr.write(output)
+  end
+end
+
 RSpec.configure do |config|
   config.before do
     Shoryuken::Client.class_variable_set :@@queues, {}
@@ -98,6 +116,8 @@ RSpec.configure do |config|
     TestWorker.get_shoryuken_options['queue'] = 'default'
 
     Shoryuken.active_job_queue_name_prefixing = false
+    Shoryuken.active_job_fifo_message_deduplication = true
+    Shoryuken.fifo_message_deduplication = true
 
     Shoryuken.worker_registry.clear
     Shoryuken.register_worker('default', TestWorker)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shoryuken
 version: !ruby/object:Gem::Version
-  version: 7.0.2
+  version: 7.0.4
 platform: ruby
 authors:
 - Pablo Cantero
@@ -223,13 +223,16 @@ files:
 - spec/integration/active_job/bulk_enqueue/bulk_enqueue_spec.rb
 - spec/integration/active_job/current_attributes/bulk_enqueue_spec.rb
 - spec/integration/active_job/current_attributes/complex_types_spec.rb
+- spec/integration/active_job/current_attributes/cross_job_reset_spec.rb
 - spec/integration/active_job/current_attributes/empty_context_spec.rb
 - spec/integration/active_job/current_attributes/full_context_spec.rb
+- spec/integration/active_job/current_attributes/incremental_persist_spec.rb
 - spec/integration/active_job/current_attributes/partial_context_spec.rb
 - spec/integration/active_job/custom_attributes/number_attributes_spec.rb
 - spec/integration/active_job/custom_attributes/string_attributes_spec.rb
 - spec/integration/active_job/error_handling/job_wrapper_spec.rb
 - spec/integration/active_job/fifo_and_attributes/deduplication_spec.rb
+- spec/integration/active_job/fifo_dedup_opt_out/fifo_dedup_opt_out_spec.rb
 - spec/integration/active_job/keyword_arguments/keyword_arguments_spec.rb
 - spec/integration/active_job/retry/discard_on_spec.rb
 - spec/integration/active_job/retry/retry_on_spec.rb
@@ -238,26 +241,36 @@ files:
 - spec/integration/active_record_middleware/active_record_middleware_spec.rb
 - spec/integration/auto_delete/auto_delete_spec.rb
 - spec/integration/auto_extend_visibility/auto_extend_visibility_spec.rb
+- spec/integration/auto_extend_visibility/short_visibility_timeout_spec.rb
 - spec/integration/aws_config/aws_config_spec.rb
 - spec/integration/batch_processing/batch_processing_spec.rb
 - spec/integration/body_parser/json_parser_spec.rb
 - spec/integration/body_parser/proc_parser_spec.rb
 - spec/integration/body_parser/text_parser_spec.rb
+- spec/integration/cli/find_all_spec.rb
 - spec/integration/concurrent_processing/concurrent_processing_spec.rb
+- spec/integration/concurrent_processing/processor_accounting_spec.rb
 - spec/integration/custom_group_polling_strategy/custom_group_polling_strategy_spec.rb
 - spec/integration/dead_letter_queue/dead_letter_queue_spec.rb
 - spec/integration/exception_handlers/exception_handlers_spec.rb
 - spec/integration/exponential_backoff/exponential_backoff_spec.rb
+- spec/integration/fifo_ordering/fifo_max_messages_cap_spec.rb
 - spec/integration/fifo_ordering/fifo_ordering_spec.rb
 - spec/integration/large_payloads/large_payloads_spec.rb
+- spec/integration/launcher/double_graceful_stop_spec.rb
+- spec/integration/launcher/embedded_dispatch_error_spec.rb
+- spec/integration/launcher/global_executor_preserved_spec.rb
+- spec/integration/launcher/graceful_stop_timeout_spec.rb
 - spec/integration/launcher/launcher_spec.rb
 - spec/integration/message_attributes/message_attributes_spec.rb
 - spec/integration/message_operations/message_operations_spec.rb
+- spec/integration/message_operations/partial_batch_delete_spec.rb
 - spec/integration/middleware_chain/empty_chain_spec.rb
 - spec/integration/middleware_chain/execution_order_spec.rb
 - spec/integration/middleware_chain/removal_spec.rb
 - spec/integration/middleware_chain/short_circuit_spec.rb
 - spec/integration/non_retryable_exception/non_retryable_exception_spec.rb
+- spec/integration/non_retryable_exception/with_retry_intervals_spec.rb
 - spec/integration/polling_strategies/polling_strategies_spec.rb
 - spec/integration/queue_operations/queue_operations_spec.rb
 - spec/integration/rails/rails_72/Gemfile
@@ -329,7 +342,13 @@ files:
 homepage: https://github.com/ruby-shoryuken/shoryuken
 licenses:
 - LGPL-3.0
-metadata: {}
+metadata:
+  homepage_uri: https://github.com/ruby-shoryuken/shoryuken
+  source_code_uri: https://github.com/ruby-shoryuken/shoryuken
+  changelog_uri: https://github.com/ruby-shoryuken/shoryuken/blob/main/CHANGELOG.md
+  bug_tracker_uri: https://github.com/ruby-shoryuken/shoryuken/issues
+  documentation_uri: https://github.com/ruby-shoryuken/shoryuken
+  rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
 - lib
@@ -344,7 +363,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.6
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Shoryuken is a super efficient AWS SQS thread based message processor
 test_files:
@@ -353,13 +372,16 @@ test_files:
 - spec/integration/active_job/bulk_enqueue/bulk_enqueue_spec.rb
 - spec/integration/active_job/current_attributes/bulk_enqueue_spec.rb
 - spec/integration/active_job/current_attributes/complex_types_spec.rb
+- spec/integration/active_job/current_attributes/cross_job_reset_spec.rb
 - spec/integration/active_job/current_attributes/empty_context_spec.rb
 - spec/integration/active_job/current_attributes/full_context_spec.rb
+- spec/integration/active_job/current_attributes/incremental_persist_spec.rb
 - spec/integration/active_job/current_attributes/partial_context_spec.rb
 - spec/integration/active_job/custom_attributes/number_attributes_spec.rb
 - spec/integration/active_job/custom_attributes/string_attributes_spec.rb
 - spec/integration/active_job/error_handling/job_wrapper_spec.rb
 - spec/integration/active_job/fifo_and_attributes/deduplication_spec.rb
+- spec/integration/active_job/fifo_dedup_opt_out/fifo_dedup_opt_out_spec.rb
 - spec/integration/active_job/keyword_arguments/keyword_arguments_spec.rb
 - spec/integration/active_job/retry/discard_on_spec.rb
 - spec/integration/active_job/retry/retry_on_spec.rb
@@ -368,26 +390,36 @@ test_files:
 - spec/integration/active_record_middleware/active_record_middleware_spec.rb
 - spec/integration/auto_delete/auto_delete_spec.rb
 - spec/integration/auto_extend_visibility/auto_extend_visibility_spec.rb
+- spec/integration/auto_extend_visibility/short_visibility_timeout_spec.rb
 - spec/integration/aws_config/aws_config_spec.rb
 - spec/integration/batch_processing/batch_processing_spec.rb
 - spec/integration/body_parser/json_parser_spec.rb
 - spec/integration/body_parser/proc_parser_spec.rb
 - spec/integration/body_parser/text_parser_spec.rb
+- spec/integration/cli/find_all_spec.rb
 - spec/integration/concurrent_processing/concurrent_processing_spec.rb
+- spec/integration/concurrent_processing/processor_accounting_spec.rb
 - spec/integration/custom_group_polling_strategy/custom_group_polling_strategy_spec.rb
 - spec/integration/dead_letter_queue/dead_letter_queue_spec.rb
 - spec/integration/exception_handlers/exception_handlers_spec.rb
 - spec/integration/exponential_backoff/exponential_backoff_spec.rb
+- spec/integration/fifo_ordering/fifo_max_messages_cap_spec.rb
 - spec/integration/fifo_ordering/fifo_ordering_spec.rb
 - spec/integration/large_payloads/large_payloads_spec.rb
+- spec/integration/launcher/double_graceful_stop_spec.rb
+- spec/integration/launcher/embedded_dispatch_error_spec.rb
+- spec/integration/launcher/global_executor_preserved_spec.rb
+- spec/integration/launcher/graceful_stop_timeout_spec.rb
 - spec/integration/launcher/launcher_spec.rb
 - spec/integration/message_attributes/message_attributes_spec.rb
 - spec/integration/message_operations/message_operations_spec.rb
+- spec/integration/message_operations/partial_batch_delete_spec.rb
 - spec/integration/middleware_chain/empty_chain_spec.rb
 - spec/integration/middleware_chain/execution_order_spec.rb
 - spec/integration/middleware_chain/removal_spec.rb
 - spec/integration/middleware_chain/short_circuit_spec.rb
 - spec/integration/non_retryable_exception/non_retryable_exception_spec.rb
+- spec/integration/non_retryable_exception/with_retry_intervals_spec.rb
 - spec/integration/polling_strategies/polling_strategies_spec.rb
 - spec/integration/queue_operations/queue_operations_spec.rb
 - spec/integration/rails/rails_72/Gemfile