simple_apm 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a450ff5329c11a826e738f055c77033e5623896367cc64a171f12ea2e22dab7
-  data.tar.gz: 1ffafa80b66578969520c09ac9ec78e1d2a00d83ede6f551c28e30e019531154
+  metadata.gz: 69c8c44cd6c1c1c98083753871364bbeb78f9f8d6c26d1d4a4bdd791e22349a3
+  data.tar.gz: 507a53cdc6cb281eb76d765560638138010e26b125f515a9289b1a6472677e0f
 SHA512:
-  metadata.gz: 254e51e5514a8fba9268e5d61c6b80d75da06045b2c6b7857006713a5ed60b2bb3a3a2bca22fb294d94c0e5bbdad6dce629cc688cd9ab70d1abbdbbc48ca6d97
-  data.tar.gz: e72dba40ef3ba6666ae1a4d27d6a622cbf2abab24781cf44826f0e3c4b47d517e398b39e9d8b6bcf6d80c4ae333b913a27ac0a3c415268c690ae862c2fdf3026
+  metadata.gz: a04629e1d91833e080cf9b503379332fbd1e490855306fd93a20ef7700db0bb642959feec81356dfd8ea21cd9b22015e82f3a8c10cda045cc29cc3efd622e009
+  data.tar.gz: 9033e87a25ecf8890edf0f5e56fb71d4875e8c304e4c5c85e73f3567952ac2bc9853f4807e0a736b281614029d4d32d9713b02b68a7b4c088bac050ce406fcc6

data/app/controllers/simple_apm/apm_controller.rb

@@ -24,6 +24,7 @@ module SimpleApm
               sec_str(request.during),
               sec_str(request.db_runtime),
               sec_str(request.view_runtime),
+              request.memory_during.to_f.round(1),
               request.host,
               request.remote_addr
             ]

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, :url,
+                  :host, :remote_addr, :url, :completed_memory, :memory_during,
                   :exception, :status
     def initialize(h)
       h.each do |k, v|

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

@@ -6,6 +6,7 @@
     <th>总耗时</th>
     <th>db_time</th>
     <th>view time</th>
+    <th>内存增幅(M)</th>
     <th>host</th>
     <th>remote_addr</th>
   </tr>

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

@@ -14,6 +14,13 @@
     （数据库：<%= sec_str @request.db_runtime %>, View: <%= sec_str @request.view_runtime %>）
 </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>

data/config/simple_apm.yml

@@ -10,4 +10,7 @@ action_slow_request_limit:
 # 项目名，默认为 'app'，区分项目名可以多个项目数据存于一台redis server上
 app_name:
 # 记录SQL的最低时间（单位：秒），小于指定数值的则不记录
-sql_critical_time:
+sql_critical_time:
+# 不统计的请求(值为：xxxController#Action)（数组）
+#  - Devise::SessionsController#create
+exclude_actions:

data/lib/simple_apm/engine.rb

@@ -5,8 +5,10 @@ module SimpleApm
     end
 
     def call(env)
-      if SimpleApm::Redis.running?
+      if SimpleApm::Redis.ping && SimpleApm::Redis.running?
+        SimpleApm::ProcessingThread.start!
         Thread.current['action_dispatch.request_id'] = env['action_dispatch.request_id']
+        Thread.current[:current_process_memory] = GetProcessMem.new.mb
       end
       @app.call(env)
     end

data/lib/simple_apm/setting.rb

@@ -12,5 +12,8 @@ module SimpleApm
     APP_NAME = ApmSettings['app_name'].presence || 'app'
     # SQL临界值
     SQL_CRITICAL_TIME = ApmSettings['sql_critical_time'].to_f
+    # 不纳入统计的action
+    t = ApmSettings['exclude_actions']
+    EXCLUDE_ACTIONS = t.is_a?(Array) ? t : [t]
   end
 end

data/lib/simple_apm/version.rb

@@ -1,3 +1,3 @@
 module SimpleApm
-  VERSION = '1.0.4'
+  VERSION = '1.0.5'
 end

data/lib/simple_apm.rb

@@ -2,80 +2,153 @@ require "simple_apm/setting"
 require "simple_apm/redis"
 require "simple_apm/engine"
 require 'callsite'
+require 'get_process_mem'
 module SimpleApm
-  # RUBY_PLATFORM darwin linux win32
-  # ps aux | grep -w 30057 | awk '$2==30057 {print $6}'
+  # 订阅log ---- start ----
   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'
-      if request_id.present?
-        if need_skip
-          SimpleApm::Sql.delete_by_request_id(request_id)
-        else
-          action_name = "#{payload[:controller]}##{payload[:action]}" #payload[:format]
-          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,
-              view_runtime: payload[:view_runtime].to_f / 1000,
-              controller: payload[:controller],
-              action: payload[:action],
-              host: Socket.gethostname,
-              remote_addr: (payload[:headers]['HTTP_X_REAL_IP'] rescue nil),
-              method: payload[:method],
-              format: payload[:format],
-              exception: payload[:exception].presence.to_json
-          }.with_indifferent_access
-          info[:status] = '500' if payload[:exception]
-          # 存储
-          in_slow = SimpleApm::SlowRequest.update_by_request info
-          in_action_info = SimpleApm::Action.update_by_request info
-          SimpleApm::Hit.update_by_request info
-          if in_action_info || in_slow
-            SimpleApm::Request.create info
-          else
-            SimpleApm::Sql.delete_by_request_id(request_id)
+    ProcessingThread.add_event(
+        name: name,
+        request_id: Thread.current['action_dispatch.request_id'],
+        started: started, finished: finished,
+        payload: payload,
+        started_memory: Thread.current[:current_process_memory],
+        completed_memory: GetProcessMem.new.mb
+    )
+    Thread.current['action_dispatch.request_id'] = nil
+  end
+
+  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
+      ProcessingThread.add_event(
+          name: name,
+          request_id: request_id,
+          started: started, finished: finished,
+          payload: payload
+      )
+    end
+  end
+  # 订阅log ---- end ----
+
+
+  # 开启一个接收事件的并行thread，每隔一秒处理一次
+  class ProcessingThread
+    class << self
+      def add_event(e)
+        @processing_thread && @processing_thread[:events].push(e)
+      end
+      def start!
+        @main_thread ||= Thread.current
+        @processing_thread ||= Thread.new do
+          Thread.current.name = 'simple-apm-processing-thread'
+          Thread.current[:events] ||= []
+          loop do
+            while e = Thread.current[:events].shift
+              Worker.process! e
+            end
+            sleep 1
           end
         end
       end
-    rescue => e
-      Logger.new("#{Rails.root}/log/simple_apm.log").info e.backtrace.join("\n")
     end
   end
 
-  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']
-      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)
-          payload.merge!(:line => c.line, :filename => c.filename.to_s.gsub(Rails.root.to_s, ''), :method => c.method)
+  # 处理信息的操作方法
+  class Worker
+    class << self
+      def process!(event)
+        SimpleApm::RedisKey.query_date = nil
+        if event[:name]=='process_action.action_controller'
+          process_controller(event)
+        elsif event[:name]=='sql.active_record'
+          process_sql(event)
+        end
+      end
+
+      private
+      def process_controller(event)
+        payload = event[:payload]
+        started_memory = event[:started_memory]
+        completed_memory = event[:completed_memory]
+        finished = event[:finished]
+        started = event[:started]
+        request_id = event[:request_id]
+        begin
+          need_skip = payload[:controller] == 'SimpleApm::ApmController'
+          need_skip = true if SimpleApm::Setting::EXCLUDE_ACTIONS.include?("#{payload[:controller]}##{payload[:action]}")
+          need_skip = true if payload[:status].to_s=='302' && payload[:path].to_s=~/login/ && payload[:method].to_s.downcase=='get'
+
+          if request_id.present?
+            if need_skip
+              SimpleApm::Sql.delete_by_request_id(request_id)
+            else
+              action_name = "#{payload[:controller]}##{payload[:action]}"
+              memory_during = completed_memory - started_memory rescue 0
+              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,
+                  view_runtime: payload[:view_runtime].to_f / 1000,
+                  controller: payload[:controller],
+                  action: payload[:action],
+                  host: Socket.gethostname,
+                  remote_addr: (payload[:headers]['HTTP_X_REAL_IP'] rescue nil),
+                  method: payload[:method],
+                  completed_memory: completed_memory,
+                  memory_during: memory_during,
+                  format: payload[:format],
+                  exception: payload[:exception].presence.to_json
+              }.with_indifferent_access
+              info[:status] = '500' if payload[:exception]
+              # 存储
+              in_slow = SimpleApm::SlowRequest.update_by_request info
+              in_action_info = SimpleApm::Action.update_by_request info
+              SimpleApm::Hit.update_by_request info
+              if in_action_info || in_slow
+                SimpleApm::Request.create info
+              else
+                SimpleApm::Sql.delete_by_request_id(request_id)
+              end
+            end
+          end
+        rescue => e
+          Logger.new("#{Rails.root}/log/simple_apm.log").info e.backtrace.join("\n")
+        end
+      end
+
+      def process_sql(event)
+        payload = event[:payload]
+        finished = event[:finished]
+        started = event[:started]
+        request_id = event[:request_id]
+        begin
+          during = finished - started
+          if request_id.present? && ( SimpleApm::Setting::SQL_CRITICAL_TIME.blank? || during > SimpleApm::Setting::SQL_CRITICAL_TIME)
+            # ActiveRecord::Relation::QueryAttribute
+            sql_value = payload[:binds].map {|q| [q.name, q.value]} rescue nil
+            info = {
+                request_id: request_id,
+                name: payload[:name],
+                during: during,
+                started: started,
+                sql: payload[:sql],
+                value: sql_value,
+                filename: payload[:filename],
+                line: payload[:line]
+            }.with_indifferent_access
+            SimpleApm::Sql.create request_id, info
+          end
+        rescue => e
+          Logger.new("#{Rails.root}/log/simple_apm.log").info e.backtrace.join("\n")
         end
-        # ActiveRecord::Relation::QueryAttribute
-        sql_value = payload[:binds].map {|q| [q.name, q.value]} rescue nil
-        info = {
-            request_id: request_id,
-            name: payload[:name],
-            during: during,
-            started: started,
-            sql: payload[:sql],
-            value: sql_value,
-            filename: payload[:filename],
-            line: payload[:line]
-        }.with_indifferent_access
-        SimpleApm::Sql.create request_id, info
       end
-    rescue => e
-      Logger.new("#{Rails.root}/log/simple_apm.log").info e.backtrace.join("\n")
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_apm
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - yuanyin.xia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-13 00:00:00.000000000 Z
+date: 2018-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.1
+- !ruby/object:Gem::Dependency
+  name: get_process_mem
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 'xyy: Simple Apm View for rails using redis.'
 email:
 - xiayuanyin@qq.com