sentry-ruby-core 4.6.1 → 4.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: efdd71de2f9ada8f2c3bbffd41df8edfed7847c7b93390f2ce64a588094bc3d3
-  data.tar.gz: bdb0b838f35d1fc87c85eb63caf23e48d8234819935f2c80721cc28ec2f53fc8
+  metadata.gz: 4440f6ad3a4fd52dc9bd94c15a64e239a6957aca9adc7a410e8bd787d124bcae
+  data.tar.gz: c6736aba5112331695e81adc496f3c6ee5581ae2ee419ba880c912eb20cedde9
 SHA512:
-  metadata.gz: 232f4e625023091167191a733fc5366017eb2212e94ffe939d2b48a3a42956866df2f6b503f5d8103d7246df955f1a203776cccc6537bd5039059ba4832370e3
-  data.tar.gz: 0cac44f1407e6fd6a93a8fb789b0acefc0f36c9bc33899b149567c0dee91d677b469e7099752361d9b2227d6d76a40db8e1234901f12aed3c8407e7c30470091
+  metadata.gz: e38a7ad731a84ee1886c341f8e6484c2019ad328b0a7c3bd93583d1f3056088f5f8e050bf0d0b764a5938c80ca7e704608aa2a107e6b9f915f76cb6dc701e1dc
+  data.tar.gz: fd137796bb363205ba78929c987b1cb1e3f7f494058e9fb8a31348ef29dd071994ec30a816b7de3befcdc018f91bc437cfade282fa65aa57952ac0e863580291

data/lib/sentry-ruby.rb

@@ -36,15 +36,27 @@ module Sentry
 
   THREAD_LOCAL = :sentry_hub
 
-  def self.sdk_meta
-    META
-  end
+  class << self
+    attr_accessor :background_worker
 
-  def self.utc_now
-    Time.now.utc
-  end
+    ##### Patch Registration #####
+    #
+    def register_patch(&block)
+      registered_patches << block
+    end
 
-  class << self
+    def apply_patches(config)
+      registered_patches.each do |patch|
+        patch.call(config)
+      end
+    end
+
+    def registered_patches
+      @registered_patches ||= []
+    end
+
+    ##### Integrations #####
+    #
     # Returns a hash that contains all the integrations that have been registered to the main SDK.
     def integrations
       @integrations ||= {}
@@ -55,32 +67,16 @@ module Sentry
       meta = { name: "sentry.ruby.#{name}", version: version }.freeze
       integrations[name.to_s] = meta
     end
-  end
 
-  class << self
+    ##### Method Delegation #####
+    #
     extend Forwardable
 
     def_delegators :get_current_client, :configuration, :send_event
     def_delegators :get_current_scope, :set_tags, :set_extras, :set_user, :set_context
 
-    attr_accessor :background_worker
-
-    @@registered_patches = []
-
-    def register_patch(&block)
-      registered_patches << block
-    end
-
-    def apply_patches(config)
-      registered_patches.each do |patch|
-        patch.call(config)
-      end
-    end
-
-    def registered_patches
-      @@registered_patches
-    end
-
+    ##### Main APIs #####
+    #
     def init(&block)
       config = Configuration.new
       yield(config) if block_given?
@@ -100,8 +96,8 @@ module Sentry
     end
 
     # Takes an instance of Sentry::Breadcrumb and stores it to the current active scope.
-    def add_breadcrumb(breadcrumb)
-      get_current_hub&.add_breadcrumb(breadcrumb)
+    def add_breadcrumb(breadcrumb, **options)
+      get_current_hub&.add_breadcrumb(breadcrumb, **options)
     end
 
     # Returns the current active hub.
@@ -193,6 +189,9 @@ module Sentry
       get_current_hub&.last_event_id
     end
 
+
+    ##### Helpers #####
+    #
     def sys_command(command)
       result = `#{command} 2>&1` rescue nil
       return if result.nil? || result.empty? || ($CHILD_STATUS && $CHILD_STATUS.exitstatus != 0)
@@ -207,6 +206,14 @@ module Sentry
     def logger
       configuration.logger
     end
+
+    def sdk_meta
+      META
+    end
+
+    def utc_now
+      Time.now.utc
+    end
   end
 end
 

data/lib/sentry/breadcrumb/sentry_logger.rb

@@ -67,7 +67,7 @@ module Sentry
             type: severity >= 3 ? "error" : level
           )
 
-          Sentry.add_breadcrumb(crumb)
+          Sentry.add_breadcrumb(crumb, hint: { severity: severity })
         end
       end
 

data/lib/sentry/client.rb

@@ -26,7 +26,12 @@ module Sentry
     def capture_event(event, scope, hint = {})
       return unless configuration.sending_allowed?
 
-      scope.apply_to_event(event, hint)
+      event = scope.apply_to_event(event, hint)
+
+      if event.nil?
+        log_info("Discarded event because one of the event processors returned nil")
+        return
+      end
 
       if async_block = configuration.async
         dispatch_async_event(async_block, event, hint)

data/lib/sentry/configuration.rb

@@ -89,7 +89,7 @@ module Sentry
     # You should probably append to this rather than overwrite it.
     attr_accessor :excluded_exceptions
 
-    # Boolean to check nested exceptions when deciding if to exclude. Defaults to false
+    # Boolean to check nested exceptions when deciding if to exclude. Defaults to true
     attr_accessor :inspect_exception_causes_for_exclusion
     alias inspect_exception_causes_for_exclusion? inspect_exception_causes_for_exclusion
 
@@ -405,7 +405,7 @@ module Sentry
     def sample_allowed?
       return true if sample_rate == 1.0
 
-      if Random::DEFAULT.rand >= sample_rate
+      if Random.rand >= sample_rate
         @errors << "Excluded by random sample"
         false
       else

data/lib/sentry/core_ext/object/deep_dup.rb

@@ -1,3 +1,5 @@
+return if Object.method_defined?(:deep_dup)
+
 require 'sentry/core_ext/object/duplicable'
 
 #########################################

data/lib/sentry/core_ext/object/duplicable.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+return if Object.method_defined?(:duplicable?)
 
 #########################################
 #  This file was copied from Rails 5.2  #

data/lib/sentry/dsn.rb

@@ -37,7 +37,6 @@ module Sentry
     def server
       server = "#{scheme}://#{host}"
       server += ":#{port}" unless port == PORT_MAP[scheme]
-      server += path
       server
     end
 

data/lib/sentry/event.rb

@@ -9,7 +9,7 @@ require 'sentry/utils/request_id'
 
 module Sentry
   class Event
-    ATTRIBUTES = %i(
+    SERIALIZEABLE_ATTRIBUTES = %i(
       event_id level timestamp
       release environment server_name modules
       message user tags contexts extra
@@ -17,9 +17,13 @@ module Sentry
       platform sdk type
     )
 
+    WRITER_ATTRIBUTES = SERIALIZEABLE_ATTRIBUTES - %i(type timestamp level)
+
     MAX_MESSAGE_SIZE_IN_BYTES = 1024 * 8
 
-    attr_accessor(*ATTRIBUTES)
+    attr_writer(*WRITER_ATTRIBUTES)
+    attr_reader(*SERIALIZEABLE_ATTRIBUTES)
+
     attr_reader :configuration, :request, :exception, :threads
 
     def initialize(configuration:, integration_meta: nil, message: nil)
@@ -99,9 +103,6 @@ module Sentry
       end
     end
 
-    def type
-    end
-
     def to_hash
       data = serialize_attributes
       data[:breadcrumbs] = breadcrumbs.to_hash if breadcrumbs
@@ -139,7 +140,7 @@ module Sentry
     private
 
     def serialize_attributes
-      self.class::ATTRIBUTES.each_with_object({}) do |att, memo|
+      self.class::SERIALIZEABLE_ATTRIBUTES.each_with_object({}) do |att, memo|
         if value = public_send(att)
           memo[att] = value
         end

data/lib/sentry/hub.rb

@@ -144,6 +144,17 @@ module Sentry
       current_scope.add_breadcrumb(breadcrumb)
     end
 
+    # this doesn't do anything to the already initialized background worker
+    # but it temporarily disables dispatching events to it
+    def with_background_worker_disabled(&block)
+      original_background_worker_threads = configuration.background_worker_threads
+      configuration.background_worker_threads = 0
+
+      block.call
+    ensure
+      configuration.background_worker_threads = original_background_worker_threads
+    end
+
     private
 
     def current_layer

data/lib/sentry/rake.rb

@@ -1,17 +1,31 @@
 require "rake"
 require "rake/task"
 
-module Rake
-  class Application
-    alias orig_display_error_messsage display_error_message
-    def display_error_message(ex)
-      Sentry.capture_exception(ex, hint: { background: false }) do |scope|
-        task_name = top_level_tasks.join(' ')
-        scope.set_transaction_name(task_name)
-        scope.set_tag("rake_task", task_name)
-      end if Sentry.initialized? && !Sentry.configuration.skip_rake_integration
+module Sentry
+  module Rake
+    module Application
+      def display_error_message(ex)
+        Sentry.capture_exception(ex, hint: { background: false }) do |scope|
+          task_name = top_level_tasks.join(' ')
+          scope.set_transaction_name(task_name)
+          scope.set_tag("rake_task", task_name)
+        end if Sentry.initialized? && !Sentry.configuration.skip_rake_integration
 
-      orig_display_error_messsage(ex)
+        super
+      end
+    end
+
+    module Task
+      def execute(args=nil)
+        return super unless Sentry.initialized? && Sentry.get_current_hub
+
+        Sentry.get_current_hub.with_background_worker_disabled do
+          super
+        end
+      end
     end
   end
 end
+
+Rake::Application.prepend(Sentry::Rake::Application)
+Rake::Task.prepend(Sentry::Rake::Task)

data/lib/sentry/transaction_event.rb

@@ -4,22 +4,27 @@ module Sentry
   class TransactionEvent < Event
     TYPE = "transaction"
 
-    ATTRIBUTES = %i(
+    SERIALIZEABLE_ATTRIBUTES = %i(
       event_id level timestamp start_timestamp
       release environment server_name modules
       user tags contexts extra
       transaction platform sdk type
     )
 
-    attr_accessor(*ATTRIBUTES)
+    WRITER_ATTRIBUTES = SERIALIZEABLE_ATTRIBUTES - %i(type timestamp start_timestamp level)
+
+    attr_writer(*WRITER_ATTRIBUTES)
+    attr_reader(*SERIALIZEABLE_ATTRIBUTES)
+
     attr_accessor :spans
 
-    def start_timestamp=(time)
-      @start_timestamp = time.is_a?(Time) ? time.to_f : time
+    def initialize(configuration:, integration_meta: nil, message: nil)
+      super
+      @type = TYPE
     end
 
-    def type
-      TYPE
+    def start_timestamp=(time)
+      @start_timestamp = time.is_a?(Time) ? time.to_f : time
     end
 
     def to_hash

data/lib/sentry/transport/configuration.rb

@@ -2,7 +2,8 @@ module Sentry
   class Transport
     class Configuration
       attr_accessor :timeout, :open_timeout, :proxy, :ssl, :ssl_ca_file, :ssl_verification, :http_adapter, :faraday_builder,
-        :transport_class, :encoding
+        :encoding
+      attr_reader :transport_class
 
       def initialize
         @ssl_verification = true

data/lib/sentry/version.rb

@@ -1,3 +1,3 @@
 module Sentry
-  VERSION = "4.6.1"
+  VERSION = "4.6.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sentry-ruby-core
 version: !ruby/object:Gem::Version
-  version: 4.6.1
+  version: 4.6.5
 platform: ruby
 authors:
 - Sentry Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-08 00:00:00.000000000 Z
+date: 2021-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday