sbmt-kafka_consumer 2.1.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 260ec80f2e17f9aef25d51a0eba28f43cb8ea524c3d2d956dea2fd5a240123f3
-  data.tar.gz: b302aac60dd45b5bb3da4af3e52e1a21f1fa5f4cd126837c68cbb50c20cc894a
+  metadata.gz: 466c2702a664bfe4ad5916c115dddb574e2108a990af6b686c5eea3298fd3a4c
+  data.tar.gz: 140e5ea106e9374df42dab0e372be5ff3c547a33882391a4634e368fc93b8737
 SHA512:
-  metadata.gz: db36d1846f7b91745464ccd2a1e11b97553760e43715aae41e4cf7c0671c51cf7e35efc6b14eab9ed572ccabd21b5cdd10a4bf97b6fbf898bf4ddc83c728b2ac
-  data.tar.gz: 631e701e0c5cc15e059faa00c6e5a55ef8d92f2ad45b0c4a8d7467150f668569f3f1796453b5e1596ab489b3dc32ac3d3ca6124431077c0ffd6d97158308adf7
+  metadata.gz: fc45d190f2cd0646049392a75c3f7d1a77db081669855f13b4d3dedb6f1a143cea6830659dbff9273fbde5517e3f11259e127ecb6c5a48a08cd4f6c71bbd93ea
+  data.tar.gz: 852f8c6da38cdb110cb5832d85f9798001f9b2fbf3db56c5b492cca4e44dcb3fc47639b60e4e5d143c8420a0b3f0c7e1467433f31861100c0578de62c6f49bec

data/.rubocop.yml

@@ -18,7 +18,7 @@ AllCops:
   NewCops: enable
   SuggestExtensions: false
   TargetRubyVersion: 2.7
-  TargetRailsVersion: 5.2
+  TargetRailsVersion: 6.0
   Exclude:
     - spec/internal/pkg/**/*
 

data/Appraisals

@@ -3,11 +3,10 @@
 # See compatibility table at https://www.fastruby.io/blog/ruby/rails/versions/compatibility-table.html
 
 versions_map = {
-  "5.2" => %w[2.7],
   "6.0" => %w[2.7],
   "6.1" => %w[2.7 3.0],
   "7.0" => %w[3.1],
-  "7.1" => %w[3.2]
+  "7.1" => %w[3.2, 3.3]
 }
 
 current_ruby_version = RUBY_VERSION.split(".").first(2).join(".")

data/CHANGELOG.md

@@ -13,6 +13,23 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Fixed
 
+## [2.3.0] - 2024-05-30
+
+### Added
+
+- New config option `partition_assignment_strategy`
+
+### Changed
+
+- Raise an exception when using the `partition.assignment.strategy` option within `kafka_options` for topics.
+
+## [2.2.0] - 2024-05-13
+
+### Changed
+
+- Drop support for Rails 5.2
+- Add support for Ruby 3.3
+
 ## [2.1.0] - 2024-05-13
 
 ### Added

data/Gemfile

@@ -3,3 +3,6 @@
 source "https://rubygems.org"
 
 gemspec
+
+# FIXME: remove this after drop support for Ruby 2.7
+gem "ffi", "< 1.17"

data/README.md

@@ -69,6 +69,7 @@ default: &default
   pause_timeout: 1
   pause_max_timeout: 30
   pause_with_exponential_backoff: true
+  partition_assignment_strategy: cooperative-sticky
   auth:
     kind: plaintext
   kafka:
@@ -155,6 +156,7 @@ auth:
 The `servers` key is required and should be in rdkafka format: without `kafka://` prefix, for example: `srv1:port1,srv2:port2,...`.
 
 The `kafka_config` section may contain any [rdkafka option](https://github.com/confluentinc/librdkafka/blob/master/CONFIGURATION.md). Also, `kafka_options` may be redefined for each topic.
+Please note that the `partition.assignment.strategy` option within kafka_options is not supported for topics; instead, use the global option partition_assignment_strategy. 
 
 ### `consumer_groups` config section
 

data/lib/generators/kafka_consumer/install/templates/kafka_consumer.yml

@@ -6,6 +6,8 @@ default: &default
   pause_timeout: 1
   pause_max_timeout: 30
   pause_with_exponential_backoff: true
+## available strategies: range, roundrobin, cooperative-sticky
+#  partition_assignment_strategy: "range,roundrobin"
   auth:
     kind: plaintext
   kafka:

data/lib/sbmt/kafka_consumer/config.rb

@@ -25,7 +25,7 @@ class Sbmt::KafkaConsumer::Config < Anyway::Config
 
   attr_config :client_id,
     :pause_timeout, :pause_max_timeout, :pause_with_exponential_backoff,
-    :max_wait_time, :shutdown_timeout,
+    :max_wait_time, :shutdown_timeout, :partition_assignment_strategy,
     concurrency: 4, auth: {}, kafka: {}, consumer_groups: {}, probes: {}, metrics: {},
     deserializer_class: "::Sbmt::KafkaConsumer::Serialization::NullDeserializer",
     monitor_class: "::Sbmt::KafkaConsumer::Instrumentation::TracingMonitor",
@@ -45,6 +45,7 @@ class Sbmt::KafkaConsumer::Config < Anyway::Config
     pause_with_exponential_backoff: :boolean,
     max_wait_time: :integer,
     shutdown_timeout: :integer,
+    partition_assignment_strategy: :string,
     concurrency: :integer
 
   coerce_types kafka: coerce_to(Kafka)
@@ -54,7 +55,10 @@ class Sbmt::KafkaConsumer::Config < Anyway::Config
   coerce_types consumer_groups: coerce_to_array_of(ConsumerGroup)
 
   def to_kafka_options
-    kafka.to_kafka_options
+    {
+      "partition.assignment.strategy": partition_assignment_strategy
+    }.compact
+      .merge(kafka.to_kafka_options)
       .merge(auth.to_kafka_options)
   end
 
@@ -64,6 +68,9 @@ class Sbmt::KafkaConsumer::Config < Anyway::Config
     consumer_groups.each do |cg|
       raise_validation_error "consumer group #{cg.id} must have at least one topic defined" if cg.topics.blank?
       cg.topics.each do |t|
+        if t.kafka_options.key?(:"partition.assignment.strategy")
+          raise_validation_error "Using the partition.assignment.strategy option for individual topics is not supported due to consuming issues. Use the global option `partition_assignment_strategy` instead"
+        end
         raise_validation_error "topic #{cg.id}.topics.name[#{t.name}] contains invalid consumer class: no const #{t.consumer.klass} defined" unless t.consumer.klass.safe_constantize
         raise_validation_error "topic #{cg.id}.topics.name[#{t.name}] contains invalid deserializer class: no const #{t.deserializer.klass} defined" unless t.deserializer&.klass&.safe_constantize
       end

data/lib/sbmt/kafka_consumer/version.rb

@@ -2,6 +2,6 @@
 
 module Sbmt
   module KafkaConsumer
-    VERSION = "2.1.0"
+    VERSION = "2.3.0"
   end
 end

data/sbmt-kafka_consumer.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "rails", ">= 5.2"
+  spec.add_dependency "rails", ">= 6.0"
   spec.add_dependency "zeitwerk", "~> 2.3"
   spec.add_dependency "karafka", "~> 2.2", "< 2.4" # [Breaking] Drop the concept of consumer group mapping.
   spec.add_dependency "yabeda", ">= 0.11"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sbmt-kafka_consumer
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Sbermarket Ruby-Platform Team
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement