appsignal 1.3.6 → 1.4.0.alpha.1

data/lib/appsignal/integrations/sinatra.rb

@@ -6,7 +6,7 @@ Appsignal.logger.info("Loading Sinatra (#{Sinatra::VERSION}) integration")
 app_settings = ::Sinatra::Application.settings
 Appsignal.config = Appsignal::Config.new(
   app_settings.root || Dir.pwd,
-  ENV.fetch('APPSIGNAL_APP_ENV'.freeze, app_settings.environment)
+  app_settings.environment
 )
 
 Appsignal.start_logger

data/lib/appsignal/integrations/webmachine.rb

@@ -25,7 +25,7 @@ module Appsignal::Integrations
         handle_exceptions_without_appsignal do
           begin
             yield
-          rescue => e
+          rescue Exception => e
             Appsignal.set_error(e)
             raise e
           end

data/lib/appsignal/js_exception_transaction.rb

@@ -34,7 +34,6 @@ module Appsignal
     def set_sample_data
       {
         :params       => @data['params'],
-        :session_data => @data['session_data'],
         :environment  => @data['environment'],
         :tags         => @data['tags']
       }.each do |key, data|

data/lib/appsignal/marker.rb

@@ -10,15 +10,14 @@ module Appsignal
 
     def transmit
       transmitter = Transmitter.new(ACTION, config)
-      puts "Notifying Appsignal of deploy with: "\
-        "revision: #{marker_data[:revision]}, user: #{marker_data[:user]}"
+      puts "Notifying Appsignal of deploy with: revision: #{marker_data[:revision]}, user: #{marker_data[:user]}"
       result = transmitter.transmit(marker_data)
       if result == '200'
         puts 'Appsignal has been notified of this deploy!'
       else
         raise "#{result} at #{transmitter.uri}"
       end
-    rescue => e
+    rescue Exception => e
       puts "Something went wrong while trying to notify Appsignal: #{e}"
     end
   end

data/lib/appsignal/rack/sinatra_instrumentation.rb

@@ -29,7 +29,7 @@ module Appsignal
       def initialize(app, options = {})
         Appsignal.logger.debug 'Initializing Appsignal::Rack::SinatraInstrumentation'
         @app, @options = app, options
-        @raise_errors_on = raise_errors?(@app)
+        @raise_errors_on = @app.settings.raise_errors
       end
 
       def call(env)
@@ -73,23 +73,16 @@ module Appsignal
       end
 
       def action_name(env)
-        return unless env['sinatra.route']
-
-        if env['SCRIPT_NAME']
+        if @options.fetch(:mounted_at, nil)
+          method, route = env['sinatra.route'].split(" ")
+          "#{method} #{@options[:mounted_at]}#{route}"
+        elsif env['SCRIPT_NAME']
           method, route = env['sinatra.route'].split(" ")
           "#{method} #{env['SCRIPT_NAME']}#{route}"
         else
           env['sinatra.route']
         end
       end
-
-      private
-
-      def raise_errors?(app)
-        app.respond_to?(:settings) &&
-          app.settings.respond_to?(:raise_errors) &&
-          app.settings.raise_errors
-      end
     end
   end
 end

data/lib/appsignal/rack/streaming_listener.rb

@@ -54,15 +54,13 @@ module Appsignal
     def each
       @stream.each { |c| yield(c) }
     rescue Exception => e
-      @transaction.set_error(e)
-      raise e
+      @transaction.set_error(e); raise e
     end
 
     def close
       @stream.close if @stream.respond_to?(:close)
     rescue Exception => e
-      @transaction.set_error(e)
-      raise e
+      @transaction.set_error(e); raise e
     ensure
       Appsignal::Transaction.complete_current!
     end

data/lib/appsignal/transaction.rb

@@ -52,7 +52,7 @@ module Appsignal
 
       def complete_current!
         current.complete
-      rescue => e
+      rescue Exception => e
         Appsignal.logger.error("Failed to complete transaction ##{current.transaction_id}. #{e.message}")
       ensure
         Thread.current[:appsignal_transaction] = nil
@@ -269,9 +269,9 @@ module Appsignal
       params =
         begin
           request.send options[:params_method]
-        rescue => e
+        rescue Exception => ex
           # Getting params from the request has been know to fail.
-          Appsignal.logger.debug "Exception while getting params: #{e}"
+          Appsignal.logger.debug "Exception while getting params: #{ex}"
           nil
         end
       return unless params

data/lib/appsignal/transmitter.rb

@@ -8,6 +8,7 @@ module Appsignal
   class Transmitter
     CONTENT_TYPE = 'application/json; charset=UTF-8'.freeze
     CONTENT_ENCODING = 'gzip'.freeze
+    CA_FILE_PATH = File.expand_path(File.join(__FILE__, '../../../resources/cacert.pem'))
 
     HTTP_ERRORS = [
       EOFError,
@@ -41,7 +42,7 @@ module Appsignal
     end
 
     def transmit(payload)
-      config.logger.debug "Transmitting payload to #{uri}"
+      Appsignal.logger.debug "Transmitting payload to #{uri}"
       http_client.request(http_post(payload)).code
     end
 
@@ -51,8 +52,10 @@ module Appsignal
       Net::HTTP::Post.new(uri.request_uri).tap do |request|
         request['Content-Type'] = CONTENT_TYPE
         request['Content-Encoding'] = CONTENT_ENCODING
-        request.body = Appsignal::Utils::Gzip.compress \
-          Appsignal::Utils::JSON.generate(payload)
+        request.body = Zlib::Deflate.deflate(
+          Appsignal::Utils.json_generate(payload),
+          Zlib::BEST_SPEED
+        )
       end
     end
 
@@ -68,14 +71,7 @@ module Appsignal
           http.use_ssl     = true
           http.ssl_version = :TLSv1
           http.verify_mode = OpenSSL::SSL::VERIFY_PEER
-
-          ca_file = config[:ca_file_path]
-          if ca_file && File.exist?(ca_file) && File.readable?(ca_file)
-            http.ca_file = ca_file
-          else
-            config.logger.warn "Ignoring non-existing or unreadable "\
-              "`ca_file_path`: #{ca_file}"
-          end
+          http.ca_file     = CA_FILE_PATH
         end
       end
     end

data/lib/appsignal/utils.rb

@@ -52,11 +52,5 @@ module Appsignal
 
       extend ClassMethods
     end
-
-    class Gzip
-      def self.compress(body)
-        Zlib::Deflate.deflate(body, Zlib::BEST_SPEED)
-      end
-    end
   end
 end

data/lib/appsignal/version.rb

@@ -1,5 +1,5 @@
 require 'yaml'
 
 module Appsignal
-  VERSION = '1.3.6'
+  VERSION = '1.4.0.alpha.1'
 end

data/spec/lib/appsignal/auth_check_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe Appsignal::AuthCheck do
   let(:config) { project_fixture_config }
   let(:logger) { Logger.new(StringIO.new) }

data/spec/lib/appsignal/capistrano2_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 if capistrano2_present?
   require 'capistrano'
   require 'capistrano/configuration'
@@ -6,36 +8,39 @@ if capistrano2_present?
   describe "Capistrano 2 integration" do
     let(:out_stream) { StringIO.new }
     let(:config) { project_fixture_config }
-    let(:capistrano_config) do
-      Capistrano::Configuration.new.tap do |c|
-        c.set(:rails_env, 'production')
-        c.set(:repository, 'master')
-        c.set(:deploy_to, '/home/username/app')
-        c.set(:current_release, '')
-        c.set(:current_revision, '503ce0923ed177a3ce000005')
-        c.dry_run = false
-      end
-    end
+
     before do
-      Appsignal::Capistrano.tasks(capistrano_config)
+      @original_stdout = $stdout
+      $stdout = out_stream
+    end
+    after do
+      $stdout = @original_stdout
     end
-    around do |example|
-      capture_stdout(out_stream) { example.run }
+
+    before :all do
+      @capistrano_config = Capistrano::Configuration.new
+      Appsignal::Capistrano.tasks(@capistrano_config)
     end
 
     it "should have a deploy task" do
-      capistrano_config.find_task('appsignal:deploy').should_not be_nil
+      @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
+          @capistrano_config.dry_run = true
         end
 
         it "should be instantiated with the right params" do
@@ -49,7 +54,7 @@ if capistrano2_present?
 
         context "when appsignal_config is available" do
           before do
-            capistrano_config.set(:appsignal_config, :name => 'AppName')
+            @capistrano_config.set(:appsignal_config, :name => 'AppName')
           end
 
           it "should be instantiated with the right params" do
@@ -63,8 +68,8 @@ if capistrano2_present?
 
           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')
+              @capistrano_config.unset(:rails_env)
+              @capistrano_config.set(:rack_env, 'rack_production')
             end
 
             it "should be instantiated with the right params" do
@@ -76,51 +81,12 @@ if capistrano2_present?
               )
             end
           end
-
-          context "when stage is used instead of rack_env / rails_env" do
-            before do
-              capistrano_config.unset(:rails_env)
-              capistrano_config.set(:stage, 'stage_production')
-            end
-
-            it "should be instantiated with the right params" do
-              Appsignal::Config.should_receive(:new).with(
-                project_fixture_path,
-                'stage_production',
-                {:name => 'AppName'},
-                kind_of(Logger)
-              )
-            end
-          end
-
-          context "when appsignal_env is set" do
-            before do
-              capistrano_config.set(:rack_env, 'rack_production')
-              capistrano_config.set(:stage, 'stage_production')
-              capistrano_config.set(:appsignal_env, 'appsignal_production')
-            end
-
-            it "should prefer the appsignal_env rather than stage, rails_env and rack_env" do
-              Appsignal::Config.should_receive(:new).with(
-                project_fixture_path,
-                'appsignal_production',
-                {:name => 'AppName'},
-                kind_of(Logger)
-              )
-            end
-          end
         end
 
-        after do
-          capistrano_config.find_and_execute_task('appsignal:deploy')
-        end
+        after { @capistrano_config.find_and_execute_task('appsignal:deploy') }
       end
 
-      describe "markers" do
-        def stub_marker_request(data = {})
-          stub_api_request config, 'markers', marker_data.merge(data)
-        end
-
+      context "send marker" do
         let(:marker_data) do
           {
             :revision => '503ce0923ed177a3ce000005',
@@ -129,66 +95,80 @@ if capistrano2_present?
         end
 
         context "when active for this environment" do
-          it "transmits marker" do
-            stub_marker_request.to_return(:status => 200)
-            capistrano_config.find_and_execute_task('appsignal:deploy')
-
-            expect(out_stream.string).to include \
-              'Notifying Appsignal of deploy with: revision: 503ce0923ed177a3ce000005, user: batman',
-              'Appsignal has been notified of this deploy!'
+          before do
+            @marker = Appsignal::Marker.new(
+              marker_data,
+              config
+            )
+            Appsignal::Marker.stub(:new => @marker)
           end
 
-          context "with overridden revision" do
+          context "proper setup" do
             before do
-              capistrano_config.set(:appsignal_revision, 'abc123')
-              stub_marker_request(:revision => 'abc123').to_return(:status => 200)
-              capistrano_config.find_and_execute_task('appsignal:deploy')
+              @transmitter = double
+              Appsignal::Transmitter.should_receive(:new).and_return(@transmitter)
             end
 
-            it "transmits the overriden revision" do
-              expect(out_stream.string).to include \
-                'Notifying Appsignal of deploy with: revision: abc123, user: batman',
-                'Appsignal has been notified of this deploy!'
+            it "should add the correct marker data" do
+              Appsignal::Marker.should_receive(:new).with(
+                marker_data,
+                kind_of(Appsignal::Config)
+              ).and_return(@marker)
+
+              @capistrano_config.find_and_execute_task('appsignal:deploy')
             end
-          end
 
-          context "with failed request" do
-            before do
-              stub_marker_request.to_return(:status => 500)
-              capistrano_config.find_and_execute_task('appsignal:deploy')
+            it "should transmit data" do
+              @transmitter.should_receive(:transmit).and_return('200')
+              @capistrano_config.find_and_execute_task('appsignal:deploy')
+              out_stream.string.should include('Notifying Appsignal of deploy with: revision: 503ce0923ed177a3ce000005, user: batman')
+              out_stream.string.should include('Appsignal has been notified of this deploy!')
             end
 
-            it "does not transmit marker" do
-              output = out_stream.string
-              expect(output).to include \
-                'Notifying Appsignal of deploy with: revision: 503ce0923ed177a3ce000005, user: batman',
-                'Something went wrong while trying to notify Appsignal:'
-              expect(output).to_not include 'Appsignal has been notified of this deploy!'
+            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)
+                ).and_return(@marker)
+
+                @capistrano_config.find_and_execute_task('appsignal:deploy')
+              end
             end
           end
 
-          context "when dry run" do
-            before do
-              capistrano_config.dry_run = true
-              capistrano_config.find_and_execute_task('appsignal:deploy')
-            end
+          it "should not transmit data" do
+            @capistrano_config.find_and_execute_task('appsignal:deploy')
+            out_stream.string.should include('Notifying Appsignal of deploy with: revision: 503ce0923ed177a3ce000005, user: batman')
+            out_stream.string.should include('Something went wrong while trying to notify Appsignal:')
+          end
+
+          context "dry run" do
+            before { @capistrano_config.dry_run = true }
 
-            it "does not transmit marker" do
-              expect(out_stream.string).to include \
-                'Dry run: AppSignal deploy marker not actually sent.'
+            it "should not send deploy marker" do
+              @marker.should_not_receive(:transmit)
+              @capistrano_config.find_and_execute_task('appsignal:deploy')
+              out_stream.string.should include('Dry run: AppSignal deploy marker not actually sent.')
             end
           end
         end
 
         context "when not active for this environment" do
           before do
-            capistrano_config.set(:rails_env, 'nonsense')
-            capistrano_config.find_and_execute_task('appsignal:deploy')
+            @capistrano_config.set(:rails_env, 'nonsense')
           end
 
-          it "does not transmit marker" do
-            expect(out_stream.string).to include \
-              "Not notifying of deploy, config is not active for environment: nonsense"
+          it "should not send deploy marker" do
+            Appsignal::Marker.should_not_receive(:new)
+            @capistrano_config.find_and_execute_task('appsignal:deploy')
+            out_stream.string.should include('Not notifying of deploy, config is not active')
           end
         end
       end