simple_apm 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fef3d86f5fe835b90243b01bc335aabbc20bbfd1d581eab08e71b851790be92a
-  data.tar.gz: 353ee2dab5eba98f1e3bbbb4bcc5c01f17bd0a049484c5dcc9c5aece426c83dc
+  metadata.gz: c9c10a4595dc4a7edaaea7749ff4b55e0cc81f9eed50fe50aa9682d1c196efb9
+  data.tar.gz: 180fa1647b8dec347d607ba8f3088b1323f7dc4ba01fbeb4d882cf09c1472dfa
 SHA512:
-  metadata.gz: 3a5110cfae48bf65c15cbe89ed8906c67d6ca3452f1a97ebf567b72087555626dac2d8c4d643fcdb4be4c22e44ad63e357378258f9efe98a1ed1f6c4931ada36
-  data.tar.gz: 8b6b5ac0420c57abb6e557dd1fb02690e4f4f947445fe76ad9e903df6da0b0694e09e9547e4594a8b8c0010372ec8eea84c0043f71710cda3dd54b73f0470fa1
+  metadata.gz: 35dfd32b5ff9456ab58e847d9193cebbe3d0e5ccaf0280af8dcbad4d42063f74d647376482da2306e9b705e4e073e5a76d83050d75adfdc5cb430b63ec348625
+  data.tar.gz: 524e2ed5481223458a1b238ceaf7b4e2d56e82e419362109559eca624e7cb0a1550312b0b40e4e5ed1f45c46a326866e4ca3839f21939a5c6932abdf530d41df

data/app/models/simple_apm/request.rb

@@ -4,7 +4,7 @@ module SimpleApm
     attr_accessor :request_id, :action_name,
                   :during, :started, :db_runtime, :view_runtime,
                   :controller, :action, :format, :method,
-                  :host, :remote_addr,
+                  :host, :remote_addr, :url,
                   :exception, :status
     def initialize(h)
       h.each do |k, v|

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

@@ -1,4 +1,8 @@
 <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>

data/config/routes.rb

@@ -7,5 +7,5 @@ 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'
-
+  root 'apm#dashboard'
 end

data/config/simple_apm.yml

@@ -8,4 +8,6 @@ slow_actions_limit:
 # 记录每天的每个Action最慢的N个请求，默认20
 action_slow_request_limit:
 # 项目名，默认为 'app'，区分项目名可以多个项目数据存于一台redis server上
-app_name:
+app_name:
+# 记录SQL的最低时间（单位：秒），小于指定数值的则不记录
+sql_critical_time:

data/lib/simple_apm/redis.rb

@@ -57,8 +57,10 @@ module SimpleApm
 
       def running?
         hget('status','running').to_s != 'false'
+      rescue
+        false
       end
-      
+
       def rerun!
         hset('status', 'running', true)
       end

data/lib/simple_apm/setting.rb

@@ -10,5 +10,7 @@ module SimpleApm
     ACTION_SLOW_REQUEST_LIMIT = ApmSettings['action_slow_request_limit'].presence || 20
     # 区分项目显示
     APP_NAME = ApmSettings['app_name'].presence || 'app'
+    # SQL临界值
+    SQL_CRITICAL_TIME = ApmSettings['sql_critical_time'].to_f
   end
 end

data/lib/simple_apm/version.rb

@@ -1,3 +1,3 @@
 module SimpleApm
-  VERSION = '1.0.2'
+  VERSION = '1.0.3'
 end

data/lib/simple_apm.rb

@@ -3,8 +3,11 @@ require "simple_apm/redis"
 require "simple_apm/engine"
 require 'callsite'
 module SimpleApm
+  # RUBY_PLATFORM darwin linux win32
+  # ps aux | grep -w 30057 | awk '$2==30057 {print $6}'
   ActiveSupport::Notifications.subscribe('process_action.action_controller') do |name, started, finished, unique_id, payload|
     begin
+      SimpleApm::RedisKey.query_date = nil
       request_id = Thread.current['action_dispatch.request_id']
       need_skip = payload[:controller] == 'SimpleApm::ApmController'
       need_skip = true if payload[:status].to_s=='302' && payload[:path].to_s=~/login/ && payload[:method].to_s.downcase=='get'
@@ -16,6 +19,7 @@ module SimpleApm
           info = {
               request_id: request_id,
               action_name: action_name,
+              url: payload[:path],
               during: finished - started,
               started: started.to_s,
               db_runtime: payload[:db_runtime].to_f / 1000,
@@ -47,8 +51,10 @@ module SimpleApm
 
   ActiveSupport::Notifications.subscribe 'sql.active_record' do |name, started, finished, unique_id, payload|
     begin
+      SimpleApm::RedisKey.query_date = nil
       request_id = Thread.current['action_dispatch.request_id'].presence || Thread.main['action_dispatch.request_id']
-      if request_id.present?
+      during = finished - started
+      if request_id.present? || during < SimpleApm::Setting::SQL_CRITICAL_TIME
         dev_caller = caller.detect {|c| c.include? Rails.root.to_s}
         if dev_caller
           c = ::Callsite.parse(dev_caller)
@@ -59,7 +65,7 @@ module SimpleApm
         info = {
             request_id: request_id,
             name: payload[:name],
-            during: finished - started,
+            during: during,
             started: started,
             sql: payload[:sql],
             value: sql_value,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_apm
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - yuanyin.xia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-06 00:00:00.000000000 Z
+date: 2018-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails