bugsnag 6.11.1 → 6.12.0

data/lib/bugsnag/integrations/resque.rb

@@ -43,7 +43,10 @@ module Bugsnag
           :type => Bugsnag::Report::UNHANDLED_EXCEPTION_MIDDLEWARE,
           :attributes => FRAMEWORK_ATTRIBUTES
         }
-        report.meta_data.merge!({:context => "#{payload['class']}@#{queue}", :payload => payload})
+
+        context = "#{payload['class']}@#{queue}"
+        report.meta_data.merge!({:context => context, :payload => payload})
+        report.context = context
       end
     end
   end
@@ -59,10 +62,12 @@ if Resque::Worker.new(:bugsnag_fork_check).fork_per_job?
   Resque.after_fork do
     Bugsnag.configuration.app_type = "resque"
     Bugsnag.configuration.default_delivery_method = :synchronous
+    Bugsnag.configuration.runtime_versions["resque"] = ::Resque::VERSION
   end
 else
   Resque.before_first_fork do
     Bugsnag.configuration.app_type = "resque"
     Bugsnag.configuration.default_delivery_method = :synchronous
+    Bugsnag.configuration.runtime_versions["resque"] = ::Resque::VERSION
   end
 end

data/lib/bugsnag/integrations/sidekiq.rb

@@ -15,6 +15,7 @@ module Bugsnag
       Bugsnag.configuration.internal_middleware.use(Bugsnag::Middleware::Sidekiq)
       Bugsnag.configuration.app_type = "sidekiq"
       Bugsnag.configuration.default_delivery_method = :synchronous
+      Bugsnag.configuration.runtime_versions["sidekiq"] = ::Sidekiq::VERSION
     end
 
     def call(worker, msg, queue)

data/lib/bugsnag/middleware/rails3_request.rb

@@ -32,13 +32,6 @@ module Bugsnag::Middleware
         })
 
         report.user["id"] = client_ip
-
-        # Add the rails version
-        if report.configuration.send_environment
-          report.add_tab(:environment, {
-            :railsVersion => Rails::VERSION::STRING
-          })
-        end
       end
 
       @bugsnag.call(report)

data/lib/bugsnag/report.rb

@@ -29,6 +29,7 @@ module Bugsnag
     attr_accessor :delivery_method
     attr_accessor :exceptions
     attr_accessor :hostname
+    attr_accessor :runtime_versions
     attr_accessor :grouping_hash
     attr_accessor :meta_data
     attr_accessor :raw_exceptions
@@ -55,6 +56,7 @@ module Bugsnag
       self.breadcrumbs = []
       self.delivery_method = configuration.delivery_method
       self.hostname = configuration.hostname
+      self.runtime_versions = configuration.runtime_versions.dup
       self.meta_data = {}
       self.release_stage = configuration.release_stage
       self.severity = auto_notify ? "error" : "warning"
@@ -97,7 +99,8 @@ module Bugsnag
         },
         context: context,
         device: {
-          hostname: hostname
+          hostname: hostname,
+          runtimeVersions: runtime_versions
         },
         exceptions: exceptions,
         groupingHash: grouping_hash,

data/lib/bugsnag/session_tracker.rb

@@ -118,7 +118,8 @@ module Bugsnag
           :version => Bugsnag::Report::NOTIFIER_VERSION
         },
         :device => {
-          :hostname => Bugsnag.configuration.hostname
+          :hostname => Bugsnag.configuration.hostname,
+          :runtimeVersions => Bugsnag.configuration.runtime_versions
         },
         :app => {
           :version => Bugsnag.configuration.app_version,

data/spec/breadcrumbs/validator_spec.rb

@@ -64,6 +64,7 @@ RSpec.describe Bugsnag::Breadcrumbs::Validator do
 
         meta_data = {
           :string => "This is a string",
+          :symbol => :this_is_a_symbol,
           :integer => 12345,
           :float => 12345.6789,
           :false => false,

data/spec/configuration_spec.rb

@@ -161,6 +161,37 @@ describe Bugsnag::Configuration do
     end
   end
 
+  describe "#hostname" do
+    it "has a default value" do
+      expect(subject.hostname.length).to be > 0
+    end
+
+    it "has a value set by Socket" do
+      expect(subject.hostname).to eq(Socket.gethostname)
+    end
+
+    it "has a value set by DYNO environment variable" do
+      ENV['DYNO'] = 'localhost'
+      expect(subject.hostname).to eq("localhost")
+    end
+
+    after do
+      ENV['DYNO'] = nil
+    end
+  end
+
+  describe "#runtime_versions" do
+    it "has a default value" do
+      expect(subject.runtime_versions.length).to be > 0
+      expect(subject.runtime_versions["ruby"]).to eq(RUBY_VERSION)
+    end
+
+    it "has a settable value" do
+      subject.runtime_versions["ruby"] = '9.9.9'
+      expect(subject.runtime_versions["ruby"]).to eq('9.9.9')
+    end
+  end
+
   describe "logger" do
     class TestLogger
       attr_accessor :logs

data/spec/fixtures/tasks/Rakefile

@@ -1,3 +1,15 @@
+if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.0')
+  # Mixing Module#prepend with alias_method can sometimes lead to infinite
+  # mutual recursion, so this is to test that it doesn't happen.
+  mod = Module.new do
+    def execute(args = nil)
+      puts 'In module prepended to Rake::Task'
+      super
+    end
+  end
+  Rake::Task.send(:prepend, mod)
+end
+
 require "bugsnag/integrations/rake"
 
 namespace :test do

data/spec/integrations/logger_spec.rb

@@ -83,18 +83,14 @@ describe 'Configuration.logger' do
     key_warning = /\[Bugsnag\] .* No valid API key has been set, notifications will not be sent/
 
     def run_app(name)
-      out_reader, out_writer = IO.pipe
+      output = ''
       Dir.chdir(File.join(File.dirname(__FILE__), "../fixtures/apps/scripts")) do
         Bundler.with_clean_env do
-          pid = Process.spawn(@env, "bundle exec ruby #{name}.rb",
-                              out: out_writer.fileno,
-                              err: out_writer.fileno)
-          Process.waitpid(pid, 0)
+          IO.popen([@env, 'bundle', 'exec', 'ruby', "#{name}.rb", err: [:child, :out]]) do |io|
+            output << io.read
+          end
         end
       end
-      out_writer.close
-      output = ""
-      output << out_reader.gets until out_reader.eof?
       output
     end
 

data/spec/integrations/que_spec.rb

@@ -6,6 +6,16 @@ describe 'Bugsnag::Que', :order => :defined do
     unless defined?(::Que)
       @mocked_que = true
       class ::Que
+        Version = '9.9.9'
+        class << self
+          attr_accessor :error_notifier
+        end
+      end
+      module Kernel
+        alias_method :old_require, :require
+        def require(path)
+          old_require(path) unless /^que/.match(path)
+        end
       end
     end
   end
@@ -25,7 +35,6 @@ describe 'Bugsnag::Que', :order => :defined do
     expect(report).to receive(:add_tab).with(:job, {
       :error_count => 1,
       :job_class => 'ActiveJob::QueueAdapters::QueAdapter::JobWrapper',
-      :args => [{"queue_name" => "foo", "arguments" => "bar"}],
       :job_id => "ID",
       :wrapper_job_class => 'ActiveJob::QueueAdapters::QueAdapter::JobWrapper',
       :wrapper_job_id => "ID",
@@ -45,6 +54,8 @@ describe 'Bugsnag::Que', :order => :defined do
     allow(Bugsnag).to receive(:configuration).and_return(config)
     expect(config).to receive(:app_type)
     expect(config).to receive(:app_type=).with('que')
+    runtime = {}
+    expect(config).to receive(:runtime_versions).and_return(runtime)
     allow(config).to receive(:clear_request_data)
     expect(Que).to receive(:error_notifier=) do |handler|
       handler.call(error, job)
@@ -52,9 +63,32 @@ describe 'Bugsnag::Que', :order => :defined do
 
     #Kick off
     load './lib/bugsnag/integrations/que.rb'
+    
+    expect(runtime).to eq("que" => "9.9.9")
+  end
+
+  context 'when the job is nil' do
+    it 'notifies Bugsnag' do
+      load './lib/bugsnag/integrations/que.rb'
+      error = RuntimeError.new('nil job')
+      report = Bugsnag::Report.new(error, Bugsnag::Configuration.new)
+      expect(Bugsnag).to receive(:notify).with(error, true).and_yield(report)
+
+      Que.error_notifier.call(error, nil)
+
+      expect(report.meta_data['custom'].fetch('job')).to eq(nil)
+      expect(report.severity).to eq('error')
+      expect(report.severity_reason).to eq({
+        :type => Bugsnag::Report::UNHANDLED_EXCEPTION_MIDDLEWARE,
+        :attributes => {:framework => 'Que'},
+      })
+    end
   end
 
   after do
     Object.send(:remove_const, :Que) if @mocked_que
+    module Kernel
+      alias_method :require, :old_require
+    end
   end
 end

data/spec/integrations/rack_spec.rb

@@ -18,6 +18,19 @@ describe Bugsnag::Rack do
     app = lambda { |env| raise exception }
     rack_stack = Bugsnag::Rack.new(app)
 
+    before do
+      unless defined?(::Rack)
+        @mocked_rack = true
+        class Rack
+          def self.release
+            '9.9.9'
+          end
+          class Request
+          end
+        end
+      end
+    end
+
     it "re-raises the exception" do
       expect { rack_stack.call(rack_env) }.to raise_error(BugsnagTestException)
     end
@@ -47,6 +60,13 @@ describe Bugsnag::Rack do
       }
     end
 
+    it "applies the rack version" do
+      app = lambda { |env| raise BugsnagTestException.new("It crashed") }
+      rack_stack = Bugsnag::Rack.new(app)
+
+      expect(Bugsnag.configuration.runtime_versions["rack"]).to eq '9.9.9'
+    end
+
     it "does not deliver an exception if auto_notify is disabled" do
       Bugsnag.configure do |config|
         config.auto_notify = false
@@ -63,6 +83,9 @@ describe Bugsnag::Rack do
       unless defined?(::Rack)
         @mocked_rack = true
         class Rack
+          def self.release
+            '9.9.9'
+          end
           class Request
           end
         end
@@ -196,7 +219,6 @@ describe Bugsnag::Rack do
   end
 
   it "don't mess with middlewares list on each req" do
-    stub_const('Rack', nil)
     app = lambda { |env| ['200', {}, ['']] }
 
     Bugsnag::Rack.new(app)

data/spec/integrations/rake_spec.rb

@@ -55,18 +55,17 @@ describe "Bugsnag Rake integration" do
     let(:request) { JSON.parse(queue.pop) }
 
     it 'should run the rake middleware when rake tasks crash' do
-      #Skips this test in ruby 1.9.3 with travis
-      unless ENV['TRAVIS'] && RUBY_VERSION == "1.9.3"
-        ENV['BUGSNAG_TEST_SERVER_PORT'] = server.config[:Port].to_s
-        task_fixtures_path = File.join(File.dirname(__FILE__), '../fixtures', 'tasks')
-        Dir.chdir(task_fixtures_path) do
-          system("bundle exec rake test:crash > /dev/null 2>&1")
-        end
-
-        result = request()
-        expect(result["events"][0]["metaData"]["rake_task"]).not_to be_nil
-        expect(result["events"][0]["metaData"]["rake_task"]["name"]).to eq("test:crash")
+      ENV['BUGSNAG_TEST_SERVER_PORT'] = server.config[:Port].to_s
+      task_fixtures_path = File.join(File.dirname(__FILE__), '../fixtures', 'tasks')
+      Dir.chdir(task_fixtures_path) do
+        system("bundle exec rake test:crash > /dev/null 2>&1")
       end
+
+      result = request()
+      expect(result["events"][0]["metaData"]["rake_task"]).not_to be_nil
+      expect(result["events"][0]["metaData"]["rake_task"]["name"]).to eq("test:crash")
+      expect(result["events"][0]["app"]["type"]).to eq("rake")
+      expect(result["events"][0]["device"]["runtimeVersions"]["rake"]).to match(/\A\d+\.\d+\.\d+/)
     end
   end
-end
+end

data/spec/integrations/resque_spec.rb

@@ -6,6 +6,7 @@ describe 'Bugsnag::Resque', :order => :defined do
     unless defined?(::Resque)
       @mocked_resque = true
       class ::Resque
+        VERSION = '9.9.9'
         class Worker
         end
         class Failure
@@ -44,10 +45,14 @@ describe 'Bugsnag::Resque', :order => :defined do
     expect(fork_check).to receive(:fork_per_job?).and_return(true)
     expect(::Resque).to receive(:after_fork).and_yield
     expect(Bugsnag.configuration).to receive(:app_type=).with("resque")
+    runtime = {}
+    expect(Bugsnag.configuration).to receive(:runtime_versions).and_return(runtime)
     expect(Bugsnag.configuration).to receive(:default_delivery_method=).with(:synchronous)
 
     #Kick off
     require './lib/bugsnag/integrations/resque'
+
+    expect(runtime).to eq("resque" => "9.9.9")
   end
 
   it "can configure" do
@@ -71,14 +76,16 @@ describe 'Bugsnag::Resque', :order => :defined do
       :type => Bugsnag::Report::UNHANDLED_EXCEPTION_MIDDLEWARE,
       :attributes => Bugsnag::Resque::FRAMEWORK_ATTRIBUTES
     })
+    expected_context = "class@queue"
     meta_data = double('meta_data')
     expect(report).to receive(:meta_data).and_return(meta_data)
     expect(meta_data).to receive(:merge!).with({
-      :context => "class@queue",
+      :context => expected_context,
       :payload => {
         "class" => "class"
       }
     })
+    expect(report).to receive(:context=).with(expected_context)
     expect(Bugsnag).to receive(:notify).with(exception, true).and_yield(report)
     resque.save
   end

data/spec/integrations/sidekiq_spec.rb

@@ -29,6 +29,8 @@ describe Bugsnag::Sidekiq do
         expect(event["metaData"]["sidekiq"]["msg"]["args"]).to eq([-0])
         expect(event["metaData"]["sidekiq"]["msg"]["queue"]).to eq("default")
         expect(event["severity"]).to eq("error")
+        expect(event["app"]["type"]).to eq("sidekiq")
+        expect(event["device"]["runtimeVersions"]["sidekiq"]).to eq('2.0.0')
       }
     end
   end

data/spec/report_spec.rb

@@ -1252,7 +1252,7 @@ describe Bugsnag::Report do
 
   if defined?(JRUBY_VERSION)
 
-    it "should work with java.lang.Throwables" do
+    it "works with java.lang.Throwables" do
       begin
         JRubyException.raise!
       rescue
@@ -1267,4 +1267,16 @@ describe Bugsnag::Report do
       }
     end
   end
+
+  it 'includes device data when notify is called' do
+    Bugsnag.configuration.hostname = 'test-host'
+    Bugsnag.configuration.runtime_versions["ruby"] = '9.9.9'
+    Bugsnag.notify(BugsnagTestException.new("It crashed"))
+
+    expect(Bugsnag).to have_sent_notification{ |payload, headers|
+      event = payload["events"][0]
+      expect(event["device"]["hostname"]).to eq('test-host')
+      expect(event["device"]["runtimeVersions"]["ruby"]).to eq('9.9.9')
+    }
+  end
 end

data/spec/session_tracker_spec.rb

@@ -129,6 +129,7 @@ describe Bugsnag::SessionTracker do
     device = payload["device"]
     expect(device.include?("hostname")).to be true
     expect(device["hostname"]).to eq(Bugsnag.configuration.hostname)
+    expect(device["runtimeVersions"]["ruby"]).to eq(Bugsnag.configuration.runtime_versions["ruby"])
   end
 
   it 'uses middleware to attach session to notification' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bugsnag
 version: !ruby/object:Gem::Version
-  version: 6.11.1
+  version: 6.12.0
 platform: ruby
 authors:
 - James Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-22 00:00:00.000000000 Z
+date: 2019-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -425,6 +425,113 @@ files:
 - features/fixtures/rails5/app/test/models/.keep
 - features/fixtures/rails5/app/test/test_helper.rb
 - features/fixtures/rails5/app/tmp/.keep
+- features/fixtures/rails6/.dockerignore
+- features/fixtures/rails6/Dockerfile
+- features/fixtures/rails6/app/.browserslistrc
+- features/fixtures/rails6/app/.gitignore
+- features/fixtures/rails6/app/.ruby-version
+- features/fixtures/rails6/app/Gemfile
+- features/fixtures/rails6/app/README.md
+- features/fixtures/rails6/app/Rakefile
+- features/fixtures/rails6/app/app/assets/config/manifest.js
+- features/fixtures/rails6/app/app/assets/images/.keep
+- features/fixtures/rails6/app/app/assets/stylesheets/application.css
+- features/fixtures/rails6/app/app/channels/application_cable/channel.rb
+- features/fixtures/rails6/app/app/channels/application_cable/connection.rb
+- features/fixtures/rails6/app/app/controllers/api_key_controller.rb
+- features/fixtures/rails6/app/app/controllers/app_type_controller.rb
+- features/fixtures/rails6/app/app/controllers/app_version_controller.rb
+- features/fixtures/rails6/app/app/controllers/application_controller.rb
+- features/fixtures/rails6/app/app/controllers/auto_notify_controller.rb
+- features/fixtures/rails6/app/app/controllers/before_notify_controller.rb
+- features/fixtures/rails6/app/app/controllers/breadcrumbs_controller.rb
+- features/fixtures/rails6/app/app/controllers/clearance_controller.rb
+- features/fixtures/rails6/app/app/controllers/concerns/.keep
+- features/fixtures/rails6/app/app/controllers/handled_controller.rb
+- features/fixtures/rails6/app/app/controllers/ignore_classes_controller.rb
+- features/fixtures/rails6/app/app/controllers/metadata_filters_controller.rb
+- features/fixtures/rails6/app/app/controllers/project_root_controller.rb
+- features/fixtures/rails6/app/app/controllers/release_stage_controller.rb
+- features/fixtures/rails6/app/app/controllers/send_code_controller.rb
+- features/fixtures/rails6/app/app/controllers/send_environment_controller.rb
+- features/fixtures/rails6/app/app/controllers/session_tracking_controller.rb
+- features/fixtures/rails6/app/app/controllers/unhandled_controller.rb
+- features/fixtures/rails6/app/app/helpers/application_helper.rb
+- features/fixtures/rails6/app/app/javascript/channels/consumer.js
+- features/fixtures/rails6/app/app/javascript/channels/index.js
+- features/fixtures/rails6/app/app/javascript/packs/application.js
+- features/fixtures/rails6/app/app/jobs/application_job.rb
+- features/fixtures/rails6/app/app/jobs/notify_job.rb
+- features/fixtures/rails6/app/app/mailers/application_mailer.rb
+- features/fixtures/rails6/app/app/models/application_record.rb
+- features/fixtures/rails6/app/app/models/concerns/.keep
+- features/fixtures/rails6/app/app/models/user.rb
+- features/fixtures/rails6/app/app/views/layouts/application.html.erb
+- features/fixtures/rails6/app/app/views/layouts/mailer.html.erb
+- features/fixtures/rails6/app/app/views/layouts/mailer.text.erb
+- features/fixtures/rails6/app/babel.config.js
+- features/fixtures/rails6/app/config.ru
+- features/fixtures/rails6/app/config/application.rb
+- features/fixtures/rails6/app/config/boot.rb
+- features/fixtures/rails6/app/config/cable.yml
+- features/fixtures/rails6/app/config/credentials.yml.enc
+- features/fixtures/rails6/app/config/database.yml
+- features/fixtures/rails6/app/config/environment.rb
+- features/fixtures/rails6/app/config/environments/development.rb
+- features/fixtures/rails6/app/config/environments/production.rb
+- features/fixtures/rails6/app/config/environments/rails_env.rb
+- features/fixtures/rails6/app/config/environments/test.rb
+- features/fixtures/rails6/app/config/initializers/application_controller_renderer.rb
+- features/fixtures/rails6/app/config/initializers/assets.rb
+- features/fixtures/rails6/app/config/initializers/backtrace_silencers.rb
+- features/fixtures/rails6/app/config/initializers/bugsnag.rb
+- features/fixtures/rails6/app/config/initializers/content_security_policy.rb
+- features/fixtures/rails6/app/config/initializers/cookies_serializer.rb
+- features/fixtures/rails6/app/config/initializers/filter_parameter_logging.rb
+- features/fixtures/rails6/app/config/initializers/inflections.rb
+- features/fixtures/rails6/app/config/initializers/mime_types.rb
+- features/fixtures/rails6/app/config/initializers/wrap_parameters.rb
+- features/fixtures/rails6/app/config/locales/en.yml
+- features/fixtures/rails6/app/config/puma.rb
+- features/fixtures/rails6/app/config/routes.rb
+- features/fixtures/rails6/app/config/secrets.yml
+- features/fixtures/rails6/app/config/spring.rb
+- features/fixtures/rails6/app/config/storage.yml
+- features/fixtures/rails6/app/config/webpack/development.js
+- features/fixtures/rails6/app/config/webpack/environment.js
+- features/fixtures/rails6/app/config/webpack/production.js
+- features/fixtures/rails6/app/config/webpack/rails_env.js
+- features/fixtures/rails6/app/config/webpack/test.js
+- features/fixtures/rails6/app/config/webpacker.yml
+- features/fixtures/rails6/app/db/migrate/20180426095545_create_users.rb
+- features/fixtures/rails6/app/db/schema.rb
+- features/fixtures/rails6/app/db/seeds.rb
+- features/fixtures/rails6/app/lib/assets/.keep
+- features/fixtures/rails6/app/lib/tasks/.keep
+- features/fixtures/rails6/app/log/.keep
+- features/fixtures/rails6/app/package.json
+- features/fixtures/rails6/app/postcss.config.js
+- features/fixtures/rails6/app/public/404.html
+- features/fixtures/rails6/app/public/422.html
+- features/fixtures/rails6/app/public/500.html
+- features/fixtures/rails6/app/public/apple-touch-icon-precomposed.png
+- features/fixtures/rails6/app/public/apple-touch-icon.png
+- features/fixtures/rails6/app/public/favicon.ico
+- features/fixtures/rails6/app/public/robots.txt
+- features/fixtures/rails6/app/storage/.keep
+- features/fixtures/rails6/app/test/application_system_test_case.rb
+- features/fixtures/rails6/app/test/channels/application_cable/connection_test.rb
+- features/fixtures/rails6/app/test/controllers/.keep
+- features/fixtures/rails6/app/test/fixtures/.keep
+- features/fixtures/rails6/app/test/fixtures/files/.keep
+- features/fixtures/rails6/app/test/helpers/.keep
+- features/fixtures/rails6/app/test/integration/.keep
+- features/fixtures/rails6/app/test/mailers/.keep
+- features/fixtures/rails6/app/test/models/.keep
+- features/fixtures/rails6/app/test/system/.keep
+- features/fixtures/rails6/app/test/test_helper.rb
+- features/fixtures/rails6/app/tmp/.keep
+- features/fixtures/rails6/app/yarn.lock
 - features/fixtures/resque/.dockerignore
 - features/fixtures/resque/Dockerfile
 - features/fixtures/resque/Gemfile
@@ -600,7 +707,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Ruby notifier for bugsnag.com