sbmt-kafka_consumer 2.6.0 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 167a1f001609eaac9e7cfb33fbd19422a89711d099dedd4b4bdc96b63731562a
-  data.tar.gz: fe081b40a7c1d2462b95874bb9c089b7604db7c7b15e7717ce904462b90383e3
+  metadata.gz: 4db2a1a6eecab6ef429ef1591991a38e19d5996f1881f8e21e1382513ccd972b
+  data.tar.gz: 490e1c37ce5029efe299119cd7a879fbdb7e0ee3be8e1bc49f4c18a7ad0a0b4c
 SHA512:
-  metadata.gz: de1d6a79ee8fa4eb55830b186037b17b5d900cb6fba4b19556dbc78d62da7d9d8a70dd1b5c829a99dfb88ea60b78ed49ec61c75b00d377311af693167924f4b8
-  data.tar.gz: d2fd8c167da6f471d00a5cad5542fdc0cd5815a3f0680a1bd9404203ce982bddc3b3d50ce524448113cdf97f9d5cebc56c2e23820c5d53a242f2a98e698d60fd
+  metadata.gz: 11ab3951c1caa9cf2975199c4815838058c719038f77cdc8d563ef36248eebf312cf06e66d9b43058918f3042f88312144f36183f0cddfe882c3b9c03b5e5c8d
+  data.tar.gz: 5eedd592dd638ac22181e2bd5717e8ef63ca2e4b23cfa1c79c05c0fb3c1596586492eff32c3a5b1475ce997dd8f184e0e6e9024252922409fc3dee5d474e7d8b

data/CHANGELOG.md

@@ -13,6 +13,18 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Fixed
 
+## [2.7.0] - 2024-07-30
+
+### Changed
+
+- When using strategy `cooperative-sticky`, method `mark_as_consumed` is used ([more details](https://github.com/karafka/karafka/wiki/FAQ#why-when-using-cooperative-sticky-rebalance-strategy-all-topics-get-revoked-on-rebalance))
+
+## [2.6.1] - 2024-07-05
+
+### Fixed
+
+- Use the current `trace_id` instead of creating a new one
+
 ## [2.6.0] - 2024-07-01
 
 ### Added

data/lib/sbmt/kafka_consumer/base_consumer.rb

@@ -3,8 +3,6 @@
 module Sbmt
   module KafkaConsumer
     class BaseConsumer < Karafka::BaseConsumer
-      attr_reader :trace_id
-
       def self.consumer_klass(skip_on_error: false, middlewares: [])
         Class.new(self) do
           const_set(:SKIP_ON_ERROR, skip_on_error)
@@ -21,7 +19,7 @@ module Sbmt
           if process_batch?
             with_batch_instrumentation(messages) do
               process_batch(messages)
-              mark_as_consumed!(messages.last)
+              mark_message(messages.last)
             end
           else
             messages.each do |message|
@@ -41,8 +39,6 @@ module Sbmt
       private
 
       def with_instrumentation(message)
-        @trace_id = SecureRandom.base58
-
         logger.tagged(
           trace_id: trace_id,
           topic: message.metadata.topic, partition: message.metadata.partition,
@@ -69,8 +65,6 @@ module Sbmt
       end
 
       def with_batch_instrumentation(messages)
-        @trace_id = SecureRandom.base58
-
         logger.tagged(
           trace_id: trace_id,
           first_offset: messages.first.metadata.offset,
@@ -88,8 +82,6 @@ module Sbmt
       end
 
       def with_common_instrumentation(name, message)
-        @trace_id = SecureRandom.base58
-
         logger.tagged(
           trace_id: trace_id
         ) do
@@ -116,7 +108,7 @@ module Sbmt
         end
 
         with_common_instrumentation("mark_as_consumed", message) do
-          mark_as_consumed!(message)
+          mark_message(message)
         end
       end
 
@@ -173,6 +165,26 @@ module Sbmt
         end
         traverse_chain.call
       end
+
+      def trace_id
+        @trace_id ||= SecureRandom.base58
+      end
+
+      def config
+        @config ||= Sbmt::KafkaConsumer::Config.new
+      end
+
+      def cooperative_sticky?
+        config.partition_assignment_strategy == "cooperative-sticky"
+      end
+
+      def mark_message(message)
+        if cooperative_sticky?
+          mark_as_consumed(message)
+        else
+          mark_as_consumed!(message)
+        end
+      end
     end
   end
 end

data/lib/sbmt/kafka_consumer/version.rb

@@ -2,6 +2,6 @@
 
 module Sbmt
   module KafkaConsumer
-    VERSION = "2.6.0"
+    VERSION = "2.7.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sbmt-kafka_consumer
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.7.0
 platform: ruby
 authors:
 - Sbermarket Ruby-Platform Team
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-07-01 00:00:00.000000000 Z
+date: 2024-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -570,7 +570,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Ruby gem for consuming Kafka messages