simple_apm 1.0.9 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c91db688c65ce6f3494af08efe52113e34f6b717b70ad1bbd7f7940d7439734
-  data.tar.gz: 5d4d4b1d8ed80f91f07a8e11a41e884aaf7ac057c592a3d9adb214844ab7bf41
+  metadata.gz: 13c4a3af0428d79e6e98ad4e523ccdbc6e62f756aedbecb6289f55c9613c07bc
+  data.tar.gz: a44fe2e03f9080a7c44354b9923598f3c83028cf3d432363dd8c3feaec157b3e
 SHA512:
-  metadata.gz: 451a075c9e513bd609d990a8907b985fa9afec5449327cb4542eddde3de91c2446649e0edbced46347ae85b6c164d7e1258234d0477c8a6f5356f502a8f28ede
-  data.tar.gz: 68e68a6dc70ee52c31141de9023f58f25187a47699589f92789c47235f4344d4b37b644fe88184a2a821695efca16ac558b68a5a9474e02ce1eaffbcdf701a08
+  metadata.gz: d1d2bad5ed7af59fdab080e4ee6345a28f5454c3eab359383ccb343d2d80fe778d3bab84cc06682b68592a765625e8edd91bac365ec341c75c20df57da3a739f
+  data.tar.gz: fcb8e12ddcc73ba608d8e8ffbfab7303b817fec99aa753846d21dfd7a8abd9475c0c1c8eaeb28d825fa817864df82859f4f504f07e86816e7b1cc1cb83639b56

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

@@ -1,15 +1,21 @@
-<table id="slow-requests" class="table">
+<style>
+  .container{
+    width: 90%;
+    min-width: 1200px;
+  }
+</style>
+<table id="slow-requests" class="table" style="width: 100%">
   <thead>
   <tr>
     <th>请求时间</th>
-    <th>action</th>
-    <th>总耗时</th>
-    <th>db_time</th>
-    <th>view time</th>
-    <th>外部http time</th>
-    <th>内存增幅(M)</th>
-    <th>host</th>
-    <th>remote_addr</th>
+    <th>ActionName</th>
+    <th>TotalTime</th>
+    <th>DB</th>
+    <th>View</th>
+    <th>HTTP</th>
+    <th>Memory(Mb)</th>
+    <th>server</th>
+    <th>ip</th>
   </tr>
   </thead>
 </table>

data/lib/simple_apm.rb

@@ -10,8 +10,13 @@ module SimpleApm
   SimpleApm::NetHttp.install
 
   ActiveSupport::Notifications.subscribe('process_action.action_controller') do |name, started, finished, unique_id, payload|
+    remote_addr = (payload[:headers]['HTTP_X_REAL_IP'] rescue nil)
+    if remote_addr.blank? || remote_addr=='127.0.0.1'
+      remote_addr = (payload[:headers]['REMOTE_ADDR'] rescue nil)
+    end
     ProcessingThread.add_event(
         name: name,
+        remote_addr: remote_addr,
         request_id: Thread.current['action_dispatch.request_id'],
         started: started, finished: finished,
         payload: payload.reject{|k,v|k.to_s=='headers'},

data/lib/simple_apm/version.rb

@@ -1,3 +1,3 @@
 module SimpleApm
-  VERSION = '1.0.9'
+  VERSION = '1.0.10'
 end

data/lib/simple_apm/worker.rb

@@ -22,6 +22,7 @@ module SimpleApm
         finished = event[:finished]
         started = event[:started]
         request_id = event[:request_id]
+        remote_addr = event[:remote_addr]
         net_http_during = event[:net_http_during]
         begin
           need_skip = payload[:controller] == 'SimpleApm::ApmController'
@@ -46,7 +47,7 @@ module SimpleApm
                   controller: payload[:controller],
                   action: payload[:action],
                   host: Socket.gethostname,
-                  remote_addr: (payload[:headers]['HTTP_X_REAL_IP'] rescue nil),
+                  remote_addr: remote_addr,
                   method: payload[:method],
                   completed_memory: completed_memory,
                   memory_during: memory_during,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_apm
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.10
 platform: ruby
 authors:
 - yuanyin.xia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-23 00:00:00.000000000 Z
+date: 2018-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails