dead_bro 0.2.36 → 0.2.38

data/lib/dead_bro/subscriber.rb

@@ -13,6 +13,10 @@ module DeadBro
         # drop with an excluded request) — ErrorMiddleware must not send it again.
         mark_reported(data)
 
+        # Closes the action span opened at start_processing, whether or not
+        # this request is sent.
+        DeadBro::SpanTracker.finish_action(started, finished)
+
         # When disabled remotely, fire a heartbeat at most once per minute so the gem
         # can detect when tracking has been re-enabled, then skip all tracking.
         unless DeadBro.configuration.enabled
@@ -166,7 +170,8 @@ module DeadBro
           db_runtime_ms: data[:db_runtime],
           memory_usage: memory_usage_mb,
           gc_stats: end_gc_stats,
-          sql_count: sql_count(data),
+          sql_count: sql_count(sql_queries),
+          sql_cached_count: sql_cached_count(sql_queries),
           sql_queries: sql_queries,
           transaction_events: transaction_events,
           http_outgoing: Thread.current[:dead_bro_http_events] || [],
@@ -190,6 +195,14 @@ module DeadBro
           watch_events: watch_events,
           logs: DeadBro.logger.logs
         }
+        # The span tree (see SpanTracker); the middleware spans are added when
+        # the payload is sent.
+        spans = DeadBro::SpanTracker.payload_spans
+        if spans
+          detail_fields[:spans] = spans
+          spans_dropped = DeadBro::SpanTracker.payload_spans_dropped
+          detail_fields[:spans_dropped] = spans_dropped if spans_dropped
+        end
 
         # Report exceptions attached to this action (e.g. controller/view errors)
         if data[:exception] || data[:exception_object]
@@ -222,7 +235,7 @@ module DeadBro
             )
 
             event_name = (exception_class || exception_obj&.class&.name || "exception").to_s
-            client.post_metric(event_name: event_name, payload: error_payload, force: true)
+            DeadBro::SpanTracker.post(client, event_name, error_payload, request_type_key)
           rescue
           ensure
             next
@@ -246,10 +259,12 @@ module DeadBro
           user_agent: safe_user_agent(data),
           user_id: extract_user_id(data)
         )
-        # force: true — the sampling decision (global or per-request-type) was
-        # already made above; client#post_metric must not re-roll it with the
-        # global-only rate, which would silently override a per-type sample rate.
-        client.post_metric(event_name: name, payload: payload, force: true)
+        # Sent with force: true — the sampling decision (global or
+        # per-request-type) was already made above; client#post_metric must not
+        # re-roll it with the global-only rate, which would silently override a
+        # per-type sample rate. Held until the middleware chain returns when the
+        # request runs inside one (see SpanTracker.post).
+        DeadBro::SpanTracker.post(client, name, payload, request_type_key)
       rescue *DeadBro::CONTAINED_ERRORS
         # Anything raised here would fail the host's request (see
         # DeadBro::CONTAINED_ERRORS) — drop this request's metrics instead.
@@ -472,20 +487,24 @@ module DeadBro
       {}
     end
 
-    def self.sql_count(data)
-      # Count SQL queries from the payload if available
-      if data[:sql_count]
-        data[:sql_count]
-      elsif defined?(ActiveRecord) && ActiveRecord::Base.connection
-        # Try to get from ActiveRecord connection
-        begin
-          ActiveRecord::Base.connection.query_cache.size
-        rescue
-          0
-        end
-      else
-        0
-      end
+    # Number of SQL statements run during the request, query-cache hits included
+    # (the same count as Rails' "ActiveRecord: …ms (N queries, M cached)" log
+    # line). Summed from SqlSubscriber.stop_request_tracking's per-statement
+    # aggregates, which count every query — the raw query list stops at
+    # MAX_TRACKED_QUERIES. This used to read
+    # ActiveRecord::Base.connection.query_cache.size: the number of distinct
+    # cached SELECTs, an LRU capped at 100 since Rails 7.1, so every N+1 page
+    # reported "100" — and it leased a DB connection on requests with no SQL.
+    def self.sql_count(sql_queries)
+      Array(sql_queries).sum { |agg| agg[:count].to_i }
+    rescue
+      0
+    end
+
+    # How many of sql_count were answered by the query cache, sent separately so
+    # the dashboard can tell repeated cache hits from database round trips.
+    def self.sql_cached_count(sql_queries)
+      Array(sql_queries).sum { |agg| agg[:cached_count].to_i }
     rescue
       0
     end

data/lib/dead_bro/version.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
 module DeadBro
-  VERSION = "0.2.36"
+  VERSION = "0.2.38"
 end
-

data/lib/dead_bro/watch_tracker.rb

@@ -91,6 +91,8 @@ module DeadBro
       frame[:slot] = events.length
       events << nil
       active_stack << frame
+      # The block's span in the request's span tree (nil in a job).
+      span_frame = DeadBro::SpanTracker.enter_watch(sanitized_label)
 
       begin
         yield
@@ -104,6 +106,8 @@ module DeadBro
         raise
       ensure
         active_stack.pop if active_stack.last.equal?(frame)
+        DeadBro::SpanTracker.leave_watch(span_frame)
+        frame[:span_id] = span_frame[:id] if span_frame.is_a?(Hash)
         append_completed_span(events, frame)
       end
     end
@@ -178,6 +182,7 @@ module DeadBro
         error: frame[:error] == true
       }
       span[:exception_class] = frame[:exception_class] if frame[:exception_class]
+      span[:span_id] = frame[:span_id] if frame[:span_id]
       tags = frame[:tags]
       span[:tags] = tags if tags.is_a?(Hash) && tags.any?
 

data/lib/dead_bro.rb

@@ -30,6 +30,8 @@ module DeadBro
   autoload :MemoryDetails, "dead_bro/memory_details"
   autoload :Logger, "dead_bro/logger"
   autoload :WatchTracker, "dead_bro/watch_tracker"
+  autoload :SpanTracker, "dead_bro/span_tracker"
+  autoload :MiddlewareProbe, "dead_bro/middleware_probe"
   autoload :Sanitizer, "dead_bro/sanitizer"
   begin
     require "dead_bro/railtie"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dead_bro
 version: !ruby/object:Gem::Version
-  version: 0.2.36
+  version: 0.2.38
 platform: ruby
 authors:
 - Emanuel Comsa
@@ -51,10 +51,12 @@ files:
 - lib/dead_bro/memory_leak_detector.rb
 - lib/dead_bro/memory_phase_tracker.rb
 - lib/dead_bro/memory_tracking_subscriber.rb
+- lib/dead_bro/middleware_probe.rb
 - lib/dead_bro/monitor.rb
 - lib/dead_bro/railtie.rb
 - lib/dead_bro/redis_subscriber.rb
 - lib/dead_bro/sanitizer.rb
+- lib/dead_bro/span_tracker.rb
 - lib/dead_bro/sql_subscriber.rb
 - lib/dead_bro/sql_tracking_middleware.rb
 - lib/dead_bro/subscriber.rb