rorvswild 1.12.0 → 1.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aad78fe6a4f76f5ab203bfdac53ee50784937c831ecd6962ad989b1405da73d6
-  data.tar.gz: 934a28615a02c898be0900bbc653046e3ee42bc32a9131bc77941d638f1ef468
+  metadata.gz: e8690eed7abf4c861e30d1432e834bea38535a091286d43ade2c791419f06f49
+  data.tar.gz: fa905a02caeaefdcad3fb18dc9a9a9d76a7a0567a67cf0211673a3ae39787589
 SHA512:
-  metadata.gz: 46a96c5adcf10ed9880ab1f4443ee7dedd63f980d6ca99f783194508c2de1c51b6d4ff6f548a257b92a512548f540a6a891e81d6c8ecfc2c138333ba0869492c
-  data.tar.gz: 9057e7e13be4db2f4a164347336436b332180cc1d588292069e69d7c907f084503df4d7bb29e35e725ae62ab1c69bf3c67d5ac18d28725c32fef572a9f3ae85d
+  metadata.gz: 7e5f95230b8d63789c107671a2cdd02d88146c82d64e48478dca1ec3733a1e14380de11a544a091db47a72e96dead24c8d1afa71ef129d5a8aea456cb0be5257
+  data.tar.gz: 7e234ae982a55df8688038167468a1ce480ba3c434e65006adc3d2a84bd47b290914a695d425ea0701ff3c9808f2996cb7e5f159fe1c799734472b4f64f6f4d0

data/lib/rorvswild/agent.rb

@@ -74,13 +74,12 @@ module RorVsWild
       method_file, method_line = method.source_location
       method_file = locator.relative_path(File.expand_path(method_file))
       method.owner.define_method(method.name) do |*args|
-        section = Section.start
-        section.file = method_file
-        section.line = method_line
-        section.commands << method_full_name
-        result = send(method_alias, *args)
-        Section.stop
-        result
+        Section.measure do |section|
+          section.file = method_file
+          section.line = method_line
+          section.commands << method_full_name
+          send(method_alias, *args)
+        end
       end
     end
 

data/lib/rorvswild/host.rb

@@ -13,7 +13,7 @@ module RorVsWild
     end
 
     def self.user
-      Etc.getlogin
+      Etc.getlogin || Etc.getpwuid.name rescue ENV["USER"]
     end
 
     def self.ruby

data/lib/rorvswild/plugin/sidekiq.rb

@@ -19,14 +19,14 @@ module RorVsWild
         # Wrapped contains the real class name of the ActiveJob wrapper
         name = item["wrapped".freeze] || item["class".freeze]
         RorVsWild.agent.measure_job(name, parameters: item["args".freeze]) do
-          section = RorVsWild::Section.start
-          section.commands << "#{name}#perform"
-          if perform_method = worker.method(:perform)
-            section.file, section.line = worker.method(:perform).source_location
-            section.file = RorVsWild.agent.locator.relative_path(section.file)
+          RorVsWild::Section.measure do |section|
+            section.commands << "#{name}#perform"
+            if perform_method = worker.method(:perform)
+              section.file, section.line = worker.method(:perform).source_location
+              section.file = RorVsWild.agent.locator.relative_path(section.file)
+            end
+            block.call
           end
-          block.call
-          RorVsWild::Section.stop
         end
       end
     end

data/lib/rorvswild/section.rb

@@ -12,6 +12,15 @@ module RorVsWild
       section
     end
 
+    def self.measure(&block)
+      section = start
+      begin
+        block.call(section)
+      ensure
+        stop
+      end
+    end
+
     def self.stop(&block)
       return if !(sections = stack) || !(section = sections.pop)
       block.call(section) if block_given?

data/lib/rorvswild/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RorVsWild
-  VERSION = "1.12.0"
+  VERSION = "1.12.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rorvswild
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.12.1
 platform: ruby
 authors:
 - Alexis Bernard