sidekiq_publisher 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 496067d05925ac3fbea1dfd0323640fbb809c32b836faca13d1e9184255ef45f
-  data.tar.gz: 9c3334f11ee9f436866a1f9cf438c0676575fee4e13e17cb41ef52ee62f6e5f1
+  metadata.gz: 5a85f0c8a5d2626638e56314c3f17a5f59168413f0e8075b7b21a69e8f3a3708
+  data.tar.gz: fb45a06f543ececf11a48d4e25bc6a57aac3d199ce36b0589702c2528a82b949
 SHA512:
-  metadata.gz: c92b6150ea19e96f388891f269903cf477d95983922bba38eb5192d3b6ef8e2dab319abdaf86722f01a5d5f8e4464ab96ae74647d25f74fc5934060e14eb7f0b
-  data.tar.gz: 69027c8e8202ba1b82c4ff221a88de668262e2086637848982c2a2bb8aa1c97d6a0eba52389642fcaf3b60da3684b4f38a607eb11029c205a85da96cc6f3ff92
+  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,11 @@
 # 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]

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,7 +7,10 @@ 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

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.2.0"
+  VERSION = "2.3.0"
 end

data/sidekiq_publisher.gemspec

@@ -47,7 +47,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "appraisal"
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "database_cleaner"
-  spec.add_development_dependency "ddtrace", ">= 0.39.0", "< 1.0"
+  spec.add_development_dependency "ddtrace", ">= 0.39.0"
   spec.add_development_dependency "ezcater_matchers"
   spec.add_development_dependency "ezcater_rubocop", "1.0.2"
   spec.add_development_dependency "factory_bot"
@@ -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", "< 6.4.2"
+  spec.add_runtime_dependency "sidekiq", ">= 5.0.4", "< 7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq_publisher
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - ezCater, Inc
@@ -73,9 +73,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.39.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -83,9 +80,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.39.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: ezcater_matchers
   requirement: !ruby/object:Gem::Requirement
@@ -269,7 +263,7 @@ dependencies:
         version: 5.0.4
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.4.2
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -279,7 +273,7 @@ dependencies:
         version: 5.0.4
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.4.2
+        version: '7'
 description: Publisher for enqueuing jobs to Sidekiq
 email:
 - engineering@ezcater.com
@@ -308,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