deimos-ruby 2.6.0 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3399390b0e3dc85c67c95c4d633d3ce65efb80258848e73c6b0fa5d9244db13e
-  data.tar.gz: d236d19cd353f581121dbf561cba34ff78a192bd636ac992fcb1ad87b5913375
+  metadata.gz: 132519f800025ce3300467213dfaa1136cbbb1ffe9c17074a09c84fd5292c151
+  data.tar.gz: cee617e162f21cee7e7d62c0c31a9b37451273a42be8d4007e94fb998b94ddb2
 SHA512:
-  metadata.gz: 502f900a5d5220c55d13bbc50ab329c826d3da953b14adfbaaaf1668e229d2ede46268729ed3c7bc631045feb6927fe85126a6b990f28b4f00630efdb0bb5501
-  data.tar.gz: 44d082485bfb68be5b2c49f228ab29626eb5c7b80b98873284a7844fba55c881ac805d0ce9db2c9d2f44f8b68eb781f541a5d1d0099b94f2f7ee236a29197093
+  metadata.gz: 865fd30cd8674ab0b311664f1ce0692c043f46fd742e2d52cc5c72f62d91e9ccd908bed6c97a27eb0d81702f7c1b866ccd225ebde2f78ea2d73e8ec50f22fbad
+  data.tar.gz: 68c968a36f4eb6688d5877eb6514e4a8abe981336f2847b246aded7aeb3521ce2d92583bac1366b36865d7eb8e95f8c9133d79395f5e68f5ce56947788f47d65

data/CHANGELOG.md

@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Unreleased
+
+## 2.6.1 - 2026-09-03
+
+- Fix: `KafkaTopicInfo.lock` only attempts the `INSERT` when the topic row is missing, instead of relying on a unique-index failure. On MySQL a failed insert still consumes an auto-increment value, so the old behaviour burned an ID on every lock attempt and could exhaust the ID space.
+- Fix: `KafkaSource#import_without_validations_or_callbacks` accepts a variable number of arguments, so it works with both `activerecord-import` 2.3+ (which prepends a `conn` argument) and earlier versions. Previously an app on 2.3+ raised `ArgumentError: wrong number of arguments` on any import with `kafka_config[:import]` enabled.
+
 ## 2.6.0 - 2026-08-13
 
 - Breaking: a failed batch database write is now retried one record at a time, so one unpersistable record no longer loses the whole batch. `Deimos::BatchFallbackError` is raised naming the keys that still failed.

data/lib/deimos/kafka_source.rb

@@ -88,10 +88,13 @@ end
       # Basically we want to first do the import, then reload the records
       # and send them to Kafka.
       # @!visibility private
-      def import_without_validations_or_callbacks(column_names,
-                                                  array_of_attributes,
-                                                  options={})
+      #
+      # activerecord-import 2.3+ prepends a `conn` arg to this method - accept a splat and
+      # grab the last 3 args (column_names, array_of_attributes, options) either way.
+      def import_without_validations_or_callbacks(*args)
         results = super
+        column_names, array_of_attributes, options = args.last(3)
+        options ||= {}
         if !self.kafka_config[:import] || array_of_attributes.empty?
           return results
         end

data/lib/deimos/kafka_topic_info.rb

@@ -16,11 +16,15 @@ module Deimos
       # @param lock_id [String]
       # @return [Boolean]
       def lock(topic, lock_id) # rubocop:disable Naming/PredicateMethod
-        # Try to create it - it's fine if it already exists
-        begin
-          self.create!(topic: topic, last_processed_at: Time.zone.now)
-        rescue ActiveRecord::RecordNotUnique
-          # continue on
+        # Only attempt the insert if the row is missing. On MySQL a failed
+        # insert still consumes an auto-increment value, so retrying it on
+        # every lock attempt would eventually exhaust the ID space.
+        unless self.exists?(topic: topic)
+          begin
+            self.create!(topic: topic, last_processed_at: Time.zone.now)
+          rescue ActiveRecord::RecordNotUnique
+            # another process created it in the meantime - continue on
+          end
         end
 
         # Lock the record

data/lib/deimos/message.rb

@@ -12,11 +12,11 @@ module Deimos
     # @return [Integer]
     attr_accessor :partition_key
     # @return [String]
-    attr_accessor  :encoded_key
+    attr_accessor :encoded_key
     # @return [String]
-    attr_accessor  :encoded_payload
+    attr_accessor :encoded_payload
     # @return [String]
-    attr_accessor  :topic
+    attr_accessor :topic
 
     # @param payload [Hash]
     # @param topic [String]

data/lib/deimos/version.rb

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

data/spec/active_record_batch_consumer_association_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# rubocop:disable Lint/ConstantDefinitionInBlock
+# rubocop:disable-next Lint/ConstantDefinitionInBlock
 module ActiveRecordBatchConsumerTest # rubocop:disable Metrics/ModuleLength
   describe Deimos::ActiveRecordConsumer,
            'Batch Consumer with MySQL handling associations',
@@ -321,4 +321,3 @@ module ActiveRecordBatchConsumerTest # rubocop:disable Metrics/ModuleLength
     end
            end
 end
-# rubocop:enable Lint/ConstantDefinitionInBlock

data/spec/active_record_consume/mass_updater_spec.rb

@@ -223,7 +223,7 @@ RSpec.describe Deimos::ActiveRecordConsume::MassUpdater do
           WidgetFidget.reset_column_information
         end
 
-        # rubocop:disable RSpec/ExampleLength
+        # rubocop:disable-next RSpec/ExampleLength
         it 'should backfill the associations when upserting primary records' do
           batch = Deimos::ActiveRecordConsume::BatchRecordList.new(
             [
@@ -275,7 +275,6 @@ RSpec.describe Deimos::ActiveRecordConsume::MassUpdater do
             expect(widget_fidget.note).to eq("Stuff #{ind + 1}")
           end
         end
-        # rubocop:enable RSpec/ExampleLength
 
       end
 

data/spec/active_record_consumer_spec.rb

@@ -3,7 +3,7 @@
 require 'date'
 
 # Wrapped in a module to prevent class leakage
-# rubocop:disable Metrics/ModuleLength
+# rubocop:disable-next Metrics/ModuleLength
 module ActiveRecordConsumerTest
   describe Deimos::ActiveRecordConsumer, 'Message Consumer' do
     before(:all) do
@@ -299,4 +299,3 @@ module ActiveRecordConsumerTest
     end
   end
 end
-# rubocop:enable Metrics/ModuleLength

data/spec/kafka_source_spec.rb

@@ -5,7 +5,7 @@ require 'activerecord-import'
 # Wrap in a module so our classes don't leak out afterwards
 module KafkaSourceSpec
   RSpec.describe Deimos::KafkaSource do
-    # rubocop:disable Lint/ConstantDefinitionInBlock
+    # rubocop:disable-next Lint/ConstantDefinitionInBlock
     before(:all) do
       ActiveRecord::Base.connection.create_table(:widgets, force: true) do |t|
         t.integer(:widget_id)
@@ -42,7 +42,6 @@ module KafkaSourceSpec
       end
       Widget.reset_column_information
     end
-    # rubocop:enable Lint/ConstantDefinitionInBlock
 
     after(:all) do
       ActiveRecord::Base.connection.drop_table(:widgets)

data/spec/kafka_topic_info_spec.rb

@@ -11,6 +11,12 @@ each_db_config(Deimos::KafkaTopicInfo) do
     expect(described_class.last.locked_by).to eq('def')
   end
 
+  it 'should not attempt to create the record if it already exists' do
+    described_class.create!(topic: 'my-topic', last_processed_at: Time.zone.now)
+    expect(described_class).not_to receive(:create!)
+    expect(described_class.lock('my-topic', 'abc')).to be_truthy
+  end
+
   it 'should raise an error if the create fails for a non-unique reason' do
     allow(described_class).to receive(:create!).and_raise(ActiveRecord::ActiveRecordError, 'some other error')
     expect { described_class.lock('my-topic', 'abc') }.to raise_error(ActiveRecord::ActiveRecordError)

data/spec/karafka_config/karafka_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# rubocop:disable Style/GlobalVars
+# rubocop:disable-next Style/GlobalVars
 RSpec.describe Karafka::Routing::Topic do
   before(:each) do
     KarafkaApp.routes.clear
@@ -150,4 +150,3 @@ RSpec.describe Karafka::Routing::Topic do
   end
 
 end
-# rubocop:enable Style/GlobalVars

data/spec/utils/outbox_producer_spec.rb

@@ -137,7 +137,7 @@ each_db_config(Deimos::Utils::OutboxProducer) do
     end
 
     # using expect(x).to have_received(:y).ordered doesn't work
-    # rubocop:disable RSpec/StubbedMock
+    # rubocop:disable-next RSpec/StubbedMock
     it 'should complete successfully' do # rubocop:disable RSpec/ExampleLength
       messages = (1..4).map do |i|
         Deimos::KafkaMessage.new(
@@ -203,7 +203,6 @@ each_db_config(Deimos::Utils::OutboxProducer) do
         with('my-topic', 'abc').once
       producer.process_topic('my-topic')
     end
-    # rubocop:enable RSpec/StubbedMock
 
     it 'should register an error if it gets an error' do
       allow(producer).to receive(:retrieve_messages).and_raise('OH NOES')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deimos-ruby
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.6.1
 platform: ruby
 authors:
 - Daniel Orner