appsignal 0.12.beta.31 → 0.12.beta.32

data/lib/appsignal/transmitter.rb

@@ -60,13 +60,40 @@ module Appsignal
     end
 
     def http_client
-      Net::HTTP.new(uri.host, uri.port).tap do |http|
+      client = if config[:http_proxy]
+        Net::HTTP.new(uri.host, uri.port, proxy_addr, proxy_port)
+      else
+        Net::HTTP.new(uri.host, uri.port)
+      end
+
+      client.tap do |http|
         if uri.scheme == 'https'
-          http.use_ssl = true
+          http.use_ssl     = true
+          http.ssl_version = :TLSv1
           http.verify_mode = OpenSSL::SSL::VERIFY_PEER
-          http.ca_file = CA_FILE_PATH
+          http.ca_file     = CA_FILE_PATH
         end
       end
     end
+
+    def proxy_uri
+      @proxy_uri ||= URI.parse(config[:http_proxy])
+    end
+
+    def proxy_addr
+      if config[:http_proxy]
+        proxy_uri.host
+      else
+        nil
+      end
+    end
+
+    def proxy_port
+      if config[:http_proxy]
+        proxy_uri.port
+      else
+        nil
+      end
+    end
   end
 end

data/lib/appsignal/version.rb

@@ -1,4 +1,4 @@
 module Appsignal
-  VERSION       = '0.12.beta.31'
-  AGENT_VERSION = '8cdd29b'
+  VERSION       = '0.12.beta.32'
+  AGENT_VERSION = '246e4be'
 end

data/spec/lib/appsignal/cli_spec.rb

@@ -26,7 +26,7 @@ describe Appsignal::CLI do
     subject { cli.config }
 
     it { should be_instance_of(Appsignal::Config) }
-    its(:loaded?) { should be_true }
+    its(:valid?) { should be_true }
   end
 
   it "should print the help with no arguments, -h and --help" do

data/spec/lib/appsignal/config_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Appsignal::Config do
   subject { config }
 
-  describe "when there is a config file" do
+  describe "with a config file" do
     let(:config) { project_fixture_config('production') }
 
     it "should not log an error" do
@@ -11,13 +11,13 @@ describe Appsignal::Config do
       subject
     end
 
-    its(:loaded?) { should be_true }
+    its(:valid?)  { should be_true }
     its(:active?) { should be_true }
 
     it "should merge with the default config and fill the config hash" do
       subject.config_hash.should == {
         :debug                          => false,
-        :ignore_exceptions              => [],
+        :ignore_errors                  => [],
         :ignore_actions                 => [],
         :instrument_net_http            => true,
         :skip_session_data              => false,
@@ -43,6 +43,8 @@ describe Appsignal::Config do
 
     describe "#write_to_environment" do
       before do
+        subject.config_hash[:http_proxy]     = 'http://localhost'
+        subject.config_hash[:ignore_actions] = ['action1', 'action2']
         subject.write_to_environment
       end
 
@@ -57,6 +59,8 @@ describe Appsignal::Config do
         ENV['APPSIGNAL_APP_NAME'].should          == 'TestApp'
         ENV['APPSIGNAL_ENVIRONMENT'].should       == 'production'
         ENV['APPSIGNAL_AGENT_VERSION'].should     == Appsignal::AGENT_VERSION
+        ENV['APPSIGNAL_HTTP_PROXY'].should        == 'http://localhost'
+        ENV['APPSIGNAL_IGNORE_ACTIONS'].should    == 'action1,action2'
       end
     end
 
@@ -66,14 +70,19 @@ describe Appsignal::Config do
       its(:active?) { should be_true }
     end
 
-    context "and there's also an env var present" do
+    context "and there's config in the environment" do
       before do
         ENV['APPSIGNAL_PUSH_API_KEY'] = 'push_api_key'
+        ENV['APPSIGNAL_DEBUG'] = 'true'
       end
 
-      it "should ignore the env var" do
+      it "should ignore env vars that are present in the config file" do
         subject[:push_api_key].should == 'abc'
       end
+
+      it "should use env vars that are not present in the config file" do
+        subject[:debug].should == true
+      end
     end
 
     context "and there is an initial config" do
@@ -85,12 +94,16 @@ describe Appsignal::Config do
       end
     end
 
-    context "and there is an old-style api_key defined" do
+    context "and there is an old-style config" do
       let(:config) { project_fixture_config('old_api_key') }
 
       it "should fill the push_api_key with the old style key" do
         subject[:push_api_key].should == 'def'
       end
+
+      it "should fill ignore_errors with the old style ignore exceptions" do
+        subject[:ignore_errors].should == ['StandardError']
+      end
     end
   end
 
@@ -99,148 +112,42 @@ describe Appsignal::Config do
 
     it "should log an error" do
       Appsignal::Config.any_instance.should_receive(:carefully_log_error).with(
-        "Not loading: config for 'nonsense' not found"
-      )
+        "Not loading from config file: config for 'nonsense' not found"
+      ).once
+      Appsignal::Config.any_instance.should_receive(:carefully_log_error).with(
+        "Push api key not set after loading config"
+      ).once
       subject
     end
 
-    its(:loaded?) { should be_false }
+    its(:valid?)  { should be_false }
     its(:active?) { should be_false }
   end
 
   context "when there is no config file" do
-    before do
-      ENV.keys.select { |key| key.start_with?('APPSIGNAL_') }.each do |key|
-        ENV[key] = nil
-      end
-    end
     let(:initial_config) { {} }
     let(:config) { Appsignal::Config.new('/nothing', 'production', initial_config) }
 
-    it "should log an error" do
-      Appsignal::Config.any_instance.should_receive(:carefully_log_error).with(
-        "Not loading: No config file found at '/nothing/config/appsignal.yml' " \
-        "and no APPSIGNAL_PUSH_API_KEY env var present"
-      )
-      subject
-    end
-
-    its(:loaded?) { should be_false }
+    its(:valid?)  { should be_false }
     its(:active?) { should be_false }
 
-    describe "#[]" do
-      it "should return nil" do
-        subject[:endpoint].should be_nil
-      end
-    end
-
-    context "and an env var is present" do
+    context "with valid config in the environment" do
       before do
-        ENV['APPSIGNAL_PUSH_API_KEY'] = 'push_api_key'
-      end
-
-      it "should not log an error" do
-        Appsignal::Config.any_instance.should_not_receive(:carefully_log_error)
-        subject
+        ENV['APPSIGNAL_PUSH_API_KEY']   = 'aaa-bbb-ccc'
+        ENV['APPSIGNAL_ACTIVE']         = 'true'
+        ENV['APPSIGNAL_APP_NAME']       = 'App name'
+        ENV['APPSIGNAL_DEBUG']          = 'true'
+        ENV['APPSIGNAL_IGNORE_ACTIONS'] = 'action1,action2'
       end
 
-      its(:loaded?) { should be_true }
+      its(:valid?)  { should be_true }
       its(:active?) { should be_true }
 
-      it "should merge with the default config, fill the config hash and log about the missing name" do
-        Appsignal.logger.should_receive(:debug).with(
-          "There's no application name set in your config file or in the APPSIGNAL_APP_NAME env var. You should set one unless your app runs on Heroku."
-        )
-
-        subject.config_hash.should == {
-          :debug                          => false,
-          :push_api_key                   => 'push_api_key',
-          :ignore_exceptions              => [],
-          :ignore_actions                 => [],
-          :send_params                    => true,
-          :instrument_net_http            => true,
-          :skip_session_data              => false,
-          :endpoint                       => 'https://push.appsignal.com',
-          :active                         => true,
-          :enable_frontend_error_catching => false,
-          :frontend_error_catching_path   => '/appsignal_error_catcher'
-        }
-      end
-
-      context "and an initial config with a name is present" do
-        let(:initial_config) { {:name => 'Initial Name'} }
-
-        it "should merge with the config" do
-          Appsignal.logger.should_not_receive(:debug)
-          subject[:name].should == 'Initial Name'
-        end
-      end
-
-      context "more config in environment" do
-        context "APPSIGNAL_APP_NAME is set" do
-          before do
-            ENV['APPSIGNAL_APP_NAME'] = 'Name from env'
-          end
-
-          it "should set the name" do
-            Appsignal.logger.should_not_receive(:debug)
-            subject[:name].should == 'Name from env'
-          end
-        end
-
-        context "APPSIGNAL_ACTIVE" do
-          context "not present" do
-            before do
-              ENV.delete('APPSIGNAL_ACTIVE')
-            end
-
-            it "should still set active to true" do
-              subject[:active].should be_true
-            end
-          end
-
-          context "true" do
-            before do
-              ENV['APPSIGNAL_ACTIVE'] = 'true'
-            end
-
-            it "should set active to true" do
-              subject[:active].should be_true
-            end
-          end
-
-          context "false" do
-            before do
-              ENV['APPSIGNAL_ACTIVE'] = 'false'
-            end
-
-            it "should set active to false" do
-              subject[:active].should be_false
-            end
-          end
-        end
-      end
-
-      context "with only APPSIGNAL_API_KEY" do
-        before do
-          ENV.delete('APPSIGNAL_PUSH_API_KEY')
-          ENV['APPSIGNAL_API_KEY'] = 'old_style_api_key'
-        end
-
-        it "should use the old style api key" do
-          subject[:push_api_key].should == 'old_style_api_key'
-        end
-      end
-
-      context "with both APPSIGNAL_PUSH_API_KEY and APPSIGNAL_API_KEY" do
-        before do
-          ENV['APPSIGNAL_API_KEY'] = 'old_style_api_key'
-        end
-
-        it "should use the new style push api key" do
-          subject[:push_api_key].should == 'push_api_key'
-        end
-      end
+      its([:push_api_key])   { should == 'aaa-bbb-ccc' }
+      its([:active])         { should == true }
+      its([:name])           { should == 'App name' }
+      its([:debug])          { should == true }
+      its([:ignore_actions]) { should == ['action1', 'action2'] }
     end
   end
 end

data/spec/lib/appsignal/event_formatter/active_record/sql_formatter_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-if rails_present?
+if active_record_present?
   require 'active_record'
 
   describe Appsignal::EventFormatter::ActiveRecord::SqlFormatter do
@@ -57,14 +57,8 @@ if rails_present?
 
           it { should == ['Model load', "SELECT `table`.* FROM `table` WHERE `id` = ?"] }
 
-          context "with an escaped single quote" do
-            let(:sql) { "`id` = '\\'big\\' secret'" }
-
-            it { should == ['Model load', "`id` = ?"] }
-          end
-
-          context "with an escaped double quote" do
-            let(:sql) { "`id` = '\\\"big\\\" secret'" }
+          context "with escaped single quotes in the string" do
+            let(:sql) { "`id` = 'this is a \'big\' secret'" }
 
             it { should == ['Model load', "`id` = ?"] }
           end
@@ -75,34 +69,36 @@ if rails_present?
 
           it { should == ['Model load', 'SELECT `table`.* FROM `table` WHERE `id` = ?'] }
 
-          context "with an escaped single quote" do
-            let(:sql) { '`id` = "\\\'big\\\' secret"' }
+          context "with escaped double quotes in the string" do
+            let(:sql) { '`id` = "this is a \"big\" secret"' }
 
             it { should == ['Model load', "`id` = ?"] }
           end
+        end
 
-          context "with an escaped double quote" do
-            let(:sql) { '`id` = "\\"big\\" secret"' }
+        context "numeric parameter" do
+          context "integer" do
+            let(:sql) { 'SELECT `table`.* FROM `table` WHERE `id` = 1' }
 
-            it { should == ['Model load', "`id` = ?"] }
+            it { should == ['Model load', 'SELECT `table`.* FROM `table` WHERE `id` = ?'] }
           end
-        end
 
-        context "numeric parameter" do
-          let(:sql) { 'SELECT `table`.* FROM `table` WHERE `id` = 1' }
+          context "float" do
+            let(:sql) { 'SELECT `table`.* FROM `table` WHERE `value` = 10.0' }
 
-          it { should == ['Model load', 'SELECT `table`.* FROM `table` WHERE `id` = ?'] }
+            it { should == ['Model load', 'SELECT `table`.* FROM `table` WHERE `value` = ?'] }
+          end
         end
 
-        context "parameter array" do
+        context "in operator with params" do
           let(:sql) { 'SELECT `table`.* FROM `table` WHERE `id` IN (1, 2)' }
 
           it { should == ['Model load', 'SELECT `table`.* FROM `table` WHERE `id` IN (?)'] }
         end
       end
 
-      context "with double quote style table names and no prepared statements" do
-        let(:connection_config) { {:adapter => 'postgresql', :prepared_statements => false} }
+      context "with double quote style table names" do
+        let(:connection_config) { {:adapter => 'postgresql'} }
 
         context "single quoted data value" do
           let(:sql) { "SELECT \"table\".* FROM \"table\" WHERE \"id\" = 'secret'" }
@@ -110,22 +106,24 @@ if rails_present?
           it { should == ['Model load', "SELECT \"table\".* FROM \"table\" WHERE \"id\" = ?"] }
 
           context "with an escaped single quote" do
-            let(:sql) { "\"id\" = '\\'big\\' secret'" }
+            let(:sql) { "\"id\" = 'this is a \'big\' secret'" }
 
             it { should == ['Model load', "\"id\" = ?"] }
           end
+        end
 
-          context "with an escaped double quote" do
-            let(:sql) { "\"id\" = '\\\"big\\\" secret'" }
+        context "numeric parameter" do
+          context "integer" do
+            let(:sql) { 'SELECT "table".* FROM "table" WHERE "id"=1' }
 
-            it { should == ['Model load', "\"id\" = ?"] }
+            it { should == ['Model load', 'SELECT "table".* FROM "table" WHERE "id"=?'] }
           end
-        end
 
-        context "numeric parameter" do
-          let(:sql) { 'SELECT "table".* FROM "table" WHERE "id"=1' }
+          context "float" do
+            let(:sql) { 'SELECT "table".* FROM "table" WHERE "value"=10.0' }
 
-          it { should == ['Model load', 'SELECT "table".* FROM "table" WHERE "id"=?'] }
+            it { should == ['Model load', 'SELECT "table".* FROM "table" WHERE "value"=?'] }
+          end
         end
       end
 

data/spec/lib/appsignal/extension_spec.rb

@@ -18,7 +18,7 @@ describe Appsignal::Extension do
       end
 
       it "should have a start_transaction method" do
-        subject.start_transaction('request_id')
+        subject.start_transaction('request_id', 'http_request')
       end
 
       it "should have a start_event method" do
@@ -26,45 +26,27 @@ describe Appsignal::Extension do
       end
 
       it "should have a finish_event method" do
-        subject.finish_event(
-          1,
-          'name',
-          'title',
-          'body'
-        )
+        subject.finish_event(1, 'name', 'title', 'body')
       end
 
       it "should have a set_transaction_error method" do
-        subject.set_transaction_error(
-          1,
-          'name',
-          'message'
-        )
+        subject.set_transaction_error(1, 'name', 'message')
       end
 
       it "should have a set_transaction_error_data method" do
-        subject.set_transaction_error_data(
-          1,
-          'params',
-          '{}'
-        )
+        subject.set_transaction_error_data(1, 'params', '{}')
       end
 
-      it "should have a set_transaction_base_data method" do
-        subject.set_transaction_base_data(
-          1,
-          'kind',
-          'action',
-          100
-        )
+      it "should have a set_transaction_action method" do
+        subject.set_transaction_action(1, 'value')
+      end
+
+      it "should have a set_transaction_queue_start method" do
+        subject.set_transaction_queue_start(1, 10)
       end
 
       it "should have a set_transaction_metadata method" do
-        subject.set_transaction_metadata(
-          1,
-          'key',
-          'value'
-        )
+        subject.set_transaction_metadata(1, 'key', 'value')
       end
 
       it "should have a finish_transaction method" do