karafka 2.0.23 → 2.0.24

data/lib/karafka/status.rb

@@ -10,32 +10,50 @@ module Karafka
       running: :run!,
       quieting: :quiet!,
       stopping: :stop!,
-      stopped: :stopped!
+      stopped: :stopped!,
+      terminated: :terminate!
     }.freeze
 
-    private_constant :STATES
+    # Mutex to ensure that state transitions are thread-safe
+    MUTEX = Mutex.new
+
+    private_constant :MUTEX
 
     # By default we are in the initializing state
     def initialize
       initialize!
     end
 
+    # @return [String] stringified current app status
+    def to_s
+      @status.to_s
+    end
+
+    # Resets the status state
+    # This is used mostly in the integration suite
+    def reset!
+      @status = :initializing
+    end
+
     STATES.each do |state, transition|
       define_method :"#{state}?" do
         @status == state
       end
 
       define_method transition do
-        # Do nothing if the state change would change nothing (same state)
-        return if @status == state
+        MUTEX.synchronize do
+          # Do not allow reverse state transitions (we always go one way) or transition to the same
+          # state as currently
+          return if @status && STATES.keys.index(state) <= STATES.keys.index(@status)
 
-        @status = state
+          @status = state
 
-        # Skip on creation (initializing)
-        # We skip as during this state we do not have yet a monitor
-        return if initializing?
+          # Skip on creation (initializing)
+          # We skip as during this state we do not have yet a monitor
+          return if initializing?
 
-        Karafka.monitor.instrument("app.#{state}")
+          Karafka.monitor.instrument("app.#{state}")
+        end
       end
     end
   end

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

@@ -5,8 +5,7 @@
 # If by any chance you've wanted a setup for Rails app, either run the `karafka:install`
 # command again or refer to the install templates available in the source codes
 
-ENV['RACK_ENV'] ||= 'development'
-ENV['KARAFKA_ENV'] ||= ENV['RACK_ENV']
+ENV['KARAFKA_ENV'] ||= 'development'
 Bundler.require(:default, ENV['KARAFKA_ENV'])
 
 # Zeitwerk custom loader for loading the app components before the whole

data/lib/karafka/time_trackers/pause.rb

@@ -10,7 +10,7 @@ module Karafka
     #   code here, as this is not a frequently used tracker. It is active only once per batch in
     #   case of long-running-jobs and upon errors.
     class Pause < Base
-      attr_reader :attempt
+      attr_reader :attempt, :current_timeout
 
       # @param timeout [Integer] how long should we wait when anything went wrong (in ms)
       # @param max_timeout [Integer, nil] if exponential is on, what is the max value we can reach
@@ -43,6 +43,7 @@ module Karafka
         @started_at = nil
         @attempt = 0
         @timeout = timeout
+        @current_timeout = timeout
         @max_timeout = max_timeout
         @exponential_backoff = exponential_backoff
         @mutex = Mutex.new
@@ -56,6 +57,7 @@ module Karafka
       #   period of time, outside of any regular pausing logic
       def pause(timeout = backoff_interval)
         @mutex.synchronize do
+          @current_timeout = timeout
           @started_at = now
           @ends_at = @started_at + timeout
         end

data/lib/karafka/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: karafka
 version: !ruby/object:Gem::Version
-  version: 2.0.23
+  version: 2.0.24
 platform: ruby
 authors:
 - Maciej Mensfeld
@@ -35,7 +35,7 @@ cert_chain:
   Qf04B9ceLUaC4fPVEz10FyobjaFoY4i32xRto3XnrzeAgfEe4swLq8bQsR3w/EF3
   MGU0FeSV2Yj7Xc2x/7BzLK8xQn5l7Yy75iPF+KP3vVmDHnNl
   -----END CERTIFICATE-----
-date: 2022-12-07 00:00:00.000000000 Z
+date: 2022-12-19 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.6
+        version: 2.0.7
     - - "<"
       - !ruby/object:Gem::Version
         version: 3.0.0
@@ -53,7 +53,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.6
+        version: 2.0.7
     - - "<"
       - !ruby/object:Gem::Version
         version: 3.0.0
@@ -77,7 +77,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.3
+        version: 2.4.7
     - - "<"
       - !ruby/object:Gem::Version
         version: 3.0.0
@@ -87,7 +87,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.3
+        version: 2.4.7
     - - "<"
       - !ruby/object:Gem::Version
         version: 3.0.0
@@ -147,7 +147,8 @@ files:
 - bin/stress_one
 - certs/cert_chain.pem
 - certs/karafka-pro.pem
-- config/errors.yml
+- config/locales/errors.yml
+- config/locales/pro_errors.yml
 - docker-compose.yml
 - karafka.gemspec
 - lib/active_job/karafka.rb
@@ -204,6 +205,7 @@ files:
 - lib/karafka/messages/message.rb
 - lib/karafka/messages/messages.rb
 - lib/karafka/messages/metadata.rb
+- lib/karafka/messages/parser.rb
 - lib/karafka/messages/seek.rb
 - lib/karafka/patches/rdkafka/bindings.rb
 - lib/karafka/patches/rdkafka/consumer.rb
@@ -212,6 +214,13 @@ files:
 - lib/karafka/pro/active_job/dispatcher.rb
 - lib/karafka/pro/active_job/job_options_contract.rb
 - lib/karafka/pro/base_consumer.rb
+- lib/karafka/pro/encryption.rb
+- lib/karafka/pro/encryption/cipher.rb
+- lib/karafka/pro/encryption/contracts/config.rb
+- lib/karafka/pro/encryption/errors.rb
+- lib/karafka/pro/encryption/messages/middleware.rb
+- lib/karafka/pro/encryption/messages/parser.rb
+- lib/karafka/pro/encryption/setup/config.rb
 - lib/karafka/pro/loader.rb
 - lib/karafka/pro/performance_tracker.rb
 - lib/karafka/pro/processing/coordinator.rb