scout_rails 1.1.3 → 1.1.4.pre

data/lib/scout_rails/agent/reporting.rb

@@ -17,10 +17,12 @@ module ScoutRails
             if meta.metric_name =~ /\AController/
               controller_count += stats.call_count
             end
-          end        
-          logger.debug "#{config.settings['name']} Delivering metrics for #{controller_count} requests."        
+          end      
+          sample, samples = store.fetch_and_reset_samples!  
+          payload = Marshal.dump(:metrics => metrics, :sample => sample, :samples => samples)
+          logger.debug "#{config.settings['name']} Delivering payload [#{payload.size/1024} KB] for #{controller_count} requests and #{samples.size} slow transaction samples of durations: #{samples.map(&:total_call_time).join(',')}."        
           response =  post( checkin_uri,
-                             Marshal.dump(:metrics => metrics, :sample => store.sample),
+                             payload,
                              "Content-Type"     => "application/json" )
           if response and response.is_a?(Net::HTTPSuccess)
             directives = Marshal.load(response.body)
@@ -29,9 +31,6 @@ module ScoutRails
               logger.info "Resetting metric_lookup."
               self.metric_lookup = Hash.new
             end
-            store.transaction_sample_lock.synchronize do
-              store.sample = nil
-            end
             logger.debug "Metric Cache Size: #{metric_lookup.size}"
           end
         end

data/lib/scout_rails/store.rb

@@ -9,6 +9,7 @@ class ScoutRails::Store
   attr_accessor :transaction_hash
   attr_accessor :stack
   attr_accessor :sample
+  attr_accessor :samples # array of slow transaction samples
   attr_reader :transaction_sample_lock
   
   def initialize
@@ -19,6 +20,7 @@ class ScoutRails::Store
     @stack = Array.new
     # ensure background thread doesn't manipulate transaction sample while the store is.
     @transaction_sample_lock = Mutex.new
+    @samples = Array.new
   end
   
   # Called when the last stack item completes for the current transaction to clear
@@ -126,12 +128,28 @@ class ScoutRails::Store
   end
   
   # Stores the slowest transaction. This will be sent to the server.
+  # Includes the legacy single slow transaction and the array of samples.
   def store_sample(uri,transaction_hash,parent_meta,parent_stat,options = {})    
     @transaction_sample_lock.synchronize do
       if parent_stat.total_call_time >= 2 and (@sample.nil? or (@sample and parent_stat.total_call_time > @sample.total_call_time))
         @sample = ScoutRails::TransactionSample.new(uri,parent_meta.metric_name,parent_stat.total_call_time,transaction_hash.dup)
       end
+      # tree map of all slow transactions
+      if parent_stat.total_call_time >= 2
+        @samples.push(ScoutRails::TransactionSample.new(uri,parent_meta.metric_name,parent_stat.total_call_time,transaction_hash.dup))
+      end
+    end
+  end
+
+  # Returns the slow samples and resets the values - used when reporting. 
+  def fetch_and_reset_samples!
+    sample = @sample
+    samples = @samples
+    @transaction_sample_lock.synchronize do
+      self.sample = nil
+      self.samples = Array.new
     end
+    [sample,samples]
   end
   
   # Finds or creates the metric w/the given name in the metric_hash, and updates the time. Primarily used to 

data/lib/scout_rails/version.rb

@@ -1,3 +1,3 @@
 module ScoutRails
-  VERSION = "1.1.3"
+  VERSION = "1.1.4.pre"
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: scout_rails
 version: !ruby/object:Gem::Version
-  version: 1.1.3
-  prerelease: 
+  version: 1.1.4.pre
+  prerelease: 6
 platform: ruby
 authors:
 - Derek Haynes
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-05 00:00:00.000000000 Z
+date: 2015-06-12 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.
@@ -67,9 +67,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: scout_rails
 rubygems_version: 1.8.23