sidekiq_publisher 3.0.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e4cfd9a6432a0e864ad275e0ad4d9ef2e37e7e03e2d60c323d9658ae1ac40bc
-  data.tar.gz: f0895de91a5bf0b5755835b997bd9ffa64a7b8c659516500eb21401c282b4379
+  metadata.gz: 86345d364ea857b29f80ee4f041dd6837c29e5b5a05111497029d461c31d3e7e
+  data.tar.gz: 32e159819ce58399eab3cd541e99025f0919cee3e0ccd13a54982638769a6857
 SHA512:
-  metadata.gz: bba1eb7da24705acef0140082b509622c96184997a11562d6714f552ddf2fe8aa03840723e5714c677f1e5748e9c640f771245559201084627f2dd271f36d25f
-  data.tar.gz: '069d74cacc7a2369564402944ae2dfa20b6973fcf4aee7e0d2bbb14bfb207b089aa4b15ae59abea81de2f392bdf480a2b0eadb5790c234ee7cfdf9ed6717fa64'
+  metadata.gz: 3a046f7e8a4b39d36215d4676d4467877492cdb26e12cddf5a07a3ff2a52ae78e384657487471a0f0f8443e88cba80583fe53e04914614ef622af8a5b43dfd1e
+  data.tar.gz: c75cd6ec9e1d2af0c745da843b962c6eedf47868451e26b6ddddce438043438f44ec25ed023352bf05580a8266487d9d584421108658218b69ba2751a7664a89

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # sidekiq_publisher
 
+## 4.0.0
+- BREAKING: Enqueue directly to Redis unless in a transaction ([#74](https://github.com/ezcater/sidekiq_publisher/pull/74/))
+
 ## 3.0.0
 - BREAKING: Drop support for Ruby `2.6` and `2.7` as they are [past end of life](https://endoflife.date/ruby)
 - BREAKING: Drop support for `ddtrace <= 1.8.0`

data/README.md

@@ -16,6 +16,11 @@ that modifies the system of record for the application. It also allows jobs to
 be created even when Sidekiq/Redis is temporarily unavailable. The separate
 publisher process handles retries and ensure that each job is delivered to Sidekiq.
 
+> :warning: Not all jobs are staged in Postgres. This is determined dynamically:
+> if the job is enqueued from within an `ActiveRecord` transaction, then it is
+> staged in Postgres. If not, then it bypasses Postgres and is enqueued directly
+> to Redis via Sidekiq.
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/lib/active_job/queue_adapters/sidekiq_publisher_adapter.rb

@@ -11,19 +11,28 @@ module ActiveJob
       JOB_WRAPPER_CLASS = ActiveJob::QueueAdapters::SidekiqAdapter::JobWrapper.to_s.freeze
 
       def enqueue(job)
-        internal_enqueue(job)
+        if SidekiqPublisher::DatabaseConnection.transaction_open?
+          create_job_record(job)
+        else
+          sidekiq_adapter.enqueue(job)
+        end
       end
 
       def enqueue_at(job, timestamp)
-        internal_enqueue(job, timestamp)
+        if SidekiqPublisher::DatabaseConnection.transaction_open?
+          create_job_record(job, timestamp)
+        else
+          sidekiq_adapter.enqueue_at(job, timestamp)
+        end
       end
 
       private
 
-      def internal_enqueue(job, timestamp = nil)
+      def create_job_record(job, timestamp = nil)
         job.provider_job_id = SidekiqPublisher::Job.generate_sidekiq_jid
         attributes = job_attributes(job)
         attributes[:run_at] = timestamp if timestamp.present?
+
         SidekiqPublisher::Job.create!(attributes).job_id
       end
 
@@ -36,6 +45,10 @@ module ActiveJob
           args: [job.serialize],
         }
       end
+
+      def sidekiq_adapter
+        @_sidekiq_adapter ||= ActiveJob::QueueAdapters::SidekiqAdapter.new
+      end
     end
   end
 end

data/lib/sidekiq_publisher/database_connection.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module SidekiqPublisher
+  module DatabaseConnection
+    def self.transaction_open?
+      ActiveRecord::Base.connection.transaction_open?
+    end
+  end
+end

data/lib/sidekiq_publisher/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SidekiqPublisher
-  VERSION = "3.0.0"
+  VERSION = "4.0.0"
 end

data/lib/sidekiq_publisher/worker.rb

@@ -10,7 +10,11 @@ module SidekiqPublisher
 
     module ClassMethods
       def client_push(item)
-        SidekiqPublisher::Job.create_job!(item)
+        if SidekiqPublisher::DatabaseConnection.transaction_open?
+          SidekiqPublisher::Job.create_job!(item)
+        else
+          super
+        end
       end
     end
   end

data/lib/sidekiq_publisher.rb

@@ -4,6 +4,7 @@ require "active_support"
 require "active_support/core_ext/numeric/time"
 require "sidekiq_publisher/version"
 require "sidekiq_publisher/compatibility"
+require "sidekiq_publisher/database_connection"
 require "sidekiq_publisher/instrumenter"
 require "sidekiq_publisher/metrics_reporter"
 require "sidekiq_publisher/exception_reporter"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq_publisher
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 4.0.0
 platform: ruby
 authors:
 - ezCater, Inc
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-09 00:00:00.000000000 Z
+date: 2024-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -309,6 +309,7 @@ files:
 - lib/sidekiq_publisher.rb
 - lib/sidekiq_publisher/client.rb
 - lib/sidekiq_publisher/compatibility.rb
+- lib/sidekiq_publisher/database_connection.rb
 - lib/sidekiq_publisher/datadog_apm.rb
 - lib/sidekiq_publisher/engine.rb
 - lib/sidekiq_publisher/exception_reporter.rb
@@ -344,7 +345,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: Publisher for enqueuing jobs to Sidekiq