karafka-core 2.3.0 → 2.4.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f645a5093edea0a0015987582d62b2f14deafcb18c6c9bcbbecf7dd179e93319
-  data.tar.gz: d8992489edd15d1d8a712dc139bdfa1259ec075429d9b1a0528954d7560c7ba8
+  metadata.gz: '0884d5771032fad1eb481f63f1811977caa252773d3a88cdff66aa932cc1a4c0'
+  data.tar.gz: 7d017dc4f4656a1dc374abf193a176109c641879d9606b621a47ab06fec42c55
 SHA512:
-  metadata.gz: 8d8e85bd44974f9128d44e48310682c4c15b78aa1afd099c3bc511ddd159000e69fbd34a7aebb7c764c88cc642d264374ccd01a117cb077070d298560cc9a6e8
-  data.tar.gz: 8a8b4bd4f6d5c54372643eafb84d49ac6ae2ad2a0302e4a74ed0d27e625833d9ced7373f2815b4450a1a7996f993e8440f57ea5a580ac2a88d32848ca4af8017
+  metadata.gz: 453fd9cd6f0b15c80e5da8c9f65de849ce916f273c067b0bf68cd1e9961d1f7179e6a06c3edc3b17e5222af5d927f640b22b990a6883a5a971cbdb7792d39f12
+  data.tar.gz: 8eff56658d15b9ff02ff74e71d89cd78bc77dc82f2681c822645b3405070796d25591c6456deec2e070a0dcd814991eaa61809e74a298be0f4cd4349656e08ba

data/.github/workflows/ci.yml

@@ -22,7 +22,6 @@ jobs:
           - '3.2'
           - '3.1'
           - '3.0'
-          - '2.7'
         include:
           - ruby: '3.3'
             coverage: 'true'
@@ -37,25 +36,16 @@ jobs:
           bundler: 'latest'
       - name: Install latest bundler
         run: |
-          if [[ "$(ruby -v | awk '{print $2}')" == 2.7.8* ]]; then
-            gem install bundler -v 2.4.22 --no-document
-            gem update --system 3.4.22 --no-document
-          else
-            gem install bundler --no-document
-            gem update --system --no-document
-          fi
+          gem install bundler --no-document
+          gem update --system --no-document
 
           bundle config set without 'tools benchmarks docs'
 
       - name: Bundle install
         run: |
           bundle config set without development
+          bundle install --jobs 4 --retry 3
 
-          if [[ "$(ruby -v | awk '{print $2}')" == 2.7.8* ]]; then
-            BUNDLER_VERSION=2.4.22 bundle install --jobs 4 --retry 3
-          else
-            bundle install --jobs 4 --retry 3
-          fi
       - name: Run all tests
         env:
           GITHUB_COVERAGE: ${{matrix.coverage}}

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Karafka core changelog
 
+## 2.4.0 (Unreleased)
+- **[Breaking]** Drop Ruby `2.7` support.
+- [Enhancement] Provide necessary alterations for custom oauth token callbacks to operate.
+- [Change] Set minimum `karafka-rdkafka` on `0.15.0` to support new features.
+
 ## 2.3.0 (2024-01-26)
 - [Change] Set minimum `karafka-rdkafka` on `0.14.8` to support new features.
 - [Change] Remove `concurrent-ruby` usage.

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    karafka-core (2.3.0)
-      karafka-rdkafka (>= 0.14.8, < 0.15.0)
+    karafka-core (2.4.0.beta1)
+      karafka-rdkafka (>= 0.15.0.beta1, < 0.16.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.1.3)
+    activesupport (7.1.3.2)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -22,37 +22,35 @@ GEM
     byebug (11.1.3)
     concurrent-ruby (1.2.3)
     connection_pool (2.4.1)
-    diff-lcs (1.5.0)
+    diff-lcs (1.5.1)
     docile (1.4.0)
-    drb (2.2.0)
-      ruby2_keywords
-    factory_bot (6.4.5)
+    drb (2.2.1)
+    factory_bot (6.4.6)
       activesupport (>= 5.0.0)
     ffi (1.16.3)
-    i18n (1.14.1)
+    i18n (1.14.4)
       concurrent-ruby (~> 1.0)
-    karafka-rdkafka (0.14.8)
+    karafka-rdkafka (0.15.0.beta1)
       ffi (~> 1.15)
       mini_portile2 (~> 2.6)
       rake (> 12)
     mini_portile2 (2.8.5)
-    minitest (5.21.2)
+    minitest (5.22.2)
     mutex_m (0.2.0)
     rake (13.1.0)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.2)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.3)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.6)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.1)
-    ruby2_keywords (0.0.5)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
@@ -74,4 +72,4 @@ DEPENDENCIES
   simplecov
 
 BUNDLED WITH
-   2.5.4
+   2.5.6

data/karafka-core.gemspec

@@ -16,9 +16,9 @@ Gem::Specification.new do |spec|
   spec.description = 'A toolset of small support modules used throughout the Karafka ecosystem'
   spec.licenses    = %w[MIT]
 
-  spec.add_dependency 'karafka-rdkafka', '>= 0.14.8', '< 0.15.0'
+  spec.add_dependency 'karafka-rdkafka', '>= 0.15.0.beta1', '< 0.16.0'
 
-  spec.required_ruby_version = '>= 2.7.0'
+  spec.required_ruby_version = '>= 3.0.0'
 
   if $PROGRAM_NAME.end_with?('gem')
     spec.signing_key = File.expand_path('~/.ssh/gem-private_key.pem')

data/lib/karafka/core/instrumentation.rb

@@ -6,16 +6,22 @@ module Karafka
     module Instrumentation
       class << self
         # Builds a manager for statistics callbacks
-        # @return [WaterDrop::CallbacksManager]
+        # @return [Karafka::Core::Instrumentation::CallbacksManager]
         def statistics_callbacks
           @statistics_callbacks ||= CallbacksManager.new
         end
 
         # Builds a manager for error callbacks
-        # @return [WaterDrop::CallbacksManager]
+        # @return [Karafka::Core::Instrumentation::CallbacksManager]
         def error_callbacks
           @error_callbacks ||= CallbacksManager.new
         end
+
+        # Builds a manager for oauth bearer token refreshes
+        # @return [Karafka::Core::Instrumentation::CallbacksManager]
+        def oauthbearer_token_refresh_callbacks
+          @oauthbearer_token_refresh_callbacks ||= CallbacksManager.new
+        end
       end
     end
   end

data/lib/karafka/core/patches/rdkafka/bindings.rb

@@ -24,10 +24,10 @@ module Karafka
             def build_error_callback
               FFI::Function.new(
                 :void, %i[pointer int string pointer]
-              ) do |client_prr, err_code, reason, _opaque|
+              ) do |client_ptr, err_code, reason, _opaque|
                 return nil unless ::Rdkafka::Config.error_callback
 
-                name = ::Rdkafka::Bindings.rd_kafka_name(client_prr)
+                name = ::Rdkafka::Bindings.rd_kafka_name(client_ptr)
 
                 error = ::Rdkafka::RdkafkaError.new(err_code, broker_message: reason)
                 error.set_backtrace(caller)

data/lib/karafka/core/version.rb

@@ -4,6 +4,6 @@ module Karafka
   module Core
     # Current Karafka::Core version
     # We follow the versioning schema of given Karafka version
-    VERSION = '2.3.0'
+    VERSION = '2.4.0.beta1'
   end
 end

data/lib/karafka-core.rb

@@ -39,8 +39,12 @@ end
 # Patch rdkafka
 ::Rdkafka::Bindings.include(::Karafka::Core::Patches::Rdkafka::Bindings)
 
+instrumentation = ::Karafka::Core::Instrumentation
+rd_config = ::Rdkafka::Config
+
 # Rdkafka uses a single global callback for things. We bypass that by injecting a manager for
 # each callback type. Callback manager allows us to register more than one callback
 # @note Those managers are also used by Karafka for consumer related statistics
-::Rdkafka::Config.statistics_callback = ::Karafka::Core::Instrumentation.statistics_callbacks
-::Rdkafka::Config.error_callback = ::Karafka::Core::Instrumentation.error_callbacks
+rd_config.statistics_callback = instrumentation.statistics_callbacks
+rd_config.error_callback = instrumentation.error_callbacks
+rd_config.oauthbearer_token_refresh_callback = instrumentation.oauthbearer_token_refresh_callbacks

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: karafka-core
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0.beta1
 platform: ruby
 authors:
 - Maciej Mensfeld
@@ -35,7 +35,7 @@ cert_chain:
   AnG1dJU+yL2BK7vaVytLTstJME5mepSZ46qqIJXMuWob/YPDmVaBF39TDSG9e34s
   msG3BiCqgOgHAnL23+CN3Rt8MsuRfEtoTKpJVcCfoEoNHOkc
   -----END CERTIFICATE-----
-date: 2024-01-26 00:00:00.000000000 Z
+date: 2024-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: karafka-rdkafka
@@ -43,20 +43,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.8
+        version: 0.15.0.beta1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.8
+        version: 0.15.0.beta1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.16.0
 description: A toolset of small support modules used throughout the Karafka ecosystem
 email:
 - contact@karafka.io
@@ -127,7 +127,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="