scout_rails 1.0.8 → 1.0.9

data/.gitignore

@@ -1,3 +1,4 @@
+./**/.DS_Store
 *.gem
 .bundle
 Gemfile.lock

data/CHANGELOG.markdown

@@ -1,3 +1,9 @@
+# 1.0.9
+
+* Rainbows! app server support.
+* Removed undocumented Sinatra support.
+* Limiting metric hash size to 1000 to prevent a metric explosion.
+
 # 1.0.8
 
 * Processing metrics when a process starts + exits to prevent losing in-memory metrics on process exit.

data/lib/scout_rails/agent/reporting.rb

@@ -10,6 +10,7 @@ module ScoutRails
         metrics = layaway.deposit_and_deliver
         if metrics.any?
           add_metric_ids(metrics)  
+          logger.warn "Some data may be lost - metric size is at limit" if metrics.size == ScoutRails::Store::MAX_SIZE
           # for debugging, count the total number of requests    
           controller_count = 0
           metrics.each do |meta,stats|

data/lib/scout_rails/agent.rb

@@ -67,6 +67,7 @@ module ScoutRails
         logger.debug "Not starting worker thread"
         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
         return
       end
       start_background_worker
@@ -143,6 +144,17 @@ module ScoutRails
       end
     end
     
+    def install_rainbows_worker_loop
+      logger.debug "Installing Rainbows worker loop."
+      Rainbows::HttpServer.class_eval do
+        old = instance_method(:worker_loop)
+        define_method(:worker_loop) do |worker|
+          ScoutRails::Agent.instance.start_background_worker
+          old.bind(self).call(worker)
+        end
+      end
+    end    
+    
     # Creates the worker thread. The worker thread is a loop that runs continuously. It sleeps for +Agent#period+ and when it wakes,
     # processes data, either saving it to disk or reporting to Scout.
     def start_background_worker
@@ -184,8 +196,6 @@ module ScoutRails
         require File.expand_path(File.join(File.dirname(__FILE__),'instruments/rails/action_controller_instruments.rb'))
       when :rails3
         require File.expand_path(File.join(File.dirname(__FILE__),'instruments/rails3/action_controller_instruments.rb'))
-      when :sinatra
-        require File.expand_path(File.join(File.dirname(__FILE__),'instruments/sinatra_instruments.rb'))
       end
       require File.expand_path(File.join(File.dirname(__FILE__),'instruments/active_record_instruments.rb'))
       require File.expand_path(File.join(File.dirname(__FILE__),'instruments/net_http.rb'))

data/lib/scout_rails/environment.rb

@@ -55,6 +55,7 @@ module ScoutRails
       @app_server ||= if thin? then :thin
                     elsif passenger? then :passenger
                     elsif webrick? then :webrick
+                    elsif rainbows? then :rainbows
                     elsif unicorn? then :unicorn
                     else nil
                     end
@@ -80,6 +81,12 @@ module ScoutRails
     def webrick?
       defined?(::WEBrick) && defined?(::WEBrick::VERSION)
     end
+
+    def rainbows?
+      if defined?(::Rainbows) && defined?(::Rainbows::HttpServer)
+        ObjectSpace.each_object(::Rainbows::HttpServer) { |x| return true }
+      end
+    end
     
     def unicorn?
       if defined?(::Unicorn) && defined?(::Unicorn::HttpServer)
@@ -91,7 +98,7 @@ module ScoutRails
     # 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?
+      passenger? or unicorn? or rainbows?
     end
     
     ### ruby checks

data/lib/scout_rails/store.rb

@@ -1,6 +1,10 @@
 # The store encapsolutes the logic that (1) saves instrumented data by Metric name to memory and (2) maintains a stack (just an Array)
 # of instrumented methods that are being called. It's accessed via +ScoutRails::Agent.instance.store+. 
 class ScoutRails::Store
+  
+  # Limits the size of the metric hash to prevent a metric explosion. 
+  MAX_SIZE = 1000
+  
   attr_accessor :metric_hash
   attr_accessor :transaction_hash
   attr_accessor :stack
@@ -142,7 +146,7 @@ class ScoutRails::Store
     old_data.each do |old_meta,old_stats|
       if stats = metric_hash[old_meta]
         metric_hash[old_meta] = stats.combine!(old_stats)
-      else
+      elsif metric_hash.size < MAX_SIZE
         metric_hash[old_meta] = old_stats
       end
     end

data/lib/scout_rails/version.rb

@@ -1,3 +1,3 @@
 module ScoutRails
-  VERSION = "1.0.8"
+  VERSION = "1.0.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_rails
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-03 00:00:00.000000000 Z
+date: 2012-12-11 00:00:00.000000000 Z
 dependencies: []
 description: Monitors a Ruby on Rails application and reports detailed metrics on
   performance to Scout, a hosted monitoring service.
@@ -20,7 +20,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .DS_Store
 - .gitignore
 - CHANGELOG.markdown
 - Gemfile
@@ -41,7 +40,6 @@ files:
 - lib/scout_rails/instruments/process/process_memory.rb
 - lib/scout_rails/instruments/rails/action_controller_instruments.rb
 - lib/scout_rails/instruments/rails3/action_controller_instruments.rb
-- lib/scout_rails/instruments/sinatra_instruments.rb
 - lib/scout_rails/layaway.rb
 - lib/scout_rails/layaway_file.rb
 - lib/scout_rails/metric_meta.rb

data/lib/scout_rails/instruments/sinatra_instruments.rb

@@ -1,41 +0,0 @@
-module ScoutRails::Instruments
-  module SinatraInstruments
-    def dispatch_with_scout_instruments!
-      scout_controller_action = "Controller/Sinatra/#{scout_sinatra_controller_name(@request)}"
-      self.class.trace(scout_controller_action, :uri => @request.path_info) do
-        dispatch_without_scout_instruments!
-      end
-    end
-    
-    # Iterates through the app's routes, returning the matched route that the request should be 
-    # grouped under for the metric name. 
-    #
-    # If not found, "unknown" is returned. This prevents a metric explosion.
-    #
-    # Nice to have: substitute the param pattern (([^/?#]+)) w/the named key (the +key+ param of the block).
-    def scout_sinatra_controller_name(request)
-      name = 'unknown'
-      verb = request.request_method if request && request.respond_to?(:request_method) 
-      Array(self.class.routes[verb]).each do |pattern, keys, conditions, block|
-        if pattern = process_route(pattern, keys, conditions) { pattern.source }
-          name = pattern
-        end
-      end
-      name.gsub!(%r{^[/^]*(.*?)[/\$\?]*$}, '\1')
-      if verb
-        name = [verb,name].join(' ')
-      end
-      name
-    end
-  end # SinatraInstruments
-end # ScoutRails::Instruments
-
-if defined?(::Sinatra) && defined?(::Sinatra::Base) && Sinatra::Base.private_method_defined?(:dispatch!)
-  ScoutRails::Agent.instance.logger.debug "Instrumenting Sinatra"
-  ::Sinatra::Base.class_eval do
-    include ScoutRails::Tracer
-    include ::ScoutRails::Instruments::SinatraInstruments
-    alias dispatch_without_scout_instruments! dispatch!
-    alias dispatch! dispatch_with_scout_instruments!
-  end
-end