rails-profiler 0.4.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e97a77a23dca55d709a1512c3c2ab3b95f0e6b15ed01b7769852587b962be8a
-  data.tar.gz: 131c40f561129e8835c41a0b3ba456431bb11fe791c8b0add6396fbbfe0be293
+  metadata.gz: 8a0b42cc0bcdfe940609dbb07f9ee29a23cd00495c738711950749b22e58d664
+  data.tar.gz: b61678855bf48c082f4776773ce1754328c4e6b6d1672ea2542a836f79d9602a
 SHA512:
-  metadata.gz: 7565ae06d41a7bd2d574610962e20fc3c4a6fcba5bda89482e840fb09af57c686eff9e8f4ccb02bfde05d53e0b5cc8019622ee7ea4db44fc85d6f5a0bc09c8c6
-  data.tar.gz: bea8aee55cc58b41fc6d01c2ad4dffcdd9ecfdfc4617a45ba16b019577ad5209a2bcae5c9d226d0d5e31af1fbb3e508db8a7e3eae25c5c87f920dcad3e48d1f8
+  metadata.gz: bde96bed30d2bc7fda19f62a10a2a1b9d55e1e73b83bc91ae0bba63ae7fb58a0d66ca692cb3db7ca66d17c29cfc69d190123095d6cc8f428e33e4d3030733b70
+  data.tar.gz: 310c1ddfc31ab16fddd783db87e24bbe10a5c48058f678215f389f66056ede8af928438f7a350fd4f9ab8828f49f6daf4cdffd4f41634c76b3f9d1f0a0840f0f

data/lib/profiler/instrumentation/active_job_instrumentation.rb

@@ -12,7 +12,7 @@ module Profiler
             job_id: job.job_id,
             queue: job.queue_name,
             arguments: job.arguments,
-            executions: job.executions,
+            executions: job.executions - 1,
             &block
           )
         end

data/lib/profiler/instrumentation/net_http_instrumentation.rb

@@ -4,6 +4,7 @@ require "net/http"
 require "base64"
 require "zlib"
 require "stringio"
+require "securerandom"
 
 module Profiler
   module Instrumentation
@@ -22,6 +23,8 @@ module Profiler
           url = build_url(host, port, req.path, use_ssl?)
           req_body = req.body.to_s
           req_headers = req.to_hash.transform_values { |v| v.join(", ") }
+          request_id = SecureRandom.hex(8)
+          started_at = Time.now.iso8601(3)
           t0 = Process.clock_gettime(Process::CLOCK_MONOTONIC)
           Thread.current[:profiler_http_recording] = true
 
@@ -40,6 +43,8 @@ module Profiler
           t1 = Process.clock_gettime(Process::CLOCK_MONOTONIC)
 
           collector.record_request(
+            id: request_id,
+            started_at: started_at,
             url: url,
             method: req.method,
             status: response.code.to_i,
@@ -63,6 +68,8 @@ module Profiler
           if defined?(t0) && t0
             duration = ((Process.clock_gettime(Process::CLOCK_MONOTONIC) - t0) * 1000).round(2)
             collector&.record_request(
+              id: defined?(request_id) ? request_id : SecureRandom.hex(8),
+              started_at: defined?(started_at) ? started_at : Time.now.iso8601(3),
               url: url,
               method: req.method,
               status: 0,

data/lib/profiler/mcp/body_formatter.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module Profiler
+  module MCP
+    module BodyFormatter
+      # Formats a body string for MCP output.
+      #
+      # params keys used:
+      #   "save_bodies"   (boolean) — save to /tmp/rails-profiler/{token}/{name} and return path
+      #   "max_body_size" (number)  — truncate inline body at N chars
+      #   "json_path"     (string)  — JSONPath to extract from body when save_bodies is true
+      #   "xml_path"      (string)  — XPath to extract from body when save_bodies is true
+      #
+      # Returns a formatted string ready to embed in markdown, or nil if body is blank.
+      def self.format_body(token, name, body, encoding, params)
+        return "  *(binary, base64 encoded)*" if encoding == "base64"
+        return nil if body.nil? || body.empty?
+
+        if params["save_bodies"]
+          path = FileCache.save(token, name, body)
+          if path
+            result = "  *(saved → `#{path}`)*"
+            if params["json_path"]
+              extracted = PathExtractor.extract_json(body, params["json_path"])
+              result += "\n  `#{params['json_path']}` → `#{extracted}`"
+            elsif params["xml_path"]
+              extracted = PathExtractor.extract_xml(body, params["xml_path"])
+              result += "\n  `#{params['xml_path']}` → `#{extracted}`"
+            end
+            result
+          else
+            truncate_body(body, params["max_body_size"])
+          end
+        else
+          truncate_body(body, params["max_body_size"])
+        end
+      end
+
+      def self.truncate_body(body, max_size)
+        max = max_size&.to_i
+        content = if max && body.length > max
+          "#{body[0, max]}\n... [truncated, #{body.length} chars total]"
+        else
+          body
+        end
+        "```\n#{content}\n```"
+      end
+    end
+  end
+end

data/lib/profiler/mcp/file_cache.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require "fileutils"
+
+module Profiler
+  module MCP
+    class FileCache
+      BASE_DIR = "/tmp/rails-profiler"
+
+      def self.save(token, name, content)
+        cleanup if rand < 0.05
+
+        dir = File.join(BASE_DIR, token)
+        FileUtils.mkdir_p(dir)
+        path = File.join(dir, name)
+        File.write(path, content)
+        path
+      rescue Errno::EACCES, Errno::EROFS
+        nil
+      end
+
+      def self.cleanup(max_age: 3600)
+        return unless Dir.exist?(BASE_DIR)
+
+        Dir.glob(File.join(BASE_DIR, "*")).each do |dir|
+          FileUtils.rm_rf(dir) if File.directory?(dir) && (Time.now - File.mtime(dir)) > max_age
+        end
+      end
+    end
+  end
+end

data/lib/profiler/mcp/path_extractor.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require "json"
+
+module Profiler
+  module MCP
+    module PathExtractor
+      # Supports dot-notation JSONPath: $.key, $.key.sub, $.array[0].key
+      def self.extract_json(content, path)
+        data = JSON.parse(content)
+        segments = path.sub(/\A\$\.?/, "").split(".").flat_map do |seg|
+          seg =~ /\A(.+)\[(\d+)\]\z/ ? [$1, $2.to_i] : [seg]
+        end
+        result = segments.reduce(data) do |obj, seg|
+          obj.is_a?(Array) ? obj[seg.to_i] : obj[seg]
+        end
+        JSON.generate(result)
+      rescue => e
+        "JSONPath error: #{e.message}"
+      end
+
+      def self.extract_xml(content, xpath)
+        require "nokogiri"
+        Nokogiri::XML(content).xpath(xpath).to_s
+      rescue => e
+        "XPath error: #{e.message}"
+      end
+    end
+  end
+end

data/lib/profiler/mcp/server.rb

@@ -59,6 +59,9 @@ module Profiler
       private
 
       def build_tools
+        require_relative "file_cache"
+        require_relative "path_extractor"
+        require_relative "body_formatter"
         require_relative "tools/query_profiles"
         require_relative "tools/get_profile_detail"
         require_relative "tools/analyze_queries"
@@ -78,17 +81,24 @@ module Profiler
                 method: { type: "string", description: "Filter by HTTP method (GET, POST, etc.)" },
                 min_duration: { type: "number", description: "Minimum duration in milliseconds" },
                 profile_type: { type: "string", description: "Filter by type: 'http' or 'job'" },
-                limit: { type: "number", description: "Maximum number of results" }
+                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." }
               }
             },
             handler: Tools::QueryProfiles
           ),
           define_tool(
             name: "get_profile",
-            description: "Get detailed profile data by token",
+            description: "Get detailed profile data by token. Use 'latest' as token to get the most recent profile.",
             input_schema: {
               properties: {
-                token: { type: "string", description: "Profile token (required)" }
+                token: { type: "string", description: "Profile token, or 'latest' for the most recent profile (required)" },
+                sections: { type: "array", items: { type: "string" }, description: "Sections to include. Valid values: overview, exception, job, request, response, curl, database, performance, views, cache, ajax, http, routes, dumps. Omit for all." },
+                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 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." }
               },
               required: ["token"]
             },
@@ -96,10 +106,11 @@ module Profiler
           ),
           define_tool(
             name: "analyze_queries",
-            description: "Analyze SQL queries for N+1 problems, duplicates, and slow queries",
+            description: "Analyze SQL queries for N+1 problems, duplicates, and slow queries. Use 'latest' as token to analyze the most recent profile.",
             input_schema: {
               properties: {
-                token: { type: "string", description: "Profile token (required)" }
+                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." }
               },
               required: ["token"]
             },
@@ -107,10 +118,10 @@ module Profiler
           ),
           define_tool(
             name: "get_profile_ajax",
-            description: "Get detailed AJAX sub-request breakdown for a profile",
+            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 (required)" }
+                token: { type: "string", description: "Profile token, or 'latest' for the most recent profile (required)" }
               },
               required: ["token"]
             },
@@ -118,10 +129,10 @@ module Profiler
           ),
           define_tool(
             name: "get_profile_dumps",
-            description: "Get variable dumps captured during a profile",
+            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 (required)" }
+                token: { type: "string", description: "Profile token, or 'latest' for the most recent profile (required)" }
               },
               required: ["token"]
             },
@@ -129,10 +140,15 @@ module Profiler
           ),
           define_tool(
             name: "get_profile_http",
-            description: "Get outbound HTTP request breakdown for a profile (external API calls made during the request)",
+            description: "Get outbound HTTP request breakdown for a profile (external API calls made during the request). Use 'latest' as token to get the most recent profile.",
             input_schema: {
               properties: {
-                token: { type: "string", description: "Profile token (required)" }
+                token: { type: "string", description: "Profile token, or 'latest' for the most recent profile (required)" },
+                domain: { type: "string", description: "Filter outbound requests by domain (partial match on host)" },
+                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." }
               },
               required: ["token"]
             },
@@ -145,7 +161,9 @@ module Profiler
               properties: {
                 queue: { type: "string", description: "Filter by queue name" },
                 status: { type: "string", description: "Filter by status (completed, failed)" },
-                limit: { type: "number", description: "Maximum number of results" }
+                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." }
               }
             },
             handler: Tools::QueryJobs

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

@@ -15,7 +15,11 @@ module Profiler
             ]
           end
 
-          profile = Profiler.storage.load(token)
+          profile = if token == "latest"
+            Profiler.storage.list(limit: 1).first
+          else
+            Profiler.storage.load(token)
+          end
           unless profile
             return [
               {
@@ -35,7 +39,8 @@ module Profiler
             ]
           end
 
-          text = analyze_and_format(db_data["queries"])
+          summary_only = params["summary_only"] == true || params["summary_only"] == "true"
+          text = analyze_and_format(db_data["queries"], summary_only: summary_only)
 
           [
             {
@@ -47,58 +52,55 @@ module Profiler
 
         private
 
-        def self.analyze_and_format(queries)
+        def self.analyze_and_format(queries, summary_only: false)
           lines = []
           lines << "# SQL Query Analysis\n"
 
-          # Detect slow queries
           slow_threshold = Profiler.configuration.slow_query_threshold
           slow_queries = queries.select { |q| q["duration"] > slow_threshold }
-
-          if slow_queries.any?
-            lines << "## ⚠️ Slow Queries (> #{slow_threshold}ms)"
-            lines << "Found #{slow_queries.size} slow queries:\n"
-
-            slow_queries.first(5).each_with_index do |query, index|
-              lines << "### Query #{index + 1} - #{query['duration'].round(2)}ms"
-              lines << "```sql"
-              lines << query['sql']
-              lines << "```\n"
-            end
-
-            if slow_queries.size > 5
-              lines << "_... and #{slow_queries.size - 5} more slow queries_\n"
-            end
-          else
-            lines << "## ✅ No Slow Queries"
-            lines << "All queries executed in less than #{slow_threshold}ms\n"
-          end
-
-          # Detect duplicate queries (potential N+1)
           query_counts = queries.group_by { |q| normalize_sql(q["sql"]) }
                                .transform_values(&:count)
                                .select { |_, count| count > 1 }
 
-          if query_counts.any?
-            lines << "## ⚠️ Duplicate Queries (Potential N+1)"
-            lines << "Found #{query_counts.size} duplicate query patterns:\n"
-
-            query_counts.sort_by { |_, count| -count }.first(5).each do |sql, count|
-              lines << "### Executed #{count} times:"
-              lines << "```sql"
-              lines << sql
-              lines << "```\n"
+          unless summary_only
+            # Detect slow queries
+            if slow_queries.any?
+              lines << "## ⚠️ Slow Queries (> #{slow_threshold}ms)"
+              lines << "Found #{slow_queries.size} slow queries:\n"
+
+              slow_queries.first(5).each_with_index do |query, index|
+                lines << "### Query #{index + 1} - #{query['duration'].round(2)}ms"
+                lines << "```sql"
+                lines << query["sql"]
+                lines << "```\n"
+              end
+
+              lines << "_... and #{slow_queries.size - 5} more slow queries_\n" if slow_queries.size > 5
+            else
+              lines << "## ✅ No Slow Queries"
+              lines << "All queries executed in less than #{slow_threshold}ms\n"
             end
 
-            if query_counts.size > 5
-              lines << "_... and #{query_counts.size - 5} more duplicate patterns_\n"
+            # Detect duplicate queries (potential N+1)
+            if query_counts.any?
+              lines << "## ⚠️ Duplicate Queries (Potential N+1)"
+              lines << "Found #{query_counts.size} duplicate query patterns:\n"
+
+              query_counts.sort_by { |_, count| -count }.first(5).each do |sql, count|
+                lines << "### Executed #{count} times:"
+                lines << "```sql"
+                lines << sql
+                lines << "```\n"
+              end
+
+              lines << "_... and #{query_counts.size - 5} more duplicate patterns_\n" if query_counts.size > 5
+            else
+              lines << "## ✅ No Duplicate Queries"
+              lines << "No potential N+1 query problems detected\n"
             end
-          else
-            lines << "## ✅ No Duplicate Queries"
-            lines << "No potential N+1 query problems detected\n"
           end
 
-          # Overall statistics
+          # Summary statistics always included
           lines << "## Summary Statistics"
           lines << "- **Total Queries:** #{queries.size}"
           lines << "- **Total Duration:** #{queries.sum { |q| q['duration'] }.round(2)}ms"
@@ -111,11 +113,10 @@ module Profiler
         end
 
         def self.normalize_sql(sql)
-          # Normalize SQL by removing bind values for comparison
-          sql.gsub(/\$\d+/, '?')
-             .gsub(/\b\d+\b/, '?')
-             .gsub(/'[^']*'/, '?')
-             .gsub(/"[^"]*"/, '?')
+          sql.gsub(/\$\d+/, "?")
+             .gsub(/\b\d+\b/, "?")
+             .gsub(/'[^']*'/, "?")
+             .gsub(/"[^"]*"/, "?")
              .strip
         end
       end

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

@@ -10,7 +10,11 @@ module Profiler
             return [{ type: "text", text: "Error: token parameter is required" }]
           end
 
-          profile = Profiler.storage.load(token)
+          profile = if token == "latest"
+            Profiler.storage.list(limit: 1).first
+          else
+            Profiler.storage.load(token)
+          end
           unless profile
             return [{ type: "text", text: "Profile not found: #{token}" }]
           end