karafka-core 2.2.7 → 2.3.0.alpha1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc7045405ed175fe21daf14e6efaa21462acd2640c06b55dc91c4688335b5f0a
-  data.tar.gz: 19ff63fc17eaa07976cfd7d74a0daca60c0db510db1ad090ced02245de83e141
+  metadata.gz: d63219280bae126121367daab1d344937dc7aac2ad2aae1843fb94c78c4d7ea5
+  data.tar.gz: 5237075c39f753d3175c9c59be8fda4edb4756fb131c6b9f02150fd64805f509
 SHA512:
-  metadata.gz: bcaa9df0ec9ed960f1aee7d6ab9b49db172e4331aecdaa649c98e04bc54ff3b32abae393ff478bceda52c8b05856fefe766ff2b6076ea1432db0e6ed25cf3c9f
-  data.tar.gz: e1f8a4ed2a151b61dcf2b0d77c6f1a0bf3cb8593d6a56832b60d9245f4193fa4c6bf7c460af2265c5f15e588af7caad5951a0b8097ec52f10b80022ab956b92b
+  metadata.gz: f2fe0e7e24a36e1aaf1e25aeb6210a07e0d582a273f3cb9031e4d6a2e2e53b15a8867c45a144557987f5a203e9701d9a6385bb59d58c0d15c9a5b3f8638a32e0
+  data.tar.gz: b63ecdc07c66fa610d876dade5be4feaece13dcc437fc9ccc9cc0231b788c29819e14bd9822ae2bfe70d3691a324c398e6a91ca72ac97682fc610eda7420e81d

data/.github/workflows/ci.yml

@@ -18,13 +18,13 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
-          - '3.3.0-preview2'
+          - '3.3'
           - '3.2'
           - '3.1'
           - '3.0'
           - '2.7'
         include:
-          - ruby: '3.2'
+          - ruby: '3.3'
             coverage: 'true'
     steps:
       - uses: actions/checkout@v4
@@ -34,14 +34,28 @@ jobs:
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{matrix.ruby}}
+          bundler: 'latest'
       - name: Install latest bundler
         run: |
-          gem install bundler --no-document
+          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
+
           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}}
@@ -58,7 +72,7 @@ jobs:
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.2
+          ruby-version: 3.3
       - name: Install latest bundler
         run: gem install bundler --no-document
       - name: Install Diffend plugin

data/.ruby-version

@@ -1 +1 @@
-3.2.2
+3.3.0

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Karafka core changelog
 
+## 2.3.0 (Unreleased)
+- [Change] Set minimum `karafka-rdkafka` on `0.14.6` to support new features.
+- [Change] Remove `concurrent-ruby` usage.
+
 ## 2.2.7 (2023-11-07)
 - [Change] Set minimum `karafka-rdkafka` on `0.13.9` to support alternative consumer builder.
 

data/Gemfile.lock

@@ -1,14 +1,13 @@
 PATH
   remote: .
   specs:
-    karafka-core (2.2.7)
-      concurrent-ruby (>= 1.1)
-      karafka-rdkafka (>= 0.13.9, < 0.15.0)
+    karafka-core (2.3.0.alpha1)
+      karafka-rdkafka (>= 0.14.7, < 0.15.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.1.1)
+    activesupport (7.1.2)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -18,27 +17,27 @@ GEM
       minitest (>= 5.1)
       mutex_m
       tzinfo (~> 2.0)
-    base64 (0.1.1)
-    bigdecimal (3.1.4)
+    base64 (0.2.0)
+    bigdecimal (3.1.5)
     byebug (11.1.3)
     concurrent-ruby (1.2.2)
     connection_pool (2.4.1)
     diff-lcs (1.5.0)
     docile (1.4.0)
-    drb (2.1.1)
+    drb (2.2.0)
       ruby2_keywords
-    factory_bot (6.3.0)
+    factory_bot (6.4.5)
       activesupport (>= 5.0.0)
     ffi (1.16.3)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    karafka-rdkafka (0.13.9)
+    karafka-rdkafka (0.14.7)
       ffi (~> 1.15)
       mini_portile2 (~> 2.6)
       rake (> 12)
     mini_portile2 (2.8.5)
     minitest (5.20.0)
-    mutex_m (0.1.2)
+    mutex_m (0.2.0)
     rake (13.1.0)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
@@ -64,6 +63,7 @@ GEM
       concurrent-ruby (~> 1.0)
 
 PLATFORMS
+  ruby
   x86_64-linux
 
 DEPENDENCIES
@@ -74,4 +74,4 @@ DEPENDENCIES
   simplecov
 
 BUNDLED WITH
-   2.4.19
+   2.5.3

data/karafka-core.gemspec

@@ -16,8 +16,7 @@ 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 'concurrent-ruby', '>= 1.1'
-  spec.add_dependency 'karafka-rdkafka', '>= 0.13.9', '< 0.15.0'
+  spec.add_dependency 'karafka-rdkafka', '>= 0.14.7', '< 0.15.0'
 
   spec.required_ruby_version = '>= 2.7.0'
 

data/lib/karafka/core/instrumentation/callbacks_manager.rb

@@ -9,7 +9,7 @@ module Karafka
       class CallbacksManager
         # @return [::Karafka::Core::Instrumentation::CallbacksManager]
         def initialize
-          @callbacks = Concurrent::Hash.new
+          @callbacks = {}
         end
 
         # Invokes all the callbacks registered one after another

data/lib/karafka/core/monitoring/monitor.rb

@@ -20,7 +20,7 @@ module Karafka
         def initialize(notifications_bus, namespace = nil)
           @notifications_bus = notifications_bus
           @namespace = namespace
-          @mapped_events = Concurrent::Map.new
+          @mapped_events = {}
         end
 
         # Passes the instrumentation block (if any) into the notifications bus

data/lib/karafka/core/monitoring/notifications.rb

@@ -22,25 +22,27 @@ module Karafka
         private_constant :EMPTY_HASH
 
         def initialize
-          @listeners = Concurrent::Map.new do |k, v|
-            k.compute_if_absent(v) { Concurrent::Array.new }
-          end
-
+          @listeners = Hash.new { |hash, key| hash[key] = [] }
+          @mutex = Mutex.new
           # This allows us to optimize the method calling lookups
-          @events_methods_map = Concurrent::Map.new
+          @events_methods_map = {}
         end
 
         # Registers a new event on which we can publish
         #
         # @param event_id [String] event id
         def register_event(event_id)
-          @listeners[event_id]
-          @events_methods_map[event_id] = :"on_#{event_id.to_s.tr('.', '_')}"
+          @mutex.synchronize do
+            @listeners[event_id]
+            @events_methods_map[event_id] = :"on_#{event_id.to_s.tr('.', '_')}"
+          end
         end
 
         # Clears all the subscribed listeners
         def clear
-          @listeners.each_value(&:clear)
+          @mutex.synchronize do
+            @listeners.each_value(&:clear)
+          end
         end
 
         # Allows for subscription to an event
@@ -58,19 +60,21 @@ module Karafka
         #     puts event
         #   end
         def subscribe(event_id_or_listener, &block)
-          if block
-            event_id = event_id_or_listener
+          @mutex.synchronize do
+            if block
+              event_id = event_id_or_listener
 
-            raise EventNotRegistered, event_id unless @listeners.key?(event_id)
+              raise EventNotRegistered, event_id unless @listeners.key?(event_id)
 
-            @listeners[event_id] << block
-          else
-            listener = event_id_or_listener
+              @listeners[event_id] << block
+            else
+              listener = event_id_or_listener
 
-            @listeners.each_key do |reg_event_id|
-              next unless listener.respond_to?(@events_methods_map[reg_event_id])
+              @listeners.each_key do |reg_event_id|
+                next unless listener.respond_to?(@events_methods_map[reg_event_id])
 
-              @listeners[reg_event_id] << listener
+                @listeners[reg_event_id] << listener
+              end
             end
           end
         end

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.2.7'
+    VERSION = '2.3.0.alpha1'
   end
 end

data/lib/karafka-core.rb

@@ -4,10 +4,6 @@
   yaml
   rdkafka
 
-  concurrent/map
-  concurrent/hash
-  concurrent/array
-
   karafka/core
   karafka/core/version
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: karafka-core
 version: !ruby/object:Gem::Version
-  version: 2.2.7
+  version: 2.3.0.alpha1
 platform: ruby
 authors:
 - Maciej Mensfeld
@@ -35,29 +35,15 @@ cert_chain:
   AnG1dJU+yL2BK7vaVytLTstJME5mepSZ46qqIJXMuWob/YPDmVaBF39TDSG9e34s
   msG3BiCqgOgHAnL23+CN3Rt8MsuRfEtoTKpJVcCfoEoNHOkc
   -----END CERTIFICATE-----
-date: 2023-11-07 00:00:00.000000000 Z
+date: 2024-01-15 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: concurrent-ruby
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: karafka-rdkafka
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.13.9
+        version: 0.14.7
     - - "<"
       - !ruby/object:Gem::Version
         version: 0.15.0
@@ -67,7 +53,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.13.9
+        version: 0.14.7
     - - "<"
       - !ruby/object:Gem::Version
         version: 0.15.0
@@ -148,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.5.3
 signing_key: 
 specification_version: 4
 summary: Karafka ecosystem core modules