newrelic_rpm 4.0.0.332 → 4.8.0.341

data/test/agent_helper.rb

@@ -47,6 +47,22 @@ def last_traced_error
   harvest_error_traces!.last
 end
 
+def harvest_transaction_events!
+  NewRelic::Agent.instance.transaction_event_aggregator.harvest!
+end
+
+def last_transaction_event
+  harvest_transaction_events!.last.last
+end
+
+def harvest_error_events!
+  NewRelic::Agent.instance.error_collector.error_event_aggregator.harvest!
+end
+
+def last_error_event
+  harvest_error_events!.last.last
+end
+
 unless defined?( assert_block )
   def assert_block(*msgs)
     assert yield, *msgs
@@ -219,6 +235,23 @@ def assert_metrics_recorded_exclusive(expected, options={})
   assert_equal(0, unexpected_metrics.size, "Found unexpected metrics: #{format_metric_spec_list(unexpected_metrics)}")
 end
 
+# The clear_metrics! method prevents metrics from "leaking" between tests by resetting
+# the @stats_hash instance variable in the current instance of NewRelic::Agent::StatsEngine.
+
+module NewRelic
+  module Agent
+    class StatsEngine
+      def reset_for_test!
+        @stats_hash = StatsHash.new
+      end
+    end
+  end
+end
+
+def clear_metrics!
+  NewRelic::Agent.instance.stats_engine.reset_for_test!
+end
+
 def assert_metrics_not_recorded(not_expected)
   not_expected = _normalize_metric_expectations(not_expected)
   found_but_not_expected = []
@@ -337,7 +370,8 @@ def refute_contains_request_params(attributes)
 end
 
 def last_transaction_trace
-  NewRelic::Agent.agent.transaction_sampler.last_sample
+  return unless last_sample = NewRelic::Agent.agent.transaction_sampler.last_sample
+  NewRelic::Agent::Transaction::TraceBuilder.build_trace(last_sample)
 end
 
 def last_transaction_trace_request_params
@@ -362,8 +396,7 @@ def find_last_transaction_node(transaction_sample=nil)
   if transaction_sample
     root_node = transaction_sample.root_node
   else
-    builder = NewRelic::Agent.agent.transaction_sampler.tl_builder
-    root_node = builder.current_node
+    root_node = last_transaction_trace.root_node
   end
 
   last_node = nil
@@ -451,16 +484,16 @@ unless Time.respond_to?(:__original_now)
   end
 end
 
-def freeze_time(now=Time.now)
+def nr_freeze_time(now=Time.now)
   Time.__frozen_now = now
 end
 
-def unfreeze_time
+def nr_unfreeze_time
   Time.__frozen_now = nil
 end
 
 def advance_time(seconds)
-  freeze_time(Time.now + seconds)
+  Time.__frozen_now = Time.now + seconds
 end
 
 def with_constant_defined(constant_symbol, implementation=Module.new)