simple_apm 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7022496ba04174ad3f103383c9388b3b5203c79f22eec0381bb50f6d2d8d6f14
-  data.tar.gz: 2e6faa25b91f124e29c9c092cb432fcfd3593631daecc18edd61182f19a9d10b
+  metadata.gz: 5c91db688c65ce6f3494af08efe52113e34f6b717b70ad1bbd7f7940d7439734
+  data.tar.gz: 5d4d4b1d8ed80f91f07a8e11a41e884aaf7ac057c592a3d9adb214844ab7bf41
 SHA512:
-  metadata.gz: bafd772296505aae3f057b5a6a51fed6aba84f1c31dc81245b80c989b6c9f9845b0e16d99e769e7a7f74e6e538402ff7bd0983b8817c74a6990aa29c64804e64
-  data.tar.gz: e8393025dec36cf4a329a10f69a4a187d5361a07f8e59d3dc1751aa931562a323cf2e3ff34e11d2808a20ef8ac721d83ed56c4e7e5983e08758092b91a31c012
+  metadata.gz: 451a075c9e513bd609d990a8907b985fa9afec5449327cb4542eddde3de91c2446649e0edbced46347ae85b6c164d7e1258234d0477c8a6f5356f502a8f28ede
+  data.tar.gz: 68e68a6dc70ee52c31141de9023f58f25187a47699589f92789c47235f4344d4b37b644fe88184a2a821695efca16ac558b68a5a9474e02ce1eaffbcdf701a08

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

@@ -29,7 +29,9 @@
     <tr>
       <td>
         <%= sec_str r.during %>
-        (DB: <%= sec_str r.db_runtime %> , View: <%= sec_str r.view_runtime %>)
+        (DB: <%= sec_str r.db_runtime %> ,
+        View: <%= sec_str r.view_runtime %>
+        <%= "HTTP: #{sec_str r.net_http_during}" if r.net_http_during.to_f > 0 %>)
       </td>
       <td><%= time_label r.started %></td>
       <td><%= link_to r.request_id, show_path(id: r.request_id) %></td>

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

@@ -12,8 +12,8 @@
   <span>
   <%= sec_str @request.during %>
     （数据库：<%= sec_str @request.db_runtime %>,
-    View: <%= sec_str @request.view_runtime %>,
-    外部请求: <%= sec_str @request.net_http_during %>）
+    View: <%= sec_str @request.view_runtime %>
+    <%= ",外部请求: #{sec_str @request.net_http_during}" if @request.net_http_during.to_f>0 %>）
 </span>
 </p>
 <p>
@@ -42,15 +42,15 @@
   <table class="table table-bordered">
     <tr>
       <th>开始时间</th>
-      <th>URL</th>
       <th>耗时</th>
+      <th>URL</th>
       <th>其他信息</th>
     </tr>
     <% @request.net_http_requests.each do |r| %>
       <tr>
         <td><%= time_label r.started %></td>
-        <td><%= r.url %></td>
         <td><%= sec_str r.during %></td>
+        <td><%= r.url %></td>
         <td><%= "#{r.filename}: #{r.line}" if r.filename.present? %></td>
       </tr>
     <% end %>

data/lib/simple_apm.rb

@@ -27,7 +27,9 @@ module SimpleApm
     th = Thread.current['action_dispatch.request_id'].present? ? Thread.current : Thread.main
     request_id = th['action_dispatch.request_id']
     if request_id
-      during = finished - started
+      # Net::HTTP请求分两步，do_start和request，RestClient会预先do_start在调用request，HTTParty则会直接调用request
+      real_start_time = payload[:real_start_time] || started
+      during = finished - real_start_time
       th[:net_http_during] += during if th[:net_http_during]
       if dev_caller = caller.detect {|c| c.include?(Rails.root.to_s) && !c.include?('/vendor/')}
         c = ::Callsite.parse(dev_caller)
@@ -36,7 +38,7 @@ module SimpleApm
       ProcessingThread.add_event(
           name: name,
           request_id: request_id,
-          started: started, finished: finished,
+          started: real_start_time, finished: finished,
           payload: payload
       )
     end

data/lib/simple_apm/net_http.rb

@@ -1,9 +1,16 @@
+require 'net/http'
 module SimpleApm
   class NetHttp
     class << self
       def install
         Net::HTTP.class_eval do
-          alias orig_request_apm request unless method_defined?(:orig_request)
+          alias origin_request_apm request unless method_defined?(:origin_request_apm)
+          alias origin_do_start_apm do_start unless method_defined?(:origin_do_start_apm)
+
+          def do_start
+            Thread.current[:injection_net_http_request_start_time] = Time.now
+            origin_do_start_apm
+          end
 
           def request(req, body = nil, &block)
             url = if @port == '80'
@@ -13,14 +20,17 @@ module SimpleApm
                   else
                     "http://#{@address}:#{@port}#{req.path}"
                   end
-            # 会调用两次(HTTParty)
+            payload = {
+                real_start_time: Thread.current[:injection_net_http_request_start_time],
+                url: url, host: @address, path: req.path
+            }
             if started?
-              ActiveSupport::Notifications.instrument "net_http.request", url: url, host: @address, path: req.path do
-                @response = orig_request_apm(req, body, &block)
+              ActiveSupport::Notifications.instrument 'net_http.request', payload do
+                @response = origin_request_apm(req, body, &block)
               end
             else
               # 去connect
-              @response = orig_request_apm(req, body, &block)
+              @response = origin_request_apm(req, body, &block)
             end
             @response
           end

data/lib/simple_apm/version.rb

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

metadata

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