sentry-raven 2.6.0 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9a90db025f175635bb089674602bd66c1d5dfe1
-  data.tar.gz: 44d3c2baa95de9c91ebc5de66967a8046e1ce8ae
+  metadata.gz: 492ac8036f2f1a02ec925196ee01e9e7a8719a0e
+  data.tar.gz: 15769839c7060ad049168680b620fb58f9faa1f5
 SHA512:
-  metadata.gz: a8a454427885043f2647bd4cb74d8d9856187fea01f0830c30ffaf32c97024dc8705e7f59edcf2008890138501da5459fa1786bcca89813cff7e493e318d98d3
-  data.tar.gz: e6d8d7c3f3abfb12168a5d023eed5b8858e40a145c9e90426c3e759eb58d88713eb2bc1a079b68ae6cef9d80fc3f24425d33ce036451e0df6aaa360916c05bf1
+  metadata.gz: 765c2b840c6b5741be982ef814f907dc214aa77625487856a829e7365748d474ed4d058b46fb29d2afef184de3c0e70e29f87c3504ee518c704d629d57a2389b
+  data.tar.gz: 147881f36841706e57863f9a27f01b289a9207dc14360fd29018c8dd4caba6b8d5adbdeaf783748a5f2fc6e8b1db46341b5b77a7fa420306b2a8b44d76feced4

data/changelog.md

@@ -1,3 +1,9 @@
+2.6.1
+-----
+
+* BUGFIX: Fix cases where ActionDispatch::RemoteIP would blow up during event creation [@cmoylan, #722]
+* BUGFIX: In ActiveJob, don't report exceptions which can be rescued by rescue_from handlers [@bensheldon, #719]
+
 2.6.0
 -----
 

data/lib/raven/integrations/rack.rb

@@ -94,22 +94,30 @@ module Raven
 
     def format_headers_for_sentry(env_hash)
       env_hash.each_with_object({}) do |(key, value), memo|
-        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_hash['SERVER_PROTOCOL']
-
-        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
+        begin
+          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_hash['SERVER_PROTOCOL']
+
+          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
+        rescue StandardError => e
+          # Rails adds objects to the Rack env that can sometimes raise exceptions
+          # when `to_s` is called.
+          # See: https://github.com/rails/rails/blob/master/actionpack/lib/action_dispatch/middleware/remote_ip.rb#L134
+          Raven.logger.warn("Error raised while formatting headers: #{e.message}")
+          next
+        end
       end
     end
 

data/lib/raven/integrations/rails/active_job.rb

@@ -17,6 +17,7 @@ module Raven
       def capture_and_reraise_with_sentry(job, block)
         block.call
       rescue Exception => exception # rubocop:disable Lint/RescueException
+        return if rescue_with_handler(exception)
         return if already_supported_by_specific_integration?(job)
         Raven.capture_exception(exception, :extra => raven_context(job))
         raise exception

data/lib/raven/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 module Raven
   # Freezing this constant breaks in 1.9.x
-  VERSION = "2.6.0" # rubocop:disable Style/MutableConstant
+  VERSION = "2.6.1" # rubocop:disable Style/MutableConstant
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sentry-raven
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.6.1
 platform: ruby
 authors:
 - Sentry Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-19 00:00:00.000000000 Z
+date: 2017-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday