rorvswild 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d83c8de22b205606b6ca1d8a70edb9994361af2f
-  data.tar.gz: e8de8fd1f28219a40a5e525dc1d77b9ba8865542
+  metadata.gz: c255c25e5829f312cb6e04c42eb8bb0c4d0b247b
+  data.tar.gz: 0581376548672b9c4e168bdf5b2bf0c02a1b044d
 SHA512:
-  metadata.gz: c7c1f11d63d3ddfc0763ae333ba6978307bba99b0c8ea1774779ee822738334be82986684b3f7b043b5403db73441094e9f03c7555ec3e65c5ce3baedd7de63d
-  data.tar.gz: c2fb3ad205b3e98fc72c2017987d91b94c14bb4ef0a259fdf957ffc07ff8f7a9ef3fc85bfe00c782a2f8624a0d74d861dd4f91c2735775092f7e4a44a74ecdc3
+  metadata.gz: f702cf9cb1ab6f629130bb5fcc543821181d8e8a4b7b45bf56a7c8277a19f4e6401cb7e3c29911e1f81dc9a9dc0fd6157e2db5f9a786a003887e75517722e7eb
+  data.tar.gz: 0851c9573066fe3ca8b9581d10cc09c61c6f3e4da1c44fbc1c358bbae1fba47b4fdf66c9c796e2b501870ada44977af4209de3bf3a79a200cb2f6d21ccf85940

data/lib/rorvswild/version.rb

@@ -1,3 +1,3 @@
 module RorVsWild
-  VERSION = "0.2.0".freeze
+  VERSION = "0.2.1".freeze
 end

data/lib/rorvswild.rb

@@ -43,7 +43,7 @@ module RorVsWild
       }
     end
 
-    attr_reader :api_url, :api_key, :app_id, :error, :request, :explain_sql_threshold, :log_sql_threshold
+    attr_reader :api_url, :api_key, :app_id, :explain_sql_threshold, :log_sql_threshold
 
     def initialize(config)
       config = self.class.default_config.merge(config)
@@ -52,6 +52,7 @@ module RorVsWild
       @api_url = config[:api_url]
       @api_key = config[:api_key]
       @app_id = config[:app_id]
+      @data = {}
       setup_callbacks
       RorVsWild.register_default_client(self)
     end
@@ -70,19 +71,15 @@ module RorVsWild
     end
 
     def before_http_request(name, start, finish, id, payload)
-      @request = {controller: payload[:controller], action: payload[:action], path: payload[:path]}
-      @queries = []
-      @views = {}
-      @error = nil
+      request.merge!(controller: payload[:controller], action: payload[:action], path: payload[:path])
     end
 
     def after_http_request(name, start, finish, id, payload)
       request[:db_runtime] = (payload[:db_runtime] || 0).round
       request[:view_runtime] = (payload[:view_runtime] || 0).round
       request[:other_runtime] = compute_duration(start, finish) - request[:db_runtime] - request[:view_runtime]
-      error[:parameters] = filter_sensitive_data(payload[:params]) if error
-      attributes = request.merge(queries: slowest_queries, views: slowest_views, error: error)
-      Thread.new { post_request(attributes) }
+      request[:error][:parameters] = filter_sensitive_data(payload[:params]) if request[:error]
+      post_request
     rescue => exception
       log_error(exception)
     end
@@ -114,7 +111,7 @@ module RorVsWild
     def after_exception(exception, controller)
       if !exception.is_a?(ActionController::RoutingError)
         file, line = exception.backtrace.first.split(":")
-        @error = exception_to_hash(exception).merge(
+        request[:error] = exception_to_hash(exception).merge(
           session: controller.session.to_hash,
           environment_variables: filter_sensitive_data(filter_environment_variables(controller.request.env))
         )
@@ -136,8 +133,7 @@ module RorVsWild
     end
 
     def measure_block(name, &block)
-      @queries = []
-      @job = {name: name}
+      job[:name] = name
       started_at = Time.now
       cpu_time_offset = cpu_time
       block.call
@@ -175,15 +171,27 @@ module RorVsWild
     private
 
     def queries
-      @queries
+      data[:queries] ||= []
     end
 
     def views
-      @views
+      data[:views] ||= {}
     end
 
     def job
-      @job
+      data
+    end
+
+    def request
+      data
+    end
+
+    def data
+      @data[Thread.current.object_id] ||= {}
+    end
+
+    def cleanup_data
+      @data.delete(Thread.current.object_id)
     end
 
     def push_query(query)
@@ -213,20 +221,23 @@ module RorVsWild
       ActiveRecord::Base.connection.explain(sql, binds) if (sql =~ SELECT_REGEX) == 0
     end
 
-    def post_request(attributes)
-      post("/requests", request: attributes)
-    rescue => exception
-      log_error(exception)
+    def post_request
+      attributes = request.merge(queries: slowest_queries, views: slowest_views)
+      Thread.new { post("/requests".freeze, request: attributes) }
+    ensure
+      cleanup_data
     end
 
     def post_job
-      post("/jobs", job: job.merge(queries: slowest_queries))
+      post("/jobs".freeze, job: job.merge(queries: slowest_queries))
     rescue => exception
       log_error(exception)
+    ensure
+      cleanup_data
     end
 
     def post_error(hash)
-      post("/errors", error: hash)
+      post("/errors".freeze, error: hash)
     end
 
     def extract_query_location(stack)
@@ -241,15 +252,15 @@ module RorVsWild
 
     def split_file_location(location)
       file, line, method = location.split(":")
-      method = cleanup_method_name(method)
+      method = cleanup_method_name(method) if method
       [file, line, method]
     end
 
     def cleanup_method_name(method)
-      method.sub!("block in ", "")
-      method.sub!("in `", "")
-      method.sub!("'", "")
-      method.index("_app_views_") == 0 ? nil : method
+      method.sub!("block in ".freeze, "".freeze)
+      method.sub!("in `".freeze, "".freeze)
+      method.sub!("'".freeze, "".freeze)
+      method.index("_app_views_".freeze) == 0 ? nil : method
     end
 
     def compute_duration(start, finish)
@@ -257,7 +268,7 @@ module RorVsWild
     end
 
     def relative_path(path)
-      path.sub(Rails.root.to_s, "")
+      path.sub(Rails.root.to_s, "".freeze)
     end
 
     def exception_to_hash(exception, extra_details = nil)
@@ -277,7 +288,7 @@ module RorVsWild
       uri = URI(api_url + path)
       Net::HTTP.start(uri.host, uri.port) do |http|
         post = Net::HTTP::Post.new(uri.path)
-        post.content_type = "application/json"
+        post.content_type = "application/json".freeze
         post.basic_auth(app_id, api_key)
         post.body = data.to_json
         http.request(post)
@@ -303,15 +314,17 @@ module RorVsWild
     end
   end
 
+  DASH_PERFORM = "#perform".freeze
+
   module ResquePlugin
     def around_perform_rorvswild(*args, &block)
-      RorVsWild.measure_block(to_s + "#perform", &block)
+      RorVsWild.measure_block(to_s + DASH_PERFORM, &block)
     end
   end
 
   class SidekiqPlugin
     def call(worker, item, queue, &block)
-      RorVsWild.measure_block(item["class"] + "#perform", &block)
+      RorVsWild.measure_block(item["class".freeze] + DASH_PERFORM, &block)
     end
   end
 end

data/test/ror_vs_wild_test.rb

@@ -70,6 +70,10 @@ class RorVsWildTest < MiniTest::Unit::TestCase
     assert_equal(%w[/ruby/gems/lib/sql.rb 1 method1], client.send(:extract_error_location, callstack))
   end
 
+  def test_extract_error_location_when_there_is_no_method_name
+    assert_equal(["/foo/bar.rb", "123", nil], client.send(:extract_error_location, ["/foo/bar.rb:123"]))
+  end
+
   private
 
   def client

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rorvswild
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Alexis Bernard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-20 00:00:00.000000000 Z
+date: 2015-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler