scout_rails 1.1.5.pre5 → 1.1.5.pre6

data/lib/scout_rails/agent/reporting.rb

@@ -26,7 +26,7 @@ module ScoutRails
           STATSD_SCOUT_RAILS.timing('scout_rails.samples',samples.size)
           samples_kb = Marshal.dump(samples).size/1024 # just for performance debugging
           STATSD_SCOUT_RAILS.timing('scout_rails.samples_kb',samples_kb)
-          logger.debug "#{config.settings['name']} Delivering metrics [#{payload.size/1024} KB] for #{controller_count} requests and slow transaction samples [#{samples_kb} KB] for #{samples.size} samples of durations: #{samples.map(&:total_call_time).join(',')}."        
+          logger.debug "#{config.settings['name']} Delivering total payload [#{payload.size/1024} KB] for #{controller_count} requests and slow transaction samples [#{samples_kb} KB] for #{samples.size} samples of durations: #{samples.map(&:total_call_time).join(',')}."        
           response =  post( checkin_uri,
                              payload,
                              "Content-Type"     => "application/json" )

data/lib/scout_rails/store.rb

@@ -135,12 +135,12 @@ class ScoutRails::Store
   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)
+        @sample = ScoutRails::TransactionSample.new(uri,parent_meta.metric_name,parent_stat.total_call_time,transaction_hash.dup,Thread::current[:scout_custom_attributes])
       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))
-        ScoutRails::Agent.instance.logger.debug "Slow transaction sample added. Array Size: #{@samples.size}"
+        @samples.push(ScoutRails::TransactionSample.new(uri,parent_meta.metric_name,parent_stat.total_call_time,transaction_hash.dup,Thread::current[:scout_custom_attributes]))
+        ScoutRails::Agent.instance.logger.debug "Slow transaction sample added. [URI: #{uri}] [Attrs: #{Thread::current[:scout_custom_attributes].inspect}] Array Size: #{@samples.size}"
       end
     end
   end

data/lib/scout_rails/tracer.rb

@@ -21,6 +21,7 @@ module ScoutRails::Tracer
         yield
         Thread::current[:scout_scope_name] = nil
       end
+      Thread::current[:scout_custom_attributes] = nil
     end
     
     # Options:

data/lib/scout_rails/transaction_sample.rb

@@ -2,7 +2,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
+  attr_reader :metric_name, :total_call_time, :metrics, :meta, :uri, :custom_attributes
   
   # Given a call stack, generates a filtered backtrace that:
   # * Limits to the app/models, app/controllers, or app/views directories
@@ -19,11 +19,14 @@ class ScoutRails::TransactionSample
     stack
   end
   
-  def initialize(uri,metric_name,total_call_time,metrics)
+  def initialize(uri,metric_name,total_call_time,metrics,custom_attributes)
     @uri = uri
     @metric_name = metric_name
     @total_call_time = total_call_time
     @metrics = metrics
+    if custom_attributes.is_a?(Hash) and custom_attributes.any?
+      @custom_attributes = custom_attributes
+    end
   end
 
   # Used to remove metrics when the payload will be too large.

data/lib/scout_rails/version.rb

@@ -1,3 +1,3 @@
 module ScoutRails
-  VERSION = "1.1.5.pre5"
+  VERSION = "1.1.5.pre6"
 end

metadata

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