dead_bro 0.2.21 → 0.2.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96a0bc8cf707ea8af5d3bcd0be76fa02e28d09031c8a7897a311754cda8f7440
-  data.tar.gz: 4a1407455415636db2858a28f0f77a8bb530d45fa916a359f85ae22f5f4294bb
+  metadata.gz: 14aa1509e04c9bf1848883cc5f2a12e7783e5ac4c123c9bcddde301948e30bfb
+  data.tar.gz: b3ec01b52a1e63efda701520a014f040fff96cedcbf36fe0827f4a7e892aac90
 SHA512:
-  metadata.gz: 493d8d79e5eedd0d0443ddc3922ace02ed2f606220e7cff07e07484c9a628a85b54a5160551cb816630e06db34886e22ebae5c6c95e3697784b67a8c71b5b1ad
-  data.tar.gz: 715064a097fadfb5ef97b96be9086f760f91efa004d3d339978f87ab87b6dce935ba5111c60c92a9f1849ec5a17a80e83efbd9f9cab031a963392f03a1055b2e
+  metadata.gz: 0c1f24b1718fa9aacf383d22e3b6982e76e7c5aa2c1ccf989d9c411bb0771b0a5fae60d9a780bbe845fac84cafc1a7f876b305005b9e5f3c07f82a7005b0775b
+  data.tar.gz: 469f652352cb2544b882b82dc528dced3e4725a34da033a14dd54b6e7742691a189eed1079dac1684e2da24ba587a955d4fcf3034c1c50f6a2f0d9bf514b2311

data/lib/dead_bro/cpu_tracker.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module DeadBro
+  module CpuTracker
+    THREAD_KEY = :dead_bro_cpu_start
+
+    def self.start_request_tracking
+      Thread.current[THREAD_KEY] = thread_cpu_ms
+    end
+
+    def self.stop_request_tracking
+      before = Thread.current[THREAD_KEY]
+      return nil if before.nil?
+      after = thread_cpu_ms
+      return nil if after.nil?
+      (after - before).round(2)
+    ensure
+      Thread.current[THREAD_KEY] = nil
+    end
+
+    def self.thread_cpu_ms
+      Process.clock_gettime(Process::CLOCK_THREAD_CPUTIME_ID, :millisecond)
+    rescue
+      nil
+    end
+  end
+end

data/lib/dead_bro/sql_tracking_middleware.rb

@@ -67,6 +67,9 @@ module DeadBro
       # Start AR object instantiation counting for this request
       DeadBro::ArObjectTracker.start_request_tracking if defined?(DeadBro::ArObjectTracker)
 
+      # Start CPU time tracking for this request (thread-local clock)
+      DeadBro::CpuTracker.start_request_tracking if defined?(DeadBro::CpuTracker)
+
       # Start outgoing HTTP accumulation for this request
       Thread.current[:dead_bro_http_events] = []
 
@@ -106,6 +109,7 @@ module DeadBro
       Thread.current[DeadBro::GcTracker::THREAD_KEY] = nil if defined?(DeadBro::GcTracker)
       # Bypass stop_request_tracking intentionally — cleanup only, no return value needed here.
       Thread.current[DeadBro::ArObjectTracker::THREAD_KEY] = nil if defined?(DeadBro::ArObjectTracker)
+      Thread.current[DeadBro::CpuTracker::THREAD_KEY] = nil if defined?(DeadBro::CpuTracker)
       Thread.current[DeadBro::TRACKING_START_TIME_KEY] = nil
     end
 

data/lib/dead_bro/subscriber.rb

@@ -72,6 +72,9 @@ module DeadBro
         # Stop AR object instantiation tracking
         ar_instantiation_count = defined?(DeadBro::ArObjectTracker) ? DeadBro::ArObjectTracker.stop_request_tracking : nil
 
+        # Stop CPU time tracking — thread CPU time consumed by this request
+        cpu_time_ms = defined?(DeadBro::CpuTracker) ? DeadBro::CpuTracker.stop_request_tracking : nil
+
         # Stop view rendering tracking and get collected view events
         view_events = DeadBro::ViewRenderingSubscriber.stop_request_tracking
         view_performance = DeadBro::ViewRenderingSubscriber.analyze_view_performance(view_events)
@@ -191,6 +194,7 @@ module DeadBro
           db_connection_checkouts: db_connection_stats[:checkouts],
           gc_pressure: gc_pressure,
           ar_instantiation_count: ar_instantiation_count,
+          cpu_time_ms: cpu_time_ms,
           logs: DeadBro.logger.logs
         }
         client.post_metric(event_name: name, payload: payload)
@@ -214,13 +218,14 @@ module DeadBro
       DeadBro::DbConnectionSubscriber.stop_request_tracking if defined?(DeadBro::DbConnectionSubscriber)
       DeadBro::GcTracker.stop_request_tracking if defined?(DeadBro::GcTracker)
       DeadBro::ArObjectTracker.stop_request_tracking if defined?(DeadBro::ArObjectTracker)
+      DeadBro::CpuTracker.stop_request_tracking if defined?(DeadBro::CpuTracker)
     rescue
       # Best effort — draining must never raise from the notifications callback.
     end
 
     def self.safe_path(data)
       path = data[:path] || (data[:request] && data[:request].path)
-      path.to_s
+      sanitize_string(path)
     rescue
       ""
     end
@@ -266,11 +271,16 @@ module DeadBro
       {}
     end
 
+    def self.sanitize_string(str)
+      str.to_s.gsub("\x00", "")
+    end
+
     # Recursively truncate values to reasonable sizes to avoid huge payloads
     def self.truncate_value(value, max_str: 200, max_array: 20, max_hash_keys: 30)
       case value
       when String
-        (value.length > max_str) ? value[0, max_str] + "…" : value
+        sanitized = sanitize_string(value)
+        (sanitized.length > max_str) ? sanitized[0, max_str] + "…" : sanitized
       when Numeric, TrueClass, FalseClass, NilClass
         value
       when Array
@@ -295,7 +305,7 @@ module DeadBro
           elsif data[:request].respond_to?(:env)
             ua = data[:request].env && data[:request].env["HTTP_USER_AGENT"]
           end
-          return ua.to_s[0..200]
+          return sanitize_string(ua)[0..200]
         end
 
         # Fallback to headers object/hash if present in notification data
@@ -303,7 +313,7 @@ module DeadBro
           headers = data[:headers]
           if headers.respond_to?(:[])
             ua = headers["HTTP_USER_AGENT"] || headers["User-Agent"] || headers["user-agent"]
-            return ua.to_s[0..200]
+            return sanitize_string(ua)[0..200]
           elsif headers.respond_to?(:to_h)
             h = begin
               headers.to_h
@@ -311,14 +321,14 @@ module DeadBro
               {}
             end
             ua = h["HTTP_USER_AGENT"] || h["User-Agent"] || h["user-agent"]
-            return ua.to_s[0..200]
+            return sanitize_string(ua)[0..200]
           end
         end
 
         # Fallback to env hash if present in notification data
         if data[:env].is_a?(Hash)
           ua = data[:env]["HTTP_USER_AGENT"]
-          return ua.to_s[0..200]
+          return sanitize_string(ua)[0..200]
         end
 
         ""

data/lib/dead_bro/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DeadBro
-  VERSION = "0.2.21"
+  VERSION = "0.2.22"
 end

data/lib/dead_bro.rb

@@ -20,6 +20,7 @@ module DeadBro
   autoload :LightweightMemoryTracker, "dead_bro/lightweight_memory_tracker"
   autoload :GcTracker, "dead_bro/gc_tracker"
   autoload :ArObjectTracker, "dead_bro/ar_object_tracker"
+  autoload :CpuTracker, "dead_bro/cpu_tracker"
   autoload :MemoryHelpers, "dead_bro/memory_helpers"
   autoload :JobSubscriber, "dead_bro/job_subscriber"
   autoload :JobSqlTrackingMiddleware, "dead_bro/job_sql_tracking_middleware"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dead_bro
 version: !ruby/object:Gem::Version
-  version: 0.2.21
+  version: 0.2.22
 platform: ruby
 authors:
 - Emanuel Comsa
@@ -33,6 +33,7 @@ files:
 - lib/dead_bro/collectors/sample_store.rb
 - lib/dead_bro/collectors/system.rb
 - lib/dead_bro/configuration.rb
+- lib/dead_bro/cpu_tracker.rb
 - lib/dead_bro/db_connection_subscriber.rb
 - lib/dead_bro/dispatcher.rb
 - lib/dead_bro/elasticsearch_subscriber.rb