oneapm_rpm 1.3.3 → 1.3.4.rc1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Njc2ODZkMDE0YzE2YTNjMGVlYmM4ZDk2Y2M1YjVjZjQ5OTkwNTBmNg==
+    MmE0NDFhMTgyYjQxZDg5NWU0NTAzZTQyMDA1ZjBjMDRiMjY0NWE1OQ==
   data.tar.gz: !binary |-
-    ZGEzYmYwYjBiNzE4Mzk4NzM4NTQzYmI3ZDcxMzYzMGJlZjU4Y2UxNg==
+    MmE1ZjcwYTUyZTc4NWE0ZjYzNWU2YjEyYTIyZTI4M2UwYzY2MTlmOA==
 SHA512:
   metadata.gz: !binary |-
-    N2RhZGUxYzQ4NGRmOGI2ZGZiODc5YzhhZDZjMGM5ODk1MDkyNWJkY2Y4OGUz
-    MWJmZWE5MTFhNjgzNmZmZTU0MGVmMDI3MmE5NzgxMzVmNDMyNjYyY2YxNzcw
-    M2E4MGMzZDUwMjQ1MWY5M2RhYWYyMjZhZjkxYTVkZjk0NGJhNzY=
+    MjMzYWExYmFlODhkZDE1YjBiMDZlYjYxNmRmODQ5NGNkZTAyMzBhMjRlNGEz
+    NzAyODFiY2NjNjUzZmU4YmU4Nzg4MjdjNTFlM2NhZjAxNTI3ZTAzZWMzZjU4
+    YzVjYmJkMjk2YmQyNmRiZThjMGMyNjdiMWUyYzczMTJjMmI0NTk=
   data.tar.gz: !binary |-
-    NTZkNTVlZGQ5NmY1YjUyZWUwZDI0OTgyODAzY2M2ZWM2ZWE5MDRlZjgwZTBm
-    MTBmY2EzMjBlYmU0NWFhYmU3NTA0NDBhNGIzYTAyOGUwMmY0NzI3MGQxNjAy
-    NzVjM2I5NGEzYmI3MzkyZjA5ZWEyNWRkZTdiZTJjNWZlNDE2Mzg=
+    MjdjZGQwNjMzZmFiNGI3YmIzYzA1NWY2ZWRhYzZjMjFkMGJkNWQ2YTM1Nzhh
+    NDI2YWVjZjU1YjgzMWViOThjZjk4YTU5MTNhNGRkMzQ3NTRiYmFhZTMzYmJj
+    MTk0NjdjNzdhYWFlNmUzODFlOGU3YzE0Y2UxYWM5NjRjYzAyNTA=

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

@@ -15,14 +15,15 @@ module OneApm
           poll
         end
 
-        def self.supported_on_this_platform?
-          # Process.times on JRuby < 1.7.0 reports wall clock elapsed time, not actual cpu time used
-          defined?(JRuby) ? (JRUBY_VERSION >= '1.7.0') : true
+        def set_poller poller
+          @poller = poller
         end
-
+        
         def poll
           now = Time.now
+          @poller.pid = Process.pid if @poller
           t = Process.times
+
           if @last_time
             elapsed = now - @last_time
             return if elapsed < 1 # Causing some kind of math underflow
@@ -35,14 +36,21 @@ module OneApm
               OneApm::Manager.record_metric("CPU/System/Utilization", systemtime / (elapsed * @processor_count))
             end
             if usertime >= 0
+              cpu_utilization = @poller ? @poller.cpu_utilization : (usertime / (elapsed * @processor_count))
               OneApm::Manager.record_metric("CPU/User Time", usertime)
-              OneApm::Manager.record_metric("CPU/User/Utilization", usertime / (elapsed * @processor_count))
+              OneApm::Manager.record_metric("CPU/User/Utilization", cpu_utilization)
             end
           end
           @last_utime = t.utime
           @last_stime = t.stime
           @last_time = now
         end
+
+        def self.supported_on_this_platform?
+          # Process.times on JRuby < 1.7.0 reports wall clock elapsed time, not actual cpu time used
+          defined?(JRuby) ? (JRUBY_VERSION >= '1.7.0') : true
+        end
+
       end
     end
   end

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

@@ -9,43 +9,8 @@ module OneApm
       class MemorySampler < OneApm::Collector::Sampler
         named :memory
 
-        attr_accessor :sampler
-
-        def initialize
-          if defined? JRuby
-            @sampler = JavaHeapSampler.new
-          elsif platform =~ /linux/
-            @sampler = ProcStatus.new
-            if !@sampler.can_run?
-              OneApm::Manager.logger.debug "Error attempting to use /proc/#{$$}/status file for reading memory. Using ps command instead."
-              @sampler = ShellPS.new("ps -o rsz")
-            else
-              OneApm::Manager.logger.debug "Using /proc/#{$$}/status for reading process memory."
-            end
-          elsif platform =~ /darwin9/ # 10.5
-            @sampler = ShellPS.new("ps -o rsz")
-          elsif platform =~ /darwin1\d+/ # >= 10.6
-            @sampler = ShellPS.new("ps -o rss")
-          elsif platform =~ /freebsd/
-            @sampler = ShellPS.new("ps -o rss")
-          elsif platform =~ /solaris/
-            @sampler = ShellPS.new("/usr/bin/ps -o rss -p")
-          end
-
-          raise Unsupported, "Unsupported platform for getting memory: #{platform}" if @sampler.nil?
-          raise Unsupported, "Unable to run #{@sampler}" unless @sampler.can_run?
-        end
-
-        def self.supported_on_this_platform?
-          defined?(JRuby) or platform =~ /linux|darwin|freebsd|solaris/
-        end
-
-        def self.platform
-          if RUBY_PLATFORM =~ /java/
-            %x[uname -s].downcase
-          else
-            RUBY_PLATFORM.downcase
-          end
+        def set_poller poller
+          @poller = poller
         end
 
         def platform
@@ -53,108 +18,37 @@ module OneApm
         end
 
         def poll
-          sample = @sampler.get_sample
+          sample = get_sample
           if sample
             OneApm::Manager.record_metric("Memory/Used", sample)
           end
         end
 
-        class Base
-
-          def pgrp_id
-            Process.getpgrp
-          end
-
-          def pids_cmd
-            `ps -o pid,pgid -e | grep #{pgrp_id}`
-          end
-
-          def pids
-            @pids = pids_cmd.split(/\s+/).uniq rescue [Process.pid]
-            @pids = [Process.pid] if @pids.empty?  
-            @pids
-          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
-              m = get_memory
-              if m.nil?
-                OneApm::Manager.logger.warn "Unable to get the resident memory for process #{$$}.  Disabling memory sampler."
-                @broken = true
-              end
-              return m
-            rescue => e
-              OneApm::Manager.logger.warn "Unable to get the resident memory for process #{$$}. Disabling memory sampler.", e
-              @broken = true
-              return nil
+        def get_sample
+          begin
+            m = @poller.memory 
+            if m.nil?
+              OneApm::Manager.logger.warn "Unable to get the resident memory for process #{$$}.  Disabling memory sampler."
             end
+            return m
+          rescue => e
+            OneApm::Manager.logger.warn "Unable to get the resident memory for process #{$$}. Disabling memory sampler.", e
+            return nil
           end
-
         end
 
-        class JavaHeapSampler < Base
-
-          def get_memory
-            raise "Can't sample Java heap unless running in JRuby" unless defined? JRuby
-            java.lang.Runtime.getRuntime.totalMemory / (1024 * 1024).to_f rescue nil
-          end
-
-          def to_s
-            "JRuby Java heap sampler"
-          end
-
+        def self.supported_on_this_platform?
+          defined?(::JRuby) or platform =~ /linux|darwin|freebsd|solaris/
         end
 
-        class ShellPS < Base
-
-          def initialize(command)
-            super()
-            @command = command
-          end
-
-          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
-            memory
-          end
-
-          def to_s
-            "shell command sampler: #{@command}"
+        def self.platform
+          if RUBY_PLATFORM =~ /java/
+            %x[uname -s].downcase
+          else
+            RUBY_PLATFORM.downcase
           end
-
         end
 
-        class ProcStatus < Base
-
-          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 pid=Process.pid
-            "/proc/#{pid}/status"
-          end
-
-          def to_s
-            "proc status file sampler: #{proc_status_file}"
-          end
-
-        end
       end
     end
   end

data/lib/one_apm/collector/support/jruby_poller.rb

@@ -0,0 +1,22 @@
+# encoding: utf-8
+require 'one_apm/collector/support/shell_poller'
+
+module OneApm
+  module Collector
+    class JrubyPoller < OneApm::Collector::ShellPoller
+
+      def self.enable?
+        defined?(::JRuby)
+      end
+
+      def memory
+        java.lang.Runtime.getRuntime.totalMemory / (1024 * 1024).to_f rescue nil
+      end
+
+      def to_s
+        "JrubyPoller from: java.lang.Runtime.getRuntime.totalMemory"
+      end
+
+    end
+  end
+end

data/lib/one_apm/collector/support/proc_poller.rb

@@ -0,0 +1,63 @@
+# encoding: utf-8
+require 'one_apm/collector/support/shell_poller'
+
+module OneApm
+  module Collector
+    class ProcPoller < OneApm::Collector::ShellPoller
+
+      UPTIME_PATH = '/proc/uptime'.freeze
+
+      def self.enable?
+        ::RUBY_PLATFORM.downcase =~ /linux/
+      end
+
+      def poll_memory
+        return 0.0 unless File.exist?(proc_status_file)
+        stats[:rss].to_f * OneApm::Collector::ShellPoller.kb_page_size / 1024.0
+      end
+      
+      def cpu_utilization
+        @pid = Process.pid
+        stat = stats 
+        total_time = stat[:utime].to_f + stat[:stime].to_f # in jiffies
+        seconds = uptime - stat[:starttime].to_f / 100
+        return 0.0 if seconds <= 0.0
+        ((total_time * 1000.0 / 100.0) / seconds) / 10.0 / 100.0
+      rescue => e
+        OneApm::Manager.logger.warn "Fetch cpu usage error: #{e.message}"
+        0.0
+      end
+
+      def to_s
+        "ProcPoller from: #{proc_status_file}"
+      end
+
+      private
+      # in seconds
+      def uptime
+        File.read(UPTIME_PATH).split[0].to_f
+      end
+
+      def proc_status_file
+        "/proc/#{pid}/stat"
+      end
+
+      def stats
+        stat = {}
+        stat[:pid], stat[:comm], stat[:state], stat[:ppid], stat[:pgrp],
+        stat[:session], stat[:tty_nr], stat[:tpgid], stat[:flags],
+        stat[:minflt], stat[:cminflt], stat[:majflt], stat[:cmajflt],
+        stat[:utime], stat[:stime], stat[:cutime], stat[:cstime],
+        stat[:priority], stat[:nice], _, stat[:itrealvalue],
+        stat[:starttime], stat[:vsize], stat[:rss], stat[:rlim],
+        stat[:startcode], stat[:endcode], stat[:startstack], stat[:kstkesp],
+        stat[:kstkeip], stat[:signal], stat[:blocked], stat[:sigignore],
+        stat[:sigcatch], stat[:wchan], stat[:nswap], stat[:cnswap],
+        stat[:exit_signal], stat[:processor], stat[:rt_priority],
+        stat[:policy] = File.open(proc_status_file, "r") {|f| f.read_nonblock(4096).strip }.scan(/\(.*?\)|\w+/)
+        stat
+      end
+
+    end
+  end
+end

data/lib/one_apm/collector/support/sampler_collection.rb

@@ -1,4 +1,7 @@
 # encoding: utf-8
+require 'one_apm/collector/support/shell_poller'
+require 'one_apm/collector/support/proc_poller'
+require 'one_apm/collector/support/jruby_poller'
 
 module OneApm
   module Collector
@@ -47,6 +50,7 @@ module OneApm
         if supported && enabled && !sampler_class_registered?(sampler_class)
           sampler = sampler_class.new
           sampler.setup_events(@event_listener) if sampler.respond_to?(:setup_events)
+          sampler.set_poller(poller)            if sampler.respond_to?(:set_poller)
           @samplers << sampler
           OneApm::Manager.logger.debug("Registered #{sampler_class.name} for harvest time sampling.")
         else
@@ -57,6 +61,19 @@ module OneApm
       rescue => e
         OneApm::Manager.logger.error("Error registering sampler:", e)
       end
+
+      def poller 
+        @pller ||= begin
+          if OneApm::Collector::JrubyPoller.enable?
+            OneApm::Collector::JrubyPoller.new 
+          elsif OneApm::Collector::ProcPoller.enable?
+            OneApm::Collector::ProcPoller.new 
+          else
+            OneApm::Collector::ShellPoller.new  
+          end 
+        end
+      end
+
     end
   end
 end

data/lib/one_apm/collector/support/shell_poller.rb

@@ -0,0 +1,58 @@
+# encoding: utf-8
+
+module OneApm
+  module Collector
+    class ShellPoller
+
+      attr_accessor :pid
+
+      def memory
+        pids.inject(0.0){|m, pid| m + get_memory_by_pid(pid) }
+      end
+
+      def cpu_utilization
+        @pid = Process.pid
+        ps_float('%cpu') / 100.0
+      end
+
+      def to_s
+        "ShellPoller from: ps -p #{pid}"
+      end
+
+      def self.kb_page_size
+        @size ||= `getconf PAGE_SIZE`.to_f / 1024.0 rescue 4.0
+      end
+
+      protected
+
+      def pgrp_id
+        Process.getpgrp
+      end
+
+      def pids_cmd
+        `ps -o pid,pgid -e | grep -w "#{pgrp_id}"`
+      end
+
+      def pids
+        @pids = pids_cmd.split(/\s+/).uniq rescue [Process.pid.to_s]
+        @pids = [Process.pid.to_s] if @pids.empty?  
+        @pids
+      end
+
+      def get_memory_by_pid pid
+        return 0.0 if pid.empty?
+        @pid = pid
+        poll_memory rescue 0.0
+      end
+
+      def poll_memory
+        ps_float('rss') / 1024.0
+      end
+
+      def ps_float keyword
+        `ps -o #{keyword}= -p #{pid}`.to_f
+      end
+
+    end
+  end
+end

data/lib/one_apm/rack/developer_mode.rb

@@ -13,6 +13,7 @@ require 'one_apm/transaction/transaction_sample'
 require 'one_apm/transaction/transaction_analysis'
 
 require 'one_apm/rack/developer_mode/helper'
+require 'one_apm/collector/support/shell_poller'
 
 module OneApm
   module Rack
@@ -291,7 +292,7 @@ module OneApm
         ERB.new(File.read(File.join(VIEW_PATH, 'oneapm', view.to_s + '.html.erb')), nil, nil, 'frobnitz').result(binding)
       end
 
-      def content_tag(tag, contents, opts={})
+      def content_tag(tag, contents, opts={}) 
         opt_values = opts.map {|k, v| "#{k}=\"#{v}\"" }.join(' ')
         "<#{tag} #{opt_values}>#{contents}</#{tag}>"
       end
@@ -358,7 +359,9 @@ module OneApm
 
       def current_memory_used
         @memory_sampler ||= OneApm::Collector::Samplers::MemorySampler.new
-        @memory_sampler.sampler.get_sample
+        @shell_poller ||= OneApm::Collector::ShellPoller.new
+        @memory_sampler.set_poller(@shell_poller) 
+        @memory_sampler.get_sample
       end
 
     end

data/lib/one_apm/version.rb

@@ -5,10 +5,11 @@ module OneApm
 
     MAJOR = 1
     MINOR = 3
-    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.3.3
+  version: 1.3.4.rc1
 platform: ruby
 authors:
 - oneapm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-23 00:00:00.000000000 Z
+date: 2015-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -295,7 +295,10 @@ files:
 - lib/one_apm/collector/stats_engine/metric_stats.rb
 - lib/one_apm/collector/stats_engine/stats_hash.rb
 - lib/one_apm/collector/support/forked_process_service.rb
+- lib/one_apm/collector/support/jruby_poller.rb
+- lib/one_apm/collector/support/proc_poller.rb
 - lib/one_apm/collector/support/sampler_collection.rb
+- lib/one_apm/collector/support/shell_poller.rb
 - lib/one_apm/configuration.rb
 - lib/one_apm/configuration/default_source.rb
 - lib/one_apm/configuration/environment_source.rb