appsignal 0.12.rc.14 → 1.0.0.rc.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5d48a39d924257facf894b4a9c2e636936db173
-  data.tar.gz: 959db33de85929f774e51c1ac25120a5cfef3d12
+  metadata.gz: dfb150bcd1300dfd0f72554fcfb79432a20d1c37
+  data.tar.gz: a4a4b0c5dea4885c6aabc140a4e31bf7090bda07
 SHA512:
-  metadata.gz: 8908e5a4de9c5edb13d923e57c32358dca86e7582ce976dc046ccb62e6183c237a8d4c0469d66afd0852d08be1e162a633bc21af787c1b9783e8e965c6846655
-  data.tar.gz: 9c2b984abd3d0734885560f9bb8a94dfa8a5fc6bdd6edb7756bace964efff1265f6f6f17d494cff61a586ecd87713a2dab25cf51075fd2a0db578e8c598a2d3c
+  metadata.gz: 01f13f11bd5f14d9db6a35440cbf981acadef9861feb31d99f9a775ac3d39e6490eb8fd6c8cf2bf4119326205e91f9d6c3fbf14f7fc4edc4f705c2d3daf34506
+  data.tar.gz: a70a256d58b07fcd17ff8943ce8c182bc1f00c1d767f2b7819b7ea0accdf57b0db02a1592087db5ec2e5454ea55329d7d8cfc2ca385b5da6dc8657b40c181ec5

data/.travis.yml

@@ -1,30 +1,43 @@
+sudo: false
+
 language: ruby
 
 rvm:
-  - "1.9.2"
   - "1.9.3"
   - "2.0.0"
-  - "2.1.1"
+  - "2.1.8"
+  - "2.2.4"
+  - "2.3.0"
   - "jruby-19mode"
-  - "rbx"
 
 gemfile:
   - "gemfiles/capistrano2.gemfile"
   - "gemfiles/capistrano3.gemfile"
   - "gemfiles/no_dependencies.gemfile"
-  - "gemfiles/rails-3.0.gemfile"
-  - "gemfiles/rails-3.1.gemfile"
+  - "gemfiles/padrino.gemfile"
   - "gemfiles/rails-3.2.gemfile"
   - "gemfiles/rails-4.0.gemfile"
   - "gemfiles/rails-4.1.gemfile"
+  - "gemfiles/rails-4.2.gemfile"
+  - "gemfiles/rails-5.0.gemfile"
+  - "gemfiles/resque.gemfile"
   - "gemfiles/sequel.gemfile"
   - "gemfiles/sinatra.gemfile"
 
 matrix:
+  exclude:
+    - rvm: "1.9.3"
+      gemfile: "gemfiles/rails-5.0.gemfile"
+    - rvm: "2.0.0"
+      gemfile: "gemfiles/rails-5.0.gemfile"
+    - rvm: "2.1.8"
+      gemfile: "gemfiles/rails-5.0.gemfile"
+    - rvm: "jruby-19mode"
+      gemfile: "gemfiles/rails-5.0.gemfile"
   allow_failures:
-    - rvm: "rbx"
+    - rvm: "jruby-19mode"
 
 env:
   global: "RAILS_ENV=test"
 
-script: "bundle exec rspec"
+script: "bundle exec rake travis"

data/CHANGELOG.md

@@ -1,8 +1,10 @@
-# 0.12.0
+# 1.0.0
 * New version of event formatting and collection
 * Use native library and agent
 * Use API V2
 * Support for Mongoid 5
+* Integration into other gems with a hooks system
+* Lots of minor bug fixes and improvements
 
 # 0.11.15
 * Improve Sinatra support

data/Rakefile

@@ -1,3 +1,5 @@
+require 'rspec/core/rake_task'
+
 GEMFILES = %w(
   capistrano2
   capistrano3
@@ -7,17 +9,24 @@ GEMFILES = %w(
   rails-4.0
   rails-4.1
   rails-4.2
+  rails-5.0
+  resque
   sequel
   sinatra
 )
 
 RUBY_VERSIONS = %w(
-  1.9.3-p429
-  2.0.0-p451
-  2.1.2
-  2.2.0
+  1.9.3-p551
+  2.0.0-p648
+  2.1.8
+  2.2.4
+  2.3.0
 )
 
+EXCLUSIONS = {
+  'rails-5.0' => %w( 1.9.3-p551 2.0.0-p648 2.1.8)
+}
+
 VERSION_MANAGERS = {
   :rbenv => 'rbenv local',
   :rvm => 'rvm use'
@@ -44,10 +53,10 @@ task :publish do
       puts `git commit -am 'Bump to #{version} [ci skip]'`
       puts "# Creating tag #{version}"
       puts `git tag #{version}`
-      puts `git push origin #{version}`
-      puts `git push appsignal #{version}`
-      puts `git push origin #{branch}`
-      puts `git push appsignal #{branch}`
+      puts `git push public #{version}`
+      puts `git push private #{version}`
+      puts `git push public #{branch}`
+      puts `git push private #{branch}`
     rescue
       raise "Tag: '#{version}' already exists"
     end
@@ -100,7 +109,7 @@ task :install do
   end
 end
 
-task :spec do
+task :spec_all_gemfiles do
   GEMFILES.each do |gemfile|
     puts "Running #{gemfile}"
     raise 'Not successful' unless system("env BUNDLE_GEMFILE=gemfiles/#{gemfile}.gemfile bundle exec rspec")
@@ -122,13 +131,15 @@ task :generate_bundle_and_spec_all do
       out << "#{switch_command} #{version} || { echo 'Switching Ruby failed'; exit 1; }"
       out << 'cd ext && rm -f libappsignal.a && ruby extconf.rb && make clean && make && cd ..'
       GEMFILES.each do |gemfile|
-        out << "echo 'Bundling #{gemfile} in #{version}'"
-        out << "bundle --quiet --gemfile gemfiles/#{gemfile}.gemfile || { echo 'Bundling failed'; exit 1; }"
-        out << "echo 'Running #{gemfile} in #{version}'"
-        out << "env BUNDLE_GEMFILE=gemfiles/#{gemfile}.gemfile bundle exec rspec || { echo 'Running specs failed'; exit 1; }"
+        unless EXCLUSIONS[gemfile] && EXCLUSIONS[gemfile].include?(version)
+          out << "echo 'Bundling #{gemfile} in #{version}'"
+          out << "bundle --quiet --gemfile gemfiles/#{gemfile}.gemfile || { echo 'Bundling failed'; exit 1; }"
+          out << "echo 'Running #{gemfile} in #{version}'"
+          out << "env BUNDLE_GEMFILE=gemfiles/#{gemfile}.gemfile bundle exec rspec || { echo 'Running specs failed'; exit 1; }"
+        end
       end
     end
-    out << 'rm .ruby-version'
+    out << 'rm -f .ruby-version'
     out << "echo 'Successfully ran specs for all environments'"
 
     script = "bundle_and_spec_all_#{version_manager}.sh"
@@ -151,4 +162,14 @@ task :console do
   IRB.start
 end
 
-task :default => [:generate_bundle_and_spec_all, :spec]
+task :install_extension do
+  `cd ext && rm -f libappsignal.a && ruby extconf.rb && make clean && make`
+end
+
+RSpec::Core::RakeTask.new(:rspec) do |t|
+  t.pattern = Dir.glob('spec/**/*_spec.rb')
+end
+
+task :travis => [:install_extension, :rspec]
+
+task :default => [:generate_bundle_and_spec_all, :spec_all_gemfiles]

data/ext/agent.yml

@@ -1,15 +1,15 @@
 ---
-:version: 198f4fc
+:version: 9e5359a
 :triples:
   x86_64-linux:
-    :checksum: 0519f250f1442c02c69e6bda52b1b3cac852e7d9a6e8da6365344d6009588727
-    :download_url: https://appsignal-agent-releases.global.ssl.fastly.net/198f4fc/appsignal-agent-x86_64-linux-static.tar.gz
+    :checksum: cafe3e12730619db156edc7d36ce4c6e7a367fba94dcb509c0373e46beeacc00
+    :download_url: https://appsignal-agent-releases.global.ssl.fastly.net/9e5359a/appsignal-agent-x86_64-linux-static.tar.gz
     :lib_filename: libappsignal.a
   i686-linux:
-    :checksum: f38faad12bf0f452c85776c2a882a600186237334970b21b691c6671ac661401
-    :download_url: https://appsignal-agent-releases.global.ssl.fastly.net/198f4fc/appsignal-agent-i686-linux-static.tar.gz
+    :checksum: 4f5453174877e5bbc61e686eadfd741870eb5ed7713a405440ba8cfa77a884d8
+    :download_url: https://appsignal-agent-releases.global.ssl.fastly.net/9e5359a/appsignal-agent-i686-linux-static.tar.gz
     :lib_filename: libappsignal.a
   x86_64-darwin:
-    :checksum: 53a59e437366aedc339ef25dbbb9aa70b3ccc353faa6cac2b1777a72fd211cd4
-    :download_url: https://appsignal-agent-releases.global.ssl.fastly.net/198f4fc/appsignal-agent-x86_64-darwin-static.tar.gz
+    :checksum: 19d974f0ce1c8e1e296f631876f050992b2de055e0f835c07a811da6513c621d
+    :download_url: https://appsignal-agent-releases.global.ssl.fastly.net/9e5359a/appsignal-agent-x86_64-darwin-static.tar.gz
     :lib_filename: libappsignal.a

data/ext/appsignal_extension.c

@@ -105,9 +105,11 @@ static VALUE set_transaction_metadata(VALUE self, VALUE transaction_index, VALUE
 }
 
 static VALUE finish_transaction(VALUE self, VALUE transaction_index) {
+  int sample;
+
   Check_Type(transaction_index, T_FIXNUM);
 
-  int sample = appsignal_finish_transaction(FIX2INT(transaction_index));
+  sample = appsignal_finish_transaction(FIX2INT(transaction_index));
   return sample == 1 ? Qtrue : Qfalse;
 }
 

data/gemfiles/rails-4.2.gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'rails', '~> 4.2.0.rc'
+gem 'rails', '~> 4.2.0'
 
 gem 'generator_spec'
 

data/gemfiles/rails-5.0.gemfile

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+gem 'rails', '~> 5.0.0.beta'
+
+gem 'generator_spec'
+
+gemspec :path => '../'

data/gemfiles/resque.gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem 'resque'
+
+gemspec :path => '../'

data/lib/appsignal.rb

@@ -1,11 +1,15 @@
 require 'logger'
 require 'securerandom'
 
+# Make sure we have the notification system
 begin
   require 'active_support/notifications'
   ActiveSupport::Notifications::Fanout::Subscribers::Timed # See it it's recent enough
-rescue LoadError, NameError
+rescue LoadError
   require 'vendor/active_support/notifications'
+rescue NameError
+  require 'appsignal/update_active_support'
+  Appsignal::UpdateActiveSupport.run
 end
 
 module Appsignal
@@ -250,6 +254,7 @@ require 'appsignal/hooks'
 require 'appsignal/marker'
 require 'appsignal/params_sanitizer'
 require 'appsignal/integrations/railtie' if defined?(::Rails)
+require 'appsignal/integrations/resque'
 require 'appsignal/subscriber'
 require 'appsignal/transaction'
 require 'appsignal/version'

data/lib/appsignal/event_formatter/active_record/sql_formatter.rb

@@ -6,7 +6,7 @@ module Appsignal
 
         SINGLE_QUOTED_STRING = /'(.?|[^']).*'/.freeze
         DOUBLE_QUOTED_STRING = /"(.?|[^"]).*"/.freeze
-        IN_OPERATOR_CONTENT  = /(IN \()[^\)]+(\))/.freeze
+        IN_OPERATOR_CONTENT  = /(IN \()[^SELECT][^\)]+(\))/.freeze
         NUMERIC              = /\d*\.?\d+/.freeze
         REPLACEMENT          = '?'.freeze
         IN_REPLACEMENT       = '\1?\2'.freeze

data/lib/appsignal/hooks.rb

@@ -55,7 +55,6 @@ require 'appsignal/hooks/passenger'
 require 'appsignal/hooks/puma'
 require 'appsignal/hooks/rake'
 require 'appsignal/hooks/redis'
-require 'appsignal/hooks/resque'
 require 'appsignal/hooks/sequel'
 require 'appsignal/hooks/sidekiq'
 require 'appsignal/hooks/unicorn'

data/lib/appsignal/hooks/rake.rb

@@ -9,18 +9,10 @@ module Appsignal
 
       def install
         ::Rake::Task.class_eval do
-          alias :invoke_without_appsignal :invoke
+          alias :execute_without_appsignal :execute
 
-          def invoke(*args)
-            if Appsignal.active?
-              invoke_with_appsignal(*args)
-            else
-              invoke_without_appsignal(*args)
-            end
-          end
-
-          def invoke_with_appsignal(*args)
-            invoke_without_appsignal(*args)
+          def execute(*args)
+            execute_without_appsignal(*args)
           rescue => error
             transaction = Appsignal::Transaction.create(
               SecureRandom.uuid,
@@ -31,7 +23,7 @@ module Appsignal
             )
             transaction.set_action(name)
             transaction.set_error(error)
-            transaction.complete!
+            transaction.complete
             Appsignal.stop
             raise error
           end

data/lib/appsignal/integrations/resque.rb

@@ -0,0 +1,15 @@
+module Appsignal
+  module Integrations
+    module ResquePlugin
+      def around_perform_resque_plugin(*args)
+        Appsignal.monitor_transaction(
+          'perform_job.resque',
+          :class => self.to_s,
+          :method => 'perform'
+        ) do
+          yield
+        end
+      end
+    end
+  end
+end

data/lib/appsignal/subscriber.rb

@@ -31,14 +31,14 @@ module Appsignal
 
     def start(name, id, payload)
       return unless transaction = Appsignal::Transaction.current
-      return if transaction.paused?
+      return if transaction.nil_transaction? || transaction.paused?
 
       Appsignal::Extension.start_event(transaction.transaction_index)
     end
 
     def finish(name, id, payload)
       return unless transaction = Appsignal::Transaction.current
-      return if transaction.paused?
+      return if transaction.nil_transaction? || transaction.paused?
 
       title, body = Appsignal::EventFormatter.format(name, payload)
       Appsignal::Extension.finish_event(

data/lib/appsignal/transaction.rb

@@ -21,16 +21,12 @@ module Appsignal
       end
 
       def current
-        Thread.current[:appsignal_transaction]
+        Thread.current[:appsignal_transaction] || NilTransaction.new
       end
 
       def complete_current!
-        if current
-          current.complete
-          Thread.current[:appsignal_transaction] = nil
-        else
-          Appsignal.logger.error('Trying to complete current, but no transaction present')
-        end
+        current.complete
+        Thread.current[:appsignal_transaction] = nil
       end
     end
 
@@ -49,6 +45,10 @@ module Appsignal
       @transaction_index = Appsignal::Extension.start_transaction(@transaction_id, @namespace)
     end
 
+    def nil_transaction?
+      false
+    end
+
     def complete
       if Appsignal::Extension.finish_transaction(transaction_index)
         sample_data
@@ -230,5 +230,16 @@ module Appsignal
         backtrace
       end
     end
+
+    # Stub that is returned by `Transaction.current` if there is no current transaction, so
+    # that it's still safe to call methods on it if there is none.
+    class NilTransaction
+      def method_missing(m, *args, &block)
+      end
+
+      def nil_transaction?
+        true
+      end
+    end
   end
 end

data/lib/appsignal/update_active_support.rb

@@ -0,0 +1,20 @@
+module Appsignal
+  module UpdateActiveSupport
+    def self.run
+      # Get the old subscribers if present
+      old_notifier = ActiveSupport::Notifications.notifier
+      subscribers  = old_notifier.instance_variable_get('@subscribers') || []
+
+      # Require the newer notifications
+      require 'vendor/active_support/notifications'
+
+      # Re-subscribe the old subscribers
+      subscribers.each do |sub|
+        pattern  = sub.instance_variable_get('@pattern')
+        delegate = sub.instance_variable_get('@delegate')
+        next unless pattern && delegate
+        ActiveSupport::Notifications.subscribe(pattern, delegate)
+      end
+    end
+  end
+end

data/lib/appsignal/version.rb

@@ -1,5 +1,5 @@
 require 'yaml'
 
 module Appsignal
-  VERSION = '0.12.rc.14'
+  VERSION = '1.0.0.rc.1'
 end

data/spec/lib/appsignal/event_formatter/active_record/sql_formatter_spec.rb

@@ -90,11 +90,17 @@ if active_record_present?
           end
         end
 
-        context "in operator with params" do
+        context "in operator with values" do
           let(:sql) { 'SELECT `table`.* FROM `table` WHERE `id` IN (1, 2)' }
 
           it { should == ['Model load', 'SELECT `table`.* FROM `table` WHERE `id` IN (?)'] }
         end
+
+        context "in operator with inner query" do
+          let(:sql) { 'SELECT `table`.* FROM `table` WHERE `id` IN (SELECT `id` from `other_table` WHERE `value` = 10.0)' }
+
+          it { should == ['Model load', 'SELECT `table`.* FROM `table` WHERE `id` IN (SELECT `id` from `other_table` WHERE `value` = ?)'] }
+        end
       end
 
       context "with double quote style table names" do

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

@@ -6,51 +6,29 @@ describe Appsignal::Hooks::RakeHook do
   let(:task) { Rake::Task.new('task', app) }
   before do
     task.stub(
-      :name                     => 'task:name',
-      :invoke_without_appsignal => true
+      :name                      => 'task:name',
+      :execute_without_appsignal => true
     )
   end
   before :all do
     Appsignal::Hooks::RakeHook.new.install
   end
 
-  describe "#invoke" do
-    before { Appsignal.stub(:active? => true) }
-
-    it "should call with appsignal monitoring" do
-      expect( task ).to receive(:invoke_with_appsignal).with(['foo'])
-    end
-
-    context "when not active" do
-      before { Appsignal.stub(:active? => false) }
-
-      it "should NOT call with appsignal monitoring" do
-        expect( task ).to_not receive(:invoke_with_appsignal).with(['foo'])
-      end
-
-      it "should call the original task" do
-        expect( task ).to receive(:invoke_without_appsignal).with(['foo'])
-      end
-    end
-
-    after { task.invoke(['foo']) }
-  end
-
-  describe "#invoke_with_appsignal" do
+  describe "#execute" do
     context "with transaction" do
       let!(:transaction) { regular_transaction }
       let!(:agent)       { double('Agent', :send_queue => true) }
       before do
         transaction.stub(:set_action)
         transaction.stub(:set_error)
-        transaction.stub(:complete!)
+        transaction.stub(:complete)
         SecureRandom.stub(:uuid => '123')
         Appsignal::Transaction.stub(:create => transaction)
         Appsignal.stub(:active? => true)
       end
 
       it "should call the original task" do
-        expect( task ).to receive(:invoke_without_appsignal).with('foo')
+        expect( task ).to receive(:execute_without_appsignal).with('foo')
       end
 
       it "should not create a transaction" do
@@ -61,7 +39,7 @@ describe Appsignal::Hooks::RakeHook do
         let(:exception) { VerySpecificError.new }
 
         before do
-          task.stub(:invoke_without_appsignal).and_raise(exception)
+          task.stub(:execute_without_appsignal).and_raise(exception)
         end
 
         it "should create a transaction" do
@@ -81,7 +59,7 @@ describe Appsignal::Hooks::RakeHook do
         end
 
         it "should call complete! on the transaction" do
-          expect( transaction ).to receive(:complete!)
+          expect( transaction ).to receive(:complete)
         end
 
         it "should stop appsignal" do
@@ -90,6 +68,6 @@ describe Appsignal::Hooks::RakeHook do
       end
     end
 
-    after { task.invoke_with_appsignal('foo') rescue VerySpecificError }
+    after { task.execute('foo') rescue VerySpecificError }
   end
 end

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

@@ -8,7 +8,7 @@ describe Appsignal::Hooks::RedisHook do
   context "with redis" do
     context "with redis" do
       before :all do
-        module Redis
+        class Redis
           class Client
             def process(commands, &block)
               1

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

@@ -0,0 +1,81 @@
+require 'spec_helper'
+
+if resque_present?
+  describe "Resque integration" do
+    let(:file) { File.expand_path('lib/appsignal/integrations/resque.rb') }
+
+    context "with resque" do
+      before do
+        load file
+        start_agent
+
+        class TestJob
+          extend Appsignal::Integrations::ResquePlugin
+
+          def self.perform
+          end
+        end
+
+        class BrokenTestJob
+          extend Appsignal::Integrations::ResquePlugin
+
+          def self.perform
+            raise VerySpecificError.new('broken')
+          end
+        end
+      end
+
+      describe :around_perform_resque_plugin do
+        let(:transaction) { Appsignal::Transaction.new('1', 'background', {}, {}) }
+        let(:job) { Resque::Job.new('default', {'class' => 'TestJob'}) }
+        before do
+          transaction.stub(:complete => true)
+          Appsignal::Transaction.stub(:current => transaction)
+        end
+
+        context "without exception" do
+          it "should create a new transaction" do
+            Appsignal::Transaction.should_receive(:create).and_return(transaction)
+          end
+
+          it "should wrap in a transaction with the correct params" do
+            Appsignal.should_receive(:monitor_transaction).with(
+              'perform_job.resque',
+              :class => 'TestJob',
+              :method => 'perform'
+            )
+          end
+
+          it "should close the transaction" do
+            transaction.should_receive(:complete)
+          end
+
+          after { job.perform  }
+        end
+
+        context "with exception" do
+          let(:job) { Resque::Job.new('default', {'class' => 'BrokenTestJob'}) }
+
+          it "should set the exception" do
+            Appsignal::Transaction.any_instance.should_receive(:set_error)
+          end
+
+          after do
+            begin
+              job.perform
+            rescue VerySpecificError
+              # Do nothing
+            end
+          end
+        end
+      end
+    end
+
+    context "without resque" do
+      before(:all) { Object.send(:remove_const, :Resque) }
+
+      specify { expect { ::Resque }.to raise_error(NameError) }
+      specify { expect { load file }.to_not raise_error }
+    end
+  end
+end

data/spec/lib/appsignal/transaction_spec.rb

@@ -40,33 +40,44 @@ describe Appsignal::Transaction do
     end
 
     describe '.current' do
-      before { transaction }
       subject { Appsignal::Transaction.current }
 
-      it 'should return the correct transaction' do
-        should == transaction
-      end
-    end
+      context "if there is a transaction" do
+        before { transaction }
 
-    describe "complete_current!" do
-      before { Thread.current[:appsignal_transaction] = nil }
+        it "should return the correct transaction" do
+          should == transaction
+        end
 
-      context "with a current transaction" do
-        before { Appsignal::Transaction.create('2', Appsignal::Transaction::HTTP_REQUEST, {}) }
+        it "should indicate it's not a nil transaction" do
+          subject.nil_transaction?.should be_false
+        end
+      end
 
-        it "should complete the current transaction and set the thread appsignal_transaction to nil" do
-          Appsignal::Extension.should_receive(:finish_transaction).with(kind_of(Integer))
+      context "if there is no transaction" do
+        before do
+          Thread.current[:appsignal_transaction] = nil
+        end
 
-          Appsignal::Transaction.complete_current!
+        it "should return a nil transaction stub" do
+          should be_a Appsignal::Transaction::NilTransaction
+        end
 
-          Thread.current[:appsignal_transaction].should be_nil
+        it "should indicate it's a nil transaction" do
+          subject.nil_transaction?.should be_true
         end
       end
+    end
 
-      context "without a current transaction" do
-        it "should not raise an error" do
-          Appsignal::Transaction.complete_current!
-        end
+    describe "complete_current!" do
+      before { Appsignal::Transaction.create('2', Appsignal::Transaction::HTTP_REQUEST, {}) }
+
+      it "should complete the current transaction and set the thread appsignal_transaction to nil" do
+        Appsignal::Extension.should_receive(:finish_transaction).with(kind_of(Integer))
+
+        Appsignal::Transaction.complete_current!
+
+        Thread.current[:appsignal_transaction].should be_nil
       end
     end
   end
@@ -587,7 +598,7 @@ describe Appsignal::Transaction do
                 def load_session(env); [1, {:foo => :bar}]; end
                 def session_exists?(env); true; end
               }.new
-              ActionDispatch::Request::Session.create(store, {}, {})
+              ActionDispatch::Request::Session.create(store, ActionDispatch::Request.new('rack.input' => StringIO.new), {})
             end
           end
         end
@@ -641,4 +652,27 @@ describe Appsignal::Transaction do
       pending "calls Rails backtrace cleaner if Rails is present"
     end
   end
+
+  describe Appsignal::Transaction::NilTransaction do
+    subject { Appsignal::Transaction::NilTransaction.new }
+
+    it "should have method stubs" do
+      lambda {
+        subject.complete
+        subject.pause!
+        subject.resume!
+        subject.paused?
+        subject.store(:key)
+        subject.set_tags(:tag => 1)
+        subject.set_action('action')
+        subject.set_http_or_background_action
+        subject.set_queue_start(1)
+        subject.set_http_or_background_queue_start
+        subject.set_metadata('key', 'value')
+        subject.set_sample_data('key', 'data')
+        subject.sample_data
+        subject.set_error('a')
+      }.should_not raise_error
+    end
+  end
 end

data/spec/lib/appsignal/update_active_support_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe 'Appsignal::UpdateActiveSupport', :if => (
+  Gem.loaded_specs['rails'] &&
+  Gem.loaded_specs['rails'].version < Gem::Version.create('4.0')
+) do
+  require 'appsignal/update_active_support'
+  let(:pattern)  { 'foo' }
+  let(:delegate) { double }
+  before { ActiveSupport::Notifications.subscribe(pattern, delegate) }
+
+  it "should transfer old subscriptions to the new version" do
+    expect( ActiveSupport::Notifications ).to receive(:subscribe).with(pattern, delegate)
+  end
+
+  after { Appsignal::UpdateActiveSupport.run }
+end

