karafka 2.2.10 → 2.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 460029e2dbc352c56f107e18bbff28f5914b5b56a0e42be9670e13f0f3592fc9
-  data.tar.gz: 68c25bacd1995a8e9c97a915e1e1b2b4435437c97a5e31e2824499c9ad531057
+  metadata.gz: '08439276b10ee121dabe7ef6496334d7aef3cf6a8a49fdc723e6333a147d57d7'
+  data.tar.gz: f1022962556a4e3397ec256bdd63e7ced077cadabddf72849473eef8ec190186
 SHA512:
-  metadata.gz: adc877c3be3cb8885b0244168014387f0353bed89575b6931f5e1ca062d01ba6a0e5a0566da4dd282f5117c7daf27ff2116f27025ec4213972c1ca52e92980de
-  data.tar.gz: a62ff96ef96ea85d98288bad3c8f6cf0bfafc1ee6de1cf928fe803ad80435b0fa137aac9cf5eff4b232e854b3c4df76c3c16efaa4a117d6b86e442975cfc9a30
+  metadata.gz: 75f6a68aba0fa013bcdbcd618c9186f5b2e8870723aaef87bbfb8cb745c4a33862efac55c2a46938b7ad843f1f5e6640ebe381861c4365f459df8f115288cf2d
+  data.tar.gz: 6e495a3376f1c9650039534260c3d21ea697b77104ad2b9d7393b1ae8301cc29a116a6757efb9ead13716932ec7f6b188ab2404f3f0d86a68942f2c9972a5dc6

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Karafka framework changelog
 
+## 2.2.11 (2023-11-03)
+- [Improvement] Allow marking as consumed in the user `#synchronize` block.
+- [Improvement] Make whole Pro VP marking as consumed concurrency safe for both async and sync scenarios.
+- [Improvement] Provide new alias to `karafka server`, that is: `karafka consumer`.
+
 ## 2.2.10 (2023-11-02)
 - [Improvement] Allow for running `#pause` without specifying the offset (provide offset or `:consecutive`). This allows for pausing on the consecutive message (last received + 1), so after resume we will get last message received + 1 effectively not using `#seek` and not purging `librdafka` buffer preserving on networking. Please be mindful that this uses notion of last message passed from **librdkafka**, and not the last one available in the consumer (`messages.last`). While for regular cases they will be the same, when using things like DLQ, LRJs, VPs or Filtering API, those may not be the same.
 - [Improvement] **Drastically** improve network efficiency of operating with LRJ by using the `:consecutive` offset as default strategy for running LRJs without moving the offset in place and purging the data.

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    karafka (2.2.10)
-      karafka-core (>= 2.2.2, < 2.3.0)
+    karafka (2.2.11)
+      karafka-core (>= 2.2.6, < 2.3.0)
       waterdrop (>= 2.6.10, < 3.0.0)
       zeitwerk (~> 2.3)
 
@@ -39,7 +39,7 @@ GEM
       activesupport (>= 6.1)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    karafka-core (2.2.5)
+    karafka-core (2.2.6)
       concurrent-ruby (>= 1.1)
       karafka-rdkafka (>= 0.13.8, < 0.15.0)
     karafka-rdkafka (0.13.8)

data/README.md

@@ -59,8 +59,8 @@ We also maintain many [integration specs](https://github.com/karafka/karafka/tre
 1. Add and install Karafka:
 
 ```bash
-# Make sure to install Karafka 2.1
-bundle add karafka --version ">= 2.1.2"
+# Make sure to install Karafka 2.2
+bundle add karafka --version ">= 2.2.10"
 
 bundle exec karafka install
 ```

data/karafka.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
     without having to focus on things that are not your business domain.
   DESC
 
-  spec.add_dependency 'karafka-core', '>= 2.2.2', '< 2.3.0'
+  spec.add_dependency 'karafka-core', '>= 2.2.6', '< 2.3.0'
   spec.add_dependency 'waterdrop', '>= 2.6.10', '< 3.0.0'
   spec.add_dependency 'zeitwerk', '~> 2.3'
 

data/lib/karafka/cli/server.rb

@@ -12,9 +12,9 @@ module Karafka
 
       private_constant :SUPPORTED_TYPES
 
-      desc 'Starts the Karafka server (short-cut alias: "s")'
+      desc 'Starts the Karafka server (short-cut aliases: "s", "consumer")'
 
-      aliases :s
+      aliases :s, :consumer
 
       option(
         :consumer_groups,

data/lib/karafka/instrumentation/vendors/datadog/logger_listener.rb

@@ -137,7 +137,15 @@ module Karafka
           def push_tags
             return unless Karafka.logger.respond_to?(:push_tags)
 
-            Karafka.logger.push_tags(client.log_correlation)
+            # Older versions of ddtrace do not have the `#log_correlation` method, so we fallback
+            # to the older method for tags
+            tags = if client.respond_to?(:log_correlation)
+                     client.log_correlation
+                   else
+                     client.active_correlation.to_s
+                   end
+
+            Karafka.logger.push_tags(tags)
           end
 
           # Pops datadog's tags from the logger

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

@@ -47,9 +47,9 @@ module Karafka
                 manager.mark_until(message) if coordinator.finished?
 
                 return revoked? unless manager.markable?
-              end
 
-              manager.markable? ? super(manager.markable) : revoked?
+                manager.markable? ? super(manager.markable) : revoked?
+              end
             end
 
             # @param message [Karafka::Messages::Message] blocking marks message as consumed
@@ -61,9 +61,8 @@ module Karafka
               coordinator.synchronize do
                 manager.mark(message)
                 manager.mark_until(message) if coordinator.finished?
+                manager.markable? ? super(manager.markable) : revoked?
               end
-
-              manager.markable? ? super(manager.markable) : revoked?
             end
 
             # @return [Boolean] is the virtual processing collapsed in the context of given

data/lib/karafka/processing/coordinator.rb

@@ -162,14 +162,19 @@ module Karafka
         @manual_seek
       end
 
-      # Allows to run synchronized (locked) code that can operate in between virtual partitions
+      # Allows to run synchronized (locked) code that can operate only from a given thread
+      #
       # @param block [Proc] code we want to run in the synchronized mode
+      # @note We check if mutex is not owned already by the current thread so we won't end up with
+      #   a deadlock in case user runs coordinated code from inside of his own lock
       def synchronize(&block)
-        @mutex.synchronize(&block)
+        if @mutex.owned?
+          yield
+        else
+          @mutex.synchronize(&block)
+        end
       end
 
-      private
-
       # @param consumer [Object] karafka consumer (normal or pro)
       # @return [Karafka::Processing::Result] result object which we can use to indicate
       #   consumption processing state.

data/lib/karafka/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: karafka
 version: !ruby/object:Gem::Version
-  version: 2.2.10
+  version: 2.2.11
 platform: ruby
 authors:
 - Maciej Mensfeld
@@ -35,7 +35,7 @@ cert_chain:
   AnG1dJU+yL2BK7vaVytLTstJME5mepSZ46qqIJXMuWob/YPDmVaBF39TDSG9e34s
   msG3BiCqgOgHAnL23+CN3Rt8MsuRfEtoTKpJVcCfoEoNHOkc
   -----END CERTIFICATE-----
-date: 2023-11-02 00:00:00.000000000 Z
+date: 2023-11-03 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.2.2
+        version: 2.2.6
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.3.0
@@ -53,7 +53,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 2.2.6
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.3.0