dolores_rpm 3.2.0.6 → 3.3.4.fork

data/lib/new_relic/transaction_sample.rb

@@ -9,39 +9,37 @@ module NewRelic
 
   class TransactionSample
 
-    attr_accessor :params, :root_segment
-    attr_accessor :profile
-    attr_reader :root_segment
-    attr_reader :params
-    attr_reader :sample_id
+    attr_accessor :params, :root_segment, :profile, :force_persist, :guid
+    attr_reader :root_segment, :params, :sample_id
 
     @@start_time = Time.now
 
     include TransactionAnalysis
-    
+
     def initialize(time = Time.now.to_f, sample_id = nil)
       @sample_id = sample_id || object_id
       @start_time = time
+      @params = { :segment_count => -1, :request_params => {} }
+      @segment_count = -1
       @root_segment = create_segment 0.0, "ROOT"
-      @params = {}
-      @params[:request_params] = {}
+
+      @guid = generate_guid
+      NewRelic::Agent::TransactionInfo.get.guid = @guid
     end
 
     def count_segments
-      @root_segment.count_segments - 1    # don't count the root segment
+      @segment_count
     end
-    
+
     # Truncates the transaction sample to a maximum length determined
     # by the passed-in parameter. Operates recursively on the entire
     # tree of transaction segments in a depth-first manner
     def truncate(max)
-      count = count_segments
-      return if count < max
+      return if @segment_count < max
       @root_segment.truncate(max + 1)
-
-      ensure_segment_count_set(count)
+      @segment_count = max
     end
-    
+
     # makes sure that the parameter cache for segment count is set to
     # the correct value
     def ensure_segment_count_set(count)
@@ -74,13 +72,15 @@ module NewRelic
 
     def create_segment(relative_timestamp, metric_name, segment_id = nil)
       raise TypeError.new("Frozen Transaction Sample") if frozen?
+      @params[:segment_count] += 1
+      @segment_count += 1
       NewRelic::TransactionSample::Segment.new(relative_timestamp, metric_name, segment_id)
     end
 
     def duration
       root_segment.duration
     end
-    
+
     # Iterates recursively over each segment in the entire transaction
     # sample tree
     def each_segment(&block)
@@ -96,7 +96,7 @@ module NewRelic
     def to_s_compact
       @root_segment.to_s_compact
     end
-    
+
     # Searches the tree recursively for the segment with the given
     # id. note that this is an internal id, not an ActiveRecord id
     def find_segment(id)
@@ -115,6 +115,7 @@ module NewRelic
           when Enumerable then v.map(&:to_s).sort.join("; ")
           when String then v
           when Float then '%6.3s' % v
+          when Fixnum then v.to_s
           when nil then ''
         else
           raise "unexpected value type for #{k}: '#{v}' (#{v.class})"
@@ -133,9 +134,10 @@ module NewRelic
       regex = Regexp.new(regex)
 
       sample = TransactionSample.new(@start_time, sample_id)
-
-      params.each {|k,v| sample.params[k] = v}
-
+      
+      sample.params = params.dup
+      sample.params[:segment_count] = 0
+      
       delta = build_segment_with_omissions(sample, 0.0, @root_segment, sample.root_segment, regex)
       sample.root_segment.end_trace(@root_segment.exit_timestamp - delta)
       sample.profile = self.profile
@@ -154,6 +156,8 @@ module NewRelic
       sample = TransactionSample.new(@start_time, sample_id)
 
       sample.params.merge! self.params
+      sample.guid = self.guid
+      sample.force_persist = self.force_persist if self.force_persist
 
       begin
         build_segment_for_transfer(sample, @root_segment, sample.root_segment, options)
@@ -170,7 +174,19 @@ module NewRelic
     end
 
   private
-    
+
+
+
+    HEX_DIGITS = (0..15).map{|i| i.to_s(16)}
+    # generate a random 64 bit uuid
+    def generate_guid
+      guid = ''
+      HEX_DIGITS.each do |a|
+        guid << HEX_DIGITS[rand(16)]
+      end
+      guid
+    end
+
     # This is badly in need of refactoring
     def build_segment_with_omissions(new_sample, time_delta, source_segment, target_segment, regex)
       source_segment.called_segments.each do |source_called_segment|
@@ -223,12 +239,12 @@ module NewRelic
                 source_called_segment.duration > options[:explain_sql].to_f
               target_called_segment[:explain_plan] = source_called_segment.explain_sql
             end
-            
+
             target_called_segment[:sql] = case options[:record_sql]
               when :raw then v
               when :obfuscated then NewRelic::Agent::Database.obfuscate_sql(v)
               else raise "Invalid value for record_sql: #{options[:record_sql]}"
-            end if options[:record_sql]
+            end.to_s if options[:record_sql]
           when :connection_config
             # don't copy it
           else

data/lib/new_relic/version.rb

@@ -2,9 +2,9 @@
 module NewRelic
   module VERSION #:nodoc:
     MAJOR = 3
-    MINOR = 2
-    TINY  = 0
-    BUILD = 6 #'0' # Set to nil for a release, 'beta1', 'alpha', etc for prerelease builds
+    MINOR = 3
+    TINY  = 4
+    BUILD = 'fork' # Set to nil for a release, 'beta1', 'alpha', etc for prerelease builds
     STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
   end
 

data/test/active_record_fixtures.rb

@@ -12,7 +12,7 @@ module ActiveRecordFixtures
     ActiveRecordFixtures::Order.teardown
     begin
       super
-    rescue Exception => e
+    rescue => e
     end
   end
   class Order < ActiveRecord::Base
@@ -30,7 +30,7 @@ module ActiveRecordFixtures
 
     def self.check_for_table
       connection.table_exists?(self.table_name)
-    rescue Exception => e
+    rescue => e
       false
     end
     
@@ -66,7 +66,7 @@ module ActiveRecordFixtures
     end
     def self.check_for_table
       connection.table_exists?(self.table_name) && connection.table_exists?('orders_shipments')
-    rescue Exception => e
+    rescue => e
       false
     end