deimos-ruby 2.6.0.pre.beta1 → 2.6.0

data/spec/spec_helper.rb

@@ -223,13 +223,13 @@ RSpec.configure do |config|
     set_karafka_config(:reraise_errors, true)
     Deimos.configure do |deimos_config|
       deimos_config.producers.backend = :kafka
-      deimos_config.avrogen.nest_child_schemas = true
+      deimos_config.schema.nest_child_schemas = true
       deimos_config.schema.path = File.join(File.expand_path(__dir__), 'schemas')
       deimos_config.schema.registry_url = ENV['SCHEMA_REGISTRY'] || 'http://localhost:8081'
       deimos_config.logger = Logger.new(File::NULL)
       deimos_config.logger.level = Logger::INFO
       deimos_config.schema.backend = :avro_validation
-      deimos_config.avrogen.generated_class_path = 'spec/schemas'
+      deimos_config.schema.generated_class_path = 'spec/schemas'
     end
   end
 

data/spec/utils/db_poller_spec.rb

@@ -316,7 +316,7 @@ each_db_config(Deimos::Utils::DbPoller::Base) do
             m.call(*args)
             expect(info.reload.last_sent.in_time_zone).to eq(time_value(mins: -61, secs: 32))
             expect(info.last_sent_id).to eq(widgets[1].id)
-        end
+          end
         expect(poller).to receive(:process_and_touch_info).ordered.
           with([widgets[2], widgets[3], widgets[4]], anything).and_call_original
         expect(poller).to receive(:process_and_touch_info).ordered.

data/spec/utils/deadlock_retry_spec.rb

@@ -7,6 +7,43 @@ RSpec.describe Deimos::Utils::DeadlockRetry do
     allow(described_class).to receive(:sleep)
   end
 
+  # `deadlock?` matches against the exception message, so the examples below are literal
+  # fragments as each engine emits them, padded with surrounding text to pin substring rather
+  # than equality matching. No database is exercised here - these are hand-built exceptions, so
+  # they verify the predicate agrees with DEADLOCK_MESSAGES, not that any engine really produces
+  # those strings. See the `each_db_config` specs for tests that run against real engines.
+  describe '.deadlock?' do
+    it 'should match MySQL deadlocks and lock wait timeouts' do
+      expect(described_class).to be_deadlock(
+        ActiveRecord::Deadlocked.new('Mysql2::Error: Deadlock found when trying to get lock')
+      )
+      expect(described_class).to be_deadlock(
+        ActiveRecord::StatementInvalid.new('Lock wait timeout exceeded; try restarting')
+      )
+    end
+
+    it 'should match Postgres deadlock detection' do
+      expect(described_class).to be_deadlock(
+        ActiveRecord::Deadlocked.new('PG::TRDeadlockDetected: ERROR: deadlock detected')
+      )
+    end
+
+    it 'should not match a database error whose message is not a known deadlock' do
+      expect(described_class).not_to be_deadlock(ActiveRecord::StatementInvalid.new('Oops!!'))
+    end
+
+    it 'should not match a non-database error that happens to mention a deadlock' do
+      expect(described_class).not_to be_deadlock(StandardError.new('deadlock detected'))
+    end
+
+    it 'should not match validation failures' do
+      # Batch consumption depends on this: if a RecordInvalid looked like a deadlock, the guard
+      # in `save_record_list` would reraise it and the individual fallback would never fire for
+      # the poison-record case it exists to handle.
+      expect(described_class).not_to be_deadlock(ActiveRecord::RecordInvalid.new)
+    end
+  end
+
   describe 'deadlock handling' do
     let(:batch) { [{ key: 1, payload: { test_id: 'abc', some_int: 3 } }] }
 
@@ -55,6 +92,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.6.0.pre.beta1
+  version: 2.6.0
 platform: ruby
 authors:
 - Daniel Orner
@@ -9,20 +9,6 @@ bindir: bin
 cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: avro-gen-ruby
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: benchmark
   requirement: !ruby/object:Gem::Requirement
@@ -550,7 +536,9 @@ files:
 - lib/deimos/schema_backends/proto_base.rb
 - lib/deimos/schema_backends/proto_local.rb
 - lib/deimos/schema_backends/proto_schema_registry.rb
-- lib/deimos/schema_class.rb
+- lib/deimos/schema_class/base.rb
+- lib/deimos/schema_class/enum.rb
+- lib/deimos/schema_class/record.rb
 - lib/deimos/shared_config.rb
 - lib/deimos/test_helpers.rb
 - lib/deimos/tracing/datadog.rb
@@ -576,6 +564,10 @@ files:
 - lib/generators/deimos/outbox_backend/templates/migration
 - lib/generators/deimos/outbox_backend/templates/rails3_migration
 - lib/generators/deimos/outbox_backend_generator.rb
+- lib/generators/deimos/schema_class/templates/schema_class.rb.tt
+- lib/generators/deimos/schema_class/templates/schema_enum.rb.tt
+- lib/generators/deimos/schema_class/templates/schema_record.rb.tt
+- lib/generators/deimos/schema_class_generator.rb
 - lib/generators/deimos/v2/templates/karafka.rb.tt
 - lib/generators/deimos/v2_generator.rb
 - lib/tasks/deimos.rake
@@ -603,6 +595,10 @@ files:
 - spec/gen/sample/v1/sample_key_pb.rb
 - spec/gen/sample/v1/sample_pb.rb
 - spec/generators/active_record_generator_spec.rb
+- spec/generators/schema_class/my_schema_spec.rb
+- spec/generators/schema_class/my_schema_with_circular_reference_spec.rb
+- spec/generators/schema_class/my_schema_with_complex_types_spec.rb
+- spec/generators/schema_class_generator_spec.rb
 - spec/handlers/my_batch_consumer.rb
 - spec/handlers/my_consumer.rb
 - spec/kafka_source_spec.rb
@@ -622,7 +618,6 @@ files:
 - spec/schema_backends/avro_validation_spec.rb
 - spec/schema_backends/base_spec.rb
 - spec/schema_backends/proto_schema_registry_spec.rb
-- spec/schema_class_spec.rb
 - spec/schemas/com/my-namespace/Generated.avsc
 - spec/schemas/com/my-namespace/MyNestedSchema.avsc
 - spec/schemas/com/my-namespace/MySchema.avsc
@@ -674,6 +669,20 @@ files:
 - spec/schemas/my_namespace/widget.rb
 - spec/schemas/my_namespace/widget_the_second.rb
 - spec/schemas/my_namespace/widget_the_third.rb
+- spec/snapshots/consumers-no-nest.snap
+- spec/snapshots/consumers.snap
+- spec/snapshots/consumers_and_producers-no-nest.snap
+- spec/snapshots/consumers_and_producers.snap
+- spec/snapshots/consumers_circular-no-nest.snap
+- spec/snapshots/consumers_circular.snap
+- spec/snapshots/consumers_complex_types-no-nest.snap
+- spec/snapshots/consumers_complex_types.snap
+- spec/snapshots/consumers_nested-no-nest.snap
+- spec/snapshots/consumers_nested.snap
+- spec/snapshots/namespace_folders.snap
+- spec/snapshots/namespace_map.snap
+- spec/snapshots/producers_with_key-no-nest.snap
+- spec/snapshots/producers_with_key.snap
 - spec/spec_helper.rb
 - spec/test_helpers_spec.rb
 - spec/utils/db_poller_spec.rb
@@ -702,7 +711,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.10
+rubygems_version: 4.0.16
 specification_version: 4
 summary: Kafka libraries for Ruby.
 test_files: []

data/lib/deimos/schema_class.rb

@@ -1,72 +0,0 @@
-# frozen_string_literal: true
-
-require 'avro_gen'
-
-module Deimos
-  # Backwards-compatible shim. Schema class generation moved to the avro-gen-ruby
-  # gem (namespace AvroGen). Previously-generated classes that reference
-  # `Deimos::SchemaClass::Record` / `Enum` / `Base` still resolve here, with a
-  # one-time deprecation warning, via const_missing.
-  module SchemaClass
-    DEPRECATED_CONSTANTS = {
-      Base: AvroGen::SchemaClass::Base,
-      Record: AvroGen::SchemaClass::Record,
-      Enum: AvroGen::SchemaClass::Enum
-    }.freeze
-
-    # The generation settings that live under Deimos.config.avrogen and are
-    # forwarded to AvroGen.config (same names on both sides).
-    GENERATION_SETTINGS = %i(
-      generated_class_path
-      nest_child_schemas
-      use_full_namespace
-      schema_namespace_map
-    ).freeze
-
-    # @param name [Symbol]
-    def self.const_missing(name)
-      klass = DEPRECATED_CONSTANTS[name]
-      return super unless klass
-
-      Deimos::Logging.deprecate(
-        "Deimos::SchemaClass::#{name} is deprecated; use AvroGen::SchemaClass::#{name} instead. " \
-        'Run `rake avro:upgrade` to update generated classes.'
-      )
-      # Define the constant so the warning is only emitted once.
-      const_set(name, klass)
-      klass
-    end
-
-    # Mirror the Deimos generation settings onto AvroGen.config. Deimos.config is
-    # the source of truth within Deimos, so this runs on every configure (keeping
-    # a reset in sync). The settings live under Deimos.config.avrogen; the legacy
-    # Deimos.config.schema.* equivalents still work but emit a deprecation warning.
-    # Standalone AvroGen users never trigger this and set AvroGen.config directly.
-    # @!visibility private
-    def self.sync_config!
-      # schema.path is shared with the Avro backends, so it stays under `schema`.
-      AvroGen.config.schema_path = Deimos.config.schema.path
-      # Refresh AvroGen's cached schema stores on (re)configuration so they don't
-      # serve stale schemas after the schema path or files change.
-      AvroGen::SchemaValidator.clear_store_cache!
-
-      GENERATION_SETTINGS.each do |key|
-        AvroGen.config.send("#{key}=", generation_setting(key))
-      end
-    end
-
-    # Resolve a generation setting, preferring the legacy (deprecated)
-    # Deimos.config.schema.* location when it was explicitly set.
-    # @!visibility private
-    def self.generation_setting(key)
-      if Deimos.config.schema.default_value?(key)
-        Deimos.config.avrogen.send(key)
-      else
-        Deimos::Logging.deprecate(
-          "Deimos.config.schema.#{key} is deprecated; use Deimos.config.avrogen.#{key} instead."
-        )
-        Deimos.config.schema.send(key)
-      end
-    end
-  end
-end

data/spec/schema_class_spec.rb

@@ -1,65 +0,0 @@
-# frozen_string_literal: true
-
-# Schema class generation moved to the avro-gen-ruby gem. These specs cover the
-# backwards-compatible shims that keep the old Deimos constants working for
-# users who haven't yet run `rake avro:upgrade`.
-RSpec.describe Deimos::SchemaClass do
-  describe 'deprecated constants' do
-    it 'resolves to the AvroGen equivalents' do
-      expect(Deimos::SchemaClass::Base).to be(AvroGen::SchemaClass::Base)
-      expect(Deimos::SchemaClass::Record).to be(AvroGen::SchemaClass::Record)
-      expect(Deimos::SchemaClass::Enum).to be(AvroGen::SchemaClass::Enum)
-    end
-
-    it 'emits a deprecation warning when an old constant is referenced' do
-      allow(Deimos::Logging).to receive(:deprecate)
-      # Stub const_set so re-resolving doesn't emit an "already initialized" warning.
-      allow(described_class).to receive(:const_set)
-
-      expect(described_class.const_missing(:Record)).to be(AvroGen::SchemaClass::Record)
-      expect(Deimos::Logging).to have_received(:deprecate).
-        with(a_string_matching(/Deimos::SchemaClass::Record is deprecated/))
-    end
-
-    it 'raises NameError for genuinely unknown constants' do
-      expect { Deimos::SchemaClass::NotARealClass }.to raise_error(NameError)
-    end
-  end
-
-  describe Deimos::Utils::SchemaClass do
-    it 'delegates to AvroGen::SchemaClass with a deprecation warning' do
-      allow(Deimos::Logging).to receive(:deprecate)
-
-      expect(described_class.modules_for('com.my-namespace')).
-        to eq(AvroGen::SchemaClass.modules_for('com.my-namespace'))
-      expect(Deimos::Logging).to have_received(:deprecate).
-        with(a_string_matching(/Deimos::Utils::SchemaClass\.modules_for is deprecated/))
-    end
-
-    it 'still raises NoMethodError for genuinely unknown methods' do
-      expect { described_class.not_a_real_method }.to raise_error(NoMethodError)
-    end
-  end
-
-  describe 'generation config' do
-    it 'forwards Deimos.config.avrogen settings to AvroGen.config' do
-      Deimos.configure do |config|
-        config.avrogen.generated_class_path = 'custom/classes'
-        config.avrogen.use_full_namespace = true
-      end
-
-      expect(AvroGen.config.generated_class_path).to eq('custom/classes')
-      expect(AvroGen.config.use_full_namespace).to be(true)
-    end
-
-    it 'still honors the legacy schema setting, deprecating it in favour of avrogen' do
-      allow(Deimos::Logging).to receive(:deprecate)
-
-      Deimos.configure { |config| config.schema.generated_class_path = 'legacy/classes' }
-
-      expect(AvroGen.config.generated_class_path).to eq('legacy/classes')
-      expect(Deimos::Logging).to have_received(:deprecate).
-        with(a_string_matching(/Deimos\.config\.schema\.generated_class_path is deprecated.*avrogen/))
-    end
-  end
-end