sentry-ruby-core 4.6.0 → 4.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfe5056c156c748700100bc8c0a08188547f04ef0c09d7ee7653c084407e294e
-  data.tar.gz: 63562591edc3eb48be9e0cf22ab17a3787a5ee91784978252dd67dd050128abe
+  metadata.gz: 442dc8b92f82ac1873cc066b8188d49ad4673425c2833416b5262c8076e4a13d
+  data.tar.gz: 1c7b5d1d49ebc37da4cd3b524b50e0d50b1e7152cbbeb8f712603a57ceeac53c
 SHA512:
-  metadata.gz: 777e2a93032b22c039dec36aa8eb859de7169a0cb438d3204bb7620a0e290ff8a4b747c196ff093008d2fe61f066cf6368d8bddda2fba9e7127ec4985ca1968a
-  data.tar.gz: 35bb4ff5ab8d01fbd1d2882b2e3f0382a24248bca2e3b3a2be80a2e80c8fea6d5e10316b9c8962407e43f72a84cae3f201c8dadf4f80526cd584d9c238aa47a1
+  metadata.gz: e5f3aa0e7950fff974c056ac389218d68677804b590e1d94bac250070130630915d72905df42d88d6beb434912f893c3a86a6e0a734c8f6b7e6b91ae44d813e2
+  data.tar.gz: d5f973ca005648a658c71e2c2e2a336bf68f7511b856147b4f8bcacd6234bf6d950e37d97af422dfc0c730f75e57e0e7a1ec41e2c819ed6cb222a811494d55e1

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/utils/real_ip.rb

@@ -29,7 +29,13 @@ module Sentry
         @client_ip = client_ip
         @real_ip = real_ip
         @forwarded_for = forwarded_for
-        @trusted_proxies = (LOCAL_ADDRESSES + Array(trusted_proxies)).map { |proxy| IPAddr.new(proxy.to_s) }.uniq
+        @trusted_proxies = (LOCAL_ADDRESSES + Array(trusted_proxies)).map do |proxy|
+          if proxy.is_a?(IPAddr)
+            proxy
+          else
+            IPAddr.new(proxy.to_s)
+          end
+        end.uniq
       end
 
       def calculate_ip

data/lib/sentry/version.rb

@@ -1,3 +1,3 @@
 module Sentry
-  VERSION = "4.6.0"
+  VERSION = "4.6.4"
 end

metadata

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