waterdrop 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24189103d7583fac3c911f4b32244655ffa2cd1b5a95abe0e73dbd4344530c5b
-  data.tar.gz: b4f5c0e95af559e0a0a929d14a3b56b39c4da5edc9b1d9ffe995e8b1852d9c14
+  metadata.gz: e04020bed5a4adb3cb5ed3486367c9bae0b66998b0c25912a699b64e5c348917
+  data.tar.gz: c2ce9c2f9a3169201a66f948b307ab5d4b1c0d5caa130b1dca1e7c2f90db666e
 SHA512:
-  metadata.gz: bd49152ec9f6325cf58d9d470ed1ccfdb0c5b5d9a899bcdca289500ab56008b1153db35bf90f8e5e167692be8c79cd5bf96bbf66f9f515f97922bb217a0544d5
-  data.tar.gz: 32b36daf1f26227c58690fea5a6846c7599d1e8859e074ca3f2075cf0effa187cfbb4cb86a50ea22dfe169d3af54fd2e3232e14c569efcaa625f52166f227dbb
+  metadata.gz: a40f4811e0ae0356980dfec3a0c0847409186b2afcb7d148e3afadb2c879c6ead03fcfe365e2a3cd15ed45ea1bf9afef7bd89567918dfde3d13741044f5ad36e
+  data.tar.gz: ec09878e1db68243141b4d2a751b7841627f38866199680ed8e08910257e28862c620864d5bd27c880e3176c960960040ef37c447841c00718fd6419f56770f1

data/.github/workflows/ci.yml

@@ -29,6 +29,12 @@ jobs:
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{matrix.ruby}}
+      - name: Run Kafka with docker-compose
+        # We need to give Kafka enough time to start and create all the needed topics, etc
+        # If anyone has a better idea on how to do it smart and easily, please contact me
+        run: |
+          docker-compose up -d
+          sleep 5
       - name: Install latest bundler
         run: |
           gem install bundler --no-document
@@ -37,8 +43,6 @@ jobs:
         run: |
           bundle config set without development
           bundle install --jobs 4 --retry 3
-      - name: Run Kafka with docker-compose
-        run: docker-compose up -d
       - name: Run all tests
         env:
           GITHUB_COVERAGE: ${{matrix.coverage}}

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # WaterDrop changelog
 
+## 2.0.3 (2021-09-05)
+- Remove rdkafka patch in favour of spec topic pre-creation
+- Do not close client that was never used upon closing producer
+
 ## 2.0.2 (2021-08-13)
 - Add support for `partition_key`
 - Switch license from `LGPL-3.0` to  `MIT`

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    waterdrop (2.0.2)
+    waterdrop (2.0.3)
       concurrent-ruby (>= 1.1)
       dry-configurable (~> 0.8)
       dry-monitor (~> 0.3)
@@ -12,7 +12,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.4)
+    activesupport (6.1.4.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -43,7 +43,7 @@ GEM
       dry-configurable (~> 0.5)
       dry-core (~> 0.5, >= 0.5)
       dry-events (~> 0.2)
-    dry-schema (1.7.0)
+    dry-schema (1.7.1)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.8, >= 0.8.3)
       dry-core (~> 0.5, >= 0.5)
@@ -68,7 +68,7 @@ GEM
     ffi (1.15.3)
     i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    mini_portile2 (2.6.1)
+    mini_portile2 (2.7.0)
     minitest (5.14.4)
     rake (13.0.6)
     rdkafka (0.9.0)
@@ -111,4 +111,4 @@ DEPENDENCIES
   waterdrop!
 
 BUNDLED WITH
-   2.2.25
+   2.2.26

data/docker-compose.yml

@@ -13,5 +13,6 @@ services:
       KAFKA_ADVERTISED_PORT: 9092
       KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
       KAFKA_AUTO_CREATE_TOPICS_ENABLE: 'true'
+      KAFKA_CREATE_TOPICS: 'example_topic:1:1'
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock

data/lib/water_drop/producer.rb

@@ -107,7 +107,9 @@ module WaterDrop
 
           # We should not close the client in several threads the same time
           # It is safe to run it several times but not exactly the same moment
-          client.close
+          # We also mark it as closed only if it was connected, if not, it would trigger a new
+          # connection that anyhow would be immediately closed
+          client.close if @client
 
           @status.closed!
         end

data/lib/water_drop/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: waterdrop
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Maciej Mensfeld
@@ -34,7 +34,7 @@ cert_chain:
   R2P11bWoCtr70BsccVrN8jEhzwXngMyI2gVt750Y+dbTu1KgRqZKp/ECe7ZzPzXj
   pIy9vHxTANKYVyI4qj8OrFdEM5BQNu8oQpL0iQ==
   -----END CERTIFICATE-----
-date: 2021-08-13 00:00:00.000000000 Z
+date: 2021-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -152,7 +152,6 @@ files:
 - lib/water_drop/instrumentation.rb
 - lib/water_drop/instrumentation/monitor.rb
 - lib/water_drop/instrumentation/stdout_listener.rb
-- lib/water_drop/patches/rdkafka_producer.rb
 - lib/water_drop/producer.rb
 - lib/water_drop/producer/async.rb
 - lib/water_drop/producer/buffer.rb
@@ -184,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.25
+rubygems_version: 3.2.26
 signing_key: 
 specification_version: 4
 summary: Kafka messaging made easy!

data/lib/water_drop/patches/rdkafka_producer.rb

@@ -1,49 +0,0 @@
-# frozen_string_literal: true
-
-module WaterDrop
-  # Patches to external components
-  module Patches
-    # `Rdkafka::Producer` patches
-    module RdkafkaProducer
-      # Errors upon which we want to retry message production
-      # @note Since production happens async, those errors should only occur when using
-      #   partition_key, thus only then we handle them
-      RETRYABLES = %w[
-        leader_not_available
-        err_not_leader_for_partition
-        invalid_replication_factor
-        transport
-        timed_out
-      ].freeze
-
-      # How many attempts do we want to make before re-raising the error
-      MAX_ATTEMPTS = 5
-
-      private_constant :RETRYABLES, :MAX_ATTEMPTS
-
-      # @param args [Object] anything `Rdkafka::Producer#produce` accepts
-      #
-      # @note This can be removed once this: https://github.com/appsignal/rdkafka-ruby/issues/163
-      #   is resolved.
-      def produce(**args)
-        attempt ||= 0
-        attempt += 1
-
-        super
-      rescue Rdkafka::RdkafkaError => e
-        raise unless args.key?(:partition_key)
-        # We care only about specific errors
-        # https://docs.confluent.io/platform/current/clients/librdkafka/html/md_INTRODUCTION.html
-        raise unless RETRYABLES.any? { |message| e.message.to_s.include?(message) }
-        raise if attempt > MAX_ATTEMPTS
-
-        max_sleep = 2**attempt / 10.0
-        sleep rand(0.01..max_sleep)
-
-        retry
-      end
-    end
-  end
-end
-
-Rdkafka::Producer.prepend(WaterDrop::Patches::RdkafkaProducer)