appsignal 1.2.1.beta.1 → 1.2.1.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 350007064e166fbb91f0ac4dd1a84d4ef0830c71
-  data.tar.gz: cac950f88072c96359cad08e06c348b73ea36d77
+  metadata.gz: a3adbe0e670d7699320eaa00fb6fd5241b5633be
+  data.tar.gz: 133762d96801cb15b8c31afa794a98dd1085dd03
 SHA512:
-  metadata.gz: 320de9094dddc0782864706cbf8886e30d5e1a5e44a5a828645f19c16b7a18d78becb98c93b582c2d3d8e8678dfef19451ad331fb05664ab7d995f4ebf7ee8e1
-  data.tar.gz: e1354c1a4966f439a8220a0147d5d7545654fbaf8acd060ef1b40efc42255f6c80691653b82d92eb4cb7ff1626db1e657809e2f95a967175ada8021e15139d3a
+  metadata.gz: c0615b6e08b91f9717dc3f2eb3309c17e0caafdf10111e47e8f319a862f422ba84fa5e9554d4316e8ab80ce79a6b6d99b8bc7c9230ef960af8c0c94a38c4ca89
+  data.tar.gz: f6692ce6ad5da7d216d77fb71df603ec45afbf725f5322efe628ad10e6a099ea3f7dd85f00c9ec0a1123d0fee657c263f3e9dfcfd07690ab9779175b58a97b3b

data/CHANGELOG.md

@@ -2,6 +2,7 @@
 * Use Dir.pwd in CLI install wizard
 * Support bignums when setting queue length
 * Support for Sequel 4.35
+* Add env option to skip errors in Sinatra
 
 # 1.2.0
 * Restart background thread when FD's are closed

data/lib/appsignal/rack/sinatra_instrumentation.rb

@@ -39,7 +39,9 @@ module Appsignal
         ensure
           # If raise_error is off versions of Sinatra don't raise errors, but store
           # them in the sinatra.error env var.
-          transaction.set_error(env['sinatra.error']) if !@raise_errors_on && env['sinatra.error']
+          if !@raise_errors_on && env['sinatra.error'] && !env['sinatra.skip_appsignal_error']
+            transaction.set_error(env['sinatra.error'])
+          end
           transaction.set_action(env['sinatra.route'])
           transaction.set_metadata('path', request.path)
           transaction.set_metadata('method', request.request_method)

data/lib/appsignal/version.rb

@@ -1,5 +1,5 @@
 require 'yaml'
 
 module Appsignal
-  VERSION = '1.2.1.beta.1'
+  VERSION = '1.2.1.beta.2'
 end

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

@@ -88,6 +88,14 @@ if defined?(::Sinatra)
             Appsignal::Transaction.any_instance.should_not_receive(:set_error)
           end
         end
+
+        context "if sinatra.skip_appsignal_error is set" do
+          let(:env) { {'sinatra.error' => error, 'sinatra.skip_appsignal_error' => true} }
+
+          it "should not set the error" do
+            Appsignal::Transaction.any_instance.should_not_receive(:set_error)
+          end
+        end
       end
 
       it "should set the action" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 1.2.1.beta.1
+  version: 1.2.1.beta.2
 platform: ruby
 authors:
 - Robert Beekman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-22 00:00:00.000000000 Z
+date: 2016-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack