rorvswild 1.5.17 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ce241e0d917e560c8a5683bdc210dbd4f5158cd7bf49444ced9548d85b61e5e
-  data.tar.gz: b354848c0048368c615e4c2dd5231864a164c127af0aaf590fbfcd5c2a1cb36c
+  metadata.gz: b40a18c6bc14739968aabfda67d1ce3b68fbd582ef16b66bc35e636ab1cc4137
+  data.tar.gz: d90c55f88561d249a723de427ce522e27133cbf2fed8c68639e029b0a7f2a6f1
 SHA512:
-  metadata.gz: fc3e48e9328b450bfb3cb7e7e4536e249470bcf7cb1fd2b3c7f67416daa66e1c281e742446a97f868276ac3028a573a84247b80b7f3053fbaeb9f9dfe4209c57
-  data.tar.gz: eab70d88fd705bdd5d679b625a9b6e06b6612cff6eaa6dc5080d6cd80a38f6f28e1a198f475b683cecdb25be7ac98d54a67eecfb8ee8cea230d987248e846823
+  metadata.gz: 5ecb2843e5cf8d0556a4b412011d5facb3fdc9a936ab19836758acf3d0fb7de90ccccdad7cb4f599fc3fe9f1bbb39d112b3674a43aec1d1313d5264a643ea58a
+  data.tar.gz: e4bcb64980a094b6a4743c24d35452fc86fe53f347286272129103a321ac34e15e4ebd3fbb6d7fba24f7a77cc7b920b6b9ce626328baf91a671cb9e3382b09e4

data/lib/rorvswild/agent.rb

@@ -34,12 +34,12 @@ module RorVsWild
       RorVsWild.logger.debug("Start RorVsWild #{RorVsWild::VERSION}")
       setup_plugins
       cleanup_data
+      send_deployment
     end
 
     def load_features
       features = config[:features] || []
-      features.include?("server_metrics")
-      require "rorvswild/metrics" if features.include?("server_metrics")
+      RorVsWild.logger.info("Server metrics are now monitored enabled by default") if features.include?("server_metrics")
     end
 
     def setup_plugins
@@ -85,7 +85,7 @@ module RorVsWild
         raise
       ensure
         current_data[:runtime] = RorVsWild.clock_milliseconds - current_data[:started_at]
-        post_job
+        queue_job
       end
     end
 
@@ -96,7 +96,7 @@ module RorVsWild
     def stop_request
       return unless current_data
       current_data[:runtime] = RorVsWild.clock_milliseconds - current_data[:started_at]
-      post_request
+      queue_request
     end
 
     def catch_error(extra_details = nil, &block)
@@ -109,7 +109,7 @@ module RorVsWild
     end
 
     def record_error(exception, extra_details = nil)
-      post_error(exception_to_hash(exception, extra_details))
+      send_error(exception_to_hash(exception, extra_details))
     end
 
     def push_exception(exception, options = nil)
@@ -153,21 +153,8 @@ module RorVsWild
       config[:ignore_jobs].include?(name)
     end
 
-    def os_description
-      @os_description ||= `uname -sr`
-    rescue Exception => ex
-      @os_description = RbConfig::CONFIG["host_os"]
-    end
-
-    def hostname
-      if gae_instance = ENV["GAE_INSTANCE"] || ENV["CLOUD_RUN_EXECUTION"]
-        gae_instance
-      elsif dyno = ENV["DYNO"] # Heroku
-        dyno.start_with?("run.") ? "run.*" :
-          dyno.start_with?("release.") ? "release.*" : dyno
-      else
-        Socket.gethostname
-      end
+    def send_deployment
+      client.post("/deployments", deployment: Deployment.to_h)
     end
 
     #######################
@@ -177,7 +164,12 @@ module RorVsWild
     private
 
     def initialize_data
-      Thread.current[:rorvswild_data] = {sections: [], section_stack: [], started_at: RorVsWild.clock_milliseconds}
+      Thread.current[:rorvswild_data] = {
+        sections: [],
+        section_stack: [],
+        environment: Host.to_h,
+        started_at: RorVsWild.clock_milliseconds,
+      }
     end
 
     def cleanup_data
@@ -186,15 +178,15 @@ module RorVsWild
       result
     end
 
-    def post_request
+    def queue_request
       (data = cleanup_data) && data[:name] && queue.push_request(data)
     end
 
-    def post_job
+    def queue_job
       queue.push_job(cleanup_data)
     end
 
-    def post_error(hash)
+    def send_error(hash)
       client.post_async("/errors".freeze, error: hash)
     end
 
@@ -208,15 +200,7 @@ module RorVsWild
         backtrace: exception.backtrace || ["No backtrace"],
         exception: exception.class.to_s,
         extra_details: context,
-        environment: {
-          os: os_description,
-          user: Etc.getlogin,
-          host: Socket.gethostname,
-          ruby: RUBY_DESCRIPTION,
-          pid: Process.pid,
-          cwd: Dir.pwd,
-          lib_paths: locator.lib_paths,
-        },
+        environment: Host.to_h,
       }
     end
 

data/lib/rorvswild/deployment.rb

@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+
+module RorVsWild
+  module Deployment
+    def self.revision
+      read_once && @revision
+    end
+
+    def self.description
+      read_once && @description
+    end
+
+    def self.author
+      read_once && @author
+    end
+
+    def self.email
+      read_once && @email
+    end
+
+    def self.ruby
+      RUBY_VERSION
+    end
+
+    def self.rails
+      Rails.version if defined?(Rails)
+    end
+
+    def self.rorvswild
+      RorVsWild::VERSION
+    end
+
+    def self.to_h
+      @to_h ||= {revision: revision, description: description, author: author, email: email, ruby: ruby, rails: rails, rorvswild: rorvswild}.compact
+    end
+
+    def self.read
+      read_from_heroku || read_from_scalingo || read_from_git || read_from_capistrano
+    end
+
+    def self.read_once
+      @already_read || read
+      @already_read = true
+    end
+
+    private
+
+    def self.read_from_heroku
+      return unless ENV["HEROKU_SLUG_COMMIT"]
+      @revision = ENV["HEROKU_SLUG_COMMIT"]
+      @description = ENV["HEROKU_SLUG_DESCRIPTION"]
+    end
+
+    def self.read_from_scalingo
+      return unless ENV["SOURCE_VERSION"]
+      @revision = ENV["SOURCE_VERSION"]
+    end
+
+    def self.read_from_git
+      @revision = normalize_string(`git rev-parse HEAD`) rescue nil
+      return unless @revision
+      lines = `git log -1 --pretty=%an%n%ae%n%B`.lines rescue nil
+      return unless lines
+      @author = normalize_string(lines[0])
+      @email = normalize_string(lines[1])
+      @description = lines[2..-1] && normalize_string(lines[2..-1].join)
+      @revision
+    end
+
+    def self.read_from_capistrano
+      return unless File.readable?("REVISION")
+      return unless @revision = File.read("REVISION")
+      lines = `git --git-dir ../../repo log --format=%an%n%ae%n%B -n 1 #{@revision}`.lines rescue nil
+      return unless lines
+      @author = normalize_string(lines[0])
+      @email = normalize_string(lines[1])
+      @description = lines[2..-1] && normalize_string(lines[2..-1].join)
+      @revision
+    end
+
+    def self.normalize_string(string)
+      if string
+        string = string.strip
+        string.empty? ? nil : string
+      end
+    end
+  end
+end

data/lib/rorvswild/host.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+module RorVsWild
+  module Host
+    def self.os
+      @os_description ||= `uname -sr`.strip
+    rescue Exception => ex
+      @os_description = RbConfig::CONFIG["host_os"]
+    end
+
+    def self.user
+      Etc.getlogin
+    end
+
+    def self.ruby
+      RUBY_DESCRIPTION
+    end
+
+    def self.rails
+      Rails.version if defined?(Rails)
+    end
+
+    def self.name
+      if gae_instance = ENV["GAE_INSTANCE"] || ENV["CLOUD_RUN_EXECUTION"]
+        gae_instance
+      elsif dyno = ENV["DYNO"] # Heroku
+        dyno.start_with?("run.") ? "run.*" :
+          dyno.start_with?("release.") ? "release.*" : dyno
+      else
+        Socket.gethostname
+      end
+    end
+
+    def self.pid
+      Process.pid
+    end
+
+    def self.cwd
+      Dir.pwd
+    end
+
+    def self.revision
+      Deployment.revision
+    end
+
+    def self.revision_description
+      Deployment.description
+    end
+
+    def self.to_h
+      @to_h ||= {os: os, user: user, host: name, ruby: ruby, rails: rails, pid: pid, cwd: cwd, revision: revision}.compact
+    end
+  end
+end

data/lib/rorvswild/local/javascript/local.js

@@ -77,9 +77,9 @@ RorVsWild.Local.prototype.goToHistory = function(event) {
   this.render()
 }
 
-RorVsWild.Local.prototype.containerStyle = function() {
+RorVsWild.Local.prototype.containerClass = function() {
   if (!this.active)
-    return 'display: none !important;'
+    return "is-hidden"
 }
 
 RorVsWild.Local.kindToLanguage = function(kind) {

data/lib/rorvswild/local/local.html.erb

@@ -4,7 +4,7 @@
 </div>
 
 <script type="x-tmpl-mustache" data-partial="RorVsWild.Local">
-  <div id="rorvswild-local-requests" class="rorvswild-local-panel" style="{{containerStyle}}">
+  <div id="rorvswild-local-requests" class="rorvswild-local-panel {{containerClass}}">
 
     <div class="rorvswild-local-panel__header">
       <a href="https://www.rorvswild.com" class="rorvswild-local-panel__logo">

data/lib/rorvswild/local/stylesheet/local.css

@@ -76,6 +76,10 @@
           flex-direction: column !important;
 }
 
+.rorvswild-local-panel.is-hidden {
+  display: none !important;
+}
+
 .rorvswild-local-panel * {
   font-family: inherit !important;
   font-size: inherit !important;

data/lib/rorvswild/metrics/cpu.rb

@@ -1,30 +1,61 @@
+# frozen_string_literal: true
+
 module RorVsWild
   class Metrics
     class Cpu
       attr_reader :user, :system, :idle, :waiting, :stolen
       attr_reader :load_average, :count
 
+      def initialize
+        @old_stat = Stat.read
+      end
+
       def update
-        if vmstat = execute(:vmstat)
-          vmstat = vmstat.split("\n").last.split
-          @user = vmstat[12].to_i
-          @system = vmstat[13].to_i
-          @idle = vmstat[14].to_i
-          @waiting = vmstat[15].to_i
-          @stolen = vmstat[16].to_i
+        if @old_stat && (new_stat = Stat.read)
+          if (total = new_stat.total - @old_stat.total) > 0
+            @user = (new_stat.user - @old_stat.user) * 100 / total
+            @system = (new_stat.system - @old_stat.system) * 100 / total
+            @idle = (new_stat.idle - @old_stat.idle) * 100 / total
+            @waiting = (new_stat.iowait - @old_stat.iowait) * 100 / total
+            @stolen = (new_stat.steal - @old_stat.steal) * 100 / total
+            @old_stat = new_stat
+          end
         end
-        if uptime = execute(:uptime)
-          @load_average = uptime.split[-3].to_f
+        @load_average = File.read("/proc/loadavg").to_f if File.readable?("/proc/loadavg")
+        @count = `nproc`.to_i rescue nil
+      end
+
+      class Stat
+        attr_reader :user, :nice, :system, :idle, :iowait, :irq, :softirq, :steal, :guest, :guest_nice, :total
+
+        def initialize(user, nice, system, idle, iowait, irq, softirq, steal, guest, guest_nice)
+          @user = user
+          @nice = nice
+          @system = system
+          @idle = idle
+          @iowait = iowait
+          @irq = irq
+          @softirq = softirq
+          @steal = steal
+          @guest = guest
+          @guest_nice = guest_nice
+          @total = user + nice + system + idle + iowait + irq + softirq + steal + guest + guest_nice
         end
-        if nproc = execute(:nproc)
-          @count = nproc.to_i
+
+        def self.parse(string)
+          for row in string.lines
+            if row.start_with?("cpu ")
+              array = row.split[1..-1].map(&:to_i)[0,10]
+              array.fill(0, array.size, 10 - array.size) if array.size < 10
+              return new(*array)
+            end
+          end
+          nil
         end
-      end
 
-      def execute(command)
-        `#{command}`
-      rescue => ex
-        nil
+        def self.read
+          parse(File.read("/proc/stat")) if File.readable?("/proc/stat")
+        end
       end
     end
   end

data/lib/rorvswild/metrics/memory.rb

@@ -23,7 +23,7 @@ module RorVsWild
       SWAP_FREE = "SwapFree" # Amount of swap space that is currently unused.
 
       def update
-        info = read_meminfo
+        return unless info = read_meminfo
         @ram_total = convert_to_bytes(info[MEM_TOTAL])
         @ram_free = convert_to_bytes(info[MEM_FREE])
         @ram_available = convert_to_bytes(info[MEM_AVAILABLE])

data/lib/rorvswild/metrics.rb

@@ -1,7 +1,5 @@
 module RorVsWild
   class Metrics
-    UPDATE_INTERVAL_MS = 60_000 # One metric every minute
-
     attr_reader :cpu, :memory, :storage, :updated_at
 
     def initialize
@@ -11,22 +9,23 @@ module RorVsWild
     end
 
     def update
-      if staled?
-        cpu.update
-        memory.update
-        storage.update
-        @updated_at = RorVsWild.clock_milliseconds
-      end
+      cpu.update
+      memory.update
+      storage.update
     end
 
-    def staled?
-      !updated_at || RorVsWild.clock_milliseconds - updated_at > UPDATE_INTERVAL_MS
+    def update_every_minute
+      return unless Host.os.include?("Linux")
+      if !@updated_at || @updated_at.min != Time.now.min
+        @updated_at = Time.now
+        update
+      end
     end
 
     def to_h
       {
-        hostname: RorVsWild.agent.hostname,
-        os: RorVsWild.agent.os_description,
+        hostname: Host.name,
+        os: Host.os,
         cpu_user: cpu.user,
         cpu_system: cpu.system,
         cpu_idle: cpu.idle,

data/lib/rorvswild/plugin/net_http.rb

@@ -19,7 +19,7 @@ module RorVsWild
           end
 
           def request_with_rorvswild(req, body = nil, &block)
-            return request_without_rorvswild(req, body, &block) if request_called_twice?
+            return request_without_rorvswild(req, body, &block) if !RorVsWild.agent || request_called_twice?
             RorVsWild.agent.measure_section("#{req.method} #{address}", kind: HTTP) do
               request_without_rorvswild(req, body, &block)
             end

data/lib/rorvswild/queue.rb

@@ -1,6 +1,6 @@
 module RorVsWild
   class Queue
-    SLEEP_TIME = 30
+    SLEEP_TIME = 10
     FLUSH_TRESHOLD = 10
 
     attr_reader :mutex, :thread, :client
@@ -52,7 +52,7 @@ module RorVsWild
     end
 
     def pull_server_metrics
-      @metrics && @metrics.update && @metrics.to_h
+      @metrics && @metrics.update_every_minute && @metrics.to_h
     end
 
     def flush_indefinetely

data/lib/rorvswild/version.rb

@@ -1,3 +1,3 @@
 module RorVsWild
-  VERSION = "1.5.17".freeze
+  VERSION = "1.6.0".freeze
 end

data/lib/rorvswild.rb

@@ -1,4 +1,7 @@
 require "rorvswild/version"
+require "rorvswild/host"
+require "rorvswild/metrics"
+require "rorvswild/deployment"
 require "rorvswild/locator"
 require "rorvswild/section"
 require "rorvswild/client"

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: rorvswild
 version: !ruby/object:Gem::Version
-  version: 1.5.17
+  version: 1.6.0
 platform: ruby
 authors:
 - Alexis Bernard
 - Antoine Marguerie
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-25 00:00:00.000000000 Z
+date: 2023-01-27 00:00:00.000000000 Z
 dependencies: []
 description: Performances and errors insights for rails developers.
 email:
@@ -27,6 +27,8 @@ files:
 - lib/rorvswild.rb
 - lib/rorvswild/agent.rb
 - lib/rorvswild/client.rb
+- lib/rorvswild/deployment.rb
+- lib/rorvswild/host.rb
 - lib/rorvswild/installer.rb
 - lib/rorvswild/local.rb
 - lib/rorvswild/local/javascript/application.js
@@ -69,7 +71,7 @@ licenses:
 metadata:
   source_code_uri: https://github.com/BaseSecrete/rorvswild
   changelog_uri: https://github.com/BaseSecrete/rorvswild/blob/master/CHANGELOG.md
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -85,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.2.22
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Ruby on Rails applications monitoring
 test_files: []