simple_apm 1.0.14 → 1.1.1

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

@@ -1,24 +1,38 @@
-<style>
-  .container{
-    width: 90%;
-    min-width: 1200px;
-  }
-</style>
-<table id="slow-requests" class="table" style="width: 100%">
-  <thead>
-  <tr>
-    <th>请求时间</th>
-    <th>ActionName</th>
-    <th>TotalTime</th>
-    <th>DB</th>
-    <th>View</th>
-    <th>HTTP</th>
-    <th>Memory(Mb)</th>
-    <th>server</th>
-    <th>ip</th>
-  </tr>
-  </thead>
-</table>
+<div class="apm-page-header">
+  <div>
+    <h1 class="apm-page-title"><%= t("simple_apm.index.title") %></h1>
+    <p class="apm-page-subtitle"><%= t("simple_apm.index.subtitle") %></p>
+  </div>
+</div>
+
+<section class="apm-panel">
+  <div class="apm-panel-header">
+    <div>
+      <h2 class="apm-panel-title"><%= t("simple_apm.index.samples_title") %></h2>
+      <p class="apm-panel-subtitle"><%= t("simple_apm.index.samples_subtitle") %></p>
+    </div>
+  </div>
+  <div class="apm-panel-body">
+    <div class="apm-table-wrap">
+      <table id="slow-requests" class="table">
+        <thead>
+        <tr>
+          <th><%= t("simple_apm.index.request_time") %></th>
+          <th><%= t("simple_apm.index.action_name") %></th>
+          <th><%= t("simple_apm.index.total_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.index.memory_mb") %></th>
+          <th><%= t("simple_apm.common.server") %></th>
+          <th><%= t("simple_apm.index.ip") %></th>
+        </tr>
+        </thead>
+      </table>
+    </div>
+  </div>
+</section>
 
 <script type="text/javascript">
   $(document).ready(function () {

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

@@ -1,90 +1,140 @@
-<h4><%= @request.action_name %>.<%= @request.format %>(<%= @request.method %>)</h4>
-<p>
-  <label>URL：</label>
-  <span><%= @request.url %></span>
-</p>
-<p>
-  <label>开始时间：</label>
-  <span><%= time_label @request.started, true %></span>
-</p>
-<p>
-  <label>响应时间：</label>
-  <span>
-  <%= sec_str @request.during %>
-    （数据库：<%= sec_str @request.db_runtime %>,
-    View: <%= sec_str @request.view_runtime %>
-    <%= ",外部请求: #{sec_str @request.net_http_during}" if @request.net_http_during.to_f>0 %>）
-</span>
-</p>
-<p>
-  <label>结束时内存：</label>
-  <span>
-  <%= @request.completed_memory.to_f.round(1) %>M
-    （增幅：<%= @request.memory_during.to_f.round(1) %>M）
-</span>
-</p>
-<p>
-  <label>server：</label>
-  <span><%= @request.host %></span>
-</p>
-<p>
-  <label>访问ip：</label>
-  <span><%= @request.remote_addr %></span>
-</p>
+<div class="apm-page-header">
+  <div>
+    <h1 class="apm-page-title"><%= t("simple_apm.show.title") %></h1>
+    <p class="apm-page-subtitle"><%= @request.action_name %>.<%= @request.format %>(<%= @request.method %>)</p>
+  </div>
+</div>
+
+<div class="apm-metrics">
+  <div class="apm-stat">
+    <p class="apm-stat-label"><%= t("simple_apm.common.total") %></p>
+    <div class="apm-stat-value"><%= sec_str @request.during %></div>
+  </div>
+  <div class="apm-stat">
+    <p class="apm-stat-label"><%= t("simple_apm.common.db") %></p>
+    <div class="apm-stat-value"><%= sec_str @request.db_runtime %></div>
+  </div>
+  <div class="apm-stat">
+    <p class="apm-stat-label"><%= t("simple_apm.common.sql") %></p>
+    <div class="apm-stat-value"><%= @request.queries_count.to_i %></div>
+    <div class="apm-stat-meta"><%= t("simple_apm.show.cached") %> <%= @request.cached_queries_count.to_i %></div>
+  </div>
+  <div class="apm-stat">
+    <p class="apm-stat-label"><%= t("simple_apm.common.view") %></p>
+    <div class="apm-stat-value"><%= sec_str @request.view_runtime %></div>
+  </div>
+  <div class="apm-stat">
+    <p class="apm-stat-label"><%= t("simple_apm.common.http") %></p>
+    <div class="apm-stat-value"><%= sec_str @request.net_http_during %></div>
+  </div>
+</div>
+
+<section class="apm-panel">
+  <div class="apm-panel-header">
+    <div>
+      <h2 class="apm-panel-title"><%= t("simple_apm.show.basic_info") %></h2>
+      <p class="apm-panel-subtitle"><%= t("simple_apm.show.basic_info_subtitle") %></p>
+    </div>
+  </div>
+  <div class="apm-panel-body">
+    <dl class="apm-detail-list">
+      <dt><%= t("simple_apm.common.url") %></dt>
+      <dd><%= @request.url %></dd>
+      <dt><%= t("simple_apm.show.started_at") %></dt>
+      <dd><%= time_label @request.started, true %></dd>
+      <dt><%= t("simple_apm.show.completed_memory") %></dt>
+      <dd><%= @request.completed_memory.to_f.round(1) %>M (<%= t("simple_apm.show.memory_increase") %>: <%= @request.memory_during.to_f.round(1) %>M)</dd>
+      <dt><%= t("simple_apm.common.server") %></dt>
+      <dd><%= @request.host %></dd>
+      <dt><%= t("simple_apm.show.ip") %></dt>
+      <dd><%= @request.remote_addr %></dd>
+    </dl>
+  </div>
+</section>
+
 <% if @request.exception.present? && @request.exception != 'null' %>
-  <p>
-    <label>报错信息: </label>
-  <pre><%= @request.exception %></pre>
-  </p>
+  <section class="apm-panel">
+    <div class="apm-panel-header">
+      <div>
+        <h2 class="apm-panel-title"><%= t("simple_apm.show.exception") %></h2>
+      </div>
+    </div>
+    <div class="apm-panel-body">
+      <pre><%= @request.exception %></pre>
+    </div>
+  </section>
 <% end %>
+
 <% if @request.net_http_requests.present? %>
-  <p>外部请求</p>
-  <table class="table table-bordered">
-    <tr>
-      <th>开始时间</th>
-      <th>耗时</th>
-      <th>URL</th>
-      <th>其他信息</th>
-    </tr>
-    <% @request.net_http_requests.each do |r| %>
-      <tr>
-        <td><%= time_label r.started %></td>
-        <td><%= sec_str r.during %></td>
-        <td><%= r.url %></td>
-        <td><%= "#{r.filename}: #{r.line}" if r.filename.present? %></td>
-      </tr>
-    <% end %>
-  </table>
+  <section class="apm-panel">
+    <div class="apm-panel-header">
+      <div>
+        <h2 class="apm-panel-title"><%= t("simple_apm.show.external_requests") %></h2>
+        <p class="apm-panel-subtitle"><%= t("simple_apm.show.external_requests_subtitle") %></p>
+      </div>
+    </div>
+    <div class="apm-panel-body">
+      <div class="apm-table-wrap">
+        <table class="table table-bordered">
+          <tr>
+            <th><%= t("simple_apm.show.started_at") %></th>
+            <th><%= t("simple_apm.show.duration") %></th>
+            <th><%= t("simple_apm.common.url") %></th>
+            <th><%= t("simple_apm.show.other_info") %></th>
+          </tr>
+          <% @request.net_http_requests.each do |r| %>
+            <tr>
+              <td><%= time_label r.started %></td>
+              <td><%= sec_str r.during %></td>
+              <td><%= r.url %></td>
+              <td><%= "#{r.filename}: #{r.line}" if r.filename.present? %></td>
+            </tr>
+          <% end %>
+        </table>
+      </div>
+    </div>
+  </section>
 <% end %>
 
 <% if @request.sqls.present? %>
-  <p>SQL列表</p>
-  <table id="sql-table" class="table">
-    <thead>
-    <tr>
-      <td>time</td>
-      <td>name</td>
-      <td>sql</td>
-      <td>时间(ms)</td>
-      <td>位置</td>
-    </tr>
-    </thead>
-    <tbody>
-    <% @request.sqls.each do |sql| %>
-      <tr>
-        <td><%= time_label sql.started %></td>
-        <td>
-          <%= sql.name %>
-        </td>
-        <td>
-          <div class="sql"><%= sql.full_sql -%></div>
-        </td>
-        <td><%= sec_str sql.during %></td>
-        <td><%= sql.filename %>:<%= sql.line %></td>
-      </tr>
-    <% end %>
-    </tbody>
-  </table>
+  <section class="apm-panel">
+    <div class="apm-panel-header">
+      <div>
+        <h2 class="apm-panel-title"><%= t("simple_apm.show.sql_list") %></h2>
+        <p class="apm-panel-subtitle"><%= t("simple_apm.show.sql_list_subtitle") %></p>
+      </div>
+    </div>
+    <div class="apm-panel-body">
+      <div class="apm-table-wrap">
+        <table id="sql-table" class="table">
+          <thead>
+          <tr>
+            <td>time</td>
+            <td>name</td>
+            <td>sql</td>
+            <td><%= t("simple_apm.show.time_ms") %></td>
+            <td><%= t("simple_apm.show.location") %></td>
+          </tr>
+          </thead>
+          <tbody>
+          <% @request.sqls.each do |sql| %>
+            <tr>
+              <td><%= time_label sql.started %></td>
+              <td>
+                <%= sql.name %>
+              </td>
+              <td>
+                <div class="sql"><%= sql.full_sql -%></div>
+              </td>
+              <td><%= sec_str sql.during %></td>
+              <td><%= sql.filename %>:<%= sql.line %></td>
+            </tr>
+          <% end %>
+          </tbody>
+        </table>
+      </div>
+    </div>
+  </section>
   <script type="text/javascript">
       $(document).ready(function () {
           $('#sql-table').DataTable({
@@ -95,4 +145,4 @@
 
       })
   </script>
-<% end %>
+<% end %>

data/config/locales/simple_apm.en.yml

@@ -0,0 +1,131 @@
+en:
+  simple_apm:
+    actions:
+      title: "Action Performance"
+      subtitle: "Aggregate hits, response time, and SQL behavior by Controller#Action."
+      list_title: "Action List"
+      list_subtitle: "Click an action name to inspect its slow request samples."
+      name: "Name"
+      click_count: "Hits"
+      avg_response_time: "Avg Response Time"
+      avg_db_time: "Avg DB Time"
+      avg_sql_count: "Avg SQL Count"
+      avg_http_time: "Avg HTTP Time"
+      fastest_response_time: "Fastest Response Time"
+      slowest_response_time: "Slowest Response Time"
+    action_info:
+      title: "Action Overview"
+      daily_hits: "Daily Hits"
+      avg_response_time: "Avg Response Time"
+      avg_db_time: "Avg DB Time"
+      avg_sql_count: "Avg SQL Count"
+      slowest_response_time: "Slowest Response Time"
+      fastest: "Fastest"
+      slow_samples_title: "Slow Request Samples"
+      slow_samples_subtitle: "Keeps the slowest requests for this action."
+      response_time: "Response Time"
+      access_time: "Access Time"
+      memory_delta: "Memory Delta"
+      request_id: "Request ID"
+      ip: "IP"
+    common:
+      db: "DB"
+      http: "HTTP"
+      running: "Running"
+      paused: "Paused"
+      server: "Server"
+      sql: "SQL"
+      total: "Total"
+      url: "URL"
+      view: "View"
+    dashboard:
+      title: "Performance Overview"
+      subtitle: "Review response time and traffic trends in 10-minute intervals."
+      stat_points: "Data Points"
+      ten_minute_intervals: "10-minute intervals"
+      hits: "Hits"
+      current_day_total: "Current day total"
+      peak_avg_response: "Peak Avg Response"
+      interval_peak: "Interval peak"
+      current_collection: "Collection"
+      redis_status: "Redis status"
+      query_date: "Query Date"
+      switch_in_top_right: "Switchable in the top right"
+      response_time: "Response Time"
+      response_time_subtitle: "Average response time for each interval."
+      hit_count: "Hit Count"
+      hit_count_subtitle: "Request count for each interval."
+    data:
+      title: "Data Management"
+      subtitle: "Manage collection status and historical Redis data."
+      collection_status: "Collection Status"
+      collection_subtitle: "When paused, middleware stops recording new request performance data."
+      pause_collection: "Pause Collection"
+      resume_collection: "Resume Collection"
+      confirm_pause: "Pause collection?"
+      delete_data: "Delete Data"
+      delete_subtitle: "Clean historical data by retention period, or delete one day."
+      keep_one_week: "Keep One Week"
+      keep_one_month: "Keep One Month"
+      confirm_delete_week: "Delete all data older than one week?"
+      confirm_delete_month: "Delete all data older than one month?"
+      history_title: "Historical Data"
+      history_subtitle: "View collection volume and average response time by date."
+      date: "Date"
+      request_count: "Requests"
+      avg_response_time: "Avg Response Time"
+      operation: "Operation"
+      delete: "Delete"
+      confirm_delete: "Delete this data?"
+    flash:
+      deleted: "Deleted successfully."
+      deleted_count: "Deleted %{count} records successfully."
+      no_data_for_day: "No data for this day."
+      unknown_action: "Unknown action."
+      updated: "Updated successfully."
+    index:
+      title: "Slow Requests"
+      subtitle: "Sort by response duration to locate DB, SQL, View, and external request cost."
+      samples_title: "Request Samples"
+      samples_subtitle: "Loads recent slow request records by default."
+      request_time: "Request Time"
+      action_name: "Action Name"
+      total_time: "Total Time"
+      memory_mb: "Memory (Mb)"
+      ip: "IP"
+    layout:
+      collected: "Collecting data"
+      date: "Date"
+      language: "Language"
+      nav_actions: "Actions"
+      nav_dashboard: "Dashboard"
+      nav_data: "Data"
+      nav_slow_requests: "Slow Requests"
+      redis_info:
+        current_memory: "Current Memory"
+        current_memory_rss: "Current Memory (RSS)"
+        db: "DB"
+        peak_memory: "Peak Memory"
+        redis_version: "Redis Version"
+        system_memory: "System Memory"
+    locales:
+      en: "English"
+      zh-CN: "中文"
+    show:
+      title: "Request Details"
+      cached: "Cached"
+      basic_info: "Basic Info"
+      basic_info_subtitle: "Request source, time, and memory changes."
+      started_at: "Started At"
+      completed_memory: "Completed Memory"
+      memory_increase: "Increase"
+      ip: "IP"
+      exception: "Exception"
+      external_requests: "External Requests"
+      external_requests_subtitle: "Net::HTTP calls triggered during this request."
+      duration: "Duration"
+      other_info: "Other Info"
+      sql_list: "SQL List"
+      sql_list_subtitle: "Click SQL text to view the complete statement."
+      time_ms: "Time (ms)"
+      location: "Location"

data/config/locales/simple_apm.zh-CN.yml

@@ -0,0 +1,131 @@
+zh-CN:
+  simple_apm:
+    actions:
+      title: "Action 性能"
+      subtitle: "按 Controller#Action 聚合访问次数、响应时间和 SQL 行为。"
+      list_title: "Action 列表"
+      list_subtitle: "点击 Action 名称查看该接口的慢请求样本。"
+      name: "Name"
+      click_count: "点击次数"
+      avg_response_time: "平均响应时间"
+      avg_db_time: "平均 DB 时间"
+      avg_sql_count: "平均 SQL 次数"
+      avg_http_time: "平均 HTTP 访问时间"
+      fastest_response_time: "最快响应时间"
+      slowest_response_time: "最慢响应时间"
+    action_info:
+      title: "Action 概况"
+      daily_hits: "当日点击次数"
+      avg_response_time: "平均响应时间"
+      avg_db_time: "平均 DB 时间"
+      avg_sql_count: "平均 SQL 次数"
+      slowest_response_time: "最慢响应时间"
+      fastest: "最快"
+      slow_samples_title: "慢请求样本"
+      slow_samples_subtitle: "保留该 Action 下响应最慢的请求。"
+      response_time: "响应时间"
+      access_time: "访问时间"
+      memory_delta: "内存波动"
+      request_id: "请求 ID"
+      ip: "访问 IP"
+    common:
+      db: "DB"
+      http: "HTTP"
+      running: "运行中"
+      paused: "已暂停"
+      server: "Server"
+      sql: "SQL"
+      total: "Total"
+      url: "URL"
+      view: "View"
+    dashboard:
+      title: "性能概览"
+      subtitle: "按 10 分钟粒度观察响应时间和访问量趋势。"
+      stat_points: "统计点"
+      ten_minute_intervals: "10 分钟区间"
+      hits: "访问次数"
+      current_day_total: "当前日期累计"
+      peak_avg_response: "最高平均响应"
+      interval_peak: "区间峰值"
+      current_collection: "当前采集"
+      redis_status: "Redis 状态"
+      query_date: "查询日期"
+      switch_in_top_right: "可在右上角切换"
+      response_time: "响应时间"
+      response_time_subtitle: "每个时间段的平均响应耗时。"
+      hit_count: "访问次数"
+      hit_count_subtitle: "每个时间段的请求数量。"
+    data:
+      title: "数据管理"
+      subtitle: "管理采集开关和历史 Redis 数据。"
+      collection_status: "采集状态"
+      collection_subtitle: "暂停后 middleware 不再记录新的请求性能数据。"
+      pause_collection: "暂停收集数据"
+      resume_collection: "继续收集数据"
+      confirm_pause: "确定暂停吗？"
+      delete_data: "删除数据"
+      delete_subtitle: "按保留周期清理历史数据，或删除单日数据。"
+      keep_one_week: "保留一周数据"
+      keep_one_month: "保留一个月数据"
+      confirm_delete_week: "确定删除所有一周以前的数据？"
+      confirm_delete_month: "确定删除所有一个月以前的数据？"
+      history_title: "历史数据"
+      history_subtitle: "以日期为单位查看采集量和平均响应时间。"
+      date: "日期"
+      request_count: "请求数量"
+      avg_response_time: "平均响应时间"
+      operation: "操作"
+      delete: "删除"
+      confirm_delete: "确定删除？"
+    flash:
+      deleted: "删除成功！"
+      deleted_count: "成功删除 %{count} 条数据"
+      no_data_for_day: "当日没有数据"
+      unknown_action: "未知操作！"
+      updated: "设置成功！"
+    index:
+      title: "慢事务列表"
+      subtitle: "按响应耗时排序，快速定位 DB、SQL、View 和外部请求占比。"
+      samples_title: "请求样本"
+      samples_subtitle: "默认加载最近的慢请求记录。"
+      request_time: "请求时间"
+      action_name: "Action Name"
+      total_time: "Total Time"
+      memory_mb: "Memory (Mb)"
+      ip: "IP"
+    layout:
+      collected: "数据收集中"
+      date: "统计日期"
+      language: "语言"
+      nav_actions: "Action 列表"
+      nav_dashboard: "Dashboard"
+      nav_data: "数据管理"
+      nav_slow_requests: "慢事务列表"
+      redis_info:
+        current_memory: "当前内存占用"
+        current_memory_rss: "当前内存占用 (RSS)"
+        db: "DB"
+        peak_memory: "占用内存峰值"
+        redis_version: "Redis 版本"
+        system_memory: "系统内存"
+    locales:
+      en: "English"
+      zh-CN: "中文"
+    show:
+      title: "请求详情"
+      cached: "缓存"
+      basic_info: "基础信息"
+      basic_info_subtitle: "请求来源、时间和内存变化。"
+      started_at: "开始时间"
+      completed_memory: "结束时内存"
+      memory_increase: "增幅"
+      ip: "访问 IP"
+      exception: "报错信息"
+      external_requests: "外部请求"
+      external_requests_subtitle: "请求过程中触发的 Net::HTTP 调用。"
+      duration: "耗时"
+      other_info: "其他信息"
+      sql_list: "SQL 列表"
+      sql_list_subtitle: "点击 SQL 文本查看完整语句。"
+      time_ms: "时间 (ms)"
+      location: "位置"

data/config/routes.rb

@@ -7,5 +7,6 @@ SimpleApm::Engine.routes.draw do
   get 'data', to: 'apm#data'
   get 'data_delete', to: 'apm#data_delete'
   get 'set_apm_date', to: 'apm#set_apm_date'
+  get 'set_locale', to: 'apm#set_locale'
   root 'apm#dashboard'
 end

data/lib/simple_apm/redis.rb

@@ -62,12 +62,12 @@ module SimpleApm
       end
 
       def rerun!
-        hset('status', 'running', true)
+        hset('status', 'running', 'true')
       end
 
       # 停止收集数据
       def stop!
-        hset('status', 'running', false)
+        hset('status', 'running', 'false')
       end
 
       def method_missing(method, *args)

data/lib/simple_apm/setting.rb

@@ -1,6 +1,16 @@
+require 'erb'
+
 module SimpleApm
   class Setting
-    ApmSettings = YAML.load(IO.read("config/simple_apm.yml")) rescue {}
+    def self.load_settings(path = "config/simple_apm.yml")
+      yaml = ERB.new(File.read(path)).result
+      settings = YAML.safe_load(yaml, aliases: true) || {}
+      settings.is_a?(Hash) ? settings : {}
+    rescue
+      {}
+    end
+
+    ApmSettings = load_settings
     REDIS_URL = ApmSettings['redis_url'].presence || 'redis://localhost:6379/0'
     # nil , hiredis ...
     REDIS_DRIVER = ApmSettings['redis_driver']

data/lib/simple_apm/version.rb

@@ -1,3 +1,3 @@
 module SimpleApm
-  VERSION = '1.0.14'
+  VERSION = '1.1.1'
 end

data/lib/simple_apm/worker.rb

@@ -44,6 +44,8 @@ module SimpleApm
                   started: started.to_s,
                   db_runtime: payload[:db_runtime].to_f / 1000,
                   view_runtime: payload[:view_runtime].to_f / 1000,
+                  queries_count: payload[:queries_count].to_i,
+                  cached_queries_count: payload[:cached_queries_count].to_i,
                   controller: payload[:controller],
                   action: payload[:action],
                   host: Socket.gethostname,
@@ -127,4 +129,4 @@ module SimpleApm
       end
     end
   end
-end
+end