karafka 2.5.6 → 2.5.9

data/lib/karafka/swarm/producer_replacer.rb

@@ -0,0 +1,110 @@
+# frozen_string_literal: true
+
+module Karafka
+  module Swarm
+    # Builds a new WaterDrop producer that inherits configuration from an old one
+    #
+    # When a swarm node forks, the parent's producer must be replaced with a new one.
+    # This class encapsulates the logic for building that new producer, inheriting all relevant
+    # settings from the old one while generating fresh connection-level configuration.
+    class ProducerReplacer
+      # Attributes that should not be directly copied from the old producer config because they
+      # are either regenerated fresh (kafka, logger, id) or handled via their own namespaced
+      # migration (oauth, polling, polling.fd).
+      SKIPPABLE_ATTRIBUTES = %i[
+        id
+        kafka
+        logger
+        oauth
+        polling
+        fd
+      ].freeze
+
+      private_constant :SKIPPABLE_ATTRIBUTES
+
+      # Builds a new WaterDrop producer inheriting configuration from the old one
+      #
+      # @param old_producer [WaterDrop::Producer] the old producer to inherit settings from
+      # @param kafka [Hash] app-level kafka configuration
+      # @param logger [Object] logger instance for the new producer
+      # @return [WaterDrop::Producer] new producer with inherited configuration
+      def call(old_producer, kafka, logger)
+        old_producer_config = old_producer.config
+
+        WaterDrop::Producer.new do |p_config|
+          p_config.logger = logger
+
+          migrate_kafka(p_config, old_producer_config, kafka)
+          migrate_root(p_config, old_producer_config)
+          migrate_oauth(p_config, old_producer_config)
+          migrate_polling(p_config, old_producer_config)
+          migrate_polling_fd(p_config, old_producer_config)
+        end
+      end
+
+      private
+
+      # Migrates root-level producer attributes from the old producer, skipping those that are
+      # regenerated fresh or handled by their own namespaced migration
+      #
+      # @param p_config [WaterDrop::Config] new producer config being built
+      # @param old_producer_config [WaterDrop::Config] old producer config to inherit from
+      def migrate_root(p_config, old_producer_config)
+        old_producer_config.to_h.each do |key, value|
+          next if SKIPPABLE_ATTRIBUTES.include?(key)
+
+          p_config.public_send("#{key}=", value)
+        end
+      end
+
+      # Builds fresh kafka config from app-level settings and preserves any producer-specific
+      # kafka settings from the old producer (e.g., enable.idempotence) that aren't in the
+      # base app kafka config
+      #
+      # @param p_config [WaterDrop::Config] new producer config being built
+      # @param old_producer_config [WaterDrop::Config] old producer config to inherit from
+      # @param kafka [Hash] app-level kafka configuration
+      def migrate_kafka(p_config, old_producer_config, kafka)
+        p_config.kafka = Setup::AttributesMap.producer(kafka.dup)
+
+        old_producer_config.kafka.each do |key, value|
+          next if p_config.kafka.key?(key)
+
+          p_config.kafka[key] = value
+        end
+      end
+
+      # Migrates oauth configuration from the old producer
+      #
+      # @param p_config [WaterDrop::Config] new producer config being built
+      # @param old_producer_config [WaterDrop::Config] old producer config to inherit from
+      def migrate_oauth(p_config, old_producer_config)
+        old_producer_config.oauth.to_h.each do |key, value|
+          p_config.oauth.public_send("#{key}=", value)
+        end
+      end
+
+      # Migrates polling configuration from the old producer
+      #
+      # @param p_config [WaterDrop::Config] new producer config being built
+      # @param old_producer_config [WaterDrop::Config] old producer config to inherit from
+      def migrate_polling(p_config, old_producer_config)
+        old_producer_config.polling.to_h.each do |key, value|
+          next if SKIPPABLE_ATTRIBUTES.include?(key)
+
+          p_config.polling.public_send("#{key}=", value)
+        end
+      end
+
+      # Migrates polling fd configuration from the old producer
+      #
+      # @param p_config [WaterDrop::Config] new producer config being built
+      # @param old_producer_config [WaterDrop::Config] old producer config to inherit from
+      def migrate_polling_fd(p_config, old_producer_config)
+        old_producer_config.polling.fd.to_h.each do |key, value|
+          p_config.polling.fd.public_send("#{key}=", value)
+        end
+      end
+    end
+  end
+end

data/lib/karafka/swarm/supervisor.rb

@@ -152,6 +152,9 @@ module Karafka
           caller: self,
           error: e,
           manager: manager,
+          active_listeners: [],
+          alive_workers: [],
+          in_processing: {},
           type: "app.stopping.error"
         )
 

data/lib/karafka/version.rb

@@ -3,5 +3,5 @@
 # Main module namespace
 module Karafka
   # Current Karafka version
-  VERSION = "2.5.6"
+  VERSION = "2.5.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: karafka
 version: !ruby/object:Gem::Version
-  version: 2.5.6
+  version: 2.5.9
 platform: ruby
 authors:
 - Maciej Mensfeld
@@ -206,6 +206,8 @@ files:
 - lib/karafka/pro/active_job/consumer.rb
 - lib/karafka/pro/active_job/dispatcher.rb
 - lib/karafka/pro/active_job/job_options_contract.rb
+- lib/karafka/pro/admin/recovery.rb
+- lib/karafka/pro/admin/recovery/errors.rb
 - lib/karafka/pro/base_consumer.rb
 - lib/karafka/pro/cleaner.rb
 - lib/karafka/pro/cleaner/errors.rb
@@ -374,6 +376,7 @@ files:
 - lib/karafka/pro/routing/features/long_running_job/topic.rb
 - lib/karafka/pro/routing/features/multiplexing.rb
 - lib/karafka/pro/routing/features/multiplexing/config.rb
+- lib/karafka/pro/routing/features/multiplexing/contracts/routing.rb
 - lib/karafka/pro/routing/features/multiplexing/contracts/topic.rb
 - lib/karafka/pro/routing/features/multiplexing/patches/contracts/consumer_group.rb
 - lib/karafka/pro/routing/features/multiplexing/proxy.rb
@@ -542,6 +545,7 @@ files:
 - lib/karafka/swarm/liveness_listener.rb
 - lib/karafka/swarm/manager.rb
 - lib/karafka/swarm/node.rb
+- lib/karafka/swarm/producer_replacer.rb
 - lib/karafka/swarm/supervisor.rb
 - lib/karafka/templates/application_consumer.rb.erb
 - lib/karafka/templates/example_consumer.rb.erb
@@ -576,7 +580,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.6
 specification_version: 4
 summary: Karafka is Ruby and Rails efficient Kafka processing framework.
 test_files: []