newrelic_rpm 3.5.8.72 → 3.6.0.74.beta

data/test/new_relic/agent/instrumentation/sinatra_test.rb

@@ -1,3 +1,7 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
 require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'test_helper'))
 require 'new_relic/agent/instrumentation/sinatra'
 

data/test/new_relic/agent/instrumentation/task_instrumentation_test.rb

@@ -1,3 +1,7 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
 require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'test_helper'))
 require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'test_contexts'))
 

data/test/new_relic/agent/memcache_instrumentation_test.rb

@@ -1,3 +1,7 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper'))
 
 memcached_ready = false

data/test/new_relic/agent/method_tracer/class_methods/add_method_tracer_test.rb

@@ -1,3 +1,7 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','..','..','test_helper'))
 
 require 'set'

data/test/new_relic/agent/method_tracer/instance_methods/trace_execution_scoped_test.rb

@@ -1,3 +1,7 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# 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::MethodTracer::InstanceMethods::TraceExecutionScopedTest < Test::Unit::TestCase
   require 'new_relic/agent/method_tracer'
@@ -47,29 +51,36 @@ class NewRelic::Agent::MethodTracer::InstanceMethods::TraceExecutionScopedTest <
     assert_equal NewRelic::Agent.instance, agent_instance
   end
 
-  def test_main_stat
-    self.expects(:get_stats_scoped).with('hello', true)
-    opts = {:scoped_metric_only => true}
-    main_stat('hello', opts)
-  end
-
-  def test_get_metric_stats_metric
-    metrics = ['foo', 'bar', 'baz']
+  def test_get_metric_specs_with_metric_option
+    first_name = 'foo'
+    other_names = ['bar', 'baz']
     opts = {:metric => true}
-    self.expects(:get_stats_unscoped).twice
-    self.expects(:main_stat).with('foo', opts)
-    first_name, stats = get_metric_stats(metrics, opts)
-    assert_equal 'foo', first_name
-    assert_equal 3, stats.length
+
+    specs = get_metric_specs(first_name, other_names, 'scope', opts)
+
+    expected_specs = [
+      NewRelic::MetricSpec.new('foo', 'scope'),
+      NewRelic::MetricSpec.new('foo'),
+      NewRelic::MetricSpec.new('bar'),
+      NewRelic::MetricSpec.new('baz')
+    ]
+
+    assert_equal(expected_specs.sort, specs.sort)
   end
 
-  def test_get_metric_stats_no_metric
-    metrics = ['foo', 'bar', 'baz']
+  def test_get_metric_stats_without_metric_option
+    first_name = 'foo'
+    other_names = ['bar', 'baz']
     opts = {:metric => false}
-    self.expects(:get_stats_unscoped).twice
-    first_name, stats = get_metric_stats(metrics, opts)
-    assert_equal 'foo', first_name
-    assert_equal 2, stats.length
+
+    specs = get_metric_specs(first_name, other_names, 'scope', opts)
+
+    expected_specs = [
+      NewRelic::MetricSpec.new('bar'),
+      NewRelic::MetricSpec.new('baz')
+    ]
+
+    assert_equal(expected_specs.sort, specs.sort)
   end
 
   def test_set_if_nil
@@ -145,17 +156,20 @@ class NewRelic::Agent::MethodTracer::InstanceMethods::TraceExecutionScopedTest <
     t0 = 1.0
     t1 = 2.0
     metric = 'foo'
-    metric_stats = [mock('fakestat')]
-    metric_stats.first.expects(:trace_call).with(1.0, 0.5)
+    metric_specs = [NewRelic::MetricSpec.new('foo'), NewRelic::MetricSpec.new('bar')]
+    stats = [NewRelic::Agent::Stats.new, NewRelic::Agent::Stats.new]
     expected_scope = 'an expected scope'
     engine = mocked_object('stat_engine')
     scope = mock('scope')
     engine.expects(:pop_scope).with('an expected scope', 1.0, 2.0).returns(scope)
+    engine.expects(:record_metrics).with(metric_specs).multiple_yields(*stats)
+    stats[0].expects(:record_data_point).with(1.0, 0.5)
+    stats[1].expects(:record_data_point).with(1.0, 0.5)
     scope.expects(:children_time).returns(0.5)
     self.expects(:pop_flag!).with(false)
     self.expects(:log_errors).with('trace_method_execution footer', 'foo').yields
 
-    trace_execution_scoped_footer(t0, metric, metric_stats, expected_scope, false, t1)
+    trace_execution_scoped_footer(t0, metric, metric_specs, expected_scope, false, t1)
   end
 
   def test_trace_execution_scoped_disabled
@@ -175,10 +189,14 @@ class NewRelic::Agent::MethodTracer::InstanceMethods::TraceExecutionScopedTest <
   def test_trace_execution_scoped_default
     passed_in_opts = {}
     opts_after_correction = {:metric => true, :deduct_call_time_from_parent => true}
+    specs = [
+      NewRelic::MetricSpec.new('metric'),
+      NewRelic::MetricSpec.new('array')
+    ]
     self.expects(:trace_disabled?).returns(false)
-    self.expects(:get_metric_stats).with(['metric', 'array'], opts_after_correction).returns(['metric', ['stats']])
+    self.expects(:get_metric_specs).with('metric', ['array'], nil, opts_after_correction).returns(specs)
     self.expects(:trace_execution_scoped_header).with('metric', opts_after_correction).returns(['start_time', 'expected_scope'])
-    self.expects(:trace_execution_scoped_footer).with('start_time', 'metric', ['stats'], 'expected_scope', nil)
+    self.expects(:trace_execution_scoped_footer).with('start_time', 'metric', specs, 'expected_scope', nil)
     ran = false
     value = trace_execution_scoped(['metric', 'array'], passed_in_opts) do
       ran = true
@@ -192,10 +210,14 @@ class NewRelic::Agent::MethodTracer::InstanceMethods::TraceExecutionScopedTest <
   def test_trace_execution_scoped_with_error
     passed_in_opts = {}
     opts_after_correction = {:metric => true, :deduct_call_time_from_parent => true}
+    specs = [
+      NewRelic::MetricSpec.new('metric'),
+      NewRelic::MetricSpec.new('array')
+    ]
     self.expects(:trace_disabled?).returns(false)
-    self.expects(:get_metric_stats).with(['metric', 'array'], opts_after_correction).returns(['metric', ['stats']])
+    self.expects(:get_metric_specs).with('metric', ['array'], nil, opts_after_correction).returns(specs)
     self.expects(:trace_execution_scoped_header).with('metric', opts_after_correction).returns(['start_time', 'expected_scope'])
-    self.expects(:trace_execution_scoped_footer).with('start_time', 'metric', ['stats'], 'expected_scope', nil)
+    self.expects(:trace_execution_scoped_footer).with('start_time', 'metric', specs, 'expected_scope', nil)
     ran = false
     assert_raises(RuntimeError) do
       trace_execution_scoped(['metric', 'array'], passed_in_opts) do

data/test/new_relic/agent/method_tracer_test.rb

@@ -1,3 +1,7 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper'))
 require 'new_relic/agent/mock_scope_listener'
 

data/test/new_relic/agent/mock_scope_listener.rb

@@ -1,3 +1,7 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
 
 class NewRelic::Agent::MockScopeListener
 

data/test/new_relic/agent/new_relic_service_test.rb

@@ -1,3 +1,7 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
 require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'test_helper'))
 require 'new_relic/agent/thread_profiler'
 

data/test/new_relic/agent/pipe_channel_manager_test.rb

@@ -1,3 +1,7 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
 require 'timeout'
 require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'test_helper'))
 require 'new_relic/agent/pipe_channel_manager'
@@ -97,17 +101,31 @@ class NewRelic::Agent::PipeChannelManagerTest < Test::Unit::TestCase
       assert_equal(2, NewRelic::Agent.agent.error_collector.errors.size)
     end
 
-    def test_close_pipe_on_EOF_string
-      listener = start_listener_with_pipe(669)
+    def assert_pipe_finished(id)
+      assert(!NewRelic::Agent::PipeChannelManager.channels[id] ||
+        NewRelic::Agent::PipeChannelManager.channels[id].closed?,
+        "Expected pipe with ID #{id} to be nil or closed")
+    end
 
+    def test_close_pipe_on_child_explicit_close
+      listener = start_listener_with_pipe(669)
       pid = Process.fork do
-        listener.pipes[669].write('EOF')
+        NewRelic::Agent::PipeService.new(669)
       end
       Process.wait(pid)
-      listener.stop
+      listener.stop_listener_thread
+      assert_pipe_finished(669)
+    end
 
-      assert(!NewRelic::Agent::PipeChannelManager.channels[669] ||
-             NewRelic::Agent::PipeChannelManager.channels[669].closed?)
+    def test_close_pipe_on_child_exit
+      listener = start_listener_with_pipe(669)
+      pid = Process.fork do
+        NewRelic::Agent::PipeService.new(669)
+        exit!
+      end
+      Process.wait(pid)
+      listener.stop_listener_thread
+      assert_pipe_finished(669)
     end
 
     def test_manager_does_not_crash_when_given_bad_data

data/test/new_relic/agent/pipe_service_test.rb

@@ -1,3 +1,7 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
 require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'test_helper'))
 
 class PipeServiceTest < Test::Unit::TestCase
@@ -26,10 +30,9 @@ class PipeServiceTest < Test::Unit::TestCase
   end
 
   def test_write_to_missing_pipe_logs_error
-    service = NewRelic::Agent::PipeService.new(:non_existant)
     ::NewRelic::Agent.logger.expects(:error) \
-      .with(regexp_matches(/Unable to send data to parent process/)).once
-
+      .with(regexp_matches(/No communication channel to parent process/)).once
+    service = NewRelic::Agent::PipeService.new(:non_existant)
     assert_nothing_raised do
       service.metric_data(Time.now, Time.now, {})
     end
@@ -87,13 +90,6 @@ class PipeServiceTest < Test::Unit::TestCase
       assert_equal ['err0'], received_data[:error_traces].sort
     end
 
-    def test_shutdown_sends_EOF
-      received_data = data_from_forked_process do
-        @service.shutdown(Time.now)
-      end
-      assert_equal 'EOF', received_data[:EOF]
-    end
-
     def test_shutdown_closes_pipe
       data_from_forked_process do
         @service.shutdown(Time.now)

data/test/new_relic/agent/rpm_agent_test.rb

@@ -1,3 +1,7 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
 ENV['SKIP_RAILS'] = 'true'
 require File.expand_path('../../../test_helper', __FILE__)
 require File.expand_path('../../../test_contexts', __FILE__)

data/test/new_relic/agent/rules_engine_test.rb

@@ -1,3 +1,7 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper'))
 
 class RulesEngineTest < Test::Unit::TestCase

data/test/new_relic/agent/sampler_test.rb

@@ -1,3 +1,7 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# 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 < Test::Unit::TestCase
   require 'new_relic/agent/sampler'

data/test/new_relic/agent/shim_agent_test.rb

@@ -1,3 +1,7 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper'))
 module NewRelic
   module Agent

data/test/new_relic/agent/sql_sampler_test.rb

@@ -1,3 +1,7 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# 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::SqlSamplerTest < Test::Unit::TestCase

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

@@ -1,3 +1,7 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# 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::StatsEngine::GCProfilerTest < Test::Unit::TestCase

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

@@ -1,3 +1,7 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# 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::MetricStatsTest < Test::Unit::TestCase
@@ -112,36 +116,36 @@ class NewRelic::Agent::MetricStatsTest < Test::Unit::TestCase
     assert_equal(1, bar_stats.call_count)
   end
 
-  def test_record_metric_unscoped_metrics_only_by_default
-    @engine.stubs(:default_scope).returns('scopey')
-    @engine.record_metric('foo', 42)
+  def test_record_metrics_unscoped_metrics_only_by_default
+    @engine.stubs(:scope_name).returns('scopey')
+    @engine.record_metrics('foo', 42)
     unscoped_stats = @engine.get_stats('foo', false)
     scoped_stats = @engine.get_stats('foo', true, true, 'scopey')
     assert_equal(1, unscoped_stats.call_count)
     assert_equal(0, scoped_stats.call_count)
   end
 
-  def test_record_metric_records_to_scoped_metric_if_requested
-    @engine.stubs(:default_scope).returns('scopey')
-    @engine.record_metric('foo', 42, :scoped => true)
+  def test_record_metrics_records_to_scoped_metric_if_requested
+    @engine.stubs(:scope_name).returns('scopey')
+    @engine.record_metrics('foo', 42, :scoped => true)
     unscoped_stats = @engine.get_stats('foo', false)
     scoped_stats = @engine.get_stats('foo', true, true, 'scopey')
     assert_equal(1, unscoped_stats.call_count)
     assert_equal(1, scoped_stats.call_count)
   end
 
-  def test_record_metric_elides_scoped_metric_if_not_in_transaction
+  def test_record_metrics_elides_scoped_metric_if_not_in_transaction
     @engine.clear_stats
-    @engine.stubs(:default_scope).returns(nil)
-    @engine.record_metric('foo', 42, :scoped => true)
+    @engine.stubs(:scope_name).returns(nil)
+    @engine.record_metrics('foo', 42, :scoped => true)
     unscoped_stats = @engine.get_stats('foo', false)
     assert_equal(1, unscoped_stats.call_count)
     assert_equal(1, @engine.metrics.size)
   end
 
-  def test_record_metric_accepts_explicit_scope
-    @engine.stubs(:default_scope).returns('scopey')
-    @engine.record_metric('foo', 42, :scoped => true, :scope => 'not scopey')
+  def test_record_metrics_accepts_explicit_scope
+    @engine.stubs(:scope_name).returns('scopey')
+    @engine.record_metrics('foo', 42, :scoped => true, :scope => 'not scopey')
     unscoped_stats = @engine.get_stats('foo', false)
     scoped_stats_scopey = @engine.get_stats('foo', true, true, 'scopey')
     scoped_stats_not_scopey = @engine.get_stats('foo', true, true, 'not scopey')
@@ -150,23 +154,23 @@ class NewRelic::Agent::MetricStatsTest < Test::Unit::TestCase
     assert_equal(1, scoped_stats_not_scopey.call_count)
   end
 
-  def test_record_metric_accepts_block
-    @engine.record_metric('foo') do |stats|
+  def test_record_metrics_accepts_block
+    @engine.record_metrics('foo') do |stats|
       stats.call_count = 999
     end
     stats = @engine.get_stats_no_scope('foo')
     assert_equal(999, stats.call_count)
   end
 
-  def test_record_metric_is_thread_safe
+  def test_record_metrics_is_thread_safe
     threads = []
     nthreads = 25
     iterations = 100
     nthreads.times do |tid|
       threads << Thread.new do
         iterations.times do
-          @engine.record_metric('m1', 1)
-          @engine.record_metric('m2', 1)
+          @engine.record_metrics('m1', 1)
+          @engine.record_metrics('m2', 1)
         end
       end
     end

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

@@ -1,3 +1,7 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
 require File.expand_path(File.join(File.dirname(__FILE__),'..', '..','..','test_helper'))
 require 'new_relic/agent/samplers/cpu_sampler'
 
@@ -42,10 +46,13 @@ class NewRelic::Agent::StatsEngine::SamplersTest < Test::Unit::TestCase
     s.poll
     s.instance_eval { @last_time = Time.now - 1.1 }
     s.poll
-    assert_equal 2, s.systemtime_stats.call_count
-    assert_equal 2, s.usertime_stats.call_count
-    assert s.usertime_stats.total_call_time >= 0, "user cpu greater/equal to 0: #{s.usertime_stats.total_call_time}"
-    assert s.systemtime_stats.total_call_time >= 0, "system cpu greater/equal to 0: #{s.systemtime_stats.total_call_time}"
+
+    systemtime_stats = s.stats_engine.get_stats_no_scope("CPU/System Time")
+    usertime_stats = s.stats_engine.get_stats_no_scope("CPU/User Time")
+    assert_equal 2, systemtime_stats.call_count
+    assert_equal 2, usertime_stats.call_count
+    assert usertime_stats.total_call_time >= 0, "user cpu greater/equal to 0: #{usertime_stats.total_call_time}"
+    assert systemtime_stats.total_call_time >= 0, "system cpu greater/equal to 0: #{systemtime_stats.total_call_time}"
   end
   def test_memory__default
     s = NewRelic::Agent::Samplers::MemorySampler.new
@@ -53,8 +60,9 @@ class NewRelic::Agent::StatsEngine::SamplersTest < Test::Unit::TestCase
     s.poll
     s.poll
     s.poll
-    assert_equal 3, s.stats.call_count
-    assert s.stats.total_call_time > 0.5, "cpu greater than 0.5 ms: #{s.stats.total_call_time}"
+    stats = @stats_engine.get_stats_no_scope("Memory/Physical")
+    assert_equal(3, stats.call_count)
+    assert stats.total_call_time > 0.5, "cpu greater than 0.5 ms: #{stats.total_call_time}"
   end
   def test_memory__linux
     return if RUBY_PLATFORM =~ /darwin/
@@ -64,8 +72,9 @@ class NewRelic::Agent::StatsEngine::SamplersTest < Test::Unit::TestCase
     s.poll
     s.poll
     s.poll
-    assert_equal 3, s.stats.call_count
-    assert s.stats.total_call_time > 0.5, "cpu greater than 0.5 ms: #{s.stats.total_call_time}"
+    stats = @stats_engine.get_stats_no_scope("Memory/Physical")
+    assert_equal 3, stats.call_count
+    assert stats.total_call_time > 0.5, "cpu greater than 0.5 ms: #{stats.total_call_time}"
   end
   def test_memory__solaris
     return if defined? JRuby
@@ -74,8 +83,9 @@ class NewRelic::Agent::StatsEngine::SamplersTest < Test::Unit::TestCase
     s = NewRelic::Agent::Samplers::MemorySampler.new
     s.stats_engine = @stats_engine
     s.poll
-    assert_equal 1, s.stats.call_count
-    assert_equal 999, s.stats.total_call_time
+    stats = s.stats_engine.get_stats_no_scope("Memory/Physical")
+    assert_equal 1, stats.call_count
+    assert_equal 999, stats.total_call_time
   end
   def test_memory__windows
     return if defined? JRuby