karafka 2.0.0.alpha3 → 2.0.0.alpha4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e715fa7f45c40a200fc2d281d765f5d42ac4f03ba6e3f529b86a0adc90bc1af
-  data.tar.gz: 50e2083063f1fd77ffc529395550e443c4166aa035c2d87716390059bec6fe32
+  metadata.gz: f8ed5005d3288abb4f9f6389fa126b5434b5a7a6df729e924695d38624e167e5
+  data.tar.gz: aa802a441d9c9cb1275260ba9b290c8c4c72acf125ca72efaafc58538a6c8b20
 SHA512:
-  metadata.gz: d225ba3d118716bcf1265e06d3d781aee7a3e9e87edaab791fdf1b240dc1565a0a460a3f99ca5b8687f6e63701ff2fee3d8ffe343dc18c5e1bfdde4af9deb852
-  data.tar.gz: 73084d0b5f3678f37b63debdcf944517e0f954bf0a21242caae3c807ced721afd26f5d6bdb864bcf5fe36bb2d098ca3dd167901a1c3ddc61b0ceb00f8a3a2d96
+  metadata.gz: 1ad458acdb42c28d04895db1aa348d0ab10177c0829e7b19fc9fd8b23aaac5fc17feac5e1366cd6444d1e60903b087be1b24298b7764a98f8f372a325afb7cee
+  data.tar.gz: fb1de540a2c50d26467585bb720a636726955e65f1cea1ca055ef4a9f10d66db233928ca8b067d225d6c935f779d50f2381660ddcaa0d86d6c5b0b8a8ed991e1

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Karafka framework changelog
 
+## 2.0.0-alpha4 (Unreleased)
+- Rails support without ActiveJob queue adapter usage (#805)
+
 ## 2.0.0-alpha3 (2022-03-16)
 - Restore 'app.initialized' state and add notification on it
 - Fix the installation flow for Rails and add integration tests for this scenario

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    karafka (2.0.0.alpha3)
+    karafka (2.0.0.alpha4)
       dry-configurable (~> 0.13)
       dry-monitor (~> 0.5)
       dry-validation (~> 1.7)

data/bin/integrations

@@ -25,7 +25,7 @@ CONCURRENCY = 4
 class Scenario
   # How long a scenario can run before we kill it
   # This is a fail-safe just in case something would hang
-  MAX_RUN_TIME = 60 * 5
+  MAX_RUN_TIME = 60 * 2
 
   # There are rare cases where Karafka may force shutdown for some of the integration cases
   # This includes exactly those

data/bin/stress

@@ -9,5 +9,5 @@ set -e
 while :
 do
   reset
-  bundle exec bin/integrations $1
+  bin/integrations $1
 done

data/lib/active_job/karafka.rb

@@ -1,20 +1,21 @@
 # frozen_string_literal: true
 
-require 'active_job'
-require 'active_job/queue_adapters'
-require 'active_job/queue_adapters/karafka_adapter'
+begin
+  require 'active_job'
+  require_relative 'queue_adapters/karafka_adapter'
 
-module ActiveJob
-  # Namespace for usage simplification outside of Rails where Railtie will not kick in.
-  # That way a require 'active_job/karafka' should be enough to use it
-  module Karafka
+  module ActiveJob
+    # Namespace for usage simplification outside of Rails where Railtie will not kick in.
+    # That way a require 'active_job/karafka' should be enough to use it
+    module Karafka
+    end
   end
-end
-
-# We extend routing builder by adding a simple wrapper for easier jobs topics defining
-# This needs to be extended here as it is going to be used in karafka routes, hence doing that in
-# the railtie initializer would be too late
-::Karafka::Routing::Builder.include ::Karafka::ActiveJob::RoutingExtensions
-::Karafka::Routing::Proxy.include ::Karafka::ActiveJob::RoutingExtensions
 
-# We extend ActiveJob stuff in the railtie
+  # We extend routing builder by adding a simple wrapper for easier jobs topics defining
+  # This needs to be extended here as it is going to be used in karafka routes, hence doing that in
+  # the railtie initializer would be too late
+  ::Karafka::Routing::Builder.include ::Karafka::ActiveJob::RoutingExtensions
+  ::Karafka::Routing::Proxy.include ::Karafka::ActiveJob::RoutingExtensions
+rescue LoadError
+  # We extend ActiveJob stuff in the railtie
+end

data/lib/karafka/contracts/consumer_group_topic.rb

@@ -10,6 +10,7 @@ module Karafka
         required(:id).filled(:str?, format?: Karafka::Contracts::TOPIC_REGEXP)
         required(:kafka).filled
         required(:max_messages) { int? & gteq?(1) }
+        required(:initial_offset).filled(included_in?: %w[earliest latest])
         required(:max_wait_time).filled { int? & gteq?(10) }
         required(:manual_offset_management).filled(:bool?)
         required(:name).filled(:str?, format?: Karafka::Contracts::TOPIC_REGEXP)

data/lib/karafka/routing/subscription_group.rb

@@ -41,7 +41,7 @@ module Karafka
 
         kafka[:'client.id'] ||= Karafka::App.config.client_id
         kafka[:'group.id'] ||= @topics.first.consumer_group.id
-        kafka[:'auto.offset.reset'] ||= 'earliest'
+        kafka[:'auto.offset.reset'] ||= @topics.first.initial_offset
         # Karafka manages the offsets based on the processing state, thus we do not rely on the
         # rdkafka offset auto-storing
         kafka[:'enable.auto.offset.store'] = 'false'

data/lib/karafka/routing/subscription_groups_builder.rb

@@ -18,6 +18,7 @@ module Karafka
         kafka
         max_messages
         max_wait_time
+        initial_offset
       ].freeze
 
       private_constant :DISTRIBUTION_KEYS

data/lib/karafka/routing/topic.rb

@@ -16,6 +16,7 @@ module Karafka
         manual_offset_management
         max_messages
         max_wait_time
+        initial_offset
       ].freeze
 
       private_constant :INHERITABLE_ATTRIBUTES

data/lib/karafka/setup/config.rb

@@ -54,6 +54,9 @@ module Karafka
       setting :consumer_persistence, default: true
       # Default deserializer for converting incoming data into ruby objects
       setting :deserializer, default: Karafka::Serialization::Json::Deserializer.new
+      # option [String] should we start with the earliest possible offset or latest
+      # This will set the `auto.offset.reset` value unless present in the kafka scope
+      setting :initial_offset, default: 'earliest'
       # option [Boolean] should we leave offset management to the user
       setting :manual_offset_management, default: false
       # options max_messages [Integer] how many messages do we want to fetch from Kafka in one go

data/lib/karafka/version.rb

@@ -3,5 +3,5 @@
 # Main module namespace
 module Karafka
   # Current Karafka version
-  VERSION = '2.0.0.alpha3'
+  VERSION = '2.0.0.alpha4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: karafka
 version: !ruby/object:Gem::Version
-  version: 2.0.0.alpha3
+  version: 2.0.0.alpha4
 platform: ruby
 authors:
 - Maciej Mensfeld
@@ -34,7 +34,7 @@ cert_chain:
   R2P11bWoCtr70BsccVrN8jEhzwXngMyI2gVt750Y+dbTu1KgRqZKp/ECe7ZzPzXj
   pIy9vHxTANKYVyI4qj8OrFdEM5BQNu8oQpL0iQ==
   -----END CERTIFICATE-----
-date: 2022-03-16 00:00:00.000000000 Z
+date: 2022-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-configurable