waterdrop 2.6.3 → 2.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f051a62baab08b5b23bb85a5b2264f3b33bebb77c0f3628ed90eda5eda8c22f2
-  data.tar.gz: 9a5f27b24bee02bb2efcaeec926a8568c540c420c77cf1c9a06a6d72fcf496b1
+  metadata.gz: 908779a6b04cc938fc6f2801d1cd8650191a8cc61db1cda5e8331ca31b2a044e
+  data.tar.gz: 610c8c9e35cc0bd8f1ac47ad34e8e5c36e10283806085c10797ca61cf1761a06
 SHA512:
-  metadata.gz: 7fd5cd82e391ad95e9c48b4e6794ad6b4e0715b6f4a64e838c676064b96e22c2c0a0cea1f18e4131c5dc60ae33923b943d2828278404038f5f7a79b754cb6e37
-  data.tar.gz: 004d5f3fdbbe48733ba47f132e12dcf1bd3ab5e0705181825f8e93b207e12b955b97cf6c283dcb58049153dd3325dd3ea655130e60982d0300ec309460e0d583
+  metadata.gz: 8274e596617d0ba318948f11dda305e8e36819a2f499b8344536a769b576439fcb9a99daaa759d33d2a25629586a5bbff99259ded9682931a8fb5be6357bb2fd
+  data.tar.gz: 9931e5cff829a95398adeac12e22a8461ac3abb0b0001829876495e53b66489ef13896dea7106624602bc1ddc2abcacf2bbd3df107266cbf99c69e5ca84e7e05

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # WaterDrop changelog
 
+### 2.6.5 (2023-07-22)
+- [Fix] Add cause to the errors that are passed into instrumentation (konalegi)
+
+### 2.6.4 (2023-07-11)
+- [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`.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    waterdrop (2.6.3)
+    waterdrop (2.6.5)
       karafka-core (>= 2.1.1, < 3.0.0)
       zeitwerk (~> 2.3)
 

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,18 +22,22 @@ module WaterDrop
           producer_id: id,
           message: message
         ) { produce(message) }
-      rescue *SUPPORTED_FLOW_ERRORS
-        re_raised = Errors::ProduceError.new
+      rescue *SUPPORTED_FLOW_ERRORS => e
+        # We use this syntax here because we want to preserve the original `#cause` when we
+        # instrument the error and there is no way to manually assign `#cause` value
+        begin
+          raise Errors::ProduceError, e.inspect
+        rescue Errors::ProduceError => ex
+          @monitor.instrument(
+            'error.occurred',
+            producer_id: id,
+            message: message,
+            error: ex,
+            type: 'message.produce_async'
+          )
 
-        @monitor.instrument(
-          'error.occurred',
-          producer_id: id,
-          message: message,
-          error: re_raised,
-          type: 'message.produce_async'
-        )
-
-        raise re_raised
+          raise ex
+        end
       end
 
       # Produces many messages to Kafka and does not wait for them to be delivered
@@ -62,8 +66,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,18 +26,22 @@ module WaterDrop
         ) do
           wait(produce(message))
         end
-      rescue *SUPPORTED_FLOW_ERRORS
-        re_raised = Errors::ProduceError.new
+      rescue *SUPPORTED_FLOW_ERRORS => e
+        # We use this syntax here because we want to preserve the original `#cause` when we
+        # instrument the error and there is no way to manually assign `#cause` value
+        begin
+          raise Errors::ProduceError, e.inspect
+        rescue Errors::ProduceError => ex
+          @monitor.instrument(
+            'error.occurred',
+            producer_id: id,
+            message: message,
+            error: ex,
+            type: 'message.produce_sync'
+          )
 
-        @monitor.instrument(
-          'error.occurred',
-          producer_id: id,
-          message: message,
-          error: re_raised,
-          type: 'message.produce_sync'
-        )
-
-        raise re_raised
+          raise ex
+        end
       end
 
       # Produces many messages to Kafka and waits for them to be delivered
@@ -69,8 +73,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

@@ -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.

data/lib/waterdrop/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: waterdrop
 version: !ruby/object:Gem::Version
-  version: 2.6.3
+  version: 2.6.5
 platform: ruby
 authors:
 - Maciej Mensfeld
@@ -35,7 +35,7 @@ cert_chain:
   Qf04B9ceLUaC4fPVEz10FyobjaFoY4i32xRto3XnrzeAgfEe4swLq8bQsR3w/EF3
   MGU0FeSV2Yj7Xc2x/7BzLK8xQn5l7Yy75iPF+KP3vVmDHnNl
   -----END CERTIFICATE-----
-date: 2023-06-28 00:00:00.000000000 Z
+date: 2023-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: karafka-core