appsignal 1.4.0.alpha.2 → 1.4.0.beta.1

data/spec/lib/appsignal/event_formatter/action_view/render_formatter_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-if rails_present?
+if DependencyHelper.rails_present?
   require 'action_view'
 
   describe Appsignal::EventFormatter::ActionView::RenderFormatter do

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

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Appsignal::EventFormatter::ActiveRecord::InstantiationFormatter do
   let(:klass)     { Appsignal::EventFormatter::ActiveRecord::InstantiationFormatter }
   let(:formatter) { klass.new }

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

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Appsignal::EventFormatter::ActiveRecord::InstantiationFormatter do
   let(:klass)     { Appsignal::EventFormatter::ActiveRecord::SqlFormatter }
   let(:formatter) { klass.new }

data/spec/lib/appsignal/event_formatter/elastic_search/search_formatter_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Appsignal::EventFormatter::ElasticSearch::SearchFormatter do
   let(:klass)     { Appsignal::EventFormatter::ElasticSearch::SearchFormatter }
   let(:formatter) { klass.new }

data/spec/lib/appsignal/event_formatter/faraday/request_formatter_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Appsignal::EventFormatter::Faraday::RequestFormatter do
   let(:klass)     { Appsignal::EventFormatter::Faraday::RequestFormatter }
   let(:formatter) { klass.new }

data/spec/lib/appsignal/event_formatter/mongo_ruby_driver/query_formatter_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Appsignal::EventFormatter::MongoRubyDriver::QueryFormatter do
   let(:formatter) { Appsignal::EventFormatter::MongoRubyDriver::QueryFormatter }
 

data/spec/lib/appsignal/event_formatter/moped/query_formatter_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Appsignal::EventFormatter::Moped::QueryFormatter do
   let(:klass) { Appsignal::EventFormatter::Moped::QueryFormatter }
   let(:formatter) { klass.new }

data/spec/lib/appsignal/event_formatter_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 class MockFormatter < Appsignal::EventFormatter
   register 'mock'
 

data/spec/lib/appsignal/extension_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 require 'fileutils'
 
 describe "extension loading and operation" do
@@ -38,26 +37,26 @@ describe "extension loading and operation" do
       end
 
       context "with a transaction" do
-        subject { Appsignal::Extension.start_transaction('request_id', 'http_request') }
+        subject { Appsignal::Extension.start_transaction('request_id', 'http_request', 0) }
 
         it "should have a start_event method" do
-          subject.start_event
+          subject.start_event(0)
         end
 
         it "should have a finish_event method" do
-          subject.finish_event('name', 'title', 'body', 0)
+          subject.finish_event('name', 'title', 'body', 0, 0)
         end
 
         it "should have a record_event method" do
-          subject.record_event('name', 'title', 'body', 0, 1000)
+          subject.record_event('name', 'title', 'body', 1000, 0, 1000)
         end
 
         it "should have a set_error method" do
-          subject.set_error('name', 'message', '[backtrace]')
+          subject.set_error('name', 'message', Appsignal::Extension.data_map_new)
         end
 
         it "should have a set_sample_data method" do
-          subject.set_sample_data('params', '{}')
+          subject.set_sample_data('params', Appsignal::Extension.data_map_new)
         end
 
         it "should have a set_action method" do
@@ -73,7 +72,7 @@ describe "extension loading and operation" do
         end
 
         it "should have a finish method" do
-          subject.finish
+          subject.finish(0)
         end
 
         it "should have a complete method" do

data/spec/lib/appsignal/garbage_collection_profiler_spec.rb

@@ -0,0 +1,71 @@
+require 'spec_helper'
+require_relative '../../support/mocks/fake_gc_profiler'
+
+describe Appsignal::GarbageCollectionProfiler do
+  let(:internal_profiler) { FakeGCProfiler.new }
+
+  before do
+    allow_any_instance_of(Appsignal::GarbageCollectionProfiler)
+      .to receive(:internal_profiler)
+      .and_return(internal_profiler)
+  end
+
+  it "should have a total time of 0" do
+    expect(Appsignal::GarbageCollectionProfiler.new.total_time).to eq(0)
+  end
+
+  describe "after a GC run" do
+    before do
+      internal_profiler.total_time = 0.12345
+      @profiler = Appsignal::GarbageCollectionProfiler.new
+    end
+
+    it "should take the total time from Ruby's GC::Profiler" do
+      expect(@profiler.total_time).to eq(123)
+    end
+
+    it "should clear Ruby's GC::Profiler" do
+      expect(internal_profiler).to receive(:clear)
+      @profiler.total_time
+    end
+  end
+
+  describe "when the total GC time becomes too high" do
+    it "should reset" do
+      profiler = Appsignal::GarbageCollectionProfiler.new
+        internal_profiler.total_time = 2_147_483_647
+        expect(profiler.total_time).to eq(0)
+    end
+  end
+
+  describe "after multiple GC runs" do
+    it "should add all times from Ruby's GC::Profiler together" do
+      profiler = Appsignal::GarbageCollectionProfiler.new
+
+      2.times do
+        internal_profiler.total_time = 0.12345
+        profiler.total_time
+      end
+
+      expect(profiler.total_time).to eq(246)
+    end
+  end
+
+  describe "in multiple threads, with a slow GC::Profiler" do
+    it "should not count garbage collection times twice" do
+      threads, results = [], []
+      internal_profiler.clear_delay = 0.001
+      internal_profiler.total_time = 0.12345
+
+      2.times do
+        threads << Thread.new do
+          profiler = Appsignal::GarbageCollectionProfiler.new
+          results << profiler.total_time
+        end
+      end
+
+      threads.each(&:join)
+      expect(results).to eq([123, 0])
+    end
+  end
+end

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

@@ -0,0 +1,42 @@
+describe Appsignal::Hooks::ActiveSupportNotificationsHook do
+  if active_support_present?
+    before :all do
+      start_agent
+    end
+    before do
+      Appsignal::Transaction.create('uuid', Appsignal::Transaction::HTTP_REQUEST, 'test')
+    end
+
+    let(:notifier) { ActiveSupport::Notifications::Fanout.new }
+    let(:instrumenter) { ActiveSupport::Notifications::Instrumenter.new(notifier) }
+
+    its(:dependencies_present?) { should be_true }
+
+    it "should instrument an AS notifications instrument call with a block" do
+      expect( Appsignal::Transaction.current ).to receive(:start_event)
+        .at_least(:once)
+      expect( Appsignal::Transaction.current ).to receive(:finish_event)
+        .at_least(:once)
+        .with("sql.active_record", nil, 'SQL', 1)
+
+      return_value = instrumenter.instrument('sql.active_record', :sql => 'SQL') do
+        'value'
+      end
+
+      expect(return_value).to eq 'value'
+    end
+
+    it "should not instrument events whose name starts with a bang" do
+      expect( Appsignal::Transaction.current ).not_to receive(:start_event)
+      expect( Appsignal::Transaction.current ).not_to receive(:finish_event)
+
+      return_value = instrumenter.instrument('!sql.active_record', :sql => 'SQL') do
+        'value'
+      end
+
+      expect(return_value).to eq 'value'
+    end
+  else
+    its(:dependencies_present?) { should be_false }
+  end
+end

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

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Appsignal::Hooks::CelluloidHook do
   context "with celluloid" do
     before :all do

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

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Appsignal::Hooks::DataMapperHook do
   context "with datamapper" do
     before :all do

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

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Appsignal::Hooks::DelayedJobHook do
   context "with delayed job" do
     before(:all) do

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

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Appsignal::Hooks::MongoRubyDriverHook do
   require 'appsignal/integrations/mongo_ruby_driver'
 

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

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Appsignal::Hooks::NetHttpHook do
   before :all do
     start_agent

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

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Appsignal::Hooks::PassengerHook do
   context "with passenger" do
     before(:all) do

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

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Appsignal::Hooks::PumaHook do
   context "with puma" do
     before(:all) do

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

@@ -1,4 +1,3 @@
-require 'spec_helper'
 require 'rake'
 
 describe Appsignal::Hooks::RakeHook do
@@ -16,7 +15,7 @@ describe Appsignal::Hooks::RakeHook do
 
   describe "#execute" do
     context "with transaction" do
-      let!(:transaction) { regular_transaction }
+      let!(:transaction) { background_job_transaction }
       let!(:agent)       { double('Agent', :send_queue => true) }
       before do
         transaction.stub(:set_action)

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

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Appsignal::Hooks::RedisHook do
   before :all do
     start_agent

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

@@ -1,28 +1,26 @@
-require 'spec_helper'
+describe Appsignal::Hooks::SequelHook do
+  if DependencyHelper.sequel_present?
+    let(:db) { Sequel.sqlite }
 
-describe Appsignal::Hooks::SequelHook, if: sequel_present? do
-  let(:db) { Sequel.sqlite }
-
-  before :all do
-    start_agent
-  end
+    before :all do
+      start_agent
+    end
 
-  its(:dependencies_present?) { should be_true }
+    its(:dependencies_present?) { should be_true }
 
-  context "with a transaction" do
-    it "should instrument queries" do
-      Appsignal::Transaction.create('uuid', Appsignal::Transaction::HTTP_REQUEST, 'test')
-      expect( Appsignal::Transaction.current ).to receive(:start_event)
-        .at_least(:once)
-      expect( Appsignal::Transaction.current ).to receive(:finish_event)
-        .at_least(:once)
-        .with("sql.sequel", nil, kind_of(String), 1)
+    context "with a transaction" do
+      it "should instrument queries" do
+        Appsignal::Transaction.create('uuid', Appsignal::Transaction::HTTP_REQUEST, 'test')
+        expect( Appsignal::Transaction.current ).to receive(:start_event)
+          .at_least(:once)
+        expect( Appsignal::Transaction.current ).to receive(:finish_event)
+          .at_least(:once)
+          .with("sql.sequel", nil, kind_of(String), 1)
 
-      db['SELECT 1'].all.to_a
+        db['SELECT 1'].all.to_a
+      end
     end
+  else
+    its(:dependencies_present?) { should be_false }
   end
 end
-
-describe Appsignal::Hooks::SequelHook, unless: sequel_present? do
-  its(:dependencies_present?) { should be_false }
-end

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

@@ -1,6 +1,3 @@
-require 'spec_helper'
-
-
 describe Appsignal::Hooks::ShoryukenMiddleware do
   let(:current_transaction) { background_job_transaction }
 
@@ -51,7 +48,7 @@ describe Appsignal::Hooks::ShoryukenMiddleware do
   end
 
   context "with an erroring call" do
-    let(:error) { VerySpecificError.new('on fire') }
+    let(:error) { VerySpecificError.new }
 
     it "should add the exception to appsignal" do
       Appsignal::Transaction.any_instance.should_receive(:set_error).with(error)

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

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Appsignal::Hooks::SidekiqPlugin do
   let(:worker) { double }
   let(:queue) { double }
@@ -79,7 +77,8 @@ describe Appsignal::Hooks::SidekiqPlugin do
   end
 
   context "with an erroring call" do
-    let(:error) { VerySpecificError.new('the roof') }
+    let(:error) { VerySpecificError.new }
+
     it "should add the exception to appsignal" do
       Appsignal::Transaction.any_instance.should_receive(:set_error).with(error)
     end

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

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Appsignal::Hooks::UnicornHook do
   context "with unicorn" do
     before :all do

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

@@ -1,17 +1,11 @@
-require 'spec_helper'
-
-if webmachine_present?
-
-  describe Appsignal::Hooks::WebmachineHook do
+describe Appsignal::Hooks::WebmachineHook do
+  if DependencyHelper.webmachine_present?
     context "with webmachine" do
-      before(:all) do
-        Appsignal::Hooks::WebmachineHook.new.install
-      end
+      let(:fsm) { Webmachine::Decision::FSM.new(double(:trace? => false), double, double) }
+      before(:all) { start_agent }
 
       its(:dependencies_present?) { should be_true }
 
-      let(:fsm) { Webmachine::Decision::FSM.new(double(:trace? => false), double, double) }
-
       it "should include the run alias methods" do
         expect( fsm ).to respond_to(:run_with_appsignal)
         expect( fsm ).to respond_to(:run_without_appsignal)
@@ -28,5 +22,4 @@ if webmachine_present?
       end
     end
   end
-
 end

data/spec/lib/appsignal/hooks_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 class MockPresentHook < Appsignal::Hooks::Hook
   def dependencies_present?
     true

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

@@ -1,4 +1,3 @@
-require 'spec_helper'
 require 'appsignal/integrations/data_mapper'
 
 describe Appsignal::Hooks::DataMapperLogListener do

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

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-if grape_present?
+if DependencyHelper.grape_present?
   require 'appsignal/integrations/grape'
 
   describe Appsignal::Grape::Middleware do

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

@@ -1,4 +1,3 @@
-require 'spec_helper'
 require 'appsignal/integrations/mongo_ruby_driver'
 describe Appsignal::Hooks::MongoMonitorSubscriber do
   let(:subscriber) { Appsignal::Hooks::MongoMonitorSubscriber.new }
@@ -82,7 +81,7 @@ describe Appsignal::Hooks::MongoMonitorSubscriber do
         transaction.should receive(:finish_event).with(
           'query.mongodb',
           'find | test | SUCCEEDED',
-          "{\"foo\":\"?\"}",
+          Appsignal::Utils.data_generate({'foo' => '?'}),
           0
         )
 

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

@@ -1,4 +1,3 @@
-require 'spec_helper'
 require 'appsignal/integrations/object'
 
 describe Object do
@@ -15,7 +14,7 @@ describe Object do
       let(:instance) { klass.new }
 
       context "when active" do
-        let(:transaction) { regular_transaction }
+        let(:transaction) { http_request_transaction }
         before { Appsignal.config = project_fixture_config }
         after { Appsignal.config = nil }
 
@@ -93,6 +92,21 @@ describe Object do
             expect(instance.foo).to eq(1)
           end
         end
+
+        context "with a method given a block" do
+          let(:klass) do
+            Class.new do
+              def foo
+                yield
+              end
+              appsignal_instrument_method :foo
+            end
+          end
+
+          it "should yield the block" do
+            expect(instance.foo { 42 }).to eq(42)
+          end
+        end
       end
 
       context "when not active" do
@@ -117,7 +131,7 @@ describe Object do
       end
 
       context "when active" do
-        let(:transaction) { regular_transaction }
+        let(:transaction) { http_request_transaction }
         before { Appsignal.config = project_fixture_config }
         after { Appsignal.config = nil }
 
@@ -195,6 +209,21 @@ describe Object do
             expect(klass.bar).to eq(2)
           end
         end
+
+        context "with a method given a block" do
+          let(:klass) do
+            Class.new do
+              def self.bar
+                yield
+              end
+              appsignal_instrument_class_method :bar
+            end
+          end
+
+          it "should yield the block" do
+            expect(klass.bar { 42 }).to eq(42)
+          end
+        end
       end
 
       context "when not active" do