simple_apm 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac42ca5ebe7f45973a953586a00e22bb887d77da218f11ddf734dfb90975cbf8
-  data.tar.gz: d6ae570304dd85c0cb7bbc726fb42435f7a2d0ec461d6f2f3e56796bfed68353
+  metadata.gz: d98ff928f6478abea71e3375957adc7de6d5a3865019be549026b4d615b58fa0
+  data.tar.gz: ee6fbdf30feb8499da5ca323931272b6d270d41ccdf9cadc86213d7da5fd50ac
 SHA512:
-  metadata.gz: 83534ce017f1502595622764a2768be13d26f47d271e00dbd5b39d44d3870031862d9e936a1d1c7bd4ec29c52ddf99088c8f42b7f866edc135d9975f4d9a86fb
-  data.tar.gz: b1ed3284d308e6f6c7694899887dc5734e0f7dbf38252374a509c2fc6d8990c6e20d7a3078c6c8d0e2836735e3e7a662d74a8e10335d859fd02e024d13623295
+  metadata.gz: 7b51b09db54530aac2a6e75058c815b6f7f1f3e7abd09c28b7791723722b699ab5e2a378170b074dc06f25a7baba0ea01c61ca5149e6778343d55a49495be81b
+  data.tar.gz: 81fec7c8dbb538bf21928426aa21bfc110300f28e19fd18de1b6cc5784fa0d4237765d50015c02f6985cd7516af1cc71f993fc3433f52eb33ca133c3f83b4fe5

data/README.md

@@ -13,6 +13,10 @@ SimpleApm records request performance by day:
 
 The web UI supports English and Chinese. English is used by default, and users can switch languages from the top-right corner.
 
+Action and request detail pages include **Copy for AI** with a JSON preview. Request reports include metadata, timings in seconds, memory in MB, retained SQL and external HTTP calls with code locations. Action reports add daily aggregates and the retained fastest, slowest and slow request samples, marking unavailable details explicitly. Common credential fields and SQL string literals are filtered; reports describe collection thresholds and sampling limits. Clipboard copying includes a fallback for HTTP deployments and manual selection when browser copying is unavailable.
+
+Lists support search and precise duration sorting. Slow requests offer a sample limit and refresh controls, while date-aware links keep the selected day's context across pages. Data cleanup and collection controls use POST forms with confirmation for destructive operations.
+
 ## How It Works
 
 SimpleApm records request-level data around Rack and uses Redis for storage and aggregation.

data/app/assets/javascripts/simple_apm/application.js

@@ -12,4 +12,98 @@
 //
 //= require_tree .
 
+(function ($) {
+  'use strict';
+
+  var config = JSON.parse(document.getElementById('apm-ui-config').textContent);
+  window.SimpleApmUI = {
+    tableOptions: function (overrides) {
+      return $.extend(true, {language: config.table, pageLength: 25, processing: true}, overrides);
+    }
+  };
+
+  $.extend($.fn.dataTableExt.oSort, {
+    'sec-pre': function (value) {
+      var exactSeconds = String(value).match(/data-seconds="([^"]+)"/);
+      if (exactSeconds) return parseFloat(exactSeconds[1]) || 0;
+      var text = String(value).replace(/<[^>]*>/g, '').replace(/&(?:amp;)?nbsp;/g, '').trim();
+      var number = parseFloat(text) || 0;
+      if (/ms\b/.test(text)) return number / 1000;
+      if (/min\b/.test(text)) return number * 60;
+      return number;
+    },
+    'sec-asc': function (a, b) { return a - b; },
+    'sec-desc': function (a, b) { return b - a; }
+  });
+  $.fn.dataTable.ext.errMode = 'none';
+
+  function fallbackCopy(text) {
+    var input = document.createElement('textarea');
+    input.value = text;
+    input.setAttribute('readonly', '');
+    input.style.position = 'fixed';
+    input.style.top = '0';
+    input.style.opacity = '0';
+    // Keep the temporary input inside a modal so Bootstrap's focus trap allows selection.
+    (document.querySelector('.modal.in .apm-modal-body') || document.body).appendChild(input);
+    input.select();
+    var copied = false;
+    try { copied = document.execCommand('copy'); } catch (error) { copied = false; }
+    input.remove();
+    return copied;
+  }
+
+  $(function () {
+    $('.select-apm-date select').on('change', function () { this.form.submit(); });
+    $(document).on('submit', 'form[data-confirm]', function () {
+      return window.confirm(this.getAttribute('data-confirm'));
+    });
+    $(document).on('click', 'a[data-confirm]', function () {
+      return window.confirm(this.getAttribute('data-confirm'));
+    });
+    $(document).on('error.dt', 'table', function () {
+      $(this).closest('.apm-panel').find('.apm-table-feedback').text(config.load_error);
+    });
+    $(document).on('xhr.dt', 'table', function (event, settings, data) {
+      if (data) $(this).closest('.apm-panel').find('.apm-table-feedback').text('');
+    });
+
+    $(document).on('click', '.sql', function () {
+      $('#sql-modal-text').text(this.textContent);
+      $('#sql-modal .apm-copy-status').text('');
+      $('#sql-modal').modal('show');
+    });
+
+    $(document).on('click', '[data-copy-target]', function () {
+      var button = this;
+      var target = document.getElementById(button.getAttribute('data-copy-target'));
+      var text = target.value === undefined ? target.textContent : target.value;
+      var status = $(button).closest('.apm-panel, .apm-modal-panel').find('.apm-copy-status');
+      button.disabled = true;
+
+      function finish(copied) {
+        button.disabled = false;
+        status.text(copied ? config.copied : config.copy_failed);
+        if (copied) {
+          button.focus();
+        } else if (target.tagName === 'TEXTAREA') {
+          $(target).closest('details').prop('open', true);
+          target.focus();
+          target.select();
+        }
+      }
+
+      if (navigator.clipboard && window.isSecureContext) {
+        navigator.clipboard.writeText(text).then(function () {
+          finish(true);
+        }, function () {
+          finish(fallbackCopy(text));
+        });
+      } else {
+        finish(fallbackCopy(text));
+      }
+    });
+  });
+})(jQuery);
+
 

data/app/assets/stylesheets/simple_apm/application.css

@@ -26,9 +26,9 @@
   --apm-brand-dark: #0b4f4a;
   --apm-accent: #2563eb;
   --apm-danger: #dc2626;
-  --apm-warning: #d97706;
+  --apm-warning: #a35b05;
   --apm-success: #15803d;
-  --apm-shadow: 0 16px 40px rgba(15, 23, 42, 0.08);
+  --apm-shadow: 0 2px 8px rgba(15, 23, 42, 0.04);
 }
 
 body.simple-apm {
@@ -37,6 +37,7 @@ body.simple-apm {
   color: var(--apm-ink);
   font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Helvetica Neue", Arial, sans-serif;
   font-size: 14px;
+  line-height: 1.6;
   letter-spacing: 0;
 }
 
@@ -106,7 +107,7 @@ body.simple-apm {
 .apm-nav .navbar-brand {
   float: none;
   height: auto;
-  padding: 9px 12px;
+  padding: 13px 12px;
   color: #cbd5e1;
   font-size: 13px;
   line-height: 18px;
@@ -200,6 +201,7 @@ body.simple-apm {
   margin: 7px 0 0;
   color: var(--apm-muted);
   font-size: 13px;
+  overflow-wrap: anywhere;
 }
 
 .apm-toolbar {
@@ -242,6 +244,8 @@ body.simple-apm {
   margin-top: 18px;
 }
 
+.apm-grid > .apm-panel { margin-top: 0; }
+
 .apm-panel-header {
   display: flex;
   align-items: center;
@@ -302,6 +306,7 @@ body.simple-apm {
   line-height: 1.2;
   font-weight: 700;
   word-break: break-word;
+  font-variant-numeric: tabular-nums;
 }
 
 .apm-stat-meta {
@@ -359,6 +364,11 @@ body.simple-apm {
   border-top: 1px solid #eef2f7;
   color: #243044;
   vertical-align: middle;
+  font-variant-numeric: tabular-nums;
+}
+
+.simple-apm table.table tbody tr:hover td {
+  background: var(--apm-surface-soft);
 }
 
 .simple-apm table.table-bordered {
@@ -415,6 +425,11 @@ body.simple-apm {
 .simple-apm .btn {
   border-radius: 6px;
   font-weight: 600;
+  min-height: 40px;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  padding: 8px 14px;
 }
 
 .simple-apm a.btn,
@@ -501,6 +516,10 @@ pre {
   padding: 14px 18px;
   border-bottom: 1px solid var(--apm-border);
   background: var(--apm-surface-soft);
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 12px;
 }
 
 .apm-modal-title {
@@ -547,6 +566,62 @@ pre {
   color: #475467;
 }
 
+.simple-apm :focus-visible {
+  outline: 3px solid var(--apm-accent);
+  outline-offset: 3px;
+}
+
+.apm-skip-link {
+  position: fixed;
+  top: -100px;
+  left: 16px;
+  z-index: 1100;
+  padding: 12px;
+  background: var(--apm-surface);
+}
+
+.apm-skip-link:focus { top: 8px; }
+
+.apm-date-form {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  width: 100%;
+}
+
+.apm-date-form label { margin: 0; white-space: nowrap; }
+
+.simple-apm a.apm-button-secondary,
+.simple-apm .apm-button-secondary {
+  background: var(--apm-surface);
+  border: 1px solid var(--apm-border-strong);
+  color: var(--apm-ink);
+}
+
+.simple-apm .apm-button-secondary:hover { background: var(--apm-surface-soft); color: var(--apm-accent); }
+.apm-toolbar-actions form { margin: 0; }
+#sample-limit { width: auto; min-width: 80px; }
+.apm-metrics-compact { grid-template-columns: repeat(3, minmax(0, 1fr)); }
+.apm-mono { font-family: Menlo, Monaco, Consolas, monospace; font-size: 12px; overflow-wrap: anywhere; }
+.apm-stat-hint { color: var(--apm-muted); font-size: 12px; margin: 8px 0 0; }
+.apm-breadcrumb { margin: 0 0 16px; color: var(--apm-muted); display: flex; gap: 8px; flex-wrap: wrap; }
+.apm-empty-state { padding: 40px 24px; text-align: center; color: var(--apm-muted); }
+.apm-empty-state .apm-toolbar-actions { justify-content: center; margin-top: 20px; }
+.apm-notice { padding: 12px 16px; margin-bottom: 18px; background: #d1fae5; border: 1px solid #a7f3d0; color: #065f46; border-radius: 8px; }
+.apm-copy-status, .apm-table-feedback { color: var(--apm-brand-dark); margin: 8px 0 0; }
+.apm-copy-status:empty, .apm-table-feedback:empty { display: none; }
+.apm-report-text { margin-top: 12px; width: 100%; resize: vertical; border: 1px solid var(--apm-border); border-radius: 6px; background: var(--apm-surface-soft); padding: 14px; line-height: 1.6; }
+.simple-apm summary { cursor: pointer; color: var(--apm-accent); padding: 8px 0; }
+.simple-apm button.sql { border: 0; background: transparent; padding: 4px 0; text-align: left; }
+.apm-runtime-row { display: grid; grid-template-columns: 90px minmax(0, 1fr) 110px; align-items: center; gap: 16px; margin: 10px 0; }
+.apm-runtime-row meter { width: 100%; height: 14px; accent-color: var(--apm-brand); }
+.apm-runtime-row span:last-child { text-align: right; font-variant-numeric: tabular-nums; }
+.apm-status-neutral { background: #e2e8f0; color: #334155; }
+
+@media (prefers-reduced-motion: reduce) {
+  .simple-apm *, .simple-apm *::before, .simple-apm *::after { animation: none !important; transition: none !important; }
+}
+
 @media (max-width: 980px) {
   .apm-topbar-inner,
   .apm-content,
@@ -583,7 +658,7 @@ pre {
     grid-column: span 12;
   }
 
-  .apm-metrics {
+  .apm-metrics, .apm-metrics-compact {
     grid-template-columns: repeat(2, minmax(0, 1fr));
   }
 }
@@ -599,7 +674,7 @@ pre {
   }
 
   .apm-language-switch {
-    width: 100%;
+    width: auto;
     justify-content: center;
   }
 
@@ -615,11 +690,21 @@ pre {
     font-size: 22px;
   }
 
-  .apm-metrics {
-    grid-template-columns: 1fr;
+  .apm-metrics, .apm-metrics-compact {
+    grid-template-columns: repeat(2, minmax(0, 1fr));
   }
 
+  .apm-metrics .apm-stat:last-child:nth-child(odd) { grid-column: 1 / -1; }
+  .apm-stat-value { font-size: 18px; }
+
   .apm-detail-list {
     grid-template-columns: 1fr;
   }
+
+  .apm-panel-header { flex-wrap: wrap; }
+  .apm-runtime-row { grid-template-columns: 60px minmax(0, 1fr) 90px; gap: 8px; }
+  .apm-nav { gap: 2px; }
+  .apm-nav .navbar-brand { white-space: nowrap; padding: 12px 8px; font-size: 12px; }
+  .simple-apm .btn { min-height: 44px; }
+  .simple-apm .dataTables_wrapper .dataTables_filter input { max-width: 160px; }
 }

data/app/controllers/simple_apm/apm_controller.rb

@@ -8,27 +8,32 @@ module SimpleApm
     def dashboard
       d = SimpleApm::RedisKey.query_date == Time.now.strftime('%Y-%m-%d') ? Time.now.strftime('%H:%M') : '23:50'
       data = SimpleApm::Hit.chart_data(0, d)
+      hits = data.values.sum { |point| point[:hits].to_i }
+      time = data.values.sum { |point| point[:time].to_f }
+      @daily_stats = {hits: hits, time: time, avg_time: hits.zero? ? 0 : time / hits}
       @x_names = data.keys.sort
       @time_arr = @x_names.map {|n| data[n][:hits].to_i.zero? ? 0 : (data[n][:time].to_f / data[n][:hits].to_i).round(3)}
       @hits_arr = @x_names.map {|n| data[n][:hits] rescue 0}
     end
 
     def index
+      @sample_limit = [[(params[:count].presence || 200).to_i, 1].max, SimpleApm::Setting::SLOW_ACTIONS_LIMIT.to_i].min
       respond_to do |format|
         format.json do
-          @slow_requests = SimpleApm::SlowRequest.list(params[:count] || 200).map do |r|
-            request = r.request rescue next
+          @slow_requests = SimpleApm::SlowRequest.list(@sample_limit).map do |r|
+            request = r.request
+            next unless request
             [
-              link_to(time_label(request.started), show_path(id: request.request_id)),
-              link_to(request.action_name, action_info_path(action_name: request.action_name)),
-              sec_str(request.during),
-              sec_str(request.db_runtime),
+              link_to(time_label(request.started), show_path(id: request.request_id, apm_date: apm_date)),
+              link_to(request.action_name, action_info_path(action_name: request.action_name, apm_date: apm_date)),
+              duration_cell(request.during),
+              duration_cell(request.db_runtime),
               request.queries_count,
-              sec_str(request.view_runtime),
-              sec_str(request.net_http_during),
+              duration_cell(request.view_runtime),
+              duration_cell(request.net_http_during),
               request.memory_during.to_f.round(1),
-              request.host,
-              request.remote_addr
+              ERB::Util.html_escape(request.host),
+              ERB::Util.html_escape(request.remote_addr)
             ]
           end.compact
           render json: {data: @slow_requests}
@@ -39,6 +44,7 @@ module SimpleApm
 
     def show
       @request = SimpleApm::Request.find(params[:id])
+      render :missing, status: :not_found unless @request
     end
 
     def actions
@@ -47,6 +53,7 @@ module SimpleApm
 
     def action_info
       @action = SimpleApm::Action.find(params[:action_name])
+      render :missing, status: :not_found if @action.click_count.to_i.zero?
     end
 
     def change_date
@@ -102,7 +109,11 @@ module SimpleApm
     end
 
     def link_to(name, url)
-      "<a href=#{url.to_json}>#{name}</a>"
+      helpers.link_to(name, url)
+    end
+
+    def duration_cell(seconds)
+      helpers.content_tag(:span, sec_str(seconds), data: {seconds: seconds.to_f})
     end
   end
 end

data/app/helpers/simple_apm/application_helper.rb

@@ -1,5 +1,29 @@
 module SimpleApm
   module ApplicationHelper
+    def duration_percent(part, total)
+      return 0 if total.to_f <= 0
+      [[(part.to_f / total.to_f * 100).round(1), 0].max, 100].min
+    end
+
+    def table_language
+      {
+        search: t('simple_apm.table.search'),
+        lengthMenu: t('simple_apm.table.length_menu'),
+        info: t('simple_apm.table.info'),
+        infoEmpty: t('simple_apm.table.info_empty'),
+        infoFiltered: t('simple_apm.table.info_filtered'),
+        zeroRecords: t('simple_apm.table.zero_records'),
+        emptyTable: t('simple_apm.table.empty'),
+        loadingRecords: t('simple_apm.table.loading'),
+        processing: t('simple_apm.table.processing'),
+        paginate: {
+          first: t('simple_apm.table.first'), last: t('simple_apm.table.last'),
+          next: t('simple_apm.table.next'), previous: t('simple_apm.table.previous')
+        },
+        aria: {sortAscending: t('simple_apm.table.sort_ascending'), sortDescending: t('simple_apm.table.sort_descending')}
+      }
+    end
+
     def time_label(t, full = false)
       Time.parse(t).strftime("#{'%Y-%m-%d ' if full}%H:%M:%S") rescue ''
     end

data/app/models/simple_apm/action.rb

@@ -23,23 +23,23 @@ module SimpleApm
     end
 
     def avg_http_time
-      http_time.to_f/click_count.to_i
+      click_count.to_i.zero? ? 0.0 : http_time.to_f/click_count.to_i
     end
 
     def avg_db_time
-      db_time.to_f/click_count.to_i
+      click_count.to_i.zero? ? 0.0 : db_time.to_f/click_count.to_i
     end
 
     def avg_queries_count
-      queries_count.to_f/click_count.to_i
+      click_count.to_i.zero? ? 0.0 : queries_count.to_f/click_count.to_i
     end
 
     def avg_cached_queries_count
-      cached_queries_count.to_f/click_count.to_i
+      click_count.to_i.zero? ? 0.0 : cached_queries_count.to_f/click_count.to_i
     end
 
     def avg_time
-      time.to_f/click_count.to_i
+      click_count.to_i.zero? ? 0.0 : time.to_f/click_count.to_i
     end
 
     class << self

data/app/models/simple_apm/diagnostic_report.rb

@@ -0,0 +1,203 @@
+require 'uri'
+require 'time'
+require 'active_support/parameter_filter'
+
+module SimpleApm
+  class DiagnosticReport
+    FILTERED = '[FILTERED]'.freeze
+    SECRET_KEYS = /password|passwd|secret|token|authorization|cookie|session|api[_-]?key|credential|private[_-]?key/i
+
+    def self.for_request(request, date:)
+      new(date).with_query_date { |report| report.request_report(request) }
+    end
+
+    def self.for_action(action, date:)
+      new(date).with_query_date { |report| report.action_report(action) }
+    end
+
+    def initialize(date)
+      @date = date.to_s
+      @generated_at = Time.now.utc.iso8601
+      @sample_reports = {}
+      @filter = ActiveSupport::ParameterFilter.new(Rails.application.config.filter_parameters + [SECRET_KEYS])
+    end
+
+    def with_query_date
+      previous_date = Thread.current['apm_query_date']
+      SimpleApm::RedisKey.query_date = @date
+      yield self
+    ensure
+      Thread.current['apm_query_date'] = previous_date
+    end
+
+    def request_report(request)
+      sqls = request.sqls
+      http_requests = request.net_http_requests
+      envelope('request').merge(
+        request: {
+          request_id: request.request_id, action_name: request.action_name,
+          controller: request.controller, action: request.action, method: request.method,
+          format: request.format, url: redact_url(request.url), host: request.host,
+          remote_addr: request.remote_addr, started_at: request.started&.to_s,
+          status: request.status, exception: redact_exception(request.exception)
+        },
+        timings: {
+          total_seconds: number(request.during), database_seconds: number(request.db_runtime),
+          view_seconds: number(request.view_runtime), external_http_seconds: number(request.net_http_during)
+        },
+        counters: {
+          queries: integer(request.queries_count), cached_queries: integer(request.cached_queries_count),
+          stored_sql_statements: sqls.length, stored_http_calls: http_requests.length
+        },
+        memory: { completed_mb: number(request.completed_memory), change_mb: number(request.memory_during) },
+        sql: sqls.map { |sql| sql_report(sql) },
+        http_calls: http_requests.map { |call| http_report(call) },
+        limitations: [
+          'SQL details contain all stored statements; statements at or below the configured SQL threshold are not stored.',
+          'Status and SQL cache flags may be unavailable in older records. Request parameters/bodies and HTTP response status/bodies are not collected.',
+          'Process memory is RSS, not allocations attributable solely to this request.'
+        ],
+        sql_storage_threshold_seconds: SimpleApm::Setting::SQL_CRITICAL_TIME.to_f
+      )
+    end
+
+    def action_report(action)
+      count = action.click_count.to_i
+      limit = [SimpleApm::Setting::ACTION_SLOW_REQUEST_LIMIT.to_i, 0].max
+      slow_samples = limit.zero? ? [] : SimpleApm::SlowRequest.list_by_action(action.name, limit)
+      totals = {
+        total_seconds: action.time.to_f, database_seconds: action.db_time.to_f,
+        external_http_seconds: action.http_time.to_f, queries: action.queries_count.to_i,
+        cached_queries: action.cached_queries_count.to_i
+      }
+      envelope('action').merge(
+        action_name: action.name,
+        metrics: {
+          requests: count, totals: totals,
+          averages: totals.transform_values { |value| count.positive? ? value.to_f / count : 0.0 },
+          fastest_seconds: number(action.fast_time), slowest_seconds: number(action.slow_time)
+        },
+        samples: {
+          fastest: sample(action.fast_id, action.fast_time),
+          slowest: sample(action.slow_id, action.slow_time),
+          retained_slow: slow_samples.map { |slow| sample(slow.request_id, slow.during) },
+          retained_slow_limit: limit
+        },
+        limitations: [
+          'Aggregates cover recorded requests on the query date. Details are retained for fastest, slowest and configured slow samples only; these are not representative of all requests.',
+          'Stored request details may be unavailable. A missing sample is explicitly marked available=false.',
+          'Historical request records and SQL/HTTP lists may outlive their current slow-sample ranking.'
+        ]
+      )
+    end
+
+    private
+
+    def envelope(type)
+      {
+        schema_version: '1.0', type: type, application: SimpleApm::Setting::APP_NAME,
+        query_date: @date, generated_at: @generated_at,
+        units: { duration: 'seconds', memory: 'MB', memory_bytes_per_mb: 1_048_576 },
+        redaction: 'Best effort: Rails filter_parameters and common credential keys; SQL string literals are filtered. Review remaining values before sharing.'
+      }
+    end
+
+    def sample(id, duration)
+      request = SimpleApm::Request.find(id) if id.present?
+      {
+        request_id: id, duration_seconds: number(duration), available: !request.nil?,
+        report: request ? (@sample_reports[id] ||= request_report(request)) : nil
+      }
+    end
+
+    def sql_report(sql)
+      statement = redact_text(sql.sql).to_s
+      statement = statement.gsub(/\$(\w*)\$.*?\$\1\$/m, "'#{FILTERED}'")
+      statement = statement.gsub(/'(?:''|\\.|[^'\\])*'/m, "'#{FILTERED}'")
+      binds = redact_binds(sql.value)
+      {
+        name: sql.name, statement: statement,
+        full_statement: binds.present? ? "#{statement}\n\nParameters: #{binds.to_json}" : statement,
+        binds: binds, cached: sql.respond_to?(:cached) ? sql.cached : nil,
+        duration_seconds: number(sql.during), started_at: sql.started&.to_s,
+        location: { filename: sql.filename, line: sql.line, method: sql.method }
+      }
+    end
+
+    def http_report(call)
+      {
+        name: call.name, url: redact_url(call.url), host: call.host, path: redact_url(call.path),
+        duration_seconds: number(call.during), started_at: call.started&.to_s,
+        location: { filename: call.filename, line: call.line }
+      }
+    end
+
+    def number(value)
+      value.nil? ? nil : value.to_f
+    end
+
+    def integer(value)
+      value.nil? ? nil : value.to_i
+    end
+
+    def redact_binds(value)
+      if value.is_a?(Array)
+        value.map do |bind|
+          if bind.is_a?(Array) && bind.length == 2
+            [bind[0], redact_text(@filter.filter_param(bind[0].to_s, bind[1]))]
+          else
+            redact_binds(bind)
+          end
+        end
+      elsif value.is_a?(Hash)
+        @filter.filter(value.deep_dup).transform_values { |item| redact_text(item) }
+      else
+        redact_text(value)
+      end
+    end
+
+    def redact_exception(value)
+      exception = value.is_a?(String) ? JSON.parse(value) : value
+      redact_text(exception)
+    rescue JSON::ParserError
+      redact_text(value)
+    end
+
+    def redact_url(value)
+      return nil if value.nil?
+
+      url = URI.parse(value.to_s)
+      url.userinfo = 'FILTERED' if url.userinfo
+      if url.query
+        parameters = URI.decode_www_form(url.query).map do |key, item|
+          filter_key = key.gsub(/\[([^\]]*)\]/, '.\\1')
+          [key, @filter.filter_param(filter_key, item)]
+        end
+        url.query = URI.encode_www_form(parameters).gsub('%5BFILTERED%5D', FILTERED)
+      end
+      redact_text(url.to_s)
+    rescue URI::InvalidURIError, ArgumentError
+      redact_text(value.to_s.gsub(%r{([a-z][a-z0-9+.-]*://)[^/\s?#]+@}i, '\\1FILTERED@'))
+    end
+
+    def redact_text(value)
+      case value
+      when Hash
+        @filter.filter(value.deep_dup).transform_values { |item| redact_text(item) }
+      when Array
+        value.map { |item| redact_text(item) }
+      when String
+        text = value.gsub(%r{([a-z][a-z0-9+.-]*://)[^/\s?#]+@}i, '\\1FILTERED@')
+        text = text.gsub(/\b(Bearer|Basic)\s+[A-Za-z0-9+\/=._-]+/i, "\\1 #{FILTERED}")
+        text.gsub(/([\w.\[\]-]+)(["'`]?\s*[=:]\s*)('(?:''|[^'])*'|"(?:\\.|[^"])*"|[^\s&,;\)]+)/) do |match|
+          key, separator, original = Regexp.last_match(1), Regexp.last_match(2), Regexp.last_match(3)
+          filtered = @filter.filter_param(key, original)
+          mask = original.start_with?("'", '"') ? "#{original[0]}#{FILTERED}#{original[0]}" : FILTERED
+          filtered == FILTERED ? "#{key}#{separator}#{mask}" : match
+        end
+      else
+        value
+      end
+    end
+  end
+end

data/app/models/simple_apm/sql.rb

@@ -1,7 +1,7 @@
 # 请求对应的SQL查询列表
 module SimpleApm
   class Sql
-    attr_accessor :request_id, :sql, :line, :filename, :method, :name, :during, :started, :value
+    attr_accessor :request_id, :sql, :line, :filename, :method, :name, :during, :started, :value, :cached
     def initialize(h, request = nil)
       h.each do |k, v|
         send("#{k}=", v)  rescue puts "attr #{k} not set!"