karafka 2.0.26 → 2.0.28

data/lib/karafka/processing/coordinator.rb

@@ -71,18 +71,28 @@ module Karafka
         end
       end
 
-      # @param consumer [Object] karafka consumer (normal or pro)
-      # @return [Karafka::Processing::Result] result object which we can use to indicate
-      #   consumption processing state.
-      def consumption(consumer)
+      # Is all the consumption done and finished successfully for this coordinator
+      def success?
         @mutex.synchronize do
-          @consumptions[consumer] ||= Processing::Result.new
+          @running_jobs.zero? && @consumptions.values.all?(&:success?)
         end
       end
 
-      # Is all the consumption done and finished successfully for this coordinator
-      def success?
-        @mutex.synchronize { @running_jobs.zero? && @consumptions.values.all?(&:success?) }
+      # Mark given consumption on consumer as successful
+      # @param consumer [Karafka::BaseConsumer] consumer that finished successfully
+      def success!(consumer)
+        @mutex.synchronize do
+          consumption(consumer).success!
+        end
+      end
+
+      # Mark given consumption on consumer as failed
+      # @param consumer [Karafka::BaseConsumer] consumer that failed
+      # @param error [StandardError] error that occurred
+      def failure!(consumer, error)
+        @mutex.synchronize do
+          consumption(consumer).failure!(error)
+        end
       end
 
       # Marks given coordinator for processing group as revoked
@@ -113,6 +123,15 @@ module Karafka
       def manual_pause?
         @pause_tracker.paused? && @manual_pause
       end
+
+      private
+
+      # @param consumer [Object] karafka consumer (normal or pro)
+      # @return [Karafka::Processing::Result] result object which we can use to indicate
+      #   consumption processing state.
+      def consumption(consumer)
+        @consumptions[consumer] ||= Processing::Result.new
+      end
     end
   end
 end

data/lib/karafka/processing/partitioner.rb

@@ -12,9 +12,11 @@ module Karafka
 
       # @param _topic [String] topic name
       # @param messages [Array<Karafka::Messages::Message>] karafka messages
+      # @param _coordinator [Karafka::Processing::Coordinator] processing coordinator that will
+      #   be used with those messages
       # @yieldparam [Integer] group id
       # @yieldparam [Array<Karafka::Messages::Message>] karafka messages
-      def call(_topic, messages)
+      def call(_topic, messages, _coordinator)
         yield(0, messages)
       end
     end

data/lib/karafka/processing/strategies/default.rb

@@ -31,10 +31,9 @@ module Karafka
           end
 
           # Mark job as successful
-          coordinator.consumption(self).success!
+          coordinator.success!(self)
         rescue StandardError => e
-          # If failed, mark as failed
-          coordinator.consumption(self).failure!(e)
+          coordinator.failure!(self, e)
 
           # Re-raise so reported in the consumer
           raise e

data/lib/karafka/setup/config.rb

@@ -16,7 +16,6 @@ module Karafka
 
       # Defaults for kafka settings, that will be overwritten only if not present already
       KAFKA_DEFAULTS = {
-        'client.id': 'karafka',
         # We emit the statistics by default, so all the instrumentation and web-ui work out of
         # the box, without requiring users to take any extra actions aside from enabling.
         'statistics.interval.ms': 5_000
@@ -193,6 +192,9 @@ module Karafka
             config.kafka[key] = value
           end
 
+          # Use Karafka client_id as kafka client id if not set
+          config.kafka[:'client.id'] ||= config.client_id
+
           return if Karafka::App.env.production?
 
           KAFKA_DEV_DEFAULTS.each do |key, value|

data/lib/karafka/templates/karafka.rb.erb

@@ -43,7 +43,7 @@ class KarafkaApp < Karafka::App
   routes.draw do
 <% if rails? -%>
     # Uncomment this if you use Karafka with ActiveJob
-    # You ned to define the topic per each queue name you use
+    # You need to define the topic per each queue name you use
     # active_job_topic :default
 <% end -%>
     topic :example do

data/lib/karafka/version.rb

@@ -3,5 +3,5 @@
 # Main module namespace
 module Karafka
   # Current Karafka version
-  VERSION = '2.0.26'
+  VERSION = '2.0.28'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: karafka
 version: !ruby/object:Gem::Version
-  version: 2.0.26
+  version: 2.0.28
 platform: ruby
 authors:
 - Maciej Mensfeld
@@ -35,7 +35,7 @@ cert_chain:
   Qf04B9ceLUaC4fPVEz10FyobjaFoY4i32xRto3XnrzeAgfEe4swLq8bQsR3w/EF3
   MGU0FeSV2Yj7Xc2x/7BzLK8xQn5l7Yy75iPF+KP3vVmDHnNl
   -----END CERTIFICATE-----
-date: 2023-01-10 00:00:00.000000000 Z
+date: 2023-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: karafka-core
@@ -43,7 +43,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.8
+        version: 2.0.9
     - - "<"
       - !ruby/object:Gem::Version
         version: 3.0.0
@@ -53,7 +53,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.8
+        version: 2.0.9
     - - "<"
       - !ruby/object:Gem::Version
         version: 3.0.0
@@ -77,7 +77,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.7
+        version: 2.4.9
     - - "<"
       - !ruby/object:Gem::Version
         version: 3.0.0
@@ -87,7 +87,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.7
+        version: 2.4.9
     - - "<"
       - !ruby/object:Gem::Version
         version: 3.0.0
@@ -224,6 +224,7 @@ files:
 - lib/karafka/pro/encryption/setup/config.rb
 - lib/karafka/pro/loader.rb
 - lib/karafka/pro/performance_tracker.rb
+- lib/karafka/pro/processing/collapser.rb
 - lib/karafka/pro/processing/coordinator.rb
 - lib/karafka/pro/processing/jobs/consume_non_blocking.rb
 - lib/karafka/pro/processing/jobs/revoked_non_blocking.rb
@@ -231,7 +232,9 @@ files:
 - lib/karafka/pro/processing/partitioner.rb
 - lib/karafka/pro/processing/scheduler.rb
 - lib/karafka/pro/processing/strategies/aj_dlq_lrj_mom.rb
+- lib/karafka/pro/processing/strategies/aj_dlq_lrj_mom_vp.rb
 - lib/karafka/pro/processing/strategies/aj_dlq_mom.rb
+- lib/karafka/pro/processing/strategies/aj_dlq_mom_vp.rb
 - lib/karafka/pro/processing/strategies/aj_lrj_mom.rb
 - lib/karafka/pro/processing/strategies/aj_lrj_mom_vp.rb
 - lib/karafka/pro/processing/strategies/aj_mom.rb
@@ -241,7 +244,9 @@ files:
 - lib/karafka/pro/processing/strategies/dlq.rb
 - lib/karafka/pro/processing/strategies/dlq_lrj.rb
 - lib/karafka/pro/processing/strategies/dlq_lrj_mom.rb
+- lib/karafka/pro/processing/strategies/dlq_lrj_vp.rb
 - lib/karafka/pro/processing/strategies/dlq_mom.rb
+- lib/karafka/pro/processing/strategies/dlq_vp.rb
 - lib/karafka/pro/processing/strategies/lrj.rb
 - lib/karafka/pro/processing/strategies/lrj_mom.rb
 - lib/karafka/pro/processing/strategies/lrj_vp.rb
@@ -343,7 +348,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="