sentry-ruby 7.0.0 → 7.1.0

data/lib/sentry/threaded_periodic_worker.rb

@@ -4,41 +4,118 @@ module Sentry
   class ThreadedPeriodicWorker
     include LoggingHelper
 
+    # @!visibility private
+    attr_reader :thread, :thread_mutex, :idle_condition
+
     def initialize(sdk_logger, interval)
+      @process_id = Process.pid
       @thread = nil
       @exited = false
       @interval = interval
       @sdk_logger = sdk_logger
+
+      @thread_mutex = Mutex.new
+      @wake_condition = ConditionVariable.new
+      @idle_condition = ConditionVariable.new
+
+      @woken = false
+      @running = false
     end
 
     def ensure_thread
-      return false if @exited
-      return true if @thread&.alive?
+      reset_if_forked
 
-      @thread = Thread.new do
-        loop do
-          sleep(@interval)
-          run
-        end
-      end
+      @thread_mutex.synchronize do
+        return false if @exited
+        return true if @thread&.alive?
 
-      true
+        @thread = Thread.new { worker_loop }
+
+        true
+      end
     rescue ThreadError
+      @thread_mutex.synchronize { @exited = true }
       log_debug("[#{self.class.name}] thread creation failed")
-      @exited = true
       false
     end
 
+    def wake
+      @thread_mutex.synchronize do
+        next false if @exited
+
+        @woken = true
+        @wake_condition.signal
+        true
+      end
+    end
+
+    def wait_until_idle(timeout = nil)
+      deadline = Process.clock_gettime(Process::CLOCK_MONOTONIC) + timeout if timeout
+
+      @thread_mutex.synchronize do
+        while !@exited && (@running || @woken)
+          remaining = deadline - Process.clock_gettime(Process::CLOCK_MONOTONIC) if deadline
+          return false if remaining && remaining <= 0
+
+          @idle_condition.wait(@thread_mutex, remaining)
+        end
+
+        true
+      end
+    end
+
     def kill
-      @exited = true
+      thread = @thread_mutex.synchronize do
+        @exited = true
+        @woken = false
+        @idle_condition.broadcast
+        @thread
+      end
 
       # Only a started worker has a thread to kill (and to log about).
       # Guarding here keeps a never-started worker's teardown silent, so
       # killing one during test reset can't emit a stray debug line.
-      return unless @thread
+      return unless thread
 
       log_debug("[#{self.class.name}] thread killed")
-      @thread.kill
+      thread.kill
+    end
+
+    private
+
+    def reset_if_forked
+      return false if @process_id == Process.pid
+
+      @process_id = Process.pid
+      @thread = nil
+      @exited = false
+      @woken = false
+      @running = false
+      @thread_mutex = Mutex.new
+      @wake_condition = ConditionVariable.new
+      @idle_condition = ConditionVariable.new
+      true
+    end
+
+    def worker_loop
+      loop do
+        @thread_mutex.synchronize do
+          @wake_condition.wait(@thread_mutex, @interval) unless @woken
+          @woken = false
+          @running = true
+        end
+
+        begin
+          run
+        rescue Exception => e
+          log_error("[#{self.class.name}] run failed", e)
+        ensure
+          @thread_mutex.synchronize do
+            @running = false
+            @idle_condition.broadcast
+          end
+        end
+      end
     end
   end
 end

data/lib/sentry/transaction.rb

@@ -14,6 +14,7 @@ module Sentry
     SOURCES = %i[custom url route view component task]
 
     include LoggingHelper
+    include CallbackHelper
 
     # The name of the transaction.
     # @return [String]
@@ -142,7 +143,12 @@ module Sentry
 
       sample_rate =
         if configuration.traces_sampler.is_a?(Proc)
-          configuration.traces_sampler.call(sampling_context)
+          safe_dispatch_callback(
+            "traces_sampler",
+            configuration.traces_sampler,
+            [sampling_context],
+            fallback: configuration.traces_sample_rate
+          )
         elsif !sampling_context[:parent_sampled].nil?
           sampling_context[:parent_sampled]
         else

data/lib/sentry/utils/callback_helper.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Sentry
+  # @private
+  module CallbackHelper
+    # @!visibility private
+    def safe_dispatch_callback(callback_name, callback, args, fallback: nil)
+      callback.call(*args)
+    rescue => e
+      log_callback_error(callback_name, e)
+      fallback
+    end
+
+    private
+
+    def log_callback_error(callback_name, exception)
+      return unless Sentry.initialized?
+
+      message = "Error in #{callback_name} callback: #{exception.message}"
+      message += "\n#{exception.backtrace.join("\n")}" if Sentry.configuration.debug && exception.backtrace
+
+      Sentry.sdk_logger.error(LOGGER_PROGNAME) { message }
+    rescue StandardError
+      # Callback error reporting must not propagate to the application.
+    end
+  end
+end

data/lib/sentry/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Sentry
-  VERSION = "7.0.0"
+  VERSION = "7.1.0"
 end

data/lib/sentry-ruby.rb

@@ -10,6 +10,7 @@ require "sentry/core_ext/object/deep_dup"
 require "sentry/utils/argument_checking_helper"
 require "sentry/utils/encoding_helper"
 require "sentry/utils/logging_helper"
+require "sentry/utils/callback_helper"
 require "sentry/utils/sample_rand"
 require "sentry/configuration"
 require "sentry/structured_logger"
@@ -300,6 +301,8 @@ module Sentry
       if client = get_current_client
         client.configuration.run_after_close_callbacks
         client.flush
+        client.log_event_buffer.kill
+        client.metric_event_buffer.kill
 
         if client.configuration.data_collection.collect_stack_frame_variables?
           exception_locals_tp.disable

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sentry-ruby
 version: !ruby/object:Gem::Version
-  version: 7.0.0
+  version: 7.1.0
 platform: ruby
 authors:
 - Sentry Team
@@ -185,6 +185,7 @@ files:
 - lib/sentry/transport/http_transport.rb
 - lib/sentry/transport/spotlight_transport.rb
 - lib/sentry/utils/argument_checking_helper.rb
+- lib/sentry/utils/callback_helper.rb
 - lib/sentry/utils/custom_inspection.rb
 - lib/sentry/utils/encoding_helper.rb
 - lib/sentry/utils/env_helper.rb
@@ -202,15 +203,15 @@ files:
 - lib/sentry/version.rb
 - sentry-ruby-core.gemspec
 - sentry-ruby.gemspec
-homepage: https://github.com/getsentry/sentry-ruby/tree/7.0.0/sentry-ruby
+homepage: https://github.com/getsentry/sentry-ruby/tree/7.1.0/sentry-ruby
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://github.com/getsentry/sentry-ruby/tree/7.0.0/sentry-ruby
-  source_code_uri: https://github.com/getsentry/sentry-ruby/tree/7.0.0/sentry-ruby
-  changelog_uri: https://github.com/getsentry/sentry-ruby/blob/7.0.0/CHANGELOG.md
+  homepage_uri: https://github.com/getsentry/sentry-ruby/tree/7.1.0/sentry-ruby
+  source_code_uri: https://github.com/getsentry/sentry-ruby/tree/7.1.0/sentry-ruby
+  changelog_uri: https://github.com/getsentry/sentry-ruby/blob/7.1.0/CHANGELOG.md
   bug_tracker_uri: https://github.com/getsentry/sentry-ruby/issues
-  documentation_uri: http://www.rubydoc.info/gems/sentry-ruby/7.0.0
+  documentation_uri: http://www.rubydoc.info/gems/sentry-ruby/7.1.0
 rdoc_options: []
 require_paths:
 - lib