karafka 2.4.15 → 2.4.17

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

@@ -24,7 +24,7 @@ module Karafka
           class_eval <<~RUBY, __FILE__, __LINE__ + 1
             # No actions needed for the standard flow here
             def handle_before_schedule_#{action}
-              Karafka.monitor.instrument('consumer.before_schedule_#{action}', caller: self)
+              monitor.instrument('consumer.before_schedule_#{action}', caller: self)
 
               nil
             end
@@ -35,8 +35,8 @@ module Karafka
         # @note It runs in the listener loop. Should **not** be used for anything heavy or
         #   with any potential errors. Mostly for initialization of states, etc.
         def handle_initialized
-          Karafka.monitor.instrument('consumer.initialize', caller: self)
-          Karafka.monitor.instrument('consumer.initialized', caller: self) do
+          monitor.instrument('consumer.initialize', caller: self)
+          monitor.instrument('consumer.initialized', caller: self) do
             initialized
           end
         end
@@ -54,13 +54,13 @@ module Karafka
         def mark_as_consumed(message)
           # seek offset can be nil only in case `#seek` was invoked with offset reset request
           # In case like this we ignore marking
-          return true if coordinator.seek_offset.nil?
+          return true if seek_offset.nil?
           # Ignore earlier offsets than the one we already committed
-          return true if coordinator.seek_offset > message.offset
+          return true if seek_offset > message.offset
           return false if revoked?
           return revoked? unless client.mark_as_consumed(message)
 
-          coordinator.seek_offset = message.offset + 1
+          self.seek_offset = message.offset + 1
 
           true
         end
@@ -73,14 +73,14 @@ module Karafka
         def mark_as_consumed!(message)
           # seek offset can be nil only in case `#seek` was invoked with offset reset request
           # In case like this we ignore marking
-          return true if coordinator.seek_offset.nil?
+          return true if seek_offset.nil?
           # Ignore earlier offsets than the one we already committed
-          return true if coordinator.seek_offset > message.offset
+          return true if seek_offset > message.offset
           return false if revoked?
 
           return revoked? unless client.mark_as_consumed!(message)
 
-          coordinator.seek_offset = message.offset + 1
+          self.seek_offset = message.offset + 1
 
           true
         end
@@ -115,10 +115,21 @@ module Karafka
           coordinator.pause_tracker.increment
         end
 
+        # Runs the wrapping to execute appropriate action wrapped with the wrapper method code
+        #
+        # @param action [Symbol]
+        # @param block [Proc]
+        def handle_wrap(action, &block)
+          monitor.instrument('consumer.wrap', caller: self)
+          monitor.instrument('consumer.wrapped', caller: self) do
+            wrap(action, &block)
+          end
+        end
+
         # Run the user consumption code
         def handle_consume
-          Karafka.monitor.instrument('consumer.consume', caller: self)
-          Karafka.monitor.instrument('consumer.consumed', caller: self) do
+          monitor.instrument('consumer.consume', caller: self)
+          monitor.instrument('consumer.consumed', caller: self) do
             consume
           end
 
@@ -164,8 +175,8 @@ module Karafka
 
         # Runs the consumer `#eofed` method with reporting
         def handle_eofed
-          Karafka.monitor.instrument('consumer.eof', caller: self)
-          Karafka.monitor.instrument('consumer.eofed', caller: self) do
+          monitor.instrument('consumer.eof', caller: self)
+          monitor.instrument('consumer.eofed', caller: self) do
             eofed
           end
         ensure
@@ -180,8 +191,8 @@ module Karafka
 
           coordinator.revoke
 
-          Karafka.monitor.instrument('consumer.revoke', caller: self)
-          Karafka.monitor.instrument('consumer.revoked', caller: self) do
+          monitor.instrument('consumer.revoke', caller: self)
+          monitor.instrument('consumer.revoked', caller: self) do
             revoked
           end
         ensure
@@ -190,8 +201,8 @@ module Karafka
 
         # Runs the shutdown code
         def handle_shutdown
-          Karafka.monitor.instrument('consumer.shutting_down', caller: self)
-          Karafka.monitor.instrument('consumer.shutdown', caller: self) do
+          monitor.instrument('consumer.shutting_down', caller: self)
+          monitor.instrument('consumer.shutdown', caller: self) do
             shutdown
           end
         ensure

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

@@ -81,11 +81,11 @@ module Karafka
 
               return if revoked?
             else
-              coordinator.seek_offset = skippable_message.offset + 1
+              self.seek_offset = skippable_message.offset + 1
             end
 
             # We pause to backoff once just in case.
-            pause(coordinator.seek_offset, nil, false)
+            pause(seek_offset, nil, false)
           end
         end
 
@@ -95,7 +95,7 @@ module Karafka
         #   information if this message was from marked offset or figured out via mom flow
         def find_skippable_message
           skippable_message = messages.find do |msg|
-            coordinator.marked? && msg.offset == coordinator.seek_offset
+            coordinator.marked? && msg.offset == seek_offset
           end
 
           # If we don't have the message matching the last comitted offset, it means that
@@ -117,7 +117,7 @@ module Karafka
           )
 
           # Notify about dispatch on the events bus
-          Karafka.monitor.instrument(
+          monitor.instrument(
             'dead_letter_queue.dispatched',
             caller: self,
             message: skippable_message

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

@@ -44,10 +44,10 @@ module Karafka
               # in an infinite loop trying to un-pause from the message we've already processed
               # Of course, since it's a MoM a rebalance or kill, will move it back as no
               # offsets are being committed
-              coordinator.seek_offset = skippable_message.offset + 1
+              self.seek_offset = skippable_message.offset + 1
             end
 
-            pause(coordinator.seek_offset, nil, false)
+            pause(seek_offset, nil, false)
           end
         end
 

data/lib/karafka/processing/worker.rb

@@ -19,7 +19,8 @@ module Karafka
     class Worker
       include Helpers::Async
       include Helpers::ConfigImporter.new(
-        worker_job_call_wrapper: %i[internal processing worker_job_call_wrapper]
+        worker_job_call_wrapper: %i[internal processing worker_job_call_wrapper],
+        monitor: %i[monitor]
       )
 
       # @return [String] id of this worker
@@ -53,28 +54,30 @@ module Karafka
         instrument_details = { caller: self, job: job, jobs_queue: @jobs_queue }
 
         if job
-          Karafka.monitor.instrument('worker.process', instrument_details)
+          job.wrap do
+            monitor.instrument('worker.process', instrument_details)
 
-          Karafka.monitor.instrument('worker.processed', instrument_details) do
-            job.before_call
+            monitor.instrument('worker.processed', instrument_details) do
+              job.before_call
 
-            # If a job is marked as non blocking, we can run a tick in the job queue and if there
-            # are no other blocking factors, the job queue will be unlocked.
-            # If this does not run, all the things will be blocking and job queue won't allow to
-            # pass it until done.
-            @jobs_queue.tick(job.group_id) if job.non_blocking?
+              # If a job is marked as non blocking, we can run a tick in the job queue and if there
+              # are no other blocking factors, the job queue will be unlocked.
+              # If this does not run, all the things will be blocking and job queue won't allow to
+              # pass it until done.
+              @jobs_queue.tick(job.group_id) if job.non_blocking?
 
-            if @non_wrapped_flow
-              job.call
-            else
-              worker_job_call_wrapper.wrap do
+              if @non_wrapped_flow
                 job.call
+              else
+                worker_job_call_wrapper.wrap do
+                  job.call
+                end
               end
-            end
 
-            job.after_call
+              job.after_call
 
-            true
+              true
+            end
           end
         else
           false
@@ -83,7 +86,7 @@ module Karafka
       # rubocop:disable Lint/RescueException
       rescue Exception => e
         # rubocop:enable Lint/RescueException
-        Karafka.monitor.instrument(
+        monitor.instrument(
           'error.occurred',
           caller: self,
           job: job,
@@ -99,7 +102,7 @@ module Karafka
         end
 
         # Always publish info, that we completed all the work despite its result
-        Karafka.monitor.instrument('worker.completed', instrument_details)
+        monitor.instrument('worker.completed', instrument_details)
       end
     end
   end

data/lib/karafka/version.rb

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

metadata

@@ -1,11 +1,10 @@
 --- !ruby/object:Gem::Specification
 name: karafka
 version: !ruby/object:Gem::Version
-  version: 2.4.15
+  version: 2.4.17
 platform: ruby
 authors:
 - Maciej Mensfeld
-autorequire: 
 bindir: bin
 cert_chain:
 - |
@@ -35,7 +34,7 @@ cert_chain:
   i9zWxov0mr44TWegTVeypcWGd/0nxu1+QHVNHJrpqlPBRvwQsUm7fwmRInGpcaB8
   ap8wNYvryYzrzvzUxIVFBVM5PacgkFqRmolCa8I7tdKQN+R1
   -----END CERTIFICATE-----
-date: 2024-12-04 00:00:00.000000000 Z
+date: 2025-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -275,6 +274,7 @@ files:
 - lib/karafka/pro/cleaner/errors.rb
 - lib/karafka/pro/cleaner/messages/message.rb
 - lib/karafka/pro/cleaner/messages/messages.rb
+- lib/karafka/pro/cleaner/messages/metadata.rb
 - lib/karafka/pro/connection/manager.rb
 - lib/karafka/pro/connection/multiplexing/listener.rb
 - lib/karafka/pro/contracts/base.rb
@@ -605,7 +605,6 @@ metadata:
   source_code_uri: https://github.com/karafka/karafka
   documentation_uri: https://karafka.io/docs
   rubygems_mfa_required: 'true'
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -620,8 +619,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key: 
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Karafka is Ruby and Rails efficient Kafka processing framework.
 test_files: []