simple_apm 0.1.9 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23e7fd45a7f7fc7edc4590c681e1eabac3a34adfe7ac1a3d17e8b16a97303502
-  data.tar.gz: 3020c53720ad77a0414711531c590d7334eee6aab119bf3e1fb4d1b2c2b1c973
+  metadata.gz: ede67114e4bfb1b3d6f62f5b46a132e78c9bb7bd827c7ba8f41eb783993d3fce
+  data.tar.gz: f65dafd04fe955efe84167301f1f82751c57a6821f0d250d9ca439906b9804b8
 SHA512:
-  metadata.gz: 1701cce03295e27d0d6cef228f86358c6653fbecfb616c6613b84c90c5eb0dd73e3e5f30fec9b34a8f6a174c3b7ce754a8c0de693f35f8f58d896a6f8bb97c25
-  data.tar.gz: 21d7870003ba6dcf01383b65f657a3ee9a36d51943c5b76f5558191d609b17791fa6e688443394509aa86c8f99308993b01cb9200c7fb12fc00e85f0541c7c81
+  metadata.gz: 48aa29dbae464fdfb7f51c96d99b666fdfb1751c932ec990a500814e16a0d67362cd7319a102255d3bcffd9c15c51b37fd9019f28ff9b99c6846fbd92bc2bbdf
+  data.tar.gz: b55e72a1f844c6e70c3b3132749e5b17b4c423efdd12bf0da11f85b63aae5baf743a90a542746460eeb45a107f5a0fee8c665d6cbf9398147f62880d4826449e

data/README.md

@@ -1,4 +1,3 @@
-# 开发中……
 # SimpleApm
 基于Redis的简单的Web请求性能监控/慢事务追踪工具
 

data/app/assets/javascripts/simple_apm/application.js

@@ -12,28 +12,4 @@
 //
 //= require_tree .
 
-// JqueryDataTable自定义排序方法
-jQuery.extend(jQuery.fn.dataTableExt.oSort, {
-    "sec-pre": function (a) {
-        var x = String(a).replace(/<[\s\S]*?>/g, "");    //去除html标记
-        x = x.replace(/&amp;nbsp;/ig, "");                   //去除空格
-        x = x.replace(/%/, "");                          //去除百分号
-        if(x.indexOf('ms')>0){
-            x = x.replace(/ms/, "");
-            return parseFloat(x)/1000;
-        }else if(x.indexOf('min')>0){
-            x = x.replace(/min/, "");
-            return parseFloat(x)*60;
-        }else{
-            x = x.replace(/min/, "");
-            return parseFloat(x)
-        }
-    },
-    "sec-asc": function (a, b) {                //正序排序引用方法
-        return ((a < b) ? -1 : ((a > b) ? 1 : 0));
-    },
-    "sec-desc": function (a, b) {                //倒序排序引用方法
-        return ((a < b) ? 1 : ((a > b) ? -1 : 0));
-    }
-});
 

data/app/assets/stylesheets/simple_apm/application.css

@@ -12,35 +12,4 @@
  *
  *= require_tree .
  *= require_self
- */
-footer{
-  text-align: center;
-  padding: 10px;
-  border-top: 1px solid #999999;
-}
-a.navbar-brand.active{
-  color: #00AEEF !important;
-}
-#page-container{
-  min-height: 80vh;
-}
-.select-apm-date{
-  width: auto;
-  float: right;
-  margin-top: 8px;
-}
-.select-apm-date>select{
-  display: inline-block;
-  width: auto;
-}
-.sql{
-  max-width: 300px;
-  white-space: nowrap;
-  text-overflow:ellipsis;
-  overflow: hidden;
-  color: #00AEEF;
-  cursor: pointer;
-}
-pre {
-  white-space: pre-wrap;
-}
+ */

data/app/views/layouts/simple_apm/application.html.erb

@@ -11,8 +11,72 @@
   <script src="//cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
   <script src="//cdn.bootcss.com/echarts/4.1.0/echarts.js"></script>
   <script src="//cdn.datatables.net/1.10.15/js/jquery.dataTables.min.js"></script>
-  <%= stylesheet_link_tag "simple_apm/application", media: "all" %>
-  <%= javascript_include_tag "simple_apm/application" %>
+  <style>
+    footer {
+      text-align: center;
+      padding: 10px;
+      border-top: 1px solid #999999;
+    }
+
+    a.navbar-brand.active {
+      color: #00AEEF !important;
+    }
+
+    #page-container {
+      min-height: 80vh;
+    }
+
+    .select-apm-date {
+      width: auto;
+      float: right;
+      margin-top: 8px;
+    }
+
+    .select-apm-date > select {
+      display: inline-block;
+      width: auto;
+    }
+
+    .sql {
+      max-width: 300px;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+      overflow: hidden;
+      color: #00AEEF;
+      cursor: pointer;
+    }
+
+    pre {
+      white-space: pre-wrap;
+    }
+  </style>
+  <script type="text/javascript">
+      // JqueryDataTable自定义排序方法
+      jQuery.extend(jQuery.fn.dataTableExt.oSort, {
+          "sec-pre": function (a) {
+              var x = String(a).replace(/<[\s\S]*?>/g, "");    //去除html标记
+              x = x.replace(/&amp;nbsp;/ig, "");                   //去除空格
+              x = x.replace(/%/, "");                          //去除百分号
+              if (x.indexOf('ms') > 0) {
+                  x = x.replace(/ms/, "");
+                  return parseFloat(x) / 1000;
+              } else if (x.indexOf('min') > 0) {
+                  x = x.replace(/min/, "");
+                  return parseFloat(x) * 60;
+              } else {
+                  x = x.replace(/min/, "");
+                  return parseFloat(x)
+              }
+          },
+          "sec-asc": function (a, b) {                //正序排序引用方法
+              return ((a < b) ? -1 : ((a > b) ? 1 : 0));
+          },
+          "sec-desc": function (a, b) {                //倒序排序引用方法
+              return ((a < b) ? 1 : ((a > b) ? -1 : 0));
+          }
+      });
+  </script>
+
   <%= csrf_meta_tags %>
 </head>
 <body>

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

@@ -1,7 +1,7 @@
 <p class="pull-right">
   <span class="text-danger">删除数据：</span>
-  <%= link_to '保留进一周数据', data_delete_path(type: 'week'), class: 'btn btn-danger', 'data-confirm': '确定删除所有一周以前的数据？'%>
-  <%= link_to '保留进一个月数据', data_delete_path(type: 'month'), class: 'btn btn-danger', 'data-confirm': '确定删除所有一个月以前的数据？' %>
+  <%= link_to '保留进一周数据', data_delete_path(type: 'week'), class: 'btn btn-danger', 'data-confirm'=> '确定删除所有一周以前的数据？'%>
+  <%= link_to '保留进一个月数据', data_delete_path(type: 'month'), class: 'btn btn-danger', 'data-confirm'=> '确定删除所有一个月以前的数据？' %>
 </p>
 
 <table class="table table-bordered">
@@ -20,7 +20,7 @@
       <td><%= d[:day]%></td>
       <td><%= d[:hits]%></td>
       <td><%= sec_str d[:avg_time]%></td>
-      <td><%= link_to '删除', data_delete_path(date: d[:day]), 'data-confirm': '确定删除？' %></td>
+      <td><%= link_to '删除', data_delete_path(date: d[:day]), 'data-confirm'=> '确定删除？' %></td>
     </tr>
   <% end %>
   </tbody>

data/lib/simple_apm.rb

@@ -22,7 +22,7 @@ module SimpleApm
               controller: payload[:controller],
               action: payload[:action],
               host: Socket.gethostname,
-              remote_addr: payload[:headers]['HTTP_X_REAL_IP'],
+              remote_addr: (payload[:headers]['HTTP_X_REAL_IP'] rescue nil),
               method: payload[:method],
               format: payload[:format],
               exception: payload[:exception].presence.to_json
@@ -40,7 +40,7 @@ module SimpleApm
         end
       end
     rescue => e
-      Logger.new("#{Rails.root}/log/simple_apm.log").info e.backtrace
+      Logger.new("#{Rails.root}/log/simple_apm.log").info e.backtrace.join("\n")
     end
   end
 
@@ -54,7 +54,7 @@ module SimpleApm
           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]}
+        sql_value = payload[:binds].map {|q| [q.name, q.value]} rescue nil
         info = {
             request_id: request_id,
             name: payload[:name],
@@ -68,7 +68,7 @@ module SimpleApm
         SimpleApm::Sql.create request_id, info
       end
     rescue => e
-      Logger.new("#{Rails.root}/log/simple_apm.log").info e.backtrace
+      Logger.new("#{Rails.root}/log/simple_apm.log").info e.backtrace.join("\n")
     end
   end
 end

data/lib/simple_apm/version.rb

@@ -1,3 +1,3 @@
 module SimpleApm
-  VERSION = '0.1.9'
+  VERSION = '1.0.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_apm
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 1.0.0
 platform: ruby
 authors:
 - yuanyin.xia
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: redis-namespace
   requirement: !ruby/object:Gem::Requirement
@@ -54,7 +54,7 @@ dependencies:
         version: '0.0'
 description: 'xyy: Simple Apm View for rails using redis.'
 email:
-- 454536909@qq.com
+- xiayuanyin@qq.com
 executables: []
 extensions: []
 extra_rdoc_files: []