scout_rails 1.1.5.pre3 → 1.1.5.pre4

data/lib/scout_rails/store.rb

@@ -4,6 +4,9 @@ class ScoutRails::Store
   
   # Limits the size of the metric hash to prevent a metric explosion. 
   MAX_SIZE = 1000
+
+  # Limit the number of samples that we store metrics with to prevent writing too much data to the layaway file if there are are many processes and many slow samples. 
+  MAX_SAMPLES_TO_STORE_METRICS = 10
   
   attr_accessor :metric_hash
   attr_accessor :transaction_hash
@@ -193,7 +196,17 @@ class ScoutRails::Store
     metric_hash
   end
 
+  # Merges samples together, removing transaction sample metrics from samples if the > MAX_SAMPLES_TO_STORE_METRICS
   def merge_samples(old_samples)
+    # need transaction lock here?
     self.samples += old_samples
+    if trim_samples = self.samples[MAX_SAMPLES_TO_STORE_METRICS..-1]
+      ScoutRails::Agent.instance.logger.debug "Trimming metrics from #{trim_samples.size} samples."
+      i = MAX_SAMPLES_TO_STORE_METRICS
+      trim_samples.each do |sample|
+        self.samples[i] = sample.clear_metrics!
+      end
+    end
+    self.samples
   end
 end # class Store

data/lib/scout_rails/transaction_sample.rb

@@ -25,4 +25,10 @@ class ScoutRails::TransactionSample
     @total_call_time = total_call_time
     @metrics = metrics
   end
+
+  # Used to remove metrics when the payload will be too large.
+  def clear_metrics!
+    @metrics = nil
+    self
+  end
 end

data/lib/scout_rails/version.rb

@@ -1,3 +1,3 @@
 module ScoutRails
-  VERSION = "1.1.5.pre3"
+  VERSION = "1.1.5.pre4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_rails
 version: !ruby/object:Gem::Version
-  version: 1.1.5.pre3
+  version: 1.1.5.pre4
   prerelease: 6
 platform: ruby
 authors: