simple_apm 1.1.0 → 1.1.2

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!"

data/app/views/layouts/simple_apm/application.html.erb

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
-<html>
+<html lang="<%= simple_apm_locale %>">
 <head>
-  <title>Simple Apm</title>
+  <title><%= t("simple_apm.#{action_name}.title", default: 'Simple APM') %> · Simple APM</title>
   <meta charset="utf-8">
   <meta content="IE=Edge,chrome=1" http-equiv="X-UA-Compatible">
   <meta content="width=device-width, initial-scale=1.0" name="viewport">
@@ -12,36 +12,18 @@
   <script src="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
   <script src="//cdnjs.cloudflare.com/ajax/libs/echarts/4.1.0/echarts.js"></script>
   <script src="//cdn.datatables.net/1.10.15/js/jquery.dataTables.min.js"></script>
-  <script type="text/javascript">
-      // JqueryDataTable自定义排序方法
-      jQuery.extend(jQuery.fn.dataTableExt.oSort, {
-          "sec-pre": function (a) {
-              var x = String(a).replace(/<[\s\S]*?>/g, "");    //去除html标记
-              x = x.replace(/&amp;nbsp;/ig, "");                   //去除空格
-              x = x.replace(/%/, "");                          //去除百分号
-              if (x.indexOf('ms') > 0) {
-                  x = x.replace(/ms/, "");
-                  return parseFloat(x) / 1000;
-              } else if (x.indexOf('min') > 0) {
-                  x = x.replace(/min/, "");
-                  return parseFloat(x) * 60;
-              } else {
-                  x = x.replace(/min/, "");
-                  return parseFloat(x)
-              }
-          },
-          "sec-asc": function (a, b) {                //正序排序引用方法
-              return ((a < b) ? -1 : ((a > b) ? 1 : 0));
-          },
-          "sec-desc": function (a, b) {                //倒序排序引用方法
-              return ((a < b) ? 1 : ((a > b) ? -1 : 0));
-          }
-      });
-  </script>
+  <script type="application/json" id="apm-ui-config"><%= json_escape({
+    table: table_language,
+    copied: t('simple_apm.diagnostics.copied'),
+    copy_failed: t('simple_apm.diagnostics.copy_failed'),
+    load_error: t('simple_apm.index.load_error')
+  }.to_json).html_safe %></script>
+  <%= javascript_include_tag "simple_apm/application" %>
 
   <%= csrf_meta_tags %>
 </head>
 <body class="simple-apm">
+<a class="apm-skip-link" href="#main-content"><%= t('simple_apm.common.skip_content') %></a>
 <div id="page-container" class="apm-shell">
   <nav class="apm-topbar">
     <div class="apm-topbar-inner">
@@ -52,50 +34,90 @@
       <div class="apm-nav">
         <%
           [
-            [dashboard_path, 'Dashboard'],
-            [index_path, '慢事务列表'],
-            [actions_path, 'ActionList'],
-            [data_path, '数据管理']
+            [dashboard_path(apm_date: apm_date), t("simple_apm.layout.nav_dashboard"), %w[dashboard]],
+            [index_path(apm_date: apm_date), t("simple_apm.layout.nav_slow_requests"), %w[index show]],
+            [actions_path(apm_date: apm_date), t("simple_apm.layout.nav_actions"), %w[actions action_info]],
+            [data_path(apm_date: apm_date), t("simple_apm.layout.nav_data"), %w[data]]
           ].each do |m|
         %>
-          <a class="navbar-brand <%= 'active' if request.url =~ /#{m[0]}/ %>"
-             href="<%= m[0] %>" >
+          <a class="navbar-brand <%= 'active' if m[2].include?(action_name) %>"
+             href="<%= m[0] %>" <%= 'aria-current=page' if m[2].include?(action_name) %>>
             <%= m[1] %>
           </a>
         <% end %>
       </div>
+      <div class="apm-language-switch" aria-label="<%= t("simple_apm.layout.language") %>">
+        <% SimpleApm::ApplicationController::AVAILABLE_LOCALES.each do |locale| %>
+          <%= link_to t("simple_apm.locales.#{locale}"),
+                      set_locale_path(locale: locale),
+                      class: ("active" if simple_apm_locale == locale) %>
+        <% end %>
+      </div>
       <div class="select-apm-date apm-date-select">
-        <span>统计日期</span>
-        <%= select_tag 'apm_date', options_for_select(SimpleApm::Redis.in_apm_days, apm_date), class: 'form-control' %>
+        <% date_path = action_name == 'show' ? (@request ? action_info_path : index_path) : request.path %>
+        <%= form_tag date_path, method: :get, class: 'apm-date-form' do %>
+          <label for="apm_date"><%= t("simple_apm.layout.date") %></label>
+          <%= hidden_field_tag :action_name, @request.action_name if action_name == 'show' && @request %>
+          <%= hidden_field_tag :action_name, @action.name if action_name == 'action_info' && @action %>
+          <%= hidden_field_tag :count, @sample_limit if action_name == 'index' %>
+          <%= select_tag 'apm_date', options_for_select((SimpleApm::Redis.in_apm_days + [apm_date]).uniq.sort.reverse, apm_date), class: 'form-control' %>
+          <noscript><button type="submit" class="btn btn-primary"><%= t('simple_apm.common.apply') %></button></noscript>
+        <% end %>
       </div>
     </div>
   </nav>
-  <main class="apm-content">
+  <main id="main-content" class="apm-content" tabindex="-1">
+    <% if flash[:notice].present? %>
+      <div class="apm-notice" role="status"><%= flash[:notice] %></div>
+    <% end %>
     <%= yield %>
   </main>
 </div>
 <footer class="apm-footer">
   <div class="apm-footer-status">
     <% if SimpleApm::Redis.running? %>
-      <span class="apm-status apm-status-ok">数据收集中</span>
+      <span class="apm-status apm-status-ok"><%= t("simple_apm.layout.collected") %></span>
     <% else %>
-      <span class="apm-status apm-status-danger">已暂停</span>
+      <span class="apm-status apm-status-danger"><%= t("simple_apm.common.paused") %></span>
     <% end %>
   </div>
   <div class="apm-footer-meta">
     <% SimpleApm::Redis.simple_info.each do |k, v| %>
-      <span><label><%= k %>：</label><%= v %></span>
+      <%
+        redis_label_key =
+          case k
+          when '系统内存'
+            'system_memory'
+          when '当前内存占用'
+            'current_memory'
+          when '当前内存占用(rss)'
+            'current_memory_rss'
+          when '占用内存峰值'
+            'peak_memory'
+          when 'redis版本'
+            'redis_version'
+          when /db[0-9]+/
+            'db'
+          end
+        redis_label = redis_label_key ? t("simple_apm.layout.redis_info.#{redis_label_key}") : k
+      %>
+      <span><label><%= redis_label %>：</label><%= v %></span>
     <% end %>
   </div>
 </footer>
-<div id="sql-modal" class="modal" aria-hidden="true" role="dialog" style="display: none;" tabindex="-1">
+<div id="sql-modal" class="modal" aria-hidden="true" aria-labelledby="sql-modal-title" role="dialog" style="display: none;" tabindex="-1">
   <div class="modal-dialog modal-lg modal-dialog-popout">
     <div class="apm-modal-panel">
       <div class="apm-modal-header">
-        <div class="apm-modal-title">SQL</div>
+        <h2 id="sql-modal-title" class="apm-modal-title">SQL</h2>
+        <div class="apm-toolbar-actions">
+          <button type="button" class="btn btn-primary" data-copy-target="sql-modal-text"><%= t('simple_apm.common.copy') %></button>
+          <button type="button" class="btn apm-button-secondary" data-dismiss="modal"><%= t('simple_apm.common.close') %></button>
+        </div>
       </div>
       <div class="apm-modal-body">
-        <pre class="modal-content" data-lang="SQL"></pre>
+        <pre id="sql-modal-text" class="modal-content" data-lang="SQL"></pre>
+        <p class="apm-copy-status" role="status" aria-live="polite"></p>
       </div>
     </div>
 
@@ -103,22 +125,4 @@
 </div>
 
 </body>
-<script>
-    <% if flash[:notice].present? %>
-      alert(<%= flash[:notice].to_json.html_safe %>)
-    <% end %>
-    var sql_modal_obj = $('#sql-modal')
-    $('.select-apm-date select').on('change', function () {
-        window.location.href = '<%= set_apm_date_path %>?apm_date=' + this.value
-    })
-    $('.sql').on('click', function () {
-        sql_modal_obj.find('.modal-content').html($(this).html())
-        sql_modal_obj.modal('show')
-    })
-    // 手写部分ujs
-    $("a[data-confirm]").on('click', function () {
-        return confirm($(this).data('confirm'))
-    })
-
-</script>
 </html>

data/app/views/simple_apm/apm/_diagnostic_export.html.erb

@@ -0,0 +1,17 @@
+<section class="apm-panel apm-export">
+  <div class="apm-panel-header">
+    <div>
+      <h2 class="apm-panel-title"><%= t("simple_apm.diagnostics.title") %></h2>
+      <p class="apm-panel-subtitle"><%= t("simple_apm.diagnostics.hint") %></p>
+    </div>
+    <button type="button" class="btn btn-primary" data-copy-target="diagnostic-report"><%= t("simple_apm.diagnostics.copy") %></button>
+  </div>
+  <div class="apm-panel-body">
+    <details>
+      <summary><%= t("simple_apm.diagnostics.preview") %></summary>
+      <label class="sr-only" for="diagnostic-report"><%= t("simple_apm.diagnostics.title") %></label>
+      <textarea id="diagnostic-report" class="apm-report-text apm-mono" readonly rows="14" spellcheck="false"><%= JSON.pretty_generate(report) %></textarea>
+    </details>
+    <p class="apm-copy-status" role="status" aria-live="polite"></p>
+  </div>
+</section>

data/app/views/simple_apm/apm/_timings.html.erb

@@ -0,0 +1,18 @@
+<section class="apm-panel">
+  <div class="apm-panel-header">
+    <div>
+      <h2 class="apm-panel-title"><%= t('simple_apm.show.timing_title') %></h2>
+      <p class="apm-panel-subtitle"><%= t('simple_apm.show.timing_hint') %></p>
+    </div>
+  </div>
+  <div class="apm-panel-body">
+    <% parts.each do |label, duration| %>
+      <% percentage = duration_percent(duration, total) %>
+      <div class="apm-runtime-row">
+        <span><%= label %></span>
+        <meter min="0" max="100" value="<%= percentage %>" aria-label="<%= label %>"><%= percentage %>%</meter>
+        <span><%= sec_str duration %> · <%= percentage %>%</span>
+      </div>
+    <% end %>
+  </div>
+</section>

data/app/views/simple_apm/apm/action_info.html.erb

@@ -1,73 +1,94 @@
+<nav class="apm-breadcrumb" aria-label="<%= t('simple_apm.action_info.title') %>">
+  <%= link_to t('simple_apm.common.back_actions'), actions_path(apm_date: apm_date) %>
+</nav>
 <div class="apm-page-header">
   <div>
-    <h1 class="apm-page-title">Action 概况</h1>
-    <p class="apm-page-subtitle"><%= @action.name %></p>
+    <h1 class="apm-page-title"><%= t("simple_apm.action_info.title") %></h1>
+    <p class="apm-page-subtitle apm-mono"><%= @action.name %> · <%= apm_date %></p>
   </div>
 </div>
 
 <div class="apm-metrics">
   <div class="apm-stat">
-    <p class="apm-stat-label">当日点击次数</p>
-    <div class="apm-stat-value"><%= @action.click_count %></div>
+    <p class="apm-stat-label"><%= t("simple_apm.action_info.daily_hits") %></p>
+    <div class="apm-stat-value"><%= number_with_delimiter @action.click_count.to_i %></div>
   </div>
   <div class="apm-stat">
-    <p class="apm-stat-label">平均响应时间</p>
-    <div class="apm-stat-value"><%= sec_str @action.time.to_f/@action.click_count.to_i %></div>
+    <p class="apm-stat-label"><%= t("simple_apm.action_info.avg_response_time") %></p>
+    <div class="apm-stat-value"><%= sec_str @action.avg_time %></div>
   </div>
   <div class="apm-stat">
-    <p class="apm-stat-label">平均DB时间</p>
+    <p class="apm-stat-label"><%= t("simple_apm.action_info.avg_db_time") %></p>
     <div class="apm-stat-value"><%= sec_str @action.avg_db_time %></div>
+    <div class="apm-stat-meta"><%= t('simple_apm.action_info.avg_http_time') %>: <%= sec_str @action.avg_http_time %></div>
   </div>
   <div class="apm-stat">
-    <p class="apm-stat-label">平均SQL次数</p>
+    <p class="apm-stat-label"><%= t("simple_apm.action_info.avg_sql_count") %></p>
     <div class="apm-stat-value"><%= @action.avg_queries_count.round(1) %></div>
+    <div class="apm-stat-meta"><%= t('simple_apm.action_info.cached_queries') %>: <%= @action.avg_cached_queries_count.round(1) %></div>
   </div>
   <div class="apm-stat">
-    <p class="apm-stat-label">最慢响应时间</p>
-    <div class="apm-stat-value"><%= link_to sec_str(@action.slow_time), show_path(id: @action.slow_id) %></div>
-    <div class="apm-stat-meta">最快 <%= link_to sec_str(@action.fast_time), show_path(id: @action.fast_id) %></div>
+    <p class="apm-stat-label"><%= t("simple_apm.action_info.slowest_response_time") %></p>
+    <div class="apm-stat-value"><%= link_to sec_str(@action.slow_time), show_path(id: @action.slow_id, apm_date: apm_date) %></div>
+    <div class="apm-stat-meta"><%= t("simple_apm.action_info.fastest") %> <%= link_to sec_str(@action.fast_time), show_path(id: @action.fast_id, apm_date: apm_date) %></div>
   </div>
 </div>
 
+<%= render 'diagnostic_export', report: SimpleApm::DiagnosticReport.for_action(@action, date: apm_date) %>
+<%= render 'timings', total: @action.avg_time, parts: [[t('simple_apm.common.db'), @action.avg_db_time], [t('simple_apm.common.http'), @action.avg_http_time]] %>
+
 <section class="apm-panel">
   <div class="apm-panel-header">
     <div>
-      <h2 class="apm-panel-title">慢请求样本</h2>
-      <p class="apm-panel-subtitle">保留该 Action 下响应最慢的请求。</p>
+      <h2 class="apm-panel-title"><%= t("simple_apm.action_info.slow_samples_title") %></h2>
+      <p class="apm-panel-subtitle"><%= t("simple_apm.action_info.slow_samples_subtitle") %></p>
     </div>
   </div>
   <div class="apm-panel-body">
     <div class="apm-table-wrap">
-      <table class="table table-bordered">
+      <table id="action-samples" class="table">
+        <thead>
         <tr>
-          <th>响应时间</th>
-          <th>访问时间</th>
-          <th>内存波动</th>
-          <th>请求id</th>
-          <th>访问ip</th>
-          <th>server</th>
+          <th><%= t("simple_apm.action_info.response_time") %></th>
+          <th><%= t('simple_apm.common.db') %></th>
+          <th><%= t('simple_apm.common.sql') %></th>
+          <th><%= t('simple_apm.common.view') %></th>
+          <th><%= t('simple_apm.common.http') %></th>
+          <th><%= t("simple_apm.action_info.access_time") %></th>
+          <th><%= t("simple_apm.action_info.memory_delta") %></th>
+          <th><%= t("simple_apm.action_info.request_id") %></th>
+          <th><%= t('simple_apm.common.status') %></th>
+          <th><%= t("simple_apm.action_info.ip") %></th>
+          <th><%= t("simple_apm.common.server") %></th>
         </tr>
+        </thead>
+        <tbody>
         <% @action.slow_requests.each do |slow_request| %>
           <%
             r = slow_request.request
             next if r.blank?
           %>
           <tr>
-            <td>
-              <%= sec_str r.during %>
-              (DB: <%= sec_str r.db_runtime %> ,
-              SQL: <%= r.queries_count.to_i %> ,
-              View: <%= sec_str r.view_runtime %>
-              <%= "HTTP: #{sec_str r.net_http_during}" if r.net_http_during.to_f > 0 %>)
-            </td>
+            <td data-order="<%= r.during.to_f %>"><%= link_to sec_str(r.during), show_path(id: r.request_id, apm_date: apm_date) %></td>
+            <td data-order="<%= r.db_runtime.to_f %>"><%= sec_str r.db_runtime %></td>
+            <td><%= r.queries_count.to_i %></td>
+            <td data-order="<%= r.view_runtime.to_f %>"><%= sec_str r.view_runtime %></td>
+            <td data-order="<%= r.net_http_during.to_f %>"><%= sec_str r.net_http_during %></td>
             <td><%= time_label r.started %></td>
-            <td><%= r.memory_during.to_f.round(1) %></td>
-            <td><%= link_to r.request_id, show_path(id: r.request_id) %></td>
+            <td data-order="<%= r.memory_during.to_f %>"><%= r.memory_during.to_f.round(1) %> MB</td>
+            <td class="apm-mono"><%= link_to r.request_id, show_path(id: r.request_id, apm_date: apm_date) %></td>
+            <td><%= r.status.presence || t('simple_apm.common.unknown') %></td>
             <td><%= r.remote_addr %></td>
             <td><%= r.host %></td>
           </tr>
         <% end %>
+        </tbody>
       </table>
     </div>
   </div>
 </section>
+<script>
+  $(function () {
+    $('#action-samples').DataTable(window.SimpleApmUI.tableOptions({order: [[0, 'desc']]}));
+  });
+</script>