data/spec/spec_helper.rb

@@ -53,6 +53,13 @@ rescue LoadError
   false
 end
 
+def resque_present?
+  require 'resque'
+  true
+rescue LoadError
+  false
+end
+
 def padrino_present?
   require 'padrino'
   true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 0.12.rc.14
+  version: 1.0.0.rc.1
 platform: ruby
 authors:
 - Robert Beekman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-06 00:00:00.000000000 Z
+date: 2016-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -140,6 +140,8 @@ files:
 - gemfiles/rails-4.0.gemfile
 - gemfiles/rails-4.1.gemfile
 - gemfiles/rails-4.2.gemfile
+- gemfiles/rails-5.0.gemfile
+- gemfiles/resque.gemfile
 - gemfiles/sequel.gemfile
 - gemfiles/sinatra.gemfile
 - lib/appsignal.rb
@@ -162,7 +164,6 @@ files:
 - lib/appsignal/hooks/puma.rb
 - lib/appsignal/hooks/rake.rb
 - lib/appsignal/hooks/redis.rb
-- lib/appsignal/hooks/resque.rb
 - lib/appsignal/hooks/sequel.rb
 - lib/appsignal/hooks/sidekiq.rb
 - lib/appsignal/hooks/unicorn.rb
@@ -173,6 +174,7 @@ files:
 - lib/appsignal/integrations/mongo_ruby_driver.rb
 - lib/appsignal/integrations/padrino.rb
 - lib/appsignal/integrations/railtie.rb
+- lib/appsignal/integrations/resque.rb
 - lib/appsignal/integrations/sinatra.rb
 - lib/appsignal/js_exception_transaction.rb
 - lib/appsignal/marker.rb
@@ -184,6 +186,7 @@ files:
 - lib/appsignal/subscriber.rb
 - lib/appsignal/transaction.rb
 - lib/appsignal/transmitter.rb
+- lib/appsignal/update_active_support.rb
 - lib/appsignal/utils.rb
 - lib/appsignal/version.rb
 - lib/generators/appsignal/USAGE
@@ -214,7 +217,6 @@ files:
 - spec/lib/appsignal/hooks/puma_spec.rb
 - spec/lib/appsignal/hooks/rake_spec.rb
 - spec/lib/appsignal/hooks/redis_spec.rb
-- spec/lib/appsignal/hooks/resque_spec.rb
 - spec/lib/appsignal/hooks/sequel_spec.rb
 - spec/lib/appsignal/hooks/sidekiq_spec.rb
 - spec/lib/appsignal/hooks/unicorn_spec.rb
@@ -222,6 +224,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_spec.rb
 - spec/lib/appsignal/integrations/sinatra_spec.rb
 - spec/lib/appsignal/js_exception_transaction_spec.rb
 - spec/lib/appsignal/marker_spec.rb
@@ -233,6 +236,7 @@ files:
 - spec/lib/appsignal/subscriber_spec.rb
 - spec/lib/appsignal/transaction_spec.rb
 - spec/lib/appsignal/transmitter_spec.rb
+- spec/lib/appsignal/update_active_support_spec.rb
 - spec/lib/appsignal/utils_spec.rb
 - spec/lib/appsignal_spec.rb
 - spec/lib/generators/appsignal/appsignal_generator_spec.rb
@@ -271,7 +275,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.5
 signing_key: 
 specification_version: 4
 summary: Logs performance and exception data from your app to appsignal.com
@@ -295,7 +299,6 @@ test_files:
 - spec/lib/appsignal/hooks/puma_spec.rb
 - spec/lib/appsignal/hooks/rake_spec.rb
 - spec/lib/appsignal/hooks/redis_spec.rb
-- spec/lib/appsignal/hooks/resque_spec.rb
 - spec/lib/appsignal/hooks/sequel_spec.rb
 - spec/lib/appsignal/hooks/sidekiq_spec.rb
 - spec/lib/appsignal/hooks/unicorn_spec.rb
@@ -303,6 +306,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_spec.rb
 - spec/lib/appsignal/integrations/sinatra_spec.rb
 - spec/lib/appsignal/js_exception_transaction_spec.rb
 - spec/lib/appsignal/marker_spec.rb
@@ -314,6 +318,7 @@ test_files:
 - spec/lib/appsignal/subscriber_spec.rb
 - spec/lib/appsignal/transaction_spec.rb
 - spec/lib/appsignal/transmitter_spec.rb
+- spec/lib/appsignal/update_active_support_spec.rb
 - spec/lib/appsignal/utils_spec.rb
 - spec/lib/appsignal_spec.rb
 - spec/lib/generators/appsignal/appsignal_generator_spec.rb

data/lib/appsignal/hooks/resque.rb

@@ -1,28 +0,0 @@
-module Appsignal
-  class Hooks
-    module ResquePlugin
-      def around_perform_resque_plugin(*args)
-        Appsignal.monitor_single_transaction(
-          'perform_job.resque',
-          :class => self.to_s,
-          :method => 'perform'
-        ) do
-          yield
-        end
-      end
-    end
-
-    class ResqueHook < Appsignal::Hooks::Hook
-      register :resque
-
-      def dependencies_present?
-        defined?(::Resque)
-      end
-
-      def install
-        # Extend the default job class with AppSignal instrumentation
-        ::Resque::Job.send(:extend, Appsignal::Hooks::ResquePlugin)
-      end
-    end
-  end
-end

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

@@ -1,72 +0,0 @@
-require 'spec_helper'
-
-describe Appsignal::Hooks::ResqueHook do
-  context "with resque" do
-    before :all do
-      module Resque
-        def self.before_first_fork
-        end
-
-        def self.after_fork
-        end
-
-        class Job
-        end
-
-        class TestError < StandardError
-        end
-      end
-      Appsignal::Hooks::ResqueHook.new.install
-      start_agent
-    end
-    after(:all) { Object.send(:remove_const, :Resque) }
-
-    describe :around_perform_resque_plugin do
-      let(:transaction) { background_job_transaction }
-      let(:job) { Resque::Job }
-      let(:invoked_job) { nil }
-      before do
-        transaction.stub(:complete! => true)
-        Appsignal::Transaction.stub(:current => transaction)
-      end
-
-      context "without exception" do
-        it "should create a new transaction" do
-          Appsignal::Transaction.should_receive(:create).and_return(transaction)
-        end
-
-        it "should wrap in a transaction with the correct params" do
-          Appsignal.should_receive(:monitor_single_transaction).with(
-            'perform_job.resque',
-            :class => 'Resque::Job',
-            :method => 'perform'
-          )
-        end
-
-        it "should close the transaction" do
-          Appsignal::Transaction.should_receive(:complete_current!)
-        end
-
-        after { job.around_perform_resque_plugin { invoked_job }  }
-      end
-
-      context "with exception" do
-        it "should set the exception" do
-          Appsignal::Transaction.any_instance.should_receive(:set_error)
-        end
-
-        after do
-          begin
-            job.around_perform_resque_plugin { raise(Resque::TestError.new('the roof')) }
-          rescue Resque::TestError
-            # Do nothing
-          end
-        end
-      end
-    end
-  end
-
-  context "without resque" do
-    its(:dependencies_present?) { should be_false }
-  end
-end