bugsnag 2.7.1 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d58304a346068abb5398be6aca9ab17cb57bca6
-  data.tar.gz: c74ff028120853a2ee7f1d74993ad1a76be33d00
+  metadata.gz: b932122137e824fb015eec162c338d8936587af2
+  data.tar.gz: e9f4337e6858a184a8ab78e70f902971d4dcc318
 SHA512:
-  metadata.gz: df1bb6f9345dd8809721bfd3f214340c30247e8988d20e45889142639c3bee75629dd787bb6bb26b9a10dfd90a127d5dd5e544f91e7c27b036d0879749320e29
-  data.tar.gz: 3ba9a85d663736f53205872adf576f1a5dda7436e23cddb5f5c4da01d32ea342cd699f3fedc7b6029c5100d7892c9f87617f87252592964ba4d4896eff15402f
+  metadata.gz: 5438db3a7db9953df848433a36fd1da52e9e951cee37d8df226a87cd6b661c7bc843a2028c1280d2a2865d238e2a5b74e02af091c2cf725785eee1bba71f88c3
+  data.tar.gz: 95bb639e1d57e5f3b5b7aa61ba30c23047419b433f0a47b22af807865169cba7892a9887706314b364af87a1cc6c9ef4146dd5b6beb19bb9dc3c6dcda7a06c0d

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 Changelog
 =========
+2.8.0
+-----
+-   Make meta_data available to before_notify hooks
+-   Fix bug with rails param filters
+-   Fix encoding error in exception message
 
 2.7.1
 -----

data/README.md

@@ -83,7 +83,11 @@ exceptions, to help debug problems.
 
 ### Rails Apps
 
-In any rails controller you can define a `before_bugsnag_notify` callback, which allows you to add this additional data by calling `add_tab` on the exception notification object. Please see the [Notification Object](#notification-object) for details on the notification parameter.
+By default Bugsnag includes some information automatically. For example, we
+send all the HTTP headers for requests. Additionally if you're using Warden or
+Devise, the id, name and email of the current user are sent.
+
+To send additional information, in any rails controller you can define a `before_bugsnag_notify` callback, which allows you to add this additional data by calling `add_tab` on the exception notification object. Please see the [Notification Object](#notification-object) for details on the notification parameter.
 
 ```ruby
 class MyController < ApplicationController
@@ -639,10 +643,17 @@ introduced in.
 ### Using Heroku
 
 You can easily add Bugsnag deploy tracking to your Heroku application by
-running the following command:
+running the following command from your application's directory:
+
+```shell
+$ bundle exec rake bugsnag:heroku:add_deploy_hook
+```
+
+If you have multiple Heroku apps, you can specify which app to add the hook
+for as with the `HEROKU_APP` environment variable:
 
 ```shell
-$ rake bugsnag:heroku:add_deploy_hook
+$ bundle exec rake bugsnag:heroku:add_deploy_hook HEROKU_APP=my-app
 ```
 
 ### Using Capistrano

data/VERSION

@@ -1 +1 @@
-2.7.1
+2.8.0

data/lib/bugsnag.rb

@@ -14,12 +14,14 @@ require "bugsnag/delivery/thread_queue"
 require "bugsnag/rack"
 require "bugsnag/railtie" if defined?(Rails::Railtie)
 
-[:resque, :sidekiq, :mailman, :delayed_job].each do |integration|
-  begin
-    require "bugsnag/#{integration}"
-  rescue LoadError
-  end
-end
+require "bugsnag/middleware/rack_request"
+require "bugsnag/middleware/warden_user"
+require "bugsnag/middleware/callbacks"
+require "bugsnag/middleware/rails3_request"
+require "bugsnag/middleware/sidekiq"
+require "bugsnag/middleware/mailman"
+require "bugsnag/middleware/rake"
+require "bugsnag/middleware/callbacks"
 
 module Bugsnag
   LOG_PREFIX = "** [Bugsnag] "
@@ -47,7 +49,9 @@ module Bugsnag
 
     # Explicitly notify of an exception
     def notify(exception, overrides=nil, request_data=nil)
-      Notification.new(exception, configuration, overrides, request_data).deliver
+      notification = Notification.new(exception, configuration, overrides, request_data)
+      notification.deliver
+      notification
     end
 
     # Notify of an exception unless it should be ignored
@@ -114,3 +118,10 @@ module Bugsnag
     end
   end
 end
+
+[:resque, :sidekiq, :mailman, :delayed_job].each do |integration|
+  begin
+    require "bugsnag/#{integration}"
+  rescue LoadError
+  end
+end

data/lib/bugsnag/configuration.rb

@@ -20,6 +20,7 @@ module Bugsnag
     attr_accessor :endpoint
     attr_accessor :logger
     attr_accessor :middleware
+    attr_accessor :internal_middleware
     attr_accessor :delay_with_resque
     attr_accessor :debug
     attr_accessor :proxy_host
@@ -75,6 +76,8 @@ module Bugsnag
       self.logger.level = Logger::WARN
 
       # Configure the bugsnag middleware stack
+      self.internal_middleware = Bugsnag::MiddlewareStack.new
+
       self.middleware = Bugsnag::MiddlewareStack.new
       self.middleware.use Bugsnag::Middleware::Callbacks
     end

data/lib/bugsnag/helpers.rb

@@ -1,3 +1,5 @@
+require 'uri'
+
 module Bugsnag
   module Helpers
     MAX_STRING_LENGTH = 4096
@@ -29,20 +31,10 @@ module Bugsnag
         clean_hash
       when Array, Set
         obj.map { |el| cleanup_obj(el, filters, seen) }.compact
-      when Numeric
+      when Numeric, TrueClass, FalseClass
         obj
       when String
-        if defined?(obj.encoding) && defined?(Encoding::UTF_8)
-          if obj.encoding == Encoding::UTF_8
-            obj.valid_encoding? ? obj : obj.encode('utf-16', {:invalid => :replace, :undef => :replace}).encode('utf-8')
-          else
-            obj.encode('utf-8', {:invalid => :replace, :undef => :replace})
-          end
-        elsif defined?(Iconv)
-          Iconv.conv('UTF-8//IGNORE', 'UTF-8', obj) || obj
-        else
-          obj
-        end
+        cleanup_string(obj)
       else
         str = obj.to_s
         # avoid leaking potentially sensitive data from objects' #inspect output
@@ -54,6 +46,24 @@ module Bugsnag
       end
     end
 
+    def self.cleanup_string(str)
+      if defined?(str.encoding) && defined?(Encoding::UTF_8)
+        if str.encoding == Encoding::UTF_8
+          str.valid_encoding? ? str : str.encode('utf-16', {:invalid => :replace, :undef => :replace}).encode('utf-8')
+        else
+          str.encode('utf-8', {:invalid => :replace, :undef => :replace})
+        end
+      elsif defined?(Iconv)
+        Iconv.conv('UTF-8//IGNORE', 'UTF-8', str) || str
+      else
+        str
+      end
+    end
+
+    def self.cleanup_obj_encoding(obj)
+      cleanup_obj(obj, nil)
+    end
+
     def self.filters_match?(object, filters)
       str = object.to_s
 
@@ -67,12 +77,23 @@ module Bugsnag
       end
     end
 
-    def self.cleanup_url(url, filters = nil)
-      return url unless filters
+    def self.cleanup_url(url, filters = [])
+      return url if filters.empty?
 
-      filter_regex = Regexp.new("([?&](?:[^&=]*#{filters.to_a.join('|[^&=]*')}[^&=]*)=)[^&]*")
+      uri = URI(url)
+      return url unless uri.query
+
+      query_params = uri.query.split('&').map { |pair| pair.split('=') }
+      query_params.map! do |key, val|
+        if filters_match?(key, filters)
+          "#{key}=[FILTERED]"
+        else
+          "#{key}=#{val}"
+        end
+      end
 
-      url.gsub(filter_regex, '\1[FILTERED]')
+      uri.query = query_params.join('&')
+      uri.to_s
     end
 
     def self.reduce_hash_size(hash)

data/lib/bugsnag/mailman.rb

@@ -4,9 +4,8 @@ module Bugsnag
   class Mailman
     def call(mail)
       begin
-        Bugsnag.before_notify_callbacks << lambda {|notif|
-          notif.add_tab(:mailman, {"message" => mail.to_s})
-        }
+
+        Bugsnag.set_request_data :mailman_msg, mail.to_s
 
         yield
       rescue Exception => ex
@@ -20,6 +19,9 @@ module Bugsnag
   end
 end
 
+
 if Mailman.config.respond_to?(:middleware)
   Mailman.config.middleware.add ::Bugsnag::Mailman
 end
+
+Bugsnag.configuration.internal_middleware.use(Bugsnag::Middleware::Mailman)

data/lib/bugsnag/middleware/mailman.rb

@@ -0,0 +1,13 @@
+module Bugsnag::Middleware
+  class Mailman
+    def initialize(bugsnag)
+      @bugsnag = bugsnag
+    end
+
+    def call(notification)
+      mailman_msg = notification.request_data[:mailman_msg]
+      notification.add_tab(:mailman, {"message" => mailman_msg}) if mailman_msg
+      @bugsnag.call(notification)
+    end
+  end
+end

data/lib/bugsnag/middleware/rails3_request.rb

@@ -15,6 +15,7 @@ module Bugsnag::Middleware
 
           # Augment the request tab
           notification.add_tab(:request, {
+            :requestId => env["action_dispatch.request_id"],
             :railsAction => "#{params[:controller]}##{params[:action]}",
             :params => params
           })

data/lib/bugsnag/middleware/rake.rb

@@ -0,0 +1,23 @@
+module Bugsnag::Middleware
+  class Rake
+    def initialize(bugsnag)
+      @bugsnag = bugsnag
+    end
+
+    def call(notification)
+      task = notification.request_data[:bugsnag_running_task]
+
+      if task
+        notification.add_tab(:rake_task, {
+          :name => task.name,
+          :description => task.full_comment,
+          :arguments => task.arg_description
+        })
+
+        notification.context ||= task.name
+      end
+
+      @bugsnag.call(notification)
+    end
+  end
+end

data/lib/bugsnag/middleware/sidekiq.rb

@@ -0,0 +1,13 @@
+module Bugsnag::Middleware
+  class Sidekiq
+    def initialize(bugsnag)
+      @bugsnag = bugsnag
+    end
+
+    def call(notification)
+      sidekiq = notification.request_data[:sidekiq]
+      notification.add_tab(:sidekiq, sidekiq) if sidekiq
+      @bugsnag.call(notification)
+    end
+  end
+end

data/lib/bugsnag/notification.rb

@@ -1,4 +1,12 @@
 require "multi_json"
+
+if RUBY_VERSION =~ /^1\.8/
+  begin
+    require "iconv"
+  rescue LoadError
+  end
+end
+
 require "pathname"
 
 module Bugsnag
@@ -183,32 +191,34 @@ module Bugsnag
       # Warn if no release_stage is set
       Bugsnag.warn "You should set your app's release_stage (see https://bugsnag.com/docs/notifiers/ruby#release_stage)." unless @configuration.release_stage
 
-      @meta_data = {}
+      @configuration.internal_middleware.run(self) { }
 
-      # Run the middleware here, at the end of the middleware stack, execute the actual delivery
-      @configuration.middleware.run(self) do
-        # At this point the callbacks have already been run.
-        # This supports self.ignore! for before_notify_callbacks.
-        return if @should_ignore
-
-        # Now override the required fields
-        exceptions.each do |exception|
-          if exception.class.include?(Bugsnag::MetaData)
-            if exception.bugsnag_user_id.is_a?(String)
-              self.user_id = exception.bugsnag_user_id
-            end
-            if exception.bugsnag_context.is_a?(String)
-              self.context = exception.bugsnag_context
-            end
+      exceptions.each do |exception|
+        if exception.class.include?(Bugsnag::MetaData)
+          if exception.bugsnag_user_id.is_a?(String)
+            self.user_id = exception.bugsnag_user_id
+          end
+          if exception.bugsnag_context.is_a?(String)
+            self.context = exception.bugsnag_context
           end
         end
+      end
 
-        [:user_id, :context, :user, :grouping_hash].each do |symbol|
-          if @overrides[symbol]
-            self.send("#{symbol}=", @overrides[symbol])
-            @overrides.delete symbol
-          end
+      [:user_id, :context, :user, :grouping_hash].each do |symbol|
+        if @overrides[symbol]
+          self.send("#{symbol}=", @overrides[symbol])
+          @overrides.delete symbol
         end
+      end
+
+      # make meta_data available to public middleware
+      @meta_data = Bugsnag::Helpers.cleanup_obj(generate_meta_data(@exceptions, @overrides), @configuration.params_filters)
+
+      # Run the middleware here (including Bugsnag::Middleware::Callbacks)
+      # at the end of the middleware stack, execute the actual notification delivery
+      @configuration.middleware.run(self) do
+        # This supports self.ignore! for before_notify_callbacks.
+        return if @should_ignore
 
         # Build the endpoint url
         endpoint = (@configuration.use_ssl ? "https://" : "http://") + @configuration.endpoint
@@ -227,11 +237,17 @@ module Bugsnag
           :exceptions => exception_list,
           :severity => self.severity,
           :groupingHash => self.grouping_hash,
-          :metaData => Bugsnag::Helpers.cleanup_obj(generate_meta_data(@exceptions, @overrides), @configuration.params_filters)
-        }.reject {|k,v| v.nil? }
+        }
 
         payload_event[:device] = {:hostname => @configuration.hostname} if @configuration.hostname
 
+        # cleanup character encodings
+        payload_event = Bugsnag::Helpers.cleanup_obj_encoding(payload_event)
+
+        # filter out sensitive values in (and cleanup encodings) metaData
+        payload_event[:metaData] = Bugsnag::Helpers.cleanup_obj(@meta_data, @configuration.params_filters)
+        payload_event.reject! {|k,v| v.nil? }
+
         # Build the payload hash
         payload = {
           :apiKey => api_key,

data/lib/bugsnag/rack.rb

@@ -1,8 +1,3 @@
-require "bugsnag/middleware/rack_request"
-require "bugsnag/middleware/warden_user"
-require "bugsnag/middleware/callbacks"
-require "bugsnag/middleware/rails3_request"
-
 module Bugsnag
   class Rack
     def initialize(app)
@@ -46,7 +41,7 @@ module Bugsnag
       if env["rack.exception"]
         Bugsnag.auto_notify(env["rack.exception"])
       end
-        
+
       response
     ensure
       # Clear per-request data after processing the each request

data/lib/bugsnag/rails/controller_methods.rb

@@ -3,9 +3,9 @@ module Bugsnag::Rails
     def self.included(base)
       base.extend ClassMethods
     end
-    
+
     module ClassMethods
-      private      
+      private
       def before_bugsnag_notify(*methods, &block)
         _add_bugsnag_notify_callback(:before_callbacks, *methods, &block)
       end
@@ -41,4 +41,4 @@ module Bugsnag::Rails
       Bugsnag.notify(exception, custom_data)
     end
   end
-end
+end

data/lib/bugsnag/rake.rb

@@ -11,38 +11,27 @@ module Bugsnag::Rake
         alias_method :define_task, :bugsnag_define_task
       end
     end
-
-    Bugsnag.before_notify_callbacks << lambda {|notif|
-      task = Thread.current[:bugsnag_running_task]
-      next unless task
-
-      notif.add_tab(:rake_task, {
-        :name => task.name,
-        :description => task.full_comment,
-        :arguments => task.arg_description
-      })
-
-      notif.context ||= task.name
-    }
   end
 
   module ClassMethods
     def bugsnag_define_task(*args, &block)
       task = self.original_define_task(*args) do |*block_args|
         begin
-          old_task = Thread.current[:bugsnag_running_task]
-          Thread.current[:bugsnag_running_task] = task
+          old_task = Bugsnag.configuration.request_data[:bugsnag_running_task]
+          Bugsnag.set_request_data :bugsnag_running_task, task
 
           yield(*block_args) if block_given?
         rescue Exception => e
           Bugsnag.auto_notify(e)
           raise
         ensure
-          Thread.current[:bugsnag_running_task] = old_task
+          Bugsnag.set_request_data :bugsnag_running_task, old_task
         end
       end
     end
   end
 end
 
+Bugsnag.configuration.internal_middleware.use(Bugsnag::Middleware::Rake)
+
 Rake::Task.send(:include, Bugsnag::Rake) if defined?(Rake::Task)

data/lib/bugsnag/sidekiq.rb

@@ -4,10 +4,9 @@ module Bugsnag
   class Sidekiq
     def call(worker, msg, queue)
       begin
-        Bugsnag.before_notify_callbacks << lambda {|notif|
-          notif.add_tab(:sidekiq, msg)
-          notif.context ||= "sidekiq##{queue}"
-        }
+
+        # store msg/queue in thread local state to be read by Bugsnag::Middleware::Sidekiq
+        Bugsnag.set_request_data :sidekiq, { :msg => msg, :queue => queue }
 
         yield
       rescue Exception => ex
@@ -34,3 +33,5 @@ else
     end
   end
 end
+
+Bugsnag.configuration.internal_middleware.use(Bugsnag::Middleware::Sidekiq)

data/lib/bugsnag/tasks/bugsnag.rake

@@ -45,7 +45,9 @@ namespace :bugsnag do
       }
 
       # Fetch heroku config settings
-      heroku_env = run_command.call("heroku config --shell").split.each_with_object({}) do |c, obj|
+      config_command = "heroku config --shell"
+      config_command += " --app #{ENV["HEROKU_APP"]}" if ENV["HEROKU_APP"]
+      heroku_env = run_command.call(config_command).split(/[\n\r]/).each_with_object({}) do |c, obj|
         k,v = c.split("=")
         obj[k] = v.strip.empty? ? nil : v
       end
@@ -71,6 +73,7 @@ namespace :bugsnag do
       # Add the hook
       url = "https://notify.bugsnag.com/deploy?" + params.map {|k,v| "#{k}=#{v}"}.join("&")
       command = "heroku addons:add deployhooks:http --url=\"#{url}\""
+      command += " --app #{ENV["HEROKU_APP"]}" if ENV["HEROKU_APP"]
 
       puts "$ #{command}"
       run_command.call(command)

data/spec/fixtures/middleware/internal_info_setter.rb

@@ -0,0 +1,11 @@
+class InternalInfoSetter
+  MESSAGE = "set by internal_middleware"
+  def initialize(bugsnag)
+    @bugsnag = bugsnag
+  end
+
+  def call(notification)
+    notification.meta_data[:custom][:info] = MESSAGE
+    @bugsnag.call(notification)
+  end
+end

data/spec/fixtures/middleware/public_info_setter.rb

@@ -0,0 +1,11 @@
+class PublicInfoSetter
+  MESSAGE = "set by middleware"
+  def initialize(bugsnag)
+    @bugsnag = bugsnag
+  end
+
+  def call(notification)
+    notification.meta_data[:custom][:info] = MESSAGE
+    @bugsnag.call(notification)
+  end
+end

data/spec/fixtures/tasks/Rakefile

@@ -0,0 +1,15 @@
+require "bugsnag/rake"
+
+namespace :test do
+  desc "used by integration_spec to test that Bugsnag::Middleware::Rake runs properly"
+  task :crash do
+    port = ENV['BUGSNAG_TEST_SERVER_PORT']
+    Bugsnag.configure do |config|
+      config.endpoint = "localhost:#{port}"
+      config.api_key = "0" * 32
+      config.use_ssl = false
+    end
+
+    raise
+  end
+end

data/spec/helper_spec.rb

@@ -114,4 +114,20 @@ describe Bugsnag::Helpers do
 
     expect(url).to eq("/dir/page?param1=[FILTERED]&param2=[FILTERED]&param3=value3")
   end
+
+  it "filters using a combination of string and regex filters" do
+    url = Bugsnag::Helpers.cleanup_url "/dir/page?param1=value1&param2=value2&param3=value3", ["param1", /param2/]
+
+    expect(url).to eq("/dir/page?param1=[FILTERED]&param2=[FILTERED]&param3=value3")
+  end
+
+  it "filters regex matches" do
+    url = Bugsnag::Helpers.cleanup_url "https://host.example/sessions?access_token=abc123", [/\Aaccess_token\z/]
+    expect(url).to eq("https://host.example/sessions?access_token=[FILTERED]")
+  end
+
+  it "filters partial regex matches" do
+    url = Bugsnag::Helpers.cleanup_url "https://host.example/sessions?access_token=abc123", [/token/]
+    expect(url).to eq("https://host.example/sessions?access_token=[FILTERED]")
+  end
 end

data/spec/integration_spec.rb

@@ -1,5 +1,6 @@
 require 'webrick'
 require 'spec_helper'
+require 'json'
 
 describe 'Bugsnag' do
   server = nil
@@ -20,6 +21,16 @@ describe 'Bugsnag' do
 
   let(:request) { JSON.parse(queue.pop) }
 
+  it 'should run the rake middleware when rake tasks crash' do
+    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
+    expect(request["events"][0]["metaData"]["rake_task"]).not_to be_nil
+    expect(request["events"][0]["metaData"]["rake_task"]["name"]).to eq("test:crash")
+  end
+
   it 'should send notifications over the wire' do
     Bugsnag.configure do |config|
       config.endpoint = "localhost:#{server.config[:Port]}"

data/spec/middleware_spec.rb

@@ -1,4 +1,6 @@
 require 'spec_helper'
+require 'fixtures/middleware/public_info_setter'
+require 'fixtures/middleware/internal_info_setter'
 
 describe Bugsnag::MiddlewareStack do
   it "runs before_bugsnag_notify callbacks, adding a tab" do
@@ -65,23 +67,28 @@ describe Bugsnag::MiddlewareStack do
 
   end
 
-  it "overrides data set in before_notify" do
+  it "allows overrides to override values set by internal middleware" do
+    Bugsnag.configuration.internal_middleware.use(InternalInfoSetter)
+    Bugsnag.notify(BugsnagTestException.new("It crashed"), {:info => "overridden"})
 
-    callback_run_count = 0
-    Bugsnag.before_notify_callbacks << lambda {|notif|
-      notif.add_custom_data(:info, "here")
-      notif.add_custom_data(:data, "also here")
-
-      callback_run_count += 1
+    expect(Bugsnag).to have_sent_notification{ |payload|
+      event = get_event_from_payload(payload)
+      expect(event["metaData"]["custom"]).not_to be_nil
+      expect(event["metaData"]["custom"]["info"]).not_to eq(InternalInfoSetter::MESSAGE)
+      expect(event["metaData"]["custom"]["info"]).to eq("overridden")
     }
+  end
+
+  it "doesn't allow overrides to override public middleware" do
+    Bugsnag.configuration.middleware.use(PublicInfoSetter)
+
+    Bugsnag.notify(BugsnagTestException.new("It crashed"), {:info => "overridden"})
 
-    Bugsnag.notify(BugsnagTestException.new("It crashed"), {:info => "here2"})
-    expect(callback_run_count).to eq(1)
     expect(Bugsnag).to have_sent_notification{ |payload|
       event = get_event_from_payload(payload)
       expect(event["metaData"]["custom"]).not_to be_nil
-      expect(event["metaData"]["custom"]["info"]).to eq("here2")
-      expect(event["metaData"]["custom"]["data"]).to eq("also here")
+      expect(event["metaData"]["custom"]["info"]).not_to eq("overridden")
+      expect(event["metaData"]["custom"]["info"]).to eq(PublicInfoSetter::MESSAGE)
     }
   end
 
@@ -93,7 +100,6 @@ describe Bugsnag::MiddlewareStack do
       event = get_event_from_payload(payload)
       expect(event["metaData"].size).to eq(0)
     }
-
   end
 
   it "runs after_bugsnag_notify callbacks" do
@@ -105,7 +111,7 @@ describe Bugsnag::MiddlewareStack do
     Bugsnag.notify(BugsnagTestException.new("It crashed"))
 
     expect(callback_run_count).to eq(1)
-    expect(Bugsnag::Notification).to have_sent_notification
+    expect(Bugsnag::Notification).to have_sent_notification { }
   end
 
   it "does not execute disabled bugsnag middleware" do
@@ -127,7 +133,7 @@ describe Bugsnag::MiddlewareStack do
       notif.ignore!
     end
     Bugsnag.notify(BugsnagTestException.new("It crashed"))
-    expect(Bugsnag::Notification).not_to have_sent_notification
+    expect(Bugsnag::Notification).not_to have_sent_notification { }
   end
 
   it "allows inspection of meta_data before ignoring exception" do
@@ -145,4 +151,31 @@ describe Bugsnag::MiddlewareStack do
     expect(Bugsnag::Notification).not_to have_sent_notification
 
   end
+
+  it "allows meta_data to be modified in a middleware" do
+    MetaDataMunger = Class.new do
+      def initialize(bugsnag)
+        @bugsnag = bugsnag
+      end
+
+      def call(notification)
+        token = notification.meta_data[:sidekiq][:args].first
+        notification.meta_data[:sidekiq][:args] = ["#{token[0...6]}*****#{token[-4..-1]}"]
+        @bugsnag.call(notification)
+      end
+    end
+
+    Bugsnag.configure do |c|
+      c.middleware.use MetaDataMunger
+    end
+
+    notification = Bugsnag.notify(BugsnagTestException.new("It crashed"), {
+      :sidekiq => {
+        :args => ["abcdef123456abcdef123456abcdef123456"]
+      }
+    })
+
+    expect(notification.meta_data[:sidekiq][:args]).to eq(["abcdef*****3456"])
+  end
+
 end

data/spec/notification_spec.rb

@@ -267,8 +267,8 @@ describe Bugsnag::Notification do
 
     expect(Bugsnag).to have_sent_notification{ |payload|
       # Truncated body should be no bigger than
-      # 2 truncated hashes (4096*2) + rest of payload (5000)
-      expect(Bugsnag::Helpers.dump_json(payload).length).to be < 4096*2 + 10000
+      # 2 truncated hashes (4096*2) + rest of payload (20000)
+      expect(Bugsnag::Helpers.dump_json(payload).length).to be < 4096*2 + 20000
     }
   end
 
@@ -660,6 +660,116 @@ describe Bugsnag::Notification do
     }
   end
 
+  it "should handle utf8 encoding errors in exceptions_list" do
+    invalid_data = "\"foo\xEBbar\""
+    invalid_data = invalid_data.force_encoding("utf-8") if invalid_data.respond_to?(:force_encoding)
+
+    begin
+      JSON.parse(invalid_data)
+    rescue
+      Bugsnag.notify $!
+    end
+
+    expect(Bugsnag).to have_sent_notification { |payload|
+      if defined?(Encoding::UTF_8)
+        expect(payload.to_json).to match(/foo�bar/)
+      else
+        expect(payload.to_json).to match(/foobar/)
+      end
+    }
+  end
+
+  it "should handle utf8 encoding errors in notification context" do
+    invalid_data = "\"foo\xEBbar\""
+    invalid_data = invalid_data.force_encoding("utf-8") if invalid_data.respond_to?(:force_encoding)
+
+    begin
+      raise
+    rescue
+      Bugsnag.notify($!, { :context => invalid_data })
+    end
+
+    expect(Bugsnag).to have_sent_notification { |payload|
+      if defined?(Encoding::UTF_8)
+        expect(payload.to_json).to match(/foo�bar/)
+      else
+        expect(payload.to_json).to match(/foobar/)
+      end
+    }
+  end
+
+  it "should handle utf8 encoding errors in notification app fields" do
+    invalid_data = "\"foo\xEBbar\""
+    invalid_data = invalid_data.force_encoding("utf-8") if invalid_data.respond_to?(:force_encoding)
+
+    Bugsnag.configuration.app_version = invalid_data
+    Bugsnag.configuration.release_stage = invalid_data
+    Bugsnag.configuration.app_type = invalid_data
+
+    begin
+      raise
+    rescue
+      Bugsnag.notify $!
+    end
+
+    expect(Bugsnag).to have_sent_notification { |payload|
+      if defined?(Encoding::UTF_8)
+        expect(payload.to_json).to match(/foo�bar/)
+      else
+        expect(payload.to_json).to match(/foobar/)
+      end
+    }
+  end
+
+  it "should handle utf8 encoding errors in grouping_hash" do
+    invalid_data = "\"foo\xEBbar\""
+    invalid_data = invalid_data.force_encoding("utf-8") if invalid_data.respond_to?(:force_encoding)
+
+    Bugsnag.before_notify_callbacks << lambda do |notif|
+      notif.grouping_hash = invalid_data
+    end
+
+    begin
+      raise
+    rescue
+      Bugsnag.notify $!
+    end
+
+    expect(Bugsnag).to have_sent_notification { |payload|
+      if defined?(Encoding::UTF_8)
+        expect(payload.to_json).to match(/foo�bar/)
+      else
+        expect(payload.to_json).to match(/foobar/)
+      end
+    }
+  end
+
+  it "should handle utf8 encoding errors in notification user fields" do
+    invalid_data = "\"foo\xEBbar\""
+    invalid_data = invalid_data.force_encoding("utf-8") if invalid_data.respond_to?(:force_encoding)
+
+    Bugsnag.before_notify_callbacks << lambda do |notif|
+      notif.user = {
+        :email => "#{invalid_data}@foo.com",
+        :name => invalid_data
+      }
+    end
+
+    begin
+      raise
+    rescue
+      Bugsnag.notify $!
+    end
+
+    expect(Bugsnag).to have_sent_notification { |payload|
+      if defined?(Encoding::UTF_8)
+        expect(payload.to_json).to match(/foo�bar/)
+      else
+        expect(payload.to_json).to match(/foobar/)
+      end
+    }
+  end
+
   if defined?(JRUBY_VERSION)
 
     it "should work with java.lang.Throwables" do

data/spec/spec_helper.rb

@@ -45,8 +45,9 @@ def have_sent_notification(&matcher)
   have_requested(:post, "https://notify.bugsnag.com/").with do |request|
     if matcher
       matcher.call JSON.parse(request.body)
-    else
       true
+    else
+      raise "no matcher provided to have_sent_notification (did you use { })"
     end
   end
 end

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: bugsnag
 version: !ruby/object:Gem::Version
-  version: 2.7.1
+  version: 2.8.0
 platform: ruby
 authors:
 - James Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-04 00:00:00.000000000 Z
+date: 2015-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Ruby notifier for bugsnag.com
@@ -102,10 +102,10 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.md
 files:
-- ".document"
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .document
+- .gitignore
+- .rspec
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -127,9 +127,12 @@ files:
 - lib/bugsnag/mailman.rb
 - lib/bugsnag/meta_data.rb
 - lib/bugsnag/middleware/callbacks.rb
+- lib/bugsnag/middleware/mailman.rb
 - lib/bugsnag/middleware/rack_request.rb
 - lib/bugsnag/middleware/rails2_request.rb
 - lib/bugsnag/middleware/rails3_request.rb
+- lib/bugsnag/middleware/rake.rb
+- lib/bugsnag/middleware/sidekiq.rb
 - lib/bugsnag/middleware/warden_user.rb
 - lib/bugsnag/middleware_stack.rb
 - lib/bugsnag/notification.rb
@@ -152,6 +155,9 @@ files:
 - spec/fixtures/crashes/end_of_file.rb
 - spec/fixtures/crashes/short_file.rb
 - spec/fixtures/crashes/start_of_file.rb
+- spec/fixtures/middleware/internal_info_setter.rb
+- spec/fixtures/middleware/public_info_setter.rb
+- spec/fixtures/tasks/Rakefile
 - spec/helper_spec.rb
 - spec/integration_spec.rb
 - spec/middleware_spec.rb
@@ -168,17 +174,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Ruby notifier for bugsnag.com