appsignal 0.8.15 → 0.9.0.alpha.1

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

@@ -0,0 +1,26 @@
+require 'spec_helper'
+require File.expand_path('lib/appsignal/instrumentations/net_http')
+
+describe "Net::HTTP instrumentation" do
+  let(:events) { [] }
+  before do
+    ActiveSupport::Notifications.subscribe(/^[^!]/) do |*args|
+      events << ActiveSupport::Notifications::Event.new(*args)
+    end
+  end
+
+  it "should instrument request" do
+    # We want to be absolutely sure the original method gets called correctly,
+    # so we actually do a HTTP request.
+    response = Net::HTTP.get_response(URI.parse('https://www.google.com'))
+
+    response.body.should include('google')
+
+    event = events.last
+    event.name.should == 'request.net_http'
+    event.payload[:host].should == 'www.google.com'
+    event.payload[:scheme].should == 'https'
+    event.payload[:path].should == '/'
+    event.payload[:method].should == 'GET'
+  end
+end

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

@@ -0,0 +1,178 @@
+require 'spec_helper'
+
+if capistrano2_present?
+  require 'capistrano'
+  require 'capistrano/configuration'
+  require 'appsignal/capistrano'
+
+  describe "Capistrano 2 integration" do
+    let(:config) { project_fixture_config }
+
+    before :all do
+      @capistrano_config = Capistrano::Configuration.new
+      Appsignal::Integrations::Capistrano.tasks(@capistrano_config)
+    end
+
+    it "should have a deploy task" do
+      @capistrano_config.find_task('appsignal:deploy').should_not be_nil
+    end
+
+    describe "appsignal:deploy task" do
+      before do
+        @capistrano_config.set(:rails_env, 'production')
+        @capistrano_config.set(:repository, 'master')
+        @capistrano_config.set(:deploy_to, '/home/username/app')
+        @capistrano_config.set(:current_release, '')
+        @capistrano_config.set(:current_revision, '503ce0923ed177a3ce000005')
+        @capistrano_config.dry_run = false
+        ENV['USER'] = 'batman'
+        ENV['PWD'] = project_fixture_path
+      end
+
+      context "config" do
+        before do
+          @capistrano_config.dry_run = true
+        end
+
+        it "should be instantiated with the right params" do
+          Appsignal::Config.should_receive(:new).with(
+            project_fixture_path,
+            'production',
+            {},
+            kind_of(Capistrano::Logger)
+          )
+        end
+
+        context "when appsignal_config is available" do
+          before do
+            @capistrano_config.set(:appsignal_config, :name => 'AppName')
+          end
+
+          it "should be instantiated with the right params" do
+            Appsignal::Config.should_receive(:new).with(
+              project_fixture_path,
+              'production',
+              {:name => 'AppName'},
+              kind_of(Capistrano::Logger)
+            )
+          end
+
+          context "when rack_env is used instead of rails_env" do
+            before do
+              @capistrano_config.unset(:rails_env)
+              @capistrano_config.set(:rack_env, 'rack_production')
+            end
+
+            it "should be instantiated with the right params" do
+              Appsignal::Config.should_receive(:new).with(
+                project_fixture_path,
+                'rack_production',
+                {:name => 'AppName'},
+                kind_of(Capistrano::Logger)
+              )
+            end
+          end
+        end
+
+        after { @capistrano_config.find_and_execute_task('appsignal:deploy') }
+      end
+
+      context "send marker" do
+        before :all do
+          @io = StringIO.new
+          @logger = Capistrano::Logger.new(:output => @io)
+          @logger.level = Capistrano::Logger::MAX_LEVEL
+          @capistrano_config.logger = @logger
+        end
+
+        let(:marker_data) do
+          {
+            :revision => '503ce0923ed177a3ce000005',
+            :user => 'batman'
+          }
+        end
+
+        context "when active for this environment" do
+          before do
+            @marker = Appsignal::Marker.new(
+              marker_data,
+              config,
+              @logger
+            )
+            Appsignal::Marker.stub(:new => @marker)
+          end
+
+          context "proper setup" do
+            before do
+              @transmitter = double
+              Appsignal::Transmitter.should_receive(:new).and_return(@transmitter)
+            end
+
+            it "should add the correct marker data" do
+              Appsignal::Marker.should_receive(:new).with(
+                marker_data,
+                kind_of(Appsignal::Config),
+                kind_of(Capistrano::Logger)
+              ).and_return(@marker)
+
+              @capistrano_config.find_and_execute_task('appsignal:deploy')
+            end
+
+            it "should transmit data" do
+              @transmitter.should_receive(:transmit).and_return('200')
+              @capistrano_config.find_and_execute_task('appsignal:deploy')
+              @io.string.should include('Notifying Appsignal of deploy with: revision: 503ce0923ed177a3ce000005, user: batman')
+              @io.string.should include('Appsignal has been notified of this deploy!')
+            end
+
+            context "with overridden revision" do
+              before do
+                @capistrano_config.set(:appsignal_revision, 'abc123')
+              end
+              it "should add the correct marker data" do
+                Appsignal::Marker.should_receive(:new).with(
+                  {
+                    :revision => 'abc123',
+                    :user => 'batman'
+                  },
+                  kind_of(Appsignal::Config),
+                  kind_of(Capistrano::Logger)
+                ).and_return(@marker)
+
+                @capistrano_config.find_and_execute_task('appsignal:deploy')
+              end
+            end
+          end
+
+          it "should not transmit data" do
+            @capistrano_config.find_and_execute_task('appsignal:deploy')
+            @io.string.should include('Notifying Appsignal of deploy with: revision: 503ce0923ed177a3ce000005, user: batman')
+            @io.string.should include('Something went wrong while trying to notify Appsignal:')
+          end
+
+          context "dry run" do
+            before { @capistrano_config.dry_run = true }
+
+            it "should not send deploy marker" do
+              @marker.should_not_receive(:transmit)
+              @capistrano_config.find_and_execute_task('appsignal:deploy')
+              @io.string.should include('Dry run: Deploy marker not actually sent.')
+            end
+          end
+        end
+
+        context "when not active for this environment" do
+          before do
+            @capistrano_config.set(:rails_env, 'nonsense')
+          end
+
+          it "should not send deploy marker" do
+            Appsignal::Marker.should_not_receive(:new)
+            @capistrano_config.find_and_execute_task('appsignal:deploy')
+            @io.string.should include("Not loading: config for 'nonsense' not found")
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,169 @@
+require 'spec_helper'
+
+if capistrano3_present?
+  require 'capistrano/all'
+  require 'capistrano/deploy'
+  require 'appsignal/capistrano'
+
+  include Capistrano::DSL
+
+  describe "Capistrano 3 integration" do
+    let(:config) { project_fixture_config }
+    let(:io) { StringIO.new }
+    let(:logger) { Logger.new(io) }
+
+    before do
+      @capistrano_config = Capistrano::Configuration.env
+      @capistrano_config.set(:log_level, :error)
+      @capistrano_config.set(:logger, logger)
+    end
+    before do
+      @original_stderr = $stderr
+      $stderr = io
+    end
+    after do
+      $stderr = @original_stderr
+      Rake::Task['appsignal:deploy'].reenable
+    end
+
+    it "should have a deploy task" do
+      Rake::Task.task_defined?('appsignal:deploy').should be_true
+    end
+
+    describe "appsignal:deploy task" do
+      before do
+        @capistrano_config.set(:rails_env, 'production')
+        @capistrano_config.set(:repository, 'master')
+        @capistrano_config.set(:deploy_to, '/home/username/app')
+        @capistrano_config.set(:current_release, '')
+        @capistrano_config.set(:current_revision, '503ce0923ed177a3ce000005')
+        ENV['USER'] = 'batman'
+        ENV['PWD'] = project_fixture_path
+      end
+
+      context "config" do
+        it "should be instantiated with the right params" do
+          Appsignal::Config.should_receive(:new).with(
+            project_fixture_path,
+            'production',
+            {},
+            kind_of(Logger)
+          )
+        end
+
+        context "when appsignal_config is available" do
+          before do
+            @capistrano_config.set(:appsignal_config, :name => 'AppName')
+          end
+
+          it "should be instantiated with the right params" do
+            Appsignal::Config.should_receive(:new).with(
+              project_fixture_path,
+              'production',
+              {:name => 'AppName'},
+              kind_of(Logger)
+            )
+          end
+
+          context "when rack_env is used instead of rails_env" do
+            before do
+              @capistrano_config.delete(:rails_env)
+              @capistrano_config.set(:rack_env, 'rack_production')
+            end
+
+            it "should be instantiated with the right params" do
+              Appsignal::Config.should_receive(:new).with(
+                project_fixture_path,
+                'rack_production',
+                {:name => 'AppName'},
+                kind_of(Logger)
+              )
+            end
+          end
+        end
+
+        after { invoke('appsignal:deploy') }
+      end
+
+      context "send marker" do
+        let(:marker_data) do
+          {
+            :revision => '503ce0923ed177a3ce000005',
+            :user => 'batman'
+          }
+        end
+
+        context "when active for this environment" do
+          before do
+            @marker = Appsignal::Marker.new(
+              marker_data,
+              config,
+              logger
+            )
+            Appsignal::Marker.stub(:new => @marker)
+          end
+
+          context "proper setup" do
+            before do
+              @transmitter = double
+              Appsignal::Transmitter.should_receive(:new).and_return(@transmitter)
+            end
+
+            it "should add the correct marker data" do
+              Appsignal::Marker.should_receive(:new).with(
+                marker_data,
+                kind_of(Appsignal::Config),
+                kind_of(Logger)
+              ).and_return(@marker)
+
+              invoke('appsignal:deploy')
+            end
+
+            it "should transmit data" do
+              @transmitter.should_receive(:transmit).and_return('200')
+              invoke('appsignal:deploy')
+              io.string.should include('Notifying Appsignal of deploy with: revision: 503ce0923ed177a3ce000005, user: batman')
+              io.string.should include('ppsignal has been notified of this deploy!')
+            end
+
+            context "with overridden revision" do
+              before do
+                @capistrano_config.set(:appsignal_revision, 'abc123')
+              end
+              it "should add the correct marker data" do
+                Appsignal::Marker.should_receive(:new).with(
+                  {
+                    :revision => 'abc123',
+                    :user => 'batman'
+                  },
+                  kind_of(Appsignal::Config),
+                  kind_of(Logger)
+                ).and_return(@marker)
+
+                invoke('appsignal:deploy')
+              end
+            end
+          end
+
+          it "should not transmit data" do
+            invoke('appsignal:deploy')
+            io.string.should include('Notifying Appsignal of deploy with: revision: 503ce0923ed177a3ce000005, user: batman')
+            io.string.should include('Something went wrong while trying to notify Appsignal:')
+          end
+        end
+
+        context "when not active for this environment" do
+          before do
+            @capistrano_config.set(:rails_env, 'nonsense')
+          end
+
+          it "should not send deploy marker" do
+            Appsignal::Marker.should_not_receive(:new)
+            invoke('appsignal:deploy')
+            io.string.should include("Not loading: config for 'nonsense' not found")
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "ResquePlugin" do
+describe "Resque integration" do
   let(:file) { File.expand_path('lib/appsignal/integrations/resque.rb') }
 
   context "with resque" do

data/spec/lib/appsignal/marker_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'capistrano'
 
 describe Appsignal::Marker do
   let(:config) { project_fixture_config }
@@ -44,7 +43,7 @@ describe Appsignal::Marker do
 
           marker.transmit
 
-          log.string.should include('Notifying Appsignal of deploy...')
+          log.string.should include('Notifying Appsignal of deploy with: revision: 503ce0923ed177a3ce000005, user: batman')
           log.string.should include('Appsignal has been notified of this deploy!')
         end
 
@@ -54,7 +53,7 @@ describe Appsignal::Marker do
 
           marker.transmit
 
-          log.string.should include('Notifying Appsignal of deploy...')
+          log.string.should include('Notifying Appsignal of deploy with: revision: 503ce0923ed177a3ce000005, user: batman')
           log.string.should include(
             'Something went wrong while trying to notify Appsignal: 500 at http://localhost:3000/1/markers'
           )
@@ -66,14 +65,18 @@ describe Appsignal::Marker do
 
       it_should_behave_like "logging info and errors"
 
-      context "with a Capistrano logger" do
-        let(:logger) {
-          Capistrano::Logger.new(:output => log).tap do |logger|
-            logger.level = Capistrano::Logger::MAX_LEVEL
-          end
-        }
+      if capistrano2_present?
+        require 'capistrano'
 
-        it_should_behave_like "logging info and errors"
+        context "with a Capistrano 2 logger" do
+          let(:logger) {
+            Capistrano::Logger.new(:output => log).tap do |logger|
+              logger.level = Capistrano::Logger::MAX_LEVEL
+            end
+          }
+
+          it_should_behave_like "logging info and errors"
+        end
       end
     end
   end

data/spec/lib/appsignal/transaction_spec.rb

@@ -6,14 +6,16 @@ describe Appsignal::Transaction do
   end
 
   describe '.create' do
-    before { Appsignal::Transaction.create('1', {}) }
+    subject { Appsignal::Transaction.create('1', {}) }
 
-    it 'should add the id to the thread' do
+    it 'should add the request id to the thread local' do
+      subject
       Thread.current[:appsignal_transaction_id].should == '1'
     end
 
-    it 'should add the transaction to the list' do
-      Appsignal.transactions['1'].should be_a Appsignal::Transaction
+    it "should create a transaction" do
+      subject.should be_a Appsignal::Transaction
+      subject.request_id.should == '1'
     end
   end
 
@@ -27,6 +29,28 @@ describe Appsignal::Transaction do
     end
   end
 
+  describe "complete_current!" do
+    before { Thread.current[:appsignal_transaction_id] = nil }
+
+    context "with a current transaction" do
+      before { Appsignal::Transaction.create('2', {}) }
+
+      it "should complete the current transaction and reset the thread appsignal_transaction_id" do
+        Appsignal::Transaction.current.should_receive(:complete!)
+
+        Appsignal::Transaction.complete_current!
+
+        Thread.current[:appsignal_transaction_id].should be_nil
+      end
+    end
+
+    context "without a current transaction" do
+      it "should not raise an error" do
+        Appsignal::Transaction.complete_current!
+      end
+    end
+  end
+
   context "with transaction instance" do
     let(:env) do
       {
@@ -36,7 +60,12 @@ describe Appsignal::Transaction do
         'HTTP_X_REQUEST_START' => '1000000'
       }
     end
-    let(:transaction) { Appsignal::Transaction.create('1', env) }
+    let(:transaction) { Appsignal::Transaction.create('3', env) }
+
+    it "should add the transaction to the list" do
+      transaction
+      Appsignal.transactions['3'].should == transaction
+    end
 
     describe '#request' do
       subject { transaction.request }
@@ -324,14 +353,6 @@ describe Appsignal::Transaction do
         after { transaction.complete! }
       end
 
-      context 'thread' do
-        before { transaction.complete! }
-
-        it 'should reset the thread transaction id' do
-          Thread.current[:appsignal_transaction_id].should be_nil
-        end
-      end
-
       context 'when using pipes' do
         let(:pipe) { double }
         before { Appsignal::Pipe.stub(:current => pipe) }