Merge branch 'feat/DEX-2891/remove-worker-v1' into 'master'

[DEX-2891] feat: remove worker v1

Closes DEX-2891

See merge request nstmrt/rubygems/outbox!120

Author: Сатаров Юрий Сергеевич

CHANGELOG.md

@@ -13,6 +13,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Fixed
 
+## [7.0.0] - 2025-04-03
+
+### Changed
+
+- BREAKING: remove worker v1 support
+
 ## [6.20.0] - 2025-03-31
 
 ### Fixed

README.md

@@ -154,7 +154,7 @@ Rails.application.config.outbox.tap do |config|
   config.redis = {url: ENV.fetch("REDIS_URL")} # Redis is used as a coordinator service
   config.paths << Rails.root.join("config/outbox.yml").to_s # optional; configuration file paths, deep merged at the application start, useful with Rails engines
 
-  # optional (worker v2: default)
+  # optional
   config.poller = ActiveSupport::OrderedOptions.new.tap do |pc|
     # max parallel threads (per box-item, globally)
     pc.concurrency = 6
@@ -184,7 +184,7 @@ Rails.application.config.outbox.tap do |config|
     pc.queue_delay = 0.1
   end
 
-  # optional (worker v2: default)
+  # optional
   config.processor = ActiveSupport::OrderedOptions.new.tap do |pc|
     # max threads count (per worker process)
     pc.threads_count = 4
@@ -193,26 +193,6 @@ Rails.application.config.outbox.tap do |config|
     # BRPOP delay (in seconds) for polling redis job queue per box-item
     pc.brpop_delay = 2
   end
-
-  # optional (worker v1: DEPRECATED)
-  config.process_items.tap do |x|
-    # maximum processing time of the batch, after which the batch will be considered hung and processing will be aborted
-    x.general_timeout = 180
-    # maximum batch processing time, after which the processing of the batch will be aborted in the current thread,
-    # and the next thread that picks up the batch will start processing from the same place
-    x.cutoff_timeout = 60
-    # batch size
-    x.batch_size = 200
-  end
-
-  # optional (worker v1: DEPRECATED)
-  config.worker.tap do |worker|
-    # number of batches that one thread will process per rate interval
-    worker.rate_limit = 10
-    # rate interval in seconds
-    worker.rate_interval = 60
-  end
-end
 ```
 
 ### Outbox pattern
@@ -642,7 +622,7 @@ end
 
 We would like to see more features added to the web UI. If you have any suggestions, please feel free to submit a pull request 🤗.
 
-## CLI Arguments (v2: default)
+## CLI Arguments
 
 | Key                        | Description                                                          |
 |----------------------------|----------------------------------------------------------------------|
@@ -651,14 +631,6 @@ We would like to see more features added to the web UI. If you have any suggesti
 | `--poll-concurrency or -p` | Number of poller partitions. Default 6.                              |
 | `--poll-threads or -n`     | Number of poll threads. Default 1.                                   |
 | `--poll-tactic or -t`      | Poll tactic. Default "default".                                      |
-| `--worker-version or -w`   | Worker version. Default 2.                                           |
-
-## CLI Arguments (v1: DEPRECATED)
-
-| Key                   | Description                                                               |
-|-----------------------|---------------------------------------------------------------------------|
-| `--boxes or -b`       | Outbox/Inbox processors to start`                                         |
-| `--concurrency or -c` | Number of threads. Default 10.                                            |
 
 ## Development & Test
 

lib/sbmt/outbox.rb

@@ -65,10 +65,6 @@ def processor_config
       @processor_config ||= config.processor
     end
 
-    def default_worker_version
-      @default_worker_version ||= config.default_worker_version&.to_i || 2
-    end
-
     def active_record_base_class
       @active_record_base_class ||= config.active_record_base_class.safe_constantize || ::ActiveRecord::Base
     end

lib/sbmt/outbox/cli.rb

@@ -33,34 +33,19 @@ def self.exit_on_failure?
         aliases: "-t",
         type: :string,
         desc: "Poll tactic: [default, low-priority, aggressive]"
-      option :worker_version,
-        aliases: "-w",
-        type: :numeric,
-        desc: "Worker version: [1 | 2]"
       def start
         load_environment
 
-        version = options[:worker_version] || Outbox.default_worker_version
-
         boxes = format_boxes(options[:box])
-        check_deprecations!(boxes, version)
-
-        worker = if version == 1
-          Sbmt::Outbox::V1::Worker.new(
-            boxes: boxes,
-            concurrency: options[:concurrency] || 10
-          )
-        elsif version == 2
-          Sbmt::Outbox::V2::Worker.new(
-            boxes: boxes,
-            poll_tactic: options[:poll_tactic],
-            poller_threads_count: options[:poll_threads],
-            poller_partitions_count: options[:poll_concurrency],
-            processor_concurrency: options[:concurrency] || 4
-          )
-        else
-          raise "Worker version #{version} is invalid, available versions: 1|2"
-        end
+        check_deprecations!(boxes)
+
+        worker = Sbmt::Outbox::V2::Worker.new(
+          boxes: boxes,
+          poll_tactic: options[:poll_tactic],
+          poller_threads_count: options[:poll_threads],
+          poller_partitions_count: options[:poll_concurrency],
+          processor_concurrency: options[:concurrency] || 4
+        )
 
         Sbmt::Outbox.current_worker = worker
 
@@ -77,9 +62,7 @@ def start
 
       private
 
-      def check_deprecations!(boxes, version)
-        return unless version == 2
-
+      def check_deprecations!(boxes)
         boxes.each do |item_class|
           next if item_class.config.partition_size_raw.blank?
 
@@ -91,7 +74,6 @@ def load_environment
         load(lookup_outboxfile)
 
         require "sbmt/outbox"
-        require "sbmt/outbox/v1/worker"
         require "sbmt/outbox/v2/worker"
       end
 

lib/sbmt/outbox/engine.rb

@@ -29,12 +29,6 @@ class Engine < Rails::Engine
           c.cutoff_timeout = 90
           c.batch_size = 200
         end
-        c.worker = ActiveSupport::OrderedOptions.new.tap do |c|
-          c.rate_limit = 20
-          c.rate_interval = 60
-          c.shuffle_jobs = true
-        end
-        c.default_worker_version = 2
 
         # worker v2
         c.poller = ActiveSupport::OrderedOptions.new.tap do |pc|