newrelic_rpm 3.12.1.298 → 3.13.0.299

data/test/multiverse/suites/rake/rake_test_helper.rb

@@ -0,0 +1,66 @@
+# 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.
+
+# Because some envs have Rails, we might not have loaded in the absence of
+# initializers running, so kick-start agent to get instrumentation loaded.
+NewRelic::Agent.manual_start(:sync_startup => false)
+
+module RakeTestHelper
+  def after_setup
+    ENV['NEWRELIC_DISABLE_HARVEST_THREAD'] = 'false'
+    ENV['NEW_RELIC_PORT'] = $collector.port.to_s
+  end
+
+  def after_teardown
+    unless passed?
+      puts @output
+    end
+  end
+
+  def run_rake(commands = "", allow_failure = false)
+    full_command = "bundle exec rake #{commands} 2>&1"
+    @output = `#{full_command}`
+
+    if !allow_failure
+      assert $?.success?, "Failed during '#{full_command}'"
+    end
+  end
+
+  def with_tasks_traced(*tasks)
+    with_environment("NEW_RELIC_RAKE_TASKS" => tasks.join(",")) do
+      yield
+    end
+  end
+
+  def without_attributes(*tasks)
+    with_environment("NEW_RELIC_ATTRIBUTES_EXCLUDE" => "*") do
+      yield
+    end
+  end
+
+  def assert_metric_names_posted(*expected_names)
+    expected_names.each do |expected_name|
+      assert_includes all_metric_names_posted, expected_name
+    end
+  end
+
+  def refute_metric_names_posted(*expected_names)
+    expected_names.each do |expected_name|
+      refute_includes all_metric_names_posted, expected_name
+    end
+  end
+
+  def refute_any_rake_metrics
+    all_metric_names_posted.each do |metric_name|
+      refute_match /^OtherTransaction.*/, metric_name
+      refute_match /^Rake.*/, metric_name
+    end
+  end
+
+  def all_metric_names_posted
+    $collector.calls_for("metric_data").map do |metric_post|
+      metric_post.metric_names
+    end.flatten
+  end
+end

data/test/multiverse/suites/rake/unsupported_rake_test.rb

@@ -0,0 +1,19 @@
+# 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__, '..', 'rake_test_helper'))
+
+if !::NewRelic::Agent::Instrumentation::RakeInstrumentation.should_install?
+class UnsupportedRakeTest < Minitest::Test
+  include MultiverseHelpers
+  include RakeTestHelper
+
+  setup_and_teardown_agent
+
+  def test_we_hear_nothing
+    run_rake
+    refute_any_rake_metrics
+  end
+end
+end

data/test/multiverse/suites/redis/Envfile

@@ -0,0 +1,14 @@
+gemfile <<-RB
+  gem 'rack'
+  gem 'redis', '~>3.2.1'
+RB
+
+gemfile <<-RB
+  gem 'rack'
+  gem 'redis', '3.0.0' # oldest supported version
+RB
+
+gemfile <<-RB
+  gem 'rack'
+  gem 'redis', '2.2.2' # newest unsupported version
+RB

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

@@ -0,0 +1,19 @@
+---
+development:
+  error_collector:
+    enabled: true
+  apdex_t: 0.5
+  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 %>
+  api_host: 127.0.0.1
+  transaction_tracer:
+    record_sql: obfuscated
+    enabled: true
+    stack_trace_threshold: 0.5
+    transaction_threshold: 1.0
+  capture_params: false

data/test/multiverse/suites/redis/redis_instrumentation_test.rb

@@ -0,0 +1,212 @@
+# 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 'redis'
+
+if NewRelic::Agent::Datastores::Redis.is_supported_version?
+class NewRelic::Agent::Instrumentation::RedisInstrumentationTest < Minitest::Test
+  include MultiverseHelpers
+  setup_and_teardown_agent
+
+  def after_setup
+    super
+    @redis = Redis.new
+
+    # Creating a new client doesn't actually establish a connection, so make
+    # sure we do that by issuing a dummy get command, and then drop metrics
+    # generated by the connect
+    @redis.get('bogus')
+    NewRelic::Agent.drop_buffered_data
+  end
+
+  def after_teardown
+    @redis.flushall
+  end
+
+  def test_records_metrics_for_connect
+    redis = Redis.new
+    redis.get("foo")
+
+    expected = {
+      "Datastore/operation/Redis/connect" => { :call_count => 1 },
+      "Datastore/operation/Redis/get" => { :call_count => 1 },
+      "Datastore/Redis/allOther" => { :call_count => 2 },
+      "Datastore/Redis/all" => { :call_count => 2 },
+      "Datastore/allOther" => { :call_count => 2 },
+      "Datastore/all" => { :call_count => 2 }
+    }
+
+    assert_metrics_recorded_exclusive(expected, :ignore_filter => /Supportability/)
+  end
+
+  def test_records_connect_tt_node_within_call_that_triggered_it
+    in_transaction do
+      redis = Redis.new
+      redis.get("foo")
+    end
+
+    tt = last_transaction_trace
+
+    get_node = tt.root_node.called_nodes[0].called_nodes[0]
+    assert_equal('Datastore/operation/Redis/get', get_node.metric_name)
+
+    connect_node = get_node.called_nodes[0]
+    assert_equal('Datastore/operation/Redis/connect', connect_node.metric_name)
+  end
+
+  def test_records_metrics_for_set
+    @redis.set 'time', 'walk'
+
+    expected = {
+      "Datastore/operation/Redis/set" => { :call_count => 1 },
+      "Datastore/Redis/allOther" => { :call_count => 1 },
+      "Datastore/Redis/all"=> { :call_count => 1 },
+      "Datastore/allOther"=> { :call_count => 1 },
+      "Datastore/all"=> { :call_count => 1 }
+    }
+    assert_metrics_recorded(expected)
+  end
+
+  def test_records_metrics_for_get_in_web_transaction
+    in_web_transaction do
+      @redis.set 'prodigal', 'sorcerer'
+    end
+
+    expected = {
+      "Datastore/operation/Redis/set" => { :call_count => 1 },
+      "Datastore/Redis/allWeb" => { :call_count => 1 },
+      "Datastore/Redis/all"=> { :call_count => 1 },
+      "Datastore/allWeb"=> { :call_count => 1 },
+      "Datastore/all"=> { :call_count => 1 }
+    }
+    assert_metrics_recorded(expected)
+  end
+
+  def test_records_metrics_for_get
+    @redis.get 'mox sapphire'
+
+    expected = {
+      "Datastore/operation/Redis/get" => { :call_count => 1 },
+      "Datastore/Redis/allOther" => { :call_count => 1 },
+      "Datastore/Redis/all"=> { :call_count => 1 },
+      "Datastore/allOther"=> { :call_count => 1 },
+      "Datastore/all"=> { :call_count => 1 }
+    }
+    assert_metrics_recorded(expected)
+  end
+
+  def test_records_tt_node_for_get
+    in_transaction do
+      @redis.get 'mox sapphire'
+    end
+
+    tt = last_transaction_trace
+    get_node = tt.root_node.called_nodes[0].called_nodes[0]
+    assert_equal('Datastore/operation/Redis/get', get_node.metric_name)
+  end
+
+  def test_does_not_record_statement_on_individual_command_node_by_default
+    in_transaction do
+      @redis.get 'mox sapphire'
+    end
+
+    tt = last_transaction_trace
+    get_node = tt.root_node.called_nodes[0].called_nodes[0]
+
+    assert_equal('Datastore/operation/Redis/get', get_node.metric_name)
+    refute get_node[:statement]
+  end
+
+  def test_records_metrics_for_set_in_web_transaction
+    in_web_transaction do
+      @redis.get 'timetwister'
+    end
+
+    expected = {
+      "Datastore/operation/Redis/get" => { :call_count => 1 },
+      "Datastore/Redis/allWeb" => { :call_count => 1 },
+      "Datastore/Redis/all"=> { :call_count => 1 },
+      "Datastore/allWeb"=> { :call_count => 1 },
+      "Datastore/all"=> { :call_count => 1 }
+    }
+    assert_metrics_recorded(expected)
+  end
+
+  def test_records_metrics_for_pipelined_commands
+    @redis.pipelined do
+      @redis.get 'great log'
+      @redis.get 'late log'
+    end
+
+    expected = {
+      "Datastore/operation/Redis/pipeline" => { :call_count => 1 },
+      "Datastore/Redis/allOther" => { :call_count => 1 },
+      "Datastore/Redis/all" => { :call_count => 1 },
+      "Datastore/allOther" => { :call_count => 1 },
+      "Datastore/all" => { :call_count => 1 }
+    }
+    assert_metrics_recorded_exclusive(expected, :ignore_filter => /Supportability/)
+  end
+
+  def test_records_commands_without_args_in_pipelined_block_by_default
+    in_transaction do
+      @redis.pipelined do
+        @redis.set 'late log', 'goof'
+        @redis.get 'great log'
+      end
+    end
+
+    tt = last_transaction_trace
+    pipeline_node = tt.root_node.called_nodes[0].called_nodes[0]
+
+    assert_equal "set ?\nget ?", pipeline_node[:statement]
+  end
+
+  def test_records_metrics_for_multi_blocks
+    @redis.multi do
+      @redis.get 'darkpact'
+      @redis.get 'chaos orb'
+    end
+
+    expected = {
+      "Datastore/operation/Redis/multi" => { :call_count => 1 },
+      "Datastore/Redis/allOther" => { :call_count => 1 },
+      "Datastore/Redis/all" => { :call_count => 1 },
+      "Datastore/allOther" => { :call_count => 1 },
+      "Datastore/all" => { :call_count => 1 }
+    }
+    assert_metrics_recorded_exclusive(expected, :ignore_filter => /Supportability/)
+  end
+
+  def test_records_commands_without_args_in_tt_node_for_multi_blocks
+    in_transaction do
+      @redis.multi do
+        @redis.set 'darkpact', 'sorcery'
+        @redis.get 'chaos orb'
+      end
+    end
+
+    tt = last_transaction_trace
+    pipeline_node = tt.root_node.called_nodes[0].called_nodes[0]
+
+    assert_equal("multi\nset ?\nget ?\nexec", pipeline_node[:statement])
+  end
+
+  def test_records_commands_with_args_in_tt_node_for_multi_blocks
+    with_config(:'transaction_tracer.record_redis_arguments' => true) do
+      in_transaction do
+        @redis.multi do
+          @redis.set 'darkpact', 'sorcery'
+          @redis.get 'chaos orb'
+        end
+      end
+    end
+
+    tt = last_transaction_trace
+    pipeline_node = tt.root_node.called_nodes[0].called_nodes[0]
+
+    assert_equal("multi\nset \"darkpact\" \"sorcery\"\nget \"chaos orb\"\nexec", pipeline_node[:statement])
+  end
+end
+end

data/test/multiverse/suites/redis/redis_unsupported_version_test.rb

@@ -0,0 +1,20 @@
+# 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 'redis'
+require 'newrelic_rpm'
+
+if !NewRelic::Agent::Datastores::Redis.is_supported_version?
+class NewRelic::Agent::Instrumentation::RedisUnsupportedVersionTest < Minitest::Test
+  def setup
+    @redis = Redis.new
+  end
+
+  def test_no_metrics_recorded_for_get
+    @redis.get('hello')
+
+    assert_no_metrics_match(/redis/i)
+  end
+end
+end

data/test/multiverse/suites/resque/resque_marshalling_test.rb

@@ -13,6 +13,12 @@ class ResqueMarshallingTest < Minitest::Test
 
   setup_and_teardown_agent
 
+  def before_teardown
+    puts
+    p $collector.agent_data.map { |post| [post.class, post.action] }
+    super
+  end
+
   class DummyJob
     extend Resque::Plugins::NewRelicInstrumentation
   end
@@ -41,6 +47,8 @@ class ResqueMarshallingTest < Minitest::Test
       DummyJob.around_perform_with_monitoring do
         yield
       end
+
+      run_harvest
       exit
     end
   end
@@ -50,4 +58,4 @@ class ResqueMarshallingTest < Minitest::Test
   end
 end
 
-end
+end

data/test/new_relic/agent/agent_test.rb

@@ -30,7 +30,11 @@ module NewRelic
 
       def test_after_fork_reporting_to_channel
         @agent.stubs(:connected?).returns(true)
-        @agent.after_fork(:report_to_channel => 123)
+
+        with_config(:monitor_mode => true) do
+          @agent.after_fork(:report_to_channel => 123)
+        end
+
         assert(@agent.service.kind_of?(NewRelic::Agent::PipeService),
                'Agent should use PipeService when directed to report to pipe channel')
         NewRelic::Agent::PipeService.any_instance.expects(:shutdown).never
@@ -411,6 +415,79 @@ module NewRelic
         end
       end
 
+      def test_wait_on_connect
+        error = nil
+        connected = false
+        thread = Thread.new do
+          begin
+            @agent.wait_on_connect(2)
+            connected = true
+          rescue => e
+            error = e
+          end
+        end
+
+        until @agent.waited_on_connect? do
+          # hold on there....
+        end
+
+        @agent.stubs(:connected?).returns(true)
+        @agent.signal_connected
+        thread.join
+
+        refute error, error
+        assert connected
+      end
+
+      def test_wait_raises_if_not_connected_once_signaled
+        error = nil
+        thread = Thread.new do
+          begin
+            @agent.wait_on_connect(2)
+          rescue => e
+            error = e
+          end
+        end
+
+        until @agent.waited_on_connect? do
+          # hold on there....
+        end
+
+        @agent.stubs(:connected?).returns(false)
+        @agent.signal_connected
+        thread.join
+
+        assert error, error
+        assert_kind_of NewRelic::Agent::Agent::Connect::WaitOnConnectTimeout, error
+      end
+
+      def test_wait_raises_if_not_signaled
+        error = nil
+        thread = Thread.new do
+          begin
+            @agent.wait_on_connect(0.01)
+          rescue => e
+            error = e
+          end
+        end
+
+        until @agent.waited_on_connect? do
+          # hold on there....
+        end
+
+        @agent.stubs(:connected?).returns(false)
+        thread.join
+
+        assert error, error
+        assert_kind_of NewRelic::Agent::Agent::Connect::WaitOnConnectTimeout, error
+      end
+
+      def test_wait_when_already_connected
+        @agent.stubs(:connected?).returns(true)
+        @agent.wait_on_connect(2)
+        refute @agent.waited_on_connect?
+      end
+
       def test_defer_start_if_resque_dispatcher_and_channel_manager_isnt_started_and_forkable
         NewRelic::LanguageSupport.stubs(:can_fork?).returns(true)
         NewRelic::Agent::PipeChannelManager.listener.stubs(:started?).returns(false)