rorvswild 1.7.0 → 1.8.0

data/lib/rorvswild/plugin/middleware.rb

@@ -18,7 +18,7 @@ module RorVsWild
         RorVsWild.agent.current_data[:path] = env["ORIGINAL_FULLPATH"]
         section = RorVsWild::Section.start
         section.file, section.line = rails_engine_location
-        section.command = "Rails::Engine#call"
+        section.commands << "Rails::Engine#call"
         code, headers, body = @app.call(env)
         [code, headers, body]
       ensure
@@ -26,23 +26,53 @@ module RorVsWild
         inject_server_timing(RorVsWild.agent.stop_request, headers)
       end
 
+      private
+
       def rails_engine_location
         @rails_engine_location = ::Rails::Engine.instance_method(:call).source_location
       end
 
-      def format_server_timing(sections)
-        sections.sort_by(&:self_runtime).reverse.map do |section|
+      def format_server_timing_header(sections)
+        sections.map do |section|
           if section.kind == "view"
-            "#{section.kind};dur=#{section.self_runtime};desc=\"#{section.file}\""
+            "#{section.kind};dur=#{section.self_ms.round};desc=\"#{section.file}\""
           else
-            "#{section.kind};dur=#{section.self_runtime};desc=\"#{section.file}:#{section.line}\""
+            "#{section.kind};dur=#{section.self_ms.round};desc=\"#{section.file}:#{section.line}\""
           end
         end.join(", ")
       end
 
+      def format_server_timing_ascii(sections, total_width = 80)
+        max_time = sections.map(&:self_ms).max
+        chart_width = (total_width * 0.25).to_i
+        rows = sections.map { |section|
+          [
+            section.kind == "view" ? section.file : "#{section.file}:#{section.line}",
+            "█" * (section.self_ms * (chart_width-1) / max_time),
+            "%.1fms" % section.self_ms,
+          ]
+        }
+        time_width = rows.map { |cols| cols[2].size }.max + 1
+        label_width = total_width - chart_width - time_width
+        rows.each { |cols| cols[0] = truncate_backwards(cols[0], label_width) }
+        template = "%-#{label_width}s%#{chart_width}s%#{time_width}s"
+        rows.map { |cols| format(template, *cols) }.join("\n")
+      end
+
+      def truncate_backwards(string, width)
+        string.size > width ? "…" + string[-(width - 1)..-1] : string
+      end
+
       def inject_server_timing(data, headers)
         return if !data || !data[:send_server_timing] || !(sections = data[:sections])
-        headers["Server-Timing"] = format_server_timing(sections)
+        sections = sections.sort_by(&:self_ms).reverse[0,10]
+        headers["Server-Timing"] = format_server_timing_header(sections)
+        if data[:name] && RorVsWild.logger.level <= Logger::Severity::DEBUG
+          RorVsWild.logger.debug(["┤ #{data[:name]} ├".center(80, "─"),
+            format_server_timing_ascii(sections),
+            "─" * 80, nil].join("\n")
+          )
+        end
       end
     end
   end

data/lib/rorvswild/plugin/redis.rb

@@ -15,8 +15,7 @@ module RorVsWild
       module V4
         def process(commands, &block)
           string = commands.map(&:first).join("\n")
-          appendable = APPENDABLE_COMMANDS.include?(commands[0][0])
-          RorVsWild.agent.measure_section(string, appendable_command: appendable, kind: "redis") do
+          RorVsWild.agent.measure_section(string, kind: "redis") do
             super(commands, &block)
           end
         end
@@ -24,8 +23,7 @@ module RorVsWild
 
       module V5
         def send_command(command, &block)
-          appendable = APPENDABLE_COMMANDS.include?(command)
-          RorVsWild.agent.measure_section(command[0], appendable_command: appendable, kind: "redis") do
+          RorVsWild.agent.measure_section(command[0], kind: "redis") do
             super(command, &block)
           end
         end
@@ -38,8 +36,6 @@ module RorVsWild
           RorVsWild.agent.measure_section("multi", kind: "redis") { super }
         end
       end
-
-      APPENDABLE_COMMANDS = [:auth, :select]
     end
   end
 end

data/lib/rorvswild/queue.rb

@@ -27,6 +27,10 @@ module RorVsWild
       push_to(requests, data) if !@request_sampling_rate || rand <= @request_sampling_rate
     end
 
+    def push_error(data)
+      client.post_async("/errors", error: data)
+    end
+
     def push_to(array, data)
       mutex.synchronize do
         wakeup_thread if array.push(data).size >= FLUSH_TRESHOLD || !thread

data/lib/rorvswild/section.rb

@@ -2,8 +2,8 @@
 
 module RorVsWild
   class Section
-    attr_reader :started_at
-    attr_accessor :kind, :file, :line, :calls, :command, :children_runtime, :total_runtime, :appendable_command
+    attr_reader :start_ms, :commands, :gc_start_ms
+    attr_accessor :kind, :file, :line, :calls, :children_ms, :total_ms, :gc_time_ms
 
     def self.start(&block)
       section = Section.new
@@ -15,8 +15,8 @@ module RorVsWild
     def self.stop(&block)
       return unless stack && section = stack.pop
       block.call(section) if block_given?
-      section.total_runtime = RorVsWild.clock_milliseconds - section.started_at
-      current.children_runtime += section.total_runtime if current
+      section.stop
+      current.children_ms += section.total_ms if current
       RorVsWild.agent.add_section(section)
     end
 
@@ -28,17 +28,52 @@ module RorVsWild
       (sections = stack) && sections.last
     end
 
+    def self.start_gc_timing
+      section = Section.new
+      section.calls = GC.count
+      section.file, section.line = "ruby/gc.c", 42
+      section.add_command("GC.start")
+      section.kind = "gc"
+      section
+    end
+
+    def self.stop_gc_timing(section)
+      section.total_ms = gc_total_ms - section.gc_start_ms
+      section.calls = GC.count - section.calls
+      section
+    end
+
+    if GC.respond_to?(:total_time)
+      def self.gc_total_ms
+        GC.total_time / 1_000_000.0 # nanosecond -> millisecond
+      end
+    else
+      def self.gc_total_ms
+        GC::Profiler.total_time * 1000 # second -> millisecond
+      end
+    end
+
     def initialize
+      @start_ms = RorVsWild.clock_milliseconds
+      @end_ms = nil
+      @gc_start_ms = Section.gc_total_ms
+      @gc_end_ms = nil
+      @gc_time_ms = 0
       @calls = 1
-      @total_runtime = 0
-      @children_runtime = 0
+      @total_ms = 0
+      @children_ms = 0
       @kind = "code"
-      @started_at = RorVsWild.clock_milliseconds
       location = RorVsWild.agent.locator.find_most_relevant_location(caller_locations)
       @file = RorVsWild.agent.locator.relative_path(location.path)
       @line = location.lineno
-      @command = nil
-      @appendable_command = false
+      @commands = Set.new
+    end
+
+    def stop
+      @gc_end_ms = self.class.gc_total_ms
+      @gc_time_ms = @gc_end_ms - @gc_start_ms
+      @end_ms = RorVsWild.clock_milliseconds
+      @total_ms = @end_ms - @start_ms - gc_time_ms
     end
 
     def sibling?(section)
@@ -47,35 +82,33 @@ module RorVsWild
 
     def merge(section)
       self.calls += section.calls
-      self.total_runtime += section.total_runtime
-      self.children_runtime += section.children_runtime
-      if section
-        if appendable_command
-          self.command = self.command.dup if self.command.frozen?
-          self.command << "\n" + section.command
-        end
-      else
-        self.command = section.command
-      end
-      self.appendable_command = appendable_command && section.appendable_command
+      self.total_ms += section.total_ms
+      self.children_ms += section.children_ms
+      self.gc_time_ms += section.gc_time_ms
+      commands.merge(section.commands)
     end
 
-    def self_runtime
-      total_runtime - children_runtime
+    def self_ms
+      total_ms - children_ms
     end
 
-    COMMAND_MAX_SIZE = 5_000
+    def as_json(options = nil)
+      {calls: calls, total_runtime: total_ms, children_runtime: children_ms, kind: kind, started_at: start_ms, file: file, line: line, command: command}
+    end
 
-    def command=(value)
-      @command = value && value.size > COMMAND_MAX_SIZE ? value[0, COMMAND_MAX_SIZE] + " [TRUNCATED]" : value
+    def to_json(options = {})
+      as_json.to_json(options)
     end
 
-    def to_h
-      {calls: calls, total_runtime: total_runtime, children_runtime: children_runtime, kind: kind, started_at: started_at, file: file, line: line, command: command}
+    def add_command(command)
+      commands << command
     end
 
-    def to_json(options = {})
-      to_h.to_json(options)
+    COMMAND_MAX_SIZE = 5_000
+
+    def command
+      string = @commands.join("\n")
+      string.size > COMMAND_MAX_SIZE ? string[0, COMMAND_MAX_SIZE] + " [TRUNCATED]" : string
     end
   end
 end

data/lib/rorvswild/version.rb

@@ -1,3 +1,3 @@
 module RorVsWild
-  VERSION = "1.7.0".freeze
+  VERSION = "1.8.0".freeze
 end

data/lib/rorvswild.rb

@@ -26,8 +26,14 @@ module RorVsWild
     @logger ||= initialize_logger
   end
 
-  def self.measure(code_or_name = nil, &block)
-    block ? measure_block(code_or_name, &block) : measure_code(code_or_name)
+  def self.measure(method_or_code = nil, &block)
+    if block
+      measure_block(method_or_code, &block)
+    elsif method_or_code.is_a?(Method) || method_or_code.is_a?(UnboundMethod)
+      measure_method(method_or_code)
+    else
+      measure_code(method_or_code)
+    end
   end
 
   def self.measure_code(code)
@@ -38,6 +44,10 @@ module RorVsWild
     agent ? agent.measure_block(name , &block) : block.call
   end
 
+  def self.measure_method(method)
+    agent.measure_method(method) if agent
+  end
+
   def self.catch_error(context = nil, &block)
     agent ? agent.catch_error(context, &block) : block.call
   end
@@ -67,7 +77,7 @@ module RorVsWild
   end
 
   def self.clock_milliseconds
-    Process.clock_gettime(Process::CLOCK_MONOTONIC, :millisecond)
+    Process.clock_gettime(Process::CLOCK_MONOTONIC, :float_millisecond)
   end
 
   def self.check

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rorvswild
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Alexis Bernard
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-22 00:00:00.000000000 Z
+date: 2024-06-14 00:00:00.000000000 Z
 dependencies: []
 description: Performances and errors insights for rails developers.
 email: