sidekiq_publisher 1.6.3 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9995be94eaf8bfefa408b212d26f713137516b0ffd7846a47e51d8511a41383c
-  data.tar.gz: 8a23b6f5df56a8cc03569570f1943939b3ed54f9d916f8b4da0a3da51341aa65
+  metadata.gz: fad335b6e2f541d0b15fb3ba8ca2094700636bf9db012acd1e90f1a6f25dcb8c
+  data.tar.gz: 8a27ea4780c067005505aef5871cf0adeccfe1559df8ce40149f6427a693d6d9
 SHA512:
-  metadata.gz: 181dfdf294e496b3f2182692b37d62bd3d51749eda4ef57f4eb3ce05d092c622bef3f43a0b89eb84e7086651743bdfa3790434e07b45d3084874c7b27229d060
-  data.tar.gz: 878301b5e3f3f7d8b0f9bdd8078106aa71490ad887f351c5cd47e2ebca95f53d951d3ee71b0fcc89730ecd3e18cff1d15147f319709afaa446442e8978b1a426
+  metadata.gz: 529af1f68db640954806bb7afb5331d744aaf81b4e076029becb365eabaa6e9eae905ab4bf60fd77cba00d6cd84b4096fb4e8f8686a0ada8bb4ddc17908bfb47
+  data.tar.gz: f62d7210ffd44cdfc9a428e2213255b30446e54199aea45b11d959295ef46bcfb04c3b13afe786e184cdd3c456be0f540ef48efde09b08072c58b083ac81e4c0

data/.github/CODEOWNERS

@@ -0,0 +1 @@
+* @ezcater/core-platform @tjwp

data/Appraisals

@@ -29,6 +29,12 @@ appraise "rails-5.2-sidekiq-6.0" do
   gem "sidekiq", "~> 6.0.1"
 end
 
+appraise "rails-5.2-sidekiq-6.1" do
+  gem "activejob", "~> 5.2.0"
+  gem "activesupport", "~> 5.2.0"
+  gem "sidekiq", "~> 6.1.0"
+end
+
 appraise "rails-6.0-sidekiq-5.2" do
   gem "activejob", "~> 6.0.0"
   gem "activesupport", "~> 6.0.0"
@@ -40,3 +46,9 @@ appraise "rails-6.0-sidekiq-6.0" do
   gem "activesupport", "~> 6.0.0"
   gem "sidekiq", "~> 6.0.1"
 end
+
+appraise "rails-6.0-sidekiq-6.1" do
+  gem "activejob", "~> 6.0.0"
+  gem "activesupport", "~> 6.0.0"
+  gem "sidekiq", "~> 6.1.0"
+end

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # sidekiq_publisher
 
+## 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`.
+- Add optional integration with Datadog APM.
+
+## v1.6.4
+- Expand sidekiq support to v5.0.x-v6.x.x.
+
 ## v1.6.3
 - Handle client middleware that returns false.
 

data/README.md

@@ -72,6 +72,34 @@ SidekiqPublisher::ReportUnpublishedCount.call
 It is recommended to call this method periodically using something like
 cron or [clockwork](https://github.com/Rykian/clockwork).
 
+## Instrumentation
+
+Instrumentation of this library is implemented using
+[ActiveSupport::Notifications](https://api.rubyonrails.org/classes/ActiveSupport/Notifications.html).
+
+The support for the configurable [metrics_reporter](lib/sidekiq_publisher/metrics_reporter.rb) and
+[exception_reporter](lib/sidekiq_publisher/exception_reporter.rb) options is implemented using
+[ActiveSupport::Subscriber](https://api.rubyonrails.org/classes/ActiveSupport/Subscriber.html).
+
+If an alternate integration is required for metrics or error reporting then it can be implemented using outside this
+library based on these examples.
+
+### Tracing
+
+The instrumentation in the library also supports integration with application tracing products, such as
+[Datadog APM](https://www.datadoghq.com/product/apm/).
+
+There is an optional integration with Datadog APM that can be required:
+
+```ruby
+require "sidekiq_publisher/datadog_apm"
+```
+
+This file must be required in addition including the `sidekiq_publisher` gem or requiring `sidekiq_publisher`.
+
+This integration covers all of the sections of the library that are instrumented and serves an
+[example](lib/sidekiq_publisher/datadog_apm) for implementing trace reporting for other products outside this library.
+
 ## Usage
 
 ### ActiveJob Adapter

data/docker-compose.yml

@@ -25,10 +25,10 @@ x-service: &default-service
 services:
   sidekiq-publisher-redis:
     container_name: sidekiq-publisher-redis_1
-    image: redis:5.0.3-alpine
+    image: redis:5.0.9-alpine
   sidekiq-publisher-postgres:
     container_name: sidekiq-publisher-postgres_1
-    image: postgres:10.6
+    image: postgres:11.6
     environment:
       POSTGRES_USER: postgres
       POSTGRES_DB: sidekiq_publisher_test

data/gemfiles/rails_5.2_sidekiq_6.1.gemfile

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

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

data/lib/sidekiq_publisher.rb

@@ -1,6 +1,10 @@
 # frozen_string_literal: true
 
+require "active_support"
 require "sidekiq_publisher/version"
+require "sidekiq_publisher/instrumenter"
+require "sidekiq_publisher/metrics_reporter"
+require "sidekiq_publisher/exception_reporter"
 require "sidekiq_publisher/report_unpublished_count"
 require "sidekiq_publisher/job"
 require "sidekiq_publisher/worker"

data/lib/sidekiq_publisher/datadog_apm.rb

@@ -0,0 +1,106 @@
+# frozen_string_literal: true
+
+require "active_support/subscriber"
+require "ddtrace"
+
+module SidekiqPublisher
+  module DatadogAPM
+    OPERATION = "sidekiq_publisher"
+
+    class << self
+      attr_writer :service
+
+      def service
+        @service || "sidekiq-publisher"
+      end
+    end
+
+    class Subscriber
+      def self.subscribe_to(pattern)
+        ActiveSupport::Notifications.subscribe(pattern, new)
+      end
+
+      def finish(_name, _id, payload)
+        finish_span(payload)
+      end
+
+      private
+
+      def start_span(operation, payload, resource = nil)
+        resource ||= operation
+        payload[:datadog_span] = Datadog.tracer.trace(operation, service: service, resource: resource)
+      end
+
+      def start_primary_span(resource, payload)
+        start_span(OPERATION, payload, resource)
+      end
+
+      def finish_span(payload)
+        payload[:datadog_span]&.set_error(payload[:exception_object]) if payload.key?(:exception_object)
+        payload[:datadog_span]&.finish
+      end
+
+      def service
+        SidekiqPublisher::DatadogAPM.service
+      end
+    end
+
+    class ListenerSubscriber < Subscriber
+      def start(_name, _id, payload)
+        start_primary_span("listener.timeout", payload)
+      end
+
+      subscribe_to "timeout.listener.sidekiq_publisher"
+    end
+
+    class RunnerSubscriber < Subscriber
+      def start(name, _id, payload)
+        op_name = name.split(".").first
+        start_primary_span("publisher.#{op_name}", payload)
+      end
+
+      subscribe_to "start.publisher.sidekiq_publisher"
+      subscribe_to "notify.publisher.sidekiq_publisher"
+      subscribe_to "timeout.publisher.sidekiq_publisher"
+    end
+
+    class PublisherSubscriber < Subscriber
+      def start(name, _id, payload)
+        op_name = name.split(".").first
+        start_span("publisher.#{op_name}", payload)
+      end
+
+      def finish(name, id, payload)
+        payload[:datadog_span]&.set_tag(:published_count, payload[:published_count]) if payload.key?(:published_count)
+        super
+      end
+
+      subscribe_to "publish_batch.publisher.sidekiq_publisher"
+      subscribe_to "enqueue_batch.publisher.sidekiq_publisher"
+    end
+
+    class JobSubscriber < Subscriber
+      def start(_name, _id, payload)
+        start_span("job.purge", payload)
+      end
+
+      def finish(_name, _id, payload)
+        payload[:datadog_span]&.set_tag(:purged_count, payload[:purged_count]) if payload.key?(:purged_count)
+
+        super
+      end
+
+      subscribe_to "purge.job.sidekiq_publisher"
+    end
+
+    # This subscriber is different from the classes above because it is an ActiveSupport::Subscriber
+    # 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])
+      end
+
+      attach_to "publisher.sidekiq_publisher"
+    end
+  end
+end

data/lib/sidekiq_publisher/exception_reporter.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require "active_support/subscriber"
+
+module SidekiqPublisher
+  module ExceptionReporter
+    class PublisherErrorSubscriber < ActiveSupport::Subscriber
+      def error(event)
+        SidekiqPublisher.exception_reporter&.call(event.payload[:exception_object])
+      end
+
+      attach_to "publisher.sidekiq_publisher"
+    end
+  end
+end

data/lib/sidekiq_publisher/instrumenter.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require "active_support/notifications"
+
+module SidekiqPublisher
+  class Instrumenter
+    NAMESPACE = "sidekiq_publisher"
+
+    def instrument(event_name, payload = {}, &block)
+      ActiveSupport::Notifications.instrument("#{event_name}.#{NAMESPACE}", payload, &block)
+    end
+  end
+end

data/lib/sidekiq_publisher/job.rb

@@ -39,11 +39,12 @@ module SidekiqPublisher
       where(id: ids).update_all(published_at: Time.now.utc)
     end
 
-    def self.purge_expired_published!
+    def self.purge_expired_published!(instrumenter: Instrumenter.new)
       SidekiqPublisher.logger.info("#{name} purging expired published jobs.")
-      count = purgeable.delete_all
+      count = instrumenter.instrument("purge.job") do |notification|
+        notification[:purged_count] = purgeable.delete_all
+      end
       SidekiqPublisher.logger.info("#{name} purged #{count} expired published jobs.")
-      SidekiqPublisher.metrics_reporter.try(:count, "sidekiq_publisher.purged", count)
     end
 
     def self.unpublished_batches(batch_size: SidekiqPublisher.batch_size)

data/lib/sidekiq_publisher/metrics_reporter.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require "active_support/subscriber"
+
+module SidekiqPublisher
+  module MetricsReporter
+    class Subscriber < ActiveSupport::Subscriber
+      private
+
+      def count(metric, value)
+        SidekiqPublisher.metrics_reporter&.try(:count, metric, value) unless value.nil?
+      end
+    end
+
+    class PublisherSubscriber < Subscriber
+      def enqueue_batch(event)
+        count("sidekiq_publisher.published", event.payload[:published_count])
+      end
+
+      attach_to "publisher.sidekiq_publisher"
+    end
+
+    class JobSubscriber < Subscriber
+      def purge(event)
+        count("sidekiq_publisher.purged", event.payload[:purged_count])
+      end
+
+      attach_to "job.sidekiq_publisher"
+    end
+
+    class UnpublishedSubscriber < Subscriber
+      def unpublished(event)
+        SidekiqPublisher.metrics_reporter&.
+          try(:gauge, "sidekiq_publisher.unpublished_count", event.payload[:unpublished_count])
+      end
+
+      attach_to "reporter.sidekiq_publisher"
+    end
+  end
+end

data/lib/sidekiq_publisher/publisher.rb

@@ -5,26 +5,31 @@ require "active_support/core_ext/object/try"
 
 module SidekiqPublisher
   class Publisher
-    def initialize
+    def initialize(instrumenter: Instrumenter.new)
+      @instrumenter = instrumenter
       @client = SidekiqPublisher::Client.new
       @job_class_cache = {}
     end
 
     def publish
       Job.unpublished_batches do |batch|
-        items = batch.map do |job|
-          {
-            "jid" => job[:job_id],
-            "class" => lookup_job_class(job[:job_class]),
-            "args" => job[:args],
-            "at" => job[:run_at],
-            "queue" => job[:queue],
-            "wrapped" => job[:wrapped],
-            "created_at" => job[:created_at].to_f,
-          }.tap(&:compact!)
-        end
+        instrumenter.instrument("publish_batch.publisher") do
+          items = batch.map do |job|
+            {
+              "jid" => job[:job_id],
+              "class" => lookup_job_class(job[:job_class]),
+              "args" => job[:args],
+              "at" => job[:run_at],
+              "queue" => job[:queue],
+              "wrapped" => job[:wrapped],
+              "created_at" => job[:created_at].to_f,
+            }.tap(&:compact!)
+          end
 
-        publish_batch(batch, items)
+          instrumenter.instrument("enqueue_batch.publisher") do |notification|
+            enqueue_batch(batch, items, notification)
+          end
+        end
       end
       purge_expired_published_jobs
     rescue StandardError => ex
@@ -33,16 +38,16 @@ module SidekiqPublisher
 
     private
 
-    attr_reader :client, :job_class_cache
+    attr_reader :client, :job_class_cache, :instrumenter
 
-    def publish_batch(batch, items)
+    def enqueue_batch(batch, items, notification)
       pushed_count = client.bulk_push(items)
       published_count = update_jobs_as_published!(batch)
     rescue StandardError => ex
       failure_warning(__method__, ex)
     ensure
       published_count = update_jobs_as_published!(batch) if pushed_count.present? && published_count.nil?
-      metrics_reporter.try(:count, "sidekiq_publisher.published", published_count) if published_count.present?
+      notification[:published_count] = published_count if published_count.present?
     end
 
     def lookup_job_class(name)
@@ -56,7 +61,7 @@ module SidekiqPublisher
     end
 
     def purge_expired_published_jobs
-      Job.purge_expired_published! if perform_purge?
+      Job.purge_expired_published!(instrumenter: instrumenter) if perform_purge?
     end
 
     def perform_purge?
@@ -64,17 +69,13 @@ module SidekiqPublisher
     end
 
     def failure_warning(method, ex)
-      logger.warn("#{self.class.name}: msg=\"#{method} failed\" error=#{ex.class} error_msg=#{ex.message.inspect}\n"\
-                  "#{ex.backtrace.join("\n")}")
-      SidekiqPublisher.exception_reporter&.call(ex)
+      logger.warn("#{self.class.name}: msg=\"#{method} failed\" error=#{ex.class} error_msg=#{ex.message.inspect}\n")
+      instrumenter.instrument("error.publisher",
+                              exception_object: ex, exception: [ex.class.name, ex.message])
     end
 
     def logger
       SidekiqPublisher.logger
     end
-
-    def metrics_reporter
-      SidekiqPublisher.metrics_reporter
-    end
   end
 end

data/lib/sidekiq_publisher/report_unpublished_count.rb

@@ -1,11 +1,22 @@
 # frozen_string_literal: true
 
+require "active_record"
+require "pg"
+
 module SidekiqPublisher
   module ReportUnpublishedCount
-    def self.call
-      SidekiqPublisher.metrics_reporter.
-        gauge("sidekiq_publisher.unpublished_count",
-              SidekiqPublisher::Job.unpublished.count)
+    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/runner.rb

@@ -7,12 +7,13 @@ module SidekiqPublisher
     LISTENER_TIMEOUT_SECONDS = 60
     CHANNEL_NAME = "sidekiq_publisher_job"
 
-    def self.run
-      new.run
+    def self.run(instrumenter = Instrumenter.new)
+      new(instrumenter).run
     end
 
-    def initialize
-      @publisher = Publisher.new
+    def initialize(instrumenter = Instrumenter.new)
+      @instrumenter = instrumenter
+      @publisher = Publisher.new(instrumenter: @instrumenter)
     end
 
     def run
@@ -20,24 +21,32 @@ module SidekiqPublisher
         CHANNEL_NAME,
         listen_timeout: LISTENER_TIMEOUT_SECONDS
       ) do |listener|
-        listener.on_start { publisher.publish }
-        listener.on_notify { publisher.publish }
+        listener.on_start { call_publish("start") }
+        listener.on_notify { call_publish("notify") }
         listener.on_timeout { listener_timeout }
       end
     end
 
     private
 
-    attr_reader :publisher
+    attr_reader :publisher, :instrumenter
 
-    def listener_timeout
-      if Job.unpublished.exists?
-        SidekiqPublisher.logger&.warn(
-          "#{self.class.name}: msg='publishing pending jobs at timeout'"
-        )
+    def call_publish(event)
+      instrumenter.instrument("#{event}.publisher") do
         publisher.publish
-      else
-        Job.purge_expired_published!
+      end
+    end
+
+    def listener_timeout
+      instrumenter.instrument("timeout.listener") do
+        if Job.unpublished.exists?
+          SidekiqPublisher.logger&.warn(
+            "#{self.class.name}: msg='publishing pending jobs at timeout'"
+          )
+          call_publish("timeout")
+        else
+          Job.purge_expired_published!(instrumenter: instrumenter)
+        end
       end
     end
   end

data/lib/sidekiq_publisher/version.rb

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

data/sidekiq_publisher.gemspec

@@ -45,6 +45,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"
   spec.add_development_dependency "ezcater_matchers"
   spec.add_development_dependency "ezcater_rubocop", "1.0.2"
   spec.add_development_dependency "factory_bot"
@@ -58,5 +59,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.1"
-  spec.add_runtime_dependency "sidekiq", ">= 5.0.4", "< 6.1"
+  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.6.3
+  version: 1.7.1
 platform: ruby
 authors:
 - ezCater, Inc
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-22 00:00:00.000000000 Z
+date: 2020-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ddtrace
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.39.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.39.0
 - !ruby/object:Gem::Dependency
   name: ezcater_matchers
   requirement: !ruby/object:Gem::Requirement
@@ -249,7 +263,7 @@ dependencies:
         version: 5.0.4
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -259,7 +273,7 @@ dependencies:
         version: 5.0.4
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.0'
 description: Publisher for enqueuing jobs to Sidekiq
 email:
 - engineering@ezcater.com
@@ -268,7 +282,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".codeclimate.yml"
-- ".tool-versions"
+- ".github/CODEOWNERS"
 - Appraisals
 - CHANGELOG.md
 - Dockerfile
@@ -282,14 +296,20 @@ files:
 - gemfiles/rails_5.2_sidekiq_5.1.gemfile
 - gemfiles/rails_5.2_sidekiq_5.2.gemfile
 - gemfiles/rails_5.2_sidekiq_6.0.gemfile
+- gemfiles/rails_5.2_sidekiq_6.1.gemfile
 - gemfiles/rails_6.0_sidekiq_5.2.gemfile
 - gemfiles/rails_6.0_sidekiq_6.0.gemfile
+- gemfiles/rails_6.0_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
 - lib/sidekiq_publisher.rb
 - lib/sidekiq_publisher/client.rb
+- lib/sidekiq_publisher/datadog_apm.rb
+- lib/sidekiq_publisher/exception_reporter.rb
+- lib/sidekiq_publisher/instrumenter.rb
 - lib/sidekiq_publisher/job.rb
+- lib/sidekiq_publisher/metrics_reporter.rb
 - lib/sidekiq_publisher/publisher.rb
 - lib/sidekiq_publisher/railtie.rb
 - lib/sidekiq_publisher/report_unpublished_count.rb
@@ -305,7 +325,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -320,8 +340,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.7.6.2
+signing_key:
 specification_version: 4
 summary: Publisher for enqueuing jobs to Sidekiq
 test_files: []

data/.tool-versions

@@ -1 +0,0 @@
-ruby 2.5.5