sentry-raven 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd0a24e20bb50a520df079f36059cb0adb5d7673
-  data.tar.gz: c89f6a2a4146c6ac291e527e7ec362f12a2e82eb
+  metadata.gz: e97702132902b09734d484062d95956e34c55e04
+  data.tar.gz: ca8d939ea7ff848249c6bcef9603bf31324a314b
 SHA512:
-  metadata.gz: ddb34f4ff56c51af45e4c369f61f9a2a01e24107bc97eca694abbb1a501902cac5254fc912e1eb9e794b8d6c21beff0a49570bb1b114d748676b39cfb7862735
-  data.tar.gz: b35f1609019436dd7f42ef6ed976f53bde10a15eab61b5c6a1bc362b99fa571e459913cafb02da7e1281ff366c70ba1a6a06ff8abf326fd455d1824f4a7cfe00
+  metadata.gz: 7b89c8cd9d4e2f28d8a83703d617a904b7cfca119f3a0bb3dbfff16d392307dbad7b6a37ffb844f136ce370e4c5b1f9a48069b2f86b172fa4d6afd3bbeea7d69
+  data.tar.gz: fd1da535f9f07a252ab08ca095beb0e863ae45d070074780e677dd56c51f74c1dfaae475ba62364ae90b3d905e3728f1ead572462266e6e988eefaa25a110eb6

data/lib/raven/base.rb

@@ -34,7 +34,7 @@ module Raven
 
     def_delegators :instance, :client=, :configuration=, :context, :logger, :configuration,
                    :client, :report_status, :configure, :send_event, :capture, :capture_type,
-                   :last_event_id, :should_capture?, :annotate_exception, :user_context,
+                   :last_event_id, :annotate_exception, :user_context,
                    :tags_context, :extra_context, :rack_context, :breadcrumbs
 
     def_delegator :instance, :report_status, :report_ready

data/lib/raven/cli.rb

@@ -14,7 +14,7 @@ module Raven
       Raven.configuration.dsn = dsn if dsn
 
       # wipe out env settings to ensure we send the event
-      unless Raven.configuration.send_in_current_environment?
+      unless Raven.configuration.capture_in_current_environment?
         env_name = Raven.configuration.environments.pop || 'production'
         puts "Setting environment to #{env_name}"
         Raven.configuration.current_environment = env_name

data/lib/raven/client.rb

@@ -22,7 +22,7 @@ module Raven
     end
 
     def send_event(event)
-      return false unless configuration_allows_sending
+      return false unless configuration.sending_allowed?(event)
 
       # Convert to hash
       event = event.to_hash
@@ -62,15 +62,6 @@ module Raven
 
     private
 
-    def configuration_allows_sending
-      if configuration.send_in_current_environment?
-        true
-      else
-        configuration.log_excluded_environment_message
-        false
-      end
-    end
-
     def encode(event)
       hash = @processors.reduce(event.to_hash) { |memo, p| p.process(memo) }
       encoded = JSON.generate(hash)

data/lib/raven/configuration.rb

@@ -215,12 +215,21 @@ module Raven
       @current_environment = environment.to_s
     end
 
-    def send_in_current_environment?
+    def capture_allowed?(message_or_exc)
+      capture_in_current_environment? &&
+        capture_allowed_by_callback?(message_or_exc)
+    end
+
+    # If we cannot capture, we cannot send.
+    alias sending_allowed? capture_allowed?
+
+    def capture_in_current_environment?
       !!server && (environments.empty? || environments.include?(current_environment))
     end
 
-    def log_excluded_environment_message
-      Raven.logger.debug "Event not sent due to excluded environment: #{current_environment}"
+    def capture_allowed_by_callback?(message_or_exc)
+      return true unless should_capture
+      should_capture.call(*[message_or_exc])
     end
 
     def verify!

data/lib/raven/instance.rb

@@ -60,11 +60,11 @@ module Raven
 
     # Tell the log that the client is good to go
     def report_status
-      return if client.configuration.silence_ready
-      if client.configuration.send_in_current_environment?
+      return if configuration.silence_ready
+      if configuration.capture_in_current_environment?
         logger.info "Raven #{VERSION} ready to catch errors"
       else
-        logger.info "Raven #{VERSION} configured not to send errors."
+        logger.info "Raven #{VERSION} configured not to capture errors."
       end
     end
 
@@ -113,7 +113,11 @@ module Raven
     end
 
     def capture_type(obj, options = {})
-      return false unless should_capture?(obj)
+      unless configuration.capture_allowed?(obj)
+        Raven.logger.debug("#{obj} excluded from capture due to environment or should_capture callback")
+        return false
+      end
+
       message_or_exc = obj.is_a?(String) ? "message" : "exception"
       if (evt = Event.send("from_" + message_or_exc, obj, options))
         yield evt if block_given?
@@ -131,14 +135,6 @@ module Raven
       Thread.current["sentry_#{object_id}_last_event_id".to_sym]
     end
 
-    def should_capture?(message_or_exc)
-      if configuration.should_capture
-        configuration.should_capture.call(*[message_or_exc])
-      else
-        true
-      end
-    end
-
     # Provides extra context to the exception prior to it being handled by
     # Raven. An exception can have multiple annotations, which are merged
     # together.

data/lib/raven/integrations/delayed_job.rb

@@ -42,6 +42,9 @@ module Delayed
 
             # Make sure we propagate the failure!
             raise exception
+          ensure
+            Context.clear!
+            BreadcrumbBuffer.clear!
           end
         end
       end

data/lib/raven/integrations/rack.rb

@@ -41,10 +41,6 @@ module Raven
     end
 
     def call(env)
-      # clear context at the beginning of the request to ensure a clean slate
-      Context.clear!
-      BreadcrumbBuffer.clear!
-
       # store the current environment in our local context for arbitrary
       # callers
       env['raven.requested_at'] = Time.now
@@ -64,6 +60,9 @@ module Raven
       Raven::Rack.capture_exception(error, env) if error
 
       response
+    ensure
+      Context.clear!
+      BreadcrumbBuffer.clear!
     end
   end
 

data/lib/raven/integrations/sidekiq.rb

@@ -10,6 +10,9 @@ module Raven
       Raven.capture_exception(ex, :extra => { :sidekiq => msg },
                                   :time_spent => Time.now-started_at)
       raise
+    ensure
+      Context.clear!
+      BreadcrumbBuffer.clear!
     end
   end
 end

data/lib/raven/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sentry-raven
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Sentry Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-03 00:00:00.000000000 Z
+date: 2016-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday