job-iteration 1.12.0 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a851271cdcba188da01fad33b65fa92cdbbe27d6515c44ee950d27d761e1519
-  data.tar.gz: e15477e57d43194a00067d026dc445c9edbc9225ba4bef2b0de60f91618d9874
+  metadata.gz: 3d53eb98ba08338c2ec09152aec97a0b5533f19a333e28251dd72bd9ddb9f086
+  data.tar.gz: ac7130a6c0ddc18a72611d7b84511bd298fb152edd7860e6cee9b0ac5812f5ae
 SHA512:
-  metadata.gz: a7abcf968843fcfc5c260adae6998f905398308acdd3b42fd8a4208556e3207c1cd0650724b2f48f07a7d23f84cc1740ede0fc6066ee8c211109de556b83357d
-  data.tar.gz: d8ebd653153f30e87d91951be33b38a7c8644a58865e7bff1c76603cd5287301fe596116c9eac412cd93a5b571e1062e6ef766b38b8debd6d93c20b44f9af4b8
+  metadata.gz: b1d9ae0dab247bc4e6407fb801f93abfe321a81c1fb3192bad329d4aab0ceaa73f3c198873fb225f63324dc7ade9bd826456ad05f838b6a54d4de7f9dd196962
+  data.tar.gz: 93bba42a0e0267df4d8437e1afc8cf34fa06d3d80b695fb0f45d5f538b3eac35bb9943891c8a918fa1d600d3316152ceabaf5fc2158e8e77eec662292bf828c6

data/CHANGELOG.md

@@ -1,5 +1,5 @@
 ## Main (unreleased)
-
+ 
 ### Breaking Changes
 
 nil
@@ -16,6 +16,24 @@ nil
 
 nil
 
+## v1.13.0 (Mar 23, 2026)
+
+### Breaking Changes
+
+- [673](https://github.com/Shopify/job-iteration/pull/673) - Drop support for Ruby 3.0 and Rails 6.1. The minimum supported Ruby version is now 3.1 and the minimum supported Rails version is now 7.0.
+
+### Changes
+
+nil
+
+### Features
+
+- [683](https://github.com/Shopify/job-iteration/pull/683) Add support for logging interruption reasons from the interruption_adapters and job_should_exit? hooks
+
+### Bug fixes
+
+nil
+
 ## v1.12.0 (Jan 16, 2026)
 
 ### Features

data/README.md

@@ -166,8 +166,8 @@ Job-iteration currently supports the following queue adapters (in order of imple
 
 It supports the following platforms:
 
-- Ruby 3.0 and later
-- Rails 6.1 and later
+- Ruby 3.1 and later
+- Rails 7.0 and later
 
 Support for older platforms that have reached end of life may occasionally be dropped if maintaining backwards compatibility is cumbersome.
 

data/job-iteration.gemspec

@@ -5,7 +5,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "job-iteration/version"
 
 Gem::Specification.new do |spec|
-  spec.required_ruby_version = ">= 3.0"
+  spec.required_ruby_version = ">= 3.1"
   spec.name          = "job-iteration"
   spec.version       = JobIteration::VERSION
   spec.authors       = ["Shopify"]
@@ -26,5 +26,5 @@ Gem::Specification.new do |spec|
   spec.metadata["changelog_uri"] = "https://github.com/Shopify/job-iteration/blob/main/CHANGELOG.md"
   spec.metadata["allowed_push_host"] = "https://rubygems.org"
 
-  spec.add_dependency("activejob", ">= 6.1")
+  spec.add_dependency("activejob", ">= 7.0")
 end

data/lib/job-iteration/interruption_adapters.rb

@@ -25,6 +25,11 @@ module JobIteration
 
       # Registers adapter for specified name.
       #
+      # The adapter must respond to +call+ and return a falsy value to continue iterating,
+      # or a truthy value to signal interruption. If the adapter returns a String, it will
+      # be used as the interruption reason in logs and the +interrupted.iteration+
+      # notification. Otherwise, the reason defaults to +"interrupted"+.
+      #
       #   JobIteration::InterruptionAdapters.register(:sidekiq, MyCustomSidekiqAdapter)
       def register(name, adapter)
         raise ArgumentError, "adapter must be callable" unless adapter.respond_to?(:call)

data/lib/job-iteration/iteration.rb

@@ -188,10 +188,12 @@ module JobIteration
           self.cursor_position = cursor_from_enumerator
         end
 
-        next unless job_should_exit?
+        reason = job_should_exit?
+        next unless reason
 
         self.executions -= 1 if executions > 1
         @needs_reenqueue = true
+        @interrupt_reason = reason.is_a?(String) ? reason : "unknown"
         return false
       end
 
@@ -206,7 +208,10 @@ module JobIteration
     end
 
     def reenqueue_iteration_job
-      ActiveSupport::Notifications.instrument("interrupted.iteration", instrumentation_tags)
+      ActiveSupport::Notifications.instrument(
+        "interrupted.iteration",
+        instrumentation_tags.merge(reason: @interrupt_reason),
+      )
 
       self.times_interrupted += 1
 
@@ -289,9 +294,14 @@ module JobIteration
 
     def job_should_exit?
       max_job_runtime = job_iteration_max_job_runtime
-      return true if max_job_runtime && start_time && (Time.now.utc - start_time) > max_job_runtime
+      if max_job_runtime && start_time && (Time.now.utc - start_time) > max_job_runtime
+        return "max_job_runtime_exceeded"
+      end
+
+      result = interruption_adapter.call
+      return (result.is_a?(String) ? result : "interrupted") if result
 
-      interruption_adapter.call || (defined?(super) && super)
+      (defined?(super) && super) || false
     end
 
     def job_iteration_max_job_runtime

data/lib/job-iteration/log_subscriber.rb

@@ -22,7 +22,7 @@ module JobIteration
     def interrupted(event)
       info do
         "[JobIteration::Iteration] Interrupting and re-enqueueing the job " \
-          "cursor_position=#{event.payload[:cursor_position]}"
+          "cursor_position=#{event.payload[:cursor_position]} reason=#{event.payload[:reason] || "nil"}"
       end
     end
 

data/lib/job-iteration/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JobIteration
-  VERSION = "1.12.0"
+  VERSION = "1.13.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: job-iteration
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.13.0
 platform: ruby
 authors:
 - Shopify
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.0'
 description: Makes your background jobs interruptible and resumable.
 email:
 - ops-accounts+shipit@shopify.com
@@ -70,14 +70,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.4
+rubygems_version: 4.0.8
 specification_version: 4
 summary: Makes your background jobs interruptible and resumable.
 test_files: []