appsignal 1.3.6 → 1.4.0.alpha.1

data/spec/lib/appsignal/minutely_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe Appsignal::Minutely do
   before do
     Appsignal::Minutely.probes.clear

data/spec/lib/appsignal/rack/generic_instrumentation_spec.rb

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

data/spec/lib/appsignal/rack/js_exception_catcher_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe Appsignal::Rack::JSExceptionCatcher do
   let(:app)            { double(:call => true) }
   let(:options)        { double }

data/spec/lib/appsignal/rack/rails_instrumentation_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 class MockController
 end
 

data/spec/lib/appsignal/rack/sinatra_instrumentation_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 begin
   require 'sinatra'
   require 'appsignal/integrations/sinatra'
@@ -45,40 +47,6 @@ if defined?(::Sinatra)
     let(:options) { {} }
     let(:middleware) { Appsignal::Rack::SinatraBaseInstrumentation.new(app, options) }
 
-    describe "#initialize" do
-      context "with no settings method in the Sinatra app" do
-        let(:app) { double(:call => true) }
-
-        it "should not raise errors" do
-          expect( middleware.raise_errors_on ).to be(false)
-        end
-      end
-
-      context "with no raise_errors setting in the Sinatra app" do
-        let(:app) { double(:call => true, :settings => double) }
-
-        it "should not raise errors" do
-          expect( middleware.raise_errors_on ).to be(false)
-        end
-      end
-
-      context "with raise_errors turned off in the Sinatra app" do
-        let(:app) { double(:call => true, :settings => double(:raise_errors => false)) }
-
-        it "should raise errors" do
-          expect( middleware.raise_errors_on ).to be(false)
-        end
-      end
-
-      context "with raise_errors turned on in the Sinatra app" do
-        let(:app) { double(:call => true, :settings => double(:raise_errors => true)) }
-
-        it "should raise errors" do
-          expect( middleware.raise_errors_on ).to be(true)
-        end
-      end
-    end
-
     describe "#call" do
       before do
         middleware.stub(:raw_payload => {})
@@ -165,11 +133,11 @@ if defined?(::Sinatra)
           Appsignal::Transaction.any_instance.should_receive(:set_action).with('GET /')
         end
 
-        context "without 'sinatra.route' env" do
-          let(:env) { {:path => '/', :method => 'GET'} }
+        context "with option to set path a mounted_at prefix" do
+          let(:options) {{ :mounted_at  => "/api/v2" }}
 
-          it "returns nil" do
-            Appsignal::Transaction.any_instance.should_receive(:set_action).with(nil)
+          it "should call set_action with a prefix path" do
+            Appsignal::Transaction.any_instance.should_receive(:set_action).with("GET /api/v2/")
           end
         end
 
@@ -179,14 +147,6 @@ if defined?(::Sinatra)
           it "should call set_action with an application prefix path" do
             Appsignal::Transaction.any_instance.should_receive(:set_action).with("GET /api/")
           end
-
-          context "without 'sinatra.route' env" do
-            let(:env) { {:path => '/', :method => 'GET'} }
-
-            it "returns nil" do
-              Appsignal::Transaction.any_instance.should_receive(:set_action).with(nil)
-            end
-          end
         end
       end
 

data/spec/lib/appsignal/rack/streaming_listener_spec.rb

@@ -1,3 +1,4 @@
+require 'spec_helper'
 require 'appsignal/rack/streaming_listener'
 
 describe Appsignal::Rack::StreamingListener do
@@ -88,7 +89,7 @@ describe Appsignal::Rack::StreamingListener do
 
     context "with an exception in the instrumentation call" do
       it "should add the exception to the transaction" do
-        allow( app ).to receive(:call).and_raise(VerySpecificError.new)
+        allow( app ).to receive(:call).and_raise(VerySpecificError.new('broken'))
 
         expect( transaction ).to receive(:set_error)
 
@@ -123,7 +124,7 @@ describe Appsignal::StreamWrapper do
     context "when each raises an error" do
       it "should add the exception to the transaction" do
         allow( stream ).to receive(:each)
-          .and_raise(VerySpecificError.new)
+          .and_raise(VerySpecificError.new('broken'))
 
         expect( transaction ).to receive(:set_error)
 
@@ -143,7 +144,7 @@ describe Appsignal::StreamWrapper do
     context "when each raises an error" do
       it "should add the exception to the transaction and close it" do
         allow( stream ).to receive(:close)
-          .and_raise(VerySpecificError.new)
+          .and_raise(VerySpecificError.new('broken'))
 
         expect( transaction ).to receive(:set_error)
         expect( Appsignal::Transaction ).to receive(:complete_current!)

data/spec/lib/appsignal/subscriber_spec.rb

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

data/spec/lib/appsignal/transaction_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 class Smash < Hash
   def []=(key, val)
     raise 'the roof'
@@ -120,11 +122,10 @@ describe Appsignal::Transaction do
 
       context "if a transaction is discarded" do
         it "should not complete the transaction" do
-          expect(Appsignal::Transaction.current.ext).to_not receive(:complete)
+          Appsignal::Transaction.current.should_not_receive(:complete)
 
           Appsignal::Transaction.current.discard!
           expect(Appsignal::Transaction.current.discarded?).to be_true
-
           Appsignal::Transaction.complete_current!
 
           Thread.current[:appsignal_transaction].should be_nil

data/spec/lib/appsignal/transmitter_spec.rb

@@ -1,14 +1,13 @@
+require 'spec_helper'
+
 describe Appsignal::Transmitter do
   let(:config) { project_fixture_config }
   let(:action) { 'action' }
-  let(:log) { StringIO.new }
   let(:instance) { Appsignal::Transmitter.new(action, config) }
-  before do
-    config.config_hash[:hostname] = 'app1.local'
-    config.logger = Logger.new(log)
-  end
 
   describe "#uri" do
+    before { ENV['APPSIGNAL_HOSTNAME'] = 'app1.local' }
+
     subject { instance.uri.to_s }
 
     it { should include 'https://push.appsignal.com/1/action?' }
@@ -23,11 +22,9 @@ describe Appsignal::Transmitter do
     before do
       stub_request(
         :post,
-        "https://push.appsignal.com/1/action?api_key=abc"\
-          "&environment=production&gem_version=#{Appsignal::VERSION}"\
-          "&hostname=#{config.config_hash[:hostname]}&name=TestApp"
+        "https://push.appsignal.com/1/action?api_key=abc&environment=production&gem_version=#{Appsignal::VERSION}&hostname=#{Socket.gethostname}&name=TestApp"
       ).with(
-        :body => Appsignal::Utils::Gzip.compress("{\"the\":\"payload\"}"),
+        :body => Zlib::Deflate.deflate("{\"the\":\"payload\"}", Zlib::BEST_SPEED),
         :headers => {
           'Content-Encoding' => 'gzip',
           'Content-Type' => 'application/json; charset=UTF-8',
@@ -36,57 +33,20 @@ describe Appsignal::Transmitter do
         :status => 200
       )
     end
+
     subject { instance.transmit(:the => :payload) }
 
     it { should eq '200' }
-
-    context "with ca_file_path config option set" do
-      context "when not existing file" do
-        before do
-          config.config_hash[:ca_file_path] = File.join(resources_dir, "cacert.pem")
-        end
-
-        it "ignores the config and logs a warning" do
-          expect(subject).to eq '200'
-          expect(log.string).to_not include "Ignoring non-existing or unreadable " \
-            "`ca_file_path`: #{config[:ca_file_path]}"
-        end
-      end
-
-      context "when not existing file" do
-        before do
-          config.config_hash[:ca_file_path] = File.join(tmp_dir, "ca_file_that_does_not_exist")
-        end
-
-        it "ignores the config and logs a warning" do
-          expect(subject).to eq '200'
-          expect(log.string).to include "Ignoring non-existing or unreadable " \
-            "`ca_file_path`: #{config[:ca_file_path]}"
-        end
-      end
-
-      context "when not readable file" do
-        let(:file) { File.join(tmp_dir, "ca_file") }
-        before do
-          config.config_hash[:ca_file_path] = file
-          File.open(file, "w") { |f| f.chmod 0000 }
-        end
-
-        it "ignores the config and logs a warning" do
-          expect(subject).to eq '200'
-          expect(log.string).to include "Ignoring non-existing or unreadable " \
-            "`ca_file_path`: #{config[:ca_file_path]}"
-        end
-
-        after { File.delete file }
-      end
-    end
   end
 
   describe "#http_post" do
+    before do
+      Socket.stub(:gethostname => 'app1.local')
+    end
+
     subject { instance.send(:http_post, 'the' => 'payload') }
 
-    its(:body) { should eq Appsignal::Utils::Gzip.compress("{\"the\":\"payload\"}") }
+    its(:body) { should eq Zlib::Deflate.deflate("{\"the\":\"payload\"}", Zlib::BEST_SPEED) }
     its(:path) { should eq instance.uri.request_uri }
 
     it "should have the correct headers" do
@@ -95,6 +55,13 @@ describe Appsignal::Transmitter do
     end
   end
 
+  describe ".CA_FILE_PATH" do
+    subject { Appsignal::Transmitter::CA_FILE_PATH }
+
+    it { should include('resources/cacert.pem') }
+    it("should exist") { File.exist?(subject).should be_true }
+  end
+
   describe "#http_client" do
     subject { instance.send(:http_client) }
 
@@ -113,7 +80,7 @@ describe Appsignal::Transmitter do
       its(:proxy?) { should be_false }
       its(:use_ssl?) { should be_true }
       its(:verify_mode) { should eq OpenSSL::SSL::VERIFY_PEER }
-      its(:ca_file) { should eq config[:ca_file_path] }
+      its(:ca_file) { Appsignal::Transmitter::CA_FILE_PATH }
     end
 
     context "with a proxy" do

data/spec/lib/appsignal/update_active_support_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe 'Appsignal::UpdateActiveSupport', :if => (
   Gem.loaded_specs['rails'] &&
   Gem.loaded_specs['rails'].version < Gem::Version.create('4.0')

data/spec/lib/appsignal/utils/params_sanitizer_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe Appsignal::Utils::ParamsSanitizer do
   let(:file) { uploaded_file }
   let(:params) do

data/spec/lib/appsignal/utils/query_params_sanitizer_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe Appsignal::Utils::QueryParamsSanitizer do
   describe ".sanitize" do
     context "when only_top_level = true" do

data/spec/lib/appsignal/utils_spec.rb

@@ -1,5 +1,7 @@
 # encoding: UTF-8
 
+require 'spec_helper'
+
 describe Appsignal::Utils do
   describe ".json_generate" do
     subject { Appsignal::Utils.json_generate(body) }

data/spec/lib/appsignal_spec.rb

@@ -1,3 +1,4 @@
+require 'spec_helper'
 require './spec/support/mocks/mock_extension'
 
 describe Appsignal do
@@ -360,7 +361,7 @@ describe Appsignal do
       end
 
       context "with an erroring call" do
-        let(:error) { VerySpecificError.new }
+        let(:error) { VerySpecificError.new('the roof') }
 
         it "should add the error to the current transaction and complete" do
           Appsignal::Transaction.any_instance.should_receive(:set_error).with(error)
@@ -391,7 +392,7 @@ describe Appsignal do
       end
 
       context "with an erroring call" do
-        let(:error) { VerySpecificError.new }
+        let(:error) { VerySpecificError.new('the roof') }
 
         it "should call monitor_transaction and stop and then raise the error" do
           Appsignal.should_receive(:monitor_transaction).with(
@@ -550,124 +551,69 @@ describe Appsignal do
 
     describe ".start_logger" do
       let(:out_stream) { StringIO.new }
-      let(:log_path) { File.join(tmp_dir, 'log') }
+      let(:log_path) { File.join(project_fixture_path, 'log') }
       let(:log_file) { File.join(log_path, 'appsignal.log') }
 
       before do
-        FileUtils.mkdir_p(log_path)
-
-        Appsignal.logger.error('Log in memory')
+        FileUtils.rm_f(log_file)
+        @original_stdout = $stdout
+        $stdout = out_stream
+        Appsignal.logger.error('Log something')
         Appsignal.config = project_fixture_config(
           'production',
           :log_path => log_path
         )
       end
-      around do |example|
-        capture_stdout(out_stream) { example.run }
+      after do
+        $stdout = @original_stdout
       end
-      after { FileUtils.rm_rf(log_path) }
 
       context "when the log path is writable" do
-        context "when the log file is writable" do
-          let(:log_file_contents) { File.open(log_file).read }
-          before do
-            Appsignal.start_logger
-            Appsignal.logger.error('Log to file')
-          end
-
-          it "logs to file" do
-            expect(File.exist?(log_file)).to be_true
-            expect(log_file_contents).to include 'Log to file'
-          end
-
-          it "amends in memory log to log file" do
-            expect(log_file_contents).to include 'Log in memory'
-          end
-        end
-
-        context "when the log file is not writable" do
-          before do
-            FileUtils.touch log_file
-            FileUtils.chmod 0444, log_file
-
-            Appsignal.start_logger
-            Appsignal.logger.error('Log to not writable log file')
-          end
-
-          it "logs to stdout" do
-            expect(File.writable?(log_file)).to be_false
-            expect(out_stream.string).to include 'Log to not writable log file'
-          end
-
-          it "outputs a warning" do
-            output = out_stream.string
-            expect(output).to include "appsignal: Unable to start logger with "\
-              "log path '#{log_file}'."
-            expect(output).to include "appsignal: Permission denied"
-          end
-        end
-      end
-
-      context "when the log path is not writable" do
-        before do
-          FileUtils.chmod 0444, log_path
-
+        it "should log to file" do
           Appsignal.start_logger
-          Appsignal.logger.error('Log to not writable log path')
-        end
-
-        it "logs to stdout" do
-          expect(File.writable?(log_path)).to be_false
-          expect(out_stream.string).to include 'Log to not writable log path'
-        end
-
-        it "amends in memory log to stdout" do
-          expect(out_stream.string).to include 'Log in memory'
+          Appsignal.logger.level.should eq Logger::INFO
+          Appsignal.logger.error('Log to file')
+          File.exist?(log_file).should be_true
+          File.open(log_file).read.should include 'Log to file'
+          File.open(log_file).read.should include 'Log something'
         end
       end
 
-      context "when on Heroku" do
+      context "when we're on Heroku" do
         before do
           ENV['DYNO'] = 'dyno1'
-          Appsignal.start_logger
-          Appsignal.logger.error('Log to stdout')
         end
         after { ENV.delete('DYNO') }
 
         it "should log to stdout" do
+          Appsignal.start_logger
+          Appsignal.logger.level.should eq Logger::INFO
+          Appsignal.logger.error('Log to stdout')
           out_stream.string.should include 'appsignal: Log to stdout'
+          out_stream.string.should include 'Log something'
         end
+      end
 
-        it "amends in memory log to stdout" do
-          expect(out_stream.string).to include 'Log in memory'
+      context "when there is no in memory log" do
+        it "should not crash" do
+          Appsignal.in_memory_log = nil
+          Appsignal.start_logger
         end
       end
 
-      describe "#logger#level" do
-        subject { Appsignal.logger.level }
-
-        context "when there is no config" do
-          before do
-            Appsignal.config = nil
-            Appsignal.start_logger
-          end
-
-          it "sets the log level to info" do
-            expect(subject).to eq Logger::INFO
-          end
+      context "when there is no config and debug is on" do
+        it "should set the log level to info" do
+          Appsignal.config = nil
+          Appsignal.start_logger
+          Appsignal.logger.level.should eq Logger::INFO
         end
+      end
 
-        context "when there is a config" do
-          context "when log level is configured to debug" do
-            before do
-              Appsignal.config.config_hash[:debug] = true
-              Appsignal.start_logger
-            end
-
-            it "sets the log level to debug" do
-              expect(subject).to eq Logger::DEBUG
-            end
-          end
+      context "when there is a config and debug is on" do
+        it "should set the log level to debug" do
+          Appsignal.config.config_hash[:debug] = true
+          Appsignal.start_logger
+          Appsignal.logger.level.should eq Logger::DEBUG
         end
       end
     end