appsignal 1.1.6 → 1.1.7.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6fe6d8912e2ec92a237d10feff184155f78e861f
-  data.tar.gz: a8367402622454ee4e4fa5259e739362b1c9fafd
+  metadata.gz: 087f237fab88ce1726739ad3f08b7497e2e3f934
+  data.tar.gz: 3af658ab3c053d97e8913089069516304827d546
 SHA512:
-  metadata.gz: 8975eba20b248f9c435df83f1d63609ccc1d60b82b97bdaa947cf2b53ed96fbb3a426fc7855dcfe73e2b093dd9267a980d49bab14e0210494c927c1c82632650
-  data.tar.gz: fc9296f22d1fd6b4db880eb4bed5d03df9efbfb1f6c440909eb872e96916f8c3b9e8c82c90cda6cb428586ce2a914f222d7acd44b3c048d0c7d1ac0fed445c85
+  metadata.gz: c04140d7906580a8f06b8f2bbe9208264430b7c56ec283788ca8a27f6022a5be6cd8c2d386f0c6435f01d7cba68befc3ffc4ec422d5eb1184c552e0665b94804
+  data.tar.gz: 50b2e595b29ebc9014601a04073f082ff312412886335cc185919ea3b2ad1ca4714ca903feb98002e1360233c07957c5fbf50f7fa4f974756edbd71a9e462ea5

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.1.7
+* Make logging resilient for closing FD's (daemons gem does this)
+* Add support for using Resque through ActiveJob
+
 # 1.1.6
 * Generic Rack instrumentation middleware
 * Event formatter for Faraday

data/ext/agent.yml

@@ -1,19 +1,19 @@
 ---
-version: '4201306'
+version: f5c90a8
 triples:
   x86_64-linux:
-    checksum: 29dc30be5de25655e2649f6f41266342483afca95a816d729da8be18c98341d7
-    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4201306/appsignal-agent-x86_64-linux-static.tar.gz
+    checksum: c89f8fc1f321a50cadc6c47f404cc0995108ef31c02f7252328ab2c1e4ef23f4
+    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/f5c90a8/appsignal-agent-x86_64-linux-static.tar.gz
     lib_filename: libappsignal.a
   i686-linux:
-    checksum: 4563916bd95f8d6942c15926583a3ee3979d71d2c606788dcb41369e6f495205
-    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4201306/appsignal-agent-i686-linux-static.tar.gz
+    checksum: b9ea385e0c5ab6a7578fb9db9d31239aa9d153c1cf56024f68deb43ea5fa00a0
+    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/f5c90a8/appsignal-agent-i686-linux-static.tar.gz
     lib_filename: libappsignal.a
   x86-linux:
-    checksum: 4563916bd95f8d6942c15926583a3ee3979d71d2c606788dcb41369e6f495205
-    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4201306/appsignal-agent-i686-linux-static.tar.gz
+    checksum: b9ea385e0c5ab6a7578fb9db9d31239aa9d153c1cf56024f68deb43ea5fa00a0
+    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/f5c90a8/appsignal-agent-i686-linux-static.tar.gz
     lib_filename: libappsignal.a
   x86_64-darwin:
-    checksum: 7ca9e9133d3c3876380ad1e682a8d0924c2857205cd4946012adf39dfd88a8bf
-    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4201306/appsignal-agent-x86_64-darwin-static.tar.gz
+    checksum: 7fe3fba0bd65e1f3f95b0e5a3e8c08f5b79352aee84268eb9053da30c87d68d6
+    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/f5c90a8/appsignal-agent-x86_64-darwin-static.tar.gz
     lib_filename: libappsignal.a

data/gemfiles/resque.gemfile

@@ -1,5 +1,7 @@
 source 'https://rubygems.org'
 
 gem 'resque'
+gem 'rails', '~> 4.2.0'
+gem 'mime-types', '~> 2.6'
 
 gemspec :path => '../'

data/lib/appsignal.rb

@@ -264,6 +264,7 @@ require 'appsignal/marker'
 require 'appsignal/params_sanitizer'
 require 'appsignal/integrations/railtie' if defined?(::Rails)
 require 'appsignal/integrations/resque'
+require 'appsignal/integrations/resque_active_job'
 require 'appsignal/subscriber'
 require 'appsignal/transaction'
 require 'appsignal/version'

data/lib/appsignal/integrations/resque_active_job.rb

@@ -0,0 +1,29 @@
+module Appsignal
+  module Integrations
+    module ResqueActiveJobPlugin
+      include Appsignal::Hooks::Helpers
+
+      def self.included(base)
+        base.class_eval do
+
+          around_perform do |job, block|
+            Appsignal.monitor_single_transaction(
+              'perform_job.resque',
+              :class    => job.class.to_s,
+              :method   => 'perform',
+              :params   => job.format_args(job.arguments),
+              :metadata => {
+                :id       => job.job_id,
+                :queue    => job.queue_name
+              },
+            ) do
+              block.call
+            end
+          end
+
+        end
+      end
+
+    end
+  end
+end

data/lib/appsignal/version.rb

@@ -1,5 +1,5 @@
 require 'yaml'
 
 module Appsignal
-  VERSION = '1.1.6'
+  VERSION = '1.1.7.beta.1'
 end

data/spec/lib/appsignal/cli/install_spec.rb

@@ -130,7 +130,7 @@ describe Appsignal::CLI::Install do
   end
 
   context "with sinatra" do
-    if sinatra_present? && !padrino_present?
+    if sinatra_present? && !padrino_present? && !rails_present?
       describe ".install" do
         it "should install with environment variables" do
           cli.should_receive(:gets).once.and_return('Appname')

data/spec/lib/appsignal/integrations/resque_active_job_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+if resque_present? && active_job_present?
+  describe "Resque ActiveJob integration" do
+    let(:file) { File.expand_path('lib/appsignal/integrations/resque_active_job.rb') }
+
+    context "with Resque and ActiveJob" do
+      before do
+        load file
+        start_agent
+
+        class TestActiveJob < ActiveJob::Base
+          include Appsignal::Integrations::ResqueActiveJobPlugin
+
+          def perform(param)
+          end
+        end
+      end
+
+      describe :around_perform_plugin do
+        before    { SecureRandom.stub(:uuid => 123) }
+        let(:job) { TestActiveJob.new('moo') }
+
+        it "should wrap in a transaction with the correct params" do
+          Appsignal.should_receive(:monitor_single_transaction).with(
+            'perform_job.resque',
+            :class  => 'TestActiveJob',
+            :method => 'perform',
+            :params => ['moo'],
+            :metadata => {
+              :id    => 123,
+              :queue => 'default'
+            }
+          )
+        end
+        after { job.perform_now }
+      end
+    end
+  end
+end

data/spec/lib/appsignal/integrations/resque_spec.rb

@@ -27,7 +27,7 @@ if resque_present?
 
       describe :around_perform_resque_plugin do
         let(:transaction) { Appsignal::Transaction.new('1', 'background', {}, {}) }
-        let(:job) { Resque::Job.new('default', {'class' => 'TestJob'}) }
+        let(:job) { ::Resque::Job.new('default', {'class' => 'TestJob'}) }
         before do
           transaction.stub(:complete => true)
           Appsignal::Transaction.stub(:current => transaction)
@@ -55,7 +55,7 @@ if resque_present?
         end
 
         context "with exception" do
-          let(:job) { Resque::Job.new('default', {'class' => 'BrokenTestJob'}) }
+          let(:job) { ::Resque::Job.new('default', {'class' => 'BrokenTestJob'}) }
 
           it "should set the exception" do
             Appsignal::Transaction.any_instance.should_receive(:set_error)

data/spec/spec_helper.rb

@@ -69,6 +69,15 @@ rescue LoadError
   false
 end
 
+def active_job_present?
+  begin
+    require 'active_job'
+    true
+  rescue LoadError
+    false
+  end
+end
+
 def sinatra_present?
   begin
     require 'sinatra'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.7.beta.1
 platform: ruby
 authors:
 - Robert Beekman
@@ -186,6 +186,7 @@ files:
 - lib/appsignal/integrations/railtie.rb
 - lib/appsignal/integrations/rake.rb
 - lib/appsignal/integrations/resque.rb
+- lib/appsignal/integrations/resque_active_job.rb
 - lib/appsignal/integrations/sinatra.rb
 - lib/appsignal/js_exception_transaction.rb
 - lib/appsignal/marker.rb
@@ -244,6 +245,7 @@ files:
 - spec/lib/appsignal/integrations/mongo_ruby_driver_spec.rb
 - spec/lib/appsignal/integrations/padrino_spec.rb
 - spec/lib/appsignal/integrations/railtie_spec.rb
+- spec/lib/appsignal/integrations/resque_active_job_spec.rb
 - spec/lib/appsignal/integrations/resque_spec.rb
 - spec/lib/appsignal/integrations/sinatra_spec.rb
 - spec/lib/appsignal/js_exception_transaction_spec.rb
@@ -295,9 +297,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5
@@ -340,6 +342,7 @@ test_files:
 - spec/lib/appsignal/integrations/mongo_ruby_driver_spec.rb
 - spec/lib/appsignal/integrations/padrino_spec.rb
 - spec/lib/appsignal/integrations/railtie_spec.rb
+- spec/lib/appsignal/integrations/resque_active_job_spec.rb
 - spec/lib/appsignal/integrations/resque_spec.rb
 - spec/lib/appsignal/integrations/sinatra_spec.rb
 - spec/lib/appsignal/js_exception_transaction_spec.rb