oneapm_rpm 1.2.3 → 1.2.4.rc1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NWFiZTc3ZGJlMzdkOTE2YzNiYzNjOTZkY2FmYmZiZWQ4MzlkZTk3OA==
+    MDdjYTAyMGU0ZGRmMjI1MjgzZmE2MzA1OGZjNGZhOTZjNzhjNjA2Nw==
   data.tar.gz: !binary |-
-    OTkzNTFiOTk2NDdjMzk0MTVlNzYzOTg5OTE3MTllZjc5ZWM0ZjVmMw==
+    YmY4MzUyODkxMWRhYTA4YmRkOGIxOTc5MmIyMmU0NDUwNGI0NTk2NQ==
 SHA512:
   metadata.gz: !binary |-
-    YjUzMjkyZjg0ZDg1MTQxMWY3ZTYzNGExNWU0Y2U4ZDc2ZGM0MDIxNTljNjlh
-    ZTI0YTc0NDMzMDg3MDM0MTdjMGI2N2E2MDAyY2JmZmE2ZDIyMmNkMjI0OGNl
-    MDhiN2ZiMGIzMjgyN2ZkYWRkYzQzYjk2NTEwNjJkYjhjOGRmOTg=
+    M2NkZDYwM2NhZjk5MDE4MjcxYTZhZjI1MzgxZDI4NzMwN2MxYzY3NmY0MGYw
+    ZWU2YzAxNDI2YzM1YmY5YjkxMDQzZDIxM2QwNmVkYTNiZDFjMTQ1YTFlYjJm
+    NGFjOTBmM2FmYjc3YTlkZWVhMTVjZGE4ZDBmMzZkNGViNmM1MjQ=
   data.tar.gz: !binary |-
-    MjZjY2RjOGQxYmI2M2Y0NTRkNTlkNGE4MWIwYjJhOTYzOTIxMGUyMTNmYzdh
-    YTVmYzZmZGYyZDc5YzY3NjM3OGVmNzBlMTdmNWMxZWVjZjExZjEzZTQ1MWU4
-    NmRiODk4MDU2ZDY1OWZmMzg0NDRmMGNiNjVjZWM4NDc4NTVkODk=
+    MmFlODU2MzkxZDVkNTE4YTUwMDFjYTk1OTFhZGMyMmNkMmU0ODQ3ODkwYjBl
+    MzNlNjJjZjJlMzdkMTZiZTIwZTdlNTVjNWFmNWIxYzhhNDk2YWZmZTYxYjk3
+    ZTVjZjkzYTkzNjEyY2M1ODM3NzUwY2NjYWMyYmMwNjY3ZmQwNjU=

data/lib/one_apm/collector/samplers/memory_sampler.rb

@@ -47,6 +47,7 @@ module OneApm
             RUBY_PLATFORM.downcase
           end
         end
+
         def platform
           OneApm::Collector::Samplers::MemorySampler.platform
         end
@@ -60,12 +61,24 @@ module OneApm
 
         class Base
 
+          def pgrp_id
+            Process.getpgrp
+          end
+
+          def pids
+            `ps -o pid= -g #{pgrp_id}`.split("\n")[0..-1] rescue [Process.pid]
+          end
+
           def can_run?
             return false if @broken
             m = get_memory rescue nil
             m && m > 0
           end
 
+          def get_memory
+            pids.inject(0.0){|m, pid| m + get_memory_by_pid(pid)}
+          end
+
           def get_sample
             return nil if @broken
             begin
@@ -104,10 +117,10 @@ module OneApm
             @command = command
           end
 
-          def get_memory
-            process = $$
+          def get_memory_by_pid pid
+            process = pid
             memory = `#{@command} #{process}`.split("\n")[1].to_f / 1024.0 rescue nil
-            raise "Faulty command: `#{@command} #{process}`" if memory.nil? || memory <= 0
+            raise "Faulty command: `#{@command} #{process}`" if memory.nil? || memory < 0
             memory
           end
 
@@ -119,16 +132,16 @@ module OneApm
 
         class ProcStatus < Base
 
-          def get_memory
-            proc_status = File.open(proc_status_file, "r") {|f| f.read_nonblock(4096).strip }
+          def get_memory_by_pid pid
+            proc_status = File.open(proc_status_file(pid), "r") {|f| f.read_nonblock(4096).strip }
             if proc_status =~ /RSS:\s*(\d+) kB/i
               return $1.to_f / 1024.0
             end
             raise "Unable to find RSS in #{proc_status_file}"
           end
 
-          def proc_status_file
-            "/proc/#{$$}/status"
+          def proc_status_file pid=Process.pid
+            "/proc/#{pid}/status"
           end
 
           def to_s

data/lib/one_apm/version.rb

@@ -5,9 +5,10 @@ module OneApm
 
     MAJOR = 1
     MINOR = 2
-    TINY  = 3
+    TINY  = 4
+    TAG   = 'rc1'
 
-    STRING = [MAJOR, MINOR, TINY].compact.join('.')
+    STRING = [MAJOR, MINOR, TINY, TAG].compact.join('.')
 
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oneapm_rpm
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4.rc1
 platform: ruby
 authors:
 - oneapm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-30 00:00:00.000000000 Z
+date: 2015-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake