Added unhandled functionality, updated tests and integrations

lib/bugsnag.rb

@@ -33,12 +33,37 @@ def configure
     end
 
     # Explicitly notify of an exception
-    def notify(exception, auto_notify=false, &block)
-      if auto_notify && !configuration.auto_notify
+    def notify(exception, &block)
+      report = Report.new(exception, configuration)
+      send_report(report, false, &block)
+    end
+
+    # For automatic notification of exceptions
+    def auto_notify(exception, severity_reason, &block)
+      if !configuration.auto_notify
         configuration.debug("Not notifying because auto_notify is disabled")
         return
       end
 
+      report = Report.new(exception, configuration, true, severity_reason)
+
+      send_report(report, true, &block)
+    end
+
+    # Configuration getters
+    def configuration
+      @configuration = nil unless defined?(@configuration)
+      @configuration || LOCK.synchronize { @configuration ||= Bugsnag::Configuration.new }
+    end
+
+    # Allow access to "before notify" callbacks
+    def before_notify_callbacks
+      Bugsnag.configuration.request_data[:before_callbacks] ||= []
+    end
+
+    private
+    def send_report(report, auto_notify, &block)
+
       if !configuration.valid_api_key?
         configuration.debug("Not notifying due to an invalid api_key")
         return
@@ -49,8 +74,6 @@ def notify(exception, auto_notify=false, &block)
         return
       end
 
-      report = Report.new(exception, configuration)
-
       # If this is an auto_notify we yield the block before the any middleware is run
       yield(report) if block_given? && auto_notify
       if report.ignore?
@@ -65,6 +88,9 @@ def notify(exception, auto_notify=false, &block)
         return
       end
 
+      # Store default severity for future reference
+      initial_severity = report.severity
+
       # Run users middleware
       configuration.middleware.run(report) do
         if report.ignore?
@@ -80,24 +106,18 @@ def notify(exception, auto_notify=false, &block)
           return
         end
 
+        # Test whether severity has been changed
+        if report.severity != initial_severity
+          report.default_severity = false
+        end
+
         # Deliver
         configuration.info("Notifying #{configuration.endpoint} of #{report.exceptions.last[:errorClass]}")
         payload_string = ::JSON.dump(Bugsnag::Helpers.trim_if_needed(report.as_json))
         configuration.debug("Payload: #{payload_string}")
         Bugsnag::Delivery[configuration.delivery_method].deliver(configuration.endpoint, payload_string, configuration)
       end
     end
-
-    # Configuration getters
-    def configuration
-      @configuration = nil unless defined?(@configuration)
-      @configuration || LOCK.synchronize { @configuration ||= Bugsnag::Configuration.new }
-    end
-
-    # Allow access to "before notify" callbacks
-    def before_notify_callbacks
-      Bugsnag.configuration.request_data[:before_callbacks] ||= []
-    end
   end
 end
 

lib/bugsnag/integrations/mailman.rb

@@ -13,7 +13,12 @@ def call(mail)
         yield
       rescue Exception => ex
         raise ex if [Interrupt, SystemExit, SignalException].include? ex.class
-        Bugsnag.notify(ex, true) do |report|
+        Bugsnag.auto_notify(ex, {
+            :type => "middleware",
+            :attributes => {
+              :name => "mailman"
+            }
+          }) do |report|
           report.severity = "error"
         end
         raise

lib/bugsnag/integrations/rack.rb

@@ -33,7 +33,12 @@ def call(env)
         response = @app.call(env)
       rescue Exception => raised
         # Notify bugsnag of rack exceptions
-        Bugsnag.notify(raised, true) do |report|
+        Bugsnag.auto_notify(raised, {
+          :type => "middleware_handler",
+          :attirbutes => {
+            :name => "rack"
+          }
+        }) do |report|
           report.severity = "error"
         end
 
@@ -43,7 +48,12 @@ def call(env)
 
       # Notify bugsnag of rack exceptions
       if env["rack.exception"]
-        Bugsnag.notify(env["rack.exception"], true) do |report|
+        Bugsnag.auto_notify(env["rack.exception"], {
+          :type => "middleware",
+          :attributes => {
+            :name => "rack"
+          }
+        }) do |report|
           report.severity = "error"
         end
       end

lib/bugsnag/integrations/rails/active_record_rescue.rb

@@ -8,7 +8,12 @@ def run_callbacks(kind, *args, &block)
           super
         rescue StandardError => exception
           # This exception will NOT be escalated, so notify it here.
-          Bugsnag.notify(exception, true) do |report|
+          Bugsnag.auto_notify(exception, {
+            :type => "middleware",
+            :attributes => {
+              :name => "active record"
+            }
+          }) do |report|
             report.severity = "error"
           end
           raise

lib/bugsnag/integrations/railtie.rb

@@ -17,7 +17,12 @@ class Railtie < Rails::Railtie
       runner do
         at_exit do
           if $!
-            Bugsnag.notify($!, true) do |report|
+            Bugsnag.auto_notify($!, {
+              :type => "middleware",
+              :attributes => {
+                :name => "railtie"
+              }
+            }) do |report|
               report.severity = "error"
             end
           end

lib/bugsnag/integrations/rake.rb

@@ -12,7 +12,12 @@ def execute_with_bugsnag(args=nil)
     execute_without_bugsnag(args)
 
   rescue Exception => ex
-    Bugsnag.notify(ex, true) do |report|
+    Bugsnag.auto_notify(ex, {
+      :type => "middleware",
+      :attributes => {
+        :name => "rake"
+      }
+    }) do |report|
       report.severity = "error"
     end
     raise

lib/bugsnag/integrations/resque.rb

@@ -26,7 +26,12 @@ def self.add_failure_backend
     end
 
     def save
-      Bugsnag.notify(exception, true) do |report|
+      Bugsnag.auto_notify(exception, {
+        :type => "middleware",
+        :attributes => {
+          :name => "mailman"
+        }
+      }) do |report|
         report.severity = "error"
         report.meta_data.merge!({:context => "#{payload['class']}@#{queue}", :payload => payload, :delivery_method => :synchronous})
       end

lib/bugsnag/integrations/sidekiq.rb

@@ -16,7 +16,15 @@ def call(worker, msg, queue)
         yield
       rescue Exception => ex
         raise ex if [Interrupt, SystemExit, SignalException].include? ex.class
-        Bugsnag.notify(ex, true) do |report|
+        Bugsnag.auto_notify(
+          ex,
+          {
+            :type => 'middleware_handler',
+            :attributes => {
+              :name => "sidekiq"
+            }
+          }
+        ) do |report|
           report.severity = "error"
         end
         raise

lib/bugsnag/report.rb

@@ -17,6 +17,7 @@ class Report
     attr_accessor :app_version
     attr_accessor :configuration
     attr_accessor :context
+    attr_accessor :default_severity
     attr_accessor :delivery_method
     attr_accessor :exceptions
     attr_accessor :hostname
@@ -27,8 +28,10 @@ class Report
     attr_accessor :severity
     attr_accessor :user
 
-    def initialize(exception, passed_configuration)
+    def initialize(exception, passed_configuration, unhandled=false, severity_reason=nil)
       @should_ignore = false
+      @unhandled = unhandled
+      @severity_reason = severity_reason
 
       self.configuration = passed_configuration
 
@@ -43,6 +46,7 @@ def initialize(exception, passed_configuration)
       self.meta_data = {}
       self.release_stage = configuration.release_stage
       self.severity = "warning"
+      self.default_severity = true
       self.user = {}
     end
 
@@ -77,16 +81,23 @@ def as_json
           type: app_type
         },
         context: context,
+        defaultSeverity: default_severity,
         device: {
           hostname: hostname
         },
         exceptions: exceptions,
         groupingHash: grouping_hash,
         payloadVersion: CURRENT_PAYLOAD_VERSION,
         severity: severity,
+        unhandled: @unhandled,
         user: user
       }
 
+      # add severity_reason if necessary
+      if @unhandled
+        payload_event[:severityReason] = @severity_reason
+      end
+
       # cleanup character encodings
       payload_event = Bugsnag::Cleaner.clean_object_encoding(payload_event)
 

lib/bugsnag/tasks/bugsnag.rake

@@ -6,7 +6,14 @@ namespace :bugsnag do
     begin
       raise RuntimeError.new("Bugsnag test exception")
     rescue => e
-      Bugsnag.notify(e, {:context => "rake#test_exception"})
+      Bugsnag.auto_notify(e, {
+        :type => "middleware",
+        :attributes => {
+          :name => "rake"
+        }
+      }) do |report|
+        report.context = "rake#test_exception"
+      end
     end
   end
 end

spec/report_spec.rb

@@ -388,7 +388,7 @@ def gloops
   end
 
   it "autonotifies errors" do
-    Bugsnag.notify(BugsnagTestException.new("It crashed"), true) do |report|
+    Bugsnag.auto_notify(BugsnagTestException.new("It crashed"), {}) do |report|
       report.severity = "error"
     end
 
@@ -421,12 +421,12 @@ def gloops
     }
   end
 
-  it "does not send a notification if auto_notify is false" do
+  it "does not send an automatic notification if auto_notify is false" do
     Bugsnag.configure do |config|
       config.auto_notify = false
     end
 
-    Bugsnag.notify(BugsnagTestException.new("It crashed"), true)
+    Bugsnag.auto_notify(BugsnagTestException.new("It crashed"), true)
 
     expect(Bugsnag).not_to have_sent_notification
   end
@@ -888,6 +888,52 @@ def gloops
     }
   end
 
+  it 'should use defaults when notify is called' do
+    Bugsnag.notify(BugsnagTestException.new("It crashed"))
+
+    expect(Bugsnag).to have_sent_notification{ |payload|
+      event = payload["events"][0]
+      expect(event["unhandled"]).to be false
+      expect(event["severityReason"].nil?).to be true
+      expect(event["defaultSeverity"]).to be true
+    }
+  end
+
+  it 'should attach a severity reason when auto_notify is called' do
+    Bugsnag.auto_notify(
+      BugsnagTestException.new("It crashed"),
+      {
+        :type => "middleware_handler",
+        :attributes => {
+          :name => "middleware_test"
+        }
+      }
+    )
+
+    expect(Bugsnag).to have_sent_notification{ |payload|
+      event = payload["events"][0]
+      expect(event["severityReason"]).to eq(
+        {
+          "type" => "middleware_handler",
+          "attributes" => {
+            "name" => "middleware_test"
+          }
+        }
+      )
+      expect(event["unhandled"]).to be true
+    }
+  end
+
+  it 'should set default_severity flag if severity is changed' do
+    Bugsnag.notify(BugsnagTestException.new("It crashed")) do |report|
+      report.severity = "info"
+    end
+
+    expect(Bugsnag).to have_sent_notification{ |payload|
+      expect(payload["events"][0]["defaultSeverity"]).to be false
+    }
+  end
+
   if defined?(JRUBY_VERSION)
 
     it "should work with java.lang.Throwables" do