sidekiq_publisher 1.7.0.rc0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 857fd87d65ea4d55711d45e269148eeb0b14454a27ae4315c507815b22c86ea4
-  data.tar.gz: 7d3d092e6e2df1c64734c6a60a8bc8b084fba68c8e684f4e0e578c99fdea117b
+  metadata.gz: b87dcb63524894c48e9a75cb8ed5773fddaa897e599fbb0f9c18c2fc06d7c30e
+  data.tar.gz: f8656103322b18569ee5f5ca131e1a40348d3f7d686eb3d3f22b9481a816d89a
 SHA512:
-  metadata.gz: 2938169bd4db7a074936bc48f46456c4ec2700a5bfc60adf4039ffc87666f3ba99f5c42504e72dfa34c55fc71568f4e7ef695489d3c9165db66c996a3a6363bb
-  data.tar.gz: da2bbee1abf0fb70a7afb05b48d5c7c692ea9911ae5b26f35500eb69792a54872213d509c7842564bcc5b659c1070415cb0bd52d71e4cfcdb5acb6705a2fafa3
+  metadata.gz: 11199b4b29998e62288777547706a6c545b2c0a2d74bf883a5ed5264031edca7d259fb702e131e473865aaff7f447d1fbdccb6c48a5786b3cda21dba23636afc
+  data.tar.gz: 2789c1e753de096ce9b42a964e0daea6df2e542430d4ff8bd775eedae5db26ec5bf4ea17cfde021870d0f1c41869ce068d9f3230f3494a94fc3ec561d839a666

data/Appraisals

@@ -52,3 +52,21 @@ appraise "rails-6.0-sidekiq-6.1" do
   gem "activesupport", "~> 6.0.0"
   gem "sidekiq", "~> 6.1.0"
 end
+
+appraise "rails-6.1-sidekiq-5.2" do
+  gem "activejob", "~> 6.1.0"
+  gem "activesupport", "~> 6.1.0"
+  gem "sidekiq", "~> 5.2.0"
+end
+
+appraise "rails-6.1-sidekiq-6.0" do
+  gem "activejob", "~> 6.1.0"
+  gem "activesupport", "~> 6.1.0"
+  gem "sidekiq", "~> 6.0.1"
+end
+
+appraise "rails-6.1-sidekiq-6.1" do
+  gem "activejob", "~> 6.1.0"
+  gem "activesupport", "~> 6.1.0"
+  gem "sidekiq", "~> 6.1.0"
+end

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 # sidekiq_publisher
 
-## v1.7.0 (unreleased)
+## v1.8.0
+- Extend support to Rails 6.1.
+
+## v1.7.1
+- Gracefully handle database connection errors in ReportUnpublishedCount by attempting to reconnect.
+
+## v1.7.0
 - Add instrumentation using `ActiveSupport::Notifications`.
 - Reimplement `metrics_reporter` and `exception_reporter` support using
   `ActiveSupport::Subscriber`.

data/README.md

@@ -136,6 +136,21 @@ class MyJob < ApplicationJob
 end
 ```
 
+#### ActiveJob Exception Reporting
+
+Many exception monitoring service (e.g. Sentry, Airbrake, Honeybadger, etc) already provide basic integration support for `Sidekiq`. 
+These integration should also work with `SidekiqPublisher`. 
+However, you may need to explicitly include 
+`ActiveJob::QueueAdapters::SidekiqPublisherAdapter` as a compatible adapter for this to work properly.
+
+Alternatively, you can manually report the exception:
+
+ ```ruby
+retry_on SomeError, attempts: 10 do |_job, exception|
+  Raven.capture_exception(exception, extra: { custom: :foo }) # Reporting using the Sentry gem 
+end
+```
+
 ### SidekiqPublisher::Worker
 
 Sidekiq workers are usually defined by including `Sidekiq::Worker` in a class.

data/gemfiles/rails_6.1_sidekiq_5.2.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", "~> 5.2.0"
+
+gemspec path: "../"

data/gemfiles/rails_6.1_sidekiq_6.0.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.0.1"
+
+gemspec path: "../"

data/gemfiles/rails_6.1_sidekiq_6.1.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.1.0"
+
+gemspec path: "../"

data/lib/sidekiq_publisher/datadog_apm.rb

@@ -5,6 +5,8 @@ require "ddtrace"
 
 module SidekiqPublisher
   module DatadogAPM
+    OPERATION = "sidekiq_publisher"
+
     class << self
       attr_writer :service
 
@@ -24,11 +26,13 @@ module SidekiqPublisher
 
       private
 
-      def start_span(operation, payload)
-        # Internal sanity check
-        raise "Fix operation name: #{operation}" if operation.end_with?("sidekiq_publisher")
+      def start_span(operation, payload, resource = nil)
+        resource ||= operation
+        payload[:datadog_span] = Datadog.tracer.trace(operation, service: service, resource: resource)
+      end
 
-        payload[:datadog_span] = Datadog.tracer.trace(operation, service: service)
+      def start_primary_span(resource, payload)
+        start_span(OPERATION, payload, resource)
       end
 
       def finish_span(payload)
@@ -43,7 +47,7 @@ module SidekiqPublisher
 
     class ListenerSubscriber < Subscriber
       def start(_name, _id, payload)
-        start_span("listener.timeout", payload)
+        start_primary_span("listener.timeout", payload)
       end
 
       subscribe_to "timeout.listener.sidekiq_publisher"
@@ -52,7 +56,7 @@ module SidekiqPublisher
     class RunnerSubscriber < Subscriber
       def start(name, _id, payload)
         op_name = name.split(".").first
-        start_span("publisher.#{op_name}", payload)
+        start_primary_span("publisher.#{op_name}", payload)
       end
 
       subscribe_to "start.publisher.sidekiq_publisher"

data/lib/sidekiq_publisher/report_unpublished_count.rb

@@ -1,10 +1,22 @@
 # frozen_string_literal: true
 
+require "active_record"
+require "pg"
+
 module SidekiqPublisher
   module ReportUnpublishedCount
     def self.call(instrumenter: Instrumenter.new)
       instrumenter.instrument("unpublished.reporter",
                               unpublished_count: SidekiqPublisher::Job.unpublished.count)
+    rescue ActiveRecord::StatementInvalid, PG::UnableToSend, PG::ConnectionBad => e
+      ActiveRecord::Base.clear_active_connections! if db_connection_error?(e)
+      raise
+    end
+
+    def self.db_connection_error?(error)
+      cause = error.is_a?(ActiveRecord::StatementInvalid) ? error.cause : error
+      cause.is_a?(PG::UnableToSend) || cause.is_a?(PG::ConnectionBad)
     end
+    private_class_method :db_connection_error?
   end
 end

data/lib/sidekiq_publisher/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SidekiqPublisher
-  VERSION = "1.7.0.rc0"
+  VERSION = "1.8.0"
 end

data/sidekiq_publisher.gemspec

@@ -58,6 +58,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "simplecov", "< 0.18"
 
   spec.add_runtime_dependency "activerecord-postgres_pub_sub", ">= 0.4.0"
-  spec.add_runtime_dependency "activesupport", ">= 5.1", "< 6.1"
+  spec.add_runtime_dependency "activesupport", ">= 5.1", "< 6.2"
   spec.add_runtime_dependency "sidekiq", ">= 5.0.4", "< 7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq_publisher
 version: !ruby/object:Gem::Version
-  version: 1.7.0.rc0
+  version: 1.8.0
 platform: ruby
 authors:
 - ezCater, Inc
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-06 00:00:00.000000000 Z
+date: 2021-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -243,7 +243,7 @@ dependencies:
         version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -253,7 +253,7 @@ dependencies:
         version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
@@ -300,6 +300,9 @@ files:
 - gemfiles/rails_6.0_sidekiq_5.2.gemfile
 - gemfiles/rails_6.0_sidekiq_6.0.gemfile
 - gemfiles/rails_6.0_sidekiq_6.1.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
 - 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
@@ -325,7 +328,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -336,12 +339,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.7.6.2
+signing_key: 
 specification_version: 4
 summary: Publisher for enqueuing jobs to Sidekiq
 test_files: []