bugsnag 6.11.1 → 6.12.0

data/features/rails_features/api_key.feature

@@ -31,6 +31,7 @@ Scenario Outline: Setting api_key in environment variable works
     | 2.4          | 5             |
     | 2.5          | 3             |
     | 2.5          | 5             |
+    | 2.5          | 6             |
 
  Scenario Outline: Changing api_key after initializer works
   Given I set environment variable "RUBY_VERSION" to "<ruby_version>"
@@ -56,4 +57,5 @@ Scenario Outline: Setting api_key in environment variable works
     | 2.4          | 3             |
     | 2.4          | 5             |
     | 2.5          | 3             |
-    | 2.5          | 5             |
+    | 2.5          | 5             |
+    | 2.5          | 6             |

data/features/rails_features/app_type.feature

@@ -35,6 +35,7 @@ Scenario Outline: Setting app_type in initializer works
     | 2.4          | 5             |
     | 2.5          | 3             |
     | 2.5          | 5             |
+    | 2.5          | 6             |
 
 Scenario Outline: Changing app_type after initializer works
   Given I set environment variable "RUBY_VERSION" to "<ruby_version>"
@@ -64,4 +65,5 @@ Scenario Outline: Changing app_type after initializer works
     | 2.4          | 3             |
     | 2.4          | 5             |
     | 2.5          | 3             |
-    | 2.5          | 5             |
+    | 2.5          | 5             |
+    | 2.5          | 6             |

data/features/rails_features/app_version.feature

@@ -29,6 +29,7 @@ Scenario Outline: App_version is nil by default
     | 2.4          | 5             |
     | 2.5          | 3             |
     | 2.5          | 5             |
+    | 2.5          | 6             |
 
 Scenario Outline: Setting app_version in initializer works
   Given I set environment variable "RUBY_VERSION" to "<ruby_version>"
@@ -56,6 +57,7 @@ Scenario Outline: Setting app_version in initializer works
     | 2.4          | 5             |
     | 2.5          | 3             |
     | 2.5          | 5             |
+    | 2.5          | 6             |
 
 Scenario Outline: Setting app_version after initializer works
   Given I set environment variable "RUBY_VERSION" to "<ruby_version>"
@@ -81,4 +83,5 @@ Scenario Outline: Setting app_version after initializer works
     | 2.4          | 3             |
     | 2.4          | 5             |
     | 2.5          | 3             |
-    | 2.5          | 5             |
+    | 2.5          | 5             |
+    | 2.5          | 6             |

data/features/rails_features/auto_capture_sessions.feature

@@ -31,6 +31,7 @@ Scenario Outline: Auto_capture_sessions defaults to true
     | 2.4          | 5             |
     | 2.5          | 3             |
     | 2.5          | 5             |
+    | 2.5          | 6             |
 
 Scenario Outline: Auto_capture_sessions can be set to false in the initializer
   Given I set environment variable "RUBY_VERSION" to "<ruby_version>"
@@ -54,6 +55,7 @@ Scenario Outline: Auto_capture_sessions can be set to false in the initializer
     | 2.4          | 5             |
     | 2.5          | 3             |
     | 2.5          | 5             |
+    | 2.5          | 6             |
 
 Scenario Outline: Manual sessions are still sent if Auto_capture_sessions is false
   Given I set environment variable "RUBY_VERSION" to "<ruby_version>"
@@ -81,6 +83,7 @@ Scenario Outline: Manual sessions are still sent if Auto_capture_sessions is fal
     | 2.4          | 5             |
     | 2.5          | 3             |
     | 2.5          | 5             |
+    | 2.5          | 6             |
 
 Scenario Outline: 100 session calls results in 100 sessions
   Given I set environment variable "RUBY_VERSION" to "<ruby_version>"
@@ -108,4 +111,5 @@ Scenario Outline: 100 session calls results in 100 sessions
     | 2.4          | 3             |
     | 2.4          | 5             |
     | 2.5          | 3             |
-    | 2.5          | 5             |
+    | 2.5          | 5             |
+    | 2.5          | 6             |

data/features/rails_features/auto_notify.feature

@@ -27,6 +27,7 @@ Scenario Outline: Auto_notify set to false in the initializer prevents unhandled
     | 2.4          | 5             |
     | 2.5          | 3             |
     | 2.5          | 5             |
+    | 2.5          | 6             |
 
 Scenario Outline: Auto_notify set to false in the initializer still sends handled errors
   Given I set environment variable "RUBY_VERSION" to "<ruby_version>"
@@ -59,6 +60,7 @@ Scenario Outline: Auto_notify set to false in the initializer still sends handle
     | 2.4          | 5             |
     | 2.5          | 3             |
     | 2.5          | 5             |
+    | 2.5          | 6             |
 
 Scenario Outline: Auto_notify set to false after the initializer prevents unhandled error sending
   Given I set environment variable "RUBY_VERSION" to "<ruby_version>"
@@ -81,6 +83,7 @@ Scenario Outline: Auto_notify set to false after the initializer prevents unhand
     | 2.4          | 5             |
     | 2.5          | 3             |
     | 2.5          | 5             |
+    | 2.5          | 6             |
 
 Scenario Outline: Auto_notify set to false after the initializer still sends handled errors
   Given I set environment variable "RUBY_VERSION" to "<ruby_version>"
@@ -111,4 +114,5 @@ Scenario Outline: Auto_notify set to false after the initializer still sends han
     | 2.4          | 3             |
     | 2.4          | 5             |
     | 2.5          | 3             |
-    | 2.5          | 5             |
+    | 2.5          | 5             |
+    | 2.5          | 6             |

data/features/rails_features/before_notify.feature

@@ -37,6 +37,7 @@ Scenario Outline: Rails before_notify controller method works on handled errors
     | 2.4          | 5             |
     | 2.5          | 3             |
     | 2.5          | 5             |
+    | 2.5          | 6             |
 
 Scenario Outline: Rails before_notify controller method works on unhandled errors
   Given I set environment variable "RUBY_VERSION" to "<ruby_version>"
@@ -70,6 +71,7 @@ Scenario Outline: Rails before_notify controller method works on unhandled error
     | 2.4          | 5             |
     | 2.5          | 3             |
     | 2.5          | 5             |
+    | 2.5          | 6             |
 
 Scenario Outline: Inline block on handled errors is called
   Given I set environment variable "RUBY_VERSION" to "<ruby_version>"
@@ -103,4 +105,5 @@ Scenario Outline: Inline block on handled errors is called
     | 2.4          | 5             |
     | 2.5          | 3             |
     | 2.5          | 5             |
+    | 2.5          | 6             |
 

data/features/rails_features/breadcrumbs.feature

@@ -37,6 +37,7 @@ Scenario Outline: Request breadcrumb
     | 2.4          | 5             |
     | 2.5          | 3             |
     | 2.5          | 5             |
+    | 2.5          | 6             |
 
 Scenario Outline: SQL Breadcrumb without bindings
   Given I set environment variable "RUBY_VERSION" to "<ruby_version>"
@@ -65,6 +66,7 @@ Scenario Outline: SQL Breadcrumb without bindings
     | 2.3          | 4             |
     | 2.4          | 3             |
     | 2.5          | 3             |
+    | 2.5          | 6             |
 
 Scenario Outline: SQL Breadcrumb with bindings
   Given I set environment variable "RUBY_VERSION" to "<ruby_version>"
@@ -90,6 +92,7 @@ Scenario Outline: SQL Breadcrumb with bindings
     | 2.3          | 5             |
     | 2.4          | 5             |
     | 2.5          | 5             |
+    | 2.5          | 6             |
 
 Scenario Outline: Active job breadcrumb
   Given I set environment variable "RUBY_VERSION" to "<ruby_version>"
@@ -113,6 +116,7 @@ Scenario Outline: Active job breadcrumb
     | 2.3          | 5             |
     | 2.4          | 5             |
     | 2.5          | 5             |
+    | 2.5          | 6             |
 
 Scenario Outline: Cache read
   Given I set environment variable "RUBY_VERSION" to "<ruby_version>"
@@ -133,3 +137,4 @@ Scenario Outline: Cache read
     | 2.3          | 5             |
     | 2.4          | 5             |
     | 2.5          | 5             |
+    | 2.5          | 6             |

data/features/rails_features/handled.feature

@@ -37,6 +37,7 @@ Scenario Outline: Unhandled RuntimeError
     | 2.4          | 5             |
     | 2.5          | 3             |
     | 2.5          | 5             |
+    | 2.5          | 6             |
 
 Scenario Outline: Thrown handled NameError
   Given I set environment variable "RUBY_VERSION" to "<ruby_version>"
@@ -70,6 +71,7 @@ Scenario Outline: Thrown handled NameError
     | 2.4          | 5             |
     | 2.5          | 3             |
     | 2.5          | 5             |
+    | 2.5          | 6             |
 
 Scenario Outline: Manual string notify
   Given I set environment variable "RUBY_VERSION" to "<ruby_version>"
@@ -101,3 +103,4 @@ Scenario Outline: Manual string notify
     | 2.4          | 5             |
     | 2.5          | 3             |
     | 2.5          | 5             |
+    | 2.5          | 6             |

data/features/rails_features/ignore_classes.feature

@@ -27,6 +27,7 @@ Scenario Outline: Ignore_classes can be set to a different value in initializer
     | 2.4          | 5             |
     | 2.5          | 3             |
     | 2.5          | 5             |
+    | 2.5          | 6             |
 
 Scenario Outline: Ignore_classes can be set to a different value after initializer
   Given I set environment variable "RUBY_VERSION" to "<ruby_version>"
@@ -48,4 +49,5 @@ Scenario Outline: Ignore_classes can be set to a different value after initializ
     | 2.4          | 3             |
     | 2.4          | 5             |
     | 2.5          | 3             |
-    | 2.5          | 5             |
+    | 2.5          | 5             |
+    | 2.5          | 6             |

data/features/rails_features/meta_data_filters.feature

@@ -37,3 +37,4 @@ Scenario Outline: Meta_data_filters should include Rails.configuration.filter_pa
     | 2.4          | 5             |
     | 2.5          | 3             |
     | 2.5          | 5             |
+    | 2.5          | 6             |

data/features/rails_features/project_root.feature

@@ -34,6 +34,7 @@ Scenario Outline: Project_root should default to Rails.root
     | 2.4          | 5             |
     | 2.5          | 3             |
     | 2.5          | 5             |
+    | 2.5          | 6             |
 
 Scenario Outline: Project_root can be set in an initializer
   Given I set environment variable "RUBY_VERSION" to "<ruby_version>"
@@ -65,6 +66,7 @@ Scenario Outline: Project_root can be set in an initializer
     | 2.4          | 5             |
     | 2.5          | 3             |
     | 2.5          | 5             |
+    | 2.5          | 6             |
 
 Scenario Outline: Project_root can be set after an initializer
   Given I set environment variable "RUBY_VERSION" to "<ruby_version>"
@@ -95,3 +97,4 @@ Scenario Outline: Project_root can be set after an initializer
     | 2.4          | 5             |
     | 2.5          | 3             |
     | 2.5          | 5             |
+    | 2.5          | 6             |

data/features/rails_features/release_stage.feature

@@ -31,6 +31,7 @@ Scenario Outline: Release_stage should default to RAILS_ENV
     | 2.4          | 5             |
     | 2.5          | 3             |
     | 2.5          | 5             |
+    | 2.5          | 6             |
 
 Scenario Outline: Release_stage can be set in an initializer
   Given I set environment variable "RUBY_VERSION" to "<ruby_version>"
@@ -58,6 +59,7 @@ Scenario Outline: Release_stage can be set in an initializer
     | 2.4          | 5             |
     | 2.5          | 3             |
     | 2.5          | 5             |
+    | 2.5          | 6             |
 
 Scenario Outline: Release_stage can be set after an initializer
   Given I set environment variable "RUBY_VERSION" to "<ruby_version>"
@@ -83,4 +85,5 @@ Scenario Outline: Release_stage can be set after an initializer
     | 2.4          | 3             |
     | 2.4          | 5             |
     | 2.5          | 3             |
-    | 2.5          | 5             |
+    | 2.5          | 5             |
+    | 2.5          | 6             |

data/features/rails_features/send_code.feature

@@ -30,6 +30,7 @@ Scenario Outline: Send_code can be updated in an initializer
     | 2.4          | 5             |
     | 2.5          | 3             |
     | 2.5          | 5             |
+    | 2.5          | 6             |
 
 Scenario Outline: Send_code can be updated after an initializer
   Given I set environment variable "RUBY_VERSION" to "<ruby_version>"
@@ -56,3 +57,4 @@ Scenario Outline: Send_code can be updated after an initializer
     | 2.4          | 5             |
     | 2.5          | 3             |
     | 2.5          | 5             |
+    | 2.5          | 6             |

data/features/rails_features/send_environment.feature

@@ -35,4 +35,5 @@ Scenario Outline: Send_environment should send environment in handled errors whe
     | 2.4          | 3             |
     | 2.4          | 5             |
     | 2.5          | 3             |
-    | 2.5          | 5             |
+    | 2.5          | 5             |
+    | 2.5          | 6             |

data/features/rails_features/unhandled.feature

@@ -37,4 +37,5 @@ Scenario Outline: Unhandled RuntimeError
     | 2.4          | 3             |
     | 2.4          | 5             |
     | 2.5          | 3             |
-    | 2.5          | 5             |
+    | 2.5          | 5             |
+    | 2.5          | 6             |

data/features/rails_features/user_info.feature

@@ -85,4 +85,6 @@ Scenario Outline: Clearance user information is sent
     | 2.4          | 5             | handled   |
     | 2.4          | 5             | unhandled |
     | 2.5          | 5             | handled   |
-    | 2.5          | 5             | unhandled |
+    | 2.5          | 5             | unhandled |
+    | 2.5          | 6             | handled   |
+    | 2.5          | 6             | unhandled |

data/lib/bugsnag/breadcrumbs/validator.rb

@@ -49,11 +49,11 @@ module Bugsnag::Breadcrumbs
     ##
     # Tests whether the meta_data types are non-complex objects.
     #
-    # Acceptable types are String, Numeric, TrueClass, FalseClass, and nil.
+    # Acceptable types are String, Symbol, Numeric, TrueClass, FalseClass, and nil.
     #
     # @param value [Object] the object to be type checked
     def valid_meta_data_type?(value)
-      value.nil? || value.is_a?(String) || value.is_a?(Numeric) || value.is_a?(FalseClass) || value.is_a?(TrueClass)
+      value.nil? || value.is_a?(String) || value.is_a?(Symbol) || value.is_a?(Numeric) || value.is_a?(FalseClass) || value.is_a?(TrueClass)
     end
   end
 end

data/lib/bugsnag/configuration.rb

@@ -34,6 +34,7 @@ module Bugsnag
     attr_accessor :proxy_password
     attr_accessor :timeout
     attr_accessor :hostname
+    attr_accessor :runtime_versions
     attr_accessor :ignore_classes
     attr_accessor :auto_capture_sessions
     attr_accessor :track_sessions
@@ -93,6 +94,9 @@ module Bugsnag
       self.send_code = true
       self.meta_data_filters = Set.new(DEFAULT_META_DATA_FILTERS)
       self.hostname = default_hostname
+      self.runtime_versions = {}
+      self.runtime_versions["ruby"] = RUBY_VERSION
+      self.runtime_versions["jruby"] = JRUBY_VERSION if defined?(JRUBY_VERSION)
       self.timeout = 15
       self.notify_release_stages = nil
       self.auto_capture_sessions = true

data/lib/bugsnag/integrations/que.rb

@@ -1,21 +1,24 @@
+require 'que'
 if defined?(::Que)
   handler = proc do |error, job|
     begin
-      job = job.dup # Make sure the original job object is not mutated.
+      job &&= job.dup # Make sure the original job object is not mutated.
 
       Bugsnag.notify(error, true) do |report|
-        job[:error_count] += 1
+        if job
+          job[:error_count] += 1
 
-        # If the job was scheduled using ActiveJob then unwrap the job details for clarity:
-        if job[:job_class] == "ActiveJob::QueueAdapters::QueAdapter::JobWrapper"
-          wrapped_job = job[:args].last
-          wrapped_job = wrapped_job.each_with_object({}) { |(k, v), result| result[k.to_sym] = v } # Symbolize keys
+          # If the job was scheduled using ActiveJob then unwrap the job details for clarity:
+          if job[:job_class] == "ActiveJob::QueueAdapters::QueAdapter::JobWrapper"
+            wrapped_job = job[:args].last
+            wrapped_job = wrapped_job.each_with_object({}) { |(k, v), result| result[k.to_sym] = v } # Symbolize keys
 
-          # Align key names with keys in `job`
-          wrapped_job[:queue] = wrapped_job.delete(:queue_name)
-          wrapped_job[:args]  = wrapped_job.delete(:arguments)
+            # Align key names with keys in `job`
+            wrapped_job[:queue] = wrapped_job.delete(:queue_name)
+            wrapped_job[:args]  = wrapped_job.delete(:arguments)
 
-          job.merge!(wrapper_job_class: job[:job_class], wrapper_job_id: job[:job_id]).merge!(wrapped_job)
+            job.merge!(wrapper_job_class: job[:job_class], wrapper_job_id: job[:job_id]).merge!(wrapped_job)
+          end
         end
 
         report.add_tab(:job, job)
@@ -36,9 +39,11 @@ if defined?(::Que)
 
   if Que.respond_to?(:error_notifier=)
     Bugsnag.configuration.app_type ||= "que"
+    Bugsnag.configuration.runtime_versions["que"] = ::Que::Version
     Que.error_notifier = handler
   elsif Que.respond_to?(:error_handler=)
     Bugsnag.configuration.app_type ||= "que"
+    Bugsnag.configuration.runtime_versions["que"] = ::Que::Version
     Que.error_handler = handler
   end
-end
+end

data/lib/bugsnag/integrations/rack.rb

@@ -20,7 +20,7 @@ module Bugsnag
           if defined?(settings)
             config.project_root = settings.root
           else
-            config.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://docs.bugsnag.com/platforms/ruby/rails/configuration-options/#project_root).")
           end
         end
 
@@ -29,7 +29,10 @@ module Bugsnag
         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)
 
+        # Set environment data for payload
         config.app_type ||= "rack"
+        config.runtime_versions["rack"] = ::Rack.release if defined?(::Rack)
+        config.runtime_versions["sinatra"] = ::Sinatra::VERSION if defined?(::Sinatra)
       end
     end
 

data/lib/bugsnag/integrations/railtie.rb

@@ -28,6 +28,7 @@ module Bugsnag
         config.release_stage = ENV["BUGSNAG_RELEASE_STAGE"] || ::Rails.env.to_s
         config.project_root = ::Rails.root.to_s
         config.middleware.insert_before Bugsnag::Middleware::Callbacks, Bugsnag::Middleware::Rails3Request
+        config.runtime_versions["rails"] = ::Rails::VERSION::STRING
       end
 
       ActiveSupport.on_load(:action_controller) do

data/lib/bugsnag/integrations/rake.rb

@@ -2,36 +2,68 @@ require 'bugsnag'
 
 Rake::TaskManager.record_task_metadata = true
 
-class Rake::Task
-
-  FRAMEWORK_ATTRIBUTES = {
-    :framework => "Rake"
-  }
-
-  ##
-  # Executes the rake task with Bugsnag setup with contextual data.
-  def execute_with_bugsnag(args=nil)
-    Bugsnag.configuration.app_type ||= "rake"
-    old_task = Bugsnag.configuration.request_data[:bugsnag_running_task]
-    Bugsnag.configuration.set_request_data :bugsnag_running_task, self
-
-    execute_without_bugsnag(args)
-
-  rescue Exception => ex
-    Bugsnag.notify(ex, true) do |report|
-      report.severity = "error"
-      report.severity_reason = {
-        :type => Bugsnag::Report::UNHANDLED_EXCEPTION_MIDDLEWARE,
-        :attributes => FRAMEWORK_ATTRIBUTES
+if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.0')
+  module Bugsnag
+    module RakeTask
+      FRAMEWORK_ATTRIBUTES = {
+        framework: 'Rake'
       }
+
+      # Executes the rake task with Bugsnag setup with contextual data.
+      def execute(args = nil)
+        Bugsnag.configuration.app_type ||= "rake"
+        old_task = Bugsnag.configuration.request_data[:bugsnag_running_task]
+        Bugsnag.configuration.set_request_data :bugsnag_running_task, self
+        Bugsnag.configuration.runtime_versions["rake"] = ::Rake::VERSION
+
+        super
+      rescue Exception => ex
+        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.configuration.set_request_data :bugsnag_running_task, old_task
+      end
     end
-    raise
-  ensure
-    Bugsnag.configuration.set_request_data :bugsnag_running_task, old_task
   end
 
-  alias_method :execute_without_bugsnag, :execute
-  alias_method :execute, :execute_with_bugsnag
+  Rake::Task.send(:prepend, Bugsnag::RakeTask)
+else
+  class Rake::Task
+    FRAMEWORK_ATTRIBUTES = {
+      framework: 'Rake'
+    }
+
+    ##
+    # Executes the rake task with Bugsnag setup with contextual data.
+    def execute_with_bugsnag(args=nil)
+      Bugsnag.configuration.app_type ||= "rake"
+      old_task = Bugsnag.configuration.request_data[:bugsnag_running_task]
+      Bugsnag.configuration.set_request_data :bugsnag_running_task, self
+      Bugsnag.configuration.runtime_versions["rake"] = ::Rake::VERSION
+
+      execute_without_bugsnag(args)
+    rescue Exception => ex
+      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.configuration.set_request_data :bugsnag_running_task, old_task
+    end
+
+    alias_method :execute_without_bugsnag, :execute
+    alias_method :execute, :execute_with_bugsnag
+  end
 end
 
 Bugsnag.configuration.internal_middleware.use(Bugsnag::Middleware::Rake)