bugsnag 6.3.0.beta.0 → 6.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0643f03a70da437fa3983ee21f1f9ec4466085e
-  data.tar.gz: bdcdb50f10d93babed837ad0f6ec3ad174c765b6
+  metadata.gz: 0f150d665aa4bbd126a1fcee6415449c764bfd8b
+  data.tar.gz: bacabc7aa6fc31be54613737742251ef95dd3cd7
 SHA512:
-  metadata.gz: 4d4341b5a7e9566d16c4f9fee869d570824ee89a8092260f54c19791984241f163237beb564622850cb163479f5dff81d34860917f91f16eb639461bcca755f7
-  data.tar.gz: 541e02bf501da119d9ddb4acde6ca3df1c2805c4513c7ab201a837d5d18e54a9eefbf95205fa5dd433b0f811d56c801fec3b53d871a696e9c7b8738db1b12c35
+  metadata.gz: 657d6eddccb62f4bd6e6c02f4f7c7220bcb89db9cca562dab98ad859c51d743be1dde6186a258ccd6b7c2ce1337a15ff1e966a2c53bc6fd6624d8ce32f8580fe
+  data.tar.gz: c229917814c152d2556fc3e161ebd7992da7d03ec7de27f96120bc2ca22888f88ab22aea8c5b3bce81cf302c7c6bfeb860a4a8dcb5a9d5a43a61e145804bc2d9

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 Changelog
 =========
 
+## 6.3.0 (14 Dec 2017)
+
+### Enhancements
+
+* Allow skipping report generation using exception property
+  | [#402](https://github.com/bugsnag/bugsnag-ruby/pull/402)
+
 ## 6.2.0 (07 Dec 2017)
 
 ### Enhancements

data/VERSION

@@ -1 +1 @@
-6.3.0.beta.0
+6.3.0

data/lib/bugsnag.rb

@@ -7,7 +7,6 @@ require "bugsnag/meta_data"
 require "bugsnag/report"
 require "bugsnag/cleaner"
 require "bugsnag/helpers"
-require "bugsnag/session_tracker"
 
 require "bugsnag/delivery"
 require "bugsnag/delivery/synchronous"
@@ -39,8 +38,6 @@ module Bugsnag
         configuration.warn("No valid API key has been set, notifications will not be sent")
         @key_warning = true
       end
-
-      session_tracker.config = configuration
     end
 
     # Explicitly notify of an exception
@@ -65,6 +62,11 @@ module Bugsnag
         return
       end
 
+      if exception.respond_to?(:skip_bugsnag) && exception.skip_bugsnag
+        configuration.debug("Not notifying due to skip_bugsnag flag")
+        return
+      end
+
       report = Report.new(exception, configuration, auto_notify)
 
       # If this is an auto_notify we yield the block before the any middleware is run
@@ -111,8 +113,8 @@ module Bugsnag
 
         # Deliver
         configuration.info("Notifying #{configuration.endpoint} of #{report.exceptions.last[:errorClass]}")
-        options = {:headers => report.headers, :trim_payload => true}
-        Bugsnag::Delivery[configuration.delivery_method].deliver(configuration.endpoint, report.as_json, configuration, options)
+        payload_string = ::JSON.dump(Bugsnag::Helpers.trim_if_needed(report.as_json))
+        Bugsnag::Delivery[configuration.delivery_method].deliver(configuration.endpoint, payload_string, configuration)
       end
     end
 
@@ -122,11 +124,6 @@ module Bugsnag
       @configuration || LOCK.synchronize { @configuration ||= Bugsnag::Configuration.new }
     end
 
-    def session_tracker
-      @session_tracker = nil unless defined?(@session_tracker)
-      @session_tracker || LOCK.synchronize { @session_tracker ||= Bugsnag::SessionTracker.new(configuration)}
-    end
-
     # Allow access to "before notify" callbacks
     def before_notify_callbacks
       Bugsnag.configuration.request_data[:before_callbacks] ||= []

data/lib/bugsnag/configuration.rb

@@ -7,7 +7,6 @@ require "bugsnag/middleware/exception_meta_data"
 require "bugsnag/middleware/ignore_error_class"
 require "bugsnag/middleware/suggestion_data"
 require "bugsnag/middleware/classify_error"
-require "bugsnag/middleware/session_data"
 
 module Bugsnag
   class Configuration
@@ -23,7 +22,7 @@ module Bugsnag
     attr_accessor :app_type
     attr_accessor :meta_data_filters
     attr_accessor :endpoint
-    attr_accessor :logger 
+    attr_accessor :logger
     attr_accessor :middleware
     attr_accessor :internal_middleware
     attr_accessor :proxy_host
@@ -33,13 +32,10 @@ module Bugsnag
     attr_accessor :timeout
     attr_accessor :hostname
     attr_accessor :ignore_classes
-    attr_accessor :track_sessions
-    attr_accessor :session_endpoint
 
     API_KEY_REGEX = /[0-9a-f]{32}/i
     THREAD_LOCAL_NAME = "bugsnag_req_data"
     DEFAULT_ENDPOINT = "https://notify.bugsnag.com"
-    DEFAULT_SESSION_ENDPOINT = "https://sessions.bugsnag.com"
 
     DEFAULT_META_DATA_FILTERS = [
       /authorization/i,
@@ -61,8 +57,6 @@ module Bugsnag
       self.hostname = default_hostname
       self.timeout = 15
       self.notify_release_stages = nil
-      self.track_sessions = false
-      self.session_endpoint = DEFAULT_SESSION_ENDPOINT
 
       # SystemExit and Interrupt are common Exception types seen with successful
       # exits and are not automatically reported to Bugsnag
@@ -87,7 +81,6 @@ module Bugsnag
       self.internal_middleware.use Bugsnag::Middleware::IgnoreErrorClass
       self.internal_middleware.use Bugsnag::Middleware::SuggestionData
       self.internal_middleware.use Bugsnag::Middleware::ClassifyError
-      self.internal_middleware.use Bugsnag::Middleware::SessionData
 
       self.middleware = Bugsnag::MiddlewareStack.new
       self.middleware.use Bugsnag::Middleware::Callbacks

data/lib/bugsnag/delivery/synchronous.rb

@@ -4,19 +4,13 @@ require "uri"
 module Bugsnag
   module Delivery
     class Synchronous
-      BACKOFF_THREADS = {}
-      BACKOFF_REQUESTS = {}
-      BACKOFF_LOCK = Mutex.new
+      HEADERS = {"Content-Type" => "application/json"}
 
       class << self
-        def deliver(url, body, configuration, options={})
+        def deliver(url, body, configuration)
           begin
-            response = request(url, body, configuration, options)
+            response = request(url, body, configuration)
             configuration.debug("Request to #{url} completed, status: #{response.code}")
-            success = options[:success] || '200'
-            if options[:backoff] && !(response.code == success)
-              backoff(url, body, configuration, options)
-            end
           rescue StandardError => e
             # KLUDGE: Since we don't re-raise http exceptions, this breaks rspec
             raise if e.class.to_s == "RSpec::Expectations::ExpectationNotMetError"
@@ -28,14 +22,9 @@ module Bugsnag
 
         private
 
-        def request(url, body, configuration, options)
+        def request(url, body, configuration)
           uri = URI.parse(url)
 
-          if options[:trim_payload]
-            body = Bugsnag::Helpers.trim_if_needed(body)
-          end
-          payload = ::JSON.dump(body)
-
           if configuration.proxy_host
             http = Net::HTTP.new(uri.host, uri.port, configuration.proxy_host, configuration.proxy_port, configuration.proxy_user, configuration.proxy_password)
           else
@@ -50,104 +39,14 @@ module Bugsnag
             http.ca_file = configuration.ca_file if configuration.ca_file
           end
 
-          headers = options.key?(:headers) ? options[:headers] : {}
-          headers.merge!(default_headers)
-
-          request = Net::HTTP::Post.new(path(uri), headers)
-          request.body = payload
-
+          request = Net::HTTP::Post.new(path(uri), HEADERS)
+          request.body = body
           http.request(request)
         end
 
-        def backoff(url, body, configuration, options)
-          # Ensure we have the latest configuration for making these requests
-          @latest_configuration = configuration
-          
-          BACKOFF_LOCK.lock
-          begin
-            # Define an exit function once to handle outstanding requests
-            @registered_at_exit = false unless defined?(@registered_at_exit)
-            if !@registered_at_exit
-              @registered_at_exit = true
-              at_exit do
-                backoff_exit
-              end
-            end
-            if BACKOFF_REQUESTS[url] && !BACKOFF_REQUESTS[url].empty?
-              last_request = BACKOFF_REQUESTS[url].last
-              new_body_length = ::JSON.dump(body).length
-              old_body_length = ::JSON.dump(last_request[:body]).length
-              if new_body_length + old_body_length >= Bugsnag::Helpers::MAX_PAYLOAD_LENGTH
-                BACKOFF_REQUESTS[url].push({:body => body, :options => options})
-              else
-                Bugsnag::Helpers::deep_merge!(last_request, {:body => body, :options => options})
-              end
-            else
-              BACKOFF_REQUESTS[url] = [{:body => body, :options => options}]
-            end
-            if !(BACKOFF_THREADS[url] && BACKOFF_THREADS[url].status)
-              spawn_backoff_thread(url)
-            end
-          ensure
-            BACKOFF_LOCK.unlock
-          end
-        end
-
-        def backoff_exit
-          # Kill existing threads
-          BACKOFF_THREADS.each do |url, thread|
-            thread.exit
-          end
-          # Retry outstanding requests once, then exit
-          BACKOFF_REQUESTS.each do |url, requests|
-            requests.map! do |req|
-              response = request(url, req[:body], @latest_configuration, req[:options])
-              success = req[:options][:success] || '200'
-              response.code == success
-            end
-            requests.reject! { |i| i }
-            @latest_configuration.warn("Requests to #{url} finished, #{requests.size} failed")
-          end
-        end
-        
-        def spawn_backoff_thread(url)
-          new_thread = Thread.new(url) do |url|
-            interval = 2
-            while BACKOFF_REQUESTS[url].size > 0
-              sleep(interval)
-              interval = interval * 2
-              interval = 600 if interval > 600
-              BACKOFF_LOCK.lock
-              begin
-                BACKOFF_REQUESTS[url].map! do |req|
-                  response = request(url, req[:body], @latest_configuration, req[:options])
-                  success = req[:options][:success] || '200'
-                  if response.code == success
-                    @latest_configuration.debug("Request to #{url} completed, status: #{response.code}")
-                    false
-                  else
-                    req
-                  end
-                end
-                BACKOFF_REQUESTS[url].reject! { |i| !i }
-              ensure
-                BACKOFF_LOCK.unlock
-              end
-            end
-          end
-          BACKOFF_THREADS[url] = new_thread
-        end
-
         def path(uri)
           uri.path == "" ? "/" : uri.path
         end
-
-        def default_headers
-          {
-            "Content-Type" => "application/json",
-            "Bugsnag-Sent-At" =>  Time.now().utc().strftime('%Y-%m-%dT%H:%M:%S')
-          }
-        end
       end
     end
   end

data/lib/bugsnag/delivery/thread_queue.rb

@@ -8,7 +8,7 @@ module Bugsnag
       MUTEX = Mutex.new
 
       class << self
-        def deliver(url, body, configuration, options={})
+        def deliver(url, body, configuration)
           @configuration = configuration
 
           start_once!
@@ -19,7 +19,7 @@ module Bugsnag
           end
 
           # Add delivery to the worker thread
-          @queue.push proc { super(url, body, configuration, options) }
+          @queue.push proc { super(url, body, configuration) }
         end
 
         private

data/lib/bugsnag/helpers.rb

@@ -23,30 +23,6 @@ module Bugsnag
       remove_metadata_from_events(reduced_value)
     end
 
-    def self.deep_merge(l_hash, r_hash)
-      l_hash.merge(r_hash) do |key, l_val, r_val|
-        if l_val.is_a?(Hash) && r_val.is_a?(Hash)
-          deep_merge(l_val, r_val)
-        elsif l_val.is_a?(Array) && r_val.is_a?(Array)
-          l_val.concat(r_val)
-        else
-          r_val
-        end
-      end
-    end
-
-    def self.deep_merge!(l_hash, r_hash)
-      l_hash.merge!(r_hash) do |key, l_val, r_val|
-        if l_val.is_a?(Hash) && r_val.is_a?(Hash)
-          deep_merge(l_val, r_val)
-        elsif l_val.is_a?(Array) && r_val.is_a?(Array)
-          l_val.concat(r_val)
-        else
-          r_val
-        end
-      end
-    end
-
     private
 
     TRUNCATION_INFO = '[TRUNCATED]'

data/lib/bugsnag/integrations/rack.rb

@@ -34,7 +34,6 @@ module Bugsnag
     def call(env)
       # Set the request data for bugsnag middleware to use
       Bugsnag.configuration.set_request_data(:rack_env, env)
-      Bugsnag.session_tracker.create_session
 
       begin
         response = @app.call(env)

data/lib/bugsnag/integrations/rails/controller_methods.rb

@@ -5,7 +5,6 @@ module Bugsnag::Rails
     end
 
     module ClassMethods
-
       private
       def before_bugsnag_notify(*methods, &block)
         _add_bugsnag_notify_callback(:before_callbacks, *methods, &block)

data/lib/bugsnag/report.rb

@@ -17,9 +17,8 @@ module Bugsnag
 
     MAX_EXCEPTIONS_TO_UNWRAP = 5
 
-    CURRENT_PAYLOAD_VERSION = "4.0"
+    CURRENT_PAYLOAD_VERSION = "2"
 
-    attr_reader   :unhandled
     attr_accessor :api_key
     attr_accessor :app_type
     attr_accessor :app_version
@@ -32,7 +31,6 @@ module Bugsnag
     attr_accessor :meta_data
     attr_accessor :raw_exceptions
     attr_accessor :release_stage
-    attr_accessor :session
     attr_accessor :severity
     attr_accessor :severity_reason
     attr_accessor :user
@@ -94,7 +92,7 @@ module Bugsnag
         },
         exceptions: exceptions,
         groupingHash: grouping_hash,
-        session: session,
+        payloadVersion: CURRENT_PAYLOAD_VERSION,
         severity: severity,
         severityReason: severity_reason,
         unhandled: @unhandled,
@@ -110,6 +108,7 @@ module Bugsnag
 
       # return the payload hash
       {
+        :apiKey => api_key,
         :notifier => {
           :name => NOTIFIER_NAME,
           :version => NOTIFIER_VERSION,
@@ -119,14 +118,6 @@ module Bugsnag
       }
     end
 
-    def headers
-      {
-        "Bugsnag-Api-Key" => api_key,
-        "Bugsnag-Payload-Version" => CURRENT_PAYLOAD_VERSION,
-        "Bugsnag-Sent-At" => Time.now().utc().strftime('%Y-%m-%dT%H:%M:%S')
-      }
-    end
-
     def ignore?
       @should_ignore
     end

data/spec/configuration_spec.rb

@@ -22,11 +22,6 @@ 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, headers|
+    expect(Bugsnag).to have_sent_notification {|payload|
       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, headers|
+    expect(Bugsnag).to have_sent_notification{ |payload|
       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, headers|
+    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("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, headers|
+    expect(Bugsnag).to have_sent_notification{ |payload|
       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, headers|
+    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("overridden")
@@ -87,7 +87,7 @@ describe Bugsnag::MiddlewareStack do
       report.meta_data.merge!({custom: {info: 'overridden'}})
     end
 
-    expect(Bugsnag).to have_sent_notification{ |payload, headers|
+    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("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, headers|
+    expect(Bugsnag).to have_sent_notification{ |payload|
       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, headers|
+    expect(Bugsnag).to have_sent_notification{ |payload|
       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, headers|
+        expect(Bugsnag).to have_sent_notification{ |payload|
           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, headers|
+        expect(Bugsnag).to have_sent_notification{ |payload|
           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, headers|
+    expect(Bugsnag).to have_sent_notification{ |payload|
       event = get_event_from_payload(payload)
       expect(event["unhandled"]).to be true
       expect(event["severityReason"]).to eq({