simple_apm 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0788a278666b619108511b355faf6e753efd77f91af407b9d970a6e94546e5a8'
-  data.tar.gz: b9c74722038adf1377802becec05688efff134f87d144f5f8036b303720ffd54
+  metadata.gz: bd96eb80e66cb02f54e84663909f84a974ff4071b2f5d30a9c136fa3c23552b1
+  data.tar.gz: 4b4018dc5da34ade9b345dc58622655d9263603557f1411cf17f8affe20e2725
 SHA512:
-  metadata.gz: 98c2ea0efdf65da918f63dd9f7e0c0e3ad5206e511aec00b695ba9509e03d4b87c7023db9361bbf458f772965edf4ffd1840942d4cd3361cae0349009d1948f2
-  data.tar.gz: 10c7e14e85a49bfab9587b445bc8bbe5ab207ac0ff9b731eb0d499fafb800b4e23e02d4fa8b5d4c93c6ec799b4a676966572dfc3e3b3d4b63aec95945d9bf3dd
+  metadata.gz: bdcd065ce63b5143b915d8f288d23132da6caf4b383cdf938c5baf9347770eb90a252bc185ba70a9ddf66fdf46b3ae10103bb7aa7b9661e2674a978a7bd5813d
+  data.tar.gz: c734c6adf33cfb68ff94c330a1b8dea7a2be74fdee069e8ee9406f86190b23be426dbb1994ac890e391c3b4976bca1b0e320390682ac2c8ac30089a1cbb5ae06

data/lib/simple_apm.rb

@@ -4,62 +4,71 @@ require "simple_apm/engine"
 require 'callsite'
 module SimpleApm
   ActiveSupport::Notifications.subscribe('process_action.action_controller') do |name, started, finished, unique_id, payload|
-    request_id = Thread.current['action_dispatch.request_id']
-    if request_id.present?
-      action_name = "#{payload[:controller]}##{payload[:action]}" #payload[:format]
-      info = {
-        request_id: request_id,
-        action_name: action_name,
-        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]['REMOTE_ADDR'],
-        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)
+    begin
+      request_id = Thread.current['action_dispatch.request_id']
+      need_skip = payload[:controller] == 'SimpleApm::ApmController'
+      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,
+              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'],
+              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)
+          end
+        end
       end
+    rescue => e
+      Logger.new("#{Rails.root}/log/simple_apm.log").info e.backtrace
     end
-  rescue => e
-    Logger.new("#{Rails.root}/log/simple_apm.log").info e.backtrace
   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.present?
-      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)
+    begin
+      request_id = Thread.current['action_dispatch.request_id'].presence || Thread.main['action_dispatch.request_id']
+      if request_id.present?
+        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)
+        end
+        # ActiveRecord::Relation::QueryAttribute
+        sql_value = payload[:binds].map {|q| [q.name, q.value]}
+        info = {
+            request_id: request_id,
+            name: payload[:name],
+            during: finished - started,
+            started: started,
+            sql: payload[:sql],
+            value: sql_value,
+            filename: payload[:filename],
+            line: payload[:line]
+        }.with_indifferent_access
+        SimpleApm::Sql.create request_id, info
       end
-      # ActiveRecord::Relation::QueryAttribute
-      sql_value = payload[:binds].map{|q|[q.name, q.value]}
-      info = {
-        request_id: request_id,
-        name: payload[:name],
-        during: finished - started,
-        started: started,
-        sql: payload[:sql],
-        value: sql_value,
-        filename: payload[:filename],
-        line: payload[:line]
-      }.with_indifferent_access
-      SimpleApm::Sql.create request_id, info
+    rescue => e
+      Logger.new("#{Rails.root}/log/simple_apm.log").info e.backtrace
     end
-  rescue => e
-    Logger.new("#{Rails.root}/log/simple_apm.log").info e.backtrace
   end
 end

data/lib/simple_apm/redis.rb

@@ -6,7 +6,7 @@ module SimpleApm
     class << self
       def instance
         @current ||= ::Redis::Namespace.new(
-          :simple_apm,
+          "simple_apm:#{SimpleApm::Setting::APP_NAME}",
           :redis => ::Redis.new(
             url: SimpleApm::Setting::REDIS_URL,
             driver: SimpleApm::Setting::REDIS_DRIVER
@@ -20,6 +20,8 @@ module SimpleApm
         redis.info.each do |k, v|
           if k == 'total_system_memory_human'
             h['系统内存'] = v
+          elsif k == 'used_memory_human'
+            h['当前内存占用'] = v
           elsif k == 'used_memory_rss_human'
             h['当前内存占用(rss)'] = v
           elsif k == 'used_memory_peak_human'

data/lib/simple_apm/setting.rb

@@ -8,5 +8,7 @@ module SimpleApm
     SLOW_ACTIONS_LIMIT = ApmSettings['slow_actions_limit'].presence || 1000
     # 每个action存最慢的请求量
     ACTION_SLOW_REQUEST_LIMIT = ApmSettings['action_slow_request_limit'].presence || 100
+    # 区分项目显示
+    APP_NAME = ApmSettings['app_name'].presence || 'app'
   end
 end

data/lib/simple_apm/version.rb

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

metadata

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