scout_apm 0.1.3 → 0.1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e446ee188c5294111023e7110aa649c3d1e0d6d
-  data.tar.gz: 28bf8811e6e819ea847b806ae3f5abf62c2531b2
+  metadata.gz: 6dd9fa6823ce48d2b2b36ae4238cfaa3152bfd08
+  data.tar.gz: c0916b57ea440cedaf275792089bedf20249ffe9
 SHA512:
-  metadata.gz: 9b174e8e7a4aa643a6b7ae8491aab27d969b2b64c3513ee32911b2045b2b4d9703cbca2a011404f7fd9c4557c6ed45948dce8d0119f55eafdcbc17950d34a188
-  data.tar.gz: 292f67f6b0d69de6aaf2582f53dfb1faae882baaf66127431566ba1c30692f1d2b5fd018e45df2fd9da664dacd037013d97d98805f9908880ec898b558ec1af2
+  metadata.gz: d62355ce9a305aa40ecd58722b1c518a1dc2606e06aa3fd1101b73100bded03a48e51c2a2bcc54907f0eb5da5e3444bdb819cc420766e90823cca19f4d7344bc
+  data.tar.gz: 27c9bc33de0af9d4aff82503ad7e3bb1a8fde34a6448fba5ebe61b84f80d2354a517aecf7ddb7fcf48a059193c3027064c7a159223335156dc74a22cee798056

data/CHANGELOG.markdown

@@ -1,3 +1,8 @@
+# 0.1.3.1
+
+* Adds Puma support
+* Fix for returning true for unicorn? and rainbows? when they are included in the Gemfile but not actually serving the app.
+
 # 0.1.3
 
 * Adds capacity calculation via "Instance/Capacity" metric. 

data/README.markdown

@@ -36,6 +36,8 @@ Your config file should look like:
 * Thin
 * WEBrick
 * Unicorn (make sure to add `preload_app true` to `config/unicorn.rb`)
+* Rainbows
+* Puma
 
 ## Help
 

data/lib/scout_apm/agent.rb

@@ -66,10 +66,11 @@ module ScoutApm
       logger.info "Starting monitoring for [#{config.value('name')}]. Framework [#{environment.framework}] App Server [#{environment.app_server}]."
       start_instruments
       if !start_background_worker?
-        logger.debug "Not starting worker thread"
+        logger.debug "Not starting worker thread. Will start worker loops after forking."
         install_passenger_events if environment.app_server == :passenger
         install_unicorn_worker_loop if environment.app_server == :unicorn
         install_rainbows_worker_loop if environment.app_server == :rainbows
+        install_puma_worker_loop if environment.app_server == :puma
         return
       end
       start_background_worker
@@ -116,11 +117,14 @@ module ScoutApm
     
     # The worker thread will automatically start UNLESS:
     # * A supported application server isn't detected (example: running via Rails console)
-    # * A supported application server is detected, but it forks (Passenger). In this case, 
+    # * A supported application server is detected, but it forks. In this case, 
     #   the agent is started in the forked process.
     def start_background_worker?
-      !environment.forking? or environment.app_server == :thin
+      !environment.forking? or environment.app_server == :thin # clarify why Thin is here but not WEBrick
     end
+
+    ## TODO - Likely possible to unify starting the worker loop in forking servers by listening for the first transaction 
+    ## to start and starting the background worker then in that process.
     
     def install_passenger_events
       PhusionPassenger.on_event(:starting_worker_process) do |forked|
@@ -155,6 +159,15 @@ module ScoutApm
           old.bind(self).call(worker)
         end
       end
+    end
+
+    def install_puma_worker_loop
+      Puma.cli_config.options[:before_worker_boot] << Proc.new do
+        logger.debug "Installing Puma worker loop."
+        ScoutApm::Agent.instance.start_background_worker
+      end
+    rescue
+      logger.warn "Unable to install Puma worker loop: #{$!.message}"
     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/environment.rb

@@ -73,6 +73,7 @@ module ScoutApm
       @app_server ||= if passenger? then :passenger
                     elsif rainbows? then :rainbows
                     elsif unicorn? then :unicorn
+                    elsif puma? then :puma
                     elsif thin? then :thin
                     elsif webrick? then :webrick
                     else nil
@@ -103,6 +104,7 @@ module ScoutApm
     def rainbows?
       if defined?(::Rainbows) && defined?(::Rainbows::HttpServer)
         ObjectSpace.each_object(::Rainbows::HttpServer) { |x| return true }
+        false
       end
     end
     
@@ -110,13 +112,18 @@ module ScoutApm
       if defined?(::Unicorn) && defined?(::Unicorn::HttpServer)
         # Ensure Unicorn is actually initialized. It could just be required and not running.
         ObjectSpace.each_object(::Unicorn::HttpServer) { |x| return true }
+        false
       end
     end
+
+    def puma?
+      defined?(::Puma) && File.basename($0) == 'puma'
+    end
     
     # If forking, don't start worker thread in the master process. Since it's started as a Thread, it won't survive
     # the fork. 
     def forking?
-      passenger? or unicorn? or rainbows?
+      passenger? or unicorn? or rainbows? or puma?
     end
     
     ### ruby checks

data/lib/scout_apm/version.rb

@@ -1,3 +1,3 @@
 module ScoutApm
-  VERSION = "0.1.3"
+  VERSION = "0.1.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.3.1
 platform: ruby
 authors:
 - Derek Haynes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-03 00:00:00.000000000 Z
+date: 2015-08-10 00:00:00.000000000 Z
 dependencies: []
 description: Monitors Ruby apps and reports detailed metrics on performance to Scout.
 email: