simple_apm 1.0.14 → 1.1.0

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">请求详情</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">Total</p>
+    <div class="apm-stat-value"><%= sec_str @request.during %></div>
+  </div>
+  <div class="apm-stat">
+    <p class="apm-stat-label">DB</p>
+    <div class="apm-stat-value"><%= sec_str @request.db_runtime %></div>
+  </div>
+  <div class="apm-stat">
+    <p class="apm-stat-label">SQL</p>
+    <div class="apm-stat-value"><%= @request.queries_count.to_i %></div>
+    <div class="apm-stat-meta">缓存 <%= @request.cached_queries_count.to_i %></div>
+  </div>
+  <div class="apm-stat">
+    <p class="apm-stat-label">View</p>
+    <div class="apm-stat-value"><%= sec_str @request.view_runtime %></div>
+  </div>
+  <div class="apm-stat">
+    <p class="apm-stat-label">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">基础信息</h2>
+      <p class="apm-panel-subtitle">请求来源、时间和内存变化。</p>
+    </div>
+  </div>
+  <div class="apm-panel-body">
+    <dl class="apm-detail-list">
+      <dt>URL</dt>
+      <dd><%= @request.url %></dd>
+      <dt>开始时间</dt>
+      <dd><%= time_label @request.started, true %></dd>
+      <dt>结束时内存</dt>
+      <dd><%= @request.completed_memory.to_f.round(1) %>M （增幅：<%= @request.memory_during.to_f.round(1) %>M）</dd>
+      <dt>server</dt>
+      <dd><%= @request.host %></dd>
+      <dt>访问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">报错信息</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">外部请求</h2>
+        <p class="apm-panel-subtitle">请求过程中触发的 Net::HTTP 调用。</p>
+      </div>
+    </div>
+    <div class="apm-panel-body">
+      <div class="apm-table-wrap">
+        <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>
+      </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">SQL 列表</h2>
+        <p class="apm-panel-subtitle">点击 SQL 文本查看完整语句。</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>时间(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>
+      </div>
+    </div>
+  </section>
   <script type="text/javascript">
       $(document).ready(function () {
           $('#sql-table').DataTable({
@@ -95,4 +145,4 @@
 
       })
   </script>
-<% end %>
+<% 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.0'
 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

data/lib/simple_apm.rb

@@ -3,12 +3,21 @@ require 'simple_apm/redis'
 require 'simple_apm/engine'
 require 'simple_apm/worker'
 require 'simple_apm/net_http'
-require 'callsite'
 require 'get_process_mem'
 module SimpleApm
 
   SimpleApm::NetHttp.install
 
+  def self.merge_callsite_payload!(payload, locations = caller_locations)
+    if dev_caller = locations.detect { |location| location.path.include?(Rails.root.to_s) }
+      payload.merge!(
+        :line => dev_caller.lineno,
+        :filename => dev_caller.path.gsub(Rails.root.to_s, ''),
+        :method => dev_caller.base_label
+      )
+    end
+  end
+
   ActiveSupport::Notifications.subscribe('process_action.action_controller') do |name, started, finished, unique_id, payload|
     remote_addr = (payload[:headers]['HTTP_X_REAL_IP'] rescue nil)
     if remote_addr.blank? || remote_addr=='127.0.0.1'
@@ -36,10 +45,7 @@ module SimpleApm
       real_start_time = payload[:real_start_time] || started
       during = finished - real_start_time
       th[:net_http_during] += during if th[:net_http_during]
-      if dev_caller = caller.detect { |c| c.include?(Rails.root.to_s) }
-        c = ::Callsite.parse(dev_caller)
-        payload.merge!(:line => c.line, :filename => c.filename.to_s.gsub(Rails.root.to_s, ''), :method => c.method)
-      end
+      SimpleApm.merge_callsite_payload!(payload)
       ProcessingThread.add_event(
           name: name,
           request_id: request_id,
@@ -52,10 +58,7 @@ module SimpleApm
   ActiveSupport::Notifications.subscribe 'sql.active_record' do |name, started, finished, unique_id, payload|
     request_id = Thread.current['action_dispatch.request_id'].presence || Thread.main['action_dispatch.request_id']
     if request_id
-      if dev_caller = caller.detect {|c| c.include? Rails.root.to_s}
-        c = ::Callsite.parse(dev_caller)
-        payload.merge!(:line => c.line, :filename => c.filename.to_s.gsub(Rails.root.to_s, ''), :method => c.method)
-      end
+      SimpleApm.merge_callsite_payload!(payload)
       ProcessingThread.add_event(
           name: name,
           request_id: request_id,

metadata

@@ -1,29 +1,42 @@
 --- !ruby/object:Gem::Specification
 name: simple_apm
 version: !ruby/object:Gem::Version
-  version: 1.0.14
+  version: 1.1.0
 platform: ruby
 authors:
 - yuanyin.xia
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-29 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '8.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '8.1'
+- !ruby/object:Gem::Dependency
+  name: sprockets-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '3.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: redis-namespace
   requirement: !ruby/object:Gem::Requirement
@@ -56,16 +69,30 @@ dependencies:
   name: get_process_mem
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
 description: 'xyy: Simple Apm View for rails using redis.'
 email:
 - xiayuanyin@qq.com
@@ -115,7 +142,6 @@ homepage: https://github.com/xiayuanyin/simple_apm
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -130,9 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: 'xyy: Simple Rails Apm'
 test_files: []