bugsnag 6.3.0.beta.0 → 6.3.0

data/spec/spec_helper.rb

@@ -14,17 +14,15 @@ require 'webmock/rspec'
 require 'rspec/expectations'
 require 'rspec/mocks'
 
-class BugsnagTestException < RuntimeError; end
+class BugsnagTestException < RuntimeError
+  attr_accessor :skip_bugsnag
+end
 
 def get_event_from_payload(payload)
   expect(payload["events"].size).to eq(1)
   payload["events"].first
 end
 
-def get_headers_from_payload(payload)
-
-end
-
 def get_exception_from_payload(payload)
   event = get_event_from_payload(payload)
   expect(event["exceptions"].size).to eq(1)
@@ -48,7 +46,6 @@ RSpec.configure do |config|
 
   config.before(:each) do
     WebMock.stub_request(:post, "https://notify.bugsnag.com/")
-    WebMock.stub_request(:post, "https://sessions.bugsnag.com/")
 
     Bugsnag.instance_variable_set(:@configuration, Bugsnag::Configuration.new)
     Bugsnag.configure do |bugsnag|
@@ -65,21 +62,10 @@ RSpec.configure do |config|
   end
 end
 
-def have_sent_sessions(&matcher)
-  have_requested(:post, "https://sessions.bugsnag.com/").with do |request|
-    if matcher
-      matcher.call([JSON.parse(request.body), request.headers])
-      true
-    else
-      raise "no matcher provided to have_sent_sessions (did you use { })"
-    end
-  end
-end
-
 def have_sent_notification(&matcher)
   have_requested(:post, "https://notify.bugsnag.com/").with do |request|
     if matcher
-      matcher.call([JSON.parse(request.body), request.headers])
+      matcher.call JSON.parse(request.body)
       true
     else
       raise "no matcher provided to have_sent_notification (did you use { })"

data/spec/stacktrace_spec.rb

@@ -10,7 +10,7 @@ describe Bugsnag::Stacktrace do
     _e = 5
     _f = 6
 
-    expect(Bugsnag).to have_sent_notification{ |payload, headers|
+    expect(Bugsnag).to have_sent_notification{ |payload|
       exception = get_exception_from_payload(payload)
       starting_line = __LINE__ - 10
       expect(exception["stacktrace"][1]["code"]).to eq({
@@ -30,7 +30,7 @@ describe Bugsnag::Stacktrace do
 
     notify_test_exception
 
-    expect(Bugsnag).to have_sent_notification{ |payload, headers|
+    expect(Bugsnag).to have_sent_notification{ |payload|
       exception = get_exception_from_payload(payload)
       expect(exception["stacktrace"][1]["code"]).to eq(nil)
     }
@@ -39,7 +39,7 @@ describe Bugsnag::Stacktrace do
   it 'should send the first 7 lines of the file for exceptions near the top' do
     load 'spec/fixtures/crashes/start_of_file.rb' rescue Bugsnag.notify $!
 
-    expect(Bugsnag).to have_sent_notification{ |payload, headers|
+    expect(Bugsnag).to have_sent_notification{ |payload|
       exception = get_exception_from_payload(payload)
 
       expect(exception["stacktrace"][0]["code"]).to eq({
@@ -57,7 +57,7 @@ describe Bugsnag::Stacktrace do
   it 'should send the last 7 lines of the file for exceptions near the bottom' do
     load 'spec/fixtures/crashes/end_of_file.rb' rescue Bugsnag.notify $!
 
-    expect(Bugsnag).to have_sent_notification{ |payload, headers|
+    expect(Bugsnag).to have_sent_notification{ |payload|
       exception = get_exception_from_payload(payload)
 
       expect(exception["stacktrace"][0]["code"]).to eq({
@@ -75,7 +75,7 @@ describe Bugsnag::Stacktrace do
   it 'should send the last 7 lines of the file for exceptions near the bottom' do
     load 'spec/fixtures/crashes/short_file.rb' rescue Bugsnag.notify $!
 
-    expect(Bugsnag).to have_sent_notification{ |payload, headers|
+    expect(Bugsnag).to have_sent_notification{ |payload|
       exception = get_exception_from_payload(payload)
 
       expect(exception["stacktrace"][0]["code"]).to eq({

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bugsnag
 version: !ruby/object:Gem::Version
-  version: 6.3.0.beta.0
+  version: 6.3.0
 platform: ruby
 authors:
 - James Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-12 00:00:00.000000000 Z
+date: 2017-12-14 00:00:00.000000000 Z
 dependencies: []
 description: Ruby notifier for bugsnag.com
 email: james@bugsnag.com
@@ -60,13 +60,11 @@ files:
 - lib/bugsnag/middleware/rack_request.rb
 - lib/bugsnag/middleware/rails3_request.rb
 - lib/bugsnag/middleware/rake.rb
-- lib/bugsnag/middleware/session_data.rb
 - lib/bugsnag/middleware/sidekiq.rb
 - lib/bugsnag/middleware/suggestion_data.rb
 - lib/bugsnag/middleware/warden_user.rb
 - lib/bugsnag/middleware_stack.rb
 - lib/bugsnag/report.rb
-- lib/bugsnag/session_tracker.rb
 - lib/bugsnag/stacktrace.rb
 - lib/bugsnag/tasks.rb
 - lib/bugsnag/tasks/bugsnag.rake
@@ -89,7 +87,6 @@ files:
 - spec/rack_spec.rb
 - spec/rails3_request_spec.rb
 - spec/report_spec.rb
-- spec/session_tracker_spec.rb
 - spec/spec_helper.rb
 - spec/stacktrace_spec.rb
 homepage: http://github.com/bugsnag/bugsnag-ruby
@@ -107,9 +104,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.13

data/lib/bugsnag/middleware/session_data.rb

@@ -1,21 +0,0 @@
-module Bugsnag::Middleware
-  class SessionData
-    def initialize(bugsnag)
-      @bugsnag = bugsnag
-    end
-
-    def call(report)
-      session = Bugsnag::SessionTracker.get_current_session
-      unless session.nil?
-        if report.unhandled
-          session[:events][:unhandled] += 1
-        else
-          session[:events][:handled] += 1
-        end
-        report.session = session
-      end
-
-      @bugsnag.call(report)
-    end
-  end
-end

data/lib/bugsnag/session_tracker.rb

@@ -1,157 +0,0 @@
-require 'thread'
-require 'time'
-require 'securerandom'
-
-module Bugsnag
-  class SessionTracker
-
-    THREAD_SESSION = "bugsnag_session"
-    TIME_THRESHOLD = 60
-    FALLBACK_TIME = 300
-    MAXIMUM_SESSION_COUNT = 50
-    SESSION_PAYLOAD_VERSION = "1.0"
-
-    attr_reader :session_counts
-    attr_writer :config
-
-    def self.set_current_session(session)
-      Thread.current[THREAD_SESSION] = session
-    end
-
-    def self.get_current_session
-      Thread.current[THREAD_SESSION]
-    end
-
-    def initialize(configuration)
-      @session_counts = {}
-      @config = configuration
-      @mutex = Mutex.new
-      @last_sent = Time.now
-    end
-
-    def create_session
-      return unless @config.track_sessions
-      start_time = Time.now().utc().strftime('%Y-%m-%dT%H:%M:00')
-      new_session = {
-        :id => SecureRandom.uuid,
-        :startedAt => start_time,
-        :events => {
-          :handled => 0,
-          :unhandled => 0
-        }
-      }
-      SessionTracker.set_current_session(new_session)
-      add_thread = Thread.new { add_session(start_time) }
-      add_thread.join()
-    end
-
-    def send_sessions
-      @mutex.lock
-      begin
-        deliver_sessions
-      ensure
-        @mutex.unlock
-      end
-    end
-
-    private
-    def add_session(min)
-      @mutex.lock
-      begin
-        @registered_at_exit = false unless defined?(@registered_at_exit)
-        if !@registered_at_exit
-          @registered_at_exit = true
-          at_exit do
-            if !@deliver_fallback.nil? && @deliver_fallback.status == 'sleep'
-              @deliver_fallback.terminate
-            end
-            deliver_sessions
-          end
-        end
-        @session_counts[min] ||= 0
-        @session_counts[min] += 1
-        if Time.now() - @last_sent > TIME_THRESHOLD
-          deliver_sessions
-        end
-      ensure
-        @mutex.unlock
-      end
-    end
-
-    def deliver_sessions
-      return unless @config.track_sessions
-      sessions = []
-      @session_counts.each do |min, count|
-        sessions << {
-          :startedAt => min,
-          :sessionsStarted => count
-        }
-        if sessions.size >= MAXIMUM_SESSION_COUNT
-          deliver(sessions)
-          sessions = []
-        end
-      end
-      @session_counts = {}
-      reset_delivery_thread
-      deliver(sessions)
-    end
-
-    def reset_delivery_thread
-      if !@deliver_fallback.nil? && @deliver_fallback.status == 'sleep'
-        @deliver_fallback.terminate
-      end
-      @deliver_fallback = Thread.new do
-        sleep(FALLBACK_TIME)
-        deliver_sessions
-      end
-    end
-
-    def deliver(sessionCounts)
-      if sessionCounts.length == 0
-        @config.debug("No sessions to deliver")
-        return
-      end
-      
-      if !@config.valid_api_key?
-        @config.debug("Not delivering sessions due to an invalid api_key")
-        return
-      end
-      
-      if !@config.should_notify_release_stage?
-        @config.debug("Not delivering sessions due to notify_release_stages :#{@config.notify_release_stages.inspect}")
-        return
-      end
-
-      if @config.delivery_method != :thread_queue
-        @config.debug("Not delivering sessions due to asynchronous delivery being disabled")
-        return
-      end
-      
-      payload = {
-        :notifier => {
-          :name => Bugsnag::Report::NOTIFIER_NAME,
-          :url => Bugsnag::Report::NOTIFIER_URL,
-          :version => Bugsnag::Report::NOTIFIER_VERSION
-        },
-        :device => {
-          :hostname => @config.hostname
-        },
-        :app => {
-          :version => @config.app_version,
-          :releaseStage => @config.release_stage,
-          :type => @config.app_type
-        },
-        :sessionCounts => sessionCounts
-      }
-
-      headers = {
-        "Bugsnag-Api-Key" => @config.api_key,
-        "Bugsnag-Payload-Version" => SESSION_PAYLOAD_VERSION
-      }
-
-      options = {:headers => headers, :backoff => true, :success => '202'}
-      @last_sent = Time.now
-      Bugsnag::Delivery[@config.delivery_method].deliver(@config.session_endpoint, payload, @config, options)
-    end
-  end
-end

data/spec/session_tracker_spec.rb

@@ -1,153 +0,0 @@
-# encoding: utf-8
-require 'webrick'
-require 'spec_helper'
-require 'json'
-
-describe Bugsnag::SessionTracker do
-  server = nil
-  queue = Queue.new
-
-  before do
-    @config = Bugsnag::Configuration.new
-    @config.track_sessions = true
-    server = WEBrick::HTTPServer.new :Port => 0, :Logger => WEBrick::Log.new("/dev/null"), :AccessLog => []
-    server.mount_proc '/' do |req, res|
-      headers = []
-      req.each { |header| headers << header }
-      queue << [JSON.parse(req.body), headers]
-      res.status = 202
-      res.body = "OK\n"
-    end
-    Thread.new{ server.start }
-  end
-
-  after do    
-    Bugsnag.configure do |conf|
-      conf.track_sessions = false
-      conf.delivery_method = :synchronous
-    end
-    server.stop
-    queue.clear
-  end
-
-  it 'does not create session object if disabled' do
-    config = Bugsnag::Configuration.new
-    config.track_sessions = false
-    tracker = Bugsnag::SessionTracker.new(config)
-    tracker.create_session
-    expect(tracker.session_counts.size).to eq(0)
-  end
-
-  it 'adds session object to queue' do
-    tracker = Bugsnag::SessionTracker.new(@config)
-    tracker.create_session
-    expect(tracker.session_counts.size).to eq(1)
-    time = tracker.session_counts.keys.last
-    count = tracker.session_counts[time]
-
-    expect(count).to eq(1)
-  end
-
-  it 'stores session in thread' do
-    tracker = Bugsnag::SessionTracker.new(@config)
-    tracker.create_session
-    session = Thread.current[Bugsnag::SessionTracker::THREAD_SESSION]
-    expect(session.include? :id).to be true
-    expect(session.include? :startedAt).to be true
-    expect(session.include? :events).to be true
-    expect(session[:events].include? :handled).to be true
-    expect(session[:events].include? :unhandled).to be true
-    expect(session[:events][:handled]).to eq(0)
-    expect(session[:events][:unhandled]).to eq(0)
-  end
-
-  it 'gives unique ids to each session' do
-    tracker = Bugsnag::SessionTracker.new(@config)
-    tracker.create_session
-    session_one = Thread.current[Bugsnag::SessionTracker::THREAD_SESSION]
-    tracker.create_session
-    session_two = Thread.current[Bugsnag::SessionTracker::THREAD_SESSION]
-    expect(session_one[:id]).to_not eq(session_two[:id])
-  end
-
-  it 'sends sessions when send_sessions is called' do
-    Bugsnag.configure do |conf|
-      conf.track_sessions = true
-      conf.delivery_method = :thread_queue
-      conf.session_endpoint = "http://localhost:#{server.config[:Port]}"
-    end
-    WebMock.allow_net_connect!
-    Bugsnag.session_tracker.create_session
-    expect(Bugsnag.session_tracker.session_counts.size).to eq(1)
-    Bugsnag.session_tracker.send_sessions
-    expect(Bugsnag.session_tracker.session_counts.size).to eq(0)
-    while queue.empty?
-      sleep(0.05)
-    end
-    payload, headers = queue.pop
-    expect(payload.include?("app")).to be true
-    expect(payload.include?("notifier")).to be true
-    expect(payload.include?("device")).to be true
-    expect(payload.include?("sessionCounts")).to be true
-    expect(payload["sessionCounts"].size).to eq(1)
-  end
-
-  it 'sets details from config' do
-    Bugsnag.configure do |conf|
-      conf.track_sessions = true
-      conf.release_stage = "test_stage"
-      conf.delivery_method = :thread_queue
-      conf.session_endpoint = "http://localhost:#{server.config[:Port]}"
-    end
-    WebMock.allow_net_connect!
-    Bugsnag.session_tracker.create_session
-    expect(Bugsnag.session_tracker.session_counts.size).to eq(1)
-    Bugsnag.session_tracker.send_sessions
-    expect(Bugsnag.session_tracker.session_counts.size).to eq(0)
-    while queue.empty?
-      sleep(0.05)
-    end
-    payload, headers = queue.pop
-    notifier = payload["notifier"]
-    expect(notifier.include?("name")).to be true
-    expect(notifier["name"]).to eq(Bugsnag::Report::NOTIFIER_NAME)
-    expect(notifier.include?("url")).to be true
-    expect(notifier["url"]).to eq(Bugsnag::Report::NOTIFIER_URL)
-    expect(notifier.include?("version")).to be true
-    expect(notifier["version"]).to eq(Bugsnag::Report::NOTIFIER_VERSION)
-
-    app = payload["app"]
-    expect(app.include?("releaseStage")).to be true
-    expect(app["releaseStage"]).to eq(Bugsnag.configuration.release_stage)
-    expect(app.include?("version")).to be true
-    expect(app["version"]).to eq(Bugsnag.configuration.app_version)
-    expect(app.include?("type")).to be true
-    expect(app["type"]).to eq(Bugsnag.configuration.app_type)
-
-    device = payload["device"]
-    expect(device.include?("hostname")).to be true
-    expect(device["hostname"]).to eq(Bugsnag.configuration.hostname)
-  end
-
-  it 'uses middleware to attach session to notification' do
-    Bugsnag.configure do |conf|
-      conf.track_sessions = true
-      conf.release_stage = "test_stage"
-    end
-    Bugsnag.session_tracker.create_session
-    Bugsnag.notify(BugsnagTestException.new("It crashed"))
-    expect(Bugsnag).to have_sent_notification{ |payload, headers|
-      event = payload["events"][0]
-      expect(event.include?("session")).to be true
-      session = event["session"]
-      expect(session.include?("id")).to be true
-      expect(session.include?("startedAt")).to be true
-      expect(session.include?("events")).to be true
-      sesevents = session['events']
-      expect(sesevents.include?("unhandled")).to be true
-      expect(sesevents["unhandled"]).to eq(0)
-      expect(sesevents.include?("handled")).to be true
-      expect(sesevents["handled"]).to eq(1)
-    }
-  end
-end