karafka 2.4.8 → 2.4.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7e8e51a5c0c4ded0d074965cee2090e64ca77e43443f4f36ab03cc3a21ddfd6
-  data.tar.gz: c6e912c518d301f55974a9e4deb491ebe4c3e073e6748fe62ce1003eaea7bed7
+  metadata.gz: 7601c2daf3eaacae67697fe28dd403ba8bd41387df90da49691912dad7ba0963
+  data.tar.gz: 23d6763195d2e6bf17c573859d133637c21f849e3def1eb0f852d5cb4554ae17
 SHA512:
-  metadata.gz: 8769a192c7ebb852250afd96611e115807172bf320d4e9d513bffbcc66f5570ca637aee1b8f3b68e46350b37054935ea905893139bc264a02949f975b39f2041
-  data.tar.gz: 13dc8e118850aace7127bae5fe667b6f73118d220b61b1d2b590cc18e71243b3c1467d43df9ae134cd7b26c0274a100e34d8a07db0c6091bc02fd9c95ffb24f0
+  metadata.gz: 56202acc444f3b69af7a8b643b9e28f77ffbcadeab70858b0ffaa4b4a7a264082c636ff5c0abbaba0ac1cd6f2fb72fd6924bf6e87fe3f6e57549d5f228786e91
+  data.tar.gz: b39d96ef2bcd09079b044321058b4a741797673b815ff6508a8123a7a513f08ca364d05aa22dc994a25fe8c64d959bcd19342301156e97bf0b7d005d7abcb7db

data/.github/workflows/ci.yml

@@ -77,7 +77,6 @@ jobs:
           - '3.3'
           - '3.2'
           - '3.1'
-          - '3.0'
         include:
           - ruby: '3.3'
             coverage: 'true'

data/.ruby-version

@@ -1 +1 @@
-3.3.4
+3.3.5

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Karafka Framework Changelog
 
+## 2.4.10 (2024-09-03)
+- **[Feature]** Provide Kafka based Scheduled Messages to be able to send messages in the future via a proxy topic.
+- [Enhancement] Introduce a `#assigned` hook for consumers to be able to trigger actions when consumer is built and assigned but before first consume/ticking, etc.
+- [Enhancement] Provide `Karafka::Messages::Message#tombstone?` to be able to quickly check if a message is a tombstone message.
+- [Enhancement] Provide more flexible API for Recurring Tasks topics reconfiguration.
+- [Enhancement] Remove no longer needed Rails connection releaser.
+- [Enhancement] Update AppSignal client to support newer versions (tombruijn and hieuk09).
+- [Fix] Fix a case where there would be a way to define multiple subscription groups for same topic with different consumer.
+
+## 2.4.9 (2024-08-23)
+- **[Feature]** Provide Kafka based Recurring (Cron) Tasks.
+- [Enhancement] Wrap worker work with Rails Reloader/Executor (fusion2004)
+- [Enhancement] Allow for partial topic level kafka scope settings reconfiguration via `inherit` flag.
+- [Enhancement] Validate `eof` kafka scope flag when `eofed` in routing enabled.
+- [Enhancement] Provide `mark_after_dispatch` setting for granular DLQ marking control.
+- [Enhancement] Provide `Karafka::Admin.rename_consumer_group`.
+
 ## 2.4.8 (2024-08-09)
 - **[Feature]** Introduce ability to react to `#eof` either from `#consume` or from `#eofed` when EOF without new messages.
 - [Enhancement] Provide `Consumer#eofed?` to indicate reaching EOF.

data/Gemfile

@@ -6,20 +6,23 @@ plugin 'diffend'
 
 gemspec
 
-# Karafka gem does not require activejob nor karafka-web to work
+# Karafka gem does not require activejob, karafka-web or fugit to work
 # They are added here because they are part of the integration suite
 # Since some of those are only needed for some specs, they should never be required automatically
+group :integrations, :test do
+  gem 'fugit', require: false
+  gem 'rspec', require: false
+end
+
 group :integrations do
   gem 'activejob', require: false
-  gem 'karafka-testing', '>= 2.4.0', require: false
-  gem 'karafka-web', '>= 0.10.0.beta1', require: false
-  gem 'rspec', require: false
+  gem 'karafka-testing', '>= 2.4.6', require: false
+  gem 'karafka-web', '>= 0.10.0.rc2', require: false
 end
 
 group :test do
   gem 'byebug'
   gem 'factory_bot'
   gem 'ostruct'
-  gem 'rspec'
   gem 'simplecov'
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    karafka (2.4.8)
+    karafka (2.4.10)
       base64 (~> 0.2)
       karafka-core (>= 2.4.3, < 2.5.0)
       karafka-rdkafka (>= 0.17.2)
@@ -11,31 +11,37 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activejob (7.1.3.4)
-      activesupport (= 7.1.3.4)
+    activejob (7.2.1)
+      activesupport (= 7.2.1)
       globalid (>= 0.3.6)
-    activesupport (7.1.3.4)
+    activesupport (7.2.1)
       base64
       bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+      concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      mutex_m
-      tzinfo (~> 2.0)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
     base64 (0.2.0)
     bigdecimal (3.1.8)
     byebug (11.1.3)
-    concurrent-ruby (1.3.3)
+    concurrent-ruby (1.3.4)
     connection_pool (2.4.1)
     diff-lcs (1.5.1)
     docile (1.4.1)
     drb (2.2.1)
     erubi (1.13.0)
+    et-orbi (1.2.11)
+      tzinfo
     factory_bot (6.4.6)
       activesupport (>= 5.0.0)
     ffi (1.17.0)
+    fugit (1.11.1)
+      et-orbi (~> 1, >= 1.2.11)
+      raabro (~> 1.4)
     globalid (1.2.1)
       activesupport (>= 6.1)
     i18n (1.14.5)
@@ -49,19 +55,20 @@ GEM
     karafka-testing (2.4.6)
       karafka (>= 2.4.0, < 2.5.0)
       waterdrop (>= 2.7.0)
-    karafka-web (0.10.0.rc1)
+    karafka-web (0.10.1)
       erubi (~> 1.4)
-      karafka (>= 2.4.7, < 2.5.0)
+      karafka (>= 2.4.9, < 2.5.0)
       karafka-core (>= 2.4.0, < 2.5.0)
       roda (~> 3.68, >= 3.69)
       tilt (~> 2.0)
+    logger (1.6.0)
     mini_portile2 (2.8.7)
-    minitest (5.24.1)
-    mutex_m (0.2.0)
+    minitest (5.25.1)
     ostruct (0.6.0)
+    raabro (1.4.0)
     rack (3.1.7)
     rake (13.2.1)
-    roda (3.82.0)
+    roda (3.83.0)
       rack
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
@@ -76,6 +83,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.1)
+    securerandom (0.3.1)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
@@ -99,9 +107,10 @@ DEPENDENCIES
   activejob
   byebug
   factory_bot
+  fugit
   karafka!
-  karafka-testing (>= 2.4.0)
-  karafka-web (>= 0.10.0.beta1)
+  karafka-testing (>= 2.4.6)
+  karafka-web (>= 0.10.0.rc2)
   ostruct
   rspec
   simplecov

data/bin/integrations

@@ -240,6 +240,11 @@ ARGV.each do |filter|
   end
 end
 
+# Remove Rails 7.2 specs from Ruby 3.0 because it requires 3.1
+specs.delete_if do |spec|
+  RUBY_VERSION < '3.1' && spec.include?('rails72')
+end
+
 raise ArgumentError, "No integration specs with filters: #{ARGV.join(', ')}" if specs.empty?
 
 # Randomize order

data/certs/cert.pem

@@ -0,0 +1,26 @@
+-----BEGIN CERTIFICATE-----
+MIIEcDCCAtigAwIBAgIBATANBgkqhkiG9w0BAQsFADA/MRAwDgYDVQQDDAdjb250
+YWN0MRcwFQYKCZImiZPyLGQBGRYHa2FyYWZrYTESMBAGCgmSJomT8ixkARkWAmlv
+MB4XDTI0MDgyMzEwMTkyMFoXDTQ5MDgxNzEwMTkyMFowPzEQMA4GA1UEAwwHY29u
+dGFjdDEXMBUGCgmSJomT8ixkARkWB2thcmFma2ExEjAQBgoJkiaJk/IsZAEZFgJp
+bzCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAKjLhLjQqUlNayxkXnO+
+PsmCDs/KFIzhrsYMfLZRZNaWmzV3ujljMOdDjd4snM2X06C41iVdQPWjpe3j8vVe
+ZXEWR/twSbOP6Eeg8WVH2wCOo0x5i7yhVn4UBLH4JpfEMCbemVcWQ9ry9OMg4WpH
+Uu4dRwxFV7hzCz3p0QfNLRI4miAxnGWcnlD98IJRjBAksTuR1Llj0vbOrDGsL9ZT
+JeXP2gdRLd8SqzAFJEWrbeTBCBU7gfSh3oMg5SVDLjaqf7Kz5wC/8bDZydzanOxB
+T6CDXPsCnllmvTNx2ei2T5rGYJOzJeNTmJLLK6hJWUlAvaQSvCwZRvFJ0tVGLEoS
+flqSr6uGyyl1eMUsNmsH4BqPEYcAV6P2PKTv2vUR8AP0raDvZ3xL1TKvfRb8xRpo
+vPopCGlY5XBWEc6QERHfVLTIVsjnls2/Ujj4h8/TSfqqYnaHKefIMLbuD/tquMjD
+iWQsW2qStBV0T+U7FijKxVfrfqZP7GxQmDAc9o1iiyAa3QIDAQABo3cwdTAJBgNV
+HRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQU3O4dTXmvE7YpAkszGzR9DdL9
+sbEwHQYDVR0RBBYwFIESY29udGFjdEBrYXJhZmthLmlvMB0GA1UdEgQWMBSBEmNv
+bnRhY3RAa2FyYWZrYS5pbzANBgkqhkiG9w0BAQsFAAOCAYEAVKTfoLXn7mqdSxIR
+eqxcR6Huudg1jes81s1+X0uiRTR3hxxKZ3Y82cPsee9zYWyBrN8TA4KA0WILTru7
+Ygxvzha0SRPsSiaKLmgOJ+61ebI4+bOORzIJLpD6GxCxu1r7MI4+0r1u1xe0EWi8
+agkVo1k4Vi8cKMLm6Gl9b3wG9zQBw6fcgKwmpjKiNnOLP+OytzUANrIUJjoq6oal
+TC+f/Uc0TLaRqUaW/bejxzDWWHoM3SU6aoLPuerglzp9zZVzihXwx3jPLUVKDFpF
+Rl2lcBDxlpYGueGo0/oNzGJAAy6js8jhtHC9+19PD53vk7wHtFTZ/0ugDQYnwQ+x
+oml2fAAuVWpTBCgOVFe6XCQpMKopzoxQ1PjKztW2KYxgJdIBX87SnL3aWuBQmhRd
+i9zWxov0mr44TWegTVeypcWGd/0nxu1+QHVNHJrpqlPBRvwQsUm7fwmRInGpcaB8
+ap8wNYvryYzrzvzUxIVFBVM5PacgkFqRmolCa8I7tdKQN+R1
+-----END CERTIFICATE-----

data/config/locales/errors.yml

@@ -33,6 +33,8 @@ en:
       internal.processing.partitioner_class_format: cannot be nil
       internal.processing.strategy_selector_format: cannot be nil
       internal.processing.expansions_selector_format: cannot be nil
+      internal.processing.executor_class_format: cannot be nil
+      internal.processing.worker_job_call_wrapper_format: 'needs to be false or respond to #wrap'
 
       internal.active_job.dispatcher_format: cannot be nil
       internal.active_job.job_options_contract_format: cannot be nil
@@ -113,10 +115,12 @@ en:
       dead_letter_queue.transactional_format: needs to be either true or false
       dead_letter_queue.dispatch_method_format: 'needs to be either #produce_sync or #produce_async'
       dead_letter_queue.marking_method_format: 'needs to be either #mark_as_consumed or #mark_as_consumed!'
+      dead_letter_queue.mark_after_dispatch_format: 'needs to be true, false or nil'
 
       active_format: needs to be either true or false
 
       eofed.active_format: needs to be either true or false
+      eofed.kafka_enable: 'cannot be enabled without enable.partition.eof set to true'
 
       declaratives.partitions_format: needs to be more or equal to 1
       declaratives.active_format: needs to be true
@@ -136,6 +140,7 @@ en:
     consumer_group:
       missing: needs to be present
       topics_names_not_unique: all topic names within a single consumer group must be unique
+      topics_many_consumers_same_topic: 'topic within a single consumer group cannot have distinct consumers'
       id_format: 'needs to be a string with a Kafka accepted format'
       topics_format: needs to be a non-empty array
       topics_namespaced_names_not_unique: |

data/config/locales/pro_errors.yml

@@ -63,6 +63,10 @@ en:
       swarm.nodes_format: needs to be a range, array of nodes ids or a hash with direct assignments
       swarm_nodes_with_non_existent_nodes: includes unreachable nodes ids
 
+      recurring_tasks.active_format: 'needs to be boolean'
+      scheduled_messages.active_format: 'needs to be boolean'
+      scheduled_messages.active_missing: 'needs to be boolean'
+
       direct_assignments.active_missing: needs to be present
       direct_assignments.active_format: 'needs to be boolean'
       direct_assignments.partitions_missing: 'needs to be present'
@@ -99,5 +103,35 @@ en:
       patterns.ttl_format: needs to be an integer bigger than 0
       patterns.ttl_missing: needs to be present
 
+      recurring_tasks.consumer_class_format: 'needs to inherit from Karafka::BaseConsumer'
+      recurring_tasks.group_id_format: 'needs to be a string with a Kafka accepted format'
+      recurring_tasks.topics.schedules_format: 'needs to be a string with a Kafka accepted format'
+      recurring_tasks.topics.logs_format: 'needs to be a string with a Kafka accepted format'
+      recurring_tasks.interval_format: 'needs to be equal or more than 1000 and an integer'
+      recurring_tasks.deserializer_format: 'needs to be configured'
+      recurring_tasks.logging_format: needs to be a boolean
+
+      scheduled_messages.consumer_class_format: 'must be a class'
+      scheduled_messages.dispatcher_class_format: 'must be a class'
+      scheduled_messages.flush_batch_size_format: needs to be an integer bigger than 0
+      scheduled_messages.interval_format: needs to be an integer bigger or equal to 1000
+      scheduled_messages.deserializers.headers_format: cannot be nil
+      scheduled_messages.deserializers.payload_format: cannot be nil
+      scheduled_messages.group_id_format: 'needs to be a string with a Kafka accepted format'
+      scheduled_messages.states_postfix_format: 'needs to be a string with a Kafka accepted format'
+
     routing:
       swarm_nodes_not_used: 'At least one of the nodes has no assignments'
+
+    recurring_tasks:
+      id_format: 'can include only alphanumeric characters (a-z, A-Z, 0-9), hyphens (-), and underscores (_)'
+      cron_format: must be a non-empty string
+      enabled_format: needs to be a boolean
+      changed_format: needs to be a boolean
+      previous_time_format: needs to be a numerical or time
+
+    scheduled_messages_message:
+      key_missing: must be present and should be unique within the partition
+      key_format: needs to be a non-empty string unique within the partition
+      headers_schedule_target_epoch_in_the_past: 'scheduling cannot happen in the past'
+      headers_format: are not correct

data/karafka.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
     spec.signing_key = File.expand_path('~/.ssh/gem-private_key.pem')
   end
 
-  spec.cert_chain    = %w[certs/cert_chain.pem]
+  spec.cert_chain    = %w[certs/cert.pem]
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(spec)/}) }
   spec.executables   = %w[karafka]
   spec.require_paths = %w[lib]

data/lib/karafka/admin.rb

@@ -274,6 +274,48 @@ module Karafka
         end
       end
 
+      # Takes consumer group and its topics and migrates all the offsets to a new named group
+      #
+      # @param previous_name [String] old consumer group name
+      # @param new_name [String] new consumer group name
+      # @param topics [Array<String>] topics for which we want to migrate offsets during rename
+      # @param delete_previous [Boolean] should we delete previous consumer group after rename.
+      #   Defaults to true.
+      #
+      # @note This method should **not** be executed on a running consumer group as it creates a
+      #   "fake" consumer and uses it to move offsets.
+      #
+      # @note After migration unless `delete_previous` is set to `false`, old group will be
+      #   removed.
+      #
+      # @note If new consumer group exists, old offsets will be added to it.
+      def rename_consumer_group(previous_name, new_name, topics, delete_previous: true)
+        remap = Hash.new { |h, k| h[k] = {} }
+
+        old_lags = read_lags_with_offsets({ previous_name => topics })
+
+        return if old_lags.empty?
+
+        read_lags_with_offsets({ previous_name => topics })
+          .fetch(previous_name)
+          .each do |topic, partitions|
+            partitions.each do |partition_id, details|
+              offset = details[:offset]
+
+              # No offset on this partition
+              next if offset.negative?
+
+              remap[topic][partition_id] = offset
+            end
+          end
+
+        seek_consumer_group(new_name, remap)
+
+        return unless delete_previous
+
+        delete_consumer_group(previous_name)
+      end
+
       # Removes given consumer group (if exists)
       #
       # @param consumer_group_id [String] consumer group name

data/lib/karafka/base_consumer.rb

@@ -31,6 +31,20 @@ module Karafka
       @used = false
     end
 
+    # Trigger method running after consumer is fully initialized.
+    #
+    # @private
+    def on_initialized
+      handle_initialized
+    rescue StandardError => e
+      Karafka.monitor.instrument(
+        'error.occurred',
+        error: e,
+        caller: self,
+        type: 'consumer.initialized.error'
+      )
+    end
+
     # Can be used to run preparation code prior to the job being enqueued
     #
     # @private
@@ -176,6 +190,15 @@ module Karafka
 
     private
 
+    # Method called post-initialization of a consumer when all basic things are assigned.
+    # Since initialization via `#initialize` is complex and some states are set a bit later, this
+    # hook allows to initialize resources once at a time when topic, partition and other things
+    # are assigned to the consumer
+    #
+    # @note Please keep in mind that it will run many times when persistence is off. Basically once
+    #   each batch.
+    def initialized; end
+
     # Method that will perform business logic and on data received from Kafka (it will consume
     #   the data)
     # @note This method needs to be implemented in a subclass. We stub it here as a failover if

data/lib/karafka/contracts/config.rb

@@ -116,6 +116,8 @@ module Karafka
           required(:partitioner_class) { |val| !val.nil? }
           required(:strategy_selector) { |val| !val.nil? }
           required(:expansions_selector) { |val| !val.nil? }
+          required(:executor_class) { |val| !val.nil? }
+          required(:worker_job_call_wrapper) { |val| val == false || val.respond_to?(:wrap) }
         end
 
         nested(:active_job) do

data/lib/karafka/contracts/consumer_group.rb

@@ -25,6 +25,23 @@ module Karafka
         [[%i[topics], :names_not_unique]]
       end
 
+      # Prevent same topics subscriptions in one CG with different consumer classes
+      # This should prevent users from accidentally creating multi-sg one CG setup with weird
+      # different consumer usage. If you need to consume same topic twice, use distinct CGs.
+      virtual do |data, errors|
+        next unless errors.empty?
+
+        topics_consumers = Hash.new { |h, k| h[k] = Set.new }
+
+        data.fetch(:topics).map do |topic|
+          topics_consumers[topic[:name]] << topic[:consumer]
+        end
+
+        next if topics_consumers.values.map(&:size).all? { |count| count == 1 }
+
+        [[%i[topics], :many_consumers_same_topic]]
+      end
+
       virtual do |data, errors|
         next unless errors.empty?
         next unless ::Karafka::App.config.strict_topics_namespacing

data/lib/karafka/errors.rb

@@ -82,10 +82,11 @@ module Karafka
     AssignmentLostError = Class.new(BaseError)
 
     # Raised if optional dependencies like karafka-web are required in a version that is not
-    # supported by the current framework version.
+    # supported by the current framework version or when an optional dependency is missing.
     #
     # Because we do not want to require web out of the box and we do not want to lock web with
-    # karafka 1:1, we do such a sanity check
+    # karafka 1:1, we do such a sanity check. This also applies to cases where some external
+    # optional dependencies are needed but not available.
     DependencyConstraintsError = Class.new(BaseError)
 
     # Raised when we were not able to open pidfd for given pid

data/lib/karafka/instrumentation/logger_listener.rb

@@ -275,6 +275,9 @@ module Karafka
         details = (error.backtrace || []).join("\n")
 
         case type
+        when 'consumer.initialized.error'
+          error "Consumer initialized error: #{error}"
+          error details
         when 'consumer.consume.error'
           error "Consumer consuming error: #{error}"
           error details

data/lib/karafka/instrumentation/notifications.rb

@@ -48,6 +48,9 @@ module Karafka
         connection.listener.stopping
         connection.listener.stopped
 
+        consumer.initialize
+        consumer.initialized
+
         consumer.before_schedule_consume
         consumer.consume
         consumer.consumed

data/lib/karafka/instrumentation/vendors/appsignal/client.rb

@@ -23,11 +23,16 @@ module Karafka
           # @param action_name [String] action name. For processing this should be equal to
           #   consumer class + method name
           def start_transaction(action_name)
-            transaction = ::Appsignal::Transaction.create(
-              SecureRandom.uuid,
-              namespace_name,
-              ::Appsignal::Transaction::GenericRequest.new({})
-            )
+            transaction =
+              if version_4_or_newer?
+                ::Appsignal::Transaction.create(namespace_name)
+              else
+                ::Appsignal::Transaction.create(
+                  SecureRandom.uuid,
+                  namespace_name,
+                  ::Appsignal::Transaction::GenericRequest.new({})
+                )
+              end
 
             transaction.set_action_if_nil(action_name)
           end
@@ -45,10 +50,10 @@ module Karafka
           def metadata=(metadata_hash)
             return unless transaction?
 
-            transaction = ::Appsignal::Transaction.current
+            current_transaction = transaction
 
             stringify_hash(metadata_hash).each do |key, value|
-              transaction.set_metadata(key, value)
+              current_transaction.set_metadata(key, value)
             end
           end
 
@@ -78,15 +83,20 @@ module Karafka
             )
           end
 
-          # Sends the error that occurred to Appsignal
+          # Report the error that occurred to Appsignal
           #
           # @param error [Object] error we want to ship to Appsignal
-          def send_error(error)
+          def report_error(error)
+            if ::Appsignal.respond_to?(:report_error)
+              # This helper will always report the error
+              ::Appsignal.report_error(error) do |transaction|
+                transaction.set_namespace(namespace_name)
+              end
             # If we have an active transaction we should use it instead of creating a generic one
             # That way proper namespace and other data may be transferred
             #
             # In case there is no transaction, a new generic background job one will be used
-            if transaction?
+            elsif transaction?
               transaction.set_error(error)
             else
               ::Appsignal.send_error(error) do |transaction|
@@ -99,7 +109,11 @@ module Karafka
           # @param name [Symbol] probe name
           # @param probe [Proc] code to run every minute
           def register_probe(name, probe)
-            ::Appsignal::Minutely.probes.register(name, probe)
+            if ::Appsignal::Probes.respond_to?(:register)
+              ::Appsignal::Probes.register(name, probe)
+            else
+              ::Appsignal::Minutely.probes.register(name, probe)
+            end
           end
 
           private
@@ -129,6 +143,13 @@ module Karafka
           def namespace_name
             @namespace_name ||= ::Appsignal::Transaction::BACKGROUND_JOB
           end
+
+          # @return [Boolean] is this v4+ version of Appsignal gem or older. Used for backwards
+          #   compatibility checks.
+          def version_4_or_newer?
+            @version_4_or_newer ||=
+              Gem::Version.new(Appsignal::VERSION) >= Gem::Version.new('4.0.0')
+          end
         end
       end
     end

data/lib/karafka/instrumentation/vendors/appsignal/errors_listener.rb

@@ -21,7 +21,7 @@ module Karafka
           #
           # @param event [Karafka::Core::Monitoring::Event]
           def on_error_occurred(event)
-            client.send_error(event[:error])
+            client.report_error(event[:error])
           end
         end
       end

data/lib/karafka/messages/message.rb

@@ -51,6 +51,12 @@ module Karafka
         @deserialized
       end
 
+      # @return [Boolean] true if the message has a key and raw payload is nil, it is a tombstone
+      #   event. Otherwise it is not.
+      def tombstone?
+        !raw_key.nil? && @raw_payload.nil?
+      end
+
       private
 
       # @return [Object] deserialized data

data/lib/karafka/pro/loader.rb

@@ -75,7 +75,9 @@ module Karafka
         def features
           [
             Encryption,
-            Cleaner
+            Cleaner,
+            RecurringTasks,
+            ScheduledMessages
           ]
         end
 

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

@@ -135,7 +135,12 @@ module Karafka
 
               dispatch = lambda do
                 dispatch_to_dlq(skippable_message) if dispatch_to_dlq?
-                mark_dispatched_to_dlq(skippable_message)
+
+                if mark_after_dispatch?
+                  mark_dispatched_to_dlq(skippable_message)
+                else
+                  coordinator.seek_offset = skippable_message.offset + 1
+                end
               end
 
               if dispatch_in_a_transaction?
@@ -193,6 +198,16 @@ module Karafka
               producer.transactional? && topic.dead_letter_queue.transactional?
             end
 
+            # @return [Boolean] should we mark given message as consumed after dispatch.
+            #  For default non MOM strategies if user did not explicitly tell us not to, we mark
+            #  it. Default is `nil`, which means `true` in this case. If user provided alternative
+            #  value, we go with it.
+            def mark_after_dispatch?
+              return true if topic.dead_letter_queue.mark_after_dispatch.nil?
+
+              topic.dead_letter_queue.mark_after_dispatch
+            end
+
             # Runs the DLQ strategy and based on it it performs certain operations
             #
             # In case of `:skip` and `:dispatch` will run the exact flow provided in a block

data/lib/karafka/pro/processing/strategies/dlq/ftr_lrj_mom.rb

@@ -55,7 +55,11 @@ module Karafka
                     skippable_message, _marked = find_skippable_message
                     dispatch_to_dlq(skippable_message) if dispatch_to_dlq?
 
-                    coordinator.seek_offset = skippable_message.offset + 1
+                    if mark_after_dispatch?
+                      mark_dispatched_to_dlq(skippable_message)
+                    else
+                      coordinator.seek_offset = skippable_message.offset + 1
+                    end
                   end
                 end
               end

data/lib/karafka/pro/processing/strategies/dlq/ftr_mom.rb

@@ -46,11 +46,27 @@ module Karafka
                     skippable_message, _marked = find_skippable_message
                     dispatch_to_dlq(skippable_message) if dispatch_to_dlq?
 
-                    coordinator.seek_offset = skippable_message.offset + 1
+                    if mark_after_dispatch?
+                      mark_dispatched_to_dlq(skippable_message)
+                    else
+                      coordinator.seek_offset = skippable_message.offset + 1
+                    end
                   end
                 end
               end
             end
+
+            # @return [Boolean] should we mark given message as consumed after dispatch. For
+            #  MOM strategies if user did not explicitly tell us to mark, we do not mark. Default
+            #  is `nil`, which means `false` in this case. If user provided alternative value, we
+            #  go with it.
+            #
+            # @note Please note, this is the opposite behavior than in case of AOM strategies.
+            def mark_after_dispatch?
+              return false if topic.dead_letter_queue.mark_after_dispatch.nil?
+
+              topic.dead_letter_queue.mark_after_dispatch
+            end
           end
         end
       end