rorvswild 0.3.5 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f3058ebf12d59185c06a6e58d0708b768cbbd5e
-  data.tar.gz: 180c22cf8f25b526509164cd053fad4ddda35376
+  metadata.gz: 3543194c8dc3ff5474934185936a3e514d347416
+  data.tar.gz: ef3d398dc36f503b8adaacacd24a0396c187eac6
 SHA512:
-  metadata.gz: 4c7a6ba4143a8a1c1060a2bbd5b2ebaac29d3f29eb8a44d54aba7e170008903c9ff8b9dae020b2236864ed8fa3a24ce76222aab4c99251929fd1765e001e22d2
-  data.tar.gz: e4daa2f6ed71388c9a935ea3d6757a426e25e93206c688887f5cb02d90355329e354c47306a62dff887ad3b942fd71cd9b9790bd67bafdbab1a4a3c26448ced1
+  metadata.gz: adc6cf77472d1657f151c4287dba352ceaf5675de5cde8d6d7a9c2801ef4d99967955601b43acf32684f07476f9992117a4ac13d7102ddd02595ba015bf8ce15
+  data.tar.gz: 5b6c56513e62c187b9871381eba3bde99c9ff71c6c3ab593406c96f434ca33fd85eeb00437af213c6eee4b05dc7fc3c671428cfc7fb14930f99ae6c7d5400823

data/lib/rorvswild/version.rb

@@ -1,3 +1,3 @@
 module RorVsWild
-  VERSION = "0.3.5".freeze
+  VERSION = "0.4.0".freeze
 end

data/lib/rorvswild.rb

@@ -3,6 +3,7 @@ require "json/ext"
 require "net/http"
 require "logger"
 require "uri"
+require "set"
 
 module RorVsWild
   def self.new(*args)
@@ -62,7 +63,9 @@ module RorVsWild
       }
     end
 
-    attr_reader :api_url, :api_key, :app_id, :explain_sql_threshold, :app_root, :app_root_regex, :ignored_exceptions
+    attr_reader :api_url, :api_key, :app_id, :explain_sql_threshold, :app_root, :ignored_exceptions
+
+    attr_reader :threads, :app_root_regex
 
     def initialize(config)
       config = self.class.default_config.merge(config)
@@ -73,6 +76,7 @@ module RorVsWild
       @api_key = config[:api_key]
       @app_id = config[:app_id]
       @logger = config[:logger]
+      @threads = Set.new
       @data = {}
 
       if defined?(Rails)
@@ -101,7 +105,9 @@ module RorVsWild
         ActionController::Base.rescue_from(StandardError) { |exception| client.after_exception(exception, self) }
       end
 
+      Kernel.at_exit(&method(:at_exit))
       Resque::Job.send(:extend, ResquePlugin) if defined?(Resque::Job)
+      ActiveJob::Base.around_perform(&method(:around_active_job)) if defined?(ActiveJob::Base)
       Delayed::Worker.lifecycle.around(:invoke_job, &method(:around_delayed_job)) if defined?(Delayed::Worker)
       Sidekiq.configure_server { |config| config.server_middleware { |chain| chain.add(SidekiqPlugin) } } if defined?(Sidekiq)
     end
@@ -120,8 +126,10 @@ module RorVsWild
       log_error(exception)
     end
 
+    IGNORED_QUERIES = %w[EXPLAIN SCHEMA].freeze
+
     def after_sql_query(name, start, finish, id, payload)
-      return if !queries || payload[:name] == "EXPLAIN".freeze || payload[:name] == "SCHEMA".freeze
+      return if !queries || IGNORED_QUERIES.include?(payload[:name])
       file, line, method = extract_most_relevant_location(caller)
       runtime, sql = compute_duration(start, finish), payload[:sql]
       plan = runtime >= explain_sql_threshold ? explain(payload[:sql], payload[:binds]) : nil
@@ -152,6 +160,10 @@ module RorVsWild
       raise exception
     end
 
+    def around_active_job(job, block)
+      measure_block(job.class.name, &block)
+    end
+
     def around_delayed_job(job, &block)
       measure_block(job.name) { block.call(job) }
     end
@@ -166,18 +178,21 @@ module RorVsWild
     end
 
     def measure_block(name, &block)
+      return block.call if job[:name] # Prevent from recursive jobs
       job[:name] = name
       job[:queries] = []
       started_at = Time.now
       cpu_time_offset = cpu_time
-      block.call
-    rescue Exception => exception
-      job[:error] = exception_to_hash(exception)
-      raise
-    ensure
-      job[:runtime] = (Time.now - started_at) * 1000
-      job[:cpu_runtime] = (cpu_time -  cpu_time_offset) * 1000
-      post_job
+      begin
+        block.call
+      rescue Exception => exception
+        job[:error] = exception_to_hash(exception)
+        raise
+      ensure
+        job[:runtime] = (Time.now - started_at) * 1000
+        job[:cpu_runtime] = (cpu_time -  cpu_time_offset) * 1000
+        post_job
+      end
     end
 
     def catch_error(extra_details = nil, &block)
@@ -257,13 +272,14 @@ module RorVsWild
 
     def post_request
       attributes = request.merge(queries: slowest_queries, views: slowest_views)
-      Thread.new { post("/requests".freeze, request: attributes) }
+      post_async("/requests".freeze, request: attributes)
     ensure
       cleanup_data
     end
 
     def post_job
-      post("/jobs".freeze, job: job.merge(queries: slowest_queries))
+      attributes = job.merge(queries: slowest_queries)
+      post_async("/jobs".freeze, job: attributes)
     rescue => exception
       log_error(exception)
     ensure
@@ -271,7 +287,7 @@ module RorVsWild
     end
 
     def post_error(hash)
-      post("/errors".freeze, error: hash)
+      post_async("/errors".freeze, error: hash)
     end
 
     def gem_home
@@ -346,6 +362,21 @@ module RorVsWild
       http.request(post)
     end
 
+    def post_async(path, data)
+      Thread.new do
+        begin
+          threads.add(Thread.current)
+          post(path, data)
+        ensure
+          threads.delete(Thread.current)
+        end
+      end
+    end
+
+    def at_exit
+      threads.each(&:join)
+    end
+
     def filter_sensitive_data(hash)
       @parameter_filter ? @parameter_filter.filter(hash) : hash
     end
@@ -360,17 +391,15 @@ module RorVsWild
     end
   end
 
-  DASH_PERFORM = "#perform".freeze
-
   module ResquePlugin
     def around_perform_rorvswild(*args, &block)
-      RorVsWild.measure_block(to_s + DASH_PERFORM, &block)
+      RorVsWild.measure_block(to_s, &block)
     end
   end
 
   class SidekiqPlugin
     def call(worker, item, queue, &block)
-      RorVsWild.measure_block(item["class".freeze] + DASH_PERFORM, &block)
+      RorVsWild.measure_block(item["wrapped".freeze] || item["class".freeze], &block)
     end
   end
 end

data/rorvswild.gemspec

@@ -8,9 +8,9 @@ Gem::Specification.new do |spec|
   spec.version       = RorVsWild::VERSION
   spec.authors       = ["Alexis Bernard"]
   spec.email         = ["alexis@bernard.io"]
-  spec.summary       = "All-in-one monitoring for Ruby on Rails applications."
-  spec.description   = "All-in-one monitoring for Ruby on Rails applications."
-  spec.homepage      = "http://www.rorvswild.com"
+  spec.summary       = "Ruby on Rails app monitoring"
+  spec.description   = "Performances & quality insights for rails developers."
+  spec.homepage      = "https://www.rorvswild.com"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")

data/test/ror_vs_wild_test.rb

@@ -39,6 +39,14 @@ class RorVsWildTest < Minitest::Test
     assert_equal(2, RorVsWild.measure_block("1+1") { 1+1 })
   end
 
+  def test_measure_block_recursive
+    client.expects(:post_job)
+    result = RorVsWild.measure_block("1") do
+      RorVsWild.measure_block("2") { 1 } + 1
+    end
+    assert_equal(2, result)
+  end
+
   def test_catch_error
     client.expects(:post_error)
     exception = RorVsWild.catch_error { 1 / 0 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rorvswild
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.4.0
 platform: ruby
 authors:
 - Alexis Bernard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-15 00:00:00.000000000 Z
+date: 2017-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -24,7 +24,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
-description: All-in-one monitoring for Ruby on Rails applications.
+description: Performances & quality insights for rails developers.
 email:
 - alexis@bernard.io
 executables: []
@@ -41,7 +41,7 @@ files:
 - lib/rorvswild/version.rb
 - rorvswild.gemspec
 - test/ror_vs_wild_test.rb
-homepage: http://www.rorvswild.com
+homepage: https://www.rorvswild.com
 licenses:
 - MIT
 metadata: {}
@@ -61,9 +61,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: All-in-one monitoring for Ruby on Rails applications.
+summary: Ruby on Rails app monitoring
 test_files:
 - test/ror_vs_wild_test.rb
+has_rdoc: