appsignal 1.2.0.beta.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1961ed742869bc42f46731ae2886077fcbe51a8a
-  data.tar.gz: 810e56cefb59bc34afaa86a1b00f0775dce15c80
+  metadata.gz: d44539c4d934bc6c75a61244bc52dcc2a67d75a5
+  data.tar.gz: a90fa4a59e8d2529aa5bfd67e8e80d0184d26792
 SHA512:
-  metadata.gz: c5ea8ee5ce64e217f2ff6397f1c45a770738346d777b695cf4d6b435f8da1b691171e4992bf551a34a5f1de5295ff685607c49e817b7d67cf547b3b7d23027ca
-  data.tar.gz: 17a3d405e94a611a88019045a7a4d1d7dd71b9ece5c1d4348a83234e85a5715c279efe84a6e2f855cd2490275f7e2438fe8ec250853cfee566165406eb567dc6
+  metadata.gz: a4714eeb4f848bd99460320f35dfcd9429462a49b178c1cb0dcf6e94bab432a4af261ecd68bf07975c4eb15699cd729539cd3f0b109789338405ef7096681c80
+  data.tar.gz: 66db0f2a4b0019a00b052ae6fde322c6fd4de6621ea7068a90e7f61e5f1740c281ba6817ae7d59ca54819136d44d001ce735b29940c40162928e1055e1c678db

data/CHANGELOG.md

@@ -2,6 +2,7 @@
 * Restart background thread when FD's are closed
 * Beta version of collecting host metrics (disabled by default)
 * Hooks for Shuryoken
+* Don't add errors from env if raise_errors is off for Sinatra
 
 # 1.1.9
 * Fix for race condition when creating working dir exactly at the same time

data/lib/appsignal/rack/sinatra_instrumentation.rb

@@ -3,9 +3,12 @@ require 'rack'
 module Appsignal
   module Rack
     class SinatraInstrumentation
+      attr_reader :raise_errors_on
+
       def initialize(app, options = {})
         Appsignal.logger.debug 'Initializing Appsignal::Rack::SinatraInstrumentation'
         @app, @options = app, options
+        @raise_errors_on = @app.settings.raise_errors
       end
 
       def call(env)
@@ -34,9 +37,9 @@ module Appsignal
           transaction.set_error(error)
           raise error
         ensure
-          # In production newer versions of Sinatra don't raise errors, but store
+          # 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 env['sinatra.error']
+          transaction.set_error(env['sinatra.error']) if !@raise_errors_on && env['sinatra.error']
           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.0.beta.1'
+  VERSION = '1.2.0'
 end

data/spec/lib/appsignal/hooks/sequel_spec.rb

@@ -11,13 +11,13 @@ describe "Sequel integration", if: sequel_present? do
     before { Appsignal::Transaction.create('uuid', Appsignal::Transaction::HTTP_REQUEST, 'test') }
 
     it "should instrument queries" do
-      expect( Appsignal::Extension ).to receive(:start_event)
+      expect( Appsignal::Transaction.current ).to receive(:start_event)
         .at_least(:once)
-      expect( Appsignal::Extension ).to receive(:finish_event)
+      expect( Appsignal::Transaction.current ).to receive(:finish_event)
         .at_least(:once)
-        .with(kind_of(Integer), "sql.sequel", "", kind_of(String), 1)
+        .with("sql.sequel", nil, kind_of(String), 1)
 
-      db['SELECT 1'].all
+      db['SELECT 1'].all.to_a
     end
   end
 end

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

@@ -12,7 +12,8 @@ if defined?(::Sinatra)
       start_agent
     end
 
-    let(:app) { double(:call => true) }
+    let(:settings) { double(:raise_errors => false) }
+    let(:app) { double(:call => true, :settings => settings) }
     let(:env) { {'sinatra.route' => 'GET /', :path => '/', :method => 'GET'} }
     let(:options) { {} }
     let(:middleware) { Appsignal::Rack::SinatraInstrumentation.new(app, options) }
@@ -63,6 +64,7 @@ if defined?(::Sinatra)
         let(:app) do
           double.tap do |d|
             d.stub(:call).and_raise(error)
+            d.stub(:settings => settings)
           end
         end
 
@@ -78,6 +80,14 @@ if defined?(::Sinatra)
         it "should set the error" do
           Appsignal::Transaction.any_instance.should_receive(:set_error).with(error)
         end
+
+        context "if raise_errors is on" do
+          let(:settings) { double(:raise_errors => 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.0.beta.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Robert Beekman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-13 00:00:00.000000000 Z
+date: 2016-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -299,9 +299,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5