sbmt-kafka_consumer 3.2.1 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d68fc606cb503382ebd9ff90d5e9a9c191c6905e0d76aeccfdef8d2fd98f2f4
-  data.tar.gz: 847b1844371d842ed88cbfcfbff48f95d74de91a5b108869cdbba3238494a821
+  metadata.gz: 59edd9a2025974b834689fbccd4e9637c90b217a71a30da14515c99ce6ced9e4
+  data.tar.gz: cb08c1a44da7bf4a508ebeed15318d7ea0eb461482e997fe194b8f14141a1cd4
 SHA512:
-  metadata.gz: 4f3e97d8a636a24a7b81304be3410ee5e9960017369a1a7fcee8a166166cf8b5503ab9641cdf455d84cefaab69469ae1530c40e69aa1bc97eb3b4fa1cae1f501
-  data.tar.gz: 5f8177ca6245d822974dc32a763628e7720ec89921fd45dc9ddeecf61dc9360b0690f9280fed400048afc2b02ac72b7c5c46a61e1068c92dd9d567b0e33db735
+  metadata.gz: ca488baebfdc131c41f9731e1aba206d19c000e657d5fd2b35b04bb0907d70a8f89195761b75076dfca26763f867e1ace2a2a20873db477950ea420151197932
+  data.tar.gz: 3581fe9beed1978490f1786b0b2c6fba3c4416a0b462e12e24e74871937f8c9bff53790f62d944724359dd732009befabd6e9fc410691ad739b92a3ebc59a9e4

data/CHANGELOG.md

@@ -13,6 +13,23 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Fixed
 
+## [3.3.0] - 2024-09-30
+
+### Added
+
+- inheritance of kafka settings for topic
+
+### Fixed
+ 
+- support `karafka 2.4.12`
+- properly report metrics for consumer offset lag when partition fetch assignment was lost
+
+## [3.2.2] - 2024-09-23
+
+### Fixed
+ 
+- log OTEL `trace_id`
+
 ## [3.2.1] - 2024-09-20
 
 ### Fixed

data/lib/sbmt/kafka_consumer/base_consumer.rb

@@ -162,7 +162,11 @@ module Sbmt
       end
 
       def trace_id
-        @trace_id ||= SecureRandom.base58
+        return nil unless defined?(::OpenTelemetry)
+
+        context = ::OpenTelemetry::Trace.current_span.context
+
+        context.valid? ? context.hex_trace_id : nil
       end
 
       def config

data/lib/sbmt/kafka_consumer/client_configurer.rb

@@ -57,7 +57,7 @@ class Sbmt::KafkaConsumer::ClientConfigurer
               manual_offset_management t.manual_offset_management
               consumer t.consumer.consumer_klass
               deserializer t.deserializer.instantiate if t.deserializer.klass.present?
-              kafka t.kafka_options if t.kafka_options.present?
+              kafka t.kafka_options.merge(inherit: true) if t.kafka_options.present?
             end
           end
         end

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

@@ -165,6 +165,8 @@ module Sbmt
               offset_lag = partition_statistics["consumer_lag"]
               next if offset_lag == -1
 
+              next unless partition_owned?(partition_statistics)
+
               Yabeda.kafka_consumer.offset_lag
                 .set({
                   client: Karafka::App.config.client_id,
@@ -180,6 +182,13 @@ module Sbmt
         def time_elapsed_sec(event)
           (event.payload[:time] || 0) / 1000.0
         end
+
+        def partition_owned?(partition_statistics)
+          return false if partition_statistics["fetch_state"] == "stopped"
+          return false if partition_statistics["fetch_state"] == "none"
+
+          true
+        end
       end
     end
   end

data/lib/sbmt/kafka_consumer/version.rb

@@ -2,6 +2,6 @@
 
 module Sbmt
   module KafkaConsumer
-    VERSION = "3.2.1"
+    VERSION = "3.3.0"
   end
 end

data/sbmt-kafka_consumer.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "rails", ">= 6.1"
   spec.add_dependency "zeitwerk", "~> 2.3"
-  spec.add_dependency "karafka", "~> 2.4", "< 2.4.12"
+  spec.add_dependency "karafka", "~> 2.4"
   spec.add_dependency "yabeda", ">= 0.11"
   spec.add_dependency "anyway_config", ">= 2.4.0"
   spec.add_dependency "thor"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sbmt-kafka_consumer
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.3.0
 platform: ruby
 authors:
 - Kuper Ruby-Platform Team
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-09-20 00:00:00.000000000 Z
+date: 2024-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -45,9 +45,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.4'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 2.4.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -55,9 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.4'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 2.4.12
 - !ruby/object:Gem::Dependency
   name: yabeda
   requirement: !ruby/object:Gem::Requirement