sentry-ruby 7.0.0 → 7.1.0

data/gemfiles/ruby-jruby-9.4.14.0_rack-3_redis-4.gemfile.lock

@@ -6,7 +6,7 @@ GIT
 PATH
   remote: ..
   specs:
-    sentry-ruby (6.7.0)
+    sentry-ruby (7.0.0)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
       logger
@@ -48,7 +48,7 @@ GEM
     benchmark-memory (0.1.2)
       memory_profiler (~> 0.9)
     benchmark_driver (0.16.5)
-    bigdecimal (4.1.2-java)
+    bigdecimal (4.1.3-java)
     cgi (0.5.2-java)
     concurrent-ruby (1.3.8)
     connection_pool (2.5.5)
@@ -63,30 +63,30 @@ GEM
       cgi (>= 0.3.3)
     excon (1.6.0)
       logger
-    faraday (2.14.3)
+    faraday (2.14.4)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
     faraday-net_http (3.4.4)
       net-http (~> 0.5)
     fiber-storage (1.0.1)
-    graphql (2.6.9)
+    graphql (2.6.10)
       base64
       fiber-storage
       logger
     hashdiff (1.2.1)
     i18n (1.15.2)
       concurrent-ruby (~> 1.0)
-    io-console (0.9.2-java)
+    io-console (0.9.4-java)
     irb (1.18.0)
       pp (>= 0.6.0)
       prism (>= 1.3.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
-    jar-dependencies (0.5.7)
+    jar-dependencies (0.6.1-java)
     jdbc-mysql (8.4.0.1)
     jdbc-sqlite3 (3.46.1.1)
-    json (2.21.2-java)
+    json (3.0.2-java)
     logger (1.7.0)
     memory_profiler (0.9.14)
     minitest (5.27.0)
@@ -129,7 +129,7 @@ GEM
       rspec-core (> 3.3)
     rspec-support (3.13.7)
     securerandom (0.4.1)
-    sequel (5.107.0)
+    sequel (5.108.0)
       bigdecimal
     simplecov (0.22.0)
       docile (~> 1.1)
@@ -146,7 +146,7 @@ GEM
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     uri (1.1.1)
-    webmock (3.26.3)
+    webmock (3.26.4)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -200,7 +200,7 @@ CHECKSUMS
   benchmark-ipsa (0.2.0) sha256=8be4820765d575691b2f91f6c988a8a3d90393239bf9d35ea53c8ab0fbca7230
   benchmark-memory (0.1.2) sha256=aa7bfe6776174d0ddefe6fb39945d88fff6d76eac165690188391d9acd441c87
   benchmark_driver (0.16.5) sha256=f675df0fe1de7e18e40df313ae24ebe4c7ee7814a4165f29a1a37b863a685831
-  bigdecimal (4.1.2-java) sha256=ccc836eab720a525529f70ed0de26a206fdbc9a9e8ac67b3b4ac7318b03e114d
+  bigdecimal (4.1.3-java) sha256=9a6a1fa67723a27ab1b3a6d5526322d8c82170af03199da7c915b8d9a1770532
   cgi (0.5.2-java) sha256=08bbfe06e10e771d36f10db6c1dfb81727ea2a25c3dbcd28d890a1794414a73d
   concurrent-ruby (1.3.8) sha256=b2f1be836e968ccc78ccfce277ea79c72a88633f22306782c16ff23fb415d1e1
   connection_pool (2.5.5) sha256=e54ff92855753df1fd7c59fa04a398833355f27dd14c074f8c83a05f72a716ad
@@ -211,18 +211,18 @@ CHECKSUMS
   drb (2.2.3) sha256=0b00d6fdb50995fe4a45dea13663493c841112e4068656854646f418fda13373
   erb (4.0.4.1-java) sha256=3e4805edebd25f48cdb43ad4ebf1d61c11538f29373f0a48716b688819e3f7ce
   excon (1.6.0) sha256=ebe2ab83c055ef8e117c62c91a3535b966a59a64868188219d49ab90cd83b65f
-  faraday (2.14.3) sha256=1882247e6766615c8220b4392bf1d27f6ebb63d8e28267587cef1fb0bf37f278
+  faraday (2.14.4) sha256=9bb4408c44621b0dbaaaa39e5dbfc4dbe58cc6751b6eb94d16ae9e1f2f2fab6e
   faraday-net_http (3.4.4) sha256=0e78af151747ed1b00f33e25973b4bc220d7f16c00c39676817c8b12331eb588
   fiber-storage (1.0.1) sha256=f48e5b6d8b0be96dac486332b55cee82240057065dc761c1ea692b2e719240e1
-  graphql (2.6.9) sha256=afe7bc03164f1a61abc66a415744ffd315c5aca116c9f3438c57391a431e4fe5
+  graphql (2.6.10) sha256=9b7c8633767f516ff9d48a8d6305b2a00a2101c82aa871b92e69086944f9f83e
   hashdiff (1.2.1) sha256=9c079dbc513dfc8833ab59c0c2d8f230fa28499cc5efb4b8dd276cf931457cd1
   i18n (1.15.2) sha256=00f9eb62412fe593b2a65a97daa75300d37abb8f7202ec748e94b6d46a9dd1b5
-  io-console (0.9.2-java) sha256=929c09163ad227cda17f5dc57861b995dbecf69c7ca2ce7b0c5f941f1f3da7d3
+  io-console (0.9.4-java) sha256=789188c38b937fc2d04400e35fd3b2838ffdf061e846571e51524036bc1bc185
   irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3
-  jar-dependencies (0.5.7) sha256=013ce5f4639414ac8cf1169cdbe763da164b81e2d2c983d11042b5ff7bfcce80
+  jar-dependencies (0.6.1-java) sha256=2746643482d139fd9cecb524b57df63b71d9b5d734c7275171701201e3164f23
   jdbc-mysql (8.4.0.1) sha256=429cb7999d11c4f46a7153a382b6ac07935a4c10ddc52dd98e2d52b22c17fa13
   jdbc-sqlite3 (3.46.1.1) sha256=2498fea7d37c0d51c6bad1b95ffc909173c014ba6bd36825f37910113d0230cf
-  json (2.21.2-java) sha256=f01521cd90639cc26b63040fb00d2b949f18f41ecaab5c82b02fb31d0b8b736c
+  json (3.0.2-java) sha256=2afafb9c82faabfb60ed2f37707973fdcb766dba2c99f0b9ed85f073d1d4c3d0
   logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203
   memory_profiler (0.9.14) sha256=de558cf6525d8d56d2c0ea465b1664517fbe45560f892dc7a898d3b8c2863b12
   minitest (5.27.0) sha256=2d3b17f8a36fe7801c1adcffdbc38233b938eb0b4966e97a6739055a45fa77d5
@@ -247,8 +247,8 @@ CHECKSUMS
   rspec-retry (0.6.2) sha256=6101ba23a38809811ae3484acde4ab481c54d846ac66d5037ccb40131a60d858
   rspec-support (3.13.7) sha256=0640e5570872aafefd79867901deeeeb40b0c9875a36b983d85f54fb7381c47c
   securerandom (0.4.1) sha256=cc5193d414a4341b6e225f0cb4446aceca8e50d5e1888743fac16987638ea0b1
-  sentry-ruby (6.7.0)
-  sequel (5.107.0) sha256=019629313205295b007f6df2c5eab19ddc40710d549fd445ac300f2853a370db
+  sentry-ruby (7.0.0)
+  sequel (5.108.0) sha256=ae5996d1196775427916a2fa36e02f99762ead9affb8ea9b1aec2c0b16bdb3a3
   simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5
   simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740
   simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246
@@ -258,7 +258,7 @@ CHECKSUMS
   tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f
   tzinfo (2.0.6) sha256=8daf828cc77bcf7d63b0e3bdb6caa47e2272dcfaf4fbfe46f8c3a9df087a829b
   uri (1.1.1) sha256=379fa58d27ffb1387eaada68c749d1426738bd0f654d812fcc07e7568f5c57c6
-  webmock (3.26.3) sha256=77c612816bdcb2fc43db0e42fd98b19be7d4770fd708816fdde65a006664ddec
+  webmock (3.26.4) sha256=8d8da206d217ebe6968cfb09c77f4533c23074e1432bad865f3994eacbaad50d
   webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131
   yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51
 

data/lib/sentry/backtrace.rb

@@ -7,6 +7,8 @@ require "sentry/backtrace/line"
 module Sentry
   # @api private
   class Backtrace
+    extend CallbackHelper
+
     # holder for an Array of Backtrace::Line instances
     attr_reader :lines
 
@@ -15,7 +17,14 @@ module Sentry
     def self.parse(backtrace, project_root, app_dirs_pattern, in_app_pattern: nil, &backtrace_cleanup_callback)
       ruby_lines = backtrace.is_a?(Array) ? backtrace : backtrace.split(/\n\s*/)
 
-      ruby_lines = backtrace_cleanup_callback.call(ruby_lines) if backtrace_cleanup_callback
+      if backtrace_cleanup_callback
+        ruby_lines = safe_dispatch_callback(
+          "backtrace_cleanup_callback",
+          backtrace_cleanup_callback,
+          [ruby_lines],
+          fallback: ruby_lines
+        )
+      end
 
       # in_app_pattern is now passed in from StacktraceBuilder, so this regex won't be triggered
       # only here for backwards compat and will be deleted

data/lib/sentry/client.rb

@@ -11,6 +11,7 @@ require "sentry/utils/encoding_helper"
 module Sentry
   class Client
     include LoggingHelper
+    include CallbackHelper
 
     # The Transport object that'll send events for the client.
     # @return [Transport]
@@ -89,7 +90,7 @@ module Sentry
           transport.record_lost_event(:queue_overflow, "span", num: spans_before + 1) if is_transaction
         end
       else
-        send_event(event, hint)
+        event = send_event(event, hint)
       end
 
       event
@@ -129,8 +130,8 @@ module Sentry
     def flush
       transport.flush if configuration.sending_to_dsn_allowed?
       spotlight_transport.flush if spotlight_transport
-      @log_event_buffer&.flush
-      @metric_event_buffer&.flush
+      @log_event_buffer.flush
+      @metric_event_buffer.flush
     end
 
     # Initializes an Event object with the given exception. Returns `nil` if the exception's class is excluded from reporting.
@@ -237,7 +238,11 @@ module Sentry
       spans_before = event.is_a?(TransactionEvent) ? event.spans.size : 0
 
       if event.is_a?(ErrorEvent) && configuration.before_send
-        event = configuration.before_send.call(event, hint)
+        event = safe_dispatch_callback(
+          "before_send",
+          configuration.before_send,
+          [event, hint]
+        )
 
         if !event.is_a?(ErrorEvent)
           # Avoid serializing the event object in this case because we aren't sure what it is and what it contains
@@ -250,7 +255,11 @@ module Sentry
       end
 
       if event.is_a?(TransactionEvent) && configuration.before_send_transaction
-        event = configuration.before_send_transaction.call(event, hint)
+        event = safe_dispatch_callback(
+          "before_send_transaction",
+          configuration.before_send_transaction,
+          [event, hint]
+        )
 
         if !event.is_a?(TransactionEvent)
           # Avoid serializing the event object in this case because we aren't sure what it is and what it contains
@@ -268,7 +277,11 @@ module Sentry
       end
 
       if event.is_a?(CheckInEvent) && configuration.before_send_check_in
-        event = configuration.before_send_check_in.call(event, hint)
+        event = safe_dispatch_callback(
+          "before_send_check_in",
+          configuration.before_send_check_in,
+          [event, hint]
+        )
 
         if !event.is_a?(CheckInEvent)
           # Avoid serializing the event object in this case because we aren't sure what it is and what it contains

data/lib/sentry/configuration.rb

@@ -442,7 +442,7 @@ module Sentry
       SERVER_PORT
     ].freeze
 
-    TRACE_IGNORE_STATUS_CODES_DEFAULT = [(301..303), (305..399), (401..404)]
+    TRACE_IGNORE_STATUS_CODES_DEFAULT = [301, (305..399), (401..404)]
 
     HEROKU_DYNO_METADATA_MESSAGE = "You are running on Heroku but haven't enabled Dyno Metadata. For Sentry's "\
     "release detection to work correctly, please run `heroku labs:enable runtime-dyno-metadata`"

data/lib/sentry/faraday.rb

@@ -14,10 +14,13 @@ module Sentry
 
         # Ensure that we attach instrumentation only if the adapter is not net/http
         # because if is is, then the net/http instrumentation will take care of it
-        if builder.adapter.name != "Faraday::Adapter::NetHttp"
+        if builder.adapter.name != "Faraday::Adapter::NetHttp" &&
+            !builder.locked? &&
+            !builder.instance_variable_defined?(:@sentry_patched)
           # Make sure that it's going to be the first middleware so that it can capture
           # the entire request processing involving other middlewares
           builder.insert(0, ::Faraday::Request::Instrumentation, name: OP_NAME, instrumenter: Instrumenter.new)
+          builder.instance_variable_set(:@sentry_patched, true)
         end
       end
     end

data/lib/sentry/hub.rb

@@ -7,6 +7,7 @@ require "sentry/session"
 module Sentry
   class Hub
     include ArgumentCheckingHelper
+    include CallbackHelper
 
     MUTEX = Mutex.new
 
@@ -240,8 +241,9 @@ module Sentry
     # @param value [Numeric] the metric value
     # @param unit [String, nil] (optional) the metric unit
     # @param attributes [Hash, nil] (optional) additional attributes for the metric
+    # @param integration [String, Symbol, nil] (optional) registered integration emitting the metric
     # @return [void]
-    def capture_metric(name:, type:, value:, unit: nil, attributes: nil)
+    def capture_metric(name:, type:, value:, unit: nil, attributes: nil, integration: nil)
       return unless current_client
 
       metric = MetricEvent.new(
@@ -250,6 +252,7 @@ module Sentry
         type: type,
         unit: unit,
         attributes: attributes&.dup,
+        integration_meta: Sentry.integrations[integration.to_s]
       )
 
       current_client.buffer_metric_event(metric, current_scope)
@@ -294,7 +297,11 @@ module Sentry
       return unless configuration.enabled_in_current_env?
 
       if before_breadcrumb = current_client.configuration.before_breadcrumb
-        breadcrumb = before_breadcrumb.call(breadcrumb, hint)
+        breadcrumb = safe_dispatch_callback(
+          "before_breadcrumb",
+          before_breadcrumb,
+          [breadcrumb, hint]
+        )
       end
 
       return unless breadcrumb

data/lib/sentry/integrable.rb

@@ -32,5 +32,17 @@ module Sentry
       options[:hint][:integration] = integration_name
       Sentry.capture_check_in(slug, status, **options, &block)
     end
+
+    def count(name, value: 1, attributes: nil)
+      Sentry.metrics.count(name, value: value, attributes: attributes, integration: integration_name)
+    end
+
+    def gauge(name, value, unit: nil, attributes: nil)
+      Sentry.metrics.gauge(name, value, unit: unit, attributes: attributes, integration: integration_name)
+    end
+
+    def distribution(name, value, unit: nil, attributes: nil)
+      Sentry.metrics.distribution(name, value, unit: unit, attributes: attributes, integration: integration_name)
+    end
   end
 end

data/lib/sentry/log_event_buffer.rb

@@ -21,7 +21,7 @@ module Sentry
         max_items_before_drop: MAX_EVENTS_BEFORE_DROP,
         envelope_type: "log",
         envelope_content_type: "application/vnd.sentry.items.log+json",
-        before_send: configuration.before_send_log
+        before_send: :before_send_log
       )
     end
   end

data/lib/sentry/metric_event.rb

@@ -6,7 +6,7 @@ module Sentry
   class MetricEvent
     include Sentry::Utils::TelemetryAttributes
 
-    attr_reader :name, :type, :value, :unit, :timestamp, :trace_id, :span_id, :attributes
+    attr_reader :name, :type, :value, :unit, :timestamp, :trace_id, :span_id, :attributes, :integration_meta
     attr_writer :trace_id, :span_id, :attributes
 
     def initialize(
@@ -14,13 +14,15 @@ module Sentry
       type:,
       value:,
       unit: nil,
-      attributes: nil
+      attributes: nil,
+      integration_meta: nil
     )
       @name = name
       @type = type
       @value = value
       @unit = unit
       @attributes = attributes || {}
+      @integration_meta = integration_meta
 
       @timestamp = Sentry.utc_now
       @trace_id = nil

data/lib/sentry/metric_event_buffer.rb

@@ -21,7 +21,7 @@ module Sentry
         max_items_before_drop: MAX_METRICS_BEFORE_DROP,
         envelope_type: "trace_metric",
         envelope_content_type: "application/vnd.sentry.items.trace-metric+json",
-        before_send: configuration.before_send_metric
+        before_send: :before_send_metric
       )
     end
   end

data/lib/sentry/metrics.rb

@@ -9,15 +9,17 @@ module Sentry
       # @param name [String] the metric name
       # @param value [Numeric] the value to increment by (default: 1)
       # @param attributes [Hash, nil] additional attributes for the metric (optional)
+      # @param integration [String, Symbol, nil] registered integration emitting the metric (optional)
       # @return [void]
-      def count(name, value: 1, attributes: nil)
+      def count(name, value: 1, attributes: nil, integration: nil)
         return unless Sentry.initialized?
 
         Sentry.get_current_hub.capture_metric(
           name: name,
           type: :counter,
           value: value,
-          attributes: attributes
+          attributes: attributes,
+          integration: integration
         )
       end
 
@@ -26,8 +28,9 @@ module Sentry
       # @param value [Numeric] the gauge value
       # @param unit [String, nil] the metric unit (optional)
       # @param attributes [Hash, nil] additional attributes for the metric (optional)
+      # @param integration [String, Symbol, nil] registered integration emitting the metric (optional)
       # @return [void]
-      def gauge(name, value, unit: nil, attributes: nil)
+      def gauge(name, value, unit: nil, attributes: nil, integration: nil)
         return unless Sentry.initialized?
 
         Sentry.get_current_hub.capture_metric(
@@ -35,7 +38,8 @@ module Sentry
           type: :gauge,
           value: value,
           unit: unit,
-          attributes: attributes
+          attributes: attributes,
+          integration: integration
         )
       end
 
@@ -44,8 +48,9 @@ module Sentry
       # @param value [Numeric] the distribution value
       # @param unit [String, nil] the metric unit (optional)
       # @param attributes [Hash, nil] additional attributes for the metric (optional)
+      # @param integration [String, Symbol, nil] registered integration emitting the metric (optional)
       # @return [void]
-      def distribution(name, value, unit: nil, attributes: nil)
+      def distribution(name, value, unit: nil, attributes: nil, integration: nil)
         return unless Sentry.initialized?
 
         Sentry.get_current_hub.capture_metric(
@@ -53,7 +58,8 @@ module Sentry
           type: :distribution,
           value: value,
           unit: unit,
-          attributes: attributes
+          attributes: attributes,
+          integration: integration
         )
       end
     end

data/lib/sentry/scope.rb

@@ -9,6 +9,7 @@ require "etc"
 module Sentry
   class Scope
     include ArgumentCheckingHelper
+    include CallbackHelper
 
     ATTRIBUTES = [
       :transaction_name,
@@ -71,7 +72,8 @@ module Sentry
 
       unless all_event_processors.empty?
         all_event_processors.each do |processor_block|
-          event = processor_block.call(event, hint)
+          event = safe_dispatch_callback("event_processor", processor_block, [event, hint])
+          return unless event
         end
       end
 
@@ -102,8 +104,10 @@ module Sentry
       configuration = Sentry.configuration
       return telemetry unless configuration
 
-      telemetry.attributes["sentry.sdk.name"] ||= Sentry.sdk_meta["name"]
-      telemetry.attributes["sentry.sdk.version"] ||= Sentry.sdk_meta["version"]
+      sdk_meta = telemetry.respond_to?(:integration_meta) ? telemetry.integration_meta : nil
+      sdk_meta ||= Sentry.sdk_meta
+      telemetry.attributes["sentry.sdk.name"] ||= sdk_meta[:name] || sdk_meta["name"]
+      telemetry.attributes["sentry.sdk.version"] ||= sdk_meta[:version] || sdk_meta["version"]
       telemetry.attributes["sentry.environment"] ||= configuration.environment if configuration.environment
       telemetry.attributes["sentry.release"] ||= configuration.release if configuration.release
       telemetry.attributes["server.address"] ||= configuration.server_name if configuration.server_name

data/lib/sentry/session_flusher.rb

@@ -35,6 +35,13 @@ module Sentry
 
     private
 
+    def reset_if_forked
+      return unless super
+
+      @mutex = Mutex.new
+      @pending_aggregates = {}
+    end
+
     def init_aggregates(aggregation_key)
       aggregates = { started: aggregation_key.iso8601 }
       Session::AGGREGATE_STATUSES.each { |k| aggregates[k] = 0 }

data/lib/sentry/std_lib_logger.rb

@@ -4,6 +4,8 @@ module Sentry
   # Ruby Logger support Add commentMore actions
   # intercepts any logger instance and send the log to Sentry too.
   module StdLibLogger
+    include CallbackHelper
+
     SEVERITY_MAP = {
       0 => :debug,
       1 => :info,
@@ -37,8 +39,12 @@ module Sentry
         message = message.to_s.strip
 
         if !message.nil? && message != Sentry::Logger::PROGNAME && method = SEVERITY_MAP[severity]
-          if (filter = Sentry.configuration.std_lib_logger_filter) && !filter.call(self, message, method)
-            return result
+          if filter = Sentry.configuration.std_lib_logger_filter
+            return result unless safe_dispatch_callback(
+              "std_lib_logger_filter",
+              filter,
+              [self, message, method]
+            )
           end
 
           Sentry.logger.send(method, message, origin: ORIGIN)

data/lib/sentry/telemetry_event_buffer.rb

@@ -12,7 +12,10 @@ module Sentry
   #
   # @!visibility private
   class TelemetryEventBuffer < ThreadedPeriodicWorker
+    include CallbackHelper
+
     FLUSH_INTERVAL = 5 # seconds
+    FLUSH_TIMEOUT = 2 # seconds
 
     # @!visibility private
     attr_reader :pending_items, :envelope_type, :data_category, :thread
@@ -21,6 +24,7 @@ module Sentry
       super(configuration.sdk_logger, FLUSH_INTERVAL)
 
       @client = client
+      @configuration = configuration
       @dsn = configuration.dsn
       @debug = configuration.debug
       @event_class = event_class
@@ -38,39 +42,44 @@ module Sentry
     end
 
     def flush
-      @mutex.synchronize do
-        return if empty?
-
-        log_debug("[#{self.class}] flushing #{size} #{@event_class}")
+      return unless thread&.alive? && wake
 
-        send_items
-      end
+      wait_until_idle(FLUSH_TIMEOUT)
+    end
 
-      self
+    def run
+      flush_pending_items
     end
-    alias_method :run, :flush
 
     def add_item(item)
+      # the buffer thread can never add telemetry itself to prevent recursion
+      return self if Thread.current == thread
+      return unless ensure_thread
+
       # Prevent ThreadError from re-entrant locking (e.g. transport instrumentation calling Sentry.metrics.*)
       return self if @mutex.owned?
 
-      @mutex.synchronize do
-        return unless ensure_thread
-
+      dropped = false
+      size_exceeded = @mutex.synchronize do
         if size >= @max_items_before_drop
-          log_debug("[#{self.class}] exceeded max capacity, dropping event")
-          @client.transport.record_lost_event(
-            :queue_overflow,
-            @data_category,
-            num_bytes: JSON.generate(item.to_h).bytesize
-          )
+          dropped = true
         else
           @pending_items << item
         end
 
-        send_items if size >= @max_items
+        size >= @max_items
+      end
+
+      if dropped
+        log_debug("[#{self.class}] exceeded max capacity, dropping event")
+        @client.transport.record_lost_event(
+          :queue_overflow,
+          @data_category,
+          num_bytes: JSON.generate(item.to_h).bytesize
+        )
       end
 
+      wake if size_exceeded
       self
     end
 
@@ -88,21 +97,40 @@ module Sentry
 
     private
 
-    def send_items
-      envelope = Envelope.new(
-        event_id: Sentry::Utils.uuid,
-        sent_at: Sentry.utc_now.iso8601,
-        dsn: @dsn,
-        sdk: Sentry.sdk_meta
-      )
+    def reset_if_forked
+      return unless super
+
+      # Discard items inherited from the parent to avoid duplicate delivery.
+      @mutex = Mutex.new
+      @pending_items = []
+    end
+
+    def flush_pending_items
+      pending_items = @mutex.synchronize do
+        next if @pending_items.empty?
+
+        items = @pending_items
+        @pending_items = []
+        items
+      end
+
+      return unless pending_items
+
+      log_debug("[#{self.class}] flushing #{pending_items.size} #{@event_class}")
+      send_items(pending_items)
+      self
+    end
+
+    def send_items(pending_items)
+      envelope = Envelope.new(sent_at: Sentry.utc_now.iso8601)
 
       discarded_count = 0
       discarded_bytes = 0
       envelope_items = []
 
-      if @before_send
-        @pending_items.each do |item|
-          processed_item = @before_send.call(item)
+      if callback = @configuration.send(@before_send)
+        pending_items.each do |item|
+          processed_item = safe_dispatch_callback(@before_send.to_s, callback, [item])
 
           if processed_item
             envelope_items << processed_item.to_h
@@ -112,7 +140,7 @@ module Sentry
           end
         end
       else
-        envelope_items = @pending_items.map(&:to_h)
+        envelope_items = pending_items.map(&:to_h)
       end
 
       unless discarded_count.zero?
@@ -133,8 +161,6 @@ module Sentry
       @client.send_envelope(envelope)
     rescue => e
       log_error("[#{self.class}] Failed to send #{@event_class}", e, debug: @debug)
-    ensure
-      clear!
     end
   end
 end

data/lib/sentry/test_helper.rb

@@ -127,6 +127,8 @@ module Sentry
     end
 
     def sentry_logs
+      Sentry.get_current_client&.log_event_buffer&.flush
+
       sentry_envelopes
         .flat_map(&:items)
         .select { |item| item.headers[:type] == "log" }
@@ -134,6 +136,8 @@ module Sentry
     end
 
     def sentry_metrics
+      Sentry.get_current_client&.metric_event_buffer&.flush
+
       sentry_envelopes
         .flat_map(&:items)
         .select { |item| item.headers[:type] == "trace_metric" }