appsignal 0.11.18 → 0.12.beta.0

data/spec/lib/appsignal/transmitter_spec.rb

@@ -4,7 +4,6 @@ describe Appsignal::Transmitter do
   let(:config) { project_fixture_config }
   let(:action) { 'action' }
   let(:instance) { Appsignal::Transmitter.new(action, config) }
-  let!(:payload)  { Appsignal::ZippedPayload.new({'the' => 'payload'}) }
 
   describe "#uri" do
     before { Socket.stub(:gethostname => 'app1.local') }
@@ -35,27 +34,9 @@ describe Appsignal::Transmitter do
       )
     end
 
-    it "should post the ZippedPayload" do
-      instance.transmit(payload).should == '200'
-    end
-
-    it "should not instantiate a new ZippedPayload" do
-      expect( Appsignal::ZippedPayload ).to_not receive(:new)
-      instance.transmit(payload)
-    end
+    subject { instance.transmit(:the => :payload) }
 
-    context "when not given a ZippedPayload, but a hash" do
-      it "should post the ZippedPayload" do
-        instance.transmit({'the' => 'payload'}).should == '200'
-      end
-
-      it "should instantiate a new ZippedPayload" do
-        expect( Appsignal::ZippedPayload ).to receive(:new).with({'the' => 'payload'})
-                                                           .and_return(payload)
-                                                           .at_least(:once)
-        instance.transmit({'the' => 'payload'})
-      end
-    end
+    it { should == '200' }
   end
 
   describe "#http_post" do
@@ -63,7 +44,7 @@ describe Appsignal::Transmitter do
       Socket.stub(:gethostname => 'app1.local')
     end
 
-    subject { instance.send(:http_post, payload) }
+    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 }
@@ -88,7 +69,6 @@ describe Appsignal::Transmitter do
       let(:config) { project_fixture_config('test') }
 
       it { should be_instance_of(Net::HTTP) }
-      its(:proxy?) { should be_false }
       its(:use_ssl?) { should be_false }
     end
 
@@ -96,18 +76,9 @@ describe Appsignal::Transmitter do
       let(:config) { project_fixture_config('production') }
 
       it { should be_instance_of(Net::HTTP) }
-      its(:proxy?) { should be_false }
       its(:use_ssl?) { should be_true }
       its(:verify_mode) { should == OpenSSL::SSL::VERIFY_PEER }
       its(:ca_file) { Appsignal::Transmitter::CA_FILE_PATH }
     end
-
-    context "with a proxy" do
-      let(:config) { project_fixture_config('production', :http_proxy => 'http://localhost:8080') }
-
-      its(:proxy?) { should be_true }
-      its(:proxy_address) { should == 'localhost' }
-      its(:proxy_port) { should == 8080 }
-    end
   end
 end

data/spec/lib/appsignal_spec.rb

@@ -43,12 +43,16 @@ describe Appsignal do
     context "when config is loaded" do
       before { Appsignal.config = project_fixture_config }
 
-      it "should start an agent" do
+      it "should initialize logging" do
         Appsignal.start
-        Appsignal.agent.should be_a Appsignal::Agent
         Appsignal.logger.level.should == Logger::INFO
       end
 
+      it "should start native" do
+        Appsignal::Extension.should_receive(:start)
+        Appsignal.start
+      end
+
       it "should load integrations" do
         Appsignal.should_receive(:load_integrations)
         Appsignal.start
@@ -59,6 +63,16 @@ describe Appsignal do
         Appsignal.start
       end
 
+      it "should initialize formatters" do
+        Appsignal::EventFormatter.should_receive(:initialize_formatters)
+        Appsignal.start
+      end
+
+      it "should create a subscriber" do
+        Appsignal.start
+        Appsignal.subscriber.should be_a(Appsignal::Subscriber)
+      end
+
       context "when not active for this environment" do
         before { Appsignal.config = project_fixture_config('staging') }
 
@@ -124,28 +138,25 @@ describe Appsignal do
   describe '.active?' do
     subject { Appsignal.active? }
 
-    context "without config and agent" do
+    context "without config" do
       before do
         Appsignal.config = nil
-        Appsignal.agent = nil
       end
 
       it { should be_false }
     end
 
-    context "with agent and inactive config" do
+    context "with inactive config" do
       before do
         Appsignal.config = project_fixture_config('nonsense')
-        Appsignal.agent = Appsignal::Agent.new
       end
 
       it { should be_false }
     end
 
-    context "with active agent and config" do
+    context "with active config" do
       before do
         Appsignal.config = project_fixture_config
-        Appsignal.agent = Appsignal::Agent.new
       end
 
       it { should be_true }
@@ -153,14 +164,6 @@ describe Appsignal do
   end
 
   context "not active" do
-    describe ".enqueue" do
-      it "should do nothing" do
-        lambda {
-          Appsignal.enqueue(Appsignal::Transaction.create(SecureRandom.uuid, ENV))
-        }.should_not raise_error
-      end
-    end
-
     describe ".monitor_transaction" do
       it "should do nothing but still yield the block" do
         Appsignal::Transaction.should_not_receive(:create)
@@ -195,10 +198,10 @@ describe Appsignal do
       end
     end
 
-    describe ".add_exception" do
+    describe ".set_exception" do
       it "should do nothing" do
         lambda {
-          Appsignal.add_exception(RuntimeError.new)
+          Appsignal.set_exception(RuntimeError.new)
         }.should_not raise_error
       end
     end
@@ -218,16 +221,6 @@ describe Appsignal do
       Appsignal.start
     end
 
-    describe ".enqueue" do
-      subject { Appsignal.enqueue(transaction) }
-
-      it "forwards the call to the agent" do
-        Appsignal.agent.should respond_to(:enqueue)
-        Appsignal.agent.should_receive(:enqueue).with(transaction)
-        subject
-      end
-    end
-
     describe ".monitor_transaction" do
       context "with a normall call" do
         it "should instrument and complete" do
@@ -236,7 +229,7 @@ describe Appsignal do
             'perform_job.something',
             :class => 'Something'
           ).and_yield
-          transaction.should_receive(:complete!)
+          Appsignal::Transaction.should_receive(:complete_current!)
           object = double
           object.should_receive(:some_method)
 
@@ -253,7 +246,7 @@ describe Appsignal 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.should_receive(:set_exception).with(error)
           Appsignal::Transaction.should_receive(:complete_current!)
 
           lambda {
@@ -291,12 +284,6 @@ describe Appsignal do
       end
     end
 
-    describe ".transactions" do
-      subject { Appsignal.transactions }
-
-      it { should be_a Hash }
-    end
-
     describe '.logger' do
       subject { Appsignal.logger }
 
@@ -376,43 +363,14 @@ describe Appsignal do
 
       it { should be_a Appsignal::Config }
       it 'should return configuration' do
-        subject[:endpoint].should == 'https://push.appsignal.com/1'
+        subject[:endpoint].should == 'https://push.appsignal.com'
       end
     end
 
-    describe ".post_processing_middleware" do
-      before { Appsignal.instance_variable_set(:@post_processing_chain, nil) }
-
-      it "returns the default middleware stack" do
-        Appsignal::Aggregator::PostProcessor.should_receive(:default_middleware)
-        Appsignal.post_processing_middleware
-      end
-
-      it "returns a chain when called without a block" do
-        instance = Appsignal.post_processing_middleware
-        instance.should be_an_instance_of Appsignal::Aggregator::Middleware::Chain
-      end
-
-      context "when passing a block" do
-        it "yields an appsignal middleware chain" do
-          Appsignal.post_processing_middleware do |o|
-            o.should be_an_instance_of Appsignal::Aggregator::Middleware::Chain
-          end
-        end
-      end
-    end
-
-    describe ".send_exception" do
-      let(:tags)      { nil }
-      let(:exception) { VerySpecificError.new }
-      before          { Appsignal::IPC.stub(:current => false) }
+    describe ".send_error" do
+      let(:tags) { nil }
 
       it "should send the exception to AppSignal" do
-        agent = double(:shutdown => true, :active? => true)
-        Appsignal.stub(:agent).and_return(agent)
-        agent.should_receive(:send_queue)
-        agent.should_receive(:enqueue).with(kind_of(Appsignal::Transaction))
-
         Appsignal::Transaction.should_receive(:create).and_call_original
       end
 
@@ -423,6 +381,7 @@ describe Appsignal do
           transaction = Appsignal::Transaction.create(SecureRandom.uuid, {})
           Appsignal::Transaction.stub(:create => transaction)
           transaction.should_receive(:set_tags).with(tags)
+          Appsignal::Transaction.should_receive(:complete_current!)
         end
       end
 
@@ -431,20 +390,12 @@ describe Appsignal do
         Appsignal::Transaction.should_not_receive(:create)
       end
 
-      context "when given class is not an exception" do
-        let(:exception) { double }
-
-        it "should log a message" do
-          expect( Appsignal.logger ).to receive(:error).with('Can\'t send exception, given value is not an exception')
-        end
-
-        it "should not send the exception" do
-          expect( Appsignal::Transaction ).to_not receive(:create)
-        end
-      end
-
       after do
-        Appsignal.send_exception(exception, tags) rescue Exception
+        begin
+          raise "I am an exception"
+        rescue Exception => e
+          Appsignal.send_exception(e, tags)
+        end
       end
     end
 
@@ -459,36 +410,36 @@ describe Appsignal do
       end
     end
 
-    describe ".add_exception" do
+    describe ".set_exception" do
       before { Appsignal::Transaction.stub(:current => transaction) }
       let(:exception) { RuntimeError.new('I am an exception') }
 
       it "should add the exception to the current transaction" do
-        transaction.should_receive(:add_exception).with(exception)
+        transaction.should_receive(:set_error).with(exception)
 
-        Appsignal.add_exception(exception)
+        Appsignal.set_exception(exception)
       end
 
       it "should do nothing if there is no current transaction" do
         Appsignal::Transaction.stub(:current => nil)
 
-        transaction.should_not_receive(:add_exception).with(exception)
+        transaction.should_not_receive(:set_exception).with(exception)
 
-        Appsignal.add_exception(exception)
+        Appsignal.set_exception(exception)
       end
 
       it "should not add the exception if it's in the ignored list" do
         Appsignal.stub(:is_ignored_exception? => true)
 
-        transaction.should_not_receive(:add_exception).with(exception)
+        transaction.should_not_receive(:set_exception).with(exception)
 
-        Appsignal.add_exception(exception)
+        Appsignal.set_exception(exception)
       end
 
       it "should do nothing if the exception is nil" do
-        transaction.should_not_receive(:add_exception)
+        transaction.should_not_receive(:set_exception)
 
-        Appsignal.add_exception(nil)
+        Appsignal.set_exception(nil)
       end
     end
 

data/spec/lib/generators/appsignal/appsignal_generator_spec.rb

@@ -50,7 +50,6 @@ if rails_present?
         end
 
         it "should mention successful auth check" do
-          @output.should include('success')
           @output.should include('AppSignal has confirmed authorization!')
         end
       end
@@ -82,22 +81,6 @@ if rails_present?
           @output.should include('Could not confirm authorization')
         end
       end
-
-      context "internal failure" do
-        before do
-          authcheck.stub(:perform).and_throw(:error)
-
-          prepare_destination
-          run_generator_in_tmp %w(my_app_key)
-        end
-
-        it "should mention internal failure" do
-          @output.should include(
-            'Something went wrong while trying to '\
-            'authenticate with AppSignal:'
-          )
-        end
-      end
     end
 
     context "without key" do

data/spec/spec_helper.rb

@@ -20,13 +20,6 @@ def rails_present?
   RAILS_PRESENT
 end
 
-def active_record_present?
-  require 'active_record'
-  true
-rescue LoadError
-  false
-end
-
 def running_jruby?
   defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
 end
@@ -52,20 +45,6 @@ rescue LoadError
   false
 end
 
-def resque_present?
-  require 'resque'
-  true
-rescue LoadError
-  false
-end
-
-def padrino_present?
-  require 'padrino'
-  true
-rescue LoadError
-  false
-end
-
 require 'appsignal'
 
 Dir[File.expand_path(File.join(File.dirname(__FILE__), 'support/helpers','*.rb'))].each {|f| require f}
@@ -78,9 +57,22 @@ def fixtures_dir
   @fixtures_dir ||= File.expand_path(File.join(File.dirname(__FILE__), 'support/fixtures'))
 end
 
+# Add way to clear subscribers between specs
+module ActiveSupport
+  module Notifications
+    class Fanout
+      def clear_subscribers
+        @subscribers.clear
+        @listeners_for.clear
+      end
+    end
+  end
+end
+
 RSpec.configure do |config|
   config.include ConfigHelpers
   config.include NotificationHelpers
+  config.include TimeHelpers
   config.include TransactionHelpers
 
   config.before do
@@ -91,9 +83,13 @@ RSpec.configure do |config|
   end
 
   config.after do
-    FileUtils.rm_f(File.join(project_fixture_path, 'log/appsignal.log'))
     Appsignal.logger = nil
   end
+
+  config.after :all do
+    ActiveSupport::Notifications.notifier.clear_subscribers
+    FileUtils.rm_f(File.join(project_fixture_path, 'log/appsignal.log'))
+  end
 end
 
 class VerySpecificError < RuntimeError

data/spec/support/helpers/notification_helpers.rb

@@ -7,7 +7,7 @@ module NotificationHelpers
       :tid => '1',
       :payload => create_payload
     }.merge(args)
-    Appsignal::Event.new(
+    ActiveSupport::Notifications::Event.new(
       args[:name], args[:start], args[:ending], args[:tid], args[:payload]
     )
   end

data/spec/support/helpers/time_helpers.rb

@@ -0,0 +1,11 @@
+module TimeHelpers
+  def fixed_time
+    @fixed_time ||= Time.utc(2014, 01, 15, 11, 0, 0).to_f
+  end
+
+  def advance_frozen_time(time, addition)
+    Time.at(time.to_f + addition).tap do |new_time|
+      Timecop.freeze(new_time)
+    end
+  end
+end