waterdrop 2.4.7 → 2.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8aa78b8b5f2d8534689cb9fe3db46d579610ce3b4767cef46b16d8fb1e19d48e
-  data.tar.gz: 75ff38cc56317bc74047fe9ba53ee1f42b098299f694c1ad5767f80ed4c2cf7e
+  metadata.gz: 8fab3f2b565a128bcc34f8d8bd10b36b0bd9546d1c52109a97ad87449fcd1731
+  data.tar.gz: 891f381590986451b330f74ac0ab56e6d2873d84a778d33bf470db1fe5e8447d
 SHA512:
-  metadata.gz: 3e5589c065d8db716a277bb78e985b85fbe94c2d064eff1cae780f9b4fa6f64ddd95ef0591c99de2dcefedd5582c80ad83442f1cd53091b27349fb193bcd98f6
-  data.tar.gz: 9af7835c4419dd10af2cde93b42c7797e1811f3f049fe7ae4a50a8ccad50fc6f86a8703777c60410d10c1615386eaee2acbeacf073dd640ba24af24ed534326a
+  metadata.gz: de29a31f2d498bfd04577ddd7edec90603d1226bc9b355d3e65e62fae0e2cb0f89bc5708a0734425df0fc5458adcb01e5b59775fda3daaceab1de586b41ed07d
+  data.tar.gz: 052ea95a7c819c42ba62c1275b4895cf9b034e429ef34af0d4556965dd28cd0a9307a0a5613f3a126b4e41da6b0cfe8042e3f614045929203faca67c496d4352

data/.github/workflows/ci.yml

@@ -16,11 +16,12 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
+          - '3.2'
           - '3.1'
           - '3.0'
           - '2.7'
         include:
-          - ruby: '3.1'
+          - ruby: '3.2'
             coverage: 'true'
     steps:
       - uses: actions/checkout@v3
@@ -62,7 +63,7 @@ jobs:
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.1
+          ruby-version: 3.2
       - name: Install latest bundler
         run: gem install bundler --no-document
       - name: Install Diffend plugin

data/.ruby-version

@@ -1 +1 @@
-3.1.3
+3.2.0

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # WaterDrop changelog
 
+## 2.4.8 (2023-01-07)
+- Use monotonic time from Karafka core.
+
 ## 2.4.7 (2022-12-18)
 - Add support to customizable middlewares that can modify message hash prior to validation and dispatch.
 - Fix a case where upon not-available leader, metadata request would not be retried

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    waterdrop (2.4.7)
-      karafka-core (>= 2.0.7, < 3.0.0)
+    waterdrop (2.4.8)
+      karafka-core (>= 2.0.8, < 3.0.0)
       zeitwerk (~> 2.3)
 
 GEM
@@ -22,11 +22,11 @@ GEM
     ffi (1.15.5)
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    karafka-core (2.0.7)
+    karafka-core (2.0.8)
       concurrent-ruby (>= 1.1)
       rdkafka (>= 0.12)
-    mini_portile2 (2.8.0)
-    minitest (5.16.3)
+    mini_portile2 (2.8.1)
+    minitest (5.17.0)
     rake (13.0.6)
     rdkafka (0.12.0)
       ffi (~> 1.15)
@@ -38,14 +38,14 @@ GEM
       rspec-mocks (~> 3.12.0)
     rspec-core (3.12.0)
       rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.0)
+    rspec-expectations (3.12.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.0)
+    rspec-mocks (3.12.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
-    simplecov (0.21.2)
+    simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
@@ -67,4 +67,4 @@ DEPENDENCIES
   waterdrop!
 
 BUNDLED WITH
-   2.3.26
+   2.4.2

data/lib/waterdrop/contracts/config.rb

@@ -7,7 +7,7 @@ module WaterDrop
       configure do |config|
         config.error_messages = YAML.safe_load(
           File.read(
-            File.join(WaterDrop.gem_root, 'config', 'errors.yml')
+            File.join(WaterDrop.gem_root, 'config', 'locales', 'errors.yml')
           )
         ).fetch('en').fetch('validations').fetch('config')
       end

data/lib/waterdrop/contracts/message.rb

@@ -8,7 +8,7 @@ module WaterDrop
       configure do |config|
         config.error_messages = YAML.safe_load(
           File.read(
-            File.join(WaterDrop.gem_root, 'config', 'errors.yml')
+            File.join(WaterDrop.gem_root, 'config', 'locales', 'errors.yml')
           )
         ).fetch('en').fetch('validations').fetch('message')
       end

data/lib/waterdrop/patches/rdkafka/producer.rb

@@ -7,6 +7,8 @@ module WaterDrop
     module Rdkafka
       # Rdkafka::Producer patches
       module Producer
+        include ::Karafka::Core::Helpers::Time
+
         # Cache partitions count for 30 seconds
         PARTITIONS_COUNT_TTL = 30_000
 
@@ -20,7 +22,7 @@ module WaterDrop
             topic_metadata = ::Rdkafka::Metadata.new(inner_kafka, topic).topics&.first
 
             cache[topic] = [
-              now,
+              monotonic_now,
               topic_metadata ? topic_metadata[:partition_count] : nil
             ]
           end
@@ -46,7 +48,7 @@ module WaterDrop
           closed_producer_check(__method__)
 
           @_partitions_count_cache.delete_if do |_, cached|
-            now - cached.first > PARTITIONS_COUNT_TTL
+            monotonic_now - cached.first > PARTITIONS_COUNT_TTL
           end
 
           @_partitions_count_cache[topic].last
@@ -68,11 +70,6 @@ module WaterDrop
 
           @_inner_kafka
         end
-
-        # @return [Float] current clock time
-        def now
-          ::Process.clock_gettime(::Process::CLOCK_MONOTONIC) * 1_000
-        end
       end
     end
   end

data/lib/waterdrop/version.rb

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

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.0.7', '< 3.0.0'
+  spec.add_dependency 'karafka-core', '>= 2.0.8', '< 3.0.0'
   spec.add_dependency 'zeitwerk', '~> 2.3'
 
   spec.required_ruby_version = '>= 2.7'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: waterdrop
 version: !ruby/object:Gem::Version
-  version: 2.4.7
+  version: 2.4.8
 platform: ruby
 authors:
 - Maciej Mensfeld
@@ -35,7 +35,7 @@ cert_chain:
   Qf04B9ceLUaC4fPVEz10FyobjaFoY4i32xRto3XnrzeAgfEe4swLq8bQsR3w/EF3
   MGU0FeSV2Yj7Xc2x/7BzLK8xQn5l7Yy75iPF+KP3vVmDHnNl
   -----END CERTIFICATE-----
-date: 2022-12-18 00:00:00.000000000 Z
+date: 2023-01-07 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.0.7
+        version: 2.0.8
     - - "<"
       - !ruby/object:Gem::Version
         version: 3.0.0
@@ -53,7 +53,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.7
+        version: 2.0.8
     - - "<"
       - !ruby/object:Gem::Version
         version: 3.0.0
@@ -92,7 +92,7 @@ files:
 - MIT-LICENSE
 - README.md
 - certs/cert_chain.pem
-- config/errors.yml
+- config/locales/errors.yml
 - docker-compose.yml
 - lib/waterdrop.rb
 - lib/waterdrop/config.rb
@@ -142,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.1
 signing_key: 
 specification_version: 4
 summary: Kafka messaging made easy!