appsignal 0.9.6 → 0.10.0.beta.0

data/spec/lib/appsignal/agent_spec.rb

@@ -10,6 +10,12 @@ describe Appsignal::Agent do
 
   let(:transaction) { regular_transaction }
 
+  context "supporting objects" do
+    its(:mutex) { should be_a(Mutex) }
+    its(:aggregator) { should be_a(Appsignal::Aggregator) }
+    its(:transmitter) { should be_a(Appsignal::Transmitter) }
+  end
+
   context "pid" do
     its(:master_pid) { should == Process.pid }
     its(:pid) { should == Process.pid }
@@ -55,7 +61,7 @@ describe Appsignal::Agent do
         subject.should_receive(:send_queue).at_least(:twice)
 
         subject.start_thread
-        sleep 2
+        sleep 1
       end
     end
 
@@ -218,11 +224,12 @@ describe Appsignal::Agent do
   end
 
   describe "#enqueue" do
+    let(:transaction) { double(:action => 'test#test', :request_id => 'id') }
     subject { Appsignal.agent }
 
     it "forwards to the aggregator" do
       subject.aggregator.should respond_to(:add)
-      subject.aggregator.should_receive(:add).with(:foo)
+      subject.aggregator.should_receive(:add).with(transaction)
       subject.should_not_receive(:forked!)
     end
 
@@ -230,12 +237,20 @@ describe Appsignal::Agent do
       before { Process.stub(:pid => 9000000002) }
 
       it "should call forked!" do
-        subject.aggregator.should_receive(:add).with(:foo)
+        subject.aggregator.should_receive(:add).with(transaction)
         subject.should_receive(:forked!)
       end
     end
 
-    after { subject.enqueue(:foo) }
+    context "with ignored action" do
+      before { Appsignal.stub(:is_ignored_action? => true) }
+
+      it "should not add item to queue" do
+        subject.aggregator.should_not_receive(:add)
+      end
+    end
+
+    after { subject.enqueue(transaction) }
   end
 
   describe "#send_queue" do

data/spec/lib/appsignal/config_spec.rb

@@ -17,6 +17,7 @@ describe Appsignal::Config do
     it "should merge with the default config and fill the config hash" do
       subject.config_hash.should == {
         :ignore_exceptions => [],
+        :ignore_actions => [],
         :instrument_net_http => true,
         :send_params => true,
         :endpoint => 'https://push.appsignal.com/1',
@@ -123,6 +124,7 @@ describe Appsignal::Config do
         subject.config_hash.should == {
           :push_api_key => 'push_api_key',
           :ignore_exceptions => [],
+          :ignore_actions => [],
           :send_params => true,
           :instrument_net_http => true,
           :endpoint => 'https://push.appsignal.com/1',

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

@@ -41,8 +41,8 @@ describe "Delayed Job integration" do
       let(:error) { StandardError.new }
 
       context "with a normal call" do
-        it "should create an instrumentation with the correct params" do
-          ActiveSupport::Notifications.should_receive(:instrument).with(
+        it "should wrap in a transaction with the correct params" do
+          Appsignal.should_receive(:monitor_transaction).with(
             'perform_job.delayed_job',
             :class => 'TestClass',
             :method => 'perform',
@@ -51,7 +51,6 @@ describe "Delayed Job integration" do
             :queue => 'default',
             :queue_start => time - 60_000
           )
-          Appsignal::Transaction.any_instance.should_receive(:complete!)
 
           Timecop.freeze(time) do
             plugin.invoke_with_instrumentation(job, invoked_block)

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

@@ -38,8 +38,8 @@ describe "Resque integration" do
           Appsignal::Transaction.should_receive(:create).and_return(transaction)
         end
 
-        it "should instrument with correct params" do
-          ActiveSupport::Notifications.should_receive(:instrument).with(
+        it "should wrap in a transaction with the correct params" do
+          Appsignal.should_receive(:monitor_transaction).with(
             'perform_job.resque',
             :class => 'Resque::Job',
             :method => 'perform'

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

@@ -1,8 +1,5 @@
 require 'spec_helper'
 
-class VerySpecificError < RuntimeError
-end
-
 describe "Sidekiq integration" do
   let(:file) { File.expand_path('lib/appsignal/integrations/sidekiq.rb') }
   before :all do
@@ -32,8 +29,8 @@ describe "Sidekiq integration" do
   end
 
   context "with a performance call" do
-    it "should create an instrumentation with the correct params" do
-      ActiveSupport::Notifications.should_receive(:instrument).with(
+    it "should wrap in a transaction with the correct params" do
+      Appsignal.should_receive(:monitor_transaction).with(
         'perform_job.sidekiq',
         :class => 'TestClass',
         :method => 'perform',
@@ -54,7 +51,7 @@ describe "Sidekiq integration" do
 
   context "with an erroring call" do
     let(:error) { VerySpecificError.new('the roof') }
-    it "should add exception to appsignal" do
+    it "should add the exception to appsignal" do
       current_transaction.should_receive(:add_exception).with(error)
     end
 

data/spec/lib/appsignal/transaction/formatter_spec.rb

@@ -186,4 +186,22 @@ describe Appsignal::Transaction::Formatter do
       end
     end
   end
+
+  describe "#clean_backtrace" do
+    let(:transaction) { regular_transaction }
+
+    context "when backtrace is nil" do
+      let(:error) { double(:backtrace => nil) }
+
+      it "should not raise an error when backtrace is `nil`" do
+        expect {
+          formatter.send(:clean_backtrace, error)
+        }.to_not raise_error
+      end
+
+      it "should always return an array" do
+        expect( formatter.send(:clean_backtrace, error) ).to be_a(Array)
+      end
+    end
+  end
 end

data/spec/lib/appsignal/transaction_spec.rb

@@ -234,15 +234,6 @@ describe Appsignal::Transaction do
         subject.process_action_event.payload.should be_empty
         subject.events.should be_empty
         subject.tags.should be_empty
-        subject.truncated?.should be_true
-      end
-
-      it "should not truncate twice" do
-        subject.process_action_event.payload.should_receive(:clear).once
-        subject.events.should_receive(:clear).once
-
-        subject.truncate!
-        subject.truncate!
       end
     end
 
@@ -291,14 +282,6 @@ describe Appsignal::Transaction do
           subject
           event_payload.should == before
         end
-
-        it "should not covert to primitives twice" do
-          transaction.convert_values_to_primitives!
-          transaction.have_values_been_converted_to_primitives?.should be_true
-
-          Appsignal::Transaction::ParamsSanitizer.should_not_receive(:sanitize!)
-          transaction.convert_values_to_primitives!
-        end
       end
     end
 
@@ -372,20 +355,12 @@ describe Appsignal::Transaction do
 
       context 'when using pipes' do
         let(:pipe) { double }
-        before do
-          Appsignal::Pipe.stub(:current => pipe)
-          pipe.stub(:write => true)
-          transaction.stub(:convert_values_to_primitives! => true)
-        end
+        before { Appsignal::Pipe.stub(:current => pipe) }
 
         it "should send itself trough the pipe" do
           pipe.should_receive(:write).with(transaction)
         end
 
-        it "should convert itself to primitives" do
-          transaction.should_receive(:convert_values_to_primitives!)
-        end
-
         after { transaction.complete! }
       end
     end

data/spec/lib/appsignal/transmitter_spec.rb

@@ -40,18 +40,25 @@ describe Appsignal::Transmitter do
   end
 
   describe "#http_post" do
-    before do
+    it "calls Net::HTTP.post_form with the correct params" do
+      post = double(:post)
+      post.should_receive(:[]=).with(
+        'Content-Type',
+        'application/json; charset=UTF-8'
+      )
+      post.should_receive(:[]=).with(
+        'Content-Encoding',
+        'gzip'
+      )
+      post.should_receive(:body=).with(
+        Zlib::Deflate.deflate("{\"the\":\"payload\"}", Zlib::BEST_SPEED)
+      )
       Socket.stub(:gethostname => 'app1.local')
-    end
-
-    subject { instance.send(:http_post, 'the' => 'payload') }
-
-    its(:body) { should == Zlib::Deflate.deflate("{\"the\":\"payload\"}", Zlib::BEST_SPEED) }
-    its(:path) { should == instance.uri.request_uri }
 
-    it "should have the correct headers" do
-      subject['Content-Type'].should == 'application/json; charset=UTF-8'
-      subject['Content-Encoding'].should == 'gzip'
+      Net::HTTP::Post.should_receive(:new).with(
+        instance.uri.request_uri
+      ).and_return(post)
+      instance.send(:http_post, :the => :payload)
     end
   end
 

data/spec/lib/appsignal_spec.rb

@@ -144,7 +144,7 @@ describe Appsignal do
   end
 
   context "not active" do
-    describe "#enqueue" do
+    describe ".enqueue" do
       it "should do nothing" do
         lambda {
           Appsignal.enqueue(Appsignal::Transaction.create(SecureRandom.uuid, ENV))
@@ -152,7 +152,22 @@ describe Appsignal do
       end
     end
 
-    describe "#listen_for_exception" do
+    describe ".monitor_transaction" do
+      it "should do nothing but still yield the block" do
+        Appsignal::Transaction.should_not_receive(:create)
+        ActiveSupport::Notifications.should_not_receive(:instrument)
+        object = double
+        object.should_receive(:some_method)
+
+        lambda {
+          Appsignal.monitor_transaction('perform_job.nothing') do
+            object.some_method
+          end
+        }.should_not raise_error
+      end
+    end
+
+    describe ".listen_for_exception" do
       it "should do nothing" do
         error = RuntimeError.new('specific error')
         lambda {
@@ -163,7 +178,7 @@ describe Appsignal do
       end
     end
 
-    describe "#send_exception" do
+    describe ".send_exception" do
       it "should do nothing" do
         lambda {
           Appsignal.send_exception(RuntimeError.new)
@@ -171,7 +186,7 @@ describe Appsignal do
       end
     end
 
-    describe "#add_exception" do
+    describe ".add_exception" do
       it "should do nothing" do
         lambda {
           Appsignal.add_exception(RuntimeError.new)
@@ -179,7 +194,7 @@ describe Appsignal do
       end
     end
 
-    describe "#tag_request" do
+    describe ".tag_request" do
       it "should do nothing" do
         lambda {
           Appsignal.tag_request(:tag => 'tag')
@@ -188,7 +203,6 @@ describe Appsignal do
     end
   end
 
-
   context "with config and started" do
     before do
       Appsignal.config = project_fixture_config
@@ -205,6 +219,43 @@ describe Appsignal do
       end
     end
 
+    describe ".monitor_transaction" do
+      context "with a normall call" do
+        it "should instrument and complete" do
+          Appsignal::Transaction.stub(:current => transaction)
+          ActiveSupport::Notifications.should_receive(:instrument).with(
+            'perform_job.something',
+            :class => 'Something'
+          ).and_yield
+          transaction.should_receive(:complete!)
+          object = double
+          object.should_receive(:some_method)
+
+          Appsignal.monitor_transaction(
+            'perform_job.something',
+            :class => 'Something'
+          ) do
+            object.some_method
+          end
+        end
+      end
+
+      context "with an erroring call" do
+        let(:error) { VerySpecificError.new('the roof') }
+
+        it "should add the error to the current transaction and complete" do
+          Appsignal.should_receive(:add_exception).with(error)
+          Appsignal::Transaction.should_receive(:complete_current!)
+
+          lambda {
+            Appsignal.monitor_transaction('perform_job.something') do
+              raise error
+            end
+          }.should raise_error(error)
+        end
+      end
+    end
+
     describe ".tag_request" do
       before { Appsignal::Transaction.stub(:current => transaction) }
 
@@ -320,12 +371,6 @@ describe Appsignal do
       end
     end
 
-    describe ".json" do
-      subject { Appsignal.json }
-
-      it { should == ActiveSupport::JSON }
-    end
-
     describe ".post_processing_middleware" do
       before { Appsignal.instance_variable_set(:@post_processing_chain, nil) }
 
@@ -454,5 +499,51 @@ describe Appsignal do
         end
       end
     end
+
+    describe ".is_ignored_exception?" do
+      let(:exception) { StandardError.new }
+      before do
+        Appsignal.stub(
+          :config => {:ignore_exceptions => 'StandardError'}
+        )
+      end
+
+      subject { Appsignal.is_ignored_exception?(exception) }
+
+      it "should return true if it's in the ignored list" do
+        should be_true
+      end
+
+      context "when exception is not in the ingore list" do
+        let(:exception) { Object.new }
+
+        it "should return false" do
+          should be_false
+        end
+      end
+    end
+
+    describe ".is_ignored_action?" do
+      let(:action) { 'TestController#isup' }
+      before do
+        Appsignal.stub(
+          :config => {:ignore_actions => 'TestController#isup'}
+        )
+      end
+
+      subject { Appsignal.is_ignored_action?(action) }
+
+      it "should return true if it's in the ignored list" do
+        should be_true
+      end
+
+      context "when action is not in the ingore list" do
+        let(:action) { 'TestController#other_action' }
+
+        it "should return false" do
+          should be_false
+        end
+      end
+    end
   end
 end

data/spec/spec_helper.rb

@@ -3,7 +3,6 @@ require 'rspec'
 require 'pry'
 require 'timecop'
 require 'webmock/rspec'
-require 'active_support/notifications'
 
 puts "Runnings specs in #{RUBY_VERSION} on #{RUBY_PLATFORM}"
 
@@ -64,3 +63,6 @@ RSpec.configure do |config|
     Appsignal.logger = nil
   end
 end
+
+class VerySpecificError < RuntimeError
+end

data/spec/support/fixtures/generated_config.yml

@@ -9,6 +9,10 @@ default: &defaults
   # The cuttoff point in ms above which a request is considered slow, default is 200
   # slow_request_threshold: 200
 
+  # Actions that should not be monitored by AppSignal
+  # ignore_actions:
+  #   - ApplicationController#isup
+
 # Configuration per environment, leave out an environment or set active
 # to false to not push metrics for that environment.
 development: