sentry-raven 2.5.3 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70b9abf6b93e96df6d2be4056417be002fdd5fc3
-  data.tar.gz: 6c74a0b9414e202c40f51da20914ce7b135c0961
+  metadata.gz: f9a90db025f175635bb089674602bd66c1d5dfe1
+  data.tar.gz: 44d3c2baa95de9c91ebc5de66967a8046e1ce8ae
 SHA512:
-  metadata.gz: 4498c19ed966bed8a2ea43773f01f7b587896cd434ce702e2d2f7c34fbcd902fa369ab75218b575e2468cc87b11634588a1f70a24078c966f14ae12da74d2207
-  data.tar.gz: 807dd7e9185458135d27777acc47eba17b5671a03dc90e4cc29015e8b683bb9ce51225e9c645c755e0c0d76b0cd07d7ea0a13b87d612b8638d56c91bc7383a1d
+  metadata.gz: a8a454427885043f2647bd4cb74d8d9856187fea01f0830c30ffaf32c97024dc8705e7f59edcf2008890138501da5459fa1786bcca89813cff7e493e318d98d3
+  data.tar.gz: e6d8d7c3f3abfb12168a5d023eed5b8858e40a145c9e90426c3e759eb58d88713eb2bc1a079b68ae6cef9d80fc3f24425d33ce036451e0df6aaa360916c05bf1

data/.travis.yml

@@ -31,9 +31,9 @@ matrix:
       env: RAILS_VERSION=4
     - rvm: jruby-1.7.27
       env: JRUBY_OPTS="--dev" RAILS_VERSION=4
-    - rvm: jruby-9.1.10.0
+    - rvm: jruby-9.1.12.0
       env: JRUBY_OPTS="--dev -J-Djruby.launch.inproc=true -J-Xmx1024M" RAILS_VERSION=4
-    - rvm: jruby-9.1.10.0
+    - rvm: jruby-9.1.12.0
       env: JRUBY_OPTS="--dev -J-Djruby.launch.inproc=true -J-Xmx1024M" RAILS_VERSION=5
     - rvm: ruby-head
       env: RAILS_VERSION=0

data/Gemfile

@@ -4,8 +4,12 @@ gemspec
 
 if ENV["RAILS_VERSION"] && (ENV["RAILS_VERSION"].to_i == 4)
   gem "rails", "< 5"
-elsif ENV["RAILS_VERSION"] && (ENV["RAILS_VERSION"].to_i == 5)
+  gem "rspec-rails"
+elsif ENV["RAILS_VERSION"] && (ENV["RAILS_VERSION"].to_i == 0)
+  # no-op. No Rails.
+else
   gem "rails", "< 6"
+  gem "rspec-rails"
 end
 
 if RUBY_VERSION < '2.0'
@@ -25,6 +29,5 @@ gem "ruby-prof", platform: :mri
 gem "rake"
 gem "rubocop", "~> 0.41.1"
 gem "rspec"
-gem "rspec-rails"
 gem "timecop"
 gem "test-unit", platform: :mri if RUBY_VERSION > '2.2'

data/README.md

@@ -1,9 +1,17 @@
-# Raven-Ruby
+<p align="center">
+  <img src="https://cdn.rawgit.com/getsentry/raven-python/1e525422/docs/_static/logo.png">
+</p>
+
+# Raven-Ruby, the Ruby Client for Sentry
 
 [![Gem Version](https://img.shields.io/gem/v/sentry-raven.svg)](https://rubygems.org/gems/sentry-raven)
 [![Build Status](https://img.shields.io/travis/getsentry/raven-ruby/master.svg)](https://travis-ci.org/getsentry/raven-ruby)
+[![Gem](https://img.shields.io/gem/dt/sentry-raven.svg)](https://rubygems.org/gems/sentry-raven/)
+
+
+[Documentation](https://docs.getsentry.com/hosted/clients/ruby/) | [Bug Tracker](https://github.com/getsentry/raven-ruby/issues) | [Forum](https://forum.sentry.io/) | IRC: irc.freenode.net, #sentry
 
-A client and integration layer for the [Sentry](https://github.com/getsentry/sentry) error reporting API.
+The official Ruby-language client and integration layer for the [Sentry](https://github.com/getsentry/sentry) error reporting API.
 
 ## Requirements
 
@@ -32,15 +40,15 @@ Raven.configure do |config|
 end
 ```
 
-### Raven doesn't report some kinds of data by default.
+### Raven doesn't report some kinds of data by default
 
-Raven ignores some exceptions by default - most of these are related to 404s or controller actions not being found. [For a complete list, see the `IGNORE_DEFAULT` constant](https://github.com/getsentry/raven-ruby/blob/master/lib/raven/configuration.rb).
+**Raven ignores some exceptions by default** - most of these are related to 404s or controller actions not being found. [For a complete list, see the `IGNORE_DEFAULT` constant](https://github.com/getsentry/raven-ruby/blob/master/lib/raven/configuration.rb).
 
 Raven doesn't report POST data or cookies by default. In addition, it will attempt to remove any obviously sensitive data, such as credit card or Social Security numbers. For more information about how Sentry processes your data, [check out the documentation on the `processors` config setting.](https://docs.getsentry.com/hosted/clients/ruby/config/)
 
-### Call
+### Usage
 
-If you use Rails, you're already done - no more configuration required! Check [Integrations](https://docs.getsentry.com/hosted/clients/ruby/integrations/) for more details on other gems Sentry integrates with automatically.
+**If you use Rails, you're already done - no more configuration required!** Check [Integrations](https://docs.getsentry.com/hosted/clients/ruby/integrations/) for more details on other gems Sentry integrates with automatically.
 
 Otherwise, Raven supports two methods of capturing exceptions:
 
@@ -61,29 +69,6 @@ end
 
 You're all set - but there's a few more settings you may want to know about too!
 
-#### DSN
-
-While we advise that you set your Sentry DSN through the `SENTRY_DSN` environment
-variable, there are two other configuration settings for controlling Raven:
-
-```ruby
-# DSN can be configured as a config setting instead.
-# Place in config/initializers or similar.
-Raven.configure do |config|
-  config.dsn = 'your_dsn'
-end
-```
-
-And, while not necessary if using `SENTRY_DSN`, you can also provide an `environments`
-setting. Raven will only capture events when `RACK_ENV` or `RAILS_ENV` matches
-an environment in the list.
-
-```ruby
-Raven.configure do |config|
-  config.environments = %w[staging production]
-end
-```
-
 #### async
 
 When an error or message occurs, the notification is immediately sent to Sentry. Raven can be configured to send asynchronously:
@@ -96,15 +81,15 @@ config.async = lambda { |event|
 
 Using a thread to send events will be adequate for truly parallel Ruby platforms such as JRuby, though the benefit on MRI/CRuby will be limited. If the async callback raises an exception, Raven will attempt to send synchronously.
 
-We recommend creating a background job, using your background job processor, that will send Sentry notifications in the background. Rather than enqueuing an entire Raven::Event object, we recommend providing the Hash representation of an event as a job argument. Here’s an example for ActiveJob:
+Note that the naive example implementation has a major drawback - it can create an infinite number of threads. We recommend creating a background job, using your background job processor, that will send Sentry notifications in the background.
 
 ```ruby
 config.async = lambda { |event| SentryJob.perform_later(event) }
 
 class SentryJob < ActiveJob::Base
   queue_as :default
-  
-  # Important! Otherwise, we can get caught in an infinite loop.
+
+  # Important for ActiveJob! Otherwise, we can get caught in an infinite loop.
   rescue_from(ActiveJob::DeserializationError) { |e| Rails.logger.error e }
 
   def perform(event)
@@ -146,6 +131,5 @@ For more information, see [Context](https://docs.sentry.io/clients/ruby/context/
 
 * [Documentation](https://docs.getsentry.com/hosted/clients/ruby/)
 * [Bug Tracker](https://github.com/getsentry/raven-ruby/issues)
-* [Code](https://github.com/getsentry/raven-ruby)
-* [Mailing List](https://groups.google.com/group/getsentry)
+* [Forum](https://forum.sentry.io/)
 * [IRC](irc://irc.freenode.net/sentry>)  (irc.freenode.net, #sentry)

data/changelog.md

@@ -1,3 +1,16 @@
+2.6.0
+-----
+
+* FEATURE: raven-ruby now marks itself as the "ruby" logger by default, to match raven-js behavior [@nateberkopec]
+* FEATURE: You may now override the default sanitization parameters [#712, @nateberkopec]
+* FEATURE: Breadcrumb buffers are now publicly accessible [#686, @nateberkopec]
+* FEATURE: We yell at you now if you're using Heroku but don't have runtime-dyno-metadata enabled [#715, @nateberkopec]
+* FEATURE: project_root will always be set, regardless of framework [#716, @nateberkopec]
+
+* BUGFIX: Request body and message limits now match Sentry server defaults [#714, @nateberkopec]
+* BUGFIX: Sidekiq context now works as expected [#713, @nateberkopec]
+* BUGFIX: Capture exceptions in ActiveJob when not using Sidekiq adapter [#709, #671, @nateberkopec]
+
 2.5.3
 -----
 

data/docs/config.rst

@@ -82,13 +82,13 @@ Optional settings
 
     .. code-block:: ruby
 
-        config.excluded_exceptions = ['ActionController::RoutingError', 'ActiveRecord::RecordNotFound']
+        config.excluded_exceptions += ['ActionController::RoutingError', 'ActiveRecord::RecordNotFound']
 
-    You can find the list of exceptions that are excluded by default in ``Raven::Configuration::IGNORE_DEFAULT``. Remember you'll be overriding those defaults by setting this configuration.
+    You can find the list of exceptions that are excluded by default in ``Raven::Configuration::IGNORE_DEFAULT``. It is suggested that you append to these defaults rather than overwrite them with ``=``.
 
 .. describe:: logger
 
-    The name of the logger used by Sentry. Default is an instance of Raven::Logger.
+    The logger used by Sentry. Default is an instance of Raven::Logger.
 
     .. code-block:: ruby
 

data/docs/context.rst

@@ -24,6 +24,7 @@ The following attributes are available:
 * ``server_name``: the hostname of the server
 * ``tags``: a mapping of tags describing this event
 * ``extra``: a mapping of arbitrary context
+* ``user``: a mapping of user context
 
 Providing Request Context
 -------------------------

data/docs/integrations/heroku.rst

@@ -0,0 +1,11 @@
+Heroku
+======
+
+Installation
+------------
+
+Enable the ``runtime-dyno-metadata`` Heroku Labs feature in order to enable automated release detection:
+
+::
+
+   heroku labs:enable runtime-dyno-metadata -a myapp

data/docs/integrations/index.rst

@@ -12,6 +12,7 @@ features if you want.
    rails
    rack
    puma
+   heroku
 
 The following integrations are available:
 
@@ -30,7 +31,7 @@ the default integration behavior doesn't suit your projects' needs.
 
 To explicitly include integrations:
 
-::
+.. sourcecode:: ruby
 
    require 'sentry-raven-without-integrations'
    Raven.inject_only(:railties, :rack, :rake)
@@ -38,7 +39,7 @@ To explicitly include integrations:
 
 To blacklist integrations:
 
-::
+.. sourcecode:: ruby
 
    require 'sentry-raven-without-integrations'
    Raven.inject_without(:sidekiq, :delayed_job)
@@ -46,13 +47,13 @@ To blacklist integrations:
 
 If you're using bundler, then in your gemfile:
 
-::
+.. sourcecode:: ruby
 
    gem 'sentry-raven', require: 'sentry-raven-without-integrations'
 
 
 And in some sort of initializer:
 
-::
+.. sourcecode:: ruby
 
    Raven.inject_without(:sidekiq)

data/lib/raven/breadcrumbs.rb

@@ -28,6 +28,8 @@ module Raven
   class BreadcrumbBuffer
     include Enumerable
 
+    attr_accessor :buffer
+
     def self.current
       Thread.current[:sentry_breadcrumbs] ||= new
     end

data/lib/raven/cli.rb

@@ -1,57 +1,58 @@
 module Raven
   class CLI
-    def self.test(dsn = nil, silent = false) # rubocop:disable all
-      if silent
-        Raven.configuration.logger = ::Logger.new(nil)
-      else
-        logger = ::Logger.new(STDOUT)
-        logger.level = ::Logger::ERROR
-        logger.formatter = proc do |_severity, _datetime, _progname, msg|
-          "-> #{msg}\n"
-        end
+    def self.test(dsn = nil, silent = false, config = nil) # rubocop:disable all
+      config ||= Raven.configuration
 
-        Raven.configuration.logger = logger
-      end
+      config.logger = if silent
+                        ::Logger.new(nil)
+                      else
+                        logger = ::Logger.new(STDOUT)
+                        logger.formatter = proc do |_severity, _datetime, _progname, msg|
+                          "-> #{msg}\n"
+                        end
+                        logger
+                      end
 
-      Raven.configuration.timeout = 5
-      Raven.configuration.dsn = dsn if dsn
+      config.timeout = 5
+      config.dsn = dsn if dsn
 
       # wipe out env settings to ensure we send the event
-      unless Raven.configuration.capture_allowed?
-        env_name = Raven.configuration.environments.pop || 'production'
-        Raven.logger.debug "Setting environment to #{env_name}"
-        Raven.configuration.current_environment = env_name
+      unless config.capture_allowed?
+        env_name = config.environments.pop || 'production'
+        config.current_environment = env_name
       end
 
-      Raven.logger.debug "Sending a test event:"
-      Raven.logger.debug ""
+      instance = Raven::Instance.new(nil, config)
+
+      instance.logger.debug "Sending a test event:"
+      instance.logger.debug ""
 
       begin
         1 / 0
       rescue ZeroDivisionError => exception
-        evt = Raven.capture_exception(exception)
+        evt = instance.capture_exception(exception)
       end
 
       if evt && !(evt.is_a? Thread)
         if evt.is_a? Hash
-          Raven.logger.debug "-> event ID: #{evt[:event_id]}"
+          instance.logger.debug "-> event ID: #{evt[:event_id]}"
         else
-          Raven.logger.debug "-> event ID: #{evt.id}"
+          instance.logger.debug "-> event ID: #{evt.id}"
         end
       elsif evt # async configuration
         if evt.value.is_a? Hash
-          Raven.logger.debug "-> event ID: #{evt.value[:event_id]}"
+          instance.logger.debug "-> event ID: #{evt.value[:event_id]}"
         else
-          Raven.logger.debug "-> event ID: #{evt.value.id}"
+          instance.logger.debug "-> event ID: #{evt.value.id}"
         end
       else
-        Raven.logger.debug ""
-        Raven.logger.debug "An error occurred while attempting to send the event."
+        instance.logger.debug ""
+        instance.logger.debug "An error occurred while attempting to send the event."
         exit 1
       end
 
-      Raven.logger.debug ""
-      Raven.logger.debug "Done!"
+      instance.logger.debug ""
+      instance.logger.debug "Done!"
       true
     end
   end

data/lib/raven/configuration.rb

@@ -99,6 +99,10 @@ module Raven
     # a hash key, will be censored and not sent to Sentry.
     attr_accessor :sanitize_fields
 
+    # If you're sure you want to override the default sanitization values, you can
+    # add to them to an array of Strings here, e.g. %w(authorization password)
+    attr_accessor :sanitize_fields_excluded
+
     # Sanitize additional HTTP headers - only Authorization is removed by default.
     attr_accessor :sanitize_http_headers
 
@@ -185,12 +189,14 @@ module Raven
       self.logger = ::Raven::Logger.new(STDOUT)
       self.open_timeout = 1
       self.processors = DEFAULT_PROCESSORS.dup
+      self.project_root = detect_project_root
       self.proxy = nil
       self.rails_activesupport_breadcrumbs = false
       self.rails_report_rescued_exceptions = true
       self.release = detect_release
       self.sanitize_credit_cards = true
       self.sanitize_fields = []
+      self.sanitize_fields_excluded = []
       self.sanitize_http_headers = []
       self.send_modules = true
       self.server = ENV['SENTRY_DSN'] if ENV['SENTRY_DSN']
@@ -286,28 +292,45 @@ module Raven
       detect_release_from_git ||
         detect_release_from_capistrano ||
         detect_release_from_heroku
+    rescue => ex
+      logger.error "Error detecting release: #{ex.message}"
+    end
+
+    def detect_project_root
+      if defined? Rails.root # we are in a Rails application
+        Rails.root.to_s
+      else
+        Dir.pwd
+      end
     end
 
     private
 
     def detect_release_from_heroku
-      sys_dyno_info = File.read("/etc/heroku/dyno").strip if File.directory?("/etc/heroku") rescue nil
-      return unless sys_dyno_info
-
-      # being overly cautious, because if we raise an error Raven won't start
-      begin
-        hash = JSON.parse(sys_dyno_info)
-        hash && hash["release"] && hash["release"]["commit"]
-      rescue JSON::JSONError
-        logger.error "Cannot parse Heroku JSON: #{sys_dyno_info}"
-      end
+      return unless running_on_heroku?
+      logger.warn(heroku_dyno_metadata_message) && return unless ENV['HEROKU_SLUG_COMMIT']
+
+      ENV['HEROKU_SLUG_COMMIT']
+    end
+
+    def running_on_heroku?
+      File.directory?("/etc/heroku")
+    end
+
+    def heroku_dyno_metadata_message
+      "You are running on Heroku but haven't enabled Dyno Metadata. For Sentry's"\
+      "release detection to work correctly, please run `heroku labs:enable runtime-dyno-metadata`"
     end
 
     def detect_release_from_capistrano
-      version = File.read(File.join(project_root, 'REVISION')).strip rescue nil
+      revision_file = File.join(project_root, 'REVISION')
+      revision_log = File.join(project_root, '..', 'revisions.log')
 
-      # Capistrano 3.0 - 3.1.x
-      version || File.open(File.join(project_root, '..', 'revisions.log')).to_a.last.strip.sub(/.*as release ([0-9]+).*/, '\1') rescue nil
+      if File.exist?(revision_file)
+        File.read(revision_file).strip
+      elsif File.exist?(revision_log)
+        File.open(revision_log).to_a.last.strip.sub(/.*as release ([0-9]+).*/, '\1')
+      end
     end
 
     def detect_release_from_git

data/lib/raven/event.rb

@@ -19,6 +19,9 @@ module Raven
     }.freeze
 
     BACKTRACE_RE = /^(.+?):(\d+)(?::in `(.+?)')?$/
+    # See Sentry server default limits at
+    # https://github.com/getsentry/sentry/blob/master/src/sentry/conf/server.py
+    MAX_MESSAGE_SIZE_IN_BYTES = 1024 * 8
 
     PLATFORM = "ruby".freeze
     SDK = { "name" => "raven-ruby", "version" => Raven::VERSION }.freeze
@@ -38,7 +41,7 @@ module Raven
       @timestamp     = Time.now.utc
       @time_spent    = nil
       @level         = :error
-      @logger        = ''
+      @logger        = 'ruby'
       @culprit       = nil
       @server_name   = @configuration.server_name
       @release       = @configuration.release
@@ -106,7 +109,7 @@ module Raven
 
         new(options) do |evt|
           evt.configuration = configuration
-          evt.message = "#{exc.class}: #{exc.message}".byteslice(0...10_000) # Messages limited to 10kb
+          evt.message = "#{exc.class}: #{exc.message}".byteslice(0...MAX_MESSAGE_SIZE_IN_BYTES) # Messages limited to 10kb
           evt.level = options[:level] || :error
 
           add_exception_interface(evt, exc)
@@ -116,7 +119,7 @@ module Raven
       end
 
       def from_message(message, options = {})
-        message = message.byteslice(0...10_000) # Messages limited to 10kb
+        message = message.byteslice(0...MAX_MESSAGE_SIZE_IN_BYTES)
         configuration = options[:configuration] || Raven.configuration
 
         new(options) do |evt|

data/lib/raven/integrations/rack.rb

@@ -80,11 +80,13 @@ module Raven
 
     private
 
+    # See Sentry server default limits at
+    # https://github.com/getsentry/sentry/blob/master/src/sentry/conf/server.py
     def read_data_from(request)
       if request.form_data?
         request.POST
       elsif request.body # JSON requests, etc
-        data = request.body.read(2048) # Sentry server limit
+        data = request.body.read(4096 * 4) # Sentry server limit
         request.body.rewind
         data
       end

data/lib/raven/integrations/rails.rb

@@ -37,11 +37,6 @@ module Raven
     end
 
     config.after_initialize do
-      Raven.configure do |config|
-        config.project_root ||= ::Rails.root
-        config.release ||= config.detect_release # if project_root has changed, need to re-check
-      end
-
       if Raven.configuration.rails_activesupport_breadcrumbs
         require 'raven/breadcrumbs/activesupport'
         Raven::ActiveSupportBreadcrumbs.inject
@@ -63,6 +58,12 @@ module Raven
       end
     end
 
+    initializer 'raven.active_job' do
+      ActiveSupport.on_load :active_job do
+        require 'raven/integrations/rails/active_job'
+      end
+    end
+
     rake_tasks do
       require 'raven/integrations/tasks'
     end

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

@@ -1,31 +1,53 @@
 module Raven
   class Rails
-    module ActiveJob
+    module ActiveJobExtensions
+      ALREADY_SUPPORTED_SENTRY_ADAPTERS = %w(
+        ActiveJob::QueueAdapters::SidekiqAdapter
+        ActiveJob::QueueAdapters::DelayedJobAdapter
+      ).freeze
+
       def self.included(base)
         base.class_eval do
-          rescue_from(Exception) do |exception|
-            # Do not capture exceptions when using Sidekiq so we don't capture
-            # The same exception twice.
-            unless self.class.queue_adapter.to_s == 'ActiveJob::QueueAdapters::SidekiqAdapter'
-              active_job_details = {
-                :active_job => self.class.name,
-                :arguments => arguments,
-                :scheduled_at => scheduled_at,
-                :job_id => job_id,
-                :locale => locale
-              }
+          around_perform do |job, block|
+            capture_and_reraise_with_sentry(job, block)
+          end
+        end
+      end
 
-              # Add provider_job_id details if Rails 5
-              if defined?(provider_job_id)
-                active_job_details[:provider_job_id] = provider_job_id
-              end
+      def capture_and_reraise_with_sentry(job, block)
+        block.call
+      rescue Exception => exception # rubocop:disable Lint/RescueException
+        return if already_supported_by_specific_integration?(job)
+        Raven.capture_exception(exception, :extra => raven_context(job))
+        raise exception
+      ensure
+        Context.clear!
+        BreadcrumbBuffer.clear!
+      end
 
-              Raven.capture_exception(exception, :extra => active_job_details)
-              raise exception
-            end
-          end
+      def already_supported_by_specific_integration?(job)
+        ALREADY_SUPPORTED_SENTRY_ADAPTERS.include?(job.class.queue_adapter.to_s)
+      end
+
+      def raven_context(job)
+        ctx = {
+          :active_job => job.class.name,
+          :arguments => job.arguments,
+          :scheduled_at => job.scheduled_at,
+          :job_id => job.job_id,
+          :locale => job.locale
+        }
+        # Add provider_job_id details if Rails 5
+        if job.respond_to?(:provider_job_id)
+          ctx[:provider_job_id] = job.provider_job_id
         end
+
+        ctx
       end
     end
   end
 end
+
+class ActiveJob::Base
+  include Raven::Rails::ActiveJobExtensions
+end

data/lib/raven/integrations/sidekiq.rb

@@ -5,7 +5,6 @@ module Raven
   class SidekiqCleanupMiddleware
     def call(_worker, _job, _queue)
       yield
-    ensure
       Context.clear!
       BreadcrumbBuffer.clear!
     end
@@ -22,6 +21,8 @@ module Raven
         :extra => { :sidekiq => context },
         :culprit => culprit_from_context(context)
       )
+      Context.clear!
+      BreadcrumbBuffer.clear!
     end
 
     private

data/lib/raven/processor/sanitizedata.rb

@@ -5,13 +5,16 @@ module Raven
   class Processor::SanitizeData < Processor
     DEFAULT_FIELDS = %w(authorization password passwd secret ssn social(.*)?sec).freeze
     CREDIT_CARD_RE = /^(?:\d[ -]*?){13,16}$/
+    QUERY_STRING = ['query_string', :query_string].freeze
+    JSON_STARTS_WITH = ["[", "{"].freeze
 
-    attr_accessor :sanitize_fields, :sanitize_credit_cards
+    attr_accessor :sanitize_fields, :sanitize_credit_cards, :sanitize_fields_excluded
 
     def initialize(client)
       super
       self.sanitize_fields = client.configuration.sanitize_fields
       self.sanitize_credit_cards = client.configuration.sanitize_credit_cards
+      self.sanitize_fields_excluded = client.configuration.sanitize_fields_excluded
     end
 
     def process(value, key = nil)
@@ -28,7 +31,7 @@ module Raven
           process(json).to_json
         elsif matches_regexes?(key, value)
           STRING_MASK
-        elsif key == 'query_string' || key == :query_string
+        elsif QUERY_STRING.include?(key)
           sanitize_query_string(value)
         else
           value
@@ -59,7 +62,10 @@ module Raven
     end
 
     def fields_re
-      @fields_re ||= /#{(DEFAULT_FIELDS | sanitize_fields).map do |f|
+      return @fields_re if @fields_re
+      fields = DEFAULT_FIELDS | sanitize_fields
+      fields -= sanitize_fields_excluded
+      @fields_re = /#{fields.map do |f|
         use_boundary?(f) ? "\\b#{f}\\b" : f
       end.join("|")}/i
     end
@@ -73,7 +79,7 @@ module Raven
     end
 
     def parse_json_or_nil(string)
-      return unless string.start_with?("[", "{")
+      return unless string.start_with?(*JSON_STARTS_WITH)
       JSON.parse(string)
     rescue JSON::ParserError, NoMethodError
       nil

data/lib/raven/utils/deep_merge.rb

@@ -12,7 +12,7 @@ module Raven
           this_value = hash[current_key]
 
           hash[current_key] = if this_value.is_a?(Hash) && other_value.is_a?(Hash)
-            this_value.deep_merge(other_value, &block)
+            deep_merge(this_value, other_value, &block)
           else
             if block_given? && key?(current_key)
               block.call(current_key, this_value, other_value)

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.5.3" # rubocop:disable Style/MutableConstant
+  VERSION = "2.6.0" # rubocop:disable Style/MutableConstant
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sentry-raven
 version: !ruby/object:Gem::Version
-  version: 2.5.3
+  version: 2.6.0
 platform: ruby
 authors:
 - Sentry Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-14 00:00:00.000000000 Z
+date: 2017-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -56,6 +56,7 @@ files:
 - docs/context.rst
 - docs/index.rst
 - docs/install.rst
+- docs/integrations/heroku.rst
 - docs/integrations/index.rst
 - docs/integrations/puma.rst
 - docs/integrations/rack.rst