waterdrop 2.10.9 → 2.10.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e6efd47232839d14e444c45df4cc5fae39661dd7e8ef646639f00d41f62d3b3
-  data.tar.gz: edd8560d05bb3742d8592a1b90f2dc784410e7150045e8a8d4a0ebf1c0d82e81
+  metadata.gz: cf52057f67473d68a4ec20e57ac3d45f3ae84d5fe9dd1e42655ef7d02c1384a8
+  data.tar.gz: ad9cb21f3a98a8ddad666355e507839f38a3c08a02a14d2c9fed89260a2ba1a3
 SHA512:
-  metadata.gz: 1532bf1ecbb02ec192bdd8a410b5e7e7579337e11515fe828fb88bd8cf2a2168e31ef669e9d3ba1c334e64720c148069d26b5259d7c3f913d80258d5ddbb711b
-  data.tar.gz: 87178e647ac42309e0cdbef6c48af8c0f7a902ee32238c3c5cf8cbca2ee7ae80396895bb3a70417c912f98f669834e19ce1066c596a7a5432c7245b29a537248
+  metadata.gz: 472757b2946e50858b02601f71976bcafbd496cd8674e3863068725ef4dbf750d850add9553eed3e1515563fd6275a409d05a214120b2eaef51b06c8c4376543
+  data.tar.gz: bc795ef820ae4c995f5f770858f674e3069dac85e1819ed72c02ab34aa1dba74099a5ab7a8485e69bad90a1adb8cebd4855b7de45931d535aa24bea6622d598b

data/CHANGELOG.md

@@ -1,12 +1,21 @@
 # WaterDrop changelog
 
+## v2.10.10 (2026-11-10)
+- [Feature] Add the `partition_count_cache_ttl_ms` setting to configure the process-wide karafka-rdkafka partition count cache TTL (default `nil` leaves it untouched).
+- [Change] Require `karafka-rdkafka` `>=` `0.32.0`.
+- [Change] Use the producer id (`ProducerNotTransactionalError`, `EarlyTransactionExitNotAllowedError`) or the event id (`StatisticsNotEnabledError`) as the error message instead of a sentence.
+- [Maintenance] Document the errors raised by `ensure_active!` and `ensure_connection_pool_gem!`, and fix the `MessageInvalidError` namespace in `validate_message!` YARD.
+- [Maintenance] Document that `max_wait_timeout` is omitted, not set to `nil`, to use the producer default in `Producer#with` and `Variant#initialize` YARD.
+- [Fix] Send a message buffered through a variant with that variant's `topic_config` at flush, and a message buffered through the producer with the default one, whichever producer or variant flushes the buffer.
+- [Fix] Raise `VariantInvalidError` instead of `NoMethodError` when `Producer#with` gets a `topic_config` that is not a hash (e.g. `nil`).
+- [Fix] Make `Clients::Buffered` and `Clients::Dummy` safe to produce to from many threads, so on JRuby no buffered message is lost and no offset is assigned twice.
+
 ## 2.10.9 (2026-11-02)
 - [Maintenance] Rename the positional topic name parameters of `Producer#partition_count`, `Clients::Buffered#messages_for` and the Datadog metrics listener to `topic_name`.
 - [Maintenance] Rename the positional topic name parameter of `Clients::Dummy::Handle#initialize` to `topic_name`.
 - [Maintenance] Declare `rake` in the `Gemfile`. It came only through `karafka-rdkafka`, which will stop depending on it for precompiled platform gems.
 - [Fix] Copy the buffer in `Producer#messages` (and so the `buffer.flushed_async`/`buffer.flushed_sync` payloads) under a dedicated lock, so reading it while other threads buffer no longer raises `ConcurrencyError` on JRuby.
 - [Fix] Re-buffer the undispatched rest of a `#flush` batch when a concurrent `#close` stops it, and expose the handles dispatched before the close as `ProducerClosedError#dispatched`.
-- [Fix] Copy the buffer in `Producer#messages` (and so the `buffer.flushed_async`/`buffer.flushed_sync` payloads) under a dedicated lock, so reading it while other threads buffer no longer raises `ConcurrencyError` on JRuby.
 
 ## 2.10.8 (2026-10-25)
 - [Maintenance] Document that a transaction timeout also raises `:fenced`, indistinguishable from a takeover, and when removing `:fenced` from `non_reloadable_errors` is safe.

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    waterdrop (2.10.9)
+    waterdrop (2.10.10)
       karafka-core (>= 2.5.12, < 3.0.0)
-      karafka-rdkafka (>= 0.31.0)
+      karafka-rdkafka (>= 0.32.0)
       zeitwerk (~> 2.3)
 
 GEM
@@ -12,11 +12,11 @@ GEM
     connection_pool (3.0.2)
     drb (2.2.3)
     ffi (1.17.4)
-    json (3.0.2)
-    karafka-core (2.6.4)
+    json (3.1.0)
+    karafka-core (2.6.6)
       karafka-rdkafka (>= 0.20.0)
       logger (>= 1.6.0)
-    karafka-rdkafka (0.31.0)
+    karafka-rdkafka (0.32.0)
       ffi (~> 1.17.1)
       json (> 2.0)
       logger
@@ -24,13 +24,13 @@ GEM
       rake (> 12)
     logger (1.7.0)
     mini_portile2 (2.8.9)
-    minitest (6.0.6)
+    minitest (6.1.0)
       drb (~> 2.0)
-      prism (~> 1.5)
+      prism (>= 1.5, < 3)
     mocha (3.1.0)
       ruby2_keywords (>= 0.0.5)
     ostruct (0.6.3)
-    prism (1.9.0)
+    prism (2.1.0)
     rake (13.4.2)
     ruby2_keywords (0.0.5)
     simplecov (1.3.2)
@@ -55,20 +55,20 @@ CHECKSUMS
   connection_pool (3.0.2) sha256=33fff5ba71a12d2aa26cb72b1db8bba2a1a01823559fb01d29eb74c286e62e0a
   drb (2.2.3) sha256=0b00d6fdb50995fe4a45dea13663493c841112e4068656854646f418fda13373
   ffi (1.17.4) sha256=bcd1642e06f0d16fc9e09ac6d49c3a7298b9789bcb58127302f934e437d60acf
-  json (3.0.2) sha256=8e6d7e7b11384c21230430cef90b71f14849a34a1f4452796670f7c981bd19df
-  karafka-core (2.6.4) sha256=e08166ca7ef12fadf0500f2a3aba63b5ba918a98533c3feaac9f43c90f159363
-  karafka-rdkafka (0.31.0) sha256=7d21274122d66ee8d08b8e56a0d06084933deb2306cf2a6e4bd0d073c14e7f9f
+  json (3.1.0) sha256=3ce7ccf8fde58960177a3a756c31f292a4c1e1dedee884547096a5b0604e3bd8
+  karafka-core (2.6.6) sha256=be14a9898c2133eecf1e2edefbdc127d105d902360d93c4ce63328ad8e74a440
+  karafka-rdkafka (0.32.0) sha256=07983e15df25e69c958b991fe50ea85f2b6170821816eb05248f77a9de7ffa2b
   logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203
   mini_portile2 (2.8.9) sha256=0cd7c7f824e010c072e33f68bc02d85a00aeb6fce05bb4819c03dfd3c140c289
-  minitest (6.0.6) sha256=153ea36d1d987a62942382b61075745042a2b3123b1cd48f4c3675af9cc7d6f1
+  minitest (6.1.0) sha256=ff373595aa8888631e8a5463986a76b3845346ae6d7fa46e139c1633d418076e
   mocha (3.1.0) sha256=75f42d69ebfb1f10b32489dff8f8431d37a418120ecdfc07afe3bc183d4e1d56
   ostruct (0.6.3) sha256=95a2ed4a4bd1d190784e666b47b2d3f078e4a9efda2fccf18f84ddc6538ed912
-  prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85
+  prism (2.1.0) sha256=1c0a7c6dea0e93183390fb123f007564dbe663198e2f86ad87204151147601f3
   rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701
   ruby2_keywords (0.0.5) sha256=ffd13740c573b7301cf7a2e61fc857b2a8e3d3aff32545d6f8300d8bae10e3ef
   simplecov (1.3.2) sha256=2a22ec1759f1b8db60881a2e038758956fc69ef93ed669be0bde0678de6d0e85
   warning (1.6.0) sha256=a49cdfae19fb77d19afff2efbe45f8ab759e9cd25b4e4ce2c79dbaf46bdb6c9e
