sbmt-kafka_consumer 2.3.1 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 903e47e49b20391d11feb8f0f278b52ff6e765daa3a5fa27b50e7e673612d5db
-  data.tar.gz: 95c9e87e8a1dde1c85d1266166694e0b06d82c645cd5affcb4f06200bb66d4af
+  metadata.gz: 3d328765bacde07e4c62f2a9844bb22ab61192ee180d2837a4fdfd1a5e4258dd
+  data.tar.gz: a7b441d6e0a6d2aa29b1e1e3e8474cc0076463b00b56697b8b3cccc204567a14
 SHA512:
-  metadata.gz: 40aef0b43f7e39c7f61c32a2bd226893988970ad9d0be02692c12fdfaae06553d56d0464aff307b3a01445c0e683f90eb219768289aedea6423671a2f6e06136
-  data.tar.gz: 6fe8bc839e28521bc8795aca004e3dbc0f79bda8d18c2844c01e3ac9d12bdbccb29be894dff8b5ddeb073ae7bcf7e20cfb189b76a2c349aada1457a4f8f857ae
+  metadata.gz: 61ecdb8df804c1fa008bb1421037f1f96c062d3ec3fb1ac3034ef0a45bfa9641e2bfef4b9bee364597781436e852661a3e04375a3c9236199e557c5abce521d5
+  data.tar.gz: 4eb7926ffb74c3423c0d83a0066ba33d35e6f0f722e93c2dff9f4f953dc7c5988953e5cd55ca5ed71084ee3834c4a8530c940f550a1be88d140c01b82102bc9f

data/CHANGELOG.md

@@ -13,6 +13,18 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Fixed
 
+## [2.4.1] - 2024-06-15
+
+### Fixed
+
+- Fixed display of metrics `kafka_api_calls`  and `kafka_api_errors`
+
+## [2.4.0] - 2024-06-06
+
+### Added
+
+- Added option `midlewares` to add middleware before message processing
+
 ## [2.3.1] - 2024-06-05
 
 ### Fixed

data/README.md

@@ -183,12 +183,45 @@ consumer_groups:
 #### `consumer.init_attrs` options for `BaseConsumer`
 
 - `skip_on_error` - optional, default false, omit consumer errors in message processing and commit the offset to Kafka
+- `middlewares` - optional, default [], type String, add middleware before message processing
+
+```yaml
+init_attrs:
+  middlewares: ['SomeMiddleware']
+```
+
+```ruby
+class SomeMiddleware
+  def call(message)
+    yield if message.payload.id.to_i % 2 == 0
+  end
+end
+```
+__CAUTION__:
+- ⚠️ `yield` is mandatory for all middleware, as it returns control to the `process_message` method.
 
 #### `consumer.init_attrs` options for `InboxConsumer`
 
 - `inbox_item` - required, name of the inbox item class
 - `event_name` - optional, default nil, used when the inbox item keep several event types
 - `skip_on_error` - optional, default false, omit consumer errors in message processing and commit the offset to Kafka
+- `middlewares` - optional, default [], type String, add middleware before message processing
+
+```yaml
+init_attrs:
+  middlewares: ['SomeMiddleware']
+```
+
+```ruby
+class SomeMiddleware
+  def call(message)
+    yield if message.payload.id.to_i % 2 == 0
+  end
+end
+```
+__CAUTION__:
+- ⚠️ `yield` is mandatory for all middleware, as it returns control to the `process_message` method.
+- ⚠️ Doesn't work with `process_batch`.
 
 #### `deserializer.init_attrs` options
 

data/lib/sbmt/kafka_consumer/base_consumer.rb

@@ -5,9 +5,10 @@ module Sbmt
     class BaseConsumer < Karafka::BaseConsumer
       attr_reader :trace_id
 
-      def self.consumer_klass(skip_on_error: false)
+      def self.consumer_klass(skip_on_error: false, middlewares: [])
         Class.new(self) do
           const_set(:SKIP_ON_ERROR, skip_on_error)
+          const_set(:MIDDLEWARES, middlewares.map(&:constantize))
 
           def self.name
             superclass.name
@@ -93,7 +94,7 @@ module Sbmt
         # so we trigger it explicitly to catch undeserializable message early
         message.payload
 
-        process_message(message)
+        call_middlewares(message, middlewares) { process_message(message) }
 
         mark_as_consumed!(message)
       end
@@ -102,6 +103,10 @@ module Sbmt
         self.class::SKIP_ON_ERROR
       end
 
+      def middlewares
+        self.class::MIDDLEWARES
+      end
+
       # can be overridden in consumer to enable message logging
       def log_payload?
         false
@@ -132,6 +137,21 @@ module Sbmt
       def message_payload(message)
         message.payload || message.raw_payload
       end
+
+      def call_middlewares(message, middlewares)
+        return yield if middlewares.empty?
+
+        chain = middlewares.map { |middleware_class| middleware_class.new }
+
+        traverse_chain = proc do
+          if chain.empty?
+            yield
+          else
+            chain.shift.call(message, &traverse_chain)
+          end
+        end
+        traverse_chain.call
+      end
     end
   end
 end

data/lib/sbmt/kafka_consumer/inbox_consumer.rb

@@ -6,11 +6,12 @@ module Sbmt
       IDEMPOTENCY_HEADER_NAME = "Idempotency-Key"
       DEFAULT_SOURCE = "KAFKA"
 
-      def self.consumer_klass(inbox_item:, event_name: nil, skip_on_error: false, name: nil)
+      def self.consumer_klass(inbox_item:, event_name: nil, skip_on_error: false, name: nil, middlewares: [])
         Class.new(self) do
           const_set(:INBOX_ITEM_CLASS_NAME, inbox_item)
           const_set(:EVENT_NAME, event_name)
           const_set(:SKIP_ON_ERROR, skip_on_error)
+          const_set(:MIDDLEWARES, middlewares.map(&:constantize))
 
           def self.name
             superclass.name

data/lib/sbmt/kafka_consumer/instrumentation/yabeda_metrics_listener.rb

@@ -129,7 +129,7 @@ module Sbmt
             }
 
             Yabeda.kafka_api.calls
-              .increment(broker_tags, by: broker_statistics["tx"])
+              .increment(broker_tags, by: broker_statistics["tx_d"])
             Yabeda.kafka_api.latency
               .measure(broker_tags, broker_statistics["rtt"]["avg"])
             Yabeda.kafka_api.request_size
@@ -137,7 +137,7 @@ module Sbmt
             Yabeda.kafka_api.response_size
               .measure(broker_tags, broker_statistics["rxbytes"])
             Yabeda.kafka_api.errors
-              .increment(broker_tags, by: broker_statistics["txerrs"] + broker_statistics["rxerrs"])
+              .increment(broker_tags, by: broker_statistics["txerrs_d"] + broker_statistics["rxerrs_d"])
           end
         end
 

data/lib/sbmt/kafka_consumer/version.rb

@@ -2,6 +2,6 @@
 
 module Sbmt
   module KafkaConsumer
-    VERSION = "2.3.1"
+    VERSION = "2.4.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sbmt-kafka_consumer
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.4.1
 platform: ruby
 authors:
 - Sbermarket Ruby-Platform Team
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-06-05 00:00:00.000000000 Z
+date: 2024-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails