dead_bro 0.2.2 → 0.2.3

data/lib/dead_bro/monitor.rb

@@ -0,0 +1,89 @@
+# frozen_string_literal: true
+
+module DeadBro
+  class Monitor
+    def initialize(client: DeadBro.client)
+      @client = client
+      @thread = nil
+      @running = false
+    end
+
+    def start
+      return if @running
+      return unless DeadBro.configuration.job_queue_monitoring_enabled
+      return unless DeadBro.configuration.enabled
+
+      @running = true
+      @thread = Thread.new do
+        Thread.current.abort_on_exception = false
+        loop do
+          break unless @running
+
+          begin
+            collect_and_send_stats
+          rescue => e
+            log_error("Error collecting stats: #{e.message}")
+          end
+
+          # Sleep for 60 seconds (1 minute)
+          sleep(60)
+        end
+      end
+
+      @thread
+    end
+
+    def stop
+      @running = false
+      @thread&.join(5) # Wait up to 5 seconds for thread to finish
+      @thread = nil
+    end
+
+    private
+
+    def collect_and_send_stats
+      payload = {
+        environment: DeadBro.env,
+        host: process_hostname,
+        pid: Process.pid,
+        current_time: Time.now.utc.iso8601,
+        jobs: DeadBro::Collectors::Jobs.collect,
+        network: DeadBro::Collectors::Network.collect
+      }
+
+      if DeadBro.configuration.respond_to?(:enable_db_stats) && DeadBro.configuration.enable_db_stats
+        payload[:db] = safe_collect { DeadBro::Collectors::Database.collect }
+      end
+
+      if DeadBro.configuration.respond_to?(:enable_process_stats) && DeadBro.configuration.enable_process_stats
+        payload[:process] = safe_collect { DeadBro::Collectors::ProcessInfo.collect }
+      end
+
+      if DeadBro.configuration.respond_to?(:enable_system_stats) && DeadBro.configuration.enable_system_stats
+        payload[:system] = safe_collect { DeadBro::Collectors::System.collect }
+      end
+      @client.post_monitor_stats(payload)
+    end
+
+    def process_hostname
+      require "socket"
+      Socket.gethostname
+    rescue
+      "unknown"
+    end
+
+    def log_error(message)
+      if defined?(Rails) && Rails.respond_to?(:logger) && Rails.logger
+        Rails.logger.error("[DeadBro::Monitor] #{message}")
+      else
+        $stderr.puts("[DeadBro::Monitor] #{message}")
+      end
+    end
+
+    def safe_collect
+      yield
+    rescue => e
+      {error_class: e.class.name, error_message: e.message.to_s[0, 500]}
+    end
+  end
+end

data/lib/dead_bro/railtie.rb

@@ -10,12 +10,11 @@ end
 if defined?(Rails) && defined?(Rails::Railtie)
   module DeadBro
     class Railtie < ::Rails::Railtie
-
       initializer "dead_bro.subscribe" do |app|
         app.config.after_initialize do
           # Use the shared Client instance for all subscribers
           shared_client = DeadBro.client
-          
+
           DeadBro::Subscriber.subscribe!(client: shared_client)
           # Install outgoing HTTP instrumentation
           require "dead_bro/http_instrumentation"
@@ -58,9 +57,9 @@ if defined?(Rails) && defined?(Rails::Railtie)
 
           # Start job queue monitoring if enabled
           if DeadBro.configuration.job_queue_monitoring_enabled
-            require "dead_bro/job_queue_monitor"
-            DeadBro.job_queue_monitor = DeadBro::JobQueueMonitor.new(client: shared_client)
-            DeadBro.job_queue_monitor.start
+            require "dead_bro/monitor"
+            DeadBro.monitor = DeadBro::Monitor.new(client: shared_client)
+            DeadBro.monitor.start
           end
         rescue
           # Never raise in Railtie init
@@ -70,7 +69,7 @@ if defined?(Rails) && defined?(Rails::Railtie)
       # Insert Rack middleware early enough to observe uncaught exceptions
       initializer "dead_bro.middleware" do |app|
         require "dead_bro/error_middleware"
-        
+
         # Use the shared Client instance for the middleware
         shared_client = DeadBro.client
 

data/lib/dead_bro/redis_subscriber.rb

@@ -225,17 +225,17 @@ module DeadBro
     def self.should_continue_tracking?
       events = Thread.current[THREAD_LOCAL_KEY]
       return false unless events
-      
+
       # Check count limit
       return false if events.length >= MAX_TRACKED_EVENTS
-      
+
       # Check time limit
       start_time = Thread.current[DeadBro::TRACKING_START_TIME_KEY]
       if start_time
         elapsed_seconds = Time.now - start_time
         return false if elapsed_seconds >= DeadBro::MAX_TRACKING_DURATION_SECONDS
       end
-      
+
       true
     end
 

data/lib/dead_bro/sql_subscriber.rb

@@ -20,17 +20,17 @@ module DeadBro
     def self.should_continue_tracking?(thread_local_key, max_count)
       events = Thread.current[thread_local_key]
       return false unless events
-      
+
       # Check count limit
       return false if events.length >= max_count
-      
+
       # Check time limit
       start_time = Thread.current[DeadBro::TRACKING_START_TIME_KEY]
       if start_time
         elapsed_seconds = Time.now - start_time
         return false if elapsed_seconds >= DeadBro::MAX_TRACKING_DURATION_SECONDS
       end
-      
+
       true
     end
 
@@ -102,10 +102,10 @@ module DeadBro
       # This must happen BEFORE we get the queries array reference to ensure
       # all explain_plan fields are populated
       wait_for_pending_explains(5.0) # 5 second timeout
-      
+
       # Get queries after waiting for EXPLAIN to complete
       queries = Thread.current[THREAD_LOCAL_KEY]
-      
+
       Thread.current[THREAD_LOCAL_KEY] = nil
       Thread.current[THREAD_LOCAL_ALLOC_START_KEY] = nil
       Thread.current[THREAD_LOCAL_ALLOC_RESULTS_KEY] = nil
@@ -117,12 +117,12 @@ module DeadBro
     def self.wait_for_pending_explains(timeout_seconds)
       pending = Thread.current[THREAD_LOCAL_EXPLAIN_PENDING_KEY]
       return unless pending && !pending.empty?
-      
+
       start_time = Time.now
       pending.each do |thread|
         remaining_time = timeout_seconds - (Time.now - start_time)
         break if remaining_time <= 0
-        
+
         begin
           thread.join(remaining_time)
         rescue => e
@@ -152,7 +152,7 @@ module DeadBro
       return false if duration_ms < DeadBro.configuration.slow_query_threshold_ms
       return false unless sql.is_a?(String)
       return false if sql.strip.empty?
-      
+
       # Skip EXPLAIN for certain query types that don't benefit from it
       sql_upper = sql.upcase.strip
       return false if sql_upper.start_with?("EXPLAIN")
@@ -161,55 +161,53 @@ module DeadBro
       return false if sql_upper.start_with?("ROLLBACK")
       return false if sql_upper.start_with?("SAVEPOINT")
       return false if sql_upper.start_with?("RELEASE")
-      
+
       true
     end
 
     def self.start_explain_analyze_background(sql, connection_id, query_info, binds = nil)
       return unless defined?(ActiveRecord)
       return unless ActiveRecord::Base.respond_to?(:connection)
-      
+
       # Capture the main thread reference to append logs to the correct thread
       main_thread = Thread.current
-      
+
       # Run EXPLAIN in a background thread to avoid blocking the main request
       explain_thread = Thread.new do
         connection = nil
         begin
           # Use a separate connection to avoid interfering with the main query
-          if ActiveRecord::Base.connection_pool.respond_to?(:checkout)
-            connection = ActiveRecord::Base.connection_pool.checkout
+          connection = if ActiveRecord::Base.connection_pool.respond_to?(:checkout)
+            ActiveRecord::Base.connection_pool.checkout
           else
-            connection = ActiveRecord::Base.connection
+            ActiveRecord::Base.connection
           end
-          
+
           # Interpolate binds if present to ensure EXPLAIN works with placeholders
           final_sql = interpolate_sql_with_binds(sql, binds, connection)
-          
+
           # Build EXPLAIN query based on database adapter
           explain_sql = build_explain_query(final_sql, connection)
-          
+
           # Execute the EXPLAIN query
           # For PostgreSQL, use select_all which returns ActiveRecord::Result
           # For other databases, use execute
           adapter_name = connection.adapter_name.downcase
-          if adapter_name == "postgresql" || adapter_name == "postgis"
+          result = if adapter_name == "postgresql" || adapter_name == "postgis"
             # PostgreSQL: select_all returns ActiveRecord::Result with rows
-            result = connection.select_all(explain_sql)
+            connection.select_all(explain_sql)
           else
             # Other databases: use execute
-            result = connection.execute(explain_sql)
+            connection.execute(explain_sql)
           end
-          
+
           # Format the result based on database adapter
           explain_plan = format_explain_result(result, connection)
-          
+
           # Update the query_info with the explain plan
           # This updates the hash that's already in the queries array
-          if explain_plan && !explain_plan.to_s.strip.empty?
-            query_info[:explain_plan] = explain_plan
-          else
-            query_info[:explain_plan] = nil
+          query_info[:explain_plan] = if explain_plan && !explain_plan.to_s.strip.empty?
+            explain_plan
           end
         rescue => e
           # Silently fail - don't let EXPLAIN break the application
@@ -218,11 +216,15 @@ module DeadBro
         ensure
           # Return connection to pool if we checked it out
           if connection && ActiveRecord::Base.connection_pool.respond_to?(:checkin)
-            ActiveRecord::Base.connection_pool.checkin(connection) rescue nil
+            begin
+              ActiveRecord::Base.connection_pool.checkin(connection)
+            rescue
+              nil
+            end
           end
         end
       end
-      
+
       # Track the thread so we can wait for it when stopping request tracking
       pending = Thread.current[THREAD_LOCAL_EXPLAIN_PENDING_KEY] ||= []
       pending << explain_thread
@@ -274,7 +276,7 @@ module DeadBro
 
     def self.build_explain_query(sql, connection)
       adapter_name = connection.adapter_name.downcase
-      
+
       case adapter_name
       when "postgresql", "postgis"
         # PostgreSQL supports ANALYZE and BUFFERS
@@ -296,7 +298,7 @@ module DeadBro
       return sql unless connection
 
       interpolated_sql = sql.dup
-      
+
       # Handle $1, $2 style placeholders (PostgreSQL)
       if interpolated_sql.include?("$1")
         binds.each_with_index do |val, index|
@@ -307,7 +309,7 @@ module DeadBro
           elsif val.respond_to?(:value)
             value = val.value
           end
-          
+
           quoted_value = connection.quote(value)
           interpolated_sql = interpolated_sql.gsub("$#{index + 1}", quoted_value)
         end
@@ -322,18 +324,18 @@ module DeadBro
           elsif val.respond_to?(:value)
             value = val.value
           end
-          
+
           quoted_value = connection.quote(value)
           interpolated_sql = interpolated_sql.sub("?", quoted_value)
         end
       end
-      
+
       interpolated_sql
     end
 
     def self.format_explain_result(result, connection)
       adapter_name = connection.adapter_name.downcase
-      
+
       case adapter_name
       when "postgresql", "postgis"
         # PostgreSQL returns ActiveRecord::Result from select_all
@@ -343,12 +345,12 @@ module DeadBro
           plan_text = result.rows.map { |row| row.is_a?(Array) ? row.first.to_s : row.to_s }.join("\n")
           return plan_text unless plan_text.strip.empty?
         end
-        
+
         # Try alternative methods to extract the plan
         if result.respond_to?(:each) && result.respond_to?(:columns)
           # ActiveRecord::Result with columns
           plan_column = result.columns.find { |col| col.downcase.include?("plan") || col.downcase.include?("query") } || result.columns.first
-          plan_text = result.map { |row| 
+          plan_text = result.map { |row|
             if row.is_a?(Hash)
               row[plan_column] || row[plan_column.to_sym] || row.values.first
             else
@@ -357,7 +359,7 @@ module DeadBro
           }.join("\n")
           return plan_text unless plan_text.strip.empty?
         end
-        
+
         if result.is_a?(Array)
           # Array of hashes or arrays
           plan_text = result.map do |row|
@@ -371,7 +373,7 @@ module DeadBro
           end.join("\n")
           return plan_text unless plan_text.strip.empty?
         end
-        
+
         # Fallback to string representation
         result.to_s
       when "mysql", "mysql2", "trilogy"
@@ -396,7 +398,7 @@ module DeadBro
         # Generic fallback
         result.to_s
       end
-    rescue => e
+    rescue
       # Fallback to string representation
       result.to_s
     end

data/lib/dead_bro/sql_tracking_middleware.rb

@@ -42,7 +42,7 @@ module DeadBro
 
       # Start outgoing HTTP accumulation for this request
       Thread.current[:dead_bro_http_events] = []
-      
+
       # Set tracking start time once for all subscribers (before starting any tracking)
       Thread.current[DeadBro::TRACKING_START_TIME_KEY] = Time.now
 

data/lib/dead_bro/subscriber.rb

@@ -93,7 +93,7 @@ module DeadBro
               path: safe_path(data),
               status: data[:status],
               duration_ms: duration_ms,
-              rails_env: rails_env,
+              rails_env: DeadBro.env,
               host: safe_host,
               params: safe_params(data),
               user_agent: safe_user_agent(data),
@@ -166,14 +166,6 @@ module DeadBro
       end
     end
 
-    def self.rails_env
-      if defined?(Rails) && Rails.respond_to?(:env)
-        Rails.env
-      else
-        ENV["RACK_ENV"] || ENV["RAILS_ENV"] || "development"
-      end
-    end
-
     def self.safe_params(data)
       return {} unless data[:params]
 

data/lib/dead_bro/version.rb

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

data/lib/dead_bro/view_rendering_subscriber.rb

@@ -88,17 +88,17 @@ module DeadBro
     def self.should_continue_tracking?
       events = Thread.current[THREAD_LOCAL_KEY]
       return false unless events
-      
+
       # Check count limit
       return false if events.length >= MAX_TRACKED_EVENTS
-      
+
       # Check time limit
       start_time = Thread.current[DeadBro::TRACKING_START_TIME_KEY]
       if start_time
         elapsed_seconds = Time.now - start_time
         return false if elapsed_seconds >= DeadBro::MAX_TRACKING_DURATION_SECONDS
       end
-      
+
       true
     end
 

data/lib/dead_bro.rb

@@ -6,6 +6,7 @@ module DeadBro
   autoload :Configuration, "dead_bro/configuration"
   autoload :Client, "dead_bro/client"
   autoload :CircuitBreaker, "dead_bro/circuit_breaker"
+  autoload :Collectors, "dead_bro/collectors"
   autoload :Subscriber, "dead_bro/subscriber"
   autoload :SqlSubscriber, "dead_bro/sql_subscriber"
   autoload :SqlTrackingMiddleware, "dead_bro/sql_tracking_middleware"
@@ -18,7 +19,7 @@ module DeadBro
   autoload :MemoryHelpers, "dead_bro/memory_helpers"
   autoload :JobSubscriber, "dead_bro/job_subscriber"
   autoload :JobSqlTrackingMiddleware, "dead_bro/job_sql_tracking_middleware"
-  autoload :JobQueueMonitor, "dead_bro/job_queue_monitor"
+  autoload :Monitor, "dead_bro/monitor"
   autoload :Logger, "dead_bro/logger"
   begin
     require "dead_bro/railtie"
@@ -34,7 +35,7 @@ module DeadBro
   def self.configuration
     @configuration ||= Configuration.new
   end
-  
+
   def self.reset_configuration!
     @configuration = nil
     @client = nil
@@ -66,16 +67,18 @@ module DeadBro
     else
       ENV["RACK_ENV"] || ENV["RAILS_ENV"] || "development"
     end
+  rescue
+    "development"
   end
 
-  # Returns the job queue monitor instance
-  def self.job_queue_monitor
-    @job_queue_monitor
+  # Returns the monitor instance
+  def self.monitor
+    @monitor
   end
 
-  # Sets the job queue monitor instance
-  def self.job_queue_monitor=(monitor)
-    @job_queue_monitor = monitor
+  # Sets the monitor instance
+  def self.monitor=(monitor)
+    @monitor = monitor
   end
 
   # Shared constant for tracking start time (used by all subscribers)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dead_bro
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Emanuel Comsa
@@ -24,10 +24,17 @@ files:
 - lib/dead_bro/cache_subscriber.rb
 - lib/dead_bro/circuit_breaker.rb
 - lib/dead_bro/client.rb
+- lib/dead_bro/collectors.rb
+- lib/dead_bro/collectors/database.rb
+- lib/dead_bro/collectors/filesystem.rb
+- lib/dead_bro/collectors/jobs.rb
+- lib/dead_bro/collectors/network.rb
+- lib/dead_bro/collectors/process_info.rb
+- lib/dead_bro/collectors/sample_store.rb
+- lib/dead_bro/collectors/system.rb
 - lib/dead_bro/configuration.rb
 - lib/dead_bro/error_middleware.rb
 - lib/dead_bro/http_instrumentation.rb
-- lib/dead_bro/job_queue_monitor.rb
 - lib/dead_bro/job_sql_tracking_middleware.rb
 - lib/dead_bro/job_subscriber.rb
 - lib/dead_bro/lightweight_memory_tracker.rb
@@ -35,6 +42,7 @@ files:
 - lib/dead_bro/memory_helpers.rb
 - lib/dead_bro/memory_leak_detector.rb
 - lib/dead_bro/memory_tracking_subscriber.rb
+- lib/dead_bro/monitor.rb
 - lib/dead_bro/railtie.rb
 - lib/dead_bro/redis_subscriber.rb
 - lib/dead_bro/sql_subscriber.rb