waterdrop 2.4.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0bd7288d6c0c7a6f356f050af309899cad41e6fcf202c945229231d7058194e1
-  data.tar.gz: 727738b727dccf8e2d7b4eb7c3f25b1c7ed761eb958eae4ba818c7402839a6c7
+  metadata.gz: 70b84fa09ce807d6d72679917d6c9b98a4dd15b9eb50f0ae9c556acc6f084632
+  data.tar.gz: 8ccffe9e5331865dc93ab4c8b4b8ace2e0c3297f164c378b7919a14e307edf70
 SHA512:
-  metadata.gz: 95f69c8cd00d33e04747f1447ca9fe40de88941869925662116427b14da7f0eb0a04c7eada0e00ea6c226dd8be90484b7e97e6d34f9c7f0a11333bfede37e03c
-  data.tar.gz: fa43e25469180c9d9e65f31b4d79554b35c090e79d8812586d614a77acafe04bb873f24ed58f739c4523696282bef8dfa05e0fa0358ca808bfd2df038bf3d55b
+  metadata.gz: 66f25845bada1a7de0f6bd100b7966f246604701f0394891bc959817f222b739a73fc674b49d288ebf3674c85e9872db37069771f347fad98eeade561373610c
+  data.tar.gz: 308eafaec616bf936517086de4bcee0efa03ed555ad91a061588b781d9214198fa67258a0d7044eae523fbba4da57fa447ddafdcf3169a234cdc4b0785151c6e

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # WaterDrop changelog
 
+## 2.4.1 (2022-08-01)
+- Replace local statistics decorator with the one extracted to `karafka-core`.
+
 ## 2.4.0 (2022-07-28)
 - Small refactor of the DataDog/Statsd listener to align for future extraction to `karafka-common`.
 - Replace `dry-monitor` with home-brew notification layer (API compatible) and allow for usage with `ActiveSupport::Notifications`.

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    waterdrop (2.4.0)
-      karafka-core (~> 2.0)
+    waterdrop (2.4.1)
+      karafka-core (>= 2.0.2, < 3.0.0)
       rdkafka (>= 0.10)
       zeitwerk (~> 2.3)
 
@@ -23,7 +23,7 @@ GEM
     ffi (1.15.5)
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    karafka-core (2.0.0)
+    karafka-core (2.0.2)
       concurrent-ruby (>= 1.1)
     mini_portile2 (2.8.0)
     minitest (5.16.2)

data/lib/waterdrop/instrumentation/callbacks/statistics.rb

@@ -17,7 +17,7 @@ module WaterDrop
           @producer_id = producer_id
           @client_name = client_name
           @monitor = monitor
-          @statistics_decorator = StatisticsDecorator.new
+          @statistics_decorator = ::Karafka::Core::Monitoring::StatisticsDecorator.new
         end
 
         # Emits decorated statistics to the monitor

data/lib/waterdrop/version.rb

@@ -3,5 +3,5 @@
 # WaterDrop library
 module WaterDrop
   # Current WaterDrop version
-  VERSION = '2.4.0'
+  VERSION = '2.4.1'
 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'
+  spec.add_dependency 'karafka-core', '>= 2.0.2', '< 3.0.0'
   spec.add_dependency 'rdkafka', '>= 0.10'
   spec.add_dependency 'zeitwerk', '~> 2.3'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: waterdrop
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
 platform: ruby
 authors:
 - Maciej Mensfeld
@@ -34,22 +34,28 @@ cert_chain:
   R2P11bWoCtr70BsccVrN8jEhzwXngMyI2gVt750Y+dbTu1KgRqZKp/ECe7ZzPzXj
   pIy9vHxTANKYVyI4qj8OrFdEM5BQNu8oQpL0iQ==
   -----END CERTIFICATE-----
-date: 2022-07-28 00:00:00.000000000 Z
+date: 2022-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: karafka-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.2
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.2
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rdkafka
   requirement: !ruby/object:Gem::Requirement
@@ -110,7 +116,6 @@ files:
 - lib/waterdrop/instrumentation/callbacks/delivery.rb
 - lib/waterdrop/instrumentation/callbacks/error.rb
 - lib/waterdrop/instrumentation/callbacks/statistics.rb
-- lib/waterdrop/instrumentation/callbacks/statistics_decorator.rb
 - lib/waterdrop/instrumentation/callbacks_manager.rb
 - lib/waterdrop/instrumentation/logger_listener.rb
 - lib/waterdrop/instrumentation/monitor.rb

metadata.gz.sig

@@ -1,5 +1,4 @@
-�D�T�[_g4r0Z���r�-(�� �d����$��HM��]��2�0��9�� D;�98@�.���\$ߝ0�Kn&�l��]��%�
-#9xg�j��OZ�tCp�4��ҥ��[��r�
-@~�5��/9��_'������0k��'-@G���������c�[":�jh�9]����^��i]�8�x�'tR���z^�@�f�n��O�!��ؗ����
-B��$Il�J�ۺE'����,���=��>ǡ��k�j�Pڪ'�[\���]��;̧��ԏ
-iB&U��z�1_���k���B�*�}])
+A��ˣ�v=�o�*>�.C{Ys�bA,��aB��?#
Ϻ��8\����wC�Ƈ��]%�S��Om�ȏY�u�v�Rm�l�a/����L��ӥ�J�����&����Ŷ{��a�&&Be�>b����}�}H�iݞL��h�����IE��
+%�Z#�i��ޭ��P��%���A��%D"��۩u0lJ)��Yͦ��
+}"�"�9�� B�.��?��)�)yLY3{q��7�x��-�E��fE�xmg�c��b�7Ԗ&��kt�Dx�7f����AY�X�\R����#L�_�
+�*8/I���ȖskMo��?�_���A��\�V��&*>���ؼ�ң����_=�ry*�:�D�CD��\�������[0���I	�6

data/lib/waterdrop/instrumentation/callbacks/statistics_decorator.rb

@@ -1,77 +0,0 @@
-# frozen_string_literal: true
-
-module WaterDrop
-  module Instrumentation
-    module Callbacks
-      # Many of the librdkafka statistics are absolute values instead of a gauge.
-      # This means, that for example number of messages sent is an absolute growing value
-      # instead of being a value of messages sent from the last statistics report.
-      # This decorator calculates the diff against previously emited stats, so we get also
-      # the diff together with the original values
-      class StatisticsDecorator
-        def initialize
-          @previous = {}.freeze
-        end
-
-        # @param emited_stats [Hash] original emited statistics
-        # @return [Hash] emited statistics extended with the diff data
-        # @note We modify the emited statistics, instead of creating new. Since we don't expose
-        #   any API to get raw data, users can just assume that the result of this decoration is
-        #   the proper raw stats that they can use
-        def call(emited_stats)
-          diff(
-            @previous,
-            emited_stats
-          )
-
-          @previous = emited_stats
-
-          emited_stats.freeze
-        end
-
-        private
-
-        # Calculates the diff of the provided values and modifies in place the emited statistics
-        #
-        # @param previous [Object] previous value from the given scope in which
-        #   we are
-        # @param current [Object] current scope from emitted statistics
-        # @return [Object] the diff if the values were numerics or the current scope
-        def diff(previous, current)
-          if current.is_a?(Hash)
-            # @note We cannot use #each_key as we modify the content of the current scope
-            #   in place (in case it's a hash)
-            current.keys.each do |key|
-              append(
-                current,
-                key,
-                diff((previous || {})[key], (current || {})[key])
-              )
-            end
-          end
-
-          # Diff can be computed only for numerics
-          return current unless current.is_a?(Numeric)
-          # If there was no previous value, delta is always zero
-          return 0 unless previous
-          # Should never happen but just in case, a type changed in between stats
-          return current unless previous.is_a?(Numeric)
-
-          current - previous
-        end
-
-        # Appends the result of the diff to a given key as long as the result is numeric
-        #
-        # @param current [Hash] current scope
-        # @param key [Symbol] key based on which we were diffing
-        # @param result [Object] diff result
-        def append(current, key, result)
-          return unless result.is_a?(Numeric)
-          return if current.frozen?
-
-          current["#{key}_d"] = result
-        end
-      end
-    end
-  end
-end