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

data/spec/lib/appsignal/transmitter_spec.rb

@@ -69,6 +69,7 @@ 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
 
@@ -76,9 +77,18 @@ 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

@@ -201,29 +201,29 @@ describe Appsignal do
       end
     end
 
-    describe ".listen_for_exception" do
+    describe ".listen_for_error" do
       it "should do nothing" do
         error = RuntimeError.new('specific error')
         lambda {
-          Appsignal.listen_for_exception do
+          Appsignal.listen_for_error do
             raise error
           end
         }.should raise_error(error)
       end
     end
 
-    describe ".send_exception" do
+    describe ".send_error" do
       it "should do nothing" do
         lambda {
-          Appsignal.send_exception(RuntimeError.new)
+          Appsignal.send_error(RuntimeError.new)
         }.should_not raise_error
       end
     end
 
-    describe ".set_exception" do
+    describe ".set_error" do
       it "should do nothing" do
         lambda {
-          Appsignal.set_exception(RuntimeError.new)
+          Appsignal.set_error(RuntimeError.new)
         }.should_not raise_error
       end
     end
@@ -244,12 +244,10 @@ describe Appsignal do
     end
 
     describe ".monitor_transaction" do
-      context "with a normall call" do
-        it "should instrument and complete" do
-          Appsignal::Transaction.stub(:current => transaction)
+      context "with a successful call" do
+        it "should instrument and complete for a background job" do
           ActiveSupport::Notifications.should_receive(:instrument).with(
-            'perform_job.something',
-            :class => 'Something'
+            'perform_job.something'
           ).and_yield
           Appsignal::Transaction.should_receive(:complete_current!)
           object = double
@@ -257,8 +255,30 @@ describe Appsignal do
 
           Appsignal.monitor_transaction(
             'perform_job.something',
-            :class => 'Something'
+            background_env_with_data
+          ) do
+            current = Appsignal::Transaction.current
+            current.namespace.should == Appsignal::Transaction::BACKGROUND_JOB
+            current.request.should be_a(Appsignal::Transaction::GenericRequest)
+            object.some_method
+          end
+        end
+
+        it "should instrument and complete for a http request" do
+          ActiveSupport::Notifications.should_receive(:instrument).with(
+            'process_action.something'
+          ).and_yield
+          Appsignal::Transaction.should_receive(:complete_current!)
+          object = double
+          object.should_receive(:some_method)
+
+          Appsignal.monitor_transaction(
+            'process_action.something',
+            http_request_env_with_data
           ) do
+            current = Appsignal::Transaction.current
+            current.namespace.should == Appsignal::Transaction::HTTP_REQUEST
+            current.request.should be_a(::Rack::Request)
             object.some_method
           end
         end
@@ -268,7 +288,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(:set_exception).with(error)
+          Appsignal::Transaction.any_instance.should_receive(:set_error).with(error)
           Appsignal::Transaction.should_receive(:complete_current!)
 
           lambda {
@@ -437,9 +457,10 @@ describe Appsignal do
     end
 
     describe ".send_error" do
-      let(:tags) { nil }
+      let(:tags)      { nil }
+      let(:error) { VerySpecificError.new }
 
-      it "should send the exception to AppSignal" do
+      it "should send the error to AppSignal" do
         Appsignal::Transaction.should_receive(:create).and_call_original
       end
 
@@ -447,68 +468,80 @@ describe Appsignal do
         let(:tags) { {:a => 'a', :b => 'b'} }
 
         it "should tag the request before sending" do
-          transaction = Appsignal::Transaction.create(SecureRandom.uuid, {})
+          transaction = Appsignal::Transaction.create(
+            SecureRandom.uuid,
+            Appsignal::Transaction::HTTP_REQUEST,
+            Appsignal::Transaction::GenericRequest.new({})
+          )
           Appsignal::Transaction.stub(:create => transaction)
           transaction.should_receive(:set_tags).with(tags)
           Appsignal::Transaction.should_receive(:complete_current!)
         end
       end
 
-      it "should not send the exception if it's in the ignored list" do
-        Appsignal.stub(:is_ignored_exception? => true)
+      it "should not send the error if it's in the ignored list" do
+        Appsignal.stub(:is_ignored_error? => true)
         Appsignal::Transaction.should_not_receive(:create)
       end
 
-      after do
-        begin
-          raise "I am an exception"
-        rescue Exception => e
-          Appsignal.send_exception(e, tags)
+      context "when given class is not an error" do
+        let(:error) { double }
+
+        it "should log a message" do
+          expect( Appsignal.logger ).to receive(:error).with('Can\'t send error, given value is not an exception')
         end
+
+        it "should not send the error" do
+          expect( Appsignal::Transaction ).to_not receive(:create)
+        end
+      end
+
+      after do
+        Appsignal.send_error(error, tags)
       end
     end
 
-    describe ".listen_for_exception" do
-      it "should call send_exception and re-raise" do
-        Appsignal.should_receive(:send_exception).with(kind_of(Exception))
+    describe ".listen_for_error" do
+      it "should call send_error and re-raise" do
+        Appsignal.should_receive(:send_error).with(kind_of(Exception))
         lambda {
-          Appsignal.listen_for_exception do
+          Appsignal.listen_for_error do
             raise "I am an exception"
           end
         }.should raise_error(RuntimeError, "I am an exception")
       end
     end
 
-    describe ".set_exception" do
+    describe ".set_error" do
       before { Appsignal::Transaction.stub(:current => transaction) }
-      let(:exception) { RuntimeError.new('I am an exception') }
+      let(:error) { RuntimeError.new('I am an exception') }
 
-      it "should add the exception to the current transaction" do
-        transaction.should_receive(:set_error).with(exception)
+      it "should add the error to the current transaction" do
+        transaction.should_receive(:set_error).with(error)
 
-        Appsignal.set_exception(exception)
+        Appsignal.set_error(error)
       end
 
       it "should do nothing if there is no current transaction" do
         Appsignal::Transaction.stub(:current => nil)
 
-        transaction.should_not_receive(:set_exception).with(exception)
+        transaction.should_not_receive(:set_error)
 
-        Appsignal.set_exception(exception)
+        Appsignal.set_error(error)
       end
 
-      it "should not add the exception if it's in the ignored list" do
-        Appsignal.stub(:is_ignored_exception? => true)
+      it "should not add the error if it's in the ignored list" do
+        Appsignal.stub(:is_ignored_error? => true)
 
-        transaction.should_not_receive(:set_exception).with(exception)
+        transaction.should_not_receive(:set_error)
 
-        Appsignal.set_exception(exception)
+        Appsignal.set_error(error)
       end
 
-      it "should do nothing if the exception is nil" do
-        transaction.should_not_receive(:set_exception)
+      it "should do nothing if the error is nil" do
+        transaction.should_not_receive(:set_error)
 
-        Appsignal.set_exception(nil)
+        Appsignal.set_error(nil)
       end
     end
 
@@ -536,22 +569,22 @@ describe Appsignal do
       end
     end
 
-    describe ".is_ignored_exception?" do
-      let(:exception) { StandardError.new }
+    describe ".is_ignored_error?" do
+      let(:error) { StandardError.new }
       before do
         Appsignal.stub(
-          :config => {:ignore_exceptions => 'StandardError'}
+          :config => {:ignore_errors => ['StandardError']}
         )
       end
 
-      subject { Appsignal.is_ignored_exception?(exception) }
+      subject { Appsignal.is_ignored_error?(error) }
 
       it "should return true if it's in the ignored list" do
         should be_true
       end
 
-      context "when exception is not in the ingore list" do
-        let(:exception) { Object.new }
+      context "when error is not in the ignored list" do
+        let(:error) { Object.new }
 
         it "should return false" do
           should be_false

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 ENV['RAILS_ENV'] ||= 'test'
+require 'rack'
 require 'rspec'
 require 'pry'
 require 'timecop'
@@ -20,6 +21,13 @@ 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
@@ -45,6 +53,13 @@ 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}
@@ -71,6 +86,7 @@ end
 
 RSpec.configure do |config|
   config.include ConfigHelpers
+  config.include EnvHelpers
   config.include NotificationHelpers
   config.include TimeHelpers
   config.include TransactionHelpers
@@ -78,8 +94,11 @@ RSpec.configure do |config|
   config.before do
     ENV['PWD'] = File.expand_path(File.join(File.dirname(__FILE__), '../'))
     ENV['RAILS_ENV'] = 'test'
-    ENV.delete('APPSIGNAL_PUSH_API_KEY')
-    ENV.delete('APPSIGNAL_API_KEY')
+
+    # Clean environment
+    ENV.keys.select { |key| key.start_with?('APPSIGNAL_') }.each do |key|
+      ENV[key] = nil
+    end
   end
 
   config.after do

data/spec/support/helpers/env_helpers.rb

@@ -0,0 +1,31 @@
+module EnvHelpers
+  def http_request_env_with_data(args={})
+    Rack::MockRequest.env_for(
+      '/blog',
+      :params => {
+        'controller' => 'blog_posts',
+        'action' => 'show',
+        'id' => '1'
+      }
+    ).merge(
+      :controller => 'BlogPostsController',
+      :action => 'show',
+      :request_format => 'html',
+      :request_method => "GET",
+      :status => '200',
+      :view_runtime => 500,
+      :db_runtime => 500,
+    ).merge(args)
+  end
+
+  def background_env_with_data(args={})
+    {
+      :class => 'BackgroundJob',
+      :method => 'perform',
+      :priority => 1,
+      :attempts => 0,
+      :queue => 'default',
+      :queue_start => fixed_time - 10.0,
+    }.merge(args)
+  end
+end

data/spec/support/helpers/notification_helpers.rb

@@ -5,39 +5,10 @@ module NotificationHelpers
       :start => fixed_time,
       :ending => fixed_time + 0.1,
       :tid => '1',
-      :payload => create_payload
+      :payload => http_request_env_with_data
     }.merge(args)
     ActiveSupport::Notifications::Event.new(
       args[:name], args[:start], args[:ending], args[:tid], args[:payload]
     )
   end
-
-  def create_payload(args={})
-    {
-      :path => '/blog',
-      :action => 'show',
-      :controller => 'BlogPostsController',
-      :params => {
-        'controller' => 'blog_posts',
-        'action' => 'show',
-        'id' => '1'
-      },
-      :request_format => 'html',
-      :request_method => "GET",
-      :status => '200',
-      :view_runtime => 500,
-      :db_runtime => 500
-    }.merge(args)
-  end
-
-  def create_background_payload(args={})
-    {
-      :class => 'BackgroundJob',
-      :method => 'perform',
-      :priority => 1,
-      :attempts => 0,
-      :queue => 'default',
-      :queue_start => fixed_time - 10.0,
-    }.merge(args)
-  end
 end

data/spec/support/helpers/transaction_helpers.rb

@@ -55,16 +55,15 @@ module TransactionHelpers
     )
   end
 
-  def background_job_transaction(args={}, payload=create_background_payload)
+  def background_job_transaction(args={}, payload=background_env_with_data)
     Appsignal::Transaction.create(
       '1',
-      {
+      Appsignal::Transaction::BACKGROUND_JOB,
+      Appsignal::Transaction::GenericRequest.new({
         'SERVER_NAME' => 'localhost',
         'action_dispatch.routes' => 'not_available'
-      }.merge(args)
-    ).tap do |o|
-      o.set_root_event('perform_job.delayed_job', payload )
-    end
+      }.merge(args))
+    )
   end
 
   def appsignal_transaction(args={})
@@ -75,13 +74,14 @@ module TransactionHelpers
     exception = args.delete(:exception)
     Appsignal::Transaction.create(
       '1',
+      args.delete(:namespace) || Appsignal::Transaction::HTTP_REQUEST,
       {
         'HTTP_USER_AGENT' => 'IE6',
         'SERVER_NAME' => 'localhost',
         'action_dispatch.routes' => 'not_available'
       }.merge(args)
     ).tap do |o|
-      o.set_root_event(process_action_event.name, process_action_event.payload)
+      o.set_action(process_action_event.name)
       o.set_exception(exception) if exception
     end
   end

data/spec/support/project_fixture/config/appsignal.yml

@@ -19,3 +19,5 @@ test:
 old_api_key:
   api_key: "def"
   active: true
+  ignore_exceptions:
+    - StandardError

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 0.12.beta.31
+  version: 0.12.beta.32
 platform: ruby
 authors:
 - Robert Beekman
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-21 00:00:00.000000000 Z
+date: 2015-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -137,6 +137,7 @@ files:
 - gemfiles/capistrano2.gemfile
 - gemfiles/capistrano3.gemfile
 - gemfiles/no_dependencies.gemfile
+- gemfiles/padrino.gemfile
 - gemfiles/rails-3.0.gemfile
 - gemfiles/rails-3.1.gemfile
 - gemfiles/rails-3.2.gemfile
@@ -161,7 +162,9 @@ files:
 - lib/appsignal/integrations/capistrano/careful_logger.rb
 - lib/appsignal/integrations/celluloid.rb
 - lib/appsignal/integrations/delayed_job.rb
+- lib/appsignal/integrations/padrino.rb
 - lib/appsignal/integrations/rails.rb
+- lib/appsignal/integrations/rake.rb
 - lib/appsignal/integrations/resque.rb
 - lib/appsignal/integrations/sequel.rb
 - lib/appsignal/integrations/sidekiq.rb
@@ -169,9 +172,8 @@ files:
 - lib/appsignal/js_exception_transaction.rb
 - lib/appsignal/marker.rb
 - lib/appsignal/params_sanitizer.rb
-- lib/appsignal/rack/instrumentation.rb
 - lib/appsignal/rack/js_exception_catcher.rb
-- lib/appsignal/rack/listener.rb
+- lib/appsignal/rack/rails_instrumentation.rb
 - lib/appsignal/rack/sinatra_instrumentation.rb
 - lib/appsignal/subscriber.rb
 - lib/appsignal/transaction.rb
@@ -200,7 +202,9 @@ files:
 - spec/lib/appsignal/integrations/capistrano3_spec.rb
 - spec/lib/appsignal/integrations/celluloid_spec.rb
 - spec/lib/appsignal/integrations/delayed_job_spec.rb
+- spec/lib/appsignal/integrations/padrino_spec.rb
 - spec/lib/appsignal/integrations/rails_spec.rb
+- spec/lib/appsignal/integrations/rake_spec.rb
 - spec/lib/appsignal/integrations/resque_spec.rb
 - spec/lib/appsignal/integrations/sequel_spec.rb
 - spec/lib/appsignal/integrations/sidekiq_spec.rb
@@ -208,9 +212,8 @@ files:
 - spec/lib/appsignal/js_exception_transaction_spec.rb
 - spec/lib/appsignal/marker_spec.rb
 - spec/lib/appsignal/params_sanitizer_spec.rb
-- spec/lib/appsignal/rack/instrumentation_spec.rb
 - spec/lib/appsignal/rack/js_exception_catcher_spec.rb
-- spec/lib/appsignal/rack/listener_spec.rb
+- spec/lib/appsignal/rack/rails_instrumentation_spec.rb
 - spec/lib/appsignal/rack/sinatra_instrumentation_spec.rb
 - spec/lib/appsignal/subscriber_spec.rb
 - spec/lib/appsignal/transaction_spec.rb
@@ -223,6 +226,7 @@ files:
 - spec/support/fixtures/generated_config.yml
 - spec/support/fixtures/uploaded_file.txt
 - spec/support/helpers/config_helpers.rb
+- spec/support/helpers/env_helpers.rb
 - spec/support/helpers/notification_helpers.rb
 - spec/support/helpers/time_helpers.rb
 - spec/support/helpers/transaction_helpers.rb
@@ -270,7 +274,9 @@ test_files:
 - spec/lib/appsignal/integrations/capistrano3_spec.rb
 - spec/lib/appsignal/integrations/celluloid_spec.rb
 - spec/lib/appsignal/integrations/delayed_job_spec.rb
+- spec/lib/appsignal/integrations/padrino_spec.rb
 - spec/lib/appsignal/integrations/rails_spec.rb
+- spec/lib/appsignal/integrations/rake_spec.rb
 - spec/lib/appsignal/integrations/resque_spec.rb
 - spec/lib/appsignal/integrations/sequel_spec.rb
 - spec/lib/appsignal/integrations/sidekiq_spec.rb
@@ -278,9 +284,8 @@ test_files:
 - spec/lib/appsignal/js_exception_transaction_spec.rb
 - spec/lib/appsignal/marker_spec.rb
 - spec/lib/appsignal/params_sanitizer_spec.rb
-- spec/lib/appsignal/rack/instrumentation_spec.rb
 - spec/lib/appsignal/rack/js_exception_catcher_spec.rb
-- spec/lib/appsignal/rack/listener_spec.rb
+- spec/lib/appsignal/rack/rails_instrumentation_spec.rb
 - spec/lib/appsignal/rack/sinatra_instrumentation_spec.rb
 - spec/lib/appsignal/subscriber_spec.rb
 - spec/lib/appsignal/transaction_spec.rb
@@ -293,6 +298,7 @@ test_files:
 - spec/support/fixtures/generated_config.yml
 - spec/support/fixtures/uploaded_file.txt
 - spec/support/helpers/config_helpers.rb
+- spec/support/helpers/env_helpers.rb
 - spec/support/helpers/notification_helpers.rb
 - spec/support/helpers/time_helpers.rb
 - spec/support/helpers/transaction_helpers.rb