ruby_event_store-outbox 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72cede48801be6a8a32295f690fc6a7a4091ddda2613791765b0d6127ea9eaec
-  data.tar.gz: 7a20be4c5a340e2305a760ecb104547dd7cf728d68e97717c38fde97ef404dac
+  metadata.gz: 67529756ee35bbaf8447ed5ed8afbc6b6e80e2eaae62a1c396492fe4f6fcb7e0
+  data.tar.gz: 617091c19ad0d7bd1a688178740b43aa41165ed7cd9a5a371da33ff7734d3873
 SHA512:
-  metadata.gz: e5412c791d66024632f3ff638d0bc72b7d4b6fe7535c5f736ecaff420e19d8059d8b97e8e0c34de5032433320df2fd329affb7a8c6356f60ed406d8dfaeb0953
-  data.tar.gz: f5375242631ef96645463bf23d1507b491a9259231d3082158a5ddcb4b2a35e2afbe473aea2dd7cec7c73629f735525a972ab673a1e6779d6e7a88b53ec7c378
+  metadata.gz: 2ec5edfc468a99b05f38a9fc6f2db83bb30f2fd86a1c995f98476dee542a99b8f811a83e46e6915b20873eb1c291e5dc7f95a996542c3017a026fbad93eeb383
+  data.tar.gz: 63ee434baae965c530ac947820d0b1f5d2cf682268da3b7c377dde42eedd8eea91b3d56dbd6a96a0e10ec288d4ce6bedbb3cbac9bc874ea03642572f977f7b2a

data/lib/ruby_event_store/outbox/cleanup_strategies/none.rb

@@ -4,7 +4,8 @@ module RubyEventStore
   module Outbox
     module CleanupStrategies
       class None
-        def initialize; end
+        def initialize
+        end
 
         def call(_fetch_specification)
           :ok

data/lib/ruby_event_store/outbox/cleanup_strategies.rb

@@ -14,7 +14,7 @@ module RubyEventStore
           CleanOldEnqueued.new(
             repository,
             ActiveSupport::Duration.parse(configuration.cleanup),
-            configuration.cleanup_limit
+            configuration.cleanup_limit,
           )
         end
       end

data/lib/ruby_event_store/outbox/cli.rb

@@ -32,10 +32,9 @@ module RubyEventStore
             .new do |option_parser|
               option_parser.banner = "Usage: res_outbox [options]"
 
-              option_parser.on(
-                "--database-url=DATABASE_URL",
-                "Database where outbox table is stored"
-              ) { |database_url| options.database_url = database_url }
+              option_parser.on("--database-url=DATABASE_URL", "Database where outbox table is stored") do |database_url|
+                options.database_url = database_url
+              end
 
               option_parser.on("--redis-url=REDIS_URL", "URL to redis database") do |redis_url|
                 options.redis_url = redis_url
@@ -44,25 +43,25 @@ module RubyEventStore
               option_parser.on(
                 "--log-level=LOG_LEVEL",
                 %i[fatal error warn info debug],
-                "Logging level, one of: fatal, error, warn, info, debug. Default: warn"
+                "Logging level, one of: fatal, error, warn, info, debug. Default: warn",
               ) { |log_level| options.log_level = log_level.to_sym }
 
               option_parser.on(
                 "--message-format=FORMAT",
                 ["sidekiq5"],
-                "Message format, supported: sidekiq5. Default: sidekiq5"
+                "Message format, supported: sidekiq5. Default: sidekiq5",
               ) { |message_format| options.message_format = message_format }
 
               option_parser.on(
                 "--split-keys=SPLIT_KEYS",
                 Array,
-                "Split keys which should be handled, all if not specified"
+                "Split keys which should be handled, all if not specified",
               ) { |split_keys| options.split_keys = split_keys if !split_keys.empty? }
 
               option_parser.on(
                 "--batch-size=BATCH_SIZE",
                 Integer,
-                "Amount of records fetched in one fetch. Bigger value means more duplicated messages when network problems occur. Default: 100"
+                "Amount of records fetched in one fetch. Bigger value means more duplicated messages when network problems occur. Default: 100",
               ) { |batch_size| options.batch_size = batch_size }
 
               option_parser.on("--metrics-url=METRICS_URL", "URI to metrics collector, optional") do |metrics_url|
@@ -71,18 +70,18 @@ module RubyEventStore
 
               option_parser.on(
                 "--cleanup=STRATEGY",
-                "A strategy for cleaning old records. One of: none or iso8601 duration format how old enqueued records should be removed. Default: none"
+                "A strategy for cleaning old records. One of: none or iso8601 duration format how old enqueued records should be removed. Default: none",
               ) { |cleanup_strategy| options.cleanup_strategy = cleanup_strategy }
 
               option_parser.on(
                 "--cleanup-limit=LIMIT",
-                "Amount of records removed in single cleanup run. One of: all or number of records that should be removed. Default: all"
+                "Amount of records removed in single cleanup run. One of: all or number of records that should be removed. Default: all",
               ) { |cleanup_limit| options.cleanup_limit = cleanup_limit }
 
               option_parser.on(
                 "--sleep-on-empty=SLEEP_TIME",
                 Float,
-                "How long to sleep before next check when there was nothing to do. Default: 0.5"
+                "How long to sleep before next check when there was nothing to do. Default: 0.5",
               ) { |sleep_on_empty| options.sleep_on_empty = sleep_on_empty }
 
               option_parser.on("-l", "--[no-]lock", "Lock split key in consumer") do |locking|
@@ -101,27 +100,26 @@ module RubyEventStore
 
       def run(argv)
         options = Parser.parse(argv)
-        build_runner(options)
-          .run
+        build_runner(options).run
       end
 
       def build_runner(options)
         consumer_uuid = SecureRandom.uuid
         logger = Logger.new(STDOUT, level: options.log_level, progname: "RES-Outbox #{consumer_uuid}")
-        consumer_configuration = Configuration.new(
-          split_keys: options.split_keys,
-          message_format: options.message_format,
-          batch_size: options.batch_size,
-          database_url: options.database_url,
-          redis_url: options.redis_url,
-          cleanup: options.cleanup_strategy,
-          cleanup_limit: options.cleanup_limit,
-          sleep_on_empty: options.sleep_on_empty,
-          locking: options.locking
-        )
+        consumer_configuration =
+          Configuration.new(
+            split_keys: options.split_keys,
+            message_format: options.message_format,
+            batch_size: options.batch_size,
+            database_url: options.database_url,
+            redis_url: options.redis_url,
+            cleanup: options.cleanup_strategy,
+            cleanup_limit: options.cleanup_limit,
+            sleep_on_empty: options.sleep_on_empty,
+            locking: options.locking,
+          )
         metrics = Metrics.from_url(options.metrics_url)
-        outbox_consumer =
-          Outbox::Consumer.new(consumer_uuid, consumer_configuration, logger: logger, metrics: metrics)
+        outbox_consumer = Outbox::Consumer.new(consumer_uuid, consumer_configuration, logger: logger, metrics: metrics)
         Runner.new(outbox_consumer, consumer_configuration, logger: logger)
       end
     end

data/lib/ruby_event_store/outbox/configuration.rb

@@ -41,14 +41,14 @@ module RubyEventStore
       end
 
       attr_reader :split_keys,
-        :message_format,
-        :batch_size,
-        :database_url,
-        :redis_url,
-        :cleanup,
-        :cleanup_limit,
-        :sleep_on_empty,
-        :locking
+                  :message_format,
+                  :batch_size,
+                  :database_url,
+                  :redis_url,
+                  :cleanup,
+                  :cleanup_limit,
+                  :sleep_on_empty,
+                  :locking
     end
   end
 end

data/lib/ruby_event_store/outbox/consumer.rb

@@ -44,14 +44,17 @@ module RubyEventStore
       end
 
       def handle_split(fetch_specification)
-        repository.with_next_batch(fetch_specification, tempo.batch_size, consumer_uuid, locking, @clock) do |record|
-          now = @clock.now.utc
-          processor.process(record, now)
-          repository.mark_as_enqueued(record, now)
-        end.tap do
-          cleanup(fetch_specification)
-          processor.after_batch
-        end.success_count > 0
+        repository
+          .with_next_batch(fetch_specification, tempo.batch_size, consumer_uuid, locking, @clock) do |record|
+            now = @clock.now.utc
+            processor.process(record, now)
+            repository.mark_as_enqueued(record, now)
+          end
+          .tap do
+            cleanup(fetch_specification)
+            processor.after_batch
+          end
+          .success_count > 0
       end
 
       private

data/lib/ruby_event_store/outbox/metrics/influx.rb

@@ -7,7 +7,6 @@ module RubyEventStore
     module Metrics
       class Influx
         def initialize(url)
-          uri = URI.parse(url)
           options = { url: url, async: true, time_precision: "ns" }
           @influxdb_client = InfluxDB::Client.new(**options)
         end
@@ -15,7 +14,7 @@ module RubyEventStore
         def write_operation_result(operation, result)
           write_point(
             "ruby_event_store.outbox.lock",
-            { values: { value: 1 }, tags: { operation: operation, result: result } }
+            { values: { value: 1 }, tags: { operation: operation, result: result } },
           )
         end
 
@@ -26,13 +25,13 @@ module RubyEventStore
               values: {
                 enqueued: enqueued,
                 failed: failed,
-                remaining: remaining
+                remaining: remaining,
               },
               tags: {
                 format: format,
-                split_key: split_key
-              }
-            }
+                split_key: split_key,
+              },
+            },
           )
         end
 

data/lib/ruby_event_store/outbox/metrics/null.rb

@@ -4,9 +4,11 @@ module RubyEventStore
   module Outbox
     module Metrics
       class Null
-        def write_operation_result(operation, result); end
+        def write_operation_result(operation, result)
+        end
 
-        def write_point_queue(**kwargs); end
+        def write_point_queue(**kwargs)
+        end
       end
     end
   end

data/lib/ruby_event_store/outbox/metrics/test.rb

@@ -21,7 +21,7 @@ module RubyEventStore
             failed: failed,
             remaining: remaining,
             format: format,
-            split_key: split_key
+            split_key: split_key,
           }
         end
 

data/lib/ruby_event_store/outbox/repository.rb

@@ -151,57 +151,53 @@ module RubyEventStore
         BatchResult.empty.tap do |result|
           obtained_lock = obtain_lock_for_process(fetch_specification, consumer_uuid, clock: clock)
           case obtained_lock
-            when :deadlocked
-              logger.warn "Obtaining lock for split_key '#{fetch_specification.split_key}' failed (deadlock)"
-              metrics.write_operation_result("obtain", "deadlocked")
-              return BatchResult.empty
-            when :lock_timeout
-              logger.warn "Obtaining lock for split_key '#{fetch_specification.split_key}' failed (lock timeout)"
-              metrics.write_operation_result("obtain", "lock_timeout")
-              return BatchResult.empty
-            when :taken
-              logger.debug "Obtaining lock for split_key '#{fetch_specification.split_key}' unsuccessful (taken)"
-              metrics.write_operation_result("obtain", "taken")
-              return BatchResult.empty
+          when :deadlocked
+            logger.warn "Obtaining lock for split_key '#{fetch_specification.split_key}' failed (deadlock)"
+            metrics.write_operation_result("obtain", "deadlocked")
+            return BatchResult.empty
+          when :lock_timeout
+            logger.warn "Obtaining lock for split_key '#{fetch_specification.split_key}' failed (lock timeout)"
+            metrics.write_operation_result("obtain", "lock_timeout")
+            return BatchResult.empty
+          when :taken
+            logger.debug "Obtaining lock for split_key '#{fetch_specification.split_key}' unsuccessful (taken)"
+            metrics.write_operation_result("obtain", "taken")
+            return BatchResult.empty
           end
 
           Consumer::MAXIMUM_BATCH_FETCHES_IN_ONE_LOCK.times do
             batch = retrieve_batch(fetch_specification, batch_size).to_a
             break if batch.empty?
-            batch.each do |record|
-              handle_execution(result) do
-                block.call(record)
-              end
-            end
+            batch.each { |record| handle_execution(result) { block.call(record) } }
             case (refresh_result = obtained_lock.refresh(clock: clock))
-              when :ok
-              when :deadlocked
-                logger.warn "Refreshing lock for split_key '#{lock.split_key}' failed (deadlock)"
-                metrics.write_operation_result("refresh", "deadlocked")
-                break
-              when :lock_timeout
-                logger.warn "Refreshing lock for split_key '#{lock.split_key}' failed (lock timeout)"
-                metrics.write_operation_result("refresh", "lock_timeout")
-                break
-              when :stolen
-                logger.debug "Refreshing lock for split_key '#{lock.split_key}' unsuccessful (stolen)"
-                metrics.write_operation_result("refresh", "stolen")
-                break
-              else
-                raise "Unexpected result #{refresh_result}"
+            when :ok
+            when :deadlocked
+              logger.warn "Refreshing lock for split_key '#{lock.split_key}' failed (deadlock)"
+              metrics.write_operation_result("refresh", "deadlocked")
+              break
+            when :lock_timeout
+              logger.warn "Refreshing lock for split_key '#{lock.split_key}' failed (lock timeout)"
+              metrics.write_operation_result("refresh", "lock_timeout")
+              break
+            when :stolen
+              logger.debug "Refreshing lock for split_key '#{lock.split_key}' unsuccessful (stolen)"
+              metrics.write_operation_result("refresh", "stolen")
+              break
+            else
+              raise "Unexpected result #{refresh_result}"
             end
           end
 
           case release_lock_for_process(fetch_specification, consumer_uuid)
-            when :deadlocked
-              logger.warn "Releasing lock for split_key '#{fetch_specification.split_key}' failed (deadlock)"
-              metrics.write_operation_result("release", "deadlocked")
-            when :lock_timeout
-              logger.warn "Releasing lock for split_key '#{fetch_specification.split_key}' failed (lock timeout)"
-              metrics.write_operation_result("release", "lock_timeout")
-            when :not_taken_by_this_process
-              logger.debug "Releasing lock for split_key '#{fetch_specification.split_key}' failed (not taken by this process)"
-              metrics.write_operation_result("release", "not_taken_by_this_process")
+          when :deadlocked
+            logger.warn "Releasing lock for split_key '#{fetch_specification.split_key}' failed (deadlock)"
+            metrics.write_operation_result("release", "deadlocked")
+          when :lock_timeout
+            logger.warn "Releasing lock for split_key '#{fetch_specification.split_key}' failed (lock timeout)"
+            metrics.write_operation_result("release", "lock_timeout")
+          when :not_taken_by_this_process
+            logger.debug "Releasing lock for split_key '#{fetch_specification.split_key}' failed (not taken by this process)"
+            metrics.write_operation_result("release", "not_taken_by_this_process")
           end
           instrument_batch_result(fetch_specification, result)
         end
@@ -212,11 +208,7 @@ module RubyEventStore
           Record.transaction do
             batch = retrieve_batch(fetch_specification, batch_size).lock("FOR UPDATE SKIP LOCKED")
             break if batch.empty?
-            batch.each do |record|
-              handle_execution(result) do
-                block.call(record)
-              end
-            end
+            batch.each { |record| handle_execution(result) { block.call(record) } }
           end
 
           instrument_batch_result(fetch_specification, result)
@@ -229,7 +221,7 @@ module RubyEventStore
           failed: result.failed_count,
           format: fetch_specification.message_format,
           split_key: fetch_specification.split_key,
-          remaining: Record.remaining_for(fetch_specification).count
+          remaining: Record.remaining_for(fetch_specification).count,
         )
 
         logger.info "Sent #{result.success_count} messages from outbox table"

data/lib/ruby_event_store/outbox/runner.rb

@@ -30,6 +30,7 @@ module RubyEventStore
       end
 
       private
+
       attr_reader :consumer, :logger, :sleep_on_empty, :split_keys
 
       def prepare_traps

data/lib/ruby_event_store/outbox/sidekiq_processor.rb

@@ -20,7 +20,7 @@ module RubyEventStore
 
         queue = parsed_record["queue"]
         raise InvalidPayload.new("Missing queue") if queue.nil? || queue.empty?
-        payload = JSON.generate(parsed_record.merge({ "enqueued_at" => now.to_f }))
+        payload = JSON.generate(parsed_record.merge({ "enqueued_at" => record.created_at.to_f }))
 
         redis.call("LPUSH", "queue:#{queue}", payload)
 

data/lib/ruby_event_store/outbox/sidekiq_producer.rb

@@ -20,7 +20,7 @@ module RubyEventStore
           Repository::Record.create!(
             format: SIDEKIQ5_FORMAT,
             split_key: payload.fetch("queue"),
-            payload: payload.to_json
+            payload: payload.to_json,
           )
         end
       end

data/lib/ruby_event_store/outbox/version.rb

@@ -2,6 +2,6 @@
 
 module RubyEventStore
   module Outbox
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: ruby_event_store-outbox
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Arkency
 bindir: bin
 cert_chain: []
-date: 2025-03-28 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby_event_store
@@ -91,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.6
+rubygems_version: 3.6.8
 specification_version: 4
 summary: Active Record based outbox for Ruby Event Store
 test_files: []