rails-profiler 0.28.0 → 0.30.0

data/lib/profiler/cluster/master_client.rb

@@ -0,0 +1,79 @@
+# frozen_string_literal: true
+
+require "net/http"
+require "json"
+require "uri"
+
+module Profiler
+  module Cluster
+    class MasterClient
+      def start
+        @registered = false
+        begin
+          register!
+          @registered = true
+        rescue => e
+          log_warn("Could not register with master at startup: #{e.message} — will retry in heartbeat loop")
+        end
+        start_heartbeat_thread
+      end
+
+      private
+
+      def register!
+        config = Profiler.configuration
+        uri = URI("#{config.master_url}/_profiler/api/cluster/register")
+        body = { name: config.resolved_name, url: config.self_url }.to_json
+        resp = Net::HTTP.post(uri, body, "Content-Type" => "application/json")
+        unless resp.code.to_i.between?(200, 299)
+          raise "Master returned #{resp.code}: #{resp.body.to_s.slice(0, 200)}"
+        end
+
+        log_info("Registered with master at #{config.master_url} as '#{config.resolved_name}'")
+      end
+
+      def heartbeat!
+        config = Profiler.configuration
+        uri = URI("#{config.master_url}/_profiler/api/cluster/heartbeat")
+        body = { name: config.resolved_name }.to_json
+        resp = Net::HTTP.post(uri, body, "Content-Type" => "application/json")
+        raise "Heartbeat rejected #{resp.code}" unless resp.code.to_i.between?(200, 299)
+      end
+
+      def start_heartbeat_thread
+        Thread.new do
+          interval = Profiler.configuration.cluster_heartbeat_interval
+          loop do
+            sleep interval
+            unless @registered
+              register!
+              @registered = true
+              log_info("Re-registered with master after previous failure")
+            else
+              heartbeat!
+            end
+          rescue => e
+            @registered = false
+            log_warn("Cluster communication failed: #{e.message} — will retry")
+          end
+        end
+      end
+
+      def log_info(msg)
+        if defined?(Rails)
+          Rails.logger.info("[Profiler Cluster] #{msg}")
+        else
+          $stderr.puts("[Profiler Cluster] #{msg}")
+        end
+      end
+
+      def log_warn(msg)
+        if defined?(Rails)
+          Rails.logger.warn("[Profiler Cluster] #{msg}")
+        else
+          $stderr.puts("[Profiler Cluster] WARN #{msg}")
+        end
+      end
+    end
+  end
+end

data/lib/profiler/cluster/slave_proxy.rb

@@ -0,0 +1,106 @@
+# frozen_string_literal: true
+
+require "net/http"
+require "json"
+require "uri"
+
+module Profiler
+  module Cluster
+    class SlaveProxy
+      # A slow or hung slave must not block the master's request thread for long.
+      OPEN_TIMEOUT = 5  # seconds
+      READ_TIMEOUT = 10 # seconds
+
+      def initialize(slave_name)
+        entry = Profiler.slave_registry.find!(slave_name)
+        raise Profiler::Error, "Slave profiler '#{slave_name}' is offline" if entry.status == "offline"
+
+        @base_url = entry.url.to_s.chomp("/")
+      end
+
+      # Storage-compatible interface for MCP query tools
+
+      def list(limit: 50, offset: 0, **)
+        # all_types mirrors Profiler.storage.list, which returns every profile type;
+        # without it the proxy would only ever see http profiles (see ProfilesController#index).
+        data = get_json("/_profiler/api/profiles", limit: limit, offset: offset, all_types: true)
+        Array(data["profiles"]).map { |h| profile_from_api(h) }
+      end
+
+      def load(token)
+        data = get_json("/_profiler/api/profiles/#{token}")
+        return nil unless data["token"] || data["profile"]
+
+        raw = data["profile"] || data
+        profile_from_api(raw)
+      end
+
+      def clear(type: nil)
+        params = type ? "?type=#{URI.encode_www_form_component(type)}" : ""
+        delete_json("/_profiler/api/profiles/clear#{params}")
+      end
+
+      # Generic HTTP access for action tools
+
+      def get_json(path, params = {})
+        uri = build_uri(path, params)
+        request(uri, Net::HTTP::Get.new(uri))
+      end
+
+      def post_json(path, body = {})
+        request(*json_request(Net::HTTP::Post, path, body))
+      end
+
+      def patch_json(path, body = {})
+        request(*json_request(Net::HTTP::Patch, path, body))
+      end
+
+      def delete_json(path)
+        uri = build_uri(path)
+        request(uri, Net::HTTP::Delete.new(uri))
+      end
+
+      private
+
+      def build_uri(path, params = {})
+        uri = URI("#{@base_url}#{path}")
+        unless params.empty?
+          uri.query = URI.encode_www_form(params.compact.transform_values(&:to_s))
+        end
+        uri
+      end
+
+      def json_request(klass, path, body)
+        uri = build_uri(path)
+        req = klass.new(uri)
+        req["Content-Type"] = "application/json"
+        req.body = body.to_json
+        [uri, req]
+      end
+
+      def request(uri, req)
+        resp = Net::HTTP.start(uri.hostname, uri.port,
+                               open_timeout: OPEN_TIMEOUT, read_timeout: READ_TIMEOUT) do |http|
+          http.request(req)
+        end
+        return {} if resp.code == "204"
+
+        parse_response(resp)
+      end
+
+      def parse_response(resp)
+        return {} if resp.body.nil? || resp.body.empty?
+
+        JSON.parse(resp.body)
+      rescue JSON::ParserError
+        { "raw" => resp.body }
+      end
+
+      def profile_from_api(hash)
+        require_relative "../models/profile"
+        # from_hash expects symbol keys at the top level
+        Profiler::Models::Profile.from_hash(hash.transform_keys(&:to_sym))
+      end
+    end
+  end
+end

data/lib/profiler/cluster/slave_registry.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require "concurrent-ruby"
+
+module Profiler
+  module Cluster
+    class SlaveRegistry
+      Entry = Struct.new(:name, :url, :registered_at, :last_heartbeat_at, keyword_init: true) do
+        def status
+          threshold = Profiler.configuration.cluster_offline_threshold
+          (Time.now - last_heartbeat_at) < threshold ? "online" : "offline"
+        end
+
+        def to_h
+          super.merge(status: status).tap do |h|
+            h[:registered_at] = h[:registered_at]&.iso8601
+            h[:last_heartbeat_at] = h[:last_heartbeat_at]&.iso8601
+          end
+        end
+      end
+
+      def initialize
+        @slaves = Concurrent::Hash.new
+      end
+
+      def register(name:, url:)
+        now = Time.now
+        if (existing = @slaves[name])
+          existing.url = url
+          existing.last_heartbeat_at = now
+        else
+          @slaves[name] = Entry.new(name: name, url: url, registered_at: now, last_heartbeat_at: now)
+        end
+        @slaves[name]
+      end
+
+      def heartbeat(name)
+        @slaves[name]&.tap { |e| e.last_heartbeat_at = Time.now }
+      end
+
+      def find!(name)
+        @slaves[name] || raise(Profiler::Error, "Unknown slave profiler: #{name}")
+      end
+
+      def all
+        @slaves.values.map(&:to_h)
+      end
+    end
+  end
+end

data/lib/profiler/configuration.rb

@@ -14,7 +14,9 @@ module Profiler
                   :track_console,
                   :track_tests,
                   :track_mailers, :capture_mail_body, :sanitize_mailer_recipients, :mailer_skip_actions,
-                  :compress_bodies, :compress_body_threshold
+                  :compress_bodies, :compress_body_threshold,
+                  :name, :master_url, :self_url,
+                  :cluster_heartbeat_interval, :cluster_offline_threshold
 
     attr_writer :tmp_path
 
@@ -54,12 +56,29 @@ module Profiler
       @compress_bodies = true
       @compress_body_threshold = 10 * 1024 # 10 KB
       @tmp_path = nil
+      @name = nil
+      @master_url = nil
+      @self_url = nil
+      @cluster_heartbeat_interval = 15
+      @cluster_offline_threshold = 60
     end
 
     def tmp_path
       @tmp_path || default_tmp_path
     end
 
+    def slave?
+      !master_url.nil? && !master_url.empty?
+    end
+
+    def master?
+      !slave?
+    end
+
+    def resolved_name
+      @name || (defined?(Rails) ? Rails.application.class.module_parent_name.underscore : "profiler")
+    end
+
     def authorize_with(&block)
       @authorize_block = block
     end

data/lib/profiler/mcp/server.rb

@@ -59,6 +59,7 @@ module Profiler
       private
 
       def build_tools
+        require_relative "slave_support"
         require_relative "file_cache"
         require_relative "path_extractor"
         require_relative "body_formatter"
@@ -82,6 +83,9 @@ module Profiler
         require_relative "tools/delete_env_var"
         require_relative "tools/reset_env_var"
         require_relative "tools/reset_all_env_vars"
+        require_relative "tools/list_slaves"
+
+        slave_param = { type: "string", description: "Name of a connected slave profiler to target. Omit to use this profiler's own data." }
 
         [
           define_tool(
@@ -95,7 +99,8 @@ module Profiler
                 profile_type: { type: "string", description: "Filter by type: 'http' or 'job'" },
                 limit: { type: "number", description: "Maximum number of results (default 20)" },
                 fields: { type: "array", items: { type: "string" }, description: "Columns to include. Valid values: time, type, method, path, duration, queries, status, token. Omit for all." },
-                cursor: { type: "string", description: "Pagination cursor: ISO8601 timestamp of the last item seen. Returns profiles older than this." }
+                cursor: { type: "string", description: "Pagination cursor: ISO8601 timestamp of the last item seen. Returns profiles older than this." },
+                slave: slave_param
               }
             },
             handler: Tools::QueryProfiles
@@ -112,7 +117,8 @@ module Profiler
                 json_path: { type: "string", description: "JSONPath expression to extract from response body (e.g. '$.data.items[0]'). Only applied when save_bodies is true." },
                 xml_path: { type: "string", description: "XPath expression to extract from response body (e.g. '//items/item[1]/name'). Only applied when save_bodies is true." },
                 log_min_level: { type: "string", description: "Minimum log level to include in the logs section: DEBUG, INFO, WARN, ERROR, FATAL. Only applied when 'logs' section is requested." },
-                env_filter: { type: "string", description: "Required when requesting the env section. Case-insensitive substring filter on ENV key name (e.g. 'RAILS', 'DATABASE')." }
+                env_filter: { type: "string", description: "Required when requesting the env section. Case-insensitive substring filter on ENV key name (e.g. 'RAILS', 'DATABASE')." },
+                slave: slave_param
               },
               required: ["token"]
             },
@@ -124,7 +130,8 @@ module Profiler
             input_schema: {
               properties: {
                 token: { type: "string", description: "Profile token, or 'latest' for the most recent profile (required)" },
-                summary_only: { type: "boolean", description: "Return only the summary statistics section, skipping slow query and N+1 details." }
+                summary_only: { type: "boolean", description: "Return only the summary statistics section, skipping slow query and N+1 details." },
+                slave: slave_param
               },
               required: ["token"]
             },
@@ -136,7 +143,8 @@ module Profiler
             input_schema: {
               properties: {
                 token: { type: "string", description: "Profile token, or 'latest' for the most recent profile (required)" },
-                query_index: { type: "integer", description: "Zero-based index of the query within the profile's database queries list (required)" }
+                query_index: { type: "integer", description: "Zero-based index of the query within the profile's database queries list (required)" },
+                slave: slave_param
               },
               required: ["token", "query_index"]
             },
@@ -147,7 +155,8 @@ module Profiler
             description: "Get detailed AJAX sub-request breakdown for a profile. Use 'latest' as token to get the most recent profile.",
             input_schema: {
               properties: {
-                token: { type: "string", description: "Profile token, or 'latest' for the most recent profile (required)" }
+                token: { type: "string", description: "Profile token, or 'latest' for the most recent profile (required)" },
+                slave: slave_param
               },
               required: ["token"]
             },
@@ -158,7 +167,8 @@ module Profiler
             description: "Get variable dumps captured during a profile. Use 'latest' as token to get the most recent profile.",
             input_schema: {
               properties: {
-                token: { type: "string", description: "Profile token, or 'latest' for the most recent profile (required)" }
+                token: { type: "string", description: "Profile token, or 'latest' for the most recent profile (required)" },
+                slave: slave_param
               },
               required: ["token"]
             },
@@ -174,7 +184,8 @@ module Profiler
                 save_bodies: { type: "boolean", description: "Save request/response bodies to temp files and return paths instead of inlining content." },
                 max_body_size: { type: "number", description: "Truncate inlined body content at N characters. Ignored when save_bodies is true." },
                 json_path: { type: "string", description: "JSONPath expression to extract from response bodies (e.g. '$.data.items[0]'). Only applied when save_bodies is true." },
-                xml_path: { type: "string", description: "XPath expression to extract from response bodies (e.g. '//items/item[1]/name'). Only applied when save_bodies is true." }
+                xml_path: { type: "string", description: "XPath expression to extract from response bodies (e.g. '//items/item[1]/name'). Only applied when save_bodies is true." },
+                slave: slave_param
               },
               required: ["token"]
             },
@@ -190,7 +201,8 @@ module Profiler
                 action: { type: "string", description: "Filter by mailer action (partial match, e.g. 'welcome_email')" },
                 delivery_mode: { type: "string", description: "Filter by delivery mode: 'deliver_now', 'deliver_later', or 'queued'" },
                 save_bodies: { type: "boolean", description: "Save email bodies to temp files and return paths instead of inlining content." },
-                max_body_size: { type: "number", description: "Truncate inlined body content at N characters." }
+                max_body_size: { type: "number", description: "Truncate inlined body content at N characters." },
+                slave: slave_param
               },
               required: ["token"]
             },
@@ -205,7 +217,8 @@ module Profiler
                 status: { type: "string", description: "Filter by status (completed, failed)" },
                 limit: { type: "number", description: "Maximum number of results (default 20)" },
                 fields: { type: "array", items: { type: "string" }, description: "Columns to include. Valid values: time, job_class, queue, status, duration, token. Omit for all." },
-                cursor: { type: "string", description: "Pagination cursor: ISO8601 timestamp of the last item seen. Returns jobs older than this." }
+                cursor: { type: "string", description: "Pagination cursor: ISO8601 timestamp of the last item seen. Returns jobs older than this." },
+                slave: slave_param
               }
             },
             handler: Tools::QueryJobs
@@ -221,7 +234,8 @@ module Profiler
                 has_error: { type: "boolean", description: "Filter to only emails with delivery errors" },
                 limit: { type: "number", description: "Maximum number of results (default 20)" },
                 fields: { type: "array", items: { type: "string" }, description: "Columns to include. Valid values: time, profile, mailer, action, subject, to, mode, duration, status, token. Omit for all." },
-                cursor: { type: "string", description: "Pagination cursor: ISO8601 timestamp of the last item seen." }
+                cursor: { type: "string", description: "Pagination cursor: ISO8601 timestamp of the last item seen." },
+                slave: slave_param
               }
             },
             handler: Tools::QueryMailers
@@ -236,7 +250,8 @@ module Profiler
                 min_duration: { type: "number", description: "Minimum duration in milliseconds" },
                 limit: { type: "number", description: "Maximum number of results (default 20)" },
                 fields: { type: "array", items: { type: "string" }, description: "Columns to include. Valid values: time, test_name, status, duration, queries, n1, token. Omit for all." },
-                cursor: { type: "string", description: "Pagination cursor: ISO8601 timestamp of the last item seen." }
+                cursor: { type: "string", description: "Pagination cursor: ISO8601 timestamp of the last item seen." },
+                slave: slave_param
               }
             },
             handler: Tools::QueryTestProfiles
@@ -246,7 +261,8 @@ module Profiler
             description: "Get detailed data for a test profile: metadata, SQL queries, N+1 patterns, cache, exception. Use 'latest' as token for the most recent test.",
             input_schema: {
               properties: {
-                token: { type: "string", description: "Test profile token, or 'latest' for the most recent test profile (required)" }
+                token: { type: "string", description: "Test profile token, or 'latest' for the most recent test profile (required)" },
+                slave: slave_param
               },
               required: ["token"]
             },
@@ -273,7 +289,8 @@ module Profiler
                 max_output: {
                   type: "number",
                   description: "Maximum characters of output to return (tail). Default: 4000."
-                }
+                },
+                slave: slave_param
               }
             },
             handler: Tools::RunTests
@@ -288,7 +305,8 @@ module Profiler
                 min_duration: { type: "number", description: "Minimum duration in milliseconds" },
                 limit: { type: "number", description: "Maximum number of results (default 20)" },
                 fields: { type: "array", items: { type: "string" }, description: "Columns to include. Valid values: time, expression, return_value, status, duration, queries, token. Omit for all." },
-                cursor: { type: "string", description: "Pagination cursor: ISO8601 timestamp of the last item seen. Returns profiles older than this." }
+                cursor: { type: "string", description: "Pagination cursor: ISO8601 timestamp of the last item seen. Returns profiles older than this." },
+                slave: slave_param
               }
             },
             handler: Tools::QueryConsoleProfiles
@@ -298,7 +316,8 @@ module Profiler
             description: "Clear profiler history. Omit type to clear everything, or pass 'http', 'job', 'test', or 'console' to clear only that type.",
             input_schema: {
               properties: {
-                type: { type: "string", description: "Optional: 'http' to clear only requests, 'job' to clear only jobs, 'test' to clear only test profiles, 'console' to clear only console sessions" }
+                type: { type: "string", description: "Optional: 'http' to clear only requests, 'job' to clear only jobs, 'test' to clear only test profiles, 'console' to clear only console sessions" },
+                slave: slave_param
               }
             },
             handler: Tools::ClearProfiles
@@ -309,7 +328,8 @@ module Profiler
             input_schema: {
               properties: {
                 include_all: { type: "boolean", description: "If true, return all ENV variables (not just overrides). Default: false." },
-                filter: { type: "string", description: "Case-insensitive substring filter on key name." }
+                filter: { type: "string", description: "Case-insensitive substring filter on key name." },
+                slave: slave_param
               }
             },
             handler: Tools::ListEnvVars
@@ -320,7 +340,8 @@ module Profiler
             input_schema: {
               properties: {
                 key:   { type: "string", description: "Environment variable name (required)" },
-                value: { type: "string", description: "New value (required)" }
+                value: { type: "string", description: "New value (required)" },
+                slave: slave_param
               },
               required: ["key", "value"]
             },
@@ -331,7 +352,8 @@ module Profiler
             description: "Delete an environment variable for this session (persisted across restarts until reset).",
             input_schema: {
               properties: {
-                key: { type: "string", description: "Environment variable name (required)" }
+                key: { type: "string", description: "Environment variable name (required)" },
+                slave: slave_param
               },
               required: ["key"]
             },
@@ -342,7 +364,8 @@ module Profiler
             description: "Restore an overridden environment variable to its original value.",
             input_schema: {
               properties: {
-                key: { type: "string", description: "Environment variable name to restore (required)" }
+                key: { type: "string", description: "Environment variable name to restore (required)" },
+                slave: slave_param
               },
               required: ["key"]
             },
@@ -351,8 +374,14 @@ module Profiler
           define_tool(
             name: "reset_all_env_vars",
             description: "Restore all overridden environment variables to their original values.",
-            input_schema: { properties: {} },
+            input_schema: { properties: { slave: slave_param } },
             handler: Tools::ResetAllEnvVars
+          ),
+          define_tool(
+            name: "list_slaves",
+            description: "List all slave profilers connected to this master profiler, with their connection status.",
+            input_schema: { properties: {} },
+            handler: Tools::ListSlaves
           )
         ]
       end

data/lib/profiler/mcp/slave_support.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Profiler
+  module MCP
+    module SlaveSupport
+      def self.resolve_storage(params)
+        if (slave_name = params["slave"])
+          require_relative "../cluster/slave_proxy"
+          Cluster::SlaveProxy.new(slave_name)
+        else
+          Profiler.storage
+        end
+      end
+
+      def self.with_slave_proxy(params)
+        return nil unless params["slave"]
+
+        require_relative "../cluster/slave_proxy"
+        Cluster::SlaveProxy.new(params["slave"])
+      end
+    end
+  end
+end

data/lib/profiler/mcp/tools/analyze_queries.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative "../slave_support"
+
 module Profiler
   module MCP
     module Tools
@@ -15,10 +17,11 @@ module Profiler
             ]
           end
 
+          storage = MCP::SlaveSupport.resolve_storage(params)
           profile = if token == "latest"
-            Profiler.storage.list(limit: 1).first
+            storage.list(limit: 1).first
           else
-            Profiler.storage.load(token)
+            storage.load(token)
           end
           unless profile
             return [

data/lib/profiler/mcp/tools/clear_profiles.rb

@@ -1,5 +1,9 @@
 # frozen_string_literal: true
 
+require_relative "../slave_support"
+
+require "uri"
+
 module Profiler
   module MCP
     module Tools
@@ -11,7 +15,13 @@ module Profiler
             return [{ type: "text", text: "Error: type must be 'http', 'job', 'test', or 'console'" }]
           end
 
-          Profiler.storage.clear(type: type)
+          if (proxy = MCP::SlaveSupport.with_slave_proxy(params))
+            path = "/_profiler/api/profiles/clear"
+            path += "?type=#{URI.encode_www_form_component(type)}" if type
+            proxy.delete_json(path)
+          else
+            Profiler.storage.clear(type: type)
+          end
 
           label = type ? "#{type} profiles" : "all profiles"
           [{ type: "text", text: "Cleared #{label}." }]

data/lib/profiler/mcp/tools/delete_env_var.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative "../slave_support"
+
 module Profiler
   module MCP
     module Tools
@@ -9,6 +11,11 @@ module Profiler
 
           return [{ type: "text", text: "Error: key cannot be blank." }] if key.empty?
 
+          if (proxy = MCP::SlaveSupport.with_slave_proxy(params))
+            proxy.patch_json("/_profiler/api/env_vars", { key: key, value: "" })
+            return [{ type: "text", text: "Deleted #{key} on slave '#{params["slave"]}'. Override persisted across restarts until reset." }]
+          end
+
           Profiler.env_override_store.delete(key)
           ENV.delete(key)
 

data/lib/profiler/mcp/tools/explain_query.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative "../slave_support"
+
 require "profiler/explain_runner"
 
 module Profiler
@@ -18,6 +20,12 @@ module Profiler
             return [{ type: "text", text: "Error: query_index parameter is required" }]
           end
 
+          if (proxy = MCP::SlaveSupport.with_slave_proxy(params))
+            result = proxy.post_json("/_profiler/api/explain", { token: token, query_index: query_index.to_i })
+            text = result["error"] ? "Error: #{result["error"]}" : result.inspect
+            return [{ type: "text", text: text }]
+          end
+
           unless Profiler.configuration.enabled
             return [{ type: "text", text: "Error: EXPLAIN is only available when the profiler is enabled" }]
           end

data/lib/profiler/mcp/tools/get_profile_ajax.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative "../slave_support"
+
 module Profiler
   module MCP
     module Tools
@@ -10,10 +12,11 @@ module Profiler
             return [{ type: "text", text: "Error: token parameter is required" }]
           end
 
+          storage = MCP::SlaveSupport.resolve_storage(params)
           profile = if token == "latest"
-            Profiler.storage.list(limit: 1).first
+            storage.list(limit: 1).first
           else
-            Profiler.storage.load(token)
+            storage.load(token)
           end
           unless profile
             return [{ type: "text", text: "Profile not found: #{token}" }]

data/lib/profiler/mcp/tools/get_profile_detail.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative "../slave_support"
+
 require "shellwords"
 require "cgi"
 
@@ -18,10 +20,11 @@ module Profiler
             ]
           end
 
+          storage = MCP::SlaveSupport.resolve_storage(params)
           profile = if token == "latest"
-            Profiler.storage.list(limit: 1).first
+            storage.list(limit: 1).first
           else
-            Profiler.storage.load(token)
+            storage.load(token)
           end
           unless profile
             return [