simple_apm 1.0.13 → 1.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ecd24daac047cea581ed0cd225bb608550647c8d
-  data.tar.gz: f764040b48e07fd37534db07ca32706aa4478045
+  metadata.gz: eb5367e4179faa354aa59c16c8bd9f13ef706e8f
+  data.tar.gz: f46424a7e5257d7b29821b5b055e4e8068c51f8d
 SHA512:
-  metadata.gz: 96975b1996ce11aa43f172b5dcc623fafb97e4cba30e3f0c2699d19cf5654ca7bd52470efe21472f59b8ad424882a2ebbc8f6b484222510949627422e7d87676
-  data.tar.gz: bfdaf971ad55fe4144b9c5c5f0f37d087f523804b236838fa64d02e5a895a75ef1ddf0f488435f03d54bbc478e3e51390d05cfd58a5816aec99de46d930057a8
+  metadata.gz: 0d3f3a4be257b6148bf1baa872f39774166e021a3926333c372cd9122f735e2e0271b24d5d091d6dfd1262306800dcd3b9ebf76d49c17a825884a9be9b4db647
+  data.tar.gz: ac480c8f99332d9fe00b3c82bc14d685589633754d96ac4e6703722ab2c8e6d85d3d5e3d60da4cae3fbe1a773ed48be5b3d88c057dcca1b8e443158d8fc8628f

data/app/controllers/simple_apm/apm_controller.rb

@@ -17,7 +17,7 @@ module SimpleApm
       respond_to do |format|
         format.json do
           @slow_requests = SimpleApm::SlowRequest.list(params[:count] || 200).map do |r|
-            request = r.request
+            request = r.request rescue next
             [
               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)),
@@ -29,7 +29,7 @@ module SimpleApm
               request.host,
               request.remote_addr
             ]
-          end
+          end.compact
           render json: {data: @slow_requests}
         end
         format.html

data/app/models/simple_apm/request.rb

@@ -24,7 +24,7 @@ module SimpleApm
     class << self
 
       def find(id)
-        SimpleApm::Request.new JSON.parse(SimpleApm::Redis.hget(key, id))
+        SimpleApm::Request.new JSON.parse(SimpleApm::Redis.hget(key, id)) rescue nil
       end
 
       def create(h)

data/app/models/simple_apm/summary.rb

@@ -0,0 +1,32 @@
+module SimpleApm
+  class Summary
+    @@results = {}
+
+    def initialize(date)
+      @date = date
+    end
+
+    def result
+      return @@results[@date] if @@results[@date] && Time.parse(@date) < Date.today
+      @@results[@date] = SimpleApm::RedisKey.set_query_date(@date) do
+        res = SimpleApm::Hit.day_info(@date)
+        actions = SimpleApm::Action.all_names.map{|n|SimpleApm::Action.find(n)}
+        most_hits_5 = actions.sort_by{|x|x.click_count.to_i}.reverse.take(5)
+        most_hits_5.map! do |action|
+          {
+              name: action.name,
+              avg_time: action.avg_time,
+              hits: action.click_count.to_i,
+              slow_avg_time: action.slow_requests.sum(&:during)/action.slow_requests.length
+          }
+        end
+        {
+            hits: res[:hits],
+            avg_time: res[:avg_time],
+            actions: most_hits_5
+        }
+      end
+
+    end
+  end
+end

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

@@ -26,7 +26,10 @@
     <th>server</th>
   </tr>
   <% @action.slow_requests.each do |slow_request| %>
-    <% r = slow_request.request %>
+    <%
+      r = slow_request.request
+      next if r.blank?
+    %>
     <tr>
       <td>
         <%= sec_str r.during %>

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

@@ -6,8 +6,8 @@
 <%= link_to '', data_delete_path(type: ''), class: 'btn' %>
 <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' => '确定删除所有一个月以前的数据？' %>
+  <%= 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">

data/lib/simple_apm/redis.rb

@@ -80,6 +80,18 @@ module SimpleApm
 
   class RedisKey
     class << self
+      def set_query_date(d = nil)
+        if block_given?
+          _ = query_date
+          Thread.current['apm_query_date'] = d
+          res = yield
+          Thread.current['apm_query_date'] = _
+          res
+        else
+          Thread.current['apm_query_date'] = d
+        end
+      end
+
       def query_date=(d = nil)
         Thread.current['apm_query_date'] = d
       end

data/lib/simple_apm/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_apm
 version: !ruby/object:Gem::Version
-  version: 1.0.13
+  version: 1.0.14
 platform: ruby
 authors:
 - yuanyin.xia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-15 00:00:00.000000000 Z
+date: 2019-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -91,6 +91,7 @@ files:
 - app/models/simple_apm/request.rb
 - app/models/simple_apm/slow_request.rb
 - app/models/simple_apm/sql.rb
+- app/models/simple_apm/summary.rb
 - app/views/layouts/simple_apm/application.html.erb
 - app/views/simple_apm/apm/action_info.html.erb
 - app/views/simple_apm/apm/actions.html.erb