bugsnag 6.4.0 → 6.5.0

data/spec/configuration_spec.rb

@@ -22,6 +22,11 @@ describe Bugsnag::Configuration do
       subject.delivery_method = :wow
       expect(subject.delivery_method).to eq(:wow)
     end
+
+    it "should have sensible defaults for session tracking" do
+      expect(subject.session_endpoint).to eq("https://sessions.bugsnag.com")
+      expect(subject.track_sessions).to be false
+    end
   end
 
   it "should have exit exception classes ignored by default" do

data/spec/integrations/sidekiq_spec.rb

@@ -23,7 +23,7 @@ describe Bugsnag::Sidekiq do
     rescue
     end
 
-    expect(Bugsnag).to have_sent_notification {|payload|
+    expect(Bugsnag).to have_sent_notification {|payload, headers|
       event = get_event_from_payload(payload)
       expect(event["metaData"]["sidekiq"]["msg"]["class"]).to eq("FailingWorker")
       expect(event["metaData"]["sidekiq"]["msg"]["args"]).to eq([-0])

data/spec/middleware_spec.rb

@@ -16,7 +16,7 @@ describe Bugsnag::MiddlewareStack do
     Bugsnag.notify(BugsnagTestException.new("It crashed"))
     expect(callback_run_count).to eq(1)
 
-    expect(Bugsnag).to have_sent_notification{ |payload|
+    expect(Bugsnag).to have_sent_notification{ |payload, headers|
       event = get_event_from_payload(payload)
       expect(event["metaData"]["some_tab"]).not_to be_nil
       expect(event["metaData"]["some_tab"]["info"]).to eq("here")
@@ -37,7 +37,7 @@ describe Bugsnag::MiddlewareStack do
     Bugsnag.notify(BugsnagTestException.new("It crashed"))
     expect(callback_run_count).to eq(1)
 
-    expect(Bugsnag).to have_sent_notification{ |payload|
+    expect(Bugsnag).to have_sent_notification{ |payload, headers|
       event = get_event_from_payload(payload)
       expect(event["metaData"]["custom"]).not_to be_nil
       expect(event["metaData"]["custom"]["info"]).to eq("here")
@@ -56,7 +56,7 @@ describe Bugsnag::MiddlewareStack do
     Bugsnag.notify(BugsnagTestException.new("It crashed"))
     expect(callback_run_count).to eq(1)
 
-    expect(Bugsnag).to have_sent_notification{ |payload|
+    expect(Bugsnag).to have_sent_notification{ |payload, headers|
       event = get_event_from_payload(payload)
       expect(event["user"]).not_to be_nil
       expect(event["user"]["id"]).to eq("here")
@@ -73,7 +73,7 @@ describe Bugsnag::MiddlewareStack do
       report.meta_data.merge!({custom: {info: 'overridden'}})
     end
 
-    expect(Bugsnag).to have_sent_notification{ |payload|
+    expect(Bugsnag).to have_sent_notification{ |payload, headers|
       event = get_event_from_payload(payload)
       expect(event["metaData"]["custom"]).not_to be_nil
       expect(event["metaData"]["custom"]["info"]).to eq("overridden")
@@ -87,7 +87,7 @@ describe Bugsnag::MiddlewareStack do
       report.meta_data.merge!({custom: {info: 'overridden'}})
     end
 
-    expect(Bugsnag).to have_sent_notification{ |payload|
+    expect(Bugsnag).to have_sent_notification{ |payload, headers|
       event = get_event_from_payload(payload)
       expect(event["metaData"]["custom"]).not_to be_nil
       expect(event["metaData"]["custom"]["info"]).to eq("overridden")
@@ -97,7 +97,7 @@ describe Bugsnag::MiddlewareStack do
   it "does not have have before callbacks by default" do
     expect(Bugsnag.before_notify_callbacks.size).to eq(0)
     Bugsnag.notify(BugsnagTestException.new("It crashed"))
-    expect(Bugsnag).to have_sent_notification{ |payload|
+    expect(Bugsnag).to have_sent_notification{ |payload, headers|
       event = get_event_from_payload(payload)
       expect(event["metaData"].size).to eq(0)
     }
@@ -172,7 +172,7 @@ describe Bugsnag::MiddlewareStack do
 
     Bugsnag.notify(BugsnagTestException.new("It crashed"))
 
-    expect(Bugsnag).to have_sent_notification{ |payload|
+    expect(Bugsnag).to have_sent_notification{ |payload, headers|
       event = get_event_from_payload(payload)
       expect(event["metaData"]['test']['value']).to eq("abcdef*****3456")
     }
@@ -187,7 +187,7 @@ describe Bugsnag::MiddlewareStack do
           Bugsnag.notify(e)
         end
 
-        expect(Bugsnag).to have_sent_notification{ |payload|
+        expect(Bugsnag).to have_sent_notification{ |payload, headers|
           event = get_event_from_payload(payload)
           expect(event["metaData"]["error"]).to_not be_nil
           expect(event["metaData"]["error"]).to eq({"suggestion" => "prepend"})
@@ -205,7 +205,7 @@ describe Bugsnag::MiddlewareStack do
           Bugsnag.notify(e)
         end
 
-        expect(Bugsnag).to have_sent_notification{ |payload|
+        expect(Bugsnag).to have_sent_notification{ |payload, headers|
           event = get_event_from_payload(payload)
           expect(event["metaData"]["error"]).to be_nil
         }
@@ -240,7 +240,7 @@ describe Bugsnag::MiddlewareStack do
       }
     end
 
-    expect(Bugsnag).to have_sent_notification{ |payload|
+    expect(Bugsnag).to have_sent_notification{ |payload, headers|
       event = get_event_from_payload(payload)
       expect(event["unhandled"]).to be true
       expect(event["severityReason"]).to eq({

data/spec/rack_spec.rb

@@ -25,7 +25,7 @@ describe Bugsnag::Rack do
     it "delivers an exception if auto_notify is enabled" do
       rack_stack.call(rack_env) rescue nil
 
-      expect(Bugsnag).to have_sent_notification{ |payload|
+      expect(Bugsnag).to have_sent_notification{ |payload, headers|
         exception_class = payload["events"].first["exceptions"].first["errorClass"]
         expect(exception_class).to eq(exception.class.to_s)
       }
@@ -35,7 +35,7 @@ describe Bugsnag::Rack do
     it "applies the correct severity reason" do
       rack_stack.call(rack_env) rescue nil
 
-      expect(Bugsnag).to have_sent_notification{ |payload|
+      expect(Bugsnag).to have_sent_notification{ |payload, headers|
         event = get_event_from_payload(payload)
         expect(event["unhandled"]).to be true
         expect(event["severityReason"]).to eq({

data/spec/rails3_request_spec.rb

@@ -13,7 +13,7 @@ describe Bugsnag::Middleware::Rails3Request do
       })
       Bugsnag.notify(BugsnagTestException.new('Grimbles'))
 
-      expect(Bugsnag).to have_sent_notification { |payload|
+      expect(Bugsnag).to have_sent_notification { |payload, headers|
         event = get_event_from_payload(payload)
         puts event["metaData"].inspect
         expect(event["metaData"]["request"]).to eq({
@@ -38,7 +38,7 @@ describe Bugsnag::Middleware::Rails3Request do
 
         Bugsnag.notify(BugsnagTestException.new('Grimbles'))
 
-        expect(Bugsnag).to have_sent_notification { |payload|
+        expect(Bugsnag).to have_sent_notification { |payload, headers|
           event = get_event_from_payload(payload)
           puts event["metaData"].inspect
           expect(event["metaData"]["request"]).to eq({

data/spec/report_spec.rb

@@ -31,8 +31,8 @@ describe Bugsnag::Report do
   it "should contain an api_key if one is set" do
     Bugsnag.notify(BugsnagTestException.new("It crashed"))
 
-    expect(Bugsnag).to have_sent_notification{ |payload|
-      expect(payload["apiKey"]).to eq("c9d60ae4c7e70c4b6c4ebd3e8056d2b8")
+    expect(Bugsnag).to have_sent_notification{ |payload, headers|
+      expect(headers["Bugsnag-Api-Key"]).to eq("c9d60ae4c7e70c4b6c4ebd3e8056d2b8")
     }
   end
 
@@ -57,8 +57,8 @@ describe Bugsnag::Report do
       report.api_key = "9d84383f9be2ca94902e45c756a9979d"
     end
 
-    expect(Bugsnag).to have_sent_notification{ |payload|
-      expect(payload["apiKey"]).to eq("9d84383f9be2ca94902e45c756a9979d")
+    expect(Bugsnag).to have_sent_notification{ |payload, headers|
+      expect(headers["Bugsnag-Api-Key"]).to eq("9d84383f9be2ca94902e45c756a9979d")
     }
   end
 
@@ -68,7 +68,7 @@ describe Bugsnag::Report do
       report.grouping_hash = "this is my grouping hash"
     end
 
-    expect(Bugsnag).to have_sent_notification{ |payload|
+    expect(Bugsnag).to have_sent_notification{ |payload, headers|
       event = get_event_from_payload(payload)
       expect(event["groupingHash"]).to eq("this is my grouping hash")
     }
@@ -85,15 +85,15 @@ describe Bugsnag::Report do
 
     Bugsnag.notify(BugsnagTestException.new("It crashed"))
 
-    expect(Bugsnag).to have_sent_notification{ |payload|
-      expect(payload["apiKey"]).to eq("c9d60ae4c7e70c4b6c4ebd3e8056d2b9")
+    expect(Bugsnag).to have_sent_notification{ |payload, headers|
+      expect(headers["Bugsnag-Api-Key"]).to eq("c9d60ae4c7e70c4b6c4ebd3e8056d2b9")
     }
   end
 
   it "has the right exception class" do
     Bugsnag.notify(BugsnagTestException.new("It crashed"))
 
-    expect(Bugsnag).to have_sent_notification{ |payload|
+    expect(Bugsnag).to have_sent_notification{ |payload, headers|
       exception = get_exception_from_payload(payload)
       expect(exception["errorClass"]).to eq("BugsnagTestException")
     }
@@ -102,7 +102,7 @@ describe Bugsnag::Report do
   it "has the right exception message" do
     Bugsnag.notify(BugsnagTestException.new("It crashed"))
 
-    expect(Bugsnag).to have_sent_notification{ |payload|
+    expect(Bugsnag).to have_sent_notification{ |payload, headers|
       exception = get_exception_from_payload(payload)
       expect(exception["message"]).to eq("It crashed")
     }
@@ -111,7 +111,7 @@ describe Bugsnag::Report do
   it "has a valid stacktrace" do
     Bugsnag.notify(BugsnagTestException.new("It crashed"))
 
-    expect(Bugsnag).to have_sent_notification{ |payload|
+    expect(Bugsnag).to have_sent_notification{ |payload, headers|
       exception = get_exception_from_payload(payload)
       expect(exception["stacktrace"].length).to be > 0
     }
@@ -120,7 +120,7 @@ describe Bugsnag::Report do
   it "uses correct unhandled defaults" do
     Bugsnag.notify(BugsnagTestException.new("It crashed"))
 
-    expect(Bugsnag).to have_sent_notification{ |payload|
+    expect(Bugsnag).to have_sent_notification{ |payload, headers|
       event = get_event_from_payload(payload)
       expect(event["unhandled"]).to be false
       expect(event["severity"]).to eq("warning")
@@ -134,7 +134,7 @@ describe Bugsnag::Report do
     Bugsnag.notify(BugsnagTestException.new("It crashed")) do |notification|
       notification.severity = "info"
     end
-    expect(Bugsnag).to have_sent_notification{ |payload|
+    expect(Bugsnag).to have_sent_notification{ |payload, headers|
       event = get_event_from_payload(payload)
       expect(event["unhandled"]).to be false
       expect(event["severity"]).to eq("info")
@@ -146,7 +146,7 @@ describe Bugsnag::Report do
 
   it "sets correct severity and reason for specific error classes" do
     Bugsnag.notify(SignalException.new("TERM"))
-    expect(Bugsnag).to have_sent_notification{ |payload|
+    expect(Bugsnag).to have_sent_notification{ |payload, headers|
       event = get_event_from_payload(payload)
       expect(event["unhandled"]).to be false
       expect(event["severity"]).to eq("info")
@@ -171,7 +171,7 @@ describe Bugsnag::Report do
       })
     end
 
-    expect(Bugsnag).to have_sent_notification{ |payload|
+    expect(Bugsnag).to have_sent_notification{ |payload, headers|
       event = get_event_from_payload(payload)
       expect(event["metaData"]["some_tab"]).to eq(
         "info" => "here",
@@ -191,7 +191,7 @@ describe Bugsnag::Report do
 
     Bugsnag.notify(exception)
 
-    expect(Bugsnag).to have_sent_notification{ |payload|
+    expect(Bugsnag).to have_sent_notification{ |payload, headers|
       event = get_event_from_payload(payload)
       expect(event["metaData"]["some_tab"]).to eq(
         "info" => "here",
@@ -213,7 +213,7 @@ describe Bugsnag::Report do
       report.remove_tab(:some_tab)
     end
 
-    expect(Bugsnag).to have_sent_notification{ |payload|
+    expect(Bugsnag).to have_sent_notification{ |payload, headers|
       event = get_event_from_payload(payload)
       expect(event["metaData"]["some_tab"]).to be_nil
     }
@@ -232,7 +232,7 @@ describe Bugsnag::Report do
       report.remove_tab(nil)
     end
 
-    expect(Bugsnag).to have_sent_notification{ |payload|
+    expect(Bugsnag).to have_sent_notification{ |payload, headers|
       event = get_event_from_payload(payload)
       expect(event["metaData"]["some_tab"]).to eq(
         "info" => "here",
@@ -248,7 +248,7 @@ describe Bugsnag::Report do
       report.add_tab(:some_tab, "added")
     end
 
-    expect(Bugsnag).to have_sent_notification{ |payload|
+    expect(Bugsnag).to have_sent_notification{ |payload, headers|
       event = get_event_from_payload(payload)
       expect(event["metaData"]["custom"]).to eq(
         "some_tab" => "added",
@@ -269,7 +269,7 @@ describe Bugsnag::Report do
       report.add_tab(:some_tab, {:info => "overridden"})
     end
 
-    expect(Bugsnag).to have_sent_notification{ |payload|
+    expect(Bugsnag).to have_sent_notification{ |payload, headers|
       event = get_event_from_payload(payload)
       expect(event["metaData"]["some_tab"]).to eq(
         "info" => "overridden",
@@ -284,7 +284,7 @@ describe Bugsnag::Report do
 
     Bugsnag.notify(exception)
 
-    expect(Bugsnag).to have_sent_notification{ |payload|
+    expect(Bugsnag).to have_sent_notification{ |payload, headers|
       event = get_event_from_payload(payload)
       expect(event["user"]["id"]).to eq("exception_user_id")
     }
@@ -298,7 +298,7 @@ describe Bugsnag::Report do
       report.user.merge!({:id => "override_user_id"})
     end
 
-    expect(Bugsnag).to have_sent_notification{ |payload|
+    expect(Bugsnag).to have_sent_notification{ |payload, headers|
       event = get_event_from_payload(payload)
       expect(event["user"]["id"]).to eq("override_user_id")
     }
@@ -310,7 +310,7 @@ describe Bugsnag::Report do
 
     Bugsnag.notify(exception)
 
-    expect(Bugsnag).to have_sent_notification{ |payload|
+    expect(Bugsnag).to have_sent_notification{ |payload, headers|
       event = get_event_from_payload(payload)
       expect(event["context"]).to eq("exception_context")
     }
@@ -322,7 +322,7 @@ describe Bugsnag::Report do
 
     Bugsnag.notify(exception)
 
-    expect(Bugsnag).to have_sent_notification{ |payload|
+    expect(Bugsnag).to have_sent_notification{ |payload, headers|
       event = get_event_from_payload(payload)
       expect(event["groupingHash"]).to eq("exception_hash")
     }
@@ -337,7 +337,7 @@ describe Bugsnag::Report do
       report.context = "override_context"
     end
 
-    expect(Bugsnag).to have_sent_notification{ |payload|
+    expect(Bugsnag).to have_sent_notification{ |payload, headers|
       event = get_event_from_payload(payload)
       expect(event["context"]).to eq("override_context")
     }
@@ -353,7 +353,7 @@ describe Bugsnag::Report do
       })
     end
 
-    expect(Bugsnag).to have_sent_notification{ |payload|
+    expect(Bugsnag).to have_sent_notification{ |payload, headers|
       event = get_event_from_payload(payload)
       expect(event["metaData"]["some_tab"]).to eq(
         "info" => "here",
@@ -372,7 +372,7 @@ describe Bugsnag::Report do
       })
     end
 
-    expect(Bugsnag).to have_sent_notification{ |payload|
+    expect(Bugsnag).to have_sent_notification{ |payload, headers|
       # Truncated body should be no bigger than
       # 2 truncated hashes (4096*2) + rest of payload (20000)
       expect(::JSON.dump(payload).length).to be < 4096*2 + 20000
@@ -389,7 +389,7 @@ describe Bugsnag::Report do
       })
     end
 
-    expect(Bugsnag).to have_sent_notification{ |payload|
+    expect(Bugsnag).to have_sent_notification{ |payload, headers|
       # Truncated body should be no bigger than
       # 2 truncated hashes (4096*2) + rest of payload (20000)
       expect(::JSON.dump(payload).length).to be < 4096*2 + 20000
@@ -403,7 +403,7 @@ describe Bugsnag::Report do
     ex.set_backtrace(stacktrace)
     Bugsnag.notify(ex)
 
-    expect(Bugsnag).to have_sent_notification{ |payload|
+    expect(Bugsnag).to have_sent_notification{ |payload, headers|
       # Truncated body should be no bigger than
       # 400 stacktrace lines * approx 60 chars per line + rest of payload (20000)
       expect(::JSON.dump(payload).length).to be < 400*60 + 20000
@@ -415,7 +415,7 @@ describe Bugsnag::Report do
       report.severity = "info"
     end
 
-    expect(Bugsnag).to have_sent_notification{ |payload|
+    expect(Bugsnag).to have_sent_notification{ |payload, headers|
       event = get_event_from_payload(payload)
       expect(event["severity"]).to eq("info")
     }
@@ -425,7 +425,7 @@ describe Bugsnag::Report do
   it "defaults to warning severity" do
     Bugsnag.notify(BugsnagTestException.new("It crashed"))
 
-    expect(Bugsnag).to have_sent_notification{ |payload|
+    expect(Bugsnag).to have_sent_notification{ |payload, headers|
       event = get_event_from_payload(payload)
       expect(event["severity"]).to eq("warning")
     }
@@ -436,7 +436,7 @@ describe Bugsnag::Report do
       report.context = 'test_context'
     end
 
-    expect(Bugsnag).to have_sent_notification{ |payload|
+    expect(Bugsnag).to have_sent_notification{ |payload, headers|
       event = get_event_from_payload(payload)
       expect(event["context"]).to eq("test_context")
     }
@@ -447,7 +447,7 @@ describe Bugsnag::Report do
       report.user = {id: 'test_user'}
     end
 
-    expect(Bugsnag).to have_sent_notification{ |payload|
+    expect(Bugsnag).to have_sent_notification{ |payload, headers|
       event = get_event_from_payload(payload)
       expect(event["user"]["id"]).to eq("test_user")
     }
@@ -470,7 +470,7 @@ describe Bugsnag::Report do
 
     Bugsnag.notify(BugsnagTestException.new("It crashed"))
 
-    expect(Bugsnag).to have_sent_notification{ |payload|
+    expect(Bugsnag).to have_sent_notification{ |payload, headers|
       event = get_event_from_payload(payload)
       expect(event["app"]["releaseStage"]).to eq("production")
     }
@@ -490,7 +490,7 @@ describe Bugsnag::Report do
     Bugsnag.configuration.notify_release_stages = ["development"]
     Bugsnag.notify(BugsnagTestException.new("It crashed"))
 
-    expect(Bugsnag).to have_sent_notification{ |payload|
+    expect(Bugsnag).to have_sent_notification{ |payload, headers|
       event = get_event_from_payload(payload)
       expect(event["exceptions"].length).to eq(1)
     }
@@ -506,7 +506,7 @@ describe Bugsnag::Report do
     Bugsnag.configuration.project_root = "/Random/location/here"
     Bugsnag.notify(BugsnagTestException.new("It crashed"))
 
-    expect(Bugsnag).to have_sent_notification{ |payload|
+    expect(Bugsnag).to have_sent_notification{ |payload, headers|
       exception = get_exception_from_payload(payload)
       expect(exception["stacktrace"].size).to be >= 1
       expect(exception["stacktrace"].first["inProject"]).to be_nil
@@ -517,7 +517,7 @@ describe Bugsnag::Report do
     Bugsnag.configuration.project_root = File.expand_path File.dirname(__FILE__)
     Bugsnag.notify(BugsnagTestException.new("It crashed"))
 
-    expect(Bugsnag).to have_sent_notification{ |payload|
+    expect(Bugsnag).to have_sent_notification{ |payload, headers|
       exception = get_exception_from_payload(payload)
       expect(exception["stacktrace"].size).to be >= 1
       expect(exception["stacktrace"].first["inProject"]).to eq(true)
@@ -539,7 +539,7 @@ describe Bugsnag::Report do
       "(pry):3:in `__pry__'"
     ]}
     Bugsnag.notify(ex)
-    expect(Bugsnag).to have_sent_notification{ |payload|
+    expect(Bugsnag).to have_sent_notification{ |payload, headers|
       exception = get_exception_from_payload(payload)
 
       expect(exception["stacktrace"][0]["inProject"]).to be_nil
@@ -556,7 +556,7 @@ describe Bugsnag::Report do
     Bugsnag.configuration.app_version = "1.1.1"
     Bugsnag.notify(BugsnagTestException.new("It crashed"))
 
-    expect(Bugsnag).to have_sent_notification{ |payload|
+    expect(Bugsnag).to have_sent_notification{ |payload, headers|
       event = get_event_from_payload(payload)
       expect(event["app"]["version"]).to eq("1.1.1")
     }
@@ -568,7 +568,7 @@ describe Bugsnag::Report do
       report.meta_data.merge!({:request => {:params => {:password => "1234", :other_password => "12345", :other_data => "123456"}}})
     end
 
-    expect(Bugsnag).to have_sent_notification{ |payload|
+    expect(Bugsnag).to have_sent_notification{ |payload, headers|
       event = get_event_from_payload(payload)
       expect(event["metaData"]).not_to be_nil
       expect(event["metaData"]["request"]).not_to be_nil
@@ -586,7 +586,7 @@ describe Bugsnag::Report do
       report.meta_data.merge!({:request => {:params => {:password => "1234", :other_password => "123456", :other_data => "123456"}}})
     end
 
-    expect(Bugsnag).to have_sent_notification{ |payload|
+    expect(Bugsnag).to have_sent_notification{ |payload, headers|
       event = get_event_from_payload(payload)
       expect(event["metaData"]).not_to be_nil
       expect(event["metaData"]["request"]).not_to be_nil
@@ -604,7 +604,7 @@ describe Bugsnag::Report do
       report.meta_data.merge!({:request => {:params => {:password => "1234", :other_password => "123456", :other_data => "123456"}}})
     end
 
-    expect(Bugsnag).to have_sent_notification{ |payload|
+    expect(Bugsnag).to have_sent_notification{ |payload, headers|
       event = get_event_from_payload(payload)
       expect(event["metaData"]).not_to be_nil
       expect(event["metaData"]["request"]).not_to be_nil
@@ -622,7 +622,7 @@ describe Bugsnag::Report do
       report.meta_data.merge!({:request => {:params => {:password => "1234", :other_password => "123456", :other_data => "123456"}}})
     end
 
-    expect(Bugsnag).to have_sent_notification{ |payload|
+    expect(Bugsnag).to have_sent_notification{ |payload, headers|
       event = get_event_from_payload(payload)
       expect(event["metaData"]).not_to be_nil
       expect(event["metaData"]["request"]).not_to be_nil
@@ -638,7 +638,7 @@ describe Bugsnag::Report do
       report.meta_data.merge!({:request => {:params => {:nil_param => nil}}})
     end
 
-    expect(Bugsnag).to have_sent_notification{ |payload|
+    expect(Bugsnag).to have_sent_notification{ |payload, headers|
       event = get_event_from_payload(payload)
       expect(event["metaData"]).not_to be_nil
       expect(event["metaData"]["request"]).not_to be_nil
@@ -700,7 +700,7 @@ describe Bugsnag::Report do
       Bugsnag.notify $!
     end
 
-    expect(Bugsnag).to have_sent_notification{ |payload|
+    expect(Bugsnag).to have_sent_notification{ |payload, headers|
       event = get_event_from_payload(payload)
       expect(event["exceptions"].size).to eq(2)
     }
@@ -712,7 +712,7 @@ describe Bugsnag::Report do
 
     Bugsnag.notify(ex)
 
-    expect(Bugsnag).to have_sent_notification{ |payload|
+    expect(Bugsnag).to have_sent_notification{ |payload, headers|
       event = get_event_from_payload(payload)
       expect(event["exceptions"].size).to eq(1)
     }
@@ -726,7 +726,7 @@ describe Bugsnag::Report do
     end
 
     Bugsnag.notify(first_ex)
-    expect(Bugsnag).to have_sent_notification{ |payload|
+    expect(Bugsnag).to have_sent_notification{ |payload, headers|
       event = get_event_from_payload(payload)
       expect(event["exceptions"].size).to eq(5)
     }
@@ -735,7 +735,7 @@ describe Bugsnag::Report do
   it "calls to_exception on i18n error objects" do
     Bugsnag.notify(OpenStruct.new(:to_exception => BugsnagTestException.new("message")))
 
-    expect(Bugsnag).to have_sent_notification{ |payload|
+    expect(Bugsnag).to have_sent_notification{ |payload, headers|
       exception = get_exception_from_payload(payload)
       expect(exception["errorClass"]).to eq("BugsnagTestException")
       expect(exception["message"]).to eq("message")
@@ -745,7 +745,7 @@ describe Bugsnag::Report do
   it "generates runtimeerror for non exceptions" do
     notify_test_exception
 
-    expect(Bugsnag).to have_sent_notification{ |payload|
+    expect(Bugsnag).to have_sent_notification{ |payload, headers|
       exception = get_exception_from_payload(payload)
       expect(exception["errorClass"]).to eq("RuntimeError")
       expect(exception["message"]).to eq("test message")
@@ -761,7 +761,7 @@ describe Bugsnag::Report do
 
     Bugsnag.notify(ex)
 
-    expect(Bugsnag).to have_sent_notification{ |payload|
+    expect(Bugsnag).to have_sent_notification{ |payload, headers|
       exception = get_exception_from_payload(payload)
       expect(exception["stacktrace"].length).to eq(2)
 
@@ -786,7 +786,7 @@ describe Bugsnag::Report do
 
     Bugsnag.notify(ex)
 
-    expect(Bugsnag).to have_sent_notification{ |payload|
+    expect(Bugsnag).to have_sent_notification{ |payload, headers|
       exception = get_exception_from_payload(payload)
       expect(exception["stacktrace"].length).to eq(2)
 
@@ -810,7 +810,7 @@ describe Bugsnag::Report do
       report.meta_data.merge!({fluff: {fluff: invalid_data}})
     end
 
-    expect(Bugsnag).to have_sent_notification{ |payload|
+    expect(Bugsnag).to have_sent_notification{ |payload, headers|
       event = get_event_from_payload(payload)
       if defined?(Encoding::UTF_8)
         expect(event['metaData']['fluff']['fluff']).to match(/fl�ff/)
@@ -831,7 +831,7 @@ describe Bugsnag::Report do
         Bugsnag.notify $!
       end
 
-      expect(Bugsnag).to have_sent_notification { |payload|
+      expect(Bugsnag).to have_sent_notification { |payload, headers|
         if defined?(Encoding::UTF_8)
           expect(payload.to_json).to match(/foo�bar/)
         else
@@ -853,7 +853,7 @@ describe Bugsnag::Report do
       end
     end
 
-    expect(Bugsnag).to have_sent_notification { |payload|
+    expect(Bugsnag).to have_sent_notification { |payload, headers|
       if defined?(Encoding::UTF_8)
         expect(payload.to_json).to match(/foo�bar/)
       else
@@ -876,7 +876,7 @@ describe Bugsnag::Report do
       Bugsnag.notify $!
     end
 
-    expect(Bugsnag).to have_sent_notification { |payload|
+    expect(Bugsnag).to have_sent_notification { |payload, headers|
       if defined?(Encoding::UTF_8)
         expect(payload.to_json).to match(/foo�bar/)
       else
@@ -899,7 +899,7 @@ describe Bugsnag::Report do
       Bugsnag.notify $!
     end
 
-    expect(Bugsnag).to have_sent_notification { |payload|
+    expect(Bugsnag).to have_sent_notification { |payload, headers|
       if defined?(Encoding::UTF_8)
         expect(payload.to_json).to match(/foo�bar/)
       else
@@ -925,7 +925,7 @@ describe Bugsnag::Report do
       Bugsnag.notify $!
     end
 
-    expect(Bugsnag).to have_sent_notification { |payload|
+    expect(Bugsnag).to have_sent_notification { |payload, headers|
       if defined?(Encoding::UTF_8)
         expect(payload.to_json).to match(/foo�bar/)
       else
@@ -943,7 +943,7 @@ describe Bugsnag::Report do
       Bugsnag.notify $!
     end
 
-    expect(Bugsnag).to have_sent_notification { |payload|
+    expect(Bugsnag).to have_sent_notification { |payload, headers|
       exception = get_exception_from_payload(payload)
       expect(exception['stacktrace'].size).to be > 0
     }
@@ -952,7 +952,7 @@ describe Bugsnag::Report do
   it 'should use defaults when notify is called' do
     Bugsnag.notify(BugsnagTestException.new("It crashed"))
 
-    expect(Bugsnag).to have_sent_notification{ |payload|
+    expect(Bugsnag).to have_sent_notification{ |payload, headers|
       event = payload["events"][0]
       expect(event["unhandled"]).to be false
       expect(event["severityReason"]).to eq({"type" => "handledException"})
@@ -969,7 +969,7 @@ describe Bugsnag::Report do
       }
     end
 
-    expect(Bugsnag).to have_sent_notification{ |payload|
+    expect(Bugsnag).to have_sent_notification{ |payload, headers|
       event = payload["events"][0]
       expect(event["severityReason"]).to eq(
         {
@@ -993,7 +993,7 @@ describe Bugsnag::Report do
       }
     end
 
-    expect(Bugsnag).to have_sent_notification{ |payload|
+    expect(Bugsnag).to have_sent_notification{ |payload, headers|
       event = payload["events"][0]
       expect(event["unhandled"]).to be false
       expect(event["severityReason"]).to eq({"type" => "handledException"})
@@ -1017,7 +1017,7 @@ describe Bugsnag::Report do
         Bugsnag.notify $!
       end
 
-      expect(Bugsnag).to have_sent_notification{ |payload|
+      expect(Bugsnag).to have_sent_notification{ |payload, headers|
         exception = get_exception_from_payload(payload)
         expect(exception["errorClass"]).to eq('Java::JavaLang::NullPointerException')
         expect(exception["message"]).to eq("")