simple_apm 1.0.14 → 1.1.1

data/lib/simple_apm.rb

@@ -3,12 +3,21 @@ require 'simple_apm/redis'
 require 'simple_apm/engine'
 require 'simple_apm/worker'
 require 'simple_apm/net_http'
-require 'callsite'
 require 'get_process_mem'
 module SimpleApm
 
   SimpleApm::NetHttp.install
 
+  def self.merge_callsite_payload!(payload, locations = caller_locations)
+    if dev_caller = locations.detect { |location| location.path.include?(Rails.root.to_s) }
+      payload.merge!(
+        :line => dev_caller.lineno,
+        :filename => dev_caller.path.gsub(Rails.root.to_s, ''),
+        :method => dev_caller.base_label
+      )
+    end
+  end
+
   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'
@@ -36,10 +45,7 @@ module SimpleApm
       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 = ::Callsite.parse(dev_caller)
-        payload.merge!(:line => c.line, :filename => c.filename.to_s.gsub(Rails.root.to_s, ''), :method => c.method)
-      end
+      SimpleApm.merge_callsite_payload!(payload)
       ProcessingThread.add_event(
           name: name,
           request_id: request_id,
@@ -52,10 +58,7 @@ module SimpleApm
   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
-      if dev_caller = caller.detect {|c| c.include? Rails.root.to_s}
-        c = ::Callsite.parse(dev_caller)
-        payload.merge!(:line => c.line, :filename => c.filename.to_s.gsub(Rails.root.to_s, ''), :method => c.method)
-      end
+      SimpleApm.merge_callsite_payload!(payload)
       ProcessingThread.add_event(
           name: name,
           request_id: request_id,

metadata

@@ -1,29 +1,42 @@
 --- !ruby/object:Gem::Specification
 name: simple_apm
 version: !ruby/object:Gem::Version
-  version: 1.0.14
+  version: 1.1.1
 platform: ruby
 authors:
 - yuanyin.xia
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-29 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '8.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '8.1'
+- !ruby/object:Gem::Dependency
+  name: sprockets-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '3.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: redis-namespace
   requirement: !ruby/object:Gem::Requirement
@@ -56,16 +69,30 @@ dependencies:
   name: get_process_mem
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
 description: 'xyy: Simple Apm View for rails using redis.'
 email:
 - xiayuanyin@qq.com
@@ -99,6 +126,8 @@ files:
 - app/views/simple_apm/apm/data.html.erb
 - app/views/simple_apm/apm/index.html.erb
 - app/views/simple_apm/apm/show.html.erb
+- config/locales/simple_apm.en.yml
+- config/locales/simple_apm.zh-CN.yml
 - config/routes.rb
 - config/simple_apm.yml
 - lib/generators/simple_apm/install_generator.rb
@@ -115,7 +144,6 @@ homepage: https://github.com/xiayuanyin/simple_apm
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -130,9 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: 'xyy: Simple Rails Apm'
 test_files: []