newrelic_rpm 4.0.0.332 → 4.1.0.333

data/test/multiverse/suites/json/config/newrelic.yml

@@ -7,7 +7,6 @@ development:
   log_level: debug
   monitor_mode: true
   license_key: bootstrap_newrelic_admin_license_key_000
-  developer_mode: false
   app_name: test
   host: 127.0.0.1
   api_host: 127.0.0.1

data/test/multiverse/suites/marshalling/config/newrelic.yml

@@ -6,7 +6,6 @@ development:
   ssl: false
   monitor_mode: true
   license_key: bootstrap_newrelic_admin_license_key_000
-  developer_mode: false
   app_name: test
   host: 127.0.0.1
   api_host: 127.0.0.1

data/test/multiverse/suites/mongo/config/newrelic.yml

@@ -6,7 +6,6 @@ development:
   ssl: false
   monitor_mode: true
   license_key: bootstrap_newrelic_admin_license_key_000
-  developer_mode: false
   app_name: test
   host: 127.0.0.1
   api_host: 127.0.0.1

data/test/multiverse/suites/net_http/config/newrelic.yml

@@ -6,7 +6,6 @@ development:
   ssl: false
   monitor_mode: true
   license_key: bootstrap_newrelic_admin_license_key_000
-  developer_mode: false
   app_name: test
   host: 127.0.0.1
   api_host: 127.0.0.1

data/test/multiverse/suites/padrino/config/newrelic.yml

@@ -7,7 +7,6 @@ development:
   agent_enabled: true
   monitor_mode: true
   license_key: bootstrap_newrelic_admin_license_key_000
-  developer_mode: false
   app_name: test
   host: 127.0.0.1
   api_host: 127.0.0.1

data/test/multiverse/suites/rack/config/newrelic.yml

@@ -6,7 +6,6 @@ development:
   ssl: false
   monitor_mode: true
   license_key: bootstrap_newrelic_admin_license_key_000
-  developer_mode: false
   app_name: test
   host: 127.0.0.1
   api_host: 127.0.0.1

data/test/multiverse/suites/rails/config/newrelic.yml

@@ -18,7 +18,6 @@ common: &default_settings
 
 development:
   <<: *default_settings
-  developer: true
 
 test:
   <<: *default_settings

data/test/multiverse/suites/rake/config/newrelic.yml

@@ -9,7 +9,6 @@ development:
   ssl: false
   monitor_mode: true
   license_key: bootstrap_newrelic_admin_license_key_000
-  developer_mode: false
   app_name: test
   host: 127.0.0.1
   port: <%= $collector ||= nil; $collector && $collector.port %>

data/test/multiverse/suites/redis/config/newrelic.yml

@@ -6,7 +6,6 @@ development:
   ssl: false
   monitor_mode: true
   license_key: bootstrap_newrelic_admin_license_key_000
-  developer_mode: false
   app_name: test
   host: 127.0.0.1
   port: <%= $collector && $collector.port %>

data/test/multiverse/suites/resque/config/newrelic.yml

@@ -6,7 +6,6 @@ development:
   ssl: false
   monitor_mode: true
   license_key: bootstrap_newrelic_admin_license_key_000
-  developer_mode: false
   app_name: test
   host: 127.0.0.1
   port: <%= $collector && $collector.port %>

data/test/multiverse/suites/sequel/config/newrelic.yml

@@ -6,7 +6,6 @@ development:
   ssl: false
   monitor_mode: true
   license_key: bootstrap_newrelic_admin_license_key_000
-  developer_mode: false
   app_name: test
   host: 127.0.0.1
   api_host: 127.0.0.1

data/test/multiverse/suites/sidekiq/config/newrelic.yml

@@ -6,7 +6,6 @@ development:
   ssl: false
   monitor_mode: true
   license_key: bootstrap_newrelic_admin_license_key_000
-  developer_mode: false
   app_name: test
   host: 127.0.0.1
   api_host: 127.0.0.1

data/test/multiverse/suites/sinatra/config/newrelic.yml

@@ -7,7 +7,6 @@ development:
   agent_enabled: true
   monitor_mode: true
   license_key: bootstrap_newrelic_admin_license_key_000
-  developer_mode: false
   app_name: test
   host: 127.0.0.1
   api_host: 127.0.0.1

data/test/multiverse/suites/typhoeus/config/newrelic.yml

@@ -6,7 +6,6 @@ development:
   ssl: false
   monitor_mode: true
   license_key: bootstrap_newrelic_admin_license_key_000
-  developer_mode: false
   app_name: test
   host: 127.0.0.1
   api_host: 127.0.0.1

data/test/multiverse/suites/yajl/config/newrelic.yml

@@ -7,7 +7,6 @@ development:
   log_level: debug
   monitor_mode: true
   license_key: bootstrap_newrelic_admin_license_key_000
-  developer_mode: false
   app_name: test
   host: 127.0.0.1
   api_host: 127.0.0.1

data/test/multiverse/test/suite_examples/one/a/config/newrelic.yml

@@ -8,7 +8,6 @@ development:
   ssl: false
   monitor_mode: true
   license_key: bootstrap_newrelic_admin_license_key_000
-  developer_mode: false
   app_name: test
   host: 127.0.0.1
   api_host: 127.0.0.1

data/test/multiverse/test/suite_examples/one/b/config/newrelic.yml

@@ -8,7 +8,6 @@ development:
   ssl: false
   monitor_mode: true
   license_key: bootstrap_newrelic_admin_license_key_000
-  developer_mode: false
   app_name: test
   host: 127.0.0.1
   api_host: 127.0.0.1

data/test/new_relic/agent/agent/connect_test.rb

@@ -24,14 +24,7 @@ class NewRelic::Agent::Agent::ConnectTest < Minitest::Test
     NewRelic::Agent.instance.service = @service
     @local_host = nil
 
-    @test_config = { :developer_mode => true }
     NewRelic::Agent.reset_config
-    NewRelic::Agent.config.add_config_for_testing(@test_config)
-  end
-
-  def teardown
-    NewRelic::Agent.reset_config
-    NewRelic::Agent.config.remove_config(@test_config)
   end
 
   def control
@@ -129,16 +122,14 @@ class NewRelic::Agent::Agent::ConnectTest < Minitest::Test
 
   def test_configure_transaction_tracer_negative
     with_config(:'transaction_tracer.enabled' => false) do
-      assert @transaction_sampler.enabled?
+      refute @transaction_sampler.enabled?
     end
   end
 
   def test_configure_transaction_tracer_server_disabled
     config = NewRelic::Agent::Configuration::ServerSource.new('collect_traces' => false)
-    with_config(:developer_mode => false) do
-      with_config(config) do
-        refute @transaction_sampler.enabled?
-      end
+    with_config(config) do
+      refute @transaction_sampler.enabled?
     end
   end
 

data/test/new_relic/agent/agent/start_test.rb

@@ -61,7 +61,8 @@ class NewRelic::Agent::Agent::StartTest < Minitest::Test
     self.expects(:generate_environment_report)
     self.expects(:start_worker_thread)
     self.expects(:install_exit_handler)
-    with_config(:dispatcher => 'test', :sync_startup => false, :monitor_mode => true, :license_key => 'a' * 40) do
+    with_config(:dispatcher => 'test', :sync_startup => false, :monitor_mode => true,
+      :license_key => 'a' * 40, :disable_samplers => false) do
       check_config_and_start_agent
     end
   end
@@ -73,7 +74,8 @@ class NewRelic::Agent::Agent::StartTest < Minitest::Test
     self.expects(:connect_in_foreground)
     self.expects(:start_worker_thread)
     self.expects(:install_exit_handler)
-    with_config(:dispatcher => 'test', :sync_startup => true, :monitor_mode => true, :license_key => 'a' * 40) do
+    with_config(:dispatcher => 'test', :sync_startup => true, :monitor_mode => true,
+      :license_key => 'a' * 40, :disable_samplers => false) do
       check_config_and_start_agent
     end
   end

data/test/new_relic/agent/busy_calculator_test.rb

@@ -22,7 +22,7 @@ class NewRelic::Agent::BusyCalculatorTest < Minitest::Test
     assert_equal 5, NewRelic::Agent::BusyCalculator.accumulator
     NewRelic::Agent::BusyCalculator.harvest_busy
 
-    assert_metrics_recorded 'Instance/Busy' => {:call_count => 1, :total_call_time => 0.50}
+    assert_instance_busy_metric_recorded call_count: 1, total_call_time: 0.50
   end
 
   def test_split
@@ -32,7 +32,7 @@ class NewRelic::Agent::BusyCalculatorTest < Minitest::Test
     NewRelic::Agent::BusyCalculator.dispatcher_start(now - 5.0)
     NewRelic::Agent::BusyCalculator.harvest_busy
 
-    assert_metrics_recorded 'Instance/Busy' => {:call_count => 1, :total_call_time => 0.50}
+    assert_instance_busy_metric_recorded call_count: 1, total_call_time: 0.50
   end
 
   def test_reentrancy
@@ -49,7 +49,7 @@ class NewRelic::Agent::BusyCalculatorTest < Minitest::Test
     NewRelic::Agent::BusyCalculator.dispatcher_finish(now - 1.0)
     NewRelic::Agent::BusyCalculator.harvest_busy
 
-    assert_metrics_recorded 'Instance/Busy' => {:call_count => 1, :total_call_time => 0.50}
+    assert_instance_busy_metric_recorded call_count: 1, total_call_time: 0.50
   end
 
   def test_concurrency
@@ -71,7 +71,7 @@ class NewRelic::Agent::BusyCalculatorTest < Minitest::Test
     NewRelic::Agent::BusyCalculator.stubs(:time_now).returns(now - 1.0)
     NewRelic::Agent::BusyCalculator.harvest_busy
 
-    assert_metrics_recorded 'Instance/Busy' => {:call_count => 1, :total_call_time => 1.0}
+    assert_instance_busy_metric_recorded call_count: 1, total_call_time: 1.0
   end
 
   def test_dont_ignore_zero_counts
@@ -79,7 +79,7 @@ class NewRelic::Agent::BusyCalculatorTest < Minitest::Test
     NewRelic::Agent::BusyCalculator.harvest_busy
     NewRelic::Agent::BusyCalculator.harvest_busy
 
-    assert_metrics_recorded 'Instance/Busy' => {:call_count => 3}
+    assert_instance_busy_metric_recorded :call_count => 3
   end
 
   def test_can_turn_off_recording
@@ -93,4 +93,12 @@ class NewRelic::Agent::BusyCalculatorTest < Minitest::Test
     NewRelic::Agent::TransactionState.tl_clear_for_testing
     NewRelic::Agent::BusyCalculator.dispatcher_finish
   end
+
+  def assert_instance_busy_metric_recorded total_call_time: nil, call_count: 1
+    spec = NewRelic::MetricSpec.new("Instance/Busy")
+    stats = NewRelic::Agent.instance.stats_engine.to_h[spec]
+    refute_nil stats
+    assert_equal call_count, stats.call_count
+    assert_in_delta total_call_time, stats.total_call_time, 0.01 if total_call_time
+  end
 end

data/test/new_relic/agent/pipe_channel_manager_test.rb

@@ -61,20 +61,19 @@ class NewRelic::Agent::PipeChannelManagerTest < Minitest::Test
 
     def test_listener_merges_transaction_traces
       sampler = NewRelic::Agent.agent.transaction_sampler
-      sample = run_sample_trace
-      assert_equal(1, sampler.count)
+      assert_equal(0, sampler.count)
 
       start_listener_with_pipe(667)
       run_child(667) do
         NewRelic::Agent.after_fork
         with_config(:'transaction_tracer.transaction_threshold' => 0.0) do
-          sample = run_sample_trace
+          run_sample_trace
           service = NewRelic::Agent::PipeService.new(667)
           service.transaction_sample_data(sampler.harvest!)
         end
       end
 
-      assert_equal(2, sampler.count)
+      assert_equal(1, sampler.count)
     end
 
     def test_listener_merges_error_traces

data/test/new_relic/agent/stats_engine_test.rb

@@ -7,11 +7,16 @@ require File.expand_path(File.join(File.dirname(__FILE__),'..','data_container_t
 
 class NewRelic::Agent::StatsEngineTest < Minitest::Test
   def setup
-    @engine = NewRelic::Agent::StatsEngine.new
+    NewRelic::Agent.manual_start
+    @engine = NewRelic::Agent.instance.stats_engine
+  rescue => e
+    puts e
+    puts e.backtrace.join("\n")
   end
 
   def teardown
     @engine.reset!
+    NewRelic::Agent.shutdown
     super
   end
 
@@ -29,4 +34,311 @@ class NewRelic::Agent::StatsEngineTest < Minitest::Test
 
   include NewRelic::DataContainerTests
 
+
+  def test_record_unscoped_metrics_records_to_transaction_stats_if_in_txn
+    in_transaction do
+      @engine.tl_record_unscoped_metrics(['a', 'b'], 20, 10)
+
+      # txn is still active, so metrics should not be merged into global
+      # stats hash yet
+      assert_metrics_not_recorded(['a', 'b'])
+    end
+
+    expected = {
+      :call_count           => 1,
+      :total_call_time      => 20,
+      :total_exclusive_time => 10
+    }
+    assert_metrics_recorded(
+      'a' => expected,
+      'b' => expected
+    )
+  end
+
+  def test_record_unscoped_metrics_records_to_global_metrics_if_no_txn
+    @engine.tl_record_unscoped_metrics(['a', 'b'], 20, 10)
+    expected = {
+      :call_count           => 1,
+      :total_call_time      => 20,
+      :total_exclusive_time => 10
+    }
+    assert_metrics_recorded(
+      'a' => expected,
+      'b' => expected
+    )
+  end
+
+  def test_record_unscoped_metrics_takes_single_metric_name
+    @engine.tl_record_unscoped_metrics('a', 20)
+    assert_metrics_recorded(
+      'a' => {
+        :call_count           => 1,
+        :total_call_time      => 20,
+        :total_exclusive_time => 20
+      }
+    )
+  end
+
+  def test_record_unscoped_metrics_takes_block_in_txn
+    in_transaction('txn') do
+      @engine.tl_record_unscoped_metrics('a') do |stat|
+        stat.total_call_time = 42
+        stat.call_count = 99
+      end
+    end
+
+    expected = { :total_call_time => 42, :call_count => 99 }
+    assert_metrics_recorded('a' => expected)
+  end
+
+  def test_record_unscoped_metrics_takes_block_outside_txn
+    @engine.tl_record_unscoped_metrics('a') do |stat|
+      stat.total_call_time = 42
+      stat.call_count = 99
+    end
+
+    expected = { :total_call_time => 42, :call_count => 99 }
+    assert_metrics_recorded('a' => expected)
+  end
+
+  def test_record_unscoped_metrics_is_thread_safe
+    threads = []
+    nthreads = 25
+    iterations = 100
+
+    nthreads.times do |tid|
+      threads << Thread.new do
+        iterations.times do
+          @engine.tl_record_unscoped_metrics('m1', 1)
+          @engine.tl_record_unscoped_metrics('m2', 1)
+        end
+      end
+    end
+    threads.each { |t| t.join }
+
+    assert_metrics_recorded(
+      'm1' => { :call_count => nthreads * iterations },
+      'm2' => { :call_count => nthreads * iterations }
+    )
+  end
+
+  def test_record_scoped_and_unscoped_metrics_records_scoped_and_unscoped
+    in_transaction('txn') do
+      @engine.tl_record_scoped_and_unscoped_metrics('a', nil, 20, 10)
+      assert_metrics_not_recorded('a')
+    end
+
+    expected = {
+      :call_count           => 1,
+      :total_call_time      => 20,
+      :total_exclusive_time => 10
+    }
+    assert_metrics_recorded(
+      'a'          => expected,
+      ['a', 'txn'] => expected
+    )
+  end
+
+  def test_record_scoped_and_unscoped_metrics_takes_block
+    in_transaction('txn') do
+      @engine.tl_record_scoped_and_unscoped_metrics('a', ['b']) do |stat|
+        stat.total_call_time = 42
+        stat.call_count = 99
+      end
+    end
+
+    expected = { :total_call_time => 42, :call_count => 99 }
+    assert_metrics_recorded(
+      'a'          => expected,
+      ['a', 'txn'] => expected,
+      'b'          => expected
+    )
+  end
+
+  def test_record_scoped_and_unscoped_metrics_records_multiple_unscoped_metrics
+    in_transaction('txn') do
+      @engine.tl_record_scoped_and_unscoped_metrics('a', ['b', 'c'], 20, 10)
+      assert_metrics_not_recorded(['a', 'b', 'c'])
+    end
+
+    expected = {
+      :call_count           => 1,
+      :total_call_time      => 20,
+      :total_exclusive_time => 10
+    }
+    assert_metrics_recorded(
+      'a'          => expected,
+      ['a', 'txn'] => expected,
+      'b'          => expected,
+      'c'          => expected
+    )
+    assert_metrics_not_recorded([
+      ['b', 'txn'],
+      ['c', 'txn']
+    ])
+  end
+
+  def test_record_scoped_and_unscoped_metrics_is_thread_safe
+    threads = []
+    nthreads = 25
+    iterations = 100
+
+    nthreads.times do |tid|
+      threads << Thread.new do
+        iterations.times do
+          in_transaction('txn') do
+            @engine.tl_record_scoped_and_unscoped_metrics('m1', ['m3'], 1)
+            @engine.tl_record_scoped_and_unscoped_metrics('m2', ['m4'], 1)
+          end
+        end
+      end
+    end
+    threads.each { |t| t.join }
+
+    expected = { :call_count => nthreads * iterations }
+    assert_metrics_recorded(
+      'm1'          => expected,
+      'm2'          => expected,
+      ['m1', 'txn'] => expected,
+      ['m2', 'txn'] => expected,
+      'm3'          => expected,
+      'm4'          => expected
+    )
+  end
+
+  def test_record_scoped_and_unscoped_metrics_records_unscoped_if_not_in_txn
+    @engine.tl_record_scoped_and_unscoped_metrics('a', ['b'], 20, 10)
+
+    expected = {
+      :call_count           => 1,
+      :total_call_time      => 20,
+      :total_exclusive_time => 10
+    }
+    assert_metrics_recorded_exclusive(
+      'a' => expected,
+      'b' => expected
+    )
+  end
+
+  def test_harvest
+    @engine.clear_stats
+
+    @engine.tl_record_unscoped_metrics "a", 10
+    @engine.tl_record_unscoped_metrics "c", 1
+    @engine.tl_record_unscoped_metrics "c", 3
+
+    assert_metrics_recorded({
+      "a" => {:call_count => 1, :total_call_time => 10},
+      "c" => {:call_count => 2, :total_call_time => 4}
+    })
+
+    harvested = @engine.harvest!.to_h
+
+    # after harvest, all the metrics should be reset
+    refute_metrics_recorded %w(a c)
+
+    spec_a = NewRelic::MetricSpec.new('a')
+
+    assert(harvested.has_key?(spec_a))
+    assert_equal(1, harvested[spec_a].call_count)
+    assert_equal(10, harvested[spec_a].total_call_time)
+  end
+
+  def test_harvest_applies_metric_rename_rules
+    rule = NewRelic::Agent::RulesEngine::ReplacementRule.new(
+      'match_expression' => '[0-9]+',
+      'replacement'      => '*',
+      'replace_all'      => true
+    )
+    rules_engine = NewRelic::Agent::RulesEngine.new([rule])
+
+    @engine.metric_rules = rules_engine
+    @engine.tl_record_unscoped_metrics('Custom/foo/1/bar/22', 1)
+    @engine.tl_record_unscoped_metrics('Custom/foo/3/bar/44', 1)
+    @engine.tl_record_unscoped_metrics('Custom/foo/5/bar/66', 1)
+
+    harvested = @engine.harvest!.to_h
+
+    refute harvested.has_key?(NewRelic::MetricSpec.new('Custom/foo/1/bar/22'))
+    refute harvested.has_key?(NewRelic::MetricSpec.new('Custom/foo/3/bar/44'))
+    refute harvested.has_key?(NewRelic::MetricSpec.new('Custom/foo/5/bar/66'))
+    merged = harvested[NewRelic::MetricSpec.new('Custom/foo/*/bar/*')]
+    assert_equal(3, merged.call_count)
+  end
+
+  def test_apply_rules_to_metric_data_respects_ignore_rules
+    rule = NewRelic::Agent::RulesEngine::ReplacementRule.new(
+      'match_expression' => 'bar',
+      'ignore'           => 'true'
+    )
+    rules_engine = NewRelic::Agent::RulesEngine.new([rule])
+
+    stats_hash = NewRelic::Agent::StatsHash.new
+
+    stats_hash.record(NewRelic::MetricSpec.new('foo'), 90210)
+    stats_hash.record(NewRelic::MetricSpec.new('bar'), 90210)
+
+    renamed = @engine.apply_rules_to_metric_data(rules_engine, stats_hash)
+
+    assert_equal(1    , renamed.size)
+    assert_equal('foo', renamed.to_h.keys.first.name)
+  end
+
+  def test_harvest_with_merge
+    @engine.tl_record_unscoped_metrics "a", 1
+    assert_metrics_recorded "a" => {:call_count => 1, :total_call_time => 1}
+
+    harvest = @engine.harvest!
+
+    assert_metrics_not_recorded "a"
+
+    @engine.tl_record_unscoped_metrics "a", 2
+    assert_metrics_recorded "a" => {:call_count => 1, :total_call_time => 2}
+
+    # this should merge the contents of the previous harvest,
+    # so the stats for metric "a" should have 2 data points
+    @engine.merge!(harvest)
+    harvest = @engine.harvest!
+    stats = harvest[NewRelic::MetricSpec.new("a")]
+    assert_equal 2, stats.call_count
+    assert_equal 3, stats.total_call_time
+  end
+
+  def test_merge_merges
+    @engine.tl_record_unscoped_metrics "foo", 1
+
+    other_stats_hash = NewRelic::Agent::StatsHash.new()
+    other_stats_hash.record(NewRelic::MetricSpec.new('foo'), 1)
+    other_stats_hash.record(NewRelic::MetricSpec.new('bar'), 1)
+
+    @engine.merge!(other_stats_hash)
+
+    assert_metrics_recorded ({
+      'foo' => {:call_count => 2},
+      'bar' => {:call_count => 1}
+    })
+  end
+
+  def test_harvest_adds_harvested_at_time
+    t0 = freeze_time
+    result = @engine.harvest!
+    assert_equal(t0, result.harvested_at)
+  end
+
+  def test_record_unscoped_metrics_unscoped_metrics_only
+    in_transaction('scopey') do
+      @engine.tl_record_unscoped_metrics('foo', 42)
+    end
+    assert_metrics_recorded('foo' => { :call_count => 1, :total_call_time => 42 })
+    assert_metrics_not_recorded([['foo', 'scopey']])
+  end
+
+  def test_record_supportability_metric_count_records_counts_only
+    @engine.tl_record_supportability_metric_count('foo/bar',  1)
+    @engine.tl_record_supportability_metric_count('foo/bar', 42)
+    assert_metrics_recorded(['Supportability/foo/bar'] => {
+      :call_count => 42,
+      :total_call_time => 0
+    })
+  end
 end