pg_reports 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e9a2129fba68b259fc72598215a7cc02ff8785c93a786603505d9b9987d5df1
-  data.tar.gz: 7910113c5cc18115f59463067ab201f1942ec8b968570557af8aefda645098c7
+  metadata.gz: e98f6b7de8825ba0c851061a0d5e6f341986b9f710d594a9079a0a220c86f043
+  data.tar.gz: 713c08469b6c9d7aaea22c133e838cc73ac294acc64bba8fb21fa094c3680745
 SHA512:
-  metadata.gz: 7e5573dd2cca17cc74cdfe104e6eb09249069d59d50b033effd15e9c46bcb63040da50d998d91c8a2c7e31b8dc4fd3f86c2692f5b60d83050db766942d9a5d46
-  data.tar.gz: 025a5a37c86817e22265aff1227e332a1f5dd09cf0954a48321fe1ca5dc8c8f402cd13671c4b7b4c1b69e7ec739ef7f8ca47280b11894718d1bcaa946d7983b7
+  metadata.gz: 8e0380c79d58828741eb17529e23272bb3e6fcafcfa7193e2a378e436a55b72b9e5be73e06ec3709836620e50ae704f7213cda83146fec489919695f364d7375
+  data.tar.gz: 7c5fdd5d289836e04a7b907d88e191e7a270d7bfffbc056230cc1469c4a83ff434e5fbf55dc0c49b6f84bdc2fc949e7b6858627e2e9387f0d9d7c22db423e77e

data/CHANGELOG.md

@@ -7,6 +7,27 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.5.4] - 2026-02-11
+
+### Fixed
+
+- **Live Query Monitor critical fix for multi-process servers** - monitoring now works correctly with Puma, Unicorn, and other multi-process web servers:
+  - Migrated from Singleton instance variables to Rails.cache for cross-process state sharing
+  - Fixed "Monitoring not active" errors when requests hit different worker processes
+  - Each process now subscribes to SQL notifications when monitoring is enabled
+  - State (enabled/session_id) stored in Rails.cache with 24-hour TTL
+  - Added cache helper methods with graceful error handling
+  - Monitoring state now persists across all processes in multi-worker environments
+  - Exclude `query_monitor.rb` itself from `query_from_pg_reports?` check to prevent false positives
+
+### Added
+
+- **Enhanced error handling for Query Monitor**:
+  - Toast notification system with visual feedback (success/error/warning types)
+  - Server errors now displayed to users with clear messages
+  - Automatic monitoring stop and UI reset when errors occur
+  - Smooth animations with auto-dismiss after 4 seconds
+
 ## [0.5.3] - 2026-02-11
 
 ### Fixed

data/app/controllers/pg_reports/dashboard_controller.rb

@@ -47,7 +47,7 @@ module PgReports
           timestamp: Time.current.to_i,
           available: true
         }
-      rescue PG::InsufficientPrivilege => e
+      rescue PG::InsufficientPrivilege
         render json: {
           success: false,
           error: "Insufficient database permissions to access statistics views",
@@ -363,8 +363,10 @@ module PgReports
 
     def start_query_monitoring
       monitor = PgReports::QueryMonitor.instance
+      Rails.logger.info("PgReports: start_query_monitoring called. Instance: #{monitor.object_id}")
 
       result = monitor.start
+      Rails.logger.info("PgReports: start result: #{result.inspect}")
 
       if result[:success]
         render json: result
@@ -372,6 +374,7 @@ module PgReports
         render json: result, status: :unprocessable_entity
       end
     rescue => e
+      Rails.logger.error("PgReports: start_query_monitoring error: #{e.message}\n#{e.backtrace.first(5).join("\n")}")
       render json: {success: false, error: e.message}, status: :unprocessable_entity
     end
 
@@ -407,6 +410,7 @@ module PgReports
       monitor = PgReports::QueryMonitor.instance
 
       unless monitor.enabled
+        Rails.logger.warn("PgReports: query_monitor_feed called but monitoring not active. Instance: #{monitor.object_id}, enabled: #{monitor.enabled}, session_id: #{monitor.session_id}")
         render json: {success: false, message: "Monitoring not active"}
         return
       end
@@ -634,7 +638,7 @@ module PgReports
 
       # Must start with SELECT (case insensitive)
       unless normalized.start_with?("select")
-        raise SecurityError, "Only SELECT queries are allowed. Found: #{normalized.split.first&.upcase || 'unknown'}"
+        raise SecurityError, "Only SELECT queries are allowed. Found: #{normalized.split.first&.upcase || "unknown"}"
       end
 
       # Check for dangerous keywords that might be in subqueries or CTEs

data/app/views/pg_reports/dashboard/index.html.erb

@@ -789,6 +789,44 @@ pg_stat_statements.track = all</pre>
   .metric-status.ok { background: var(--accent-green); }
   .metric-status.warning { background: var(--accent-amber); }
   .metric-status.critical { background: var(--accent-rose); }
+
+  /* Toast Notifications */
+  .toast {
+    position: fixed;
+    bottom: 2rem;
+    right: 2rem;
+    padding: 1rem 1.5rem;
+    background: var(--bg-card);
+    border: 1px solid var(--border-color);
+    border-radius: 12px;
+    color: var(--text-primary);
+    font-size: 0.875rem;
+    font-weight: 500;
+    box-shadow: 0 8px 24px rgba(0, 0, 0, 0.3);
+    z-index: 9999;
+    opacity: 0;
+    transform: translateY(20px);
+    transition: all 0.3s ease;
+  }
+
+  .toast.show {
+    opacity: 1;
+    transform: translateY(0);
+  }
+
+  .toast.toast-success {
+    border-left: 3px solid var(--accent-green);
+  }
+
+  .toast.toast-error {
+    border-left: 3px solid var(--accent-rose);
+    background: rgba(244, 63, 94, 0.1);
+    border-color: var(--accent-rose);
+  }
+
+  .toast.toast-warning {
+    border-left: 3px solid var(--accent-amber);
+  }
 </style>
 
 <script>
@@ -1568,9 +1606,20 @@ pg_stat_statements.track = all</pre>
 
       if (data.success && data.queries) {
         renderQueryFeed(data.queries);
+      } else if (!data.success) {
+        // Server returned an error (e.g., "Monitoring not active")
+        const errorMsg = data.message || data.error || 'Query monitoring error';
+        showToast(errorMsg, 'error');
+
+        // Stop polling and update UI since monitoring is not active
+        queryMonitorEnabled = false;
+        currentSessionId = null;
+        stopQueryMonitorPolling();
+        updateQueryMonitorUI(false);
       }
     } catch (error) {
       console.error('Failed to fetch query feed:', error);
+      showToast('Network error: ' + error.message, 'error');
     }
   }
 
@@ -1664,13 +1713,29 @@ pg_stat_statements.track = all</pre>
   }
 
   function showToast(message, type = 'success') {
-    // Simple console log for now - can be enhanced with actual toast UI
+    // Log to console as well
     if (type === 'error') {
       console.error(message);
     } else {
       console.log(message);
     }
-    // TODO: Implement actual toast notification UI
+
+    // Create toast element
+    const toast = document.createElement('div');
+    toast.className = `toast toast-${type}`;
+    toast.textContent = message;
+
+    // Add to page
+    document.body.appendChild(toast);
+
+    // Trigger animation
+    setTimeout(() => toast.classList.add('show'), 10);
+
+    // Remove after 4 seconds
+    setTimeout(() => {
+      toast.classList.remove('show');
+      setTimeout(() => toast.remove(), 300);
+    }, 4000);
   }
 
   // Initialize on page load

data/lib/pg_reports/query_monitor.rb

@@ -8,48 +8,63 @@ module PgReports
   class QueryMonitor
     include Singleton
 
-    attr_reader :enabled, :session_id
+    CACHE_KEY_ENABLED = "pg_reports:query_monitor:enabled"
+    CACHE_KEY_SESSION_ID = "pg_reports:query_monitor:session_id"
+    CACHE_TTL = 24.hours
 
     def initialize
-      @enabled = false
       @subscriber = nil
       @mutex = Mutex.new
-      @session_id = nil
       @queries = []
+      ensure_subscription_if_enabled
+    end
+
+    def enabled
+      cache_read(CACHE_KEY_ENABLED) || false
+    end
+
+    def session_id
+      cache_read(CACHE_KEY_SESSION_ID)
     end
 
     def start
       @mutex.synchronize do
-        if @enabled
+        if enabled
+          Rails.logger.info("PgReports: Monitoring already active, session_id=#{session_id}") if defined?(Rails)
           return {success: false, message: "Monitoring already active"}
         end
 
-        @session_id = SecureRandom.uuid
+        new_session_id = SecureRandom.uuid
         @queries = []
-        @enabled = true
 
-        # Subscribe to sql.active_record events
-        @subscriber = ActiveSupport::Notifications.subscribe("sql.active_record") do |name, started, finished, unique_id, payload|
-          handle_sql_event(name, started, finished, unique_id, payload)
-        end
+        # Store state in cache so all processes can see it
+        cache_write(CACHE_KEY_ENABLED, true)
+        cache_write(CACHE_KEY_SESSION_ID, new_session_id)
+
+        Rails.logger.info("PgReports: Monitoring started, session_id=#{new_session_id}") if defined?(Rails)
+
+        # Subscribe to sql.active_record events in THIS process
+        ensure_subscription
 
         # Write session start marker to file
         write_session_marker("session_start")
 
-        {success: true, message: "Query monitoring started", session_id: @session_id}
+        {success: true, message: "Query monitoring started", session_id: new_session_id}
       end
     rescue => e
-      @enabled = false
+      cache_write(CACHE_KEY_ENABLED, false)
       {success: false, error: e.message}
     end
 
     def stop
       @mutex.synchronize do
-        unless @enabled
+        unless enabled
           return {success: false, message: "Monitoring not active"}
         end
 
-        # Unsubscribe from notifications
+        current_session_id = session_id
+
+        # Unsubscribe from notifications in THIS process
         if @subscriber
           ActiveSupport::Notifications.unsubscribe(@subscriber)
           @subscriber = nil
@@ -61,12 +76,13 @@ module PgReports
         # Flush queries to file
         flush_to_file
 
-        @enabled = false
+        # Clear state from cache
+        cache_delete(CACHE_KEY_ENABLED)
+        cache_delete(CACHE_KEY_SESSION_ID)
+
         @queries = []
-        session_id = @session_id
-        @session_id = nil
 
-        {success: true, message: "Query monitoring stopped", session_id: session_id}
+        {success: true, message: "Query monitoring stopped", session_id: current_session_id}
       end
     rescue => e
       {success: false, error: e.message}
@@ -74,8 +90,8 @@ module PgReports
 
     def status
       {
-        enabled: @enabled,
-        session_id: @session_id,
+        enabled: enabled,
+        session_id: session_id,
         query_count: @queries.size
       }
     end
@@ -130,8 +146,53 @@ module PgReports
 
     private
 
+    # Cache helpers - work with or without Rails.cache
+    def cache_read(key)
+      return nil unless cache_available?
+      Rails.cache.read(key)
+    rescue => e
+      Rails.logger.warn("PgReports: Cache read failed: #{e.message}") if defined?(Rails.logger)
+      nil
+    end
+
+    def cache_write(key, value)
+      return false unless cache_available?
+      Rails.cache.write(key, value, expires_in: CACHE_TTL)
+    rescue => e
+      Rails.logger.warn("PgReports: Cache write failed: #{e.message}") if defined?(Rails.logger)
+      false
+    end
+
+    def cache_delete(key)
+      return false unless cache_available?
+      Rails.cache.delete(key)
+    rescue => e
+      Rails.logger.warn("PgReports: Cache delete failed: #{e.message}") if defined?(Rails.logger)
+      false
+    end
+
+    def cache_available?
+      defined?(Rails) && defined?(Rails.cache)
+    end
+
+    # Ensure this process is subscribed to notifications if monitoring is enabled
+    def ensure_subscription_if_enabled
+      return unless enabled
+      ensure_subscription
+    end
+
+    def ensure_subscription
+      return if @subscriber # Already subscribed
+
+      @subscriber = ActiveSupport::Notifications.subscribe("sql.active_record") do |name, started, finished, unique_id, payload|
+        handle_sql_event(name, started, finished, unique_id, payload)
+      end
+
+      Rails.logger.debug("PgReports: Subscribed to sql.active_record in process #{Process.pid}") if defined?(Rails.logger)
+    end
+
     def handle_sql_event(name, started, finished, unique_id, payload)
-      return unless @enabled
+      return unless enabled
 
       # Skip if should be filtered
       return if should_skip?(payload)
@@ -146,7 +207,7 @@ module PgReports
       # Build query entry
       query_entry = {
         type: "query",
-        session_id: @session_id,
+        session_id: session_id,
         sql: sql,
         duration_ms: duration_ms,
         name: query_name,
@@ -197,6 +258,10 @@ module PgReports
         # Exclude test paths
         next if path.include?("/spec/")
 
+        # IMPORTANT: Exclude query_monitor.rb itself to prevent false positives
+        # when gem is installed from RubyGems
+        next if path.include?("/query_monitor.rb")
+
         # Filter queries from pg_reports internal modules only:
         # - Installed gem: /gems/pg_reports-X.Y.Z/lib/
         # - Local gem: /pg_reports/lib/pg_reports/modules/
@@ -257,7 +322,7 @@ module PgReports
 
       marker = {
         type: marker_type,
-        session_id: @session_id,
+        session_id: session_id,
         timestamp: Time.current.iso8601
       }
 

data/lib/pg_reports/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PgReports
-  VERSION = "0.5.3"
+  VERSION = "0.5.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_reports
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Eldar Avatov