activejob 7.2.1.1 → 8.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3a60bf6940ca6270c614cf3618f9537ee9a082da84e176c00735b040199798e
-  data.tar.gz: 1c1807cc840a89fe4414a39fc48582d18ed2e46ad89080ca63c508165080d8a0
+  metadata.gz: b057adb9e0f95a232c9e5f47426c2555738637e6ea540fa1e5ac420f16e3fcae
+  data.tar.gz: 0cfdb021f58ad66972c0399325444bca333d94cf1b41077052285ff1bb2b702a
 SHA512:
-  metadata.gz: ff2f5e989fb6da50b5c504a97d7bbd62caa4a627476702e7bdbc4ae4fc28f664fce0589cf6e317125b9ccf2dc60812de8b076e513dd7131d1a94927eb1ac437d
-  data.tar.gz: 15c61d32050aac39e081ef4200b798d89abfbb465bcc6fcae5a8dfd0788b8c686ebeec7a486fead2cdafbf96f613d8ec997873fb044d53252b5577a1c5ae6e66
+  metadata.gz: e5ccec22443249143387d8186b10065f403d4410bc042621b31aa128093ab34625a42c4f071e8752be0e6fb856258a490f3b855cb2a46a0edc187a4ae93a4745
+  data.tar.gz: 80192a27f0d1f8234686f2f1b8fbcc0e7bef144e38425d836958a38f3c00601dd4343bed0ef2edf82c21e0f215f1764452a651fbdd7100edb275aaeaa06a3c33

data/CHANGELOG.md

@@ -1,77 +1,20 @@
-## Rails 7.2.1.1 (October 15, 2024) ##
+## Rails 8.0.0.rc1 (October 19, 2024) ##
 
-*   No changes.
-
-
-## Rails 7.2.1 (August 22, 2024) ##
-
-*   No changes.
-
-
-## Rails 7.2.0 (August 09, 2024) ##
-
-*   All tests now respect the `active_job.queue_adapter` config.
-
-    Previously if you had set `config.active_job.queue_adapter` in your `config/application.rb`
-    or `config/environments/test.rb` file, the adapter you selected was previously not used consistently
-    across all tests. In some tests your adapter would be used, but other tests would use the `TestAdapter`.
-
-    In Rails 7.2, all tests will respect the `queue_adapter` config if provided. If no config is provided,
-    the `TestAdapter` will continue to be used.
-
-    See [#48585](https://github.com/rails/rails/pull/48585) for more details.
-
-    *Alex Ghiculescu*
-
-*   Make Active Job transaction aware when used conjointly with Active Record.
-
-    A common mistake with Active Job is to enqueue jobs from inside a transaction,
-    causing them to potentially be picked and ran by another process, before the
-    transaction is committed, which may result in various errors.
-
-    ```ruby
-    Topic.transaction do
-      topic = Topic.create(...)
-      NewTopicNotificationJob.perform_later(topic)
-    end
-    ```
-
-    Now Active Job will automatically defer the enqueuing to after the transaction is committed,
-    and drop the job if the transaction is rolled back.
-
-    Various queue implementations can choose to disable this behavior, and users can disable it,
-    or force it on a per job basis:
-
-    ```ruby
-    class NewTopicNotificationJob < ApplicationJob
-      self.enqueue_after_transaction_commit = :never # or `:always` or `:default`
-    end
-    ```
-
-    *Jean Boussier*, *Cristian Bica*
-
-*   Do not trigger immediate loading of `ActiveJob::Base` when loading `ActiveJob::TestHelper`.
-
-    *Maxime Réty*
-
-*   Preserve the serialized timezone when deserializing `ActiveSupport::TimeWithZone` arguments.
-
-    *Joshua Young*
-
-*   Remove deprecated `:exponentially_longer` value for the `:wait` in `retry_on`.
+*   Remove deprecated `config.active_job.use_big_decimal_serializer`.
 
     *Rafael Mendonça França*
 
-*   Remove deprecated support to set numeric values to `scheduled_at` attribute.
 
-    *Rafael Mendonça França*
+## Rails 8.0.0.beta1 (September 26, 2024) ##
 
-*   Deprecate `Rails.application.config.active_job.use_big_decimal_serialize`.
+*   Deprecate `sucker_punch` as an adapter option.
 
-    *Rafael Mendonça França*
+    If you're using this adapter, change to `adapter: async` for the same functionality.
 
-*   Remove deprecated primitive serializer for `BigDecimal` arguments.
+    *Dino Maric, zzak*
 
-    *Rafael Mendonça França*
+*   Use `RAILS_MAX_THREADS` in `ActiveJob::AsyncAdapter`. If it is not set, use 5 as default.
+
+    *heka1024*
 
-Please check [7-1-stable](https://github.com/rails/rails/blob/7-1-stable/activejob/CHANGELOG.md) for previous changes.
+Please check [7-2-stable](https://github.com/rails/rails/blob/7-2-stable/activejob/CHANGELOG.md) for previous changes.

data/lib/active_job/enqueue_after_transaction_commit.rb

@@ -4,13 +4,29 @@ module ActiveJob
   module EnqueueAfterTransactionCommit # :nodoc:
     private
       def raw_enqueue
+        enqueue_after_transaction_commit = self.class.enqueue_after_transaction_commit
+
         after_transaction = case self.class.enqueue_after_transaction_commit
         when :always
+          ActiveJob.deprecator.warn(<<~MSG.squish)
+            Setting `#{self.class.name}.enqueue_after_transaction_commit = :always` is deprecated and will be removed in Rails 8.1.
+            Set to `true` to always enqueue the job after the transaction is committed.
+          MSG
           true
         when :never
+          ActiveJob.deprecator.warn(<<~MSG.squish)
+            Setting #{self.class.name}.enqueue_after_transaction_commit = :never` is deprecated and will be removed in Rails 8.1.
+            Set to `false` to never enqueue the job after the transaction is committed.
+          MSG
+          false
+        when :default
+          ActiveJob.deprecator.warn(<<~MSG.squish)
+            Setting `#{self.class.name}.enqueue_after_transaction_commit = :default` is deprecated and will be removed in Rails 8.1.
+            Set to `false` to never enqueue the job after the transaction is committed.
+          MSG
           false
-        else # :default
-          queue_adapter.enqueue_after_transaction_commit?
+        else
+          enqueue_after_transaction_commit
         end
 
         if after_transaction

data/lib/active_job/enqueuing.rb

@@ -48,10 +48,9 @@ module ActiveJob
       # automatically defers the enqueue to after the transaction commits.
       #
       # It can be set on a per job basis:
-      #  - `:always` forces the job to be deferred.
-      #  - `:never` forces the job to be queued immediately.
-      #  - `:default` lets the queue adapter define the behavior (recommended).
-      class_attribute :enqueue_after_transaction_commit, instance_accessor: false, instance_predicate: false, default: :never
+      #  - true forces the job to be deferred.
+      #  - false forces the job to be queued immediately.
+      class_attribute :enqueue_after_transaction_commit, instance_accessor: false, instance_predicate: false, default: false
     end
 
     # Includes the +perform_later+ method for job initialization.

data/lib/active_job/gem_version.rb

@@ -7,10 +7,10 @@ module ActiveJob
   end
 
   module VERSION
-    MAJOR = 7
-    MINOR = 2
-    TINY  = 1
-    PRE   = "1"
+    MAJOR = 8
+    MINOR = 0
+    TINY  = 0
+    PRE   = "rc1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/active_job/log_subscriber.rb

@@ -125,7 +125,7 @@ module ActiveJob
         "Stopped retrying #{job.class} (Job ID: #{job.job_id}) due to a #{ex.class} (#{ex.message}), which reoccurred on #{job.executions} attempts."
       end
     end
-    subscribe_log_level :enqueue_retry, :error
+    subscribe_log_level :retry_stopped, :error
 
     def discard(event)
       job = event.payload[:job]
@@ -189,15 +189,19 @@ module ActiveJob
       end
 
       def log_enqueue_source
-        source = extract_enqueue_source_location(caller)
+        source = enqueue_source_location
 
         if source
           logger.info("↳ #{source}")
         end
       end
 
-      def extract_enqueue_source_location(locations)
-        backtrace_cleaner.clean(locations.lazy).first
+      def enqueue_source_location
+        Thread.each_caller_location do |location|
+          frame = backtrace_cleaner.clean_frame(location)
+          return frame if frame
+        end
+        nil
       end
 
       def enqueued_jobs_message(adapter, enqueued_jobs)

data/lib/active_job/queue_adapter.rb

@@ -50,6 +50,7 @@ module ActiveJob
         case name_or_adapter
         when Symbol, String
           queue_adapter = ActiveJob::QueueAdapters.lookup(name_or_adapter).new
+          queue_adapter.try(:check_adapter)
           assign_adapter(name_or_adapter.to_s, queue_adapter)
         else
           if queue_adapter?(name_or_adapter)

data/lib/active_job/queue_adapters/abstract_adapter.rb

@@ -7,14 +7,6 @@ module ActiveJob
     # Active Job supports multiple job queue systems. ActiveJob::QueueAdapters::AbstractAdapter
     # forms the abstraction layer which makes this possible.
     class AbstractAdapter
-      # Defines whether enqueuing should happen implicitly to after commit when called
-      # from inside a transaction. Most adapters should return true, but some adapters
-      # that use the same database as Active Record and are transaction aware can return
-      # false to continue enqueuing jobs as part of the transaction.
-      def enqueue_after_transaction_commit?
-        true
-      end
-
       def enqueue(job)
         raise NotImplementedError
       end

data/lib/active_job/queue_adapters/async_adapter.rb

@@ -74,7 +74,7 @@ module ActiveJob
       class Scheduler # :nodoc:
         DEFAULT_EXECUTOR_OPTIONS = {
           min_threads:     0,
-          max_threads:     Concurrent.processor_count,
+          max_threads:     ENV.fetch("RAILS_MAX_THREADS", 5).to_i,
           auto_terminate:  true,
           idletime:        60, # 1 minute
           max_queue:       0, # unlimited

data/lib/active_job/queue_adapters/delayed_job_adapter.rb

@@ -16,14 +16,6 @@ module ActiveJob
     #
     #   Rails.application.config.active_job.queue_adapter = :delayed_job
     class DelayedJobAdapter < AbstractAdapter
-      def initialize(enqueue_after_transaction_commit: false)
-        @enqueue_after_transaction_commit = enqueue_after_transaction_commit
-      end
-
-      def enqueue_after_transaction_commit? # :nodoc:
-        @enqueue_after_transaction_commit
-      end
-
       def enqueue(job) # :nodoc:
         delayed_job = Delayed::Job.enqueue(JobWrapper.new(job.serialize), queue: job.queue_name, priority: job.priority)
         job.provider_job_id = delayed_job.id

data/lib/active_job/queue_adapters/inline_adapter.rb

@@ -11,10 +11,6 @@ module ActiveJob
     #
     #   Rails.application.config.active_job.queue_adapter = :inline
     class InlineAdapter < AbstractAdapter
-      def enqueue_after_transaction_commit? # :nodoc:
-        false
-      end
-
       def enqueue(job) # :nodoc:
         Base.execute(job.serialize)
       end

data/lib/active_job/queue_adapters/queue_classic_adapter.rb

@@ -19,14 +19,6 @@ module ActiveJob
     #
     #   Rails.application.config.active_job.queue_adapter = :queue_classic
     class QueueClassicAdapter < AbstractAdapter
-      def initialize(enqueue_after_transaction_commit: false)
-        @enqueue_after_transaction_commit = enqueue_after_transaction_commit
-      end
-
-      def enqueue_after_transaction_commit? # :nodoc:
-        @enqueue_after_transaction_commit
-      end
-
       def enqueue(job) # :nodoc:
         qc_job = build_queue(job.queue_name).enqueue("#{JobWrapper.name}.perform", job.serialize)
         job.provider_job_id = qc_job["id"] if qc_job.is_a?(Hash)

data/lib/active_job/queue_adapters/sucker_punch_adapter.rb

@@ -18,6 +18,13 @@ module ActiveJob
     #
     #   Rails.application.config.active_job.queue_adapter = :sucker_punch
     class SuckerPunchAdapter < AbstractAdapter
+      def check_adapter
+        ActiveJob.deprecator.warn <<~MSG.squish
+          The `sucker_punch` adapter is deprecated and will be removed in Rails 8.1.
+          Please use the `async` adapter instead.
+        MSG
+      end
+
       def enqueue(job) # :nodoc:
         if JobWrapper.respond_to?(:perform_async)
           # sucker_punch 2.0 API

data/lib/active_job/queue_adapters/test_adapter.rb

@@ -12,17 +12,9 @@ module ActiveJob
     #
     #   Rails.application.config.active_job.queue_adapter = :test
     class TestAdapter < AbstractAdapter
-      attr_accessor(:perform_enqueued_jobs, :perform_enqueued_at_jobs, :filter, :reject, :queue, :at, :enqueue_after_transaction_commit)
+      attr_accessor(:perform_enqueued_jobs, :perform_enqueued_at_jobs, :filter, :reject, :queue, :at)
       attr_writer(:enqueued_jobs, :performed_jobs)
 
-      def initialize(enqueue_after_transaction_commit: true)
-        @enqueue_after_transaction_commit = enqueue_after_transaction_commit
-      end
-
-      def enqueue_after_transaction_commit? # :nodoc:
-        @enqueue_after_transaction_commit
-      end
-
       # Provides a store of all the enqueued jobs with the TestAdapter so you can check them.
       def enqueued_jobs
         @enqueued_jobs ||= []

data/lib/active_job/queue_adapters.rb

@@ -12,7 +12,6 @@ module ActiveJob
   # * {Resque}[https://github.com/resque/resque]
   # * {Sidekiq}[https://sidekiq.org]
   # * {Sneakers}[https://github.com/jondot/sneakers]
-  # * {Sucker Punch}[https://github.com/brandonhilkert/sucker_punch]
   # * Please Note: We are not accepting pull requests for new adapters. See the {README}[link:files/activejob/README_md.html] for more details.
   #
   # For testing and development Active Job has three built-in adapters:
@@ -32,7 +31,6 @@ module ActiveJob
   #   | Resque            | Yes   | Yes    | Yes (Gem)  | Queue      | Global  | Yes     |
   #   | Sidekiq           | Yes   | Yes    | Yes        | Queue      | No      | Job     |
   #   | Sneakers          | Yes   | Yes    | No         | Queue      | Queue   | No      |
-  #   | Sucker Punch      | Yes   | Yes    | Yes        | No         | No      | No      |
   #   | Active Job Async  | Yes   | Yes    | Yes        | No         | No      | No      |
   #   | Active Job Inline | No    | Yes    | N/A        | N/A        | N/A     | N/A     |
   #   | Active Job Test   | No    | Yes    | N/A        | N/A        | N/A     | N/A     |
@@ -119,7 +117,6 @@ module ActiveJob
     autoload :InlineAdapter
     autoload :BackburnerAdapter
     autoload :DelayedJobAdapter
-    autoload :QueAdapter
     autoload :QueueClassicAdapter
     autoload :ResqueAdapter
     autoload :SidekiqAdapter

data/lib/active_job/railtie.rb

@@ -31,7 +31,22 @@ module ActiveJob
           ActiveJob::Base.include EnqueueAfterTransactionCommit
 
           if app.config.active_job.key?(:enqueue_after_transaction_commit)
-            ActiveJob::Base.enqueue_after_transaction_commit = app.config.active_job.delete(:enqueue_after_transaction_commit)
+            ActiveJob.deprecator.warn(<<~MSG.squish)
+              `config.active_job.enqueue_after_transaction_commit` is deprecated and will be removed in Rails 8.1.
+              This configuration can still be set on individual jobs using `self.enqueue_after_transaction_commit=`,
+              but due the nature of this behavior, it is not recommended to be set globally.
+            MSG
+
+            value = case app.config.active_job.enqueue_after_transaction_commit
+            when :always
+              true
+            when :never
+              false
+            else
+              false
+            end
+
+            ActiveJob::Base.enqueue_after_transaction_commit = value
           end
         end
       end
@@ -54,7 +69,8 @@ module ActiveJob
         # Configs used in other initializers
         options = options.except(
           :log_query_tags_around_perform,
-          :custom_serializers
+          :custom_serializers,
+          :enqueue_after_transaction_commit
         )
 
         options.each do |k, v|
@@ -91,7 +107,9 @@ module ActiveJob
         app.config.active_record.query_log_tags |= [:job]
 
         ActiveSupport.on_load(:active_record) do
-          ActiveRecord::QueryLogs.taggings[:job] = ->(context) { context[:job].class.name if context[:job] }
+          ActiveRecord::QueryLogs.taggings = ActiveRecord::QueryLogs.taggings.merge(
+            job: ->(context) { context[:job].class.name if context[:job] }
+          )
         end
       end
     end

data/lib/active_job/serializers.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "set"
-
 module ActiveJob
   # = Active Job \Serializers
   #

data/lib/active_job.rb

@@ -49,18 +49,6 @@ module ActiveJob
   autoload :TestCase
   autoload :TestHelper
 
-  def self.use_big_decimal_serializer
-    ActiveJob.deprecator.warn <<-WARNING.squish
-      Rails.application.config.active_job.use_big_decimal_serializer is deprecated and will be removed in Rails 8.0.
-    WARNING
-  end
-
-  def self.use_big_decimal_serializer=(value)
-    ActiveJob.deprecator.warn <<-WARNING.squish
-      Rails.application.config.active_job.use_big_decimal_serializer is deprecated and will be removed in Rails 8.0.
-    WARNING
-  end
-
   ##
   # :singleton-method: verbose_enqueue_logs
   #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activejob
 version: !ruby/object:Gem::Version
-  version: 7.2.1.1
+  version: 8.0.0.rc1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-10-15 00:00:00.000000000 Z
+date: 2024-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.2.1.1
+        version: 8.0.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.2.1.1
+        version: 8.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: globalid
   requirement: !ruby/object:Gem::Requirement
@@ -104,10 +104,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v7.2.1.1/activejob/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v7.2.1.1/
+  changelog_uri: https://github.com/rails/rails/blob/v8.0.0.rc1/activejob/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v8.0.0.rc1/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v7.2.1.1/activejob
+  source_code_uri: https://github.com/rails/rails/tree/v8.0.0.rc1/activejob
   rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
@@ -117,7 +117,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.1.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="