sentry-raven 2.6.3 → 2.7.1

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

@@ -0,0 +1,13 @@
+module Raven
+  class Rails
+    module ControllerTransaction
+      def self.included(base)
+        base.around_action do |controller, block|
+          Raven.context.transaction.push "#{controller.class}##{controller.action_name}"
+          block.call
+          Raven.context.transaction.pop
+        end
+      end
+    end
+  end
+end

data/lib/raven/integrations/rake.rb

@@ -6,7 +6,12 @@ module Rake
   class Application
     alias orig_display_error_messsage display_error_message
     def display_error_message(ex)
-      Raven.capture_exception ex, :logger => 'rake', :tags => { 'rake_task' => top_level_tasks.join(' ') }
+      Raven.capture_exception(
+        ex,
+        :transaction => top_level_tasks.join(' '),
+        :logger => 'rake',
+        :tags => { 'rake_task' => top_level_tasks.join(' ') }
+      )
       orig_display_error_messsage(ex)
     end
   end

data/lib/raven/integrations/sidekiq.rb

@@ -3,7 +3,9 @@ require 'sidekiq'
 
 module Raven
   class SidekiqCleanupMiddleware
-    def call(_worker, _job, _queue)
+    def call(_worker, job, queue)
+      Raven.context.transaction.push "Sidekiq/#{job['class']}"
+      Raven.extra_context(:sidekiq => job.merge("queue" => queue))
       yield
       Context.clear!
       BreadcrumbBuffer.clear!
@@ -15,11 +17,11 @@ module Raven
 
     def call(ex, context)
       context = filter_context(context)
+      Raven.context.transaction.push transaction_from_context(context)
       Raven.capture_exception(
         ex,
         :message => ex.message,
-        :extra => { :sidekiq => context },
-        :culprit => culprit_from_context(context)
+        :extra => { :sidekiq => context }
       )
       Context.clear!
       BreadcrumbBuffer.clear!
@@ -51,12 +53,14 @@ module Raven
 
     # this will change in the future:
     # https://github.com/mperham/sidekiq/pull/3161
-    def culprit_from_context(context)
-      classname = (context["class"] || (context["job"] && (context["job"]["wrapped"] || context["job"]["class"])))
+    def transaction_from_context(context)
+      classname = (context["wrapped"] || context["class"] ||
+                    (context[:job] && (context[:job]["wrapped"] || context[:job]["class"]))
+                  )
       if classname
         "Sidekiq/#{classname}"
-      elsif context["event"]
-        "Sidekiq/#{context['event']}"
+      elsif context[:event]
+        "Sidekiq/#{context[:event]}"
       else
         "Sidekiq"
       end

data/lib/raven/interfaces/exception.rb

@@ -1,5 +1,3 @@
-require 'raven/interface'
-
 module Raven
   class ExceptionInterface < Interface
     attr_accessor :values

data/lib/raven/interfaces/http.rb

@@ -1,5 +1,3 @@
-require 'raven/interface'
-
 module Raven
   class HttpInterface < Interface
     attr_accessor :url, :method, :data, :query_string, :cookies, :headers, :env

data/lib/raven/interfaces/single_exception.rb

@@ -1,5 +1,3 @@
-require 'raven/interface'
-
 module Raven
   class SingleExceptionInterface < Interface
     attr_accessor :type

data/lib/raven/interfaces/stack_trace.rb

@@ -1,11 +1,8 @@
-require 'raven/interface'
-
 module Raven
   class StacktraceInterface < Interface
     attr_accessor :frames
 
     def initialize(*arguments)
-      self.frames = []
       super(*arguments)
     end
 
@@ -21,24 +18,16 @@ module Raven
 
     # Not actually an interface, but I want to use the same style
     class Frame < Interface
-      attr_accessor :abs_path
-      attr_accessor :function
-      attr_accessor :vars
-      attr_accessor :pre_context
-      attr_accessor :post_context
-      attr_accessor :context_line
-      attr_accessor :module
-      attr_accessor :lineno
-      attr_accessor :in_app
+      attr_accessor :abs_path, :context_line, :function, :in_app,
+                    :lineno, :module, :pre_context, :post_context, :vars
 
       def initialize(*arguments)
-        self.vars, self.pre_context, self.post_context = [], [], []
         super(*arguments)
       end
 
       def filename
         return if abs_path.nil?
-        return @filename if @filename
+        return @filename if instance_variable_defined?(:@filename)
 
         prefix =
           if under_project_root? && in_app

data/lib/raven/processor/sanitizedata.rb

@@ -4,7 +4,7 @@ require 'json'
 module Raven
   class Processor::SanitizeData < Processor
     DEFAULT_FIELDS = %w(authorization password passwd secret ssn social(.*)?sec).freeze
-    CREDIT_CARD_RE = /^(?:\d[ -]*?){13,16}$/
+    CREDIT_CARD_RE = /\b(?:3[47]\d|(?:4\d|5[1-5]|65)\d{2}|6011)\d{12}\b/
     QUERY_STRING = ['query_string', :query_string].freeze
     JSON_STARTS_WITH = ["[", "{"].freeze
 
@@ -62,7 +62,7 @@ module Raven
     end
 
     def fields_re
-      return @fields_re if @fields_re
+      return @fields_re if instance_variable_defined?(:@fields_re)
       fields = DEFAULT_FIELDS | sanitize_fields
       fields -= sanitize_fields_excluded
       @fields_re = /#{fields.map do |f|

data/lib/raven/processor/utf8conversion.rb

@@ -23,6 +23,7 @@ module Raven
         # so instead we check if it only contains actual ASCII codepoints, and if
         # not we assume it's actually just UTF8 and scrub accordingly.
         if value.encoding == Encoding::BINARY && !value.ascii_only?
+          value = value.dup
           value.force_encoding(Encoding::UTF_8)
         end
         return value if value.valid_encoding?

data/lib/raven/transports.rb

@@ -1,5 +1,3 @@
-require 'raven/error'
-
 module Raven
   module Transports
     class Transport

data/lib/raven/transports/http.rb

@@ -1,7 +1,6 @@
 require 'faraday'
 
 require 'raven/transports'
-require 'raven/error'
 
 module Raven
   module Transports

data/lib/raven/utils/deep_merge.rb

@@ -1,4 +1,3 @@
-# rubocop:disable all
 module Raven
   module Utils
     # ported from ActiveSupport
@@ -8,23 +7,16 @@ module Raven
       end
 
       def self.deep_merge!(hash, other_hash, &block)
-        other_hash.each_pair do |current_key, other_value|
-          this_value = hash[current_key]
-
-          hash[current_key] = if this_value.is_a?(Hash) && other_value.is_a?(Hash)
-            deep_merge(this_value, other_value, &block)
+        hash.merge!(other_hash) do |key, this_val, other_val|
+          if this_val.is_a?(Hash) && other_val.is_a?(Hash)
+            deep_merge(this_val, other_val, &block)
+          elsif block_given?
+            block.call(key, this_val, other_val)
           else
-            if block_given? && key?(current_key)
-              block.call(current_key, this_value, other_value)
-            else
-              other_value
-            end
+            other_val
           end
         end
-
-        hash
       end
     end
   end
 end
-# rubocop:enable all

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.3" # rubocop:disable Style/MutableConstant
+  VERSION = "2.7.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.3
+  version: 2.7.1
 platform: ruby
 authors:
 - Sentry Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-07 00:00:00.000000000 Z
+date: 2017-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -62,6 +62,7 @@ files:
 - docs/integrations/rack.rst
 - docs/integrations/rails.rst
 - docs/make.bat
+- docs/processors.rst
 - docs/sentry-doc-config.json
 - docs/usage.rst
 - exe/raven
@@ -75,7 +76,6 @@ files:
 - lib/raven/client.rb
 - lib/raven/configuration.rb
 - lib/raven/context.rb
-- lib/raven/error.rb
 - lib/raven/event.rb
 - lib/raven/instance.rb
 - lib/raven/integrations/delayed_job.rb
@@ -84,6 +84,7 @@ files:
 - lib/raven/integrations/rails.rb
 - lib/raven/integrations/rails/active_job.rb
 - lib/raven/integrations/rails/controller_methods.rb
+- lib/raven/integrations/rails/controller_transaction.rb
 - lib/raven/integrations/rails/overrides/debug_exceptions_catcher.rb
 - lib/raven/integrations/rails/overrides/streaming_reporter.rb
 - lib/raven/integrations/railties.rb
@@ -135,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: A gem that provides a client interface for the Sentry error logger

data/lib/raven/error.rb

@@ -1,4 +0,0 @@
-module Raven
-  class Error < StandardError
-  end
-end