simple_apm 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8c989664fa3b8d390ac868ac144adf3f8c75114374d4843cb80c6ec36080eed
-  data.tar.gz: fdc007de42402503a588d7775d2a410527c125c012ff5b5c56b9d3581c1379f9
+  metadata.gz: 7022496ba04174ad3f103383c9388b3b5203c79f22eec0381bb50f6d2d8d6f14
+  data.tar.gz: 2e6faa25b91f124e29c9c092cb432fcfd3593631daecc18edd61182f19a9d10b
 SHA512:
-  metadata.gz: d0327ea89887bdc55829cbb976726b991ef836e349eedea1ee98c517d1e2e24bb86cb82950ddbfdade6c9718fb3826bbe4c2fe4261fd6158a56fb44d5acd7a49
-  data.tar.gz: c45971ff9bf1fd1683ab5110988cf0f37e52431ae202891ab2d4345f7497ed312e01bc7074cee1b953e745deaf34cdac79383c9155e3e5713c7774545cd0b136
+  metadata.gz: bafd772296505aae3f057b5a6a51fed6aba84f1c31dc81245b80c989b6c9f9845b0e16d99e769e7a7f74e6e538402ff7bd0983b8817c74a6990aa29c64804e64
+  data.tar.gz: e8393025dec36cf4a329a10f69a4a187d5361a07f8e59d3dc1751aa931562a323cf2e3ff34e11d2808a20ef8ac721d83ed56c4e7e5983e08758092b91a31c012

data/app/models/simple_apm/action.rb

@@ -1,7 +1,7 @@
 # 请求 Controller#Action
 module SimpleApm
   class Action
-    attr_accessor :name, :click_count, :time, :slow_time, :slow_id, :fast_time, :fast_id
+    attr_accessor :name, :click_count, :time, :http_time, :slow_time, :slow_id, :fast_time, :fast_id
 
     def initialize(h)
       h.each do |k, v|
@@ -21,6 +21,10 @@ module SimpleApm
       @slow_requests ||= SimpleApm::SlowRequest.list_by_action(name, limit, offset)
     end
 
+    def avg_http_time
+      http_time.to_f/click_count.to_i
+    end
+
     def avg_time
       time.to_f/click_count.to_i
     end
@@ -39,6 +43,8 @@ module SimpleApm
         SimpleApm::Redis.hincrby _key, 'click_count', 1
         # 总时间
         SimpleApm::Redis.hincrbyfloat _key, 'time', h['during']
+        # 外部http访问时间
+        SimpleApm::Redis.hincrbyfloat _key, 'http_time', h['net_http_during']
         _slow = SimpleApm::Redis.hget _key, 'slow_time'
         if _slow.nil? || h['during'].to_f > _slow.to_f
           # 记录最慢访问

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

@@ -4,6 +4,7 @@
     <th>Name</th>
     <th>点击次数</th>
     <th>平均响应时间</th>
+    <th>平均http访问时间</th>
     <th>最快响应时间</th>
     <th>最慢响应时间</th>
   </tr>
@@ -14,6 +15,7 @@
       <td><%= link_to action.name, action_info_path(action_name: action.name) %></td>
       <td><%= action.click_count %></td>
       <td><%= sec_str action.avg_time %></td>
+      <td><%= sec_str action.avg_http_time %></td>
       <td><%= link_to sec_str(action.fast_time), show_path(id: action.fast_id) %></td>
       <td><%= link_to sec_str(action.slow_time), show_path(id: action.slow_id) %></td>
     </tr>

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

@@ -48,7 +48,7 @@
     </tr>
     <% @request.net_http_requests.each do |r| %>
       <tr>
-        <td><%= r.started %></td>
+        <td><%= time_label r.started %></td>
         <td><%= r.url %></td>
         <td><%= sec_str r.during %></td>
         <td><%= "#{r.filename}: #{r.line}" if r.filename.present? %></td>

data/lib/simple_apm/net_http.rb

@@ -3,12 +3,24 @@ module SimpleApm
     class << self
       def install
         Net::HTTP.class_eval do
-          alias orig_request request unless method_defined?(:orig_request)
+          alias orig_request_apm request unless method_defined?(:orig_request)
 
           def request(req, body = nil, &block)
-            url = "http://#{@address}:#{@port}#{req.path}"
-            ActiveSupport::Notifications.instrument "net_http.request", url: url, host: @address, path: req.path do
-              @response = orig_request(req, body, &block)
+            url = if @port == '80'
+                    "http://#{@address}#{req.path}"
+                  elsif @port == '443'
+                    "https://#{@address}#{req.path}"
+                  else
+                    "http://#{@address}:#{@port}#{req.path}"
+                  end
+            # 会调用两次(HTTParty)
+            if started?
+              ActiveSupport::Notifications.instrument "net_http.request", url: url, host: @address, path: req.path do
+                @response = orig_request_apm(req, body, &block)
+              end
+            else
+              # 去connect
+              @response = orig_request_apm(req, body, &block)
             end
             @response
           end

data/lib/simple_apm/version.rb

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

metadata

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