appsignal 1.2.0.alpha.2 → 1.2.0.alpha.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 933e766ae7c1e093d8550927bb4585607a136935
-  data.tar.gz: 46996d9237382423ffe444ef48e199c3a6db6c0d
+  metadata.gz: 37ce7a608d4c05aca6924e338f6c40fad52f4ae3
+  data.tar.gz: 63cb650e05a4a77088aee56f7382faa5844620aa
 SHA512:
-  metadata.gz: ed0342c7f1be05351ea7ceaed903a153a06b094e186158fab39cb8dcfd354c3b6a694fd02ec9f562c00add31a168ba8b4c2b2739fa8e4b57e98f7d95f1224957
-  data.tar.gz: 6de43ca1045c5200fa0e4355b728a5fd5e2a5d43d90e40a98313e60755968c2a3a378ed14c9f9da166591dfbb42705a509440b32e6ac3b5378a05acb37044138
+  metadata.gz: ea0336e1283562830aff2934ac941be1b5b23c17c18b9e38c39b67b2853c485e1b2cd3ece759df2373d1d954e8fa436168421c548a62d8ce4ccad07eb0f782b7
+  data.tar.gz: 02e5f376610e448a59e5bc3d0f01dcbc97918a77e9e0b46d972efaedcbe4c29941c76ccb7e90b61513f31d84061974426e2b55f5c70467d32c868fa5d6d354a2

data/CHANGELOG.md

@@ -1,6 +1,7 @@
 # 1.2.0
 * Restart background thread when FD's are closed
 * Beta version of collecting host metrics (disabled by default)
+* Hooks for Shuryoken
 
 # 1.1.7
 * Make logging resilient for closing FD's (daemons gem does this)

data/lib/appsignal/hooks.rb

@@ -93,6 +93,7 @@ require 'appsignal/hooks/puma'
 require 'appsignal/hooks/rake'
 require 'appsignal/hooks/redis'
 require 'appsignal/hooks/sequel'
+require 'appsignal/hooks/shoryuken'
 require 'appsignal/hooks/sidekiq'
 require 'appsignal/hooks/unicorn'
 require 'appsignal/hooks/mongo_ruby_driver'

data/lib/appsignal/hooks/shoryuken.rb

@@ -0,0 +1,42 @@
+module Appsignal
+  class Hooks
+    class ShoryukenMiddleware
+      def call(worker_instance, queue, sqs_msg, body)
+        metadata = {
+          :queue => queue
+        }
+        exclude_keys = [ :job_class, :queue_name, :arguments ]
+        metadata.merge!(body.reject{ |key| exclude_keys.member?(key.to_sym) })
+        metadata.merge!(sqs_msg.attributes)
+
+        options = {
+          :class => body['job_class'],
+          :method => 'perform',
+          :metadata => metadata
+        }
+        options[:params] = body['arguments'] if body.key?('arguments')
+        options[:queue_start] = Time.at(sqs_msg.attributes['SentTimestamp'].to_i / 1000) if sqs_msg.attributes.key?('SentTimestamp')
+
+        Appsignal.monitor_transaction('perform_job.shoryuken', options) do
+          yield
+        end
+      end
+    end
+
+    class ShoryukenHook < Appsignal::Hooks::Hook
+      register :shoryuken
+
+      def dependencies_present?
+        defined?(::Shoryuken)
+      end
+
+      def install
+        ::Shoryuken.configure_server do |config|
+          config.server_middleware do |chain|
+            chain.add Appsignal::Hooks::ShoryukenMiddleware
+          end
+        end
+      end
+    end
+  end
+end

data/lib/appsignal/version.rb

@@ -1,5 +1,5 @@
 require 'yaml'
 
 module Appsignal
-  VERSION = '1.2.0.alpha.2'
+  VERSION = '1.2.0.alpha.3'
 end

data/spec/lib/appsignal/hooks/shoryuken_spec.rb

@@ -0,0 +1,93 @@
+require 'spec_helper'
+
+
+describe Appsignal::Hooks::ShoryukenMiddleware do
+  let(:current_transaction) { background_job_transaction }
+
+  let(:worker_instance) { double }
+  let(:queue) { double }
+  let(:sqs_msg) {
+    double(:attributes => {})
+  }
+  let(:body) {{}}
+
+  before do
+    Appsignal.stub(:is_ignored_exception? => false)
+    Appsignal::Transaction.stub(:current => current_transaction)
+    start_agent
+  end
+
+  context "with a performance call" do
+    let(:queue) { 'some-funky-queue-name' }
+    let(:sqs_msg) {
+      double(:attributes => { 'SentTimestamp' => Time.parse('1976-11-18 0:00:00UTC').to_i * 1000 })
+    }
+    let(:body) {{
+      'job_class' => 'TestClass',
+      'arguments' => ['Model', "1"],
+    }}
+
+    it "should wrap in a transaction with the correct params" do
+      Appsignal.should_receive(:monitor_transaction).with(
+        'perform_job.shoryuken',
+        :class => 'TestClass',
+        :method => 'perform',
+        :metadata => {
+          :queue => 'some-funky-queue-name',
+          'SentTimestamp' => 217123200000
+        },
+        :params => ['Model', "1"],
+        :queue_start => Time.parse('1976-11-18 0:00:00UTC').utc
+      )
+    end
+
+    after do
+      Timecop.freeze(Time.parse('01-01-2001 10:01:00UTC')) do
+        Appsignal::Hooks::ShoryukenMiddleware.new.call(worker_instance, queue, sqs_msg, body) do
+          # nothing
+        end
+      end
+    end
+  end
+
+  context "with an erroring call" do
+    let(:error) { VerySpecificError.new('on fire') }
+
+    it "should add the exception to appsignal" do
+      Appsignal::Transaction.any_instance.should_receive(:set_error).with(error)
+    end
+
+    after do
+      begin
+        Timecop.freeze(Time.parse('01-01-2001 10:01:00UTC')) do
+          Appsignal::Hooks::ShoryukenMiddleware.new.call(worker_instance, queue, sqs_msg, body) do
+            raise error
+          end
+        end
+      rescue VerySpecificError
+      end
+    end
+  end
+end
+
+describe Appsignal::Hooks::ShoryukenHook do
+  context "with shoryuken" do
+    before(:all) do
+      module Shoryuken
+        def self.configure_server
+        end
+      end
+      Appsignal::Hooks::ShoryukenHook.new.install
+    end
+
+    after(:all) do
+      Object.send(:remove_const, :Shoryuken)
+    end
+
+    its(:dependencies_present?) { should be_true }
+  end
+
+  context "without shoryuken" do
+    its(:dependencies_present?) { should be_false }
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 1.2.0.alpha.2
+  version: 1.2.0.alpha.3
 platform: ruby
 authors:
 - Robert Beekman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-25 00:00:00.000000000 Z
+date: 2016-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -175,6 +175,7 @@ files:
 - lib/appsignal/hooks/rake.rb
 - lib/appsignal/hooks/redis.rb
 - lib/appsignal/hooks/sequel.rb
+- lib/appsignal/hooks/shoryuken.rb
 - lib/appsignal/hooks/sidekiq.rb
 - lib/appsignal/hooks/unicorn.rb
 - lib/appsignal/integrations/capistrano/appsignal.cap
@@ -238,6 +239,7 @@ files:
 - spec/lib/appsignal/hooks/rake_spec.rb
 - spec/lib/appsignal/hooks/redis_spec.rb
 - spec/lib/appsignal/hooks/sequel_spec.rb
+- spec/lib/appsignal/hooks/shoryuken_spec.rb
 - spec/lib/appsignal/hooks/sidekiq_spec.rb
 - spec/lib/appsignal/hooks/unicorn_spec.rb
 - spec/lib/appsignal/hooks_spec.rb
@@ -335,6 +337,7 @@ test_files:
 - spec/lib/appsignal/hooks/rake_spec.rb
 - spec/lib/appsignal/hooks/redis_spec.rb
 - spec/lib/appsignal/hooks/sequel_spec.rb
+- spec/lib/appsignal/hooks/shoryuken_spec.rb
 - spec/lib/appsignal/hooks/sidekiq_spec.rb
 - spec/lib/appsignal/hooks/unicorn_spec.rb
 - spec/lib/appsignal/hooks_spec.rb