vcap_common 3.0.0 → 3.0.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTdhMGU2ZWM5ZGJkZGFmODY3NjE0NzUzMWY4NTRiNjMyM2I2OTEzMw==
+    MmZmY2Q4Njk2OGJhZWUyNGVkZDA0MWIwNjNkNzBiNTgwMThhY2ViNg==
   data.tar.gz: !binary |-
-    MGJlYjExMzJiMjEyYjRmMGMwZTczYTU3YzA2NmI0MGY0NTI2NGM4MA==
+    NWQ2ZTkyZTNmMjE5NDgwYzRhNmExOWJjNjIwNzczYzUxN2E3NWI2OQ==
 SHA512:
   metadata.gz: !binary |-
-    Mjc0MmI5NzczZmYyOGE1YTY0ZTI4MTJjYjdjN2EwOWJlMTFjMzc5NDczNGU0
-    MDc4ZTRiMWEzYTZjMjFiMzhhZGY1OTJkZTIxZDlhN2VkMjRhZDA4NDNkZDEz
-    OGU4ZGFkNmI3NjNjNjcyMWE4MzdmMTQ0MjBlYjNjZTFjZjRiODQ=
+    NWI5MDQyN2QzNjE0ZmQzMTczYmNkMzE1YzFiOGJhZTljZDg4ODVmZTdhZmYx
+    M2ZhMTg1MTg4NzViNzFjNDEwZDM3YmE4MjIzYmU5ZDAyYTRiOWU3MzNmMmYz
+    YzA1MjQ5ZjQ2M2JmODYxMmE5MzgwNTQ4M2FjZDc0NDFkZjFlZWM=
   data.tar.gz: !binary |-
-    YWUxZmU5OTMxNjE3MWI4MWQ5MTkxZTBkMDJmOGI5NTlmYTRkNjVhNjUyZGVi
-    NDAyM2U2MjRlZWIxOTEwMDQ3OTRhNjhmNzhjYjBjNDA0NjAyNzIyZDk1NmEz
-    OTk0Yjg2NDdkYmUzMGRiZjliNjU3MGRmMDdlNmFhOTM2YjU5NDI=
+    MmI2ZjQ4Nzg5MWJlNzZiOTAyNDk2MzAzN2Q3NGRjZGIyNzgxZGM4N2Y2OWNj
+    ODM3NGJlOTkzNWU4MTUwMmM3NGFkMDkyMjVlZTcxZDllZmQ4ZTliYjI2MzU2
+    ZmVhYmY1ZDc3NjhmZDk5YzhkYTRiODg4N2NjNTFmZDBhMmI5MGQ=

data/lib/cf/version.rb

@@ -1,3 +1,3 @@
 module Cf
-  VERSION = "3.0.0".freeze
+  VERSION = "3.0.1".freeze
 end

data/lib/vcap/common.rb

@@ -55,7 +55,7 @@ module VCAP
     if RUBY_PLATFORM =~ /linux/
       return `cat /proc/cpuinfo | grep processor | wc -l`.to_i
     elsif RUBY_PLATFORM =~ /darwin/
-      `hwprefs cpu_count`.strip.to_i
+      `sysctl -n hw.ncpu`.strip.to_i
     elsif RUBY_PLATFORM =~ /freebsd|netbsd/
       `sysctl hw.ncpu`.strip.to_i
     elsif WINDOWS
@@ -64,7 +64,6 @@ module VCAP
       return 1 # unknown..
     end
   rescue
-    # hwprefs doesn't always exist, and so the block above can fail.
     # In any case, let's always assume that there is 1 core
     1
   end

data/lib/vcap/component.rb

@@ -97,21 +97,20 @@ module VCAP
         @last_varz_update ||= 0
 
         if Time.now.to_f - @last_varz_update >= 1
-          rss, pcpu = Stats.process_memory_and_cpu
+          rss_bytes, pcpu = Stats.process_memory_bytes_and_cpu
 
           # Update varz
           varz.synchronize do
             @last_varz_update = Time.now.to_f
 
             varz[:uptime] = VCAP.uptime_string(Time.now - varz[:start])
-            varz[:mem] = rss.to_i
             varz[:cpu] = pcpu.to_f
+            varz[:cpu_load_avg] = Stats.cpu_load_average
 
+            varz[:mem_bytes] = rss_bytes.to_i
             varz[:mem_used_bytes] = Stats.memory_used_bytes
             varz[:mem_free_bytes] = Stats.memory_free_bytes
 
-            varz[:cpu_load_avg] = Stats.cpu_load_average
-
             # Return duplicate while holding lock
             return varz.dup
           end

data/lib/vcap/stats.rb

@@ -4,14 +4,15 @@ require 'vmstat'
 module VCAP
   class Stats
     class << self
-      def process_memory_and_cpu
+      def process_memory_bytes_and_cpu
         if WINDOWS
-          rss = windows_process_memory
+          rss_bytes = windows_process_memory * 1024
           pcpu = windows_process_cpu
         else
-          rss, pcpu = `ps -o rss=,pcpu= -p #{Process.pid}`.split
+          rss, pcpu = `ps -o rss=,pcpu= -p #{Process.pid}`.split.map(&:to_i)
+          rss_bytes = rss * 1024
         end
-        [rss, pcpu]
+        [rss_bytes, pcpu]
       end
 
       def memory_used_bytes
@@ -103,4 +104,4 @@ module VCAP
       end
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vcap_common
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Cloud Foundry Core Team
@@ -92,14 +92,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement