scout_apm 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2f2ddadaf118058d788a7d39c15de73fb24c19d
-  data.tar.gz: 7c495ff3fda4aab68c3d31b543bc3d934df4ae83
+  metadata.gz: 5c3c774cf96a6a211650f1fffabed007073ccb93
+  data.tar.gz: bd321d8d0567c66caeb6a96ca3a65a72a48db39a
 SHA512:
-  metadata.gz: f3378b43c95b66a8f33fd3f0af330ff73d00e6aa2fde247246b205697d809cd30f65ed73306e4db135bc25011e08aedac434233469945a3b73d0c2f8dfda0795
-  data.tar.gz: 56eea7c846a87ae932a758ca52dffd5b22287fb2852f36f9d267d374587cfa7c982c87d8bdd2c54f8b5bc5802754e2af1aa74e1a4e9f5b0a6742c182d8bf6b59
+  metadata.gz: e3071d8c222b7e3954aaa04a3eb25fe5ea89b780894be1763173ff5b061cf4cc565659267b3f353754dfeb16f9927db7108c22a6d60055f880d8561a74194e7e
+  data.tar.gz: 84ab4cc77107f927537587f080b6b23950330da0075c9819f03c4038929006087256fce9449f54f39ae51a98ee91678307fe836abc66ccbf2e75c0e20c229118

data/CHANGELOG.markdown

@@ -1,3 +1,13 @@
+# 0.1.12
+
+* Fix Puma integration. Now detects both branches of preload_app! setting.
+* Enhance Cpu instrumentation
+
+# 0.1.11
+
+* Post on-load application details in a background thread to prevent potential
+  pauses during app boot
+
 # 0.1.10
 
 * Prevent instrumentation in non-web contexts. Prevents agent running in rails

data/lib/scout_apm/agent.rb

@@ -153,9 +153,7 @@ module ScoutApm
     def start_background_worker?
       return true if environment.app_server == :thin
       return true if environment.app_server == :webrick
-      return false if environment.forking?
-
-      false
+      return !environment.forking?
     end
 
     # Creates the worker thread. The worker thread is a loop that runs continuously. It sleeps for +Agent#period+ and when it wakes,

data/lib/scout_apm/app_server_load.rb

@@ -27,6 +27,7 @@ module ScoutApm
         :framework          => ScoutApm::Environment.instance.framework_integration.human_name,
         :framework_version  => ScoutApm::Environment.instance.framework_integration.version,
         :environment        => ScoutApm::Environment.instance.framework_integration.env,
+        :app_server         => ScoutApm::Environment.instance.app_server,
         :ruby_version       => RUBY_VERSION,
         :hostname           => ScoutApm::Environment.instance.hostname,
         :database_engine    => ScoutApm::Environment.instance.database_engine,

data/lib/scout_apm/instruments/process/process_cpu.rb

@@ -25,6 +25,7 @@ module ScoutApm
           "Process CPU"
         end
 
+        # TODO: Figure out a good default instead of nil
         def run
           res = nil
 
@@ -34,11 +35,24 @@ module ScoutApm
           stime = t.stime
 
           wall_clock_elapsed  = now - last_run
+          if wall_clock_elapsed < 0
+            save_times(now, utime, stime)
+            logger.warn "#{human_name}: Negative time elapsed.  now: #{now}, last_run: #{last_run}, total time: #{wall_clock_elapsed}"
+            return nil
+          end
 
           utime_elapsed   = utime - last_utime
           stime_elapsed   = stime - last_stime
           process_elapsed = utime_elapsed + stime_elapsed
 
+          # This can happen right after a fork.  This class starts up in
+          # pre-fork, records {u,s}time, then forks. This resets {u,s}time to 0
+          if process_elapsed < 0
+            save_times(now, utime, stime)
+            logger.warn "#{human_name}: Negative process time elapsed.  utime: #{utime_elapsed}, stime: #{stime_elapsed}, total time: #{process_elapsed}"
+            return nil
+          end
+
           # Normalized to # of processors
           normalized_wall_clock_elapsed = wall_clock_elapsed * num_processors
 
@@ -49,14 +63,24 @@ module ScoutApm
                   ( process_elapsed / normalized_wall_clock_elapsed )*100
                 end
 
-          self.last_run = now
-          self.last_utime = t.utime
-          self.last_stime = t.stime
+          if res < 0
+            save_times(now, utime, stime)
+            logger.warn "#{human_name}: Negative CPU.  #{process_elapsed} / #{normalized_wall_clock_elapsed} * 100 ==> #{res}"
+            return nil
+          end
+
+          save_times(now, utime, stime)
 
-          logger.debug "#{human_name}: #{res.inspect} [#{Environment.instance.processors} CPU(s)]"
+          logger.debug "#{human_name}: #{res.inspect} [#{num_processors} CPU(s)]"
 
           return res
         end
+
+        def save_times(now, utime, stime)
+          self.last_run = now
+          self.last_utime = utime
+          self.last_stime = stime
+        end
       end
     end
   end

data/lib/scout_apm/server_integrations/puma.rb

@@ -11,14 +11,21 @@ module ScoutApm
         :puma
       end
 
-      def forking?; true; end
+      def forking?
+        return false unless defined?(::Puma)
+        options = ::Puma.cli_config.instance_variable_get(:@options)
+        logger.debug options.inspect
+        options[:preload_app]
+      rescue
+        false
+      end
 
       def present?
-        defined?(::Puma) && File.basename($0) == 'puma'
+        defined?(::Puma) && (File.basename($0) =~ /\Apuma/)
       end
 
       def install
-        Puma.cli_config.options[:before_worker_boot] << Proc.new do
+        ::Puma.cli_config.options[:before_worker_boot] << Proc.new do
           logger.debug "Installing Puma worker loop."
           ScoutApm::Agent.instance.start_background_worker
         end

data/lib/scout_apm/version.rb

@@ -1,4 +1,4 @@
 module ScoutApm
-  VERSION = "0.1.11"
+  VERSION = "0.1.12"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - Derek Haynes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-31 00:00:00.000000000 Z
+date: 2015-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest