newrelic_rpm 3.7.2.195 → 3.7.3.199

data/test/new_relic/agent/pipe_service_test.rb

@@ -4,7 +4,7 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'test_helper'))
 
-class PipeServiceTest < MiniTest::Unit::TestCase
+class PipeServiceTest < Minitest::Test
   def setup
     NewRelic::Agent::PipeChannelManager.listener.stop
     NewRelic::Agent::PipeChannelManager.register_report_channel(:pipe_service_test)
@@ -45,7 +45,7 @@ class PipeServiceTest < MiniTest::Unit::TestCase
         @service.metric_data(metric_data0)
       end
 
-      assert_equal 'Custom/something', received_data[:stats].keys.sort[0].name
+      assert_equal 'Custom/something', received_data[:metric_data].keys.sort[0].name
     end
 
     def test_transaction_sample_data
@@ -53,21 +53,36 @@ class PipeServiceTest < MiniTest::Unit::TestCase
         @service.transaction_sample_data(['txn'])
       end
 
-      assert_equal ['txn'], received_data[:transaction_traces]
+      assert_equal ['txn'], received_data[:transaction_sample_data]
     end
 
     def test_error_data
       received_data = data_from_forked_process do
         @service.error_data(['err'])
       end
-      assert_equal ['err'], received_data[:error_traces]
+      assert_equal ['err'], received_data[:error_data]
     end
 
     def test_sql_trace_data
       received_data = data_from_forked_process do
         @service.sql_trace_data(['sql'])
       end
-      assert_equal ['sql'], received_data[:sql_traces]
+      assert_equal ['sql'], received_data[:sql_trace_data]
+    end
+
+    def test_analytic_event_data
+      received_data = data_from_forked_process do
+        @service.analytic_event_data(['events'])
+      end
+      assert_equal ['events'], received_data[:analytic_event_data]
+    end
+
+    def test_transaction_sample_data_with_newlines
+      payload_with_newline = "foo\n\nbar"
+      received_data = data_from_forked_process do
+        @service.transaction_sample_data([payload_with_newline])
+      end
+      assert_equal [payload_with_newline], received_data[:transaction_sample_data]
     end
 
     def test_multiple_writes_to_pipe
@@ -83,9 +98,9 @@ class PipeServiceTest < MiniTest::Unit::TestCase
 
       received_data = read_from_pipe
 
-      assert_equal 'Custom/something', received_data[:stats].keys.sort[0].name
-      assert_equal ['txn0'], received_data[:transaction_traces]
-      assert_equal ['err0'], received_data[:error_traces].sort
+      assert_equal 'Custom/something', received_data[:metric_data].keys.sort[0].name
+      assert_equal ['txn0'], received_data[:transaction_sample_data]
+      assert_equal ['err0'], received_data[:error_data].sort
     end
 
     def test_shutdown_closes_pipe
@@ -105,14 +120,10 @@ class PipeServiceTest < MiniTest::Unit::TestCase
 
   def read_from_pipe
     pipe = NewRelic::Agent::PipeChannelManager.channels[:pipe_service_test]
-    pipe.in.close
     data = {}
-    while payload = pipe.out.gets("\n\n")
-      got = Marshal.load(payload)
-      if got == 'EOF'
-        got = {:EOF => 'EOF'}
-      end
-      data.merge!(got)
+    while payload = pipe.read
+      endpoint, data_for_endpoint = Marshal.load(payload)
+      data.merge!(endpoint => data_for_endpoint)
     end
     data
   end

data/test/new_relic/agent/request_sampler_test.rb

@@ -7,7 +7,7 @@ require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper
 require File.expand_path(File.join(File.dirname(__FILE__),'..','data_container_tests'))
 require 'new_relic/agent/request_sampler'
 
-class NewRelic::Agent::RequestSamplerTest < MiniTest::Unit::TestCase
+class NewRelic::Agent::RequestSamplerTest < Minitest::Test
 
   def setup
     freeze_time
@@ -50,7 +50,6 @@ class NewRelic::Agent::RequestSamplerTest < MiniTest::Unit::TestCase
     end
   end
 
-
   def test_includes_custom_parameters_in_event
     with_sampler_config do
       generate_request('whatever', :custom_params => {'bing' => 2})
@@ -69,26 +68,83 @@ class NewRelic::Agent::RequestSamplerTest < MiniTest::Unit::TestCase
 
   def test_custom_parameters_in_event_cant_override_reserved_attributes
     with_sampler_config do
+      metrics = NewRelic::Agent::StatsHash.new()
+      metrics.record(NewRelic::MetricSpec.new('HttpDispatcher'), 0.01)
+
       generate_request('whatever',
-        :overview_metrics => {'webDuration' => 0.01},
-        :custom_params => {'type' => 'giraffe', 'duration' => 'hippo', 'webDuration' => 'zebra'}
+        :metrics => metrics,
+        :custom_params => {'type' => 'giraffe', 'duration' => 'hippo'}
       )
       txn_event = single_sample[EVENT_DATA_INDEX]
       assert_equal 'Transaction', txn_event['type']
       assert_equal 0.1, txn_event['duration']
-      assert_equal 0.01, txn_event['webDuration']
 
       custom_attrs = single_sample[CUSTOM_ATTRIBUTES_INDEX]
       assert_equal 'giraffe', custom_attrs['type']
       assert_equal 'hippo', custom_attrs['duration']
-      assert_equal 'zebra', custom_attrs['webDuration']
     end
   end
 
-  def test_samples_on_transaction_finished_event_includes_overview_metrics
+  def test_samples_on_transaction_finished_event_includes_expected_web_metrics
+    stats_hash = NewRelic::Agent::StatsHash.new
+    stats_hash.record(NewRelic::MetricSpec.new('WebFrontend/QueueTime'), 13)
+    stats_hash.record(NewRelic::MetricSpec.new('External/allWeb'), 14)
+    stats_hash.record(NewRelic::MetricSpec.new('Datastore/all'), 15)
+    stats_hash.record(NewRelic::MetricSpec.new("GC/cumulative"), 16)
+    stats_hash.record(NewRelic::MetricSpec.new('Memcache/allWeb'), 17)
+
+    with_sampler_config do
+      generate_request('name', :metrics => stats_hash)
+      event_data = single_sample[EVENT_DATA_INDEX]
+      assert_equal 13, event_data["queueDuration"]
+      assert_equal 14, event_data["externalDuration"]
+      assert_equal 15, event_data["databaseDuration"]
+      assert_equal 16, event_data["gcCumulative"]
+      assert_equal 17, event_data["memcacheDuration"]
+
+      assert_equal 1, event_data["externalCallCount"]
+      assert_equal 1, event_data["databaseCallCount"]
+    end
+  end
+
+  def test_samples_on_transaction_finished_includes_expected_background_metrics
+    stats_hash = NewRelic::Agent::StatsHash.new
+    stats_hash.record(NewRelic::MetricSpec.new('External/allOther'), 12)
+    stats_hash.record(NewRelic::MetricSpec.new('Datastore/all'), 13)
+    stats_hash.record(NewRelic::MetricSpec.new('Memcache/allOther'), 14)
+
+    with_sampler_config do
+      generate_request('name', :metrics => stats_hash)
+
+      event_data = single_sample[EVENT_DATA_INDEX]
+      assert_equal 12, event_data["externalDuration"]
+      assert_equal 13, event_data["databaseDuration"]
+      assert_equal 14, event_data["memcacheDuration"]
+
+      assert_equal 1, event_data["databaseCallCount"]
+      assert_equal 1, event_data["externalCallCount"]
+    end
+  end
+
+  def test_samples_on_transaction_finished_event_includes_guid
+    with_sampler_config do
+      generate_request('name', :guid => "GUID")
+      assert_equal "GUID", single_sample[EVENT_DATA_INDEX]["nr.guid"]
+    end
+  end
+
+  def test_samples_on_transaction_finished_event_includes_referring_transaction_guid
     with_sampler_config do
-      generate_request('name', :overview_metrics => {:foo => :bar})
-      assert_equal :bar, single_sample[EVENT_DATA_INDEX][:foo]
+      generate_request('name', :referring_transaction_guid=> "REFER")
+      assert_equal "REFER", single_sample[EVENT_DATA_INDEX]["nr.referringTransactionGuid"]
+    end
+  end
+
+  def test_records_background_tasks
+    with_sampler_config do
+      generate_request('a', :type => :controller)
+      generate_request('b', :type => :background)
+      assert_equal 2, @sampler.samples.size
     end
   end
 
@@ -155,14 +211,6 @@ class NewRelic::Agent::RequestSamplerTest < MiniTest::Unit::TestCase
     end
   end
 
-  def test_does_not_record_requests_from_background_tasks
-    with_sampler_config do
-      generate_request('a', :type => :controller)
-      generate_request('b', :type => :background)
-      assert_equal 1, @sampler.samples.size
-    end
-  end
-
   def test_does_not_drop_samples_when_used_from_multiple_threads
     with_sampler_config( :'analytics_events.max_samples_stored' => 100 * 100 ) do
       threads = []
@@ -187,7 +235,6 @@ class NewRelic::Agent::RequestSamplerTest < MiniTest::Unit::TestCase
       :type => :controller,
       :start_timestamp => Time.now.to_f,
       :duration => 0.1,
-      :overview_metrics => {},
       :custom_params => {}
     }.merge(options)
     @event_listener.notify(:transaction_finished, payload)

data/test/new_relic/agent/rpm_agent_test.rb

@@ -4,7 +4,7 @@
 
 require File.expand_path('../../../test_helper', __FILE__)
 
-class NewRelic::Agent::RpmAgentTest < MiniTest::Unit::TestCase
+class NewRelic::Agent::RpmAgentTest < Minitest::Test
   def setup
     NewRelic::Agent.manual_start
     @agent = NewRelic::Agent.instance

data/test/new_relic/agent/rules_engine_test.rb

@@ -4,7 +4,7 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper'))
 
-class RulesEngineTest < MiniTest::Unit::TestCase
+class RulesEngineTest < Minitest::Test
   def setup
     @engine = NewRelic::Agent::RulesEngine.new
   end

data/test/new_relic/agent/sampled_buffer_test.rb

@@ -4,7 +4,7 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper'))
 
-class NewRelic::Agent::SampledBufferTest < MiniTest::Unit::TestCase
+class NewRelic::Agent::SampledBufferTest < Minitest::Test
   def test_should_keep_all_samples_up_to_capacity
     buffer = NewRelic::Agent::SampledBuffer.new(100)
     all = []

data/test/new_relic/agent/sampler_collection_test.rb

@@ -4,7 +4,7 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper'))
 
-class SamplerCollectionTest < MiniTest::Unit::TestCase
+class SamplerCollectionTest < Minitest::Test
 
   class DummySampler
     attr_reader :id
@@ -49,6 +49,13 @@ class SamplerCollectionTest < MiniTest::Unit::TestCase
     assert_equal(0, @collection.to_a.size)
   end
 
+  def test_add_sampler_calls_setup_events_with_event_listener_if_present
+    sampler = DummySampler.new
+    DummySampler.stubs(:new).returns(sampler)
+    sampler.expects(:setup_events).with(@events)
+    @collection.add_sampler(DummySampler)
+  end
+
   def test_poll_samplers_polls_samplers
     @collection.add_sampler(DummySampler)
     @collection.add_sampler(DummySampler2)

data/test/new_relic/agent/sampler_test.rb

@@ -3,7 +3,7 @@
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
 require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'test_helper'))
-class NewRelic::Agent::SamplerTest < MiniTest::Unit::TestCase
+class NewRelic::Agent::SamplerTest < Minitest::Test
   require 'new_relic/agent/sampler'
 
   def test_inherited_should_append_subclasses_to_sampler_classes

data/test/new_relic/agent/shim_agent_test.rb

@@ -5,15 +5,15 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper'))
 module NewRelic
   module Agent
-    class ShimAgentTest < MiniTest::Unit::TestCase
+    class ShimAgentTest < Minitest::Test
 
       def setup
         super
         @agent = NewRelic::Agent::ShimAgent.new
       end
 
-      def test_merge_data_from
-        assert_equal(nil, @agent.merge_data_from(mock('metric data')))
+      def test_merge_data_for_endpoint
+        assert_equal(nil, @agent.merge_data_for_endpoint(:diggle, mock('metric data')))
       end
     end
   end

data/test/new_relic/agent/sql_sampler_test.rb

@@ -5,7 +5,7 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper'))
 require File.expand_path(File.join(File.dirname(__FILE__),'..','data_container_tests'))
 
-class NewRelic::Agent::SqlSamplerTest < MiniTest::Unit::TestCase
+class NewRelic::Agent::SqlSamplerTest < Minitest::Test
   def setup
     agent = NewRelic::Agent.instance
     stats_engine = NewRelic::Agent::StatsEngine.new
@@ -139,23 +139,24 @@ class NewRelic::Agent::SqlSamplerTest < MiniTest::Unit::TestCase
 
   def test_harvest_should_collect_explain_plans
     @connection.expects(:execute).with("EXPLAIN select * from test") \
-     .returns([{"header0" => 'foo0', "header1" => 'foo1', "header2" => 'foo2'}])
+     .returns(dummy_mysql_explain_result({"header0" => 'foo0', "header1" => 'foo1', "header2" => 'foo2'}))
     @connection.expects(:execute).with("EXPLAIN select * from test2") \
-     .returns([{"header0" => 'bar0', "header1" => 'bar1', "header2" => 'bar2'}])
+     .returns(dummy_mysql_explain_result({"header0" => 'bar0', "header1" => 'bar1', "header2" => 'bar2'}))
 
     data = NewRelic::Agent::TransactionSqlData.new
     data.set_transaction_info("/c/a", {}, 'guid')
     data.set_transaction_name("WebTransaction/Controller/c/a")
     explainer = NewRelic::Agent::Instrumentation::ActiveRecord::EXPLAINER
+    config = { :adapter => 'mysql' }
     queries = [
                NewRelic::Agent::SlowSql.new("select * from test",
-                                            "Database/test/select", {},
+                                            "Database/test/select", config,
                                             1.5, nil, &explainer),
                NewRelic::Agent::SlowSql.new("select * from test",
-                                            "Database/test/select", {},
+                                            "Database/test/select", config,
                                             1.2, nil, &explainer),
                NewRelic::Agent::SlowSql.new("select * from test2",
-                                            "Database/test2/select", {},
+                                            "Database/test2/select", config,
                                             1.1, nil, &explainer)
               ]
     data.sql_data.concat(queries)

data/test/new_relic/agent/stats_engine/gc_profiler_test.rb

@@ -4,7 +4,7 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','..','test_helper'))
 
-class NewRelic::Agent::StatsEngine::GCProfilerTest < MiniTest::Unit::TestCase
+class NewRelic::Agent::StatsEngine::GCProfilerTest < Minitest::Test
   def test_init_profiler_for_rails_bench
     return unless defined?(::GC) && ::GC.respond_to?(:collections)
 

data/test/new_relic/agent/stats_engine/metric_stats_test.rb

@@ -4,7 +4,7 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','..','test_helper'))
 
-class NewRelic::Agent::MetricStatsTest < MiniTest::Unit::TestCase
+class NewRelic::Agent::MetricStatsTest < Minitest::Test
   def setup
     NewRelic::Agent.manual_start
     @engine = NewRelic::Agent.instance.stats_engine

data/test/new_relic/agent/stats_engine/samplers_test.rb

@@ -5,7 +5,7 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'..', '..','..','test_helper'))
 require 'new_relic/agent/samplers/cpu_sampler'
 
-class NewRelic::Agent::StatsEngine::SamplersTest < MiniTest::Unit::TestCase
+class NewRelic::Agent::StatsEngine::SamplersTest < Minitest::Test
 
   class OurSamplers
     include NewRelic::Agent::StatsEngine::Samplers

data/test/new_relic/agent/stats_engine_test.rb

@@ -5,7 +5,7 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..', 'test_helper'))
 require File.expand_path(File.join(File.dirname(__FILE__),'..','data_container_tests'))
 
-class NewRelic::Agent::StatsEngineTest < MiniTest::Unit::TestCase
+class NewRelic::Agent::StatsEngineTest < Minitest::Test
   def setup
     NewRelic::Agent.manual_start
     @engine = NewRelic::Agent::StatsEngine.new

data/test/new_relic/agent/stats_hash_test.rb

@@ -4,7 +4,7 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__),'..', '..','test_helper'))
 
-class NewRelic::Agent::StatsHashTest < MiniTest::Unit::TestCase
+class NewRelic::Agent::StatsHashTest < Minitest::Test
   def setup
     @hash = NewRelic::Agent::StatsHash.new
     NewRelic::Agent.instance.error_collector.errors.clear

data/test/new_relic/agent/stats_test.rb

@@ -4,7 +4,7 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__),'..', '..', 'test_helper'))
 
-class NewRelic::Agent::StatsTest < MiniTest::Unit::TestCase
+class NewRelic::Agent::StatsTest < Minitest::Test
   def mock_plusequals(first, second, method, first_value, second_value)
     first.expects(method).returns(first_value)
     second.expects(method).returns(second_value)

data/test/new_relic/agent/threading/agent_thread_test.rb

@@ -6,7 +6,7 @@ require File.expand_path(File.join(File.dirname(__FILE__),'..','..','..','test_h
 require 'new_relic/agent/threading/agent_thread'
 
 module NewRelic::Agent::Threading
-  class AgentThreadTest < MiniTest::Unit::TestCase
+  class AgentThreadTest < Minitest::Test
 
     def test_sets_label
       t = AgentThread.new("labelled") {}

data/test/new_relic/agent/threading/backtrace_node_test.rb

@@ -6,7 +6,7 @@ require File.expand_path(File.join(File.dirname(__FILE__),'..','..','..','test_h
 require 'new_relic/agent/threading/backtrace_node'
 
 module NewRelic::Agent::Threading
-  class BacktraceNodeTest < MiniTest::Unit::TestCase
+  class BacktraceNodeTest < Minitest::Test
     SINGLE_LINE = "irb.rb:69:in `catch'"
 
     def setup

data/test/new_relic/agent/threading/backtrace_service_test.rb

@@ -10,7 +10,7 @@ require 'new_relic/agent/threading/threaded_test_case'
 if NewRelic::Agent::Threading::BacktraceService.is_supported?
 
   module NewRelic::Agent::Threading
-    class BacktraceServiceTest < MiniTest::Unit::TestCase
+    class BacktraceServiceTest < Minitest::Test
       include ThreadedTestCase
 
       def setup
@@ -504,7 +504,7 @@ if NewRelic::Agent::Threading::BacktraceService.is_supported?
 
     # These tests do not use ThreadedTestCase as FakeThread is synchronous and
     # prevents the detection of concurrency issues.
-    class BacktraceServiceConcurrencyTest < MiniTest::Unit::TestCase
+    class BacktraceServiceConcurrencyTest < Minitest::Test
       def setup
         NewRelic::Agent.instance.stats_engine.clear_stats
         @service = BacktraceService.new
@@ -535,7 +535,7 @@ if NewRelic::Agent::Threading::BacktraceService.is_supported?
   end
 else
   module NewRelic::Agent::Threading
-    class BacktraceServiceUnsupportedTest < MiniTest::Unit::TestCase
+    class BacktraceServiceUnsupportedTest < Minitest::Test
       def test_is_not_supported?
         assert_false BacktraceService.is_supported?
       end

data/test/new_relic/agent/threading/thread_profile_test.rb

@@ -11,7 +11,7 @@ require 'new_relic/agent/threading/threaded_test_case'
 if NewRelic::Agent::Threading::BacktraceService.is_supported?
 
   module NewRelic::Agent::Threading
-    class ThreadProfileTest < MiniTest::Unit::TestCase
+    class ThreadProfileTest < Minitest::Test
       include ThreadedTestCase
 
       def setup