scout_rails 1.0.9 → 1.1.0

data/CHANGELOG.markdown

@@ -1,3 +1,7 @@
+# 1.1.0
+
+* Limiting the size of the transaction hash to 100 metrics to prevent large transaction samples.
+
 # 1.0.9
 
 * Rainbows! app server support.

data/lib/scout_rails/store.rb

@@ -71,9 +71,8 @@ class ScoutRails::Store
       meta.extra = {:backtrace => ScoutRails::TransactionSample.backtrace_parser(caller)}
     end
     stat = transaction_hash[meta] || ScoutRails::MetricStats.new(!stack_empty)
-    
     stat.update!(duration,duration-item.children_time)
-    transaction_hash[meta] = stat   
+    transaction_hash[meta] = stat if store_metric?(stack_empty)
     
     # Uses controllers as the entry point for a transaction. Otherwise, stats are ignored.
     if stack_empty and meta.metric_name.match(/\AController\//)
@@ -88,6 +87,14 @@ class ScoutRails::Store
     end
   end
   
+  # TODO - Move more logic to TransactionSample
+  #
+  # Limits the size of the transaction hash to prevent a large transactions. The final item on the stack
+  # is allowed to be stored regardless of hash size to wrapup the transaction sample w/the parent metric.
+  def store_metric?(stack_empty)
+    transaction_hash.size < ScoutRails::TransactionSample::MAX_SIZE or stack_empty
+  end
+  
   # Returns the top-level category names used in the +metrics+ hash.
   def categories(metrics)
     cats = Set.new

data/lib/scout_rails/transaction_sample.rb

@@ -1,6 +1,7 @@
 class ScoutRails::TransactionSample
   BACKTRACE_THRESHOLD = 0.5 # the minimum threshold to record the backtrace for a metric.
   BACKTRACE_LIMIT = 5 # Max length of callers to display
+  MAX_SIZE = 100 # Limits the size of the metric hash to prevent a metric explosion.
   attr_reader :metric_name, :total_call_time, :metrics, :meta, :uri
   
   # Given a call stack, generates a filtered backtrace that:

data/lib/scout_rails/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_rails
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-11 00:00:00.000000000 Z
+date: 2012-12-14 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.