server_metrics 0.0.8.4 → 0.0.8.5

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.0.8.5
+
+* Mac per-process memory and per-process CPU reports 0s instead of throwing an exception (Mac only)
+
 ## 0.0.8.4
 
 * normalize load (last minute, etc) by number of CPUs. This keeps the metrics in sync with Scout's server load plugin.

data/lib/server_metrics/collectors/processes.rb

@@ -90,7 +90,9 @@ class ServerMetrics::Processes
       }
       grouped[proc.comm][:count]    += 1
       grouped[proc.comm][:cpu]      += proc.recent_cpu_percentage || 0
-      grouped[proc.comm][:memory]   += proc.rss.to_f / 1024.0
+      if proc.respond_to?(:rss) # mac doesn't return rss. Mac returns 0 for memory usage
+        grouped[proc.comm][:memory]   += proc.rss.to_f / 1024.0
+      end
       grouped[proc.comm][:cmdlines] << proc.cmdline if !grouped[proc.comm][:cmdlines].include?(proc.cmdline)
     end # processes.each
 
@@ -153,8 +155,9 @@ class ServerMetrics::Processes
     end
     def combined_cpu
       # best thread I've seen on cutime vs utime & cstime vs stime: https://www.ruby-forum.com/topic/93176
-      # trying the metric that doesn't include the consumption of child processes
-      utime + stime
+      # * cutime and cstime include CPUusage of child processes
+      # * utime and stime don't include CPU usage of child processes
+      (utime || 0) + (stime || 0)  # utime and stime aren't available on mac. Result is %cpu is 0 on mac.
     end
     # delegate everything else to ProcTable::Struct
     def method_missing(sym, *args, &block)

data/lib/server_metrics/version.rb

@@ -1,3 +1,3 @@
 module ServerMetrics
-  VERSION = "0.0.8.4"
+  VERSION = "0.0.8.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: server_metrics
 version: !ruby/object:Gem::Version
-  version: 0.0.8.4
+  version: 0.0.8.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-11 00:00:00.000000000 Z
+date: 2013-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sys-proctable
@@ -172,7 +172,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3571060902029865156
+      hash: 1712031912329811387
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -181,10 +181,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3571060902029865156
+      hash: 1712031912329811387
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: For use with the Scout agent