simple_apm 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd96eb80e66cb02f54e84663909f84a974ff4071b2f5d30a9c136fa3c23552b1
-  data.tar.gz: 4b4018dc5da34ade9b345dc58622655d9263603557f1411cf17f8affe20e2725
+  metadata.gz: 23e7fd45a7f7fc7edc4590c681e1eabac3a34adfe7ac1a3d17e8b16a97303502
+  data.tar.gz: 3020c53720ad77a0414711531c590d7334eee6aab119bf3e1fb4d1b2c2b1c973
 SHA512:
-  metadata.gz: bdcd065ce63b5143b915d8f288d23132da6caf4b383cdf938c5baf9347770eb90a252bc185ba70a9ddf66fdf46b3ae10103bb7aa7b9661e2674a978a7bd5813d
-  data.tar.gz: c734c6adf33cfb68ff94c330a1b8dea7a2be74fdee069e8ee9406f86190b23be426dbb1994ac890e391c3b4976bca1b0e320390682ac2c8ac30089a1cbb5ae06
+  metadata.gz: 1701cce03295e27d0d6cef228f86358c6653fbecfb616c6613b84c90c5eb0dd73e3e5f30fec9b34a8f6a174c3b7ce754a8c0de693f35f8f58d896a6f8bb97c25
+  data.tar.gz: 21d7870003ba6dcf01383b65f657a3ee9a36d51943c5b76f5558191d609b17791fa6e688443394509aa86c8f99308993b01cb9200c7fb12fc00e85f0541c7c81

data/README.md

@@ -3,18 +3,21 @@
 基于Redis的简单的Web请求性能监控/慢事务追踪工具
 
 以天为维度记录：
-- 最慢的1000个(默认1000)请求
-- 记录每个action最慢的100次请求
+- 最慢的500个(默认500)请求
+- 记录每个action最慢的20次请求
 - 记录每个action的平均访问时间
-- 记录每个小时请求量
 - 记录慢请求的详情和对应SQL详情（多余的会删掉）
-- 以10分钟为刻度记录平均/最慢访问时间、次数等性能指标
+- 以10分钟为刻度记录平均/最慢访问时间、次数等性能指标，并生成图表
 
 ## Usage
 
 ```ruby
 # routes.rb
-mount SimpleApm::Engine => '/apm'
+mount SimpleApm::Engine => "/apm"
+
+# 或运行 
+rails generate simple_apm:install 
+
 ```
 
 

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

@@ -11,3 +11,29 @@
 // about supported directives.
 //
 //= require_tree .
+
+// 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));
+    }
+});
+

data/app/controllers/simple_apm/apm_controller.rb

@@ -9,14 +9,14 @@ module SimpleApm
       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)
       @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}
+      @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
       respond_to do |format|
         format.json do
-          @slow_requests = SimpleApm::SlowRequest.list(params[:count]||200).map do |r|
+          @slow_requests = SimpleApm::SlowRequest.list(params[:count] || 200).map do |r|
             request = r.request
             [
               link_to(time_label(request.started), show_path(id: request.request_id)),
@@ -39,7 +39,7 @@ module SimpleApm
     end
 
     def actions
-      @actions = SimpleApm::Action.all_names.map{|n| SimpleApm::Action.find(n)}
+      @actions = SimpleApm::Action.all_names.map {|n| SimpleApm::Action.find(n)}
     end
 
     def action_info
@@ -51,12 +51,37 @@ module SimpleApm
       redirect_to request.referer
     end
 
+    def data
+      @data = SimpleApm::Redis.in_apm_days.map {|x| SimpleApm::Hit.day_info(x)}
+    end
+
+    def data_delete
+      if params[:date].is_a?(String)
+        r = SimpleApm::Redis.clear_data(params[:date])
+        flash[:notice] = r[:success] ? '删除成功！' : r[:msg]
+      elsif params[:type]=='month'
+        del_count = SimpleApm::Redis.clear_data_before_time(Time.now.at_beginning_of_day - 1.month)
+        flash[:notice] = "成功删除#{del_count}条数据"
+      elsif params[:type]=='week'
+        del_count = SimpleApm::Redis.clear_data_before_time(Time.now.at_beginning_of_day - 1.week)
+        flash[:notice] = "成功删除#{del_count}条数据"
+      else
+        flash[:notice] = '未知操作！'
+        # r = params[:date].map{|d|SimpleApm::Redis.clear_data(d)}
+        # suc, fail = r.partition{|x|x[:success]}
+        # flash[:notice] = "成功删除#{suc.length}"
+        # flash[:notice] << "，失败#{fail.length}" if fail.length>0
+      end
+      redirect_to action: :data
+    end
+
     def set_apm_date
       # set_query_date
       redirect_to action: :dashboard
     end
 
     private
+
     def set_query_date
       session[:apm_date] = params[:apm_date] if params[:apm_date].present?
       SimpleApm::RedisKey.query_date = session[:apm_date]

data/app/helpers/simple_apm/application_helper.rb

@@ -8,19 +8,19 @@ module SimpleApm
       _sec = sec.to_f
 
       if force == 'min'
-        return "#{(_sec / 60).to_f.round(1)}min"
+        return "#{(_sec / 60).to_f.round(1)} min"
       elsif force == 's'
-        return "#{_sec.round(2)}s"
+        return "#{_sec.round(2)} s"
       elsif force == 'ms'
-        return "#{(_sec * 1000).round}ms"
+        return "#{(_sec * 1000).round} ms"
       end
 
       if (_sec / 60).to_i > 0
-        "#{(_sec / 60).to_f.round(1)}min"
+        "#{(_sec / 60).to_f.round(1)} min"
       elsif _sec.to_i > 0
-        "#{_sec.round(2)}s"
+        "#{_sec.round(2)} s"
       else
-        "#{(_sec * 1000).round}ms"
+        "#{(_sec * 1000).round} ms"
       end
     end
   end

data/app/models/simple_apm/hit.rb

@@ -4,6 +4,19 @@ module SimpleApm
 
 
     class << self
+      def day_info(date_str)
+        hits, time = 0, 0.0
+        SimpleApm::Redis.hgetall(minute_key(date_str)).each do |k, v|
+          if k=~/time/
+            time += v.to_f
+          elsif k=~/hits/
+            hits += v.to_i
+          end
+        end
+        avg_time = (hits.to_i==0 ? 0 : (time/hits).to_f.round(3))
+        {day: date_str, hits: hits, time: time, avg_time: avg_time}
+      end
+
       def chart_data(start_time = '00:00', end_time = '23:50', per = 'minute')
         start_hour = start_time.to_s.split(':').first.to_i
         end_hour = [end_time.to_s.split(':').first.to_i, 23].min
@@ -42,8 +55,8 @@ module SimpleApm
         i.to_s.size==1 ? "0#{i}" : i.to_s
       end
 
-      def minute_key
-        SimpleApm::RedisKey['per-10-minute']
+      def minute_key(date_str = nil)
+        SimpleApm::RedisKey['per-10-minute', date_str]
       end
 
       # def hour_hit_key

data/app/models/simple_apm/slow_request.rb

@@ -40,7 +40,7 @@ module SimpleApm
       # @param during [Float] 耗时
       # @return [Boolean] 是否插入成功
       def update_request(during, request_id)
-        # 记录最慢请求列表1000个
+        # 记录最慢请求列表5000个
         SimpleApm::Redis.zadd(key, during, request_id)
         SimpleApm::Redis.zremrangebyrank(key, 0, -SimpleApm::Setting::SLOW_ACTIONS_LIMIT - 1)
         SimpleApm::Redis.zrank(key, request_id).present?
@@ -50,7 +50,7 @@ module SimpleApm
       # @return [Array<SimpleApm::SlowRequest>]
       def list_by_action(action_name, limit = 100, offset = 0)
         SimpleApm::Redis.zrevrange(
-          action_key(action_name), offset, limit, with_scores: true
+          action_key(action_name), offset, limit.to_i - 1, with_scores: true
         ).map{ |x| SimpleApm::SlowRequest.new(x[0], x[1], action_name)}
       end
 

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

@@ -20,13 +20,23 @@
   <nav class="navbar navbar-default navbar-fixed-top">
     <div class="container">
       <div class="navbar-header">
-        <% [[dashboard_path, 'Dashboard'], [index_path, '慢事务列表'], [actions_path, 'ActionList']].each do |m| %>
-          <a class="navbar-brand <%= 'active' if request.url=~/#{m[0]}/ %>" href="<%= m[0] %>" ><%= m[1] %></a>
+        <%
+          [
+            [dashboard_path, 'Dashboard'],
+            [index_path, '慢事务列表'],
+            [actions_path, 'ActionList'],
+            [data_path, '数据管理']
+          ].each do |m|
+        %>
+          <a class="navbar-brand <%= 'active' if request.url =~ /#{m[0]}/ %>"
+             href="<%= m[0] %>" >
+            <%= m[1] %>
+          </a>
         <% end %>
       </div>
       <div class="select-apm-date">
         统计日期
-        <%= select_tag 'apm_date', options_for_select(SimpleApm::Redis.in_apm_days, apm_date), class: 'form-control'%>
+        <%= select_tag 'apm_date', options_for_select(SimpleApm::Redis.in_apm_days, apm_date), class: 'form-control' %>
       </div>
 
     </div>
@@ -42,20 +52,35 @@
 </footer>
 <div id="sql-modal" class="modal" aria-hidden="true" role="dialog" style="display: none;" tabindex="-1">
   <div class="modal-dialog modal-lg modal-dialog-popout">
-    <pre class="modal-content" data-lang="SQL">
-    </pre>
+    <div class="panel panel-default">
+      <div class="panel-heading">
+        <div class="panel-title">SQL</div>
+      </div>
+      <div class="panel-body">
+        <pre class="modal-content" data-lang="SQL"></pre>
+      </div>
+    </div>
+
   </div>
 </div>
 
 </body>
 <script>
-  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')
-  })
+    <% 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/actions.html.erb

@@ -13,9 +13,9 @@
     <tr>
       <td><%= link_to action.name, action_info_path(action_name: action.name) %></td>
       <td><%= action.click_count %></td>
-      <td><%= sec_str action.avg_time, 's' %></td>
-      <td><%= link_to sec_str(action.fast_time, 's'), show_path(id: action.fast_id) %></td>
-      <td><%= link_to sec_str(action.slow_time, 's'), show_path(id: action.slow_id) %></td>
+      <td><%= sec_str action.avg_time %></td>
+      <td><%= link_to sec_str(action.fast_time), show_path(id: action.fast_id) %></td>
+      <td><%= link_to sec_str(action.slow_time), show_path(id: action.slow_id) %></td>
     </tr>
   <% end %>
   </tbody>
@@ -23,7 +23,9 @@
 <script type="text/javascript">
   $(document).ready(function(){
       $('#actions-table').DataTable({
-          iDisplayLength: 25
+          iDisplayLength: 25,
+          // 自定义的排序方法
+          aoColumnDefs: [ {sType: "sec", aTargets: [2,3,4]}]
       })
 
   })

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

@@ -0,0 +1,27 @@
+<p class="pull-right">
+  <span class="text-danger">删除数据：</span>
+  <%= link_to '保留进一周数据', data_delete_path(type: 'week'), class: 'btn btn-danger', 'data-confirm': '确定删除所有一周以前的数据？'%>
+  <%= link_to '保留进一个月数据', data_delete_path(type: 'month'), class: 'btn btn-danger', 'data-confirm': '确定删除所有一个月以前的数据？' %>
+</p>
+
+<table class="table table-bordered">
+  <thead>
+  <tr>
+    <th>日期</th>
+    <th>请求数量</th>
+    <th>平均响应时间</th>
+    <th>操作</th>
+  </tr>
+  </thead>
+  <tbody>
+  <!--  {day: date_str, hits: hits, time: time, avg_time: avg_time}-->
+  <% @data.each do |d| %>
+    <tr>
+      <td><%= d[:day]%></td>
+      <td><%= d[:hits]%></td>
+      <td><%= sec_str d[:avg_time]%></td>
+      <td><%= link_to '删除', data_delete_path(date: d[:day]), 'data-confirm': '确定删除？' %></td>
+    </tr>
+  <% end %>
+  </tbody>
+</table>

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

@@ -10,20 +10,6 @@
     <th>remote_addr</th>
   </tr>
   </thead>
-  <%# @slow_requests.each do |r| %>
-<!--    <tr>-->
-      <%# request = r.request %>
-<!--      <td>-->
-        <%#= link_to time_label(request.started), show_path(id: request.request_id)%>
-<!--      </td>-->
-<!--      <td><%#= link_to request.action_name, action_info_path(action_name: request.action_name)%></td>-->
-<!--      <td><%#= sec_str request.during %></td>-->
-<!--      <td><%#= sec_str request.db_runtime %></td>-->
-<!--      <td><%#= sec_str request.view_runtime%></td>-->
-<!--      <td><%#= request.host %></td>-->
-<!--      <td><%#= request.remote_addr %></td>-->
-<!--    </tr>-->
-  <%# end %>
 </table>
 
 <script type="text/javascript">

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

@@ -1,5 +1,4 @@
-<h4><%= @request.action_name %>.<%= @request.format %></h4>
-<!--  @host="xyy", @remote_addr="127.0.0.1", @method="GET", @format="html", @exception="null"-->
+<h4><%= @request.action_name %>.<%= @request.format %>(<%= @request.method %>)</h4>
 <p>
   <label>开始时间：</label>
   <span><%= time_label @request.started, true %></span>
@@ -31,7 +30,7 @@
     <td>time</td>
     <td>name</td>
     <td>sql</td>
-    <td>时间</td>
+    <td>时间(ms)</td>
     <td>位置</td>
   </tr>
   </thead>
@@ -54,7 +53,9 @@
 <script type="text/javascript">
   $(document).ready(function(){
     $('#sql-table').DataTable({
-      bPaginate: false
+      bPaginate: false,
+      // 自定义的排序方法
+      aoColumnDefs: [{sType: "sec", aTargets: [3]}]
     })
 
   })

data/config/routes.rb

@@ -4,6 +4,8 @@ SimpleApm::Engine.routes.draw do
   get 'show', to: 'apm#show'
   get 'action_info', to: 'apm#action_info'
   get 'actions', to: 'apm#actions'
+  get 'data', to: 'apm#data'
+  get 'data_delete', to: 'apm#data_delete'
   get 'set_apm_date', to: 'apm#set_apm_date'
 
 end

data/config/simple_apm.yml

@@ -0,0 +1,11 @@
+# 默认为 redis://localhost:6379/0
+# 确保是完整的redis地址，可以设置远程地址
+redis_url:
+# 默认为空, 建议使用hiredis(并确保有这个gem)
+redis_driver:
+# 记录每天的最慢的请求数存储量，默认500
+slow_actions_limit:
+# 记录每天的每个Action最慢的N个请求，默认20
+action_slow_request_limit:
+# 项目名，默认为 'app'，区分项目名可以多个项目数据存于一台redis server上
+app_name:

data/lib/generators/simple_apm/install_generator.rb

@@ -0,0 +1,23 @@
+require 'rails/generators'
+module SimpleApm
+  module Generators
+    class InstallGenerator < Rails::Generators::Base
+      desc "Create Notifications's base files"
+      source_root File.expand_path('../../../../', __FILE__)
+
+      def add_default_config
+        path = "#{Rails.root}/config/simple_apm.yml"
+        if File.exist?(path)
+          puts 'Skipping config/simple_apm.yml creation, as file already exists!'
+        else
+          puts 'Adding simple_apm default config file (config/simple_apm.yml)...'
+          template 'config/simple_apm.yml', path
+        end
+      end
+
+      def add_routes
+        route 'mount SimpleApm::Engine => "/apm"'
+      end
+    end
+  end
+end

data/lib/simple_apm/redis.rb

@@ -37,7 +37,22 @@ module SimpleApm
 
       # 所有统计的日期，通过hits来判断
       def in_apm_days
-        SimpleApm::Redis.keys('*:action-names').map{|x|x.split(':').first}.sort
+        SimpleApm::Redis.keys('*:action-names').map{|x|x.split(':').first}.sort.reverse
+      end
+
+      # 清理指定日期之前的数据
+      def clear_data_before_time(date)
+        i = 0
+        SimpleApm::Redis.in_apm_days.each do |d|
+          SimpleApm::Redis.clear_data(d) and i+=1 if Time.parse(d) <= date
+        end
+        i
+      end
+
+      def clear_data(date_str)
+        return {success: false, msg: '当日没有数据'} unless in_apm_days.include?(date_str)
+        keys = SimpleApm::Redis.keys("#{date_str}:*")
+        {success: true, msg: SimpleApm::Redis.del(keys)}
       end
 
       def method_missing(method, *args)

data/lib/simple_apm/setting.rb

@@ -1,13 +1,13 @@
 module SimpleApm
   class Setting
-    ApmSettings = YAML.load(IO.read(Dir.join(Rails.root, 'configs', 'simple_apm.yml'))) rescue {}
+    ApmSettings = YAML.load(IO.read("config/simple_apm.yml")) rescue {}
     REDIS_URL = ApmSettings['redis_url'].presence || 'redis://localhost:6379/0'
     # nil , hiredis ...
     REDIS_DRIVER = ApmSettings['redis_driver']
     # 最慢的请求数存储量
-    SLOW_ACTIONS_LIMIT = ApmSettings['slow_actions_limit'].presence || 1000
+    SLOW_ACTIONS_LIMIT = ApmSettings['slow_actions_limit'].presence || 500
     # 每个action存最慢的请求量
-    ACTION_SLOW_REQUEST_LIMIT = ApmSettings['action_slow_request_limit'].presence || 100
+    ACTION_SLOW_REQUEST_LIMIT = ApmSettings['action_slow_request_limit'].presence || 20
     # 区分项目显示
     APP_NAME = ApmSettings['app_name'].presence || 'app'
   end

data/lib/simple_apm/version.rb

@@ -1,3 +1,3 @@
 module SimpleApm
-  VERSION = '0.1.8'
+  VERSION = '0.1.9'
 end

data/lib/tasks/simple_apm_tasks.rake

@@ -1,4 +1,4 @@
 # desc "Explaining what the task does"
-# task :simple_apm do
-#   # Task goes here
-# end
+task :simple_apm do
+  # Task goes here
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_apm
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - yuanyin.xia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-04 00:00:00.000000000 Z
+date: 2018-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -80,9 +80,12 @@ files:
 - app/views/simple_apm/apm/action_info.html.erb
 - app/views/simple_apm/apm/actions.html.erb
 - app/views/simple_apm/apm/dashboard.html.erb
+- app/views/simple_apm/apm/data.html.erb
 - app/views/simple_apm/apm/index.html.erb
 - app/views/simple_apm/apm/show.html.erb
 - config/routes.rb
+- config/simple_apm.yml
+- lib/generators/simple_apm/install_generator.rb
 - lib/simple_apm.rb
 - lib/simple_apm/engine.rb
 - lib/simple_apm/redis.rb