appsignal 2.3.7 → 2.4.0.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed63c49d1dfc2fc2760647e86a0721f9a1476d8b
-  data.tar.gz: 5af04584576a18ea0c42e2fb2a2188d0361b826b
+  metadata.gz: d33d7ecbdd7ba0817888cd6b6347f2e9289a627b
+  data.tar.gz: f9c435c47c4403295da1ff78f89d9c1ac45b67f9
 SHA512:
-  metadata.gz: 799f054a927e0dd89a7c8775f34b91d271075c25838826589959223be286bbf6ccc8297b0ad97eac00bd1cd6bae52573380ed7b69abd87037ad70ce87552856c
-  data.tar.gz: 719aaed0e8e4e9cc6e398f6ad7a509073e65c19d959b678221e026bc4d15bc478f7fda4541878561bf146c53668c8f8cfc657763a2c54806db2b8214662307af
+  metadata.gz: 957c20fa113f260bbd401e3eb95f9266b4edd03f7986a555046e86cb2266e274939691ddd8cc8583406241a06bb3cbf0201b811dbfb0f65990f8972137f8cea8
+  data.tar.gz: be4355279b8fffbfd45ebaf86f0b180e0311887f37051e9aed6ee69137f71c99fdb79907f18a45fc36404127f652daad51a9ee21a537a8f2e701c253dfbeb24b

data/.rubocop_todo.yml

@@ -1,30 +1,21 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2017-04-06 22:15:48 +0200 using RuboCop version 0.46.0.
+# on 2017-08-15 12:46:37 +0200 using RuboCop version 0.46.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 7
+# Offense count: 4
 Lint/HandleExceptions:
   Exclude:
     - 'lib/appsignal/cli/install.rb'
-    - 'spec/lib/appsignal/hooks/shoryuken_spec.rb'
-    - 'spec/lib/appsignal/hooks/sidekiq_spec.rb'
-    - 'spec/lib/appsignal/integrations/resque_spec.rb'
-
-# Offense count: 4
-Lint/RescueException:
-  Exclude:
-    - 'lib/appsignal/minutely.rb'
-    - 'lib/appsignal/rack/streaming_listener.rb'
 
-# Offense count: 38
+# Offense count: 41
 Metrics/AbcSize:
-  Max: 61
+  Max: 59
 
-# Offense count: 3
+# Offense count: 5
 # Configuration parameters: CountComments.
 Metrics/BlockLength:
   Max: 31
@@ -42,13 +33,13 @@ Metrics/ClassLength:
 Metrics/CyclomaticComplexity:
   Max: 11
 
-# Offense count: 437
+# Offense count: 471
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Metrics/LineLength:
-  Max: 456
+  Max: 152
 
-# Offense count: 79
+# Offense count: 88
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
   Max: 60
@@ -63,14 +54,14 @@ Metrics/ModuleLength:
 Metrics/PerceivedComplexity:
   Max: 14
 
-# Offense count: 11
+# Offense count: 10
 Style/AccessorMethodName:
   Exclude:
     - 'lib/appsignal.rb'
     - 'lib/appsignal/transaction.rb'
     - 'spec/support/helpers/cli_helpers.rb'
 
-# Offense count: 19
+# Offense count: 20
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: prefer_alias, prefer_alias_method
@@ -128,7 +119,3 @@ Style/IfUnlessModifier:
 Style/NonNilCheck:
   Exclude:
     - 'lib/appsignal/transaction.rb'
-
-Style/WordArray:
-  Exclude:
-    - 'spec/lib/appsignal/hooks/shoryuken_spec.rb'

data/.travis.yml

@@ -42,6 +42,10 @@ matrix:
       gemfile: "gemfiles/no_dependencies.gemfile"
       script: "bundle exec rubocop"
   exclude:
+    # We don't currently support jRuby
+    - rvm: "jruby-19mode"
+
+    # Rails 5 doesn't support Ruby < 2.2
     - rvm: "2.0.0"
       gemfile: "gemfiles/sidekiq.gemfile"
     - rvm: "2.1.8"
@@ -52,24 +56,16 @@ matrix:
       gemfile: "gemfiles/rails-5.0.gemfile"
     - rvm: "2.1.8"
       gemfile: "gemfiles/rails-5.0.gemfile"
-    - rvm: "jruby-19mode"
-      gemfile: "gemfiles/rails-5.0.gemfile"
     - rvm: "2.0.0"
       gemfile: "gemfiles/rails-5.1.gemfile"
     - rvm: "2.1.8"
       gemfile: "gemfiles/rails-5.1.gemfile"
-    - rvm: "jruby-19mode"
-      gemfile: "gemfiles/rails-5.1.gemfile"
+
   allow_failures:
-    - rvm: "jruby-19mode"
     - rvm: "2.4.0"
       gemfile: "gemfiles/rails-4.0.gemfile"
     - rvm: "2.4.0"
       gemfile: "gemfiles/rails-4.1.gemfile"
-    - rvm: "2.4.0"
-      gemfile: "gemfiles/rails-4.2.gemfile"
-    - rvm: "2.4.0"
-      gemfile: "gemfiles/resque.gemfile"
 
 env:
   global: "RAILS_ENV=test"

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+# 2.4.0 (alpha)
+- Add separate GNU linux build. PR #351 and
+  Commit d1763f4dcb685608468a73f3192226f60f66b217
+- Add separate FreeBSD build
+  Commit d1763f4dcb685608468a73f3192226f60f66b217
+- Fix crashes when using a transaction from multiple processes in an
+  unsupported way.
+  Commit d1763f4dcb685608468a73f3192226f60f66b217
+- Auto restart agent when none is running
+  Commit d1763f4dcb685608468a73f3192226f60f66b217
+- Track Exception-level exceptions. PR #356
+
 # 2.3.7
 * Support Sidekiq delayed extension job action names better. Now action names
   are reported as their class and class method name (`MyClass.method`), rather

data/Rakefile

@@ -178,8 +178,10 @@ namespace :extension do
           appsignal-agent \
           appsignal.h \
           appsignal_extension.o \
+          appsignal_extension.bundle \
           install.log \
           libappsignal.a \
+          appsignal.version \
           Makefile \
           mkmf.log
       COMMAND

data/ext/agent.yml

@@ -1,18 +1,33 @@
 ---
-version: aa306e5
+version: bd1eb5f
 triples:
-  x86_64-linux:
-    checksum: e6bb0fad95403828195f5e186128b6e9389b07c625b3845b52768ab8dd57cbf5
-    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/aa306e5/appsignal-x86_64-linux-all-static.tar.gz
-  i686-linux:
-    checksum: 05d76d816303531b4aa1905f775a0d5b8fea4e3d15b9f3b99105f499c3c549cb
-    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/aa306e5/appsignal-i686-linux-all-static.tar.gz
-  x86-linux:
-    checksum: 05d76d816303531b4aa1905f775a0d5b8fea4e3d15b9f3b99105f499c3c549cb
-    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/aa306e5/appsignal-i686-linux-all-static.tar.gz
   x86_64-darwin:
-    checksum: 3f4213164491604a1381b042404967ce11225f2c5193ffa31960552ae6451a34
-    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/aa306e5/appsignal-x86_64-darwin-all-static.tar.gz
+    checksum: c90ed7a396d0ab6f40c50ab0379ce66deda94e5be144dd89d146e37188b21f2b
+    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/bd1eb5f/appsignal-x86_64-darwin-all-static.tar.gz
   universal-darwin:
-    checksum: 3f4213164491604a1381b042404967ce11225f2c5193ffa31960552ae6451a34
-    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/aa306e5/appsignal-x86_64-darwin-all-static.tar.gz
+    checksum: c90ed7a396d0ab6f40c50ab0379ce66deda94e5be144dd89d146e37188b21f2b
+    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/bd1eb5f/appsignal-x86_64-darwin-all-static.tar.gz
+  i686-linux:
+    checksum: a5ffc5558c6b051176a1943045f91399be4a325230e4f092ac0112ed63606a05
+    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/bd1eb5f/appsignal-i686-linux-all-static.tar.gz
+  x86-linux:
+    checksum: a5ffc5558c6b051176a1943045f91399be4a325230e4f092ac0112ed63606a05
+    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/bd1eb5f/appsignal-i686-linux-all-static.tar.gz
+  i686-linux-musl:
+    checksum: aaee5ccd80c8dc96401182238d39cc16f5dd9566b23e0395f316f294f08cfc73
+    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/bd1eb5f/appsignal-i686-linux-musl-all-static.tar.gz
+  x86-linux-musl:
+    checksum: aaee5ccd80c8dc96401182238d39cc16f5dd9566b23e0395f316f294f08cfc73
+    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/bd1eb5f/appsignal-i686-linux-musl-all-static.tar.gz
+  x86_64-linux:
+    checksum: e90af03dc243a4752137018ff92b8da2eb600c5074a841aa2d996484b9315c54
+    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/bd1eb5f/appsignal-x86_64-linux-all-static.tar.gz
+  x86_64-linux-musl:
+    checksum: 04b0b5abffbf6c7791866558e227044bb0b823bdef0a64c4c3d5aa99d3c482d4
+    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/bd1eb5f/appsignal-x86_64-linux-musl-all-static.tar.gz
+  x86_64-freebsd:
+    checksum: b7c5f81aebf371c956d90a6ce88396925d3b571a2731081eaf9011d23569f574
+    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/bd1eb5f/appsignal-x86_64-freebsd-all-static.tar.gz
+  amd64-freebsd:
+    checksum: b7c5f81aebf371c956d90a6ce88396925d3b571a2731081eaf9011d23569f574
+    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/bd1eb5f/appsignal-x86_64-freebsd-all-static.tar.gz

data/ext/extconf.rb

@@ -9,7 +9,16 @@ require File.expand_path("../../lib/appsignal/version.rb", __FILE__)
 
 EXT_PATH     = File.expand_path("..", __FILE__).freeze
 AGENT_CONFIG = YAML.load(File.read(File.join(EXT_PATH, "agent.yml"))).freeze
-ARCH         = "#{Gem::Platform.local.cpu}-#{Gem::Platform.local.os}".freeze
+
+local_os = Gem::Platform.local.os
+chosen_os =
+  # Detect musl platforms
+  # Use `export APPSIGNAL_BUILD_FOR_MUSL=1` if the detection doesn't work.
+  if ENV["APPSIGNAL_BUILD_FOR_MUSL"] || (local_os =~ /linux/ && `ldd --version 2>&1` =~ /musl/)
+    "linux-musl"
+  end
+OS           = chosen_os || local_os
+ARCH         = "#{Gem::Platform.local.cpu}-#{OS}".freeze
 CA_CERT_PATH = File.join(EXT_PATH, "../resources/cacert.pem").freeze
 
 def ext_path(path)

data/lib/appsignal.rb

@@ -196,7 +196,7 @@ module Appsignal
         Appsignal.instrument(name) do
           yield
         end
-      rescue => error
+      rescue Exception => error # rubocop:disable Lint/RescueException
         transaction.set_error(error)
         raise error
       ensure
@@ -219,7 +219,7 @@ module Appsignal
 
     def listen_for_error
       yield
-    rescue => error
+    rescue Exception => error # rubocop:disable Lint/RescueException
       send_error(error)
       raise error
     end

data/lib/appsignal/hooks/action_cable.rb

@@ -37,7 +37,7 @@ module Appsignal
 
             begin
               original_perform_action(*args, &block)
-            rescue => exception
+            rescue Exception => exception # rubocop:disable Lint/RescueException
               transaction.set_error(exception)
               raise exception
             ensure
@@ -69,7 +69,7 @@ module Appsignal
             Appsignal.instrument "subscribed.action_cable" do
               inner.call
             end
-          rescue => exception
+          rescue Exception => exception # rubocop:disable Lint/RescueException
             transaction.set_error(exception)
             raise exception
           ensure
@@ -97,7 +97,7 @@ module Appsignal
             Appsignal.instrument "unsubscribed.action_cable" do
               inner.call
             end
-          rescue => exception
+          rescue Exception => exception # rubocop:disable Lint/RescueException
             transaction.set_error(exception)
             raise exception
           ensure

data/lib/appsignal/hooks/rake.rb

@@ -14,7 +14,7 @@ module Appsignal
 
           def execute(*args)
             execute_without_appsignal(*args)
-          rescue => error
+          rescue Exception => error # rubocop:disable Lint/RescueException
             # Format given arguments and cast to hash if possible
             params, _ = args
             params = params.to_hash if params.respond_to?(:to_hash)

data/lib/appsignal/integrations/grape.rb

@@ -20,7 +20,7 @@ module Appsignal
         )
         begin
           app.call(env)
-        rescue => error
+        rescue Exception => error # rubocop:disable Lint/RescueException
           transaction.set_error(error)
           raise error
         ensure

data/lib/appsignal/integrations/padrino.rb

@@ -34,7 +34,7 @@ module Padrino::Routing::InstanceMethods
       Appsignal.instrument("process_action.padrino") do
         route_without_appsignal(base, pass_block)
       end
-    rescue => error
+    rescue Exception => error # rubocop:disable Lint/RescueException
       transaction.set_error(error)
       raise error
     ensure

data/lib/appsignal/integrations/webmachine.rb

@@ -26,7 +26,7 @@ module Appsignal
           handle_exceptions_without_appsignal do
             begin
               yield
-            rescue => e
+            rescue Exception => e # rubocop:disable Lint/RescueException
               Appsignal.set_error(e)
               raise e
             end

data/lib/appsignal/minutely.rb

@@ -16,7 +16,7 @@ module Appsignal
               probes.each(&:call)
               sleep(wait_time)
             end
-          rescue Exception => ex
+          rescue => ex
             Appsignal.logger.error("Error in minutely thread: #{ex}")
           end
         end

data/lib/appsignal/rack/generic_instrumentation.rb

@@ -29,7 +29,7 @@ module Appsignal
           Appsignal.instrument("process_action.generic") do
             @app.call(env)
           end
-        rescue => error
+        rescue Exception => error # rubocop:disable Lint/RescueException
           transaction.set_error(error)
           raise error
         ensure

data/lib/appsignal/rack/rails_instrumentation.rb

@@ -28,7 +28,7 @@ module Appsignal
         )
         begin
           @app.call(env)
-        rescue => error
+        rescue Exception => error # rubocop:disable Lint/RescueException
           transaction.set_error(error)
           raise error
         ensure

data/lib/appsignal/rack/sinatra_instrumentation.rb

@@ -59,7 +59,7 @@ module Appsignal
           Appsignal.instrument("process_action.sinatra") do
             @app.call(env)
           end
-        rescue => error
+        rescue Exception => error # rubocop:disable Lint/RescueException
           transaction.set_error(error)
           raise error
         ensure

data/lib/appsignal/rack/streaming_listener.rb

@@ -31,7 +31,7 @@ module Appsignal
           Appsignal.instrument("process_action.rack") do
             begin
               @app.call(env)
-            rescue Exception => e
+            rescue Exception => e # rubocop:disable Lint/RescueException
               transaction.set_error(e)
               raise e
             ensure
@@ -56,14 +56,14 @@ module Appsignal
 
     def each
       @stream.each { |c| yield(c) }
-    rescue Exception => e
+    rescue Exception => e # rubocop:disable Lint/RescueException
       @transaction.set_error(e)
       raise e
     end
 
     def close
       @stream.close if @stream.respond_to?(:close)
-    rescue Exception => e
+    rescue Exception => e # rubocop:disable Lint/RescueException
       @transaction.set_error(e)
       raise e
     ensure

data/lib/appsignal/version.rb

@@ -1,5 +1,5 @@
 require "yaml"
 
 module Appsignal
-  VERSION = "2.3.7".freeze
+  VERSION = "2.4.0.alpha.1".freeze
 end

data/resources/appsignal.yml.erb

@@ -10,6 +10,22 @@ default: &defaults
   # ignore_actions:
   #   - ApplicationController#isup
 
+  # Errors that should not be recorded by AppSignal
+  # For more information see our docs:
+  # https://docs.appsignal.com/ruby/configuration/ignore-errors.html
+  # ignore_errors:
+  #   - Exception
+  #   - NoMemoryError
+  #   - ScriptError
+  #   - LoadError
+  #   - NotImplementedError
+  #   - SyntaxError
+  #   - SecurityError
+  #   - SignalException
+  #   - Interrupt
+  #   - SystemExit
+  #   - SystemStackError
+
   # See http://docs.appsignal.com/ruby/configuration/options.html for
   # all configuration options.
 

data/spec/lib/appsignal/config_spec.rb

@@ -281,7 +281,7 @@ describe Appsignal::Config do
       ENV["APPSIGNAL_APP_NAME"]                = "App name"
       ENV["APPSIGNAL_DEBUG"]                   = "true"
       ENV["APPSIGNAL_IGNORE_ACTIONS"]          = "action1,action2"
-      ENV["APPSIGNAL_IGNORE_ERRORS"]           = "VerySpecificError,AnotherError"
+      ENV["APPSIGNAL_IGNORE_ERRORS"]           = "ExampleStandardError,AnotherError"
       ENV["APPSIGNAL_IGNORE_NAMESPACES"]       = "admin,private_namespace"
       ENV["APPSIGNAL_INSTRUMENT_NET_HTTP"]     = "false"
       ENV["APPSIGNAL_INSTRUMENT_REDIS"]        = "false"
@@ -299,7 +299,7 @@ describe Appsignal::Config do
       expect(config[:name]).to eq "App name"
       expect(config[:debug]).to eq(true)
       expect(config[:ignore_actions]).to eq %w(action1 action2)
-      expect(config[:ignore_errors]).to eq %w(VerySpecificError AnotherError)
+      expect(config[:ignore_errors]).to eq %w(ExampleStandardError AnotherError)
       expect(config[:ignore_namespaces]).to eq %w(admin private_namespace)
       expect(config[:instrument_net_http]).to eq(false)
       expect(config[:instrument_redis]).to eq(false)
@@ -385,7 +385,7 @@ describe Appsignal::Config do
     before do
       config[:http_proxy] = "http://localhost"
       config[:ignore_actions] = %w(action1 action2)
-      config[:ignore_errors] = %w(VerySpecificError AnotherError)
+      config[:ignore_errors] = %w(ExampleStandardError AnotherError)
       config[:ignore_namespaces] = %w(admin private_namespace)
       config[:log] = "stdout"
       config[:log_path] = "/tmp"
@@ -411,7 +411,7 @@ describe Appsignal::Config do
       expect(ENV["_APPSIGNAL_LANGUAGE_INTEGRATION_VERSION"]).to eq "ruby-#{Appsignal::VERSION}"
       expect(ENV["_APPSIGNAL_HTTP_PROXY"]).to                   eq "http://localhost"
       expect(ENV["_APPSIGNAL_IGNORE_ACTIONS"]).to               eq "action1,action2"
-      expect(ENV["_APPSIGNAL_IGNORE_ERRORS"]).to                eq "VerySpecificError,AnotherError"
+      expect(ENV["_APPSIGNAL_IGNORE_ERRORS"]).to                eq "ExampleStandardError,AnotherError"
       expect(ENV["_APPSIGNAL_IGNORE_NAMESPACES"]).to            eq "admin,private_namespace"
       expect(ENV["_APPSIGNAL_FILTER_PARAMETERS"]).to            eq "password,confirm_password"
       expect(ENV["_APPSIGNAL_SEND_PARAMS"]).to                  eq "true"

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

@@ -143,7 +143,7 @@ describe Appsignal::Hooks::ActionCableHook do
             let(:channel) do
               Class.new(ActionCable::Channel::Base) do
                 def speak(_data)
-                  raise VerySpecificError, "oh no!"
+                  raise ExampleException, "oh no!"
                 end
 
                 def self.to_s
@@ -155,7 +155,7 @@ describe Appsignal::Hooks::ActionCableHook do
             it "registers an error on the transaction" do
               expect do
                 instance.perform_action("message" => "foo", "action" => "speak")
-              end.to raise_error(VerySpecificError)
+              end.to raise_error(ExampleException)
 
               expect(subject).to include(
                 "action" => "MyChannel#speak",
@@ -168,7 +168,7 @@ describe Appsignal::Hooks::ActionCableHook do
               )
               expect(subject["error"]).to include(
                 "backtrace" => kind_of(String),
-                "name" => "VerySpecificError",
+                "name" => "ExampleException",
                 "message" => "oh no!"
               )
               expect(subject["sample_data"]).to include(
@@ -233,7 +233,7 @@ describe Appsignal::Hooks::ActionCableHook do
             let(:channel) do
               Class.new(ActionCable::Channel::Base) do
                 def subscribed
-                  raise VerySpecificError, "oh no!"
+                  raise ExampleException, "oh no!"
                 end
 
                 def self.to_s
@@ -245,7 +245,7 @@ describe Appsignal::Hooks::ActionCableHook do
             it "registers an error on the transaction" do
               expect do
                 instance.subscribe_to_channel
-              end.to raise_error(VerySpecificError)
+              end.to raise_error(ExampleException)
 
               expect(subject).to include(
                 "action" => "MyChannel#subscribed",
@@ -258,7 +258,7 @@ describe Appsignal::Hooks::ActionCableHook do
               )
               expect(subject["error"]).to include(
                 "backtrace" => kind_of(String),
-                "name" => "VerySpecificError",
+                "name" => "ExampleException",
                 "message" => "oh no!"
               )
               expect(subject["sample_data"]).to include(
@@ -320,7 +320,7 @@ describe Appsignal::Hooks::ActionCableHook do
             let(:channel) do
               Class.new(ActionCable::Channel::Base) do
                 def unsubscribed
-                  raise VerySpecificError, "oh no!"
+                  raise ExampleException, "oh no!"
                 end
 
                 def self.to_s
@@ -332,7 +332,7 @@ describe Appsignal::Hooks::ActionCableHook do
             it "registers an error on the transaction" do
               expect do
                 instance.unsubscribe_from_channel
-              end.to raise_error(VerySpecificError)
+              end.to raise_error(ExampleException)
 
               expect(subject).to include(
                 "action" => "MyChannel#unsubscribed",
@@ -345,7 +345,7 @@ describe Appsignal::Hooks::ActionCableHook do
               )
               expect(subject["error"]).to include(
                 "backtrace" => kind_of(String),
-                "name" => "VerySpecificError",
+                "name" => "ExampleException",
                 "message" => "oh no!"
               )
               expect(subject["sample_data"]).to include(

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

@@ -61,9 +61,9 @@ describe Appsignal::Hooks::ActiveSupportNotificationsHook do
 
         expect do
           as.instrument("sql.active_record", :sql => "SQL") do
-            raise VerySpecificError, "foo"
+            raise ExampleException, "foo"
           end
-        end.to raise_error(VerySpecificError, "foo")
+        end.to raise_error(ExampleException, "foo")
       end
     end
 

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

@@ -316,7 +316,7 @@ describe Appsignal::Hooks::DelayedJobHook do
       end
 
       context "with an erroring call" do
-        let(:error) { VerySpecificError }
+        let(:error) { ExampleException }
         let(:transaction) do
           Appsignal::Transaction.new(
             SecureRandom.uuid,

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

@@ -24,7 +24,7 @@ describe Appsignal::Hooks::RakeHook do
     end
 
     context "with error" do
-      let(:error) { VerySpecificError.new }
+      let(:error) { ExampleException }
       let(:transaction) { background_job_transaction }
       before do
         task.enhance { raise error }
@@ -66,7 +66,7 @@ describe Appsignal::Hooks::RakeHook do
       end
 
       after do
-        expect { task.execute(arguments) }.to raise_error VerySpecificError
+        expect { task.execute(arguments) }.to raise_error ExampleException
       end
     end
   end

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

@@ -146,17 +146,17 @@ describe Appsignal::Hooks::ShoryukenMiddleware do
     end
 
     it "sets the exception on the transaction" do
-      expect(transaction).to receive(:set_error).with(VerySpecificError)
+      expect(transaction).to receive(:set_error).with(ExampleException)
     end
 
     after do
       expect do
         Timecop.freeze(Time.parse("01-01-2001 10:01:00UTC")) do
           Appsignal::Hooks::ShoryukenMiddleware.new.call(worker_instance, queue, sqs_msg, body) do
-            raise VerySpecificError
+            raise ExampleException
           end
         end
-      end.to raise_error(VerySpecificError)
+      end.to raise_error(ExampleException)
     end
   end
 end

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

@@ -224,7 +224,7 @@ if DependencyHelper.sidekiq_present?
     end
 
     context "with an erroring job" do
-      let(:error) { VerySpecificError }
+      let(:error) { ExampleException }
       before do
         expect do
           Timecop.freeze(Time.parse("01-01-2001 10:01:00UTC")) do
@@ -240,7 +240,7 @@ if DependencyHelper.sidekiq_present?
         # TODO: backtrace should be an Array of Strings
         # https://github.com/appsignal/appsignal-agent/issues/294
         expect(transaction_hash["error"]).to include(
-          "name" => "VerySpecificError",
+          "name" => "ExampleException",
           "message" => "uh oh",
           "backtrace" => kind_of(String)
         )

data/spec/lib/appsignal/integrations/grape_spec.rb

@@ -77,7 +77,7 @@ if DependencyHelper.grape_present?
             Class.new(::Grape::API) do
               format :json
               post :ping do
-                raise VerySpecificError
+                raise ExampleException
               end
             end
           end
@@ -90,11 +90,11 @@ if DependencyHelper.grape_present?
           end
 
           it "sets the error" do
-            expect(transaction).to receive(:set_error).with(kind_of(VerySpecificError))
+            expect(transaction).to receive(:set_error).with(kind_of(ExampleException))
           end
 
           after do
-            expect { middleware.call(env) }.to raise_error VerySpecificError
+            expect { middleware.call(env) }.to raise_error ExampleException
           end
         end
 

data/spec/lib/appsignal/integrations/padrino_spec.rb

@@ -215,11 +215,11 @@ if DependencyHelper.padrino_present?
             context "with an exception in the controller" do
               let(:path) { "/exception" }
               before do
-                app.controllers { get(:exception) { raise VerySpecificError } }
+                app.controllers { get(:exception) { raise ExampleException } }
                 expect_a_transaction_to_be_created
               end
               after do
-                expect { response }.to raise_error(VerySpecificError)
+                expect { response }.to raise_error(ExampleException)
               end
 
               it "sets the action name based on the app name and action name" do
@@ -227,7 +227,7 @@ if DependencyHelper.padrino_present?
               end
 
               it "sets the error on the transaction" do
-                expect(transaction).to receive(:set_error).with(VerySpecificError)
+                expect(transaction).to receive(:set_error).with(ExampleException)
               end
             end
 

data/spec/lib/appsignal/integrations/resque_spec.rb

@@ -18,7 +18,7 @@ if DependencyHelper.resque_present?
           extend Appsignal::Integrations::ResquePlugin
 
           def self.perform
-            raise VerySpecificError
+            raise ExampleException
           end
         end
       end
@@ -72,11 +72,11 @@ if DependencyHelper.resque_present?
           end
 
           it "sets the exception on the transaction" do
-            expect(transaction).to receive(:set_error).with(VerySpecificError)
+            expect(transaction).to receive(:set_error).with(ExampleException)
           end
 
           after do
-            expect { job.perform }.to raise_error(VerySpecificError)
+            expect { job.perform }.to raise_error(ExampleException)
           end
         end
       end

data/spec/lib/appsignal/integrations/webmachine_spec.rb

@@ -55,7 +55,7 @@ if DependencyHelper.webmachine_present?
     end
 
     describe "#handle_exceptions_with_appsignal" do
-      let(:error) { VerySpecificError.new }
+      let(:error) { ExampleException }
 
       it "should catch the error and send it to AppSignal" do
         expect(Appsignal).to receive(:set_error).with(error)

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

@@ -49,15 +49,15 @@ describe Appsignal::Rack::GenericInstrumentation do
       expect(app).to receive(:call).with(env)
     end
 
-    context "with an error", :error => true do
-      let(:error) { VerySpecificError.new }
+    context "with an exception", :error => true do
+      let(:error) { ExampleException }
       let(:app) do
         double.tap do |d|
           allow(d).to receive(:call).and_raise(error)
         end
       end
 
-      it "should set the error" do
+      it "records the exception" do
         expect_any_instance_of(Appsignal::Transaction).to receive(:set_error).with(error)
       end
     end
@@ -85,6 +85,6 @@ describe Appsignal::Rack::GenericInstrumentation do
     end
 
     after(:error => false) { middleware.call(env) }
-    after(:error => true) { expect { middleware.call(env) }.to raise_error(VerySpecificError) }
+    after(:error => true) { expect { middleware.call(env) }.to raise_error(error) }
   end
 end

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

@@ -68,15 +68,15 @@ if DependencyHelper.rails_present?
         expect(app).to receive(:call).with(env)
       end
 
-      context "with an error", :error => true do
-        let(:error) { VerySpecificError }
+      context "with an exception", :error => true do
+        let(:error) { ExampleException }
         let(:app) do
           double.tap do |d|
             allow(d).to receive(:call).and_raise(error)
           end
         end
 
-        it "should set the error" do
+        it "records the exception" do
           expect_any_instance_of(Appsignal::Transaction).to receive(:set_error).with(error)
         end
       end
@@ -91,7 +91,7 @@ if DependencyHelper.rails_present?
       end
 
       after(:error => false) { middleware.call(env) }
-      after(:error => true) { expect { middleware.call(env) }.to raise_error(VerySpecificError) }
+      after(:error => true) { expect { middleware.call(env) }.to raise_error(error) }
     end
 
     describe "#request_id" do

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

@@ -118,7 +118,7 @@ if DependencyHelper.sinatra_present?
       end
 
       context "with an error", :error => true do
-        let(:error) { VerySpecificError }
+        let(:error) { ExampleException }
         let(:app) do
           double.tap do |d|
             allow(d).to receive(:call).and_raise(error)
@@ -126,23 +126,23 @@ if DependencyHelper.sinatra_present?
           end
         end
 
-        it "should set the error" do
+        it "records the exception" do
           expect_any_instance_of(Appsignal::Transaction).to receive(:set_error).with(error)
         end
       end
 
       context "with an error in sinatra.error" do
-        let(:error) { VerySpecificError }
+        let(:error) { ExampleException }
         let(:env) { { "sinatra.error" => error } }
 
-        it "should set the error" do
+        it "records the exception" do
           expect_any_instance_of(Appsignal::Transaction).to receive(:set_error).with(error)
         end
 
-        context "if raise_errors is on" do
+        context "when raise_errors is on" do
           let(:settings) { double(:raise_errors => true) }
 
-          it "should not set the error" do
+          it "does not record the error" do
             expect_any_instance_of(Appsignal::Transaction).to_not receive(:set_error)
           end
         end
@@ -150,7 +150,7 @@ if DependencyHelper.sinatra_present?
         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
+          it "does not record the error" do
             expect_any_instance_of(Appsignal::Transaction).to_not receive(:set_error)
           end
         end
@@ -207,7 +207,7 @@ if DependencyHelper.sinatra_present?
       end
 
       after(:error => false) { middleware.call(env) }
-      after(:error => true) { expect { middleware.call(env) }.to raise_error(VerySpecificError) }
+      after(:error => true) { expect { middleware.call(env) }.to raise_error(error) }
     end
   end
 end

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

@@ -87,7 +87,7 @@ describe Appsignal::Rack::StreamingListener do
     end
 
     context "with an exception in the instrumentation call" do
-      let(:error) { VerySpecificError }
+      let(:error) { ExampleException }
 
       it "should add the exception to the transaction" do
         allow(app).to receive(:call).and_raise(error)
@@ -118,18 +118,17 @@ describe Appsignal::StreamWrapper do
   let(:wrapper)     { Appsignal::StreamWrapper.new(stream, transaction) }
 
   describe "#each" do
-    it "should call the original stream" do
+    it "calls the original stream" do
       expect(stream).to receive(:each)
 
       wrapper.each
     end
 
-    context "when each raises an error" do
-      let(:error) { VerySpecificError }
+    context "when #each raises an error" do
+      let(:error) { ExampleException }
 
-      it "should add the exception to the transaction" do
-        allow(stream).to receive(:each)
-          .and_raise(error)
+      it "records the exception" do
+        allow(stream).to receive(:each).and_raise(error)
 
         expect(transaction).to receive(:set_error).with(error)
 
@@ -139,17 +138,17 @@ describe Appsignal::StreamWrapper do
   end
 
   describe "#close" do
-    it "should call the original stream and close the transaction" do
+    it "closes the original stream and completes the transaction" do
       expect(stream).to receive(:close)
       expect(Appsignal::Transaction).to receive(:complete_current!)
 
       wrapper.close
     end
 
-    context "when each raises an error" do
-      let(:error) { VerySpecificError }
+    context "when #close raises an error" do
+      let(:error) { ExampleException }
 
-      it "adds the exception to the transaction and close it" do
+      it "records the exception and completes the transaction" do
         allow(stream).to receive(:close).and_raise(error)
 
         expect(transaction).to receive(:set_error).with(error)

data/spec/lib/appsignal/transaction_spec.rb

@@ -133,13 +133,13 @@ describe Appsignal::Transaction do
 
       context "when encountering an error while completing" do
         before do
-          expect(transaction).to receive(:complete).and_raise VerySpecificError
+          expect(transaction).to receive(:complete).and_raise ExampleStandardError
         end
 
         it "logs an error message" do
           Appsignal::Transaction.complete_current!
           expect(log_contents(log)).to contains_log :error,
-            "Failed to complete transaction ##{transaction.transaction_id}. VerySpecificError"
+            "Failed to complete transaction ##{transaction.transaction_id}. ExampleStandardError"
         end
 
         it "clears the current transaction" do

data/spec/lib/appsignal_spec.rb

@@ -348,7 +348,7 @@ describe Appsignal do
       end
 
       context "with an erroring call" do
-        let(:error) { VerySpecificError.new }
+        let(:error) { ExampleException.new }
 
         it "should add the error to the current transaction and complete" do
           expect_any_instance_of(Appsignal::Transaction).to receive(:set_error).with(error)
@@ -379,7 +379,7 @@ describe Appsignal do
       end
 
       context "with an erroring call" do
-        let(:error) { VerySpecificError.new }
+        let(:error) { ExampleException.new }
 
         it "should call monitor_transaction and stop and then raise the error" do
           expect(Appsignal).to receive(:monitor_transaction).with(
@@ -719,7 +719,7 @@ describe Appsignal do
           Appsignal::Transaction::GenericRequest.new({})
         )
       end
-      let(:error) { VerySpecificError.new }
+      let(:error) { ExampleException.new }
 
       it "sends the error to AppSignal" do
         expect(Appsignal::Transaction).to receive(:new).with(

data/spec/support/helpers/example_exception.rb

@@ -0,0 +1,13 @@
+# This ExampleException is used for throwing Exceptions in specs that are
+# allowed or expected.
+#
+# For example, this error can be thrown to raise an exception in AppSignal's
+# run, which should stop the program and the appsignal gem, but not crash the
+# test suite.
+#
+# There's also {ExampleStandardError}, use this when you need to test against
+# StandardError-level Ruby exceptions.
+#
+# @see ExampleStandardError
+class ExampleException < Exception # rubocop:disable Lint/InheritException
+end

data/spec/support/helpers/example_standard_error.rb

@@ -0,0 +1,13 @@
+# This ExampleStandardError is used for throwing errors in specs that are
+# allowed or expected.
+#
+# For example, this error can be thrown to raise an exception in AppSignal's
+# run, which should stop the program and the appsignal gem, but not crash the
+# test suite.
+#
+# There's also {ExampleException}, use this when you need to test against
+# Exception-level Ruby exceptions.
+#
+# @see ExampleException
+class ExampleStandardError < StandardError
+end

data/spec/support/shared_examples/instrument.rb

@@ -24,9 +24,9 @@ RSpec.shared_examples "instrument helper" do
       expect do
         instrumenter.instrument "name", "title", "body" do
           stub.method_call
-          raise VerySpecificError, "foo"
+          raise ExampleException, "foo"
         end
-      end.to raise_error(VerySpecificError, "foo")
+      end.to raise_error(ExampleException, "foo")
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 2.3.7
+  version: 2.4.0.alpha.1
 platform: ruby
 authors:
 - Robert Beekman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-10 00:00:00.000000000 Z
+date: 2017-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -314,12 +314,13 @@ files:
 - spec/support/helpers/dependency_helper.rb
 - spec/support/helpers/directory_helper.rb
 - spec/support/helpers/env_helpers.rb
+- spec/support/helpers/example_exception.rb
+- spec/support/helpers/example_standard_error.rb
 - spec/support/helpers/log_helpers.rb
 - spec/support/helpers/std_streams_helper.rb
 - spec/support/helpers/system_helpers.rb
 - spec/support/helpers/time_helpers.rb
 - spec/support/helpers/transaction_helpers.rb
-- spec/support/helpers/very_specific_error.rb
 - spec/support/matchers/contains_log.rb
 - spec/support/mocks/fake_gc_profiler.rb
 - spec/support/mocks/mock_extension.rb
@@ -348,9 +349,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.2.1
@@ -436,12 +437,13 @@ test_files:
 - spec/support/helpers/dependency_helper.rb
 - spec/support/helpers/directory_helper.rb
 - spec/support/helpers/env_helpers.rb
+- spec/support/helpers/example_exception.rb
+- spec/support/helpers/example_standard_error.rb
 - spec/support/helpers/log_helpers.rb
 - spec/support/helpers/std_streams_helper.rb
 - spec/support/helpers/system_helpers.rb
 - spec/support/helpers/time_helpers.rb
 - spec/support/helpers/transaction_helpers.rb
-- spec/support/helpers/very_specific_error.rb
 - spec/support/matchers/contains_log.rb
 - spec/support/mocks/fake_gc_profiler.rb
 - spec/support/mocks/mock_extension.rb

data/spec/support/helpers/very_specific_error.rb

@@ -1,8 +0,0 @@
-# This VerySpecificError is used for throwing errors in specs that are allowed
-# or expected.
-#
-# For example, this error can be thrown to raise an exception in AppSignal's
-# run, which should stop the program and the appsignal gem, but not crash the
-# test suite.
-class VerySpecificError < RuntimeError
-end