sentry-raven 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6c29eda4efffb38e92186b8494c5fb0fb07ac72
-  data.tar.gz: ffbb210ae9749c1a97a27ac15ff1770ef360b561
+  metadata.gz: 35bfb0236a3a8236cfe5c2ad37592f973c9612be
+  data.tar.gz: 79ee56bfc0b8243f4dd50111aa253498950548a5
 SHA512:
-  metadata.gz: 1e0ed89962c85c679bff0339d347d4b8f0ea17bb7ecef9b1de75693b5775783bbe5c5751c2f4113571efa05161d4f082b827bce8f0b8b7b3a7d731925fcab4b6
-  data.tar.gz: efbb4e689d8eed60136e7caffb3070e1fc001f371bdc23eeb576e8fe437327173e3eea99a172891954d56fb35d4c2aecc24d6bece917be8ca93d9802e9efdfdd
+  metadata.gz: d3caa9d91239b8f4bb0355f5a0bf6ea5af48e616e91f43a7abdc62f91f65638f0fca6d73dfeb63be6ba610b40a4c2defa23ca40e2256c1a8f5ad5dfd1ea5d137
+  data.tar.gz: 1cbeccc7169fba6eef992a6eb11d5c6bd8ec6aef89a780c200cb10f011a4bf970109aac68c870975f44a80849e428316382969d92ea70b300278ebe3485cf310

data/lib/raven/base.rb

@@ -115,13 +115,17 @@ module Raven
         else
           send_event(evt)
         end
-
+        Thread.current[:sentry_last_event_id] = evt.id
         evt
       end
     end
     alias_method :capture_message, :capture_type
     alias_method :capture_exception, :capture_type
 
+    def last_event_id
+      Thread.current[:sentry_last_event_id]
+    end
+
     def should_capture?(message_or_exc)
       if configuration.should_capture
         configuration.should_capture.call(*[message_or_exc])
@@ -228,6 +232,15 @@ module Raven
       self.logger.warn "Unable to load raven/integrations/#{integration}: #{error}"
     end
 
+    def rails_safely_prepend(module_name, opts = {})
+      return if opts[:to].nil?
+      if opts[:to].respond_to?(:prepend, true)
+        opts[:to].send(:prepend, Raven::Rails::Overrides.const_get(module_name))
+      else
+        opts[:to].send(:include, Raven::Rails::Overrides.const_get("Old" + module_name))
+      end
+    end
+
     # For cross-language compat
     alias :captureException :capture_exception
     alias :captureMessage :capture_message

data/lib/raven/event.rb

@@ -127,6 +127,7 @@ module Raven
         evt.interface(:exception) do |exc_int|
           exceptions = [exc]
           context = Set.new [exc.object_id]
+          backtraces = Set.new
 
           while exc.respond_to?(:cause) && exc.cause
             exc = exc.cause
@@ -145,7 +146,8 @@ module Raven
               int.module = e.class.to_s.split('::')[0...-1].join('::')
 
               int.stacktrace =
-                if e.backtrace
+                if e.backtrace && !backtraces.include?(e.backtrace.object_id)
+                  backtraces << e.backtrace.object_id
                   StacktraceInterface.new do |stacktrace|
                     stacktrace_interface_from(stacktrace, evt, e.backtrace)
                   end

data/lib/raven/integrations/rack.rb

@@ -96,19 +96,19 @@ module Raven
         key = key.to_s # rack env can contain symbols
         value = value.to_s
         next unless key.upcase == key # Non-upper case stuff isn't either
+
         # Rack adds in an incorrect HTTP_VERSION key, which causes downstream
         # to think this is a Version header. Instead, this is mapped to
         # env['SERVER_PROTOCOL']. But we don't want to ignore a valid header
         # if the request has legitimately sent a Version header themselves.
         # See: https://github.com/rack/rack/blob/028438f/lib/rack/handler/cgi.rb#L29
         next if key == 'HTTP_VERSION' && value == ENV['SERVER_PROTOCOL']
-        if key.start_with?('HTTP_')
-          # Header
-          http_key = key[5..key.length - 1].split('_').map(&:capitalize).join('-')
-          memo[http_key] = value
-        elsif %w(CONTENT_TYPE CONTENT_LENGTH).include? key
-          memo[key.capitalize] = value
-        end
+
+        next unless key.start_with?('HTTP_') || %w(CONTENT_TYPE CONTENT_LENGTH).include?(key)
+        # Rack stores headers as HTTP_WHAT_EVER, we need What-Ever
+        key = key.gsub("HTTP_", "")
+        key = key.split('_').map(&:capitalize).join('-')
+        memo[key] = value
       end
     end
 

data/lib/raven/integrations/rails.rb

@@ -2,14 +2,25 @@ require 'rails'
 
 module Raven
   class Rails < ::Rails::Railtie
+    require 'raven/integrations/rails/overrides/streaming_reporter'
+    require 'raven/integrations/rails/controller_methods'
+
     initializer "raven.use_rack_middleware" do |app|
       app.config.middleware.insert 0, Raven::Rack
     end
 
     initializer 'raven.action_controller' do
       ActiveSupport.on_load :action_controller do
-        require 'raven/integrations/rails/controller_methods'
         include Raven::Rails::ControllerMethods
+        if ::Rails::VERSION::STRING >= "4.0.0"
+          Raven.rails_safely_prepend("StreamingReporter", :to => ActionController::Live)
+        end
+      end
+    end
+
+    initializer 'raven.action_view' do
+      ActiveSupport.on_load :action_view do
+        Raven.rails_safely_prepend("StreamingReporter", :to => ActionView::StreamingTemplateRenderer::Body)
       end
     end
 
@@ -23,19 +34,13 @@ module Raven
 
     config.after_initialize do
       if Raven.configuration.rails_report_rescued_exceptions
-        require 'raven/integrations/rails/middleware/debug_exceptions_catcher'
+        require 'raven/integrations/rails/overrides/debug_exceptions_catcher'
         if defined?(::ActionDispatch::DebugExceptions)
           exceptions_class = ::ActionDispatch::DebugExceptions
         elsif defined?(::ActionDispatch::ShowExceptions)
           exceptions_class = ::ActionDispatch::ShowExceptions
         end
-        unless exceptions_class.nil?
-          if exceptions_class.respond_to?(:prepend, true)
-            exceptions_class.send(:prepend, Raven::Rails::Middleware::DebugExceptionsCatcher)
-          else
-            exceptions_class.send(:include, Raven::Rails::Middleware::OldDebugExceptionsCatcher)
-          end
-        end
+        Raven.rails_safely_prepend("DebugExceptionsCatcher", :to => exceptions_class)
       end
     end
 

data/lib/raven/integrations/rails/{middleware → overrides}/debug_exceptions_catcher.rb

@@ -1,6 +1,6 @@
 module Raven
   class Rails
-    module Middleware
+    module Overrides
       module DebugExceptionsCatcher
         def render_exception(env_or_request, exception)
           begin

data/lib/raven/integrations/rails/overrides/streaming_reporter.rb

@@ -0,0 +1,23 @@
+module Raven
+  class Rails
+    module Overrides
+      module StreamingReporter
+        def log_error(exception)
+          Raven.capture_exception(exception)
+          super
+        end
+      end
+
+      module OldStreamingReporter
+        def self.included(base)
+          base.send(:alias_method_chain, :log_error, :raven)
+        end
+
+        def log_error_with_raven(exception)
+          Raven.capture_exception(exception)
+          log_error_without_raven(exception)
+        end
+      end
+    end
+  end
+end

data/lib/raven/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Raven
-  VERSION = "1.0.0".freeze
+  VERSION = "1.1.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sentry-raven
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Sentry Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-02 00:00:00.000000000 Z
+date: 2016-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -160,7 +160,8 @@ files:
 - lib/raven/integrations/rails.rb
 - lib/raven/integrations/rails/active_job.rb
 - lib/raven/integrations/rails/controller_methods.rb
-- lib/raven/integrations/rails/middleware/debug_exceptions_catcher.rb
+- lib/raven/integrations/rails/overrides/debug_exceptions_catcher.rb
+- lib/raven/integrations/rails/overrides/streaming_reporter.rb
 - lib/raven/integrations/railties.rb
 - lib/raven/integrations/rake.rb
 - lib/raven/integrations/sidekiq.rb