rorvswild 1.7.1 → 1.8.1

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.to_a.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.1".freeze
+  VERSION = "1.8.1".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,13 +77,13 @@ 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
     api_key = RorVsWild.agent.config[:api_key]
     agent.client.instance_variable_set(:@http_unauthorized, false)
-    return puts "You API key is missing and has to be defined in config/rorvswild.yml." if !api_key || api_key.empty?
+    return puts "Your API key is missing and has to be defined in config/rorvswild.yml." if !api_key || api_key.empty?
     puts case response = agent.client.post("/jobs", jobs: [{sections: [], name: "RorVsWild.check", runtime: 0}])
     when Net::HTTPOK then "Connection to RorVsWild works fine !"
     when Net::HTTPUnauthorized then "Wrong API key"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rorvswild
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.8.1
 platform: ruby
 authors:
 - Alexis Bernard
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-03 00:00:00.000000000 Z
+date: 2024-10-17 00:00:00.000000000 Z
 dependencies: []
 description: Performances and errors insights for rails developers.
 email:
@@ -86,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.5.9
 signing_key: 
 specification_version: 4
 summary: Ruby on Rails applications monitoring