rorvswild 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d99dccaa0be65ef42005f19618032f0ed6dd02b
-  data.tar.gz: 00f69ad52c795d66d6f46cf1fa2b075e42da047b
+  metadata.gz: dbddf42d7a3d87901206dcdb0872b689c733b100
+  data.tar.gz: 51c9aeebb5d2ec07863465db44f2253990421336
 SHA512:
-  metadata.gz: d16fbec1a331e049787751d4116eaee4945b1e4e69d7b59f7738353d77098987dbbef94b1c469a1eb619ba0d619d4a5ca288db94c4745685fd0d4c3a7d3b4a90
-  data.tar.gz: fb2ed2951ee072a73c19a4bd384259c0f1d59c6954e606f150241f9acae2b38cc987233a41cdb50ad4b7b6d084de6b740b0e9d1607ab53b924668326e7dbef65
+  metadata.gz: 1b109fabeb568743f2d306c8295bdb4201fa01773fb0940c9c2c8ebe1679426fe91969d56fa3c6c02217ef91e9f4241b23eac881a68ef276f6354b86c4eb69f4
+  data.tar.gz: e20ff2a1eae18fbaa31e4631f7a6093ce7b97be390ddc0acea6a6e6483820a1cefe7737572a439c90442d8299c79a119998c9ba33fee635f90d4c3194fadc8d4

data/Gemfile

@@ -8,6 +8,7 @@ gem "top_tests"
 
 gem "mongo"
 gem "redis"
+gem "elasticsearch"
 
 gem "actionpack"
 gem "activejob"

data/lib/rorvswild/agent.rb

@@ -40,6 +40,7 @@ module RorVsWild
 
       Plugin::Redis.setup
       Plugin::Mongo.setup
+      Plugin::Elasticsearch.setup
 
       Plugin::Resque.setup
       Plugin::Sidekiq.setup

data/lib/rorvswild/plugin/elasticsearch.rb

@@ -0,0 +1,23 @@
+module RorVsWild
+  module Plugin
+    class Elasticsearch
+      def self.setup
+        return if !defined?(::Elasticsearch::Transport)
+        return if ::Elasticsearch::Transport::Client.method_defined?(:perform_request_without_rorvswild)
+
+        ::Elasticsearch::Transport::Client.class_eval do
+          alias_method :perform_request_without_rorvswild, :perform_request
+
+          def perform_request(method, path, params={}, body=nil)
+            RorVsWild::Plugin::NetHttp.ignore do
+              command = {method: method, path: path, params: params, body: body}.to_json
+              RorVsWild.agent.measure_section(command, kind: "elasticsearch") do
+                perform_request_without_rorvswild(method, path, params, body)
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rorvswild/plugin/net_http.rb

@@ -12,6 +12,14 @@ module RorVsWild
           alias_method :request_without_rorvswild, :request
 
           def request(req, body = nil, &block)
+            if Thread.current[:rorvswild_ignore_net_http]
+              request_without_rorvswild(req, body, &block)
+            else
+              request_with_rorvswild(req, body, &block)
+            end
+          end
+
+          def request_with_rorvswild(req, body = nil, &block)
             return request_without_rorvswild(req, body, &block) if request_called_twice?
             scheme = use_ssl? ? HTTPS : HTTP
             url = "#{req.method} #{scheme}://#{address}#{req.path}"
@@ -27,6 +35,14 @@ module RorVsWild
           end
         end
       end
+
+      def self.ignore(&block)
+        old_value = Thread.current[:rorvswild_ignore_net_http]
+        Thread.current[:rorvswild_ignore_net_http] = true
+        block.call
+      ensure
+        Thread.current[:rorvswild_ignore_net_http] = old_value
+      end
     end
   end
 end

data/lib/rorvswild/plugins.rb

@@ -2,6 +2,7 @@ require "rorvswild/plugin/net_http"
 
 require "rorvswild/plugin/redis"
 require "rorvswild/plugin/mongo"
+require "rorvswild/plugin/elasticsearch"
 
 require "rorvswild/plugin/resque"
 require "rorvswild/plugin/sidekiq"

data/lib/rorvswild/section.rb

@@ -41,8 +41,6 @@ module RorVsWild
       kind == section.kind && line == section.line && file == section.file
     end
 
-    MAX_COMMAND_HISTORY = 5
-
     def merge(section)
       self.calls += section.calls
       self.total_runtime += section.total_runtime

data/lib/rorvswild/version.rb

@@ -1,3 +1,3 @@
 module RorVsWild
-  VERSION = "1.1.1".freeze
+  VERSION = "1.2.0".freeze
 end

data/test/helper.rb

@@ -12,7 +12,7 @@ module RorVsWildAgentHelper
   end
 
   def initialize_agent(options = {})
-    agent ||= RorVsWild.start(options)
+    agent ||= RorVsWild.start({logger: "/dev/null"}.merge(options))
     agent.stubs(:post_request)
     agent.stubs(:post_job)
     agent

data/test/plugin/elasticsearch_test.rb

@@ -0,0 +1,17 @@
+require File.expand_path("#{File.dirname(__FILE__)}/../helper")
+
+require "elasticsearch"
+
+class RorVsWild::Plugin::ElasticsearchTest < Minitest::Test
+  include RorVsWildAgentHelper
+
+  def test_callback
+    agent.measure_block("elastic") do
+      ::Elasticsearch::Client.new.search(q: "test")
+    end
+    assert_equal(1, agent.data[:sections].size)
+    assert_equal(1, agent.data[:sections][0].calls)
+    assert_equal("elasticsearch", agent.data[:sections][0].kind)
+    assert_equal('{"method":"GET","path":"_search","params":{"q":"test"},"body":null}', agent.data[:sections][0].command)
+  end
+end

data/test/queue_test.rb

@@ -1,13 +1,17 @@
 require File.expand_path("#{File.dirname(__FILE__)}/helper")
 
 class QueueTest < Minitest::Test
+  include RorVsWildAgentHelper
+
   def test_push_job
+    queue.start_thread
     queue.thread.expects(:wakeup)
     10.times { queue.push_job(1) }
     assert_equal(10, queue.jobs.size)
   end
 
   def test_push_request
+    queue.start_thread
     queue.thread.expects(:wakeup)
     10.times { queue.push_request(1) }
     assert_equal(10, queue.requests.size)
@@ -43,10 +47,10 @@ class QueueTest < Minitest::Test
   end
 
   def queue
-    @queue ||= RorVsWild::Queue.new(client)
+    @queue ||= agent.instance_variable_get(:@queue)
   end
 
   def client
-    @client ||= RorVsWild::Client.new({})
+    @client ||= agent.instance_variable_get(:@client)
   end
 end

data/test/rorvswild_test.rb

@@ -145,7 +145,7 @@ class RorVsWildTest < Minitest::Test
   end
 
   def initialize_agent(options = {})
-    agent ||= RorVsWild.start(options)
+    agent ||= RorVsWild.start({logger: "/dev/null"}.merge(options))
     agent.stubs(:post_request)
     agent.stubs(:post_task)
     agent

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rorvswild
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Alexis Bernard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-06 00:00:00.000000000 Z
+date: 2017-11-23 00:00:00.000000000 Z
 dependencies: []
 description: Performances and quality insights for rails developers.
 email:
@@ -36,6 +36,7 @@ files:
 - lib/rorvswild/plugin/active_job.rb
 - lib/rorvswild/plugin/active_record.rb
 - lib/rorvswild/plugin/delayed_job.rb
+- lib/rorvswild/plugin/elasticsearch.rb
 - lib/rorvswild/plugin/mongo.rb
 - lib/rorvswild/plugin/net_http.rb
 - lib/rorvswild/plugin/redis.rb
@@ -55,6 +56,7 @@ files:
 - test/plugin/active_job_test.rb
 - test/plugin/active_record_test.rb
 - test/plugin/delayed_job_test.rb
+- test/plugin/elasticsearch_test.rb
 - test/plugin/mongo_test.rb
 - test/plugin/net_http_test.rb
 - test/plugin/redis_test.rb
@@ -97,6 +99,7 @@ test_files:
 - test/plugin/active_job_test.rb
 - test/plugin/active_record_test.rb
 - test/plugin/delayed_job_test.rb
+- test/plugin/elasticsearch_test.rb
 - test/plugin/mongo_test.rb
 - test/plugin/net_http_test.rb
 - test/plugin/redis_test.rb