bugsnag 5.5.0 → 6.0.0

data/lib/bugsnag/delivery.rb

@@ -1,10 +1,19 @@
 module Bugsnag
   module Delivery
     class << self
+      # Add a delivery method to the list of supported methods. Any registered
+      # method can then be used by name in Configuration.
+      #
+      # require 'bugsnag'
+      # Bugsnag::Delivery.register(:my_delivery_queue, MyDeliveryQueue)
+      # Bugsnag.configure do |config|
+      #   config.delivery_method = :my_delivery_queue
+      # end
       def register(name, delivery_method)
         delivery_methods[name.to_sym] = delivery_method
       end
 
+      # Reference a delivery method by name
       def [](name)
         delivery_methods[name.to_sym]
       end

data/lib/bugsnag/delivery/synchronous.rb

@@ -10,13 +10,13 @@ module Bugsnag
         def deliver(url, body, configuration)
           begin
             response = request(url, body, configuration)
-            Bugsnag.debug("Notification to #{url} finished, response was #{response.code}, payload was #{body}")
+            configuration.debug("Notification to #{url} finished, response was #{response.code}, payload was #{body}")
           rescue StandardError => e
             # KLUDGE: Since we don't re-raise http exceptions, this breaks rspec
             raise if e.class.to_s == "RSpec::Expectations::ExpectationNotMetError"
 
-            Bugsnag.warn("Notification to #{url} failed, #{e.inspect}")
-            Bugsnag.warn(e.backtrace)
+            configuration.warn("Notification to #{url} failed, #{e.inspect}")
+            configuration.warn(e.backtrace)
           end
         end
 
@@ -36,8 +36,6 @@ module Bugsnag
 
           if uri.scheme == "https"
             http.use_ssl = true
-            # the default in 1.9+, but required for 1.8
-            http.verify_mode = OpenSSL::SSL::VERIFY_PEER
             http.ca_file = configuration.ca_file if configuration.ca_file
           end
 

data/lib/bugsnag/delivery/thread_queue.rb

@@ -9,10 +9,12 @@ module Bugsnag
 
       class << self
         def deliver(url, body, configuration)
+          @configuration = configuration
+
           start_once!
 
           if @queue.length > MAX_OUTSTANDING_REQUESTS
-            Bugsnag.warn("Dropping notification, #{@queue.length} outstanding requests")
+            @configuration.warn("Dropping notification, #{@queue.length} outstanding requests")
             return
           end
 
@@ -38,7 +40,7 @@ module Bugsnag
             end
 
             at_exit do
-              Bugsnag.warn("Waiting for #{@queue.length} outstanding request(s)") unless @queue.empty?
+              @configuration.warn("Waiting for #{@queue.length} outstanding request(s)") unless @queue.empty?
               @queue.push STOP
               worker_thread.join
             end

data/lib/bugsnag/helpers.rb

@@ -1,12 +1,12 @@
 require 'uri'
-require 'set' unless defined?(Set)
-require 'json' unless defined?(JSON)
+require 'set'
+require 'json'
 
 
 module Bugsnag
   module Helpers
     MAX_STRING_LENGTH = 3072
-    MAX_PAYLOAD_LENGTH = 128000
+    MAX_PAYLOAD_LENGTH = 256000
     MAX_ARRAY_LENGTH = 40
     RAW_DATA_TYPES = [Numeric, TrueClass, FalseClass]
 
@@ -23,16 +23,9 @@ module Bugsnag
       remove_metadata_from_events(reduced_value)
     end
 
-    def self.flatten_meta_data(overrides)
-      return nil unless overrides
+    private
 
-      meta_data = overrides.delete(:meta_data)
-      if meta_data.is_a?(Hash)
-        overrides.merge(meta_data)
-      else
-        overrides
-      end
-    end
+    TRUNCATION_INFO = '[TRUNCATED]'
 
     # Check if a value is a raw type which should not be trimmed, truncated
     # or converted to a string
@@ -40,10 +33,6 @@ module Bugsnag
       RAW_DATA_TYPES.detect {|klass| value.is_a?(klass)} != nil
     end
 
-    private
-
-    TRUNCATION_INFO = '[TRUNCATED]'
-
     # Shorten array until it fits within the payload size limit when serialized
     def self.truncate_array(array)
       return [] unless array.respond_to?(:slice)

data/lib/bugsnag/{delayed_job.rb → integrations/delayed_job.rb}

@@ -8,9 +8,12 @@ end
 unless defined? Delayed::Plugins::Bugsnag
   module Delayed
     module Plugins
+      class Bugsnag < Plugin
 
+        FRAMEWORK_ATTRIBUTES = {
+          :framework => "DelayedJob"
+        }
 
-      class Bugsnag < Plugin
         module Notify
           def error(job, error)
             overrides = {
@@ -19,11 +22,9 @@ unless defined? Delayed::Plugins::Bugsnag
                 :id => job.id,
               },
               :severity_reason => {
-                :type => ::Bugsnag::Notification::UNHANDLED_EXCEPTION_MIDDLEWARE,
-                :attributes => {
-                  :framework => "DelayedJob"
-                }
-              }
+                :type => ::Bugsnag::Report::UNHANDLED_EXCEPTION_MIDDLEWARE,
+                :attributes => FRAMEWORK_ATTRIBUTES,
+              },
             }
             if job.respond_to?(:queue) && (queue = job.queue)
               overrides[:job][:queue] = queue
@@ -50,7 +51,14 @@ unless defined? Delayed::Plugins::Bugsnag
               overrides[:job][:payload] = p
             end
 
-            ::Bugsnag.auto_notify(error, overrides)
+            ::Bugsnag.notify(error, true) do |report|
+              report.severity = "error"
+              report.severity_reason = {
+                :type => ::Bugsnag::Report::UNHANDLED_EXCEPTION_MIDDLEWARE,
+                :attributes => FRAMEWORK_ATTRIBUTES
+              }
+              report.meta_data.merge! overrides
+            end
 
             super if defined?(super)
           end

data/lib/bugsnag/{mailman.rb → integrations/mailman.rb}

@@ -2,6 +2,11 @@ require 'mailman'
 
 module Bugsnag
   class Mailman
+
+    FRAMEWORK_ATTRIBUTES = {
+      :framework => "Mailman"
+    }
+
     def initialize
       Bugsnag.configuration.internal_middleware.use(Bugsnag::Middleware::Mailman)
       Bugsnag.configuration.app_type = "mailman"
@@ -9,23 +14,20 @@ module Bugsnag
 
     def call(mail)
       begin
-
-        Bugsnag.set_request_data :mailman_msg, mail.to_s
-
+        Bugsnag.configuration.set_request_data :mailman_msg, mail.to_s
         yield
       rescue Exception => ex
         raise ex if [Interrupt, SystemExit, SignalException].include? ex.class
-        Bugsnag.auto_notify(ex, {
-          :severity_reason => {
-            :type => Bugsnag::Notification::UNHANDLED_EXCEPTION_MIDDLEWARE,
-            :attributes => {
-              :framework => "Mailman"
-            }
+        Bugsnag.notify(ex, true) do |report|
+          report.severity = "error"
+          report.severity_reason = {
+            :type => Bugsnag::Report::UNHANDLED_EXCEPTION_MIDDLEWARE,
+            :attributes => FRAMEWORK_ATTRIBUTES
           }
-        })
+        end
         raise
       ensure
-        Bugsnag.clear_request_data
+        Bugsnag.configuration.clear_request_data
       end
     end
   end

data/lib/bugsnag/{que.rb → integrations/que.rb}

@@ -3,14 +3,7 @@ if defined?(::Que)
     begin
       job = job.dup # Make sure the original job object is not mutated.
 
-      Bugsnag.auto_notify(error, {
-        :severity_reason => {
-          :type => Bugsnag::Notification::UNHANDLED_EXCEPTION_MIDDLEWARE,
-          :attributes => {
-            :framework => "Que"
-          }
-        }
-      }) do |notification|
+      Bugsnag.notify(error, true) do |report|
         job[:error_count] += 1
 
         # If the job was scheduled using ActiveJob then unwrap the job details for clarity:
@@ -25,11 +18,18 @@ if defined?(::Que)
           job.merge!(wrapper_job_class: job[:job_class], wrapper_job_id: job[:job_id]).merge!(wrapped_job)
         end
 
-        notification.add_tab(:job, job)
+        report.add_tab(:job, job)
+        report.severity = 'error'
+        report.severity_reason = {
+          :type => Bugsnag::Report::UNHANDLED_EXCEPTION_MIDDLEWARE,
+          :attributes => {
+            :framework => 'Que'
+          }
+        }
       end
     rescue => e
       # Que supresses errors raised by its error handler to avoid killing the worker. Log them somewhere:
-      Bugsnag.warn("Failed to notify Bugsnag of error in Que job (#{e.class}): #{e.message} \n#{e.backtrace[0..9].join("\n")}")
+      Bugsnag.configuration.warn("Failed to notify Bugsnag of error in Que job (#{e.class}): #{e.message} \n#{e.backtrace[0..9].join("\n")}")
       raise
     end
   end
@@ -41,4 +41,4 @@ if defined?(::Que)
     Bugsnag.configuration.app_type ||= "que"
     Que.error_handler = handler
   end
-end
+end

data/lib/bugsnag/{rack.rb → integrations/rack.rb}

@@ -1,11 +1,8 @@
 module Bugsnag
   class Rack
 
-    SEVERITY_REASON = {
-      :type => Bugsnag::Notification::UNHANDLED_EXCEPTION_MIDDLEWARE,
-      :attributes => {
-        :framework => "Rack"
-      }
+    FRAMEWORK_ATTRIBUTES = {
+      :framework => "Rack"
     }
 
     def initialize(app)
@@ -14,37 +11,41 @@ module Bugsnag
       # Configure bugsnag rack defaults
       Bugsnag.configure do |config|
         # Try to set the release_stage automatically if it hasn't already been set
-        config.release_stage ||= release_stage
+        config.release_stage ||= ENV["RACK_ENV"] if ENV["RACK_ENV"]
 
         # Try to set the project_root if it hasn't already been set, or show a warning if we can't
         unless config.project_root && !config.project_root.to_s.empty?
           if defined?(settings)
             config.project_root = settings.root
           else
-            Bugsnag.warn("You should set your app's project_root (see https://bugsnag.com/docs/notifiers/ruby#project_root).")
+            config.warn("You should set your app's project_root (see https://bugsnag.com/docs/notifiers/ruby#project_root).")
           end
         end
 
         # Hook up rack-based notification middlewares
         config.middleware.insert_before([Bugsnag::Middleware::Rails3Request,Bugsnag::Middleware::Callbacks], Bugsnag::Middleware::RackRequest) if defined?(::Rack)
         config.middleware.insert_before(Bugsnag::Middleware::Callbacks, Bugsnag::Middleware::WardenUser) if defined?(Warden)
-        config.middleware.insert_before(Bugsnag::Middleware::Callbacks, Bugsnag::Middleware::ClearanceUser) if defined?(Clearance)
+        config.middleware.insert_before(Bugsnag::Middleware::Callbkacs, Bugsnag::Middleware::ClearanceUser) if defined?(Clearance)
 
-        Bugsnag.configuration.app_type ||= "rack"
+        config.app_type ||= "rack"
       end
     end
 
     def call(env)
       # Set the request data for bugsnag middleware to use
-      Bugsnag.set_request_data(:rack_env, env)
+      Bugsnag.configuration.set_request_data(:rack_env, env)
 
       begin
         response = @app.call(env)
       rescue Exception => raised
         # Notify bugsnag of rack exceptions
-        Bugsnag.auto_notify(raised, {
-          :severity_reason => SEVERITY_REASON
-        })
+        Bugsnag.notify(raised, true) do |report|
+          report.severity = "error"
+          report.severity_reason = {
+            :type => Bugsnag::Report::UNHANDLED_EXCEPTION_MIDDLEWARE,
+            :attributes => Bugsnag::Rack::FRAMEWORK_ATTRIBUTES
+          }
+        end
 
         # Re-raise the exception
         raise
@@ -52,21 +53,19 @@ module Bugsnag
 
       # Notify bugsnag of rack exceptions
       if env["rack.exception"]
-        Bugsnag.auto_notify(env["rack.exception"], {
-          :severity_reason => SEVERITY_REASON
-        })
+        Bugsnag.notify(env["rack.exception"], true) do |report|
+          report.severity = "error"
+          report.severity_reason = {
+            :type => Bugsnag::Report::UNHANDLED_EXCEPTION_MIDDLEWARE,
+            :attributes => FRAMEWORK_ATTRIBUTES
+          }
+        end
       end
 
       response
     ensure
       # Clear per-request data after processing the each request
-      Bugsnag.clear_request_data
-    end
-
-    private
-
-    def release_stage
-      ENV["BUGSNAG_RELEASE_STAGE"] || ENV["RACK_ENV"]
+      Bugsnag.configuration.clear_request_data
     end
   end
 end

data/lib/bugsnag/{rails → integrations/rails}/active_record_rescue.rb

@@ -1,6 +1,9 @@
 module Bugsnag::Rails
   module ActiveRecordRescue
     KINDS = [:commit, :rollback].freeze
+    FRAMEWORK_ATTRIBUTES = {
+      :framework => "Rails"
+    }
 
     def run_callbacks(kind, *args, &block)
       if KINDS.include?(kind)
@@ -8,14 +11,13 @@ module Bugsnag::Rails
           super
         rescue StandardError => exception
           # This exception will NOT be escalated, so notify it here.
-          Bugsnag.auto_notify(exception, {
-            :severity_reason => {
-              :type => Bugsnag::Notification::UNHANDLED_EXCEPTION_MIDDLEWARE,
-              :attributes => {
-                :framework => "Rails"
-              }
+          Bugsnag.notify(exception, true) do |report|
+            report.severity = "error"
+            report.severity_reason = {
+              :type => Bugsnag::Report::UNHANDLED_EXCEPTION_MIDDLEWARE,
+              :attributes => FRAMEWORK_ATTRIBUTES
             }
-          })
+          end
           raise
         end
       else

data/lib/bugsnag/{rails → integrations/rails}/controller_methods.rb

@@ -10,10 +10,6 @@ module Bugsnag::Rails
         _add_bugsnag_notify_callback(:before_callbacks, *methods, &block)
       end
 
-      def after_bugsnag_notify(*methods, &block)
-        _add_bugsnag_notify_callback(:after_callbacks, *methods, &block)
-      end
-
       def _add_bugsnag_notify_callback(callback_key, *methods, &block)
         options = methods.last.is_a?(Hash) ? methods.pop : {}
 
@@ -40,10 +36,5 @@ module Bugsnag::Rails
         end
       end
     end
-
-    private
-    def notify_bugsnag(exception, custom_data=nil)
-      Bugsnag.notify(exception, custom_data)
-    end
   end
 end

data/lib/bugsnag/{railtie.rb → integrations/railtie.rb}

@@ -7,8 +7,13 @@ require "bugsnag/middleware/rack_request"
 
 module Bugsnag
   class Railtie < Rails::Railtie
+
+    FRAMEWORK_ATTRIBUTES = {
+      :framework => "Rails"
+    }
+
     rake_tasks do
-      require "bugsnag/rake"
+      require "bugsnag/integrations/rake"
       load "bugsnag/tasks/bugsnag.rake"
     end
 
@@ -17,14 +22,13 @@ module Bugsnag
       runner do
         at_exit do
           if $!
-            Bugsnag.auto_notify($!, {
-              :severity_reason => {
-                :type => Bugsnag::Notification::UNHANDLED_EXCEPTION_MIDDLEWARE,
-                :attributes => {
-                  :framework => "Rails"
-                }
+            Bugsnag.notify($!, true) do |report|
+              report.severity = "error"
+              report.severity_reason = {
+                :type => Bugsnag::Report::UNHANDLED_EXCEPTION_MIDDLEWARE,
+                :attributes => FRAMEWORK_ATTRIBUTES
               }
-            })
+            end
           end
         end
       end
@@ -39,28 +43,27 @@ module Bugsnag
         config.middleware.insert_before Bugsnag::Middleware::Callbacks, Bugsnag::Middleware::Rails3Request
       end
 
-      # Auto-load configuration settings from config/bugsnag.yml if it exists
-      config_file = ::Rails.root.join("config", "bugsnag.yml")
-      config = YAML.load_file(config_file) if File.exist?(config_file)
-      Bugsnag.configure(config[::Rails.env] ? config[::Rails.env] : config) if config
-
-      ActiveSupport.on_load(:action_controller) do
-        require "bugsnag/rails/controller_methods"
-        include Bugsnag::Rails::ControllerMethods
+      if defined?(::ActionController::Base)
+        require "bugsnag/integrations/rails/controller_methods"
+        ::ActionController::Base.send(:include, Bugsnag::Rails::ControllerMethods)
+      end
+      if defined?(ActionController::API)
+        require "bugsnag/integrations/rails/controller_methods"
+        ActionController::API.send(:include, Bugsnag::Rails::ControllerMethods)
       end
-      ActiveSupport.on_load(:active_record) do
-        require "bugsnag/rails/active_record_rescue"
-        include Bugsnag::Rails::ActiveRecordRescue
+      if defined?(ActiveRecord::Base)
+        require "bugsnag/integrations/rails/active_record_rescue"
+        ActiveRecord::Base.send(:include, Bugsnag::Rails::ActiveRecordRescue)
       end
 
       Bugsnag.configuration.app_type = "rails"
     end
 
-    # Configure params_filters after initialization, so that rails initializers
+    # Configure meta_data_filters after initialization, so that rails initializers
     # may set filter_parameters which will be picked up by Bugsnag.
     config.after_initialize do
       Bugsnag.configure do |config|
-        config.params_filters += ::Rails.configuration.filter_parameters.map do |filter|
+        config.meta_data_filters += ::Rails.configuration.filter_parameters.map do |filter|
           case filter
           when String, Symbol
             /\A#{filter}\z/