rorvswild 1.0.0.pre.alpha3 → 1.0.0.pre.alpha4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ccd559dc4814ccc1d74e657002fd06ccc225661a
-  data.tar.gz: 1e8d7dedad441f91a5cc48843817e69ee37c8076
+  metadata.gz: df4365fa8eb745004ea5aa2496714a0dbcadbd32
+  data.tar.gz: c6d978d8c149b2af076aa1bf6a2ffd43ae63fc2e
 SHA512:
-  metadata.gz: bf8a26c1f4c83605ec4d07154daef9d848a9db27baad3d18e771051036d7abf57697683443809037065cd3a7d3e59b5b8a05efbdbe38adc7d9fc29152b997859
-  data.tar.gz: e715af573d970f2899f7b66b38a58026aac32727465086590621feeac24d23b2a15ecb3449febb8847f2b0993711530f4e5a219e64d6cc421b498c442e8fa086
+  metadata.gz: 7fa70526436f2367dceb7c2f27262c59d0d779d5924357a5d0052d7a935ad463df4019b957dcb7784d608ddadcca0f85aa34fb664b4955553711d37a7fcdbd63
+  data.tar.gz: 7563b60608111f548d19b8704916a6f767e842f1feda942210d30c0cdb0e6f6b29bcffd54957d6927c15987fe542d206ddaf85d477d542128915e010661c4926

data/lib/rorvswild/agent.rb

@@ -58,13 +58,14 @@ module RorVsWild
     end
 
     def measure_block(name, kind = "code".freeze, &block)
-      data[:name] ? measure_section(name, kind, &block) : measure_job(name, &block)
+      data[:name] ? measure_section(name, kind: kind, &block) : measure_job(name, &block)
     end
 
-    def measure_section(name, kind = "code", &block)
+    def measure_section(name, kind: "code", appendable_command: false, &block)
       return block.call unless data[:name]
       begin
         RorVsWild::Section.start do |section|
+          section.appendable_command = appendable_command
           section.command = name
           section.kind = kind
         end
@@ -159,7 +160,7 @@ module RorVsWild
     end
 
     def post_error(hash)
-      post_async("/errors".freeze, error: hash)
+      client.post_async("/errors".freeze, error: hash)
     end
 
     def exception_to_hash(exception, extra_details = nil)
@@ -168,7 +169,7 @@ module RorVsWild
         line: line.to_i,
         file: relative_path(file),
         message: exception.message,
-        backtrace: exception.backtrace,
+        backtrace: exception.backtrace || ["No backtrace"],
         exception: exception.class.to_s,
         extra_details: extra_details,
       }

data/lib/rorvswild/location.rb

@@ -15,8 +15,10 @@ module RorVsWild
       # Sometime Exception#backtrace_locations returns nil for an unknow reason. So we fallback to the old way.
       if exception.respond_to?(:backtrace_locations) && locations = exception.backtrace_locations
         extract_most_relevant_file_and_line(locations)
+      elsif backtrace = exception.backtrace
+        extract_most_relevant_file_and_line_from_array_of_strings(backtrace)
       else
-        extract_most_relevant_file_and_line_from_array_of_strings(exception.backtrace)
+        ["No backtrace".freeze, 1]
       end
     end
 

data/lib/rorvswild/plugin/active_record.rb

@@ -13,10 +13,12 @@ module RorVsWild
       end
 
       IGNORED_QUERIES = %w[EXPLAIN SCHEMA].freeze
+      APPENDABLE_QUERIES = ["BEGIN", "COMMIT"].freeze
 
       def start(name, id, payload)
         return if IGNORED_QUERIES.include?(payload[:name])
         RorVsWild::Section.start do |section|
+          section.appendable_command = APPENDABLE_QUERIES.include?(payload[:sql])
           section.command = payload[:sql]
           section.kind = "sql".freeze
         end

data/lib/rorvswild/plugin/net_http.rb

@@ -15,7 +15,7 @@ module RorVsWild
             return request_without_rorvswild(req, body, &block) if request_called_twice?
             scheme = use_ssl? ? HTTPS : HTTP
             url = "#{req.method} #{scheme}://#{address}#{req.path}"
-            RorVsWild.agent.measure_section(url, HTTP) do
+            RorVsWild.agent.measure_section(url, kind: HTTP) do
               request_without_rorvswild(req, body, &block)
             end
           end

data/lib/rorvswild/plugin/redis.rb

@@ -9,7 +9,8 @@ module RorVsWild
 
           def process(commands, &block)
             string = RorVsWild::Plugin::Redis.commands_to_string(commands)
-            RorVsWild.agent.measure_section(string, "redis".freeze) do
+            appendable = RorVsWild::Plugin::Redis.appendable_commands?(commands)
+            RorVsWild.agent.measure_section(string, appendable_command: appendable, kind: "redis".freeze) do
               process_without_rorvswild(commands, &block)
             end
           end
@@ -17,7 +18,13 @@ module RorVsWild
       end
 
       def self.commands_to_string(commands)
-        commands.map { |c| c[0] == :auth ? "auth *****" : c.join(" ".freeze) }.join("\n".freeze)
+        commands.map { |c| c[0] == :auth ? "auth *****".freeze : c.join(" ".freeze) }.join("\n".freeze)
+      end
+
+      APPENDABLE_COMMANDS = [:auth, :select]
+
+      def self.appendable_commands?(commands)
+        commands.size == 1 && APPENDABLE_COMMANDS.include?(commands.first.first)
       end
     end
   end

data/lib/rorvswild/section.rb

@@ -1,7 +1,7 @@
 module RorVsWild
   class Section
     attr_reader :started_at
-    attr_accessor :kind, :file, :line, :calls, :command, :children_runtime, :total_runtime
+    attr_accessor :kind, :file, :line, :calls, :command, :children_runtime, :total_runtime, :appendable_command
 
     def self.start(&block)
       section = Section.new
@@ -34,17 +34,25 @@ module RorVsWild
       location = RorVsWild.agent.find_most_relevant_location(caller_locations)
       @file = RorVsWild.agent.relative_path(location.path)
       @line = location.lineno
+      @appendable_command = false
     end
 
     def sibling?(section)
       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
       self.children_runtime += section.children_runtime
-      self.command ||= section.command
+      if section
+        self.command << "\n".freeze + section.command if appendable_command
+      else
+        self.command = section.command
+      end
+      self.appendable_command = appendable_command && section.appendable_command
     end
 
     def self_runtime

data/lib/rorvswild/version.rb

@@ -1,3 +1,3 @@
 module RorVsWild
-  VERSION = "1.0.0-alpha3".freeze
+  VERSION = "1.0.0-alpha4".freeze
 end

data/test/plugin/redis_test.rb

@@ -6,10 +6,11 @@ class RorVsWild::Plugin::RedisTest < Minitest::Test
   include RorVsWildAgentHelper
 
   def test_callback
-    agent.measure_code("::Redis.new.get('foo')")
+    url = "redis://localhost:6379/1"
+    agent.measure_code("::Redis.new(url: '#{url}').get('foo')")
     assert_equal(1, agent.data[:sections].size)
     assert_equal("redis", agent.data[:sections][0].kind)
-    assert_equal("get foo", agent.data[:sections][0].command)
+    assert_equal("select 1\nget foo", agent.data[:sections][0].command)
   end
 
   def test_callback_when_pipelined
@@ -27,4 +28,10 @@ class RorVsWild::Plugin::RedisTest < Minitest::Test
   def test_commands_to_string_hide_auth_password
     assert_equal("auth *****", RorVsWild::Plugin::Redis.commands_to_string([[:auth, "SECRET"]]))
   end
+
+  def test_appendable_commands?
+    assert(RorVsWild::Plugin::Redis.appendable_commands?([[:select, 1]]))
+    assert(RorVsWild::Plugin::Redis.appendable_commands?([[:auth, "SECRET"]]))
+    refute(RorVsWild::Plugin::Redis.appendable_commands?([[:get, "KEY"]]))
+  end
 end

data/test/rorvswild_test.rb

@@ -134,6 +134,10 @@ class RorVsWildTest < Minitest::Test
     assert_equal(["#{ENV["GEM_HOME"]}/lib/sql.rb", "1"], agent.extract_most_relevant_file_and_line_from_array_of_strings(locations))
   end
 
+  def test_extract_most_relevant_file_and_line_from_exception_when_exception_has_no_backtrace
+    assert_equal(["No backtrace", 1], agent.extract_most_relevant_file_and_line_from_exception(StandardError.new))
+  end
+
   private
 
   def agent

data/test/section_test.rb

@@ -21,6 +21,12 @@ class RorVsWild::SectionTest < Minitest::Test
     assert_equal(3, section1.calls)
     assert_equal(3, section1.total_runtime)
     assert_equal(3, section1.children_runtime)
+    assert_equal("command1", section1.command)
+  end
+
+  def test_merge_with_appendable_command
+    section3.merge(section1)
+    assert_equal("command3\ncommand1", section3.command)
   end
 
   def section1
@@ -32,6 +38,7 @@ class RorVsWild::SectionTest < Minitest::Test
       s.calls = 1
       s.total_runtime = 1
       s.children_runtime = 1
+      s.command = "command1"
       @section1 = s
     end
     @section1
@@ -46,8 +53,25 @@ class RorVsWild::SectionTest < Minitest::Test
       s.calls = 2
       s.total_runtime = 2
       s.children_runtime = 2
+      s.command = "command2"
       @section2 = s
     end
     @section2
   end
+
+  def section3
+    unless @section3
+      s = RorVsWild::Section.new
+      s.kind = "test"
+      s.file = "file"
+      s.line = 3
+      s.calls = 0
+      s.total_runtime = 3
+      s.children_runtime = 3
+      s.command = "command3"
+      s.appendable_command = true
+      @section3 = s
+    end
+    @section3
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rorvswild
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.alpha3
+  version: 1.0.0.pre.alpha4
 platform: ruby
 authors:
 - Alexis Bernard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-24 00:00:00.000000000 Z
+date: 2017-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler