appsignal 0.12.rc.7 → 0.12.rc.8

data/spec/lib/appsignal/{integrations → hooks}/rake_spec.rb

@@ -1,17 +1,18 @@
 require 'spec_helper'
 require 'rake'
 
-describe "Rake integration" do
-  let(:file) { File.expand_path('lib/appsignal/integrations/rake.rb') }
+describe Appsignal::Hooks::RakeHook do
   let(:app)  { double(:current_scope => nil) }
   let(:task) { Rake::Task.new('task', app) }
   before do
-    load file
     task.stub(
       :name                     => 'task:name',
       :invoke_without_appsignal => true
     )
   end
+  before :all do
+    Appsignal::Hooks::RakeHook.new.install
+  end
 
   describe "#invoke" do
     before { Appsignal.stub(:active? => true) }

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

@@ -0,0 +1,59 @@
+require 'spec_helper'
+
+describe Appsignal::Hooks::RedisHook do
+  before :all do
+    Appsignal.config = project_fixture_config
+  end
+
+  context "with redis" do
+    context "with redis" do
+      before :all do
+        module Redis
+          class Client
+            def process(commands, &block)
+              1
+            end
+          end
+          VERSION = '1.0'
+        end
+      end
+
+      context "and redis instrumentation enabled" do
+        let(:events) { [] }
+        before :all do
+          Appsignal.config.config_hash[:instrument_redis] = true
+          Appsignal::Hooks::RedisHook.new.install
+        end
+        before do
+          ActiveSupport::Notifications.subscribe(/^[^!]/) do |*args|
+            events << ActiveSupport::Notifications::Event.new(*args)
+          end
+        end
+        after(:all) { Object.send(:remove_const, :Redis) }
+
+        its(:dependencies_present?) { should be_true }
+
+        it "should generate an event for a redis call" do
+          client = Redis::Client.new
+
+          client.process([]).should == 1
+
+          event = events.last
+          event.name.should == 'query.redis'
+        end
+      end
+    end
+
+    context "and redis instrumentation disabled" do
+      before :all do
+        Appsignal.config.config_hash[:instrument_net_http] = false
+      end
+
+      its(:dependencies_present?) { should be_false }
+    end
+  end
+
+  context "without redis" do
+    its(:dependencies_present?) { should be_false }
+  end
+end

data/spec/lib/appsignal/{integrations → hooks}/resque_spec.rb

@@ -1,12 +1,9 @@
 require 'spec_helper'
 
-describe "Resque integration" do
-  let(:file) { File.expand_path('lib/appsignal/integrations/resque.rb') }
-
+describe Appsignal::Hooks::ResqueHook do
   context "with resque" do
-    before do
+    before :all do
       module Resque
-
         def self.before_first_fork
         end
 
@@ -19,10 +16,10 @@ describe "Resque integration" do
         class TestError < StandardError
         end
       end
-
-      load file
+      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 }
@@ -70,9 +67,6 @@ describe "Resque integration" do
   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 }
+    its(:dependencies_present?) { should be_false }
   end
 end

data/spec/lib/appsignal/{instrumentations → hooks}/sequel_spec.rb

@@ -1,11 +1,9 @@
 require 'spec_helper'
 
 describe "Sequel integration", if: sequel_present? do
-  let(:file) { File.expand_path('lib/appsignal/integrations/sequel.rb') }
-  let(:db)   { Sequel.sqlite }
+  let(:db) { Sequel.sqlite }
 
   before do
-    load file
     start_agent
   end
 

data/spec/lib/appsignal/{integrations → hooks}/sidekiq_spec.rb

@@ -1,18 +1,6 @@
 require 'spec_helper'
 
-describe "Sidekiq integration" do
-  let(:file) { File.expand_path('lib/appsignal/integrations/sidekiq.rb') }
-  before :all do
-    module Sidekiq
-      def self.configure_server
-      end
-    end
-  end
-  before do
-    load file
-    start_agent
-  end
-
+describe Appsignal::Hooks::SidekiqPlugin do
   let(:worker) { double }
   let(:queue) { double }
   let(:current_transaction) { background_job_transaction }
@@ -24,11 +12,12 @@ describe "Sidekiq integration" do
     'args'        => ['Model', 1],
     'extra'       => 'data'
   }}
-  let(:plugin) { Appsignal::Integrations::SidekiqPlugin.new }
+  let(:plugin) { Appsignal::Hooks::SidekiqPlugin.new }
 
   before do
     Appsignal.stub(:is_ignored_exception? => false)
     Appsignal::Transaction.stub(:current => current_transaction)
+    start_agent
   end
 
   context "with a performance call" do
@@ -66,7 +55,7 @@ describe "Sidekiq integration" do
 
     after do
       Timecop.freeze(Time.parse('01-01-2001 10:01:00UTC')) do
-        Appsignal::Integrations::SidekiqPlugin.new.call(worker, item, queue) do
+        Appsignal::Hooks::SidekiqPlugin.new.call(worker, item, queue) do
           # nothing
         end
       end
@@ -82,7 +71,7 @@ describe "Sidekiq integration" do
     after do
       begin
         Timecop.freeze(Time.parse('01-01-2001 10:01:00UTC')) do
-          Appsignal::Integrations::SidekiqPlugin.new.call(worker, item, queue) do
+          Appsignal::Hooks::SidekiqPlugin.new.call(worker, item, queue) do
             raise error
           end
         end
@@ -149,13 +138,24 @@ describe "Sidekiq integration" do
         plugin.string_or_inspect(object).should == object.inspect
       end
     end
+  end
+end
 
+describe Appsignal::Hooks::SidekiqHook do
+  context "with sidekiq" do
+    before :all do
+      module Sidekiq
+        def self.configure_server
+        end
+      end
+      Appsignal::Hooks::SidekiqHook.new.install
+    end
+    after(:all) { Object.send(:remove_const, :Sidekiq) }
+
+    its(:dependencies_present?) { should be_true }
   end
 
   context "without sidekiq" do
-    before(:all) { Object.send(:remove_const, :Sidekiq) }
-
-    specify { expect { Sidekiq }.to raise_error(NameError) }
-    specify { expect { load file }.to_not raise_error }
+    its(:dependencies_present?) { should be_false }
   end
 end

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

@@ -0,0 +1,46 @@
+require 'spec_helper'
+
+describe Appsignal::Hooks::UnicornHook do
+  context "with unicorn" do
+    before :all do
+      module Unicorn
+        class HttpServer
+          def worker_loop(worker)
+          end
+        end
+
+        class Worker
+          def close
+          end
+        end
+      end
+      Appsignal::Hooks::UnicornHook.new.install
+    end
+    after(:all) { Object.send(:remove_const, :Unicorn) }
+
+    its(:dependencies_present?) { should be_true }
+
+    it "adds behavior to Unicorn::HttpServer#worker_loop" do
+      server = Unicorn::HttpServer.new
+      worker = double
+
+      Appsignal.should_receive(:forked)
+      server.should_receive(:worker_loop_without_appsignal).with(worker)
+
+      server.worker_loop(worker)
+    end
+
+    it "adds behavior to Unicorn::Worker#close" do
+      worker = Unicorn::Worker.new
+
+      Appsignal.should_receive(:stop)
+      worker.should_receive(:close_without_appsignal)
+
+      worker.close
+    end
+  end
+
+  context "without unicorn" do
+    its(:dependencies_present?) { should be_false }
+  end
+end

data/spec/lib/appsignal/hooks_spec.rb

@@ -0,0 +1,76 @@
+require 'spec_helper'
+
+class MockPresentHook < Appsignal::Hooks::Hook
+  def dependencies_present?
+    true
+  end
+
+  def install
+    MockPresentHook.call_something
+  end
+
+  def self.call_something
+  end
+end
+
+class MockNotPresentHook < Appsignal::Hooks::Hook
+  def dependencies_present?
+    false
+  end
+
+  def install
+    MockNotPresentHook.call_something
+  end
+end
+
+class MockErrorHook < Appsignal::Hooks::Hook
+  def dependencies_present?
+    true
+  end
+
+  def install
+    raise 'error'
+  end
+end
+
+describe Appsignal::Hooks do
+  it "should register and install a hook once" do
+    Appsignal::Hooks::Hook.register(:mock_present_hook, MockPresentHook)
+
+    Appsignal::Hooks.hooks[:mock_present_hook].should be_instance_of(MockPresentHook)
+    Appsignal::Hooks.hooks[:mock_present_hook].installed?.should be_false
+
+    MockPresentHook.should_receive(:call_something).once
+
+    Appsignal::Hooks.load_hooks
+    Appsignal::Hooks.load_hooks
+    Appsignal::Hooks.load_hooks
+    Appsignal::Hooks.hooks[:mock_present_hook].installed?.should be_true
+  end
+
+  it "should not install if depencies are not present" do
+    Appsignal::Hooks::Hook.register(:mock_not_present_hook, MockNotPresentHook)
+
+    Appsignal::Hooks.hooks[:mock_not_present_hook].should be_instance_of(MockNotPresentHook)
+    Appsignal::Hooks.hooks[:mock_not_present_hook].installed?.should be_false
+
+    MockPresentHook.should_not_receive(:call_something)
+
+    Appsignal::Hooks.load_hooks
+
+    Appsignal::Hooks.hooks[:mock_not_present_hook].installed?.should be_false
+  end
+
+  it "should not install if there is an error while installing" do
+    Appsignal::Hooks::Hook.register(:mock_error_hook, MockErrorHook)
+
+    Appsignal::Hooks.hooks[:mock_error_hook].should be_instance_of(MockErrorHook)
+    Appsignal::Hooks.hooks[:mock_error_hook].installed?.should be_false
+
+    Appsignal.logger.should_receive(:error).with("Error while installing mock_error_hook hook: error").once
+
+    Appsignal::Hooks.load_hooks
+
+    Appsignal::Hooks.hooks[:mock_error_hook].installed?.should be_false
+  end
+end

data/spec/lib/appsignal/transaction_spec.rb

@@ -375,7 +375,7 @@ describe Appsignal::Transaction do
         context "with the HTTP_X_REQUEST_START header set" do
           let(:env) { {'HTTP_X_REQUEST_START' => "t=#{slightly_earlier_time_value}"} }
 
-          it { should == 1389783599 }
+          it { should == 1389783599600 }
 
           context "with unparsable content" do
             let(:env) { {'HTTP_X_REQUEST_START' => 'something'} }
@@ -386,7 +386,7 @@ describe Appsignal::Transaction do
           context "with some cruft" do
             let(:env) { {'HTTP_X_REQUEST_START' => "t=#{slightly_earlier_time_value}aaaa"} }
 
-            it { should == 1389783599 }
+            it { should == 1389783599600 }
           end
 
           context "with a really low number" do
@@ -398,7 +398,7 @@ describe Appsignal::Transaction do
           context "with the alternate HTTP_X_QUEUE_START header set" do
             let(:env) { {'HTTP_X_QUEUE_START' => "t=#{slightly_earlier_time_value}"} }
 
-            it { should == 1389783599 }
+            it { should == 1389783599600 }
           end
         end
       end

data/spec/lib/appsignal_spec.rb

@@ -62,11 +62,6 @@ describe Appsignal do
         Appsignal.start
       end
 
-      it "should load instrumentations" do
-        Appsignal.should_receive(:load_instrumentations)
-        Appsignal.start
-      end
-
       it "should initialize formatters" do
         Appsignal::EventFormatter.should_receive(:initialize_formatters)
         Appsignal.start
@@ -115,34 +110,6 @@ describe Appsignal do
       end
     end
 
-    describe ".load_instrumentations" do
-      before { Appsignal.config = project_fixture_config }
-
-      context "if on in the config" do
-        it "should require integrations" do
-          Appsignal.should_receive(:require).with('appsignal/instrumentations/net_http').once
-          Appsignal.should_receive(:require).with('appsignal/instrumentations/redis').once
-          Appsignal.should_receive(:require).with('appsignal/instrumentations/sequel').once
-        end
-      end
-
-      context "if off in the config" do
-        before do
-          Appsignal.config.config_hash[:instrument_net_http] = false
-          Appsignal.config.config_hash[:instrument_redis] = false
-          Appsignal.config.config_hash[:instrument_sequel] = false
-        end
-
-        it "should require integrations" do
-          Appsignal.should_not_receive(:require).with('appsignal/instrumentations/net_http')
-          Appsignal.should_not_receive(:require).with('appsignal/instrumentations/redis')
-          Appsignal.should_not_receive(:require).with('appsignal/instrumentations/sequel')
-        end
-      end
-
-      after { Appsignal.load_instrumentations }
-    end
-
     context "with debug logging" do
       before { Appsignal.config = project_fixture_config('test') }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 0.12.rc.7
+  version: 0.12.rc.8
 platform: ruby
 authors:
 - Robert Beekman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-18 00:00:00.000000000 Z
+date: 2015-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -155,23 +155,25 @@ files:
 - lib/appsignal/event_formatter/moped/query_formatter.rb
 - lib/appsignal/event_formatter/net_http/request_formatter.rb
 - lib/appsignal/extension.rb
-- lib/appsignal/instrumentations/net_http.rb
-- lib/appsignal/instrumentations/redis.rb
-- lib/appsignal/instrumentations/sequel.rb
+- lib/appsignal/hooks.rb
+- lib/appsignal/hooks/celluloid.rb
+- lib/appsignal/hooks/delayed_job.rb
+- lib/appsignal/hooks/net_http.rb
+- lib/appsignal/hooks/passenger.rb
+- 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
 - lib/appsignal/integrations/capistrano/appsignal.cap
 - lib/appsignal/integrations/capistrano/capistrano_2_tasks.rb
 - lib/appsignal/integrations/capistrano/careful_logger.rb
-- lib/appsignal/integrations/celluloid.rb
-- lib/appsignal/integrations/delayed_job.rb
+- lib/appsignal/integrations/delayed_job_plugin.rb
 - lib/appsignal/integrations/padrino.rb
-- lib/appsignal/integrations/passenger.rb
-- lib/appsignal/integrations/puma.rb
-- lib/appsignal/integrations/rails.rb
-- lib/appsignal/integrations/rake.rb
-- lib/appsignal/integrations/resque.rb
-- lib/appsignal/integrations/sidekiq.rb
+- lib/appsignal/integrations/railtie.rb
 - lib/appsignal/integrations/sinatra.rb
-- lib/appsignal/integrations/unicorn.rb
 - lib/appsignal/js_exception_transaction.rb
 - lib/appsignal/marker.rb
 - lib/appsignal/params_sanitizer.rb
@@ -193,6 +195,8 @@ files:
 - lib/vendor/active_support/per_thread_registry.rb
 - resources/cacert.pem
 - spec/lib/appsignal/auth_check_spec.rb
+- spec/lib/appsignal/capistrano2_spec.rb
+- spec/lib/appsignal/capistrano3_spec.rb
 - spec/lib/appsignal/cli_spec.rb
 - spec/lib/appsignal/config_spec.rb
 - spec/lib/appsignal/event_formatter/action_view/render_formatter_spec.rb
@@ -201,22 +205,21 @@ files:
 - spec/lib/appsignal/event_formatter/net_http/request_formatter_spec.rb
 - spec/lib/appsignal/event_formatter_spec.rb
 - spec/lib/appsignal/extension_spec.rb
-- spec/lib/appsignal/instrumentations/net_http_spec.rb
-- spec/lib/appsignal/instrumentations/redis_spec.rb
-- spec/lib/appsignal/instrumentations/sequel_spec.rb
-- spec/lib/appsignal/integrations/capistrano2_spec.rb
-- spec/lib/appsignal/integrations/capistrano3_spec.rb
-- spec/lib/appsignal/integrations/celluloid_spec.rb
-- spec/lib/appsignal/integrations/delayed_job_spec.rb
+- spec/lib/appsignal/hooks/celluloid_spec.rb
+- spec/lib/appsignal/hooks/delayed_job_spec.rb
+- spec/lib/appsignal/hooks/net_http_spec.rb
+- spec/lib/appsignal/hooks/passenger_spec.rb
+- 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
+- spec/lib/appsignal/hooks_spec.rb
 - spec/lib/appsignal/integrations/padrino_spec.rb
-- spec/lib/appsignal/integrations/passenger_spec.rb
-- spec/lib/appsignal/integrations/puma_spec.rb
-- spec/lib/appsignal/integrations/rails_spec.rb
-- spec/lib/appsignal/integrations/rake_spec.rb
-- spec/lib/appsignal/integrations/resque_spec.rb
-- spec/lib/appsignal/integrations/sidekiq_spec.rb
+- spec/lib/appsignal/integrations/railtie_spec.rb
 - spec/lib/appsignal/integrations/sinatra_spec.rb
-- spec/lib/appsignal/integrations/unicorn_spec.rb
 - spec/lib/appsignal/js_exception_transaction_spec.rb
 - spec/lib/appsignal/marker_spec.rb
 - spec/lib/appsignal/params_sanitizer_spec.rb
@@ -270,6 +273,8 @@ specification_version: 4
 summary: Logs performance and exception data from your app to appsignal.com
 test_files:
 - spec/lib/appsignal/auth_check_spec.rb
+- spec/lib/appsignal/capistrano2_spec.rb
+- spec/lib/appsignal/capistrano3_spec.rb
 - spec/lib/appsignal/cli_spec.rb
 - spec/lib/appsignal/config_spec.rb
 - spec/lib/appsignal/event_formatter/action_view/render_formatter_spec.rb
@@ -278,22 +283,21 @@ test_files:
 - spec/lib/appsignal/event_formatter/net_http/request_formatter_spec.rb
 - spec/lib/appsignal/event_formatter_spec.rb
 - spec/lib/appsignal/extension_spec.rb
-- spec/lib/appsignal/instrumentations/net_http_spec.rb
-- spec/lib/appsignal/instrumentations/redis_spec.rb
-- spec/lib/appsignal/instrumentations/sequel_spec.rb
-- spec/lib/appsignal/integrations/capistrano2_spec.rb
-- spec/lib/appsignal/integrations/capistrano3_spec.rb
-- spec/lib/appsignal/integrations/celluloid_spec.rb
-- spec/lib/appsignal/integrations/delayed_job_spec.rb
+- spec/lib/appsignal/hooks/celluloid_spec.rb
+- spec/lib/appsignal/hooks/delayed_job_spec.rb
+- spec/lib/appsignal/hooks/net_http_spec.rb
+- spec/lib/appsignal/hooks/passenger_spec.rb
+- 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
+- spec/lib/appsignal/hooks_spec.rb
 - spec/lib/appsignal/integrations/padrino_spec.rb
-- spec/lib/appsignal/integrations/passenger_spec.rb
-- spec/lib/appsignal/integrations/puma_spec.rb
-- spec/lib/appsignal/integrations/rails_spec.rb
-- spec/lib/appsignal/integrations/rake_spec.rb
-- spec/lib/appsignal/integrations/resque_spec.rb
-- spec/lib/appsignal/integrations/sidekiq_spec.rb
+- spec/lib/appsignal/integrations/railtie_spec.rb
 - spec/lib/appsignal/integrations/sinatra_spec.rb
-- spec/lib/appsignal/integrations/unicorn_spec.rb
 - spec/lib/appsignal/js_exception_transaction_spec.rb
 - spec/lib/appsignal/marker_spec.rb
 - spec/lib/appsignal/params_sanitizer_spec.rb