snowpack 1.0.0.alpha5 → 1.0.0.alpha6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 362981ee1367500f9298d282f89a4f9c92b376fe327cd9c084cdc9c1edfa4207
-  data.tar.gz: aa2a87c9ae454173ccaddbc34186b2c2876453004f5d5c5b3c1ba8ef84b6c872
+  metadata.gz: de5e85aa75aec4ab2fbbfcb88ee043315c68b1a359d55d7821e081e399fc8fca
+  data.tar.gz: 9bef2e815f516ccce2ca3017314120f7ea55d30fa944adc457479d7c0d6c562e
 SHA512:
-  metadata.gz: 48e5e7aa6dfc1b5bc05a1c266be867efb841c73e43c296518209748ea60fc1c0171df876b727ac49b02673e1238e022cb3dd7db5f5792992bbe366263dada05a
-  data.tar.gz: 1e144be2509cae7300ea58c4404b780bd63925881791a98c3fe604d26117c6d452e3c3ee78370ff882b6817f26c67faec7669e603f0607f9d78d7dfa8f812397
+  metadata.gz: 13e7f05d932ffa9cc00da4ce3afbb772b44e257ef33649db33b45900cb8cbc355f7366beff569a92a1b8c3141fe701742734734234516cbad9943c6a99e0117e
+  data.tar.gz: dd09630835fcc9a23684398ca70515802973a96c48c640f910cb75e07ecef4b8f15a2b7291a58ae172fa0b45f383594352cbd5e071f6dd626f004896e4ddc5af

data/.tool-versions

@@ -1 +1 @@
-ruby 2.6.2
+ruby 2.6.5

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## [1.0.0.alpha6] - 2019-10-22
+
+### Added
+
+- Added custom Appsignal/Sidekiq instrumentation
+
+### Fixed
+
+- Reduced arity strictness of Appsignal/Que error handler
+
 ## [1.0.0.alpha5] - 2019-09-20
 
 ### Changed

data/lib/snowpack/instrumentation/appsignal/que.rb

@@ -15,11 +15,9 @@ module Snowpack
         # Enable like so:
         #
         # Que.error_notifier = Snowpack::Instrumentation::Appsignal::Que::ErrorNotifier
-
-        # Actually, why is this even necessry?
-        ErrorNotifier = -> error, _job {
+        ErrorNotifier = proc do |error, _job|
           ::Appsignal::Transaction.current.set_error(error)
-        }
+        end
 
         def self.included(base)
           base.class_eval do

data/lib/snowpack/instrumentation/appsignal/sidekiq.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+require "appsignal"
+require_relative "appsignal_ext"
+
+# Remove Appsignal's own Sidekiq integration hook, so the Snowpack-hosted
+# integration can be included manually.
+Appsignal::Hooks.hooks.delete :sidekiq
+
+module Snowpack
+  module Instrumentation
+    module Appsignal
+      module Sidekiq
+        def self.install
+          ::Appsignal::Minutely.probes.register :sidekiq, ::Appsignal::Hooks::SidekiqProbe
+
+          ::Sidekiq.configure_server do |config|
+            config.server_middleware do |chain|
+              chain.add Plugin
+            end
+          end
+        end
+
+        class Plugin < ::Appsignal::Hooks::SidekiqPlugin
+          # Copy over original method, add transaction.discard! behavior
+          def call(worker, item, _queue)
+            job_status = nil
+            transaction = ::Appsignal::Transaction.create(
+              SecureRandom.uuid,
+              ::Appsignal::Transaction::BACKGROUND_JOB,
+              ::Appsignal::Transaction::GenericRequest.new(
+                :queue_start => item["enqueued_at"]
+              )
+            )
+
+            # Add this behavior
+            transaction.discard! unless worker.instrument?
+
+            ::Appsignal.instrument "perform_job.sidekiq" do
+              begin
+                yield
+              rescue Exception => exception # rubocop:disable Lint/RescueException
+                job_status = :failed
+                transaction.set_error(exception)
+                raise exception
+              end
+            end
+          ensure
+            if transaction
+              transaction.set_action_if_nil(formatted_action_name(item))
+              transaction.params = filtered_arguments(item)
+              formatted_metadata(item).each do |key, value|
+                transaction.set_metadata key, value
+              end
+              transaction.set_http_or_background_queue_start
+              ::Appsignal::Transaction.complete_current!
+              queue = item["queue"] || "unknown"
+              if job_status
+                increment_counter "queue_job_count", 1,
+                  :queue => queue,
+                  :status => job_status
+              end
+              increment_counter "queue_job_count", 1,
+                :queue => queue,
+                :status => :processed
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/snowpack/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Snowpack
-  VERSION = "1.0.0.alpha5"
+  VERSION = "1.0.0.alpha6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: snowpack
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha5
+  version: 1.0.0.alpha6
 platform: ruby
 authors:
 - Tim Riley
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-22 00:00:00.000000000 Z
+date: 2019-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-inflector
@@ -285,6 +285,7 @@ files:
 - lib/snowpack/instrumentation/appsignal/appsignal_ext.rb
 - lib/snowpack/instrumentation/appsignal/que.rb
 - lib/snowpack/instrumentation/appsignal/rack.rb
+- lib/snowpack/instrumentation/appsignal/sidekiq.rb
 - lib/snowpack/roda/web.rb
 - lib/snowpack/slice.rb
 - lib/snowpack/test/suite.rb