-  waterdrop (2.10.9)
+  waterdrop (2.10.10)
   zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5
 
 BUNDLED WITH

data/config/locales/errors.yml

@@ -26,6 +26,7 @@ en:
       non_reloadable_errors_format: must be an array of symbols
       oauth.token_provider_listener_format: 'must be false or respond to #on_oauthbearer_token_refresh'
       idle_disconnect_timeout_format: 'must be an integer that is equal to 0 or bigger than 30 000 (30 seconds)'
+      partition_count_cache_ttl_ms_format: must be nil or an integer that is equal or bigger than 1
       statistics_decorator_format: 'must respond to #call'
       polling.mode_format: must be :thread or :fd
       polling.poller_format: must be nil or a WaterDrop::Polling::Poller instance
@@ -44,6 +45,7 @@ en:
       missing: must be present
       default_format: must be boolean
       max_wait_timeout_format: must be an integer that is equal or bigger than 0
+      topic_config_format: must be a hash
       kafka_key_must_be_a_symbol: All keys under the kafka settings scope need to be symbols
       kafka_key_not_per_topic: This config option cannot be set on a per topic basis
       kafka_key_acks_not_changeable: Acks value cannot be redefined for a transactional or idempotent producer

data/lib/waterdrop/clients/buffered.rb

@@ -3,6 +3,9 @@
 module WaterDrop
   module Clients
     # Client used to buffer messages that we send out in specs and other places.
+    #
+    # It is safe to produce from many threads. Readers (`#messages`, `#messages_for`) return the
+    # internal buffers, not copies, so read them once producing is done or `dup` them.
     class Buffered < Clients::Dummy
       attr_accessor :messages
 
@@ -22,38 +25,44 @@ module WaterDrop
       # @param message [Hash] `WaterDrop::Producer#produce_sync` message hash
       # @return [Dummy::Handle] fake delivery handle that can be materialized into a report
       def produce(message)
-        if @transaction_active
-          @transaction_topics[message.fetch(:topic)] << message
-          @transaction_messages << message
-        else
-          # We pre-validate the message payload, so topic is ensured to be present
-          @topics[message.fetch(:topic)] << message
-          @messages << message
-        end
+        @clients_mutex.synchronize do
+          if @transaction_active
+            @transaction_topics[message.fetch(:topic)] << message
+            @transaction_messages << message
+          else
+            # We pre-validate the message payload, so topic is ensured to be present
+            @topics[message.fetch(:topic)] << message
+            @messages << message
+          end
 
-        super(**message.to_h)
+          build_handle(message.fetch(:topic), message.fetch(:partition, 0))
+        end
       end
 
       # Starts the transaction on a given level
       def begin_transaction
-        @transaction_level += 1
-        @transaction_active = true
+        @clients_mutex.synchronize do
+          @transaction_level += 1
+          @transaction_active = true
+        end
       end
 
       # Finishes given level of transaction
       def commit_transaction
-        @transaction_level -= 1
+        @clients_mutex.synchronize do
+          @transaction_level -= 1
 
-        # Transfer transactional data on success
-        @transaction_topics.each do |topic, messages|
-          @topics[topic] += messages
-        end
+          # Transfer transactional data on success
+          @transaction_topics.each do |topic, messages|
+            @topics[topic] += messages
+          end
 
-        @messages += @transaction_messages
+          @messages += @transaction_messages
 
-        @transaction_topics.clear
-        @transaction_messages.clear
-        @transaction_active = false
+          @transaction_topics.clear
+          @transaction_messages.clear
+          @transaction_active = false
+        end
       end
 
       # Fakes storing the offset in a transactional fashion
@@ -68,26 +77,35 @@ module WaterDrop
 
       # Aborts the transaction
       def abort_transaction
-        @transaction_level -= 1
-        @transaction_topics.clear
-        @transaction_messages.clear
-        @transaction_active = false
+        @clients_mutex.synchronize do
+          @transaction_level -= 1
+          @transaction_topics.clear
+          @transaction_messages.clear
+          @transaction_active = false
+        end
       end
 
       # Returns messages produced to a given topic
       # @param topic_name [String]
       def messages_for(topic_name)
+        @clients_mutex.synchronize { @topics[topic_name] }
+      rescue ThreadError => e
+        # Mutex#synchronize raises in a signal trap, so there the buffer is read without the lock.
+        raise unless e.message == "can't be called from trap context"
+
         @topics[topic_name]
       end
 
       # Clears internal buffer. Used in between specs so messages do not leak out
       def reset
-        @transaction_level = 0
-        @transaction_active = false
-        @transaction_topics.clear
-        @transaction_messages.clear
-        @messages.clear
-        @topics.each_value(&:clear)
+        @clients_mutex.synchronize do
+          @transaction_level = 0
+          @transaction_active = false
+          @transaction_topics.clear
+          @transaction_messages.clear
+          @messages.clear
+          @topics.each_value(&:clear)
+        end
       end
     end
   end

data/lib/waterdrop/clients/dummy.rb

@@ -43,6 +43,7 @@ module WaterDrop
       # @return [Dummy] dummy instance
       def initialize(_producer)
         @counters = Hash.new { |h, k| h[k] = -1 }
+        @clients_mutex = Mutex.new
       end
 
       # "Produces" the message
@@ -54,7 +55,7 @@ module WaterDrop
       # @option _args [Hash, nil] :headers message headers
       # @return [Handle] delivery handle
       def produce(topic:, partition: 0, **_args)
-        Handle.new(topic.to_s, partition, @counters["#{topic}#{partition}"] += 1)
+        @clients_mutex.synchronize { build_handle(topic, partition) }
       end
 
       # Returns 0 as dummy client doesn't queue any real messages
@@ -76,6 +77,17 @@ module WaterDrop
       def method_missing(*_args)
         self || super
       end
+
+      private
+
+      # Assigns the next offset of the given topic partition. Caller must hold `@clients_mutex`.
+      #
+      # @param topic [String, Symbol] topic where we want to dispatch message
+      # @param partition [Integer] target partition
+      # @return [Handle] delivery handle
+      def build_handle(topic, partition)
+        Handle.new(topic.to_s, partition, @counters["#{topic}#{partition}"] += 1)
+      end
     end
   end
 end

data/lib/waterdrop/config.rb

@@ -149,6 +149,11 @@ module WaterDrop
     #   TCP connections in low-intensity scenarios. Minimum value is 30 seconds (30_000 ms) to
     #   prevent overly aggressive disconnections.
     setting :idle_disconnect_timeout, default: 0
+    # option [Integer, nil] Time-to-live (in ms) of the partition count cache used to route
+    #   messages with `partition_key`. When `nil` (default), the karafka-rdkafka value is left
+    #   untouched. Due to how rdkafka works, this setting is global for all the producers and the
+    #   last producer set up with a non-nil value wins.
+    setting :partition_count_cache_ttl_ms, default: nil
 
     # option [Karafka::Core::Monitoring::StatisticsDecorator] decorator instance used to compute
     #   deltas (_d) and freeze durations (_fd) on raw librdkafka statistics. The default is
@@ -230,6 +235,10 @@ module WaterDrop
         Contracts::Config.new.validate!(config.to_h, Errors::ConfigurationInvalidError)
 
         ::Rdkafka::Config.logger = config.logger
+
+        if config.partition_count_cache_ttl_ms
+          ::Rdkafka::Config.partition_count_cache_ttl_ms = config.partition_count_cache_ttl_ms
+        end
       end
 
       self

data/lib/waterdrop/connection_pool.rb

@@ -172,6 +172,7 @@ module WaterDrop
 
       # Ensures the connection_pool gem is available (class method)
       # Only requires it when actually needed (lazy loading)
+      # @raise [LoadError] when the connection_pool gem is not available
       def ensure_connection_pool_gem!
         return if defined?(::ConnectionPool)
 

data/lib/waterdrop/contracts/config.rb

@@ -39,6 +39,10 @@ module WaterDrop
         val.is_a?(Integer) && (val.zero? || val >= 30_000)
       end
 
+      required(:partition_count_cache_ttl_ms) do |val|
+        val.nil? || (val.is_a?(Integer) && val.positive?)
+      end
+
       required(:statistics_decorator) { |val| val.respond_to?(:call) }
 
       nested(:oauth) do

data/lib/waterdrop/contracts/variant.rb

@@ -34,6 +34,7 @@ module WaterDrop
 
       required(:default) { |val| BOOLEANS.include?(val) }
       required(:max_wait_timeout) { |val| val.is_a?(Numeric) && val >= 0 }
+      required(:topic_config) { |val| val.is_a?(Hash) }
 
       # Checks if all keys are symbols
       virtual do |config, errors|

data/lib/waterdrop/errors.rb

@@ -63,7 +63,8 @@ module WaterDrop
     # graceful transaction aborting
     AbortTransaction = Class.new(BaseError)
 
-    # Do not use `break`, `return` or `throw` inside of the transaction blocks
+    # Do not use `break`, `return` or `throw` inside of the transaction blocks. If the `throw`
+    # comes from `Timeout.timeout(duration)`, pass an exception class as its second argument
     EarlyTransactionExitNotAllowedError = Class.new(BaseError)
 
     # Raised when an error occurs in the polling loop

data/lib/waterdrop/instrumentation/monitor.rb

@@ -46,14 +46,7 @@ module WaterDrop
       #   `statistics.emitted` and this monitor has been frozen for statistics
       def subscribe(event_id_or_listener, &block)
         if @statistics_listeners_frozen && targets_statistics?(event_id_or_listener, block)
-          raise Errors::StatisticsNotEnabledError, <<~MSG.tr("\n", " ").strip
-            Cannot subscribe to `statistics.emitted` after the producer has been connected.
-            Statistics are disabled because no listener was subscribed before the underlying
-            rdkafka client was built, so librdkafka is not emitting statistics at all.
-            Subscribe your listener BEFORE the first producer use (before the underlying
-            client is lazily initialized), or explicitly keep statistics enabled by leaving
-            a listener in place at build time.
-          MSG
+          raise Errors::StatisticsNotEnabledError, STATISTICS_EVENT
         end
 
         super

data/lib/waterdrop/producer/buffer.rb

@@ -139,6 +139,20 @@ module WaterDrop
         # Do nothing if nothing to flush
         return data_for_dispatch if data_for_dispatch.empty?
 
+        # Messages buffered through a variant carry its topic config (see Variant#buffer). The rest
+        # were buffered through the producer and must not pick up the flushing variant's one.
+        unless current_variant.default?
+          default_topic_config = @default_variant.topic_config
+
+          data_for_dispatch = data_for_dispatch.map do |message|
+            next message if message.key?(:topic_config)
+
+            message = message.dup
+            message[:topic_config] = default_topic_config
+            message
+          end
+        end
+
         if sync
           produce_many_sync(data_for_dispatch, run_middleware: false)
         else

data/lib/waterdrop/producer/transactions.rb

@@ -50,10 +50,7 @@ module WaterDrop
       #   handler.wait
       def transaction
         unless transactional?
-          raise(
-            Errors::ProducerNotTransactionalError,
-            "#{id} is not transactional"
-          )
+          raise(Errors::ProducerNotTransactionalError, id)
         end
 
         # This will safely allow us to support one operation transactions so a transactional
@@ -83,14 +80,7 @@ module WaterDrop
               raise(e)
             ensure
               if !e && !finished
-                raise(
-                  Errors::EarlyTransactionExitNotAllowedError,
-                  <<~ERROR_MSG.tr("\n", " ")
-                    Using `return`, `break` or `throw` to exit a transaction block is not allowed.
-                    If the `throw` came from `Timeout.timeout(duration)`, pass an exception class as
-                    a second argument so it doesn't use `throw` to abort its block.
-                  ERROR_MSG
-                )
+                raise(Errors::EarlyTransactionExitNotAllowedError, id)
               end
             end
 

data/lib/waterdrop/producer/variant/config_buffer.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module WaterDrop
+  class Producer
+    class Variant < SimpleDelegator
+      # Buffers belong to the producer, so another variant or the producer itself may flush them.
+      # A message buffered through a variant keeps its topic config, so it is sent with it whoever
+      # flushes. This lives here and not in Buffer#buffer because resolving `current_variant` there
+      # would cost every default-producer #buffer call (~13%).
+      class ConfigBuffer
+        # @param producer [WaterDrop::Producer] producer that owns the buffer
+        # @param topic_config [Hash] topic config of the variant buffering the messages
+        def initialize(producer, topic_config)
+          @producer = producer
+          @topic_config = topic_config
+        end
+
+        # @param message [Hash] message to buffer
+        def buffer(message)
+          @producer.buffer(with_topic_config(message))
+        end
+
+        # @param messages [Array<Hash>] messages to buffer
+        def buffer_many(messages)
+          @producer.buffer_many(messages.map { |message| with_topic_config(message) })
+        end
+
+        private
+
+        # @param message [Hash] user message, never changed in place
+        # @return [Hash] copy of the message with the variant topic config
+        def with_topic_config(message)
+          message = message.dup
+          message[:topic_config] = @topic_config
+          message
+        end
+      end
+    end
+  end
+end

data/lib/waterdrop/producer/variant.rb

@@ -37,13 +37,16 @@ module WaterDrop
       # Contract to validate that variant alteration data is correct
       CONTRACT = Contracts::Variant.new
 
-      private_constant :EMPTY_HASH, :CONTRACT
+      # Methods a non-default variant runs through its ConfigBuffer
+      CONFIG_BUFFERED = %i[buffer buffer_many].freeze
+
+      private_constant :EMPTY_HASH, :CONTRACT, :CONFIG_BUFFERED, :ConfigBuffer
 
       attr_reader :max_wait_timeout, :topic_config, :producer
 
       # @param producer [WaterDrop::Producer] producer for which we want to have a variant
-      # @param max_wait_timeout [Integer, nil] alteration to max wait timeout or nil to use
-      #   default
+      # @param max_wait_timeout [Integer] alteration to max wait timeout. Omit it to use the
+      #   producer default
       # @param topic_config [Hash] extra topic configuration that can be altered.
       # @param default [Boolean] is this a default variant or an altered one
       # @see https://karafka.io/docs/Librdkafka-Configuration/#topic-configuration-properties
@@ -57,6 +60,7 @@ module WaterDrop
         @max_wait_timeout = max_wait_timeout
         @topic_config = topic_config
         @default = default
+        @buffer_target = default ? producer : ConfigBuffer.new(producer, topic_config)
         super(producer)
 
         CONTRACT.validate!(to_h, Errors::VariantInvalidError)
@@ -78,6 +82,8 @@ module WaterDrop
         Transactions
       ].each do |scope|
         scope.instance_methods(false).each do |method_name|
+          target = CONFIG_BUFFERED.include?(method_name) ? "@buffer_target" : "@producer"
+
           # We save and restore any variant already active for this producer in this fiber rather
           # than unconditionally deleting it. A variant-wrapped method that yields user code (e.g.
           # `transaction`) may wrap a nested same-producer variant call; without save/restore the
@@ -103,7 +109,7 @@ module WaterDrop
               prev = ref[@producer.id]
               ref[@producer.id] = self
 
-              @producer.#{method_name}(*args, &block)
+              #{target}.#{method_name}(*args, &block)
             ensure
               had ? (ref[@producer.id] = prev) : ref.delete(@producer.id)
             end

data/lib/waterdrop/producer.rb

@@ -268,8 +268,8 @@ module WaterDrop
     # Builds the variant alteration and returns it.
     #
     # @param args [Hash] variant configuration options
-    # @option args [Integer, nil] :max_wait_timeout alteration to max wait timeout or nil to use
-    #   default
+    # @option args [Integer] :max_wait_timeout alteration to max wait timeout. Omit it to use the
+    #   producer default
     # @option args [Hash] :topic_config extra topic configuration that can be altered
     # @option args [Boolean] :default is this a default variant or an altered one
     # @return [WaterDrop::Producer::Variant] variant proxy to use with alterations
@@ -570,6 +570,9 @@ module WaterDrop
 
     # Ensures that we don't run any operations when the producer is not configured or when it
     # was already closed
+    # @raise [Errors::ProducerNotConfiguredError] when the producer is not configured
+    # @raise [Errors::ProducerClosedError] when the producer is closing or closed
+    # @raise [Errors::StatusInvalidError] when the producer is in an unknown state
     def ensure_active!
       # Capture the lifecycle state once. Another thread may be transitioning the producer between
       # states (for example configured -> connected while reloading the client after a fatal error),
@@ -591,7 +594,7 @@ module WaterDrop
     # Ensures that the message we want to send out to Kafka is actually valid and that it can be
     # sent there
     # @param message [Hash] message we want to send
-    # @raise [Karafka::Errors::MessageInvalidError]
+    # @raise [Errors::MessageInvalidError]
     def validate_message!(message)
       @contract.validate!(message, Errors::MessageInvalidError)
     end
@@ -660,13 +663,14 @@ module WaterDrop
       # We basically only duplicate the message hash only if it is needed.
       # It is needed when user is using a custom settings variant or when symbol is provided as
       # the topic name. We should never mutate user input message as it may be a hash that the
-      # user is using for some other operations
-      if message[:topic].is_a?(Symbol) || !variant.default?
+      # user is using for some other operations. A message buffered through a variant already
+      # carries that variant's topic config, so it needs no copy for it
+      if message[:topic].is_a?(Symbol) || (!variant.default? && !message.key?(:topic_config))
         message = message.dup
         # In case someone defines topic as a symbol, we need to convert it into a string as
         # librdkafka does not accept symbols
         message[:topic] = message[:topic].to_s
-        message[:topic_config] = variant.topic_config
+        message[:topic_config] ||= variant.topic_config
       end
 
       result = if transactional?

data/lib/waterdrop/version.rb

@@ -2,5 +2,5 @@
 
 module WaterDrop
   # Current WaterDrop version
-  VERSION = "2.10.9"
+  VERSION = "2.10.10"
 end

data/package-lock.json

@@ -286,9 +286,9 @@
       }
     },
     "node_modules/smol-toml": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/smol-toml/-/smol-toml-1.9.0.tgz",
-      "integrity": "sha512-hpd+HLON7HdZXqYchMM/+LaTTbdK0AU3NngIJ4KVyWbY9bfQqdL9cD+4yf6dUoU2Ap4VsU0JkQi6FxAI1B2mXQ==",
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/smol-toml/-/smol-toml-1.9.1.tgz",
+      "integrity": "sha512-j7WyPdf0CJoutMzMoPLF/bVXHtKZIT9Rb4eGeEbWw8X2t5oirjPgpL+OpaENZrILYaXqYwnVH+qgUwVbl+pUJQ==",
       "dev": true,
       "license": "BSD-3-Clause",
       "engines": {

data/renovate.json

@@ -1,6 +1,8 @@
 {
   "bundler": {
-    "managerFilePatterns": ["/(^|/)Gemfile\\.lint$/"]
+    "managerFilePatterns": [
+      "/(^|/)Gemfile\\.lint$/"
+    ]
   },
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
@@ -51,6 +53,13 @@
         "ruby/setup-ruby"
       ],
       "minimumReleaseAge": "5 days"
+    },
+    {
+      "description": "Major updates stay manual",
+      "matchUpdateTypes": [
+        "major"
+      ],
+      "automerge": false
     }
   ],
   "minimumReleaseAge": "7 days",
@@ -62,5 +71,13 @@
     "schedule": [
       "before 4am on the first day of the month"
     ]
+  },
+  "automerge": true,
+  "platformAutomerge": true,
+  "osvVulnerabilityAlerts": true,
+  "vulnerabilityAlerts": {
+    "labels": [
+      "security"
+    ]
   }
 }

data/waterdrop.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.licenses = %w[LGPL-3.0-only Commercial]
 
   spec.add_dependency "karafka-core", ">= 2.5.12", "< 3.0.0"
-  spec.add_dependency "karafka-rdkafka", ">= 0.31.0"
+  spec.add_dependency "karafka-rdkafka", ">= 0.32.0"
   spec.add_dependency "zeitwerk", "~> 2.3"
 
   spec.required_ruby_version = ">= 3.3.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: waterdrop
 version: !ruby/object:Gem::Version
-  version: 2.10.9
+  version: 2.10.10
 platform: ruby
 authors:
 - Maciej Mensfeld
@@ -35,14 +35,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.31.0
+        version: 0.32.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.31.0
+        version: 0.32.0
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
@@ -130,6 +130,7 @@ files:
 - lib/waterdrop/producer/tombstone.rb
 - lib/waterdrop/producer/transactions.rb
 - lib/waterdrop/producer/variant.rb
+- lib/waterdrop/producer/variant/config_buffer.rb
 - lib/waterdrop/version.rb
 - package-lock.json
 - package.json