waterdrop 2.6.2 → 2.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ed8c6f17cd730ab82df21e696e472c51dd51379acf757f735d43de98c00dead
-  data.tar.gz: 10f8b0d7bd64c26ba9b76c9edb76cf59f871cf44adbde2198907856f7b761ea4
+  metadata.gz: d70b143a525502bda5fd1ab9d391afa6e5434032179ad169b7a0cf9a1015be8d
+  data.tar.gz: c7fd47967967a0ca11e7f791f87eb9475f2d21bd3b3673a57a2c983e91244277
 SHA512:
-  metadata.gz: a41f9a5e1ef30c69221615552f48bad03099697d27a1e405f90ab189f6c21a33dedc6382c864d4790a22d798c64023a1802597f8ce255214d077de0ebcd5028b
-  data.tar.gz: b21a71b53e188fd58ce8800bc23548cc3bbc0a876fe4aa8d9c67107b0e90ddfd6484c4e534137b63e4bb45d5760460ae4b7df79233d6a2acc85ba00d45a55e2a
+  metadata.gz: 8dcc38ac6a287417c2f4b0aa65c9f08146ff84d77264b2d12e56201ff1180c9c8f9c3eead2a508341189239d223e1fadb9c126f9e7c0a2b5ebb352ffffdd9dd5
+  data.tar.gz: 73deed1c8323285e497f98d6710ddd3e8b890641205556d04f5cf460859efc5a39803f58e4ff5d2a31a1387f6a75b66dc7ddc46573145a30360797ee49fe70fc

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # WaterDrop changelog
 
+### 2.6.4 (Unreleased)
+- [Improvement] Use original error `#inspect` for `WaterDrop::Errors::ProduceError` and `WaterDrop::Errors::ProduceManyError` instead of the current empty string.
+
+### 2.6.3 (2023-06-28)
+- [Change] Use `Concurrent::AtomicFixnum` to track operations in progress to prevent potential race conditions on JRuby and TruffleRuby (not yet supported but this is for future usage).
+- [Change] Require `karafka-rdkafka` `>= 0.13.2`.
+- [Change] Require 'karafka-core' `>= 2.1.1`
+
 ### 2.6.2 (2023-06-21)
 - [Refactor] Introduce a counter-based locking approach to make sure, that we close the producer safely but at the same time not to limit messages production with producing lock.
 - [Refactor] Make private methods private.

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    waterdrop (2.6.2)
-      karafka-core (>= 2.1.0, < 3.0.0)
+    waterdrop (2.6.4)
+      karafka-core (>= 2.1.1, < 3.0.0)
       zeitwerk (~> 2.3)
 
 GEM
@@ -22,10 +22,10 @@ GEM
     ffi (1.15.5)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    karafka-core (2.1.0)
+    karafka-core (2.1.1)
       concurrent-ruby (>= 1.1)
-      karafka-rdkafka (>= 0.13.0, < 0.14.0)
-    karafka-rdkafka (0.13.0)
+      karafka-rdkafka (>= 0.13.1, < 0.14.0)
+    karafka-rdkafka (0.13.2)
       ffi (~> 1.15)
       mini_portile2 (~> 2.6)
       rake (> 12)

data/lib/waterdrop/errors.rb

@@ -38,8 +38,9 @@ module WaterDrop
 
       # @param dispatched [Array<Rdkafka::Producer::DeliveryHandle>] handlers of the
       #   messages that we've dispatched
-      def initialize(dispatched)
-        super()
+      # @param message [String] error message
+      def initialize(dispatched, message)
+        super(message)
         @dispatched = dispatched
       end
     end

data/lib/waterdrop/producer/async.rb

@@ -22,8 +22,8 @@ module WaterDrop
           producer_id: id,
           message: message
         ) { produce(message) }
-      rescue *SUPPORTED_FLOW_ERRORS
-        re_raised = Errors::ProduceError.new
+      rescue *SUPPORTED_FLOW_ERRORS => e
+        re_raised = Errors::ProduceError.new(e.inspect)
 
         @monitor.instrument(
           'error.occurred',
@@ -62,8 +62,8 @@ module WaterDrop
 
           dispatched
         end
-      rescue *SUPPORTED_FLOW_ERRORS
-        re_raised = Errors::ProduceManyError.new(dispatched)
+      rescue *SUPPORTED_FLOW_ERRORS => e
+        re_raised = Errors::ProduceManyError.new(dispatched, e.inspect)
 
         @monitor.instrument(
           'error.occurred',

data/lib/waterdrop/producer/sync.rb

@@ -26,8 +26,8 @@ module WaterDrop
         ) do
           wait(produce(message))
         end
-      rescue *SUPPORTED_FLOW_ERRORS
-        re_raised = Errors::ProduceError.new
+      rescue *SUPPORTED_FLOW_ERRORS => e
+        re_raised = Errors::ProduceError.new(e.inspect)
 
         @monitor.instrument(
           'error.occurred',
@@ -69,8 +69,8 @@ module WaterDrop
 
           dispatched
         end
-      rescue *SUPPORTED_FLOW_ERRORS
-        re_raised = Errors::ProduceManyError.new(dispatched)
+      rescue *SUPPORTED_FLOW_ERRORS => e
+        re_raised = Errors::ProduceManyError.new(dispatched, e.inspect)
 
         @monitor.instrument(
           'error.occurred',

data/lib/waterdrop/producer.rb

@@ -34,7 +34,7 @@ module WaterDrop
     # @param block [Proc] configuration block
     # @return [Producer] producer instance
     def initialize(&block)
-      @operations_in_progress = 0
+      @operations_in_progress = Concurrent::AtomicFixnum.new(0)
       @buffer_mutex = Mutex.new
       @connecting_mutex = Mutex.new
       @operating_mutex = Mutex.new
@@ -138,7 +138,7 @@ module WaterDrop
 
           # Wait until all the outgoing operations are done. Only when no one is using the
           # underlying client running operations we can close
-          sleep(0.001) until @operations_in_progress.zero?
+          sleep(0.001) until @operations_in_progress.value.zero?
 
           # Flush has its own buffer mutex but even if it is blocked, flushing can still happen
           # as we close the client after the flushing (even if blocked by the mutex)
@@ -205,9 +205,9 @@ module WaterDrop
       # This can happen only during flushing on closing, in case like this we don't have to
       # synchronize because we already own the lock
       if @operating_mutex.owned?
-        @operations_in_progress += 1
+        @operations_in_progress.increment
       else
-        @operating_mutex.synchronize { @operations_in_progress += 1 }
+        @operating_mutex.synchronize { @operations_in_progress.increment }
         ensure_active!
       end
 
@@ -228,7 +228,7 @@ module WaterDrop
       # the original cause to maintain the same API across all the errors dispatched to the
       # notifications pipeline.
       begin
-        raise Errors::ProduceError
+        raise Errors::ProduceError, e.inspect
       rescue Errors::ProduceError => e
         # We want to instrument on this event even when we restart it.
         # The reason is simple: instrumentation and visibility.
@@ -248,10 +248,10 @@ module WaterDrop
         sleep @config.wait_backoff_on_queue_full
       end
 
-      @operations_in_progress -= 1
+      @operations_in_progress.decrement
       retry
     ensure
-      @operations_in_progress -= 1
+      @operations_in_progress.decrement
     end
   end
 end

data/lib/waterdrop/version.rb

@@ -3,5 +3,5 @@
 # WaterDrop library
 module WaterDrop
   # Current WaterDrop version
-  VERSION = '2.6.2'
+  VERSION = '2.6.4'
 end

data/lib/waterdrop.rb

@@ -9,6 +9,7 @@
   securerandom
   karafka-core
   pathname
+  concurrent/atomic/atomic_fixnum
 ].each { |lib| require lib }
 
 # WaterDrop library

data/waterdrop.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
   spec.description   = spec.summary
   spec.license       = 'MIT'
 
-  spec.add_dependency 'karafka-core', '>= 2.1.0', '< 3.0.0'
+  spec.add_dependency 'karafka-core', '>= 2.1.1', '< 3.0.0'
   spec.add_dependency 'zeitwerk', '~> 2.3'
 
   if $PROGRAM_NAME.end_with?('gem')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: waterdrop
 version: !ruby/object:Gem::Version
-  version: 2.6.2
+  version: 2.6.4
 platform: ruby
 authors:
 - Maciej Mensfeld
@@ -35,7 +35,7 @@ cert_chain:
   Qf04B9ceLUaC4fPVEz10FyobjaFoY4i32xRto3XnrzeAgfEe4swLq8bQsR3w/EF3
   MGU0FeSV2Yj7Xc2x/7BzLK8xQn5l7Yy75iPF+KP3vVmDHnNl
   -----END CERTIFICATE-----
-date: 2023-06-21 00:00:00.000000000 Z
+date: 2023-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: karafka-core
@@ -43,7 +43,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.1.1
     - - "<"
       - !ruby/object:Gem::Version
         version: 3.0.0
@@ -53,7 +53,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.1.1
     - - "<"
       - !ruby/object:Gem::Version
         version: 3.0.0

metadata.gz.sig

@@ -1 +1 @@
-E���y���!+t �V�	����5cK|��3��=�$š�x�3KN$ R<�T���=�{60�-�V����=���6���w�}�Ff%r�Z��������s�P��X��)�]��
+��ǹ����2i3!F�Ftf�x��<�ǧ��ۧ�D�}���{��ƏM�.�F�y-�	��_cx���j)~�w��nG}(����1Ҋ}���݈�j�p�ž��GFI���L�a� e�2���su)�3��+��Q2�([I���/���9iE�g���org���X����_��Z�ͥ,�B����c��^�.�I