sidekiq_publisher 2.1.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa63cc2e02febd7a4fe0da8a1deba89df521cf9df46d453626ee80c45cb441c1
-  data.tar.gz: 8c4ba92a29040892080f1b0248dfec8a6f1193063f054c48d6736e3fc15a9e40
+  metadata.gz: 5a85f0c8a5d2626638e56314c3f17a5f59168413f0e8075b7b21a69e8f3a3708
+  data.tar.gz: fb45a06f543ececf11a48d4e25bc6a57aac3d199ce36b0589702c2528a82b949
 SHA512:
-  metadata.gz: '01874b1f9cad7364bf28af24830f62278c3e6aea796a5af4b66ca1fc5c3a63806f48fe3a44892f40c18759dabe58f825d444f28fb48f7b76777440c988120728'
-  data.tar.gz: 9c1c712c199f2abc7fa86c61d9739c1739d78200978071cb0b4ee0cb470091c5d84cf310f0a523f5cb31c98b87ed0ef2afd42ca61d3d743c7f605dde45b32663
+  metadata.gz: 29120ed0408fff736b9b140fbcb4540cc51fdb5f5a79685bd9d801f1c611ac94bacad584d1ca63708875b99143119a5296cee8f28e5e234a1d54d8e0899572b8
+  data.tar.gz: 5e575e742f298be27974185ccbf271a8817e9505bec890ba923d011b9ebfbb3fe1ecdc5b175db851348c4060da9239ab3a545fe2b0fb5b2e47a3935746749d86

data/Appraisals

@@ -72,6 +72,12 @@ appraise "rails-6.0-sidekiq-6.3" do
   gem "sidekiq", "~> 6.3.0"
 end
 
+appraise "rails-6.0-sidekiq-6.4" do
+  gem "activejob", "~> 6.0.0"
+  gem "activesupport", "~> 6.0.0"
+  gem "sidekiq", "~> 6.4.2" # above 6.4.2 to ensure we test against breaking changes
+end
+
 appraise "rails-6.1-sidekiq-5.2" do
   gem "activejob", "~> 6.1.0"
   gem "activesupport", "~> 6.1.0"
@@ -101,3 +107,23 @@ appraise "rails-6.1-sidekiq-6.3" do
   gem "activesupport", "~> 6.1.0"
   gem "sidekiq", "~> 6.3.0"
 end
+
+appraise "rails-6.1-sidekiq-6.4" do
+  gem "activejob", "~> 6.1.0"
+  gem "activesupport", "~> 6.1.0"
+  gem "sidekiq", "~> 6.4.2" # above 6.4.2 to ensure we test against breaking changes
+end
+
+appraise "rails-6.1-sidekiq-6.4-ddtrace-0-x" do
+  gem "activejob", "~> 6.1.0"
+  gem "activesupport", "~> 6.1.0"
+  gem "sidekiq", "~> 6.4.2"
+  gem "ddtrace", "~> 0.54"
+end
+
+appraise "rails-6.1-sidekiq-6.4-ddtrace-0-x" do
+  gem "activejob", "~> 6.1.0"
+  gem "activesupport", "~> 6.1.0"
+  gem "sidekiq", "~> 6.4.2"
+  gem "ddtrace", "~> 1.0"
+end

data/CHANGELOG.md

@@ -1,5 +1,26 @@
 # sidekiq_publisher
 
+## (Unreleased)
+
+## 2.3.0
+- Add support for ddtrace 1.x.
+- Add support for sidekiq 6.4.2+.
+
+## 2.2.0
+- Add support for redis 5.0.0 by replacing pipelined commands.
+  - Also resolves deprecation warnings introduced in [redis 4.6.0]
+
+[redis 4.6.0]: https://github.com/redis/redis-rb/blob/master/CHANGELOG.md#460
+
+- Restricts sidekiq to < 6.4.2 due to an incompatability
+  - [issue tracking this](https://github.com/ezcater/sidekiq_publisher/issues/55)
+
+- Restricts ddtrace to < 1.0.0 due to an incompatability
+
+## 2.1.1
+- Opt-in to [Rubygems MFA](https://guides.rubygems.org/mfa-requirement-opt-in/)
+  for privileged operations
+
 ## 2.1.0
 - Add support for sidekiq `7.0.0` by using `Sidekiq::Job` instead of
   `Sidekiq::Worker` in sidekiq `>= 6.3.0` to handle name changes outlined in

data/README.md

@@ -1,6 +1,11 @@
 # sidekiq_publisher
 
-[![CircleCI](https://circleci.com/gh/ezcater/sidekiq_publisher.svg?style=svg)](https://circleci.com/gh/ezcater/sidekiq_publisher)
+[![Gem Version][gem_badge]][gem_link] [![CircleCI][circle_badge]][circle_link]
+
+[circle_badge]: https://circleci.com/gh/ezcater/sidekiq_publisher.svg?style=svg
+[circle_link]: https://circleci.com/gh/ezcater/sidekiq_publisher
+[gem_badge]: https://badge.fury.io/rb/sidekiq_publisher.svg
+[gem_link]: https://badge.fury.io/rb/sidekiq_publisher
 
 This gem provides support to enqueue jobs for Sidekiq by first staging the job
 in Postgres and relying on a separate process to communicate with Sidekiq/Redis.

data/gemfiles/rails_6.0_sidekiq_6.4.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activejob", "~> 6.0.0"
+gem "activesupport", "~> 6.0.0"
+gem "sidekiq", "~> 6.4.2"
+
+gemspec path: "../"

data/gemfiles/rails_6.1_sidekiq_6.4.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activejob", "~> 6.1.0"
+gem "activesupport", "~> 6.1.0"
+gem "sidekiq", "~> 6.4.2"
+
+gemspec path: "../"

data/lib/sidekiq_publisher/client.rb

@@ -7,14 +7,17 @@ module SidekiqPublisher
     def bulk_push(items)
       payloads = items.map do |item|
         normed = normalize_item(item)
-        process_single(item["class"], normed) || nil
+        middleware.invoke(item["class"], normed, normed["queue"], @redis_pool) do
+          verify_json(normed) if respond_to?(:verify_json) # needed here as of v6.4.2, formerly done by normalize_item
+          normed
+        end || nil
       end.compact
 
       pushed = 0
       with_connection do |conn|
-        conn.multi do
+        conn.multi do |transaction|
           payloads.each do |payload|
-            atomic_push(conn, [payload])
+            atomic_push(transaction, [payload])
             pushed += 1
           end
         end

data/lib/sidekiq_publisher/datadog_apm.rb

@@ -13,6 +13,10 @@ module SidekiqPublisher
       def service
         @service || "sidekiq-publisher"
       end
+
+      def tracer
+        defined?(Datadog::Tracing) ? Datadog::Tracing : Datadog.tracer
+      end
     end
 
     class Subscriber
@@ -28,7 +32,7 @@ module SidekiqPublisher
 
       def start_span(operation, payload, resource = nil)
         resource ||= operation
-        payload[:datadog_span] = Datadog.tracer.trace(operation, service: service, resource: resource)
+        payload[:datadog_span] = tracer.trace(operation, service: service, resource: resource)
       end
 
       def start_primary_span(resource, payload)
@@ -43,6 +47,10 @@ module SidekiqPublisher
       def service
         SidekiqPublisher::DatadogAPM.service
       end
+
+      def tracer
+        SidekiqPublisher::DatadogAPM.tracer
+      end
     end
 
     class ListenerSubscriber < Subscriber
@@ -97,7 +105,7 @@ module SidekiqPublisher
     # and responds to the error(.publisher.sidekiq_publisher) event.
     class PublisherErrorSubscriber < ActiveSupport::Subscriber
       def error(event)
-        Datadog.tracer.active_span&.set_error(event.payload[:exception_object])
+        SidekiqPublisher::DatadogAPM.tracer.active_span&.set_error(event.payload[:exception_object])
       end
 
       attach_to "publisher.sidekiq_publisher"

data/lib/sidekiq_publisher/version.rb

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

data/sidekiq_publisher.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   # Set "allowed_push_post" to control where this gem can be published.
   if spec.respond_to?(:metadata)
     spec.metadata["allowed_push_host"] = "https://rubygems.org"
-
+    spec.metadata["rubygems_mfa_required"] = "true"
   else
     raise "RubyGems 2.0 or newer is required to protect against public gem pushes."
   end
@@ -61,5 +61,5 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "activerecord-postgres_pub_sub", ">= 0.4.0"
   spec.add_runtime_dependency "activesupport", ">= 5.1", "< 6.2"
-  spec.add_runtime_dependency "sidekiq", ">= 5.0.4", "< 7.0"
+  spec.add_runtime_dependency "sidekiq", ">= 5.0.4", "< 7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq_publisher
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.3.0
 platform: ruby
 authors:
 - ezCater, Inc
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-11 00:00:00.000000000 Z
+date: 2022-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -263,7 +263,7 @@ dependencies:
         version: 5.0.4
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -273,7 +273,7 @@ dependencies:
         version: 5.0.4
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7'
 description: Publisher for enqueuing jobs to Sidekiq
 email:
 - engineering@ezcater.com
@@ -302,10 +302,12 @@ files:
 - gemfiles/rails_6.0_sidekiq_6.0.gemfile
 - gemfiles/rails_6.0_sidekiq_6.1.gemfile
 - gemfiles/rails_6.0_sidekiq_6.2.gemfile
+- gemfiles/rails_6.0_sidekiq_6.4.gemfile
 - gemfiles/rails_6.1_sidekiq_5.2.gemfile
 - gemfiles/rails_6.1_sidekiq_6.0.gemfile
 - gemfiles/rails_6.1_sidekiq_6.1.gemfile
 - gemfiles/rails_6.1_sidekiq_6.2.gemfile
+- gemfiles/rails_6.1_sidekiq_6.4.gemfile
 - lib/active_job/queue_adapters/sidekiq_publisher_adapter.rb
 - lib/generators/sidekiq_publisher/install_generator.rb
 - lib/generators/sidekiq_publisher/templates/create_sidekiq_publisher_jobs.rb
@@ -331,6 +333,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -346,7 +349,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Publisher for enqueuing jobs to Sidekiq