fix: solve req and telemetry issues

Author: Bulletdev

app/controllers/status_controller.rb

@@ -6,45 +6,47 @@ class StatusController < ActionController::API
   skip_before_action :verify_authenticity_token, raise: false
 
   COMPONENT_META = {
-    'api' => { name: 'API', description: 'Core REST API services' },
-    'database' => { name: 'Database', description: 'PostgreSQL primary database' },
-    'redis' => { name: 'Cache & Background Jobs', description: 'Redis cache and Sidekiq queue processor' },
-    'websocket' => { name: 'Real-time (WebSocket)', description: 'ActionCable WebSocket connections' },
-    'sidekiq' => { name: 'Background Jobs (Sidekiq)', description: 'Async job processing' },
-    'riot_api' => { name: 'Riot API Integration', description: 'Riot Games data synchronization' }
+    'api'       => { name: 'API',                        description: 'Core REST API services' },
+    'database'  => { name: 'Database',                   description: 'PostgreSQL primary database' },
+    'redis'     => { name: 'Cache & Background Jobs',    description: 'Redis cache and Sidekiq queue processor' },
+    'websocket' => { name: 'Real-time (WebSocket)',       description: 'ActionCable WebSocket connections' },
+    'sidekiq'   => { name: 'Background Jobs (Sidekiq)',  description: 'Async job processing' },
+    'riot_api'  => { name: 'Riot API Integration',       description: 'Riot Games data synchronization' }
   }.freeze
 
   def index
-    components    = build_component_statuses
-    incidents     = build_incidents
-    uptime        = build_uptime_history
-    indicator, description = overall_status(components)
+    cached = Rails.cache.fetch('status_page/v2', expires_in: 30.seconds) do
+      components = build_component_statuses
+      incidents  = build_incidents
+      uptime     = build_uptime_history
+      indicator, description = overall_status(components)
+
+      {
+        status:         { indicator: indicator, description: description },
+        components:     components,
+        incidents:      incidents,
+        uptime_history: uptime
+      }
+    end
 
-    render json: {
+    render json: cached.merge(
       page: {
-        id: 'prostaff',
-        name: 'ProStaff',
-        url: 'https://status.prostaff.gg',
-        time_zone: 'UTC',
+        id:         'prostaff',
+        name:       'ProStaff',
+        url:        'https://status.prostaff.gg',
+        time_zone:  'UTC',
         updated_at: Time.current.iso8601
-      },
-      status: {
-        indicator: indicator,
-        description: description
-      },
-      components: components,
-      incidents: incidents,
-      uptime_history: uptime
-    }, status: :ok
+      }
+    ), status: :ok
   end
 
   private
 
   def build_component_statuses
-    StatusIncident::COMPONENTS.map do |component|
-      snapshot = StatusSnapshot.for_component(component).order(checked_at: :desc).first
+    latest = StatusSnapshot.latest_per_component
 
-      if snapshot
+    StatusIncident::COMPONENTS.map do |component|
+      if (snapshot = latest[component])
         build_component_from_snapshot(component, snapshot)
       else
         build_component_live(component)
@@ -55,13 +57,13 @@ def build_component_statuses
   def build_component_from_snapshot(component, snapshot)
     meta = COMPONENT_META[component]
     {
-      id: component,
-      name: meta[:name],
-      status: snapshot.status,
-      description: meta[:description],
+      id:               component,
+      name:             meta[:name],
+      status:           snapshot.status,
+      description:      meta[:description],
       response_time_ms: snapshot.response_time_ms,
-      last_checked_at: snapshot.checked_at.iso8601,
-      updated_at: snapshot.updated_at.iso8601
+      last_checked_at:  snapshot.checked_at.iso8601,
+      updated_at:       snapshot.updated_at.iso8601
     }
   end
 
@@ -70,13 +72,13 @@ def build_component_live(component)
     result = live_check(component)
 
     {
-      id: component,
-      name: meta[:name],
-      status: result[:status],
-      description: meta[:description],
+      id:               component,
+      name:             meta[:name],
+      status:           result[:status],
+      description:      meta[:description],
       response_time_ms: result[:response_time_ms],
-      last_checked_at: Time.current.iso8601,
-      updated_at: Time.current.iso8601
+      last_checked_at:  Time.current.iso8601,
+      updated_at:       Time.current.iso8601
     }
   end
 
@@ -120,24 +122,25 @@ def build_incidents
 
   def serialize_incident(incident)
     {
-      id: incident.id,
-      title: incident.title,
-      body: incident.body,
-      severity: incident.severity,
-      status: incident.status,
+      id:                  incident.id,
+      title:               incident.title,
+      body:                incident.body,
+      severity:            incident.severity,
+      status:              incident.status,
       affected_components: incident.affected_components,
-      started_at: incident.started_at.iso8601,
-      resolved_at: incident.resolved_at&.iso8601,
-      postmortem: incident.postmortem,
-      updates: incident.updates.order(created_at: :desc).map do |u|
+      started_at:          incident.started_at.iso8601,
+      resolved_at:         incident.resolved_at&.iso8601,
+      postmortem:          incident.postmortem,
+      updates:             incident.updates.order(created_at: :desc).map do |u|
         { id: u.id, status: u.status, body: u.body, created_at: u.created_at.iso8601 }
       end
     }
   end
 
   def build_uptime_history
+    bulk = StatusSnapshot.bulk_uptime_by_day(days: 90)
     StatusIncident::COMPONENTS.each_with_object({}) do |component, hash|
-      hash[component] = StatusSnapshot.uptime_by_day(component: component, days: 90)
+      hash[component] = bulk[component] || []
     end
   rescue StandardError => e
     Rails.logger.error("[STATUS] Failed to build uptime history: #{e.message}")

app/models/status_snapshot.rb

@@ -15,29 +15,41 @@ class StatusSnapshot < ApplicationRecord
   scope :for_component, ->(component) { where(component: component) }
 
   # Returns daily uptime percentage for a component over the last N days.
-  #
-  # @param component [String] one of COMPONENTS
-  # @param days [Integer] number of days to look back (default 90)
-  # @return [Array<Hash>] array of { date: Date, uptime_pct: Float, status: String }
-  #   Days without snapshots are omitted from the result.
   def self.uptime_by_day(component:, days: 90)
-    rows    = fetch_rows(component, days)
-    grouped = rows.group_by { |checked_at, _| checked_at.to_date }
-    grouped.map { |date, entries| aggregate_day(date, entries) }
+    rows    = for_component(component).recent(days).order(checked_at: :asc).pluck(:checked_at, :status)
+    rows.group_by { |checked_at, _| checked_at.to_date }
+        .map { |date, entries| aggregate_day(date, entries) }
   end
 
-  private_class_method def self.fetch_rows(component, days)
-    for_component(component)
-      .recent(days)
-      .order(checked_at: :asc)
-      .pluck(:checked_at, :status)
+  # Single-query bulk version: returns { component => [{ date:, uptime_pct:, status: }] }
+  def self.bulk_uptime_by_day(days: 90)
+    rows = where(checked_at: days.days.ago..Time.current)
+             .order(checked_at: :asc)
+             .pluck(:component, :checked_at, :status)
+
+    rows
+      .group_by(&:first)
+      .transform_values do |component_rows|
+        component_rows
+          .map { |_, checked_at, status| [checked_at, status] }
+          .group_by { |checked_at, _| checked_at.to_date }
+          .map { |date, entries| aggregate_day(date, entries) }
+      end
+  end
+
+  # Single-query bulk version: returns { component => snapshot } for the latest per component
+  def self.latest_per_component
+    select('DISTINCT ON (component) *')
+      .order('component, checked_at DESC')
+      .index_by(&:component)
   end
 
-  private_class_method def self.aggregate_day(date, entries)
+  def self.aggregate_day(date, entries)
     total      = entries.size
     ok         = entries.count { |_, s| s == 'operational' }
     uptime_pct = (ok.to_f / total * 100).round(2)
     dominant   = entries.map { |_, s| s }.tally.max_by { |_, c| c }&.first
     { date: date, uptime_pct: uptime_pct, status: dominant }
   end
+  private_class_method :aggregate_day
 end

app/modules/inhouses/controllers/internal/inhouse_queues_controller.rb

@@ -9,7 +9,6 @@ module Internal
       class InhouseQueuesController < ApplicationController
         before_action :verify_internal_token
 
-        # GET /internal/api/inhouse_queues/active
         def active
           queues = InhouseQueue.check_in
                                .where('check_in_deadline > ?', Time.current)
@@ -28,10 +27,14 @@ def verify_internal_token
 
           render json: { error: 'unauthorized' }, status: :unauthorized and return unless token.present?
 
-          payload = JwtService.decode(token)
+          secret = ENV.fetch('INTERNAL_JWT_SECRET', nil)
+          render json: { error: 'unauthorized' }, status: :unauthorized and return unless secret.present?
+
+          decoded = JWT.decode(token, secret, true, { algorithm: 'HS256' })
+          payload = HashWithIndifferentAccess.new(decoded[0])
 
           render json: { error: 'forbidden' }, status: :forbidden and return unless payload[:type] == 'internal'
-        rescue JwtService::AuthenticationError
+        rescue JWT::DecodeError, JWT::ExpiredSignature
           render json: { error: 'unauthorized' }, status: :unauthorized
         end
 

app/modules/players/controllers/players_controller.rb

@@ -14,10 +14,7 @@ class PlayersController < Api::V1::BaseController
 
       # GET /api/v1/players
       def index
-        # Optimized query to prevent timeout during bulk sync operations
-        # PostgreSQL will allow concurrent reads even during updates (MVCC)
-        # Set a reasonable timeout to prevent 504s
-        ActiveRecord::Base.connection.execute("SET LOCAL statement_timeout = '5000'") # 5 seconds
+        ActiveRecord::Base.connection.execute("SET statement_timeout = '5000'")
 
         players = organization_scoped(Player).includes(:organization)
 
@@ -47,6 +44,8 @@ def index
           code: 'QUERY_TIMEOUT',
           status: :request_timeout
         )
+      ensure
+        ActiveRecord::Base.connection.execute("RESET statement_timeout") rescue nil
       end
 
       # GET /api/v1/players/:id

db/migrate/20260422000001_add_index_to_status_snapshots.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class AddIndexToStatusSnapshots < ActiveRecord::Migration[7.2]
+  disable_ddl_transaction!
+
+  def change
+    add_index :status_snapshots, %i[component checked_at],
+              order: { checked_at: :desc },
+              algorithm: :concurrently,
+              if_not_exists: true,
+              name: 'idx_status_snapshots_component_checked_at'
+  end
+end