deimos-ruby 2.5.3 → 2.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 634ebcbb254c467794eae6a3971200e2647472769eb59b6e8e89ed9453c3b203
-  data.tar.gz: a72e4063b395f3a5388bc2988b3780e8fb9a8aa9052152f7c08b1f3469fc63f3
+  metadata.gz: cd09242a06bc94c004fb1fbeff2f6462e3b94d9aefce48894a1378eafdad1aa6
+  data.tar.gz: 1d9c45e6048b08216fc9ef6c424c204c02d14d661e33a516da7c248cc8667e6a
 SHA512:
-  metadata.gz: 1205344ccc7c9f97b5b0496e950d5a5e385654c0e1192ba8d6e1fa6f6c01fdd2a84c88f1980c587f2623717ca5eafd6562fc3fb713f3cd04b0d54d3382645385
-  data.tar.gz: 15589b978f07ce93acfda561f8e8cb75f6a9ad1be25efd77942b5c04b9404237112c9668a1b6f295c94983848fcb18916b0c32a134daa208b8d7343ef845ee5b
+  metadata.gz: 34bed6ee88463b0345bb3d361bc489d57fdc1acbe472937b49e8ef6ae552e4cf9b9ca390606f180aeeebfb5864646dd45dd4fe3b1a6e35fa752d9d3fa65ee6c3
+  data.tar.gz: cd7df7022342e21b40c1d68b6696f0026bbaff946e34b04de7cc4ca46fc82930c0fa19316150196ddf5bf19bf1f908116ffedc380e332a5c9352d954e063bf69

data/CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## 2.5.4 - 2026-07-15
+
+- Fix: `DeadlockRetry.wrap` coerces its `tags` argument with `Array(...)`, so a scalar topic String (passed by `MassUpdater`/batch consumption) no longer raises `NoMethodError` on `String#to_a` inside the rescue, which had defeated the deadlock retry on the first deadlock.
+
 ## 2.5.3 - 2026-04-28
 
 - Fix: `setup_karafka` applies the merged kafka config to `Karafka.producer`, so kafka overrides set in later `Karafka::App.setup` calls take effect on `Karafka.producer` callers (Karafka::Web, DLQ, ActiveJob).

data/lib/deimos/utils/deadlock_retry.rb

@@ -28,10 +28,15 @@ module Deimos
         # be wrapped in a transaction.
         # Sleeps for a random number of seconds to prevent multiple transactions
         # from retrying at the same time.
-        # @param tags [Array] Tags to attach when logging and reporting metrics.
+        # @param tags [Array, String, nil] Tags to attach when logging and reporting metrics.
+        #   A scalar (e.g. a topic String) is coerced to a single-element array.
         # @yield Yields to the block that may deadlock.
         # @return [void]
         def wrap(tags=[])
+          # Normalize to an Array so downstream logging/metrics (and dogstatsd's
+          # `tags.to_a`) never receive a bare String, which would raise
+          # NoMethodError inside this rescue and defeat the retry mechanism.
+          tags = Array(tags)
           count = RETRY_COUNT
 
           begin

data/lib/deimos/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Deimos
-  VERSION = '2.5.3'
+  VERSION = '2.5.4'
 end

data/spec/consumer_spec.rb

@@ -62,7 +62,7 @@ module ConsumerTest
                                  'some_int' => 123 }) do |payload, _metadata|
                                    expect(payload['test_id']).to eq('foo')
                                    expect(payload['some_int']).to eq(123)
-                                 end
+            end
           end
 
           it 'should consume a nil message' do
@@ -77,7 +77,7 @@ module ConsumerTest
                                  'some_int' => 123 }) do |payload, _metadata|
                                    expect(payload['test_id']).to eq('foo')
                                    expect(payload['some_int']).to eq(123)
-                                 end
+            end
           end
 
           it 'should fail on invalid message' do
@@ -196,7 +196,7 @@ module ConsumerTest
             expect(payload['test_id']).to eq('foo')
             expect(payload['some_int']).to eq(1)
             expect(payload['super_int']).to eq(9000)
-                                 end
+          end
         end
 
       end
@@ -255,7 +255,7 @@ module ConsumerTest
             expect(payload['some_nested_record']['some_int']).to eq(1)
             expect(payload.to_h).not_to have_key('additional_field')
             expect(payload.to_h['some_nested_record']).not_to have_key('additional_field')
-                                 end
+          end
 
         end
       end

data/spec/utils/deadlock_retry_spec.rb

@@ -55,6 +55,26 @@ RSpec.describe Deimos::Utils::DeadlockRetry do
       expect(Widget.all).to contain_exactly(have_attributes(test_id: 'first'), have_attributes(test_id: 'second'))
     end
 
+    it 'should coerce a scalar tag to an array when reporting metrics' do
+      # Regression: mass_updater passes get_tag('topic') (a String) as tags.
+      # dogstatsd calls tags.to_a, which raises NoMethodError on a String and
+      # would defeat the retry mechanism on the first deadlock.
+      metrics = instance_double(Deimos::Metrics::Provider)
+      allow(Deimos.config).to receive(:metrics).and_return(metrics)
+      expect(metrics).to receive(:increment).with('deadlock', tags: ['Flyers.FlyerItem']).twice
+
+      expect(Widget).
+        to receive(:create).
+        and_raise(ActiveRecord::Deadlocked.new('Lock wait timeout exceeded')).
+        exactly(3).times
+
+      expect {
+        described_class.wrap('Flyers.FlyerItem') do
+          Widget.create(test_id: 'abc')
+        end
+      }.to raise_error(ActiveRecord::Deadlocked)
+    end
+
     it 'should not retry non-deadlock exceptions' do
       expect(Widget).
         to receive(:create).

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deimos-ruby
 version: !ruby/object:Gem::Version
-  version: 2.5.3
+  version: 2.5.4
 platform: ruby
 authors:
 - Daniel Orner
@@ -711,7 +711,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.6
+rubygems_version: 4.0.16
 specification_version: 4
 summary: Kafka libraries for Ruby.
 test_files: []