newrelic_rpm 3.11.2.286 → 3.12.0.288

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

@@ -49,7 +49,7 @@ class ResqueTest < Minitest::Test
       end
     end
 
-    NewRelic::Agent.instance.send(:transmit_data)
+    run_harvest
   end
 
   def test_all_jobs_ran
@@ -70,14 +70,17 @@ class ResqueTest < Minitest::Test
 
   def test_doesnt_capture_args_by_default
     run_jobs
-    assert_no_params_on_jobs
+    refute_attributes_on_transaction_traces
+    refute_attributes_on_events
   end
 
   def test_isnt_influenced_by_global_capture_params
     with_config(:capture_params => true) do
       run_jobs
     end
-    assert_no_params_on_jobs
+
+    refute_attributes_on_transaction_traces
+    refute_attributes_on_events
   end
 
   def test_agent_posts_captured_args_to_job
@@ -85,15 +88,16 @@ class ResqueTest < Minitest::Test
       run_jobs
     end
 
-    transaction_samples = $collector.calls_for('transaction_sample_data')
-    assert_false transaction_samples.empty?
+    assert_attributes_on_transaction_traces
+    refute_attributes_on_events
+  end
 
-    transaction_samples.each do |post|
-      post.samples.each do |sample|
-        assert_equal sample.metric_name, TRANSACTION_NAME, "Huh, that transaction shouldn't be in there!"
-        assert_equal sample.tree.custom_params["job_arguments"], ["testing"]
-      end
+  def test_arguments_are_captured_on_transaction_events_when_enabled
+    with_config(:'attributes.include' => 'job.resque.args.*') do
+      run_jobs
     end
+
+    assert_attributes_on_events
   end
 
   def assert_metric_and_call_count(name, expected_call_count)
@@ -107,14 +111,44 @@ class ResqueTest < Minitest::Test
     assert_equal(expected_call_count, call_count)
   end
 
-  def assert_no_params_on_jobs
+  def assert_attributes_on_transaction_traces
+    transaction_samples = $collector.calls_for('transaction_sample_data')
+    assert_false transaction_samples.empty?
+
+    transaction_samples.each do |post|
+      post.samples.each do |sample|
+        assert_equal sample.metric_name, TRANSACTION_NAME, "Huh, that transaction shouldn't be in there!"
+        assert_equal 'testing', sample.agent_attributes["job.resque.args.0"]
+      end
+    end
+  end
+
+  def refute_attributes_on_transaction_traces
     transaction_samples = $collector.calls_for('transaction_sample_data')
     assert_false transaction_samples.empty?
 
     transaction_samples.each do |post|
       post.samples.each do |sample|
         assert_equal sample.metric_name, TRANSACTION_NAME, "Huh, that transaction shouldn't be in there!"
-        assert_nil sample.tree.custom_params["job_arguments"]
+        assert sample.agent_attributes.keys.none? { |k| k =~ /^job.resque.args.*/ }
+      end
+    end
+  end
+
+  def assert_attributes_on_events
+    event_posts = $collector.calls_for('analytic_event_data')
+    event_posts.each do |post|
+      post.events.each do |event|
+        assert_equal ["job.resque.args.0"], event[2].keys
+      end
+    end
+  end
+
+  def refute_attributes_on_events
+    event_posts = $collector.calls_for('analytic_event_data')
+    event_posts.each do |post|
+      post.events.each do |event|
+        assert event[2].keys.none? { |k| k.start_with?("job.resque.args") }, "Found unexpected resque arguments"
       end
     end
   end

data/test/multiverse/suites/sequel/sequel_extension_test.rb

@@ -92,20 +92,20 @@ class SequelExtensionTest < Minitest::Test
   def test_slow_queries_get_an_explain_plan
     with_config( :'transaction_tracer.explain_threshold' => -0.01,
                  :'transaction_tracer.record_sql' => 'raw' ) do
-      segment = last_segment_for do
+      node = last_node_for do
         @posts[:id => 11]
       end
-      assert_match %r{select \* from `posts` where \(?`id` = 11\)?( limit 1)?}i, segment.params[:sql]
-      assert_segment_has_explain_plan( segment )
+      assert_match %r{select \* from `posts` where \(?`id` = 11\)?( limit 1)?}i, node.params[:sql]
+      assert_node_has_explain_plan( node )
     end
   end
 
   def test_sql_is_recorded_in_tt_for_non_select
     with_config(:'transaction_tracer.record_sql' => 'raw') do
-      segment = last_segment_for do
+      node = last_node_for do
         @posts.insert(:title => 'title', :content => 'content')
       end
-      assert_match %r{insert into `posts` \([^\)]*\) values \([^\)]*\)}i, segment.params[:sql]
+      assert_match %r{insert into `posts` \([^\)]*\) values \([^\)]*\)}i, node.params[:sql]
     end
   end
 
@@ -115,11 +115,11 @@ class SequelExtensionTest < Minitest::Test
       :'transaction_tracer.record_sql' => 'obfuscated'
     }
     with_config(config) do
-      segment = last_segment_for(:record_sql => :obfuscated) do
+      node = last_node_for(:record_sql => :obfuscated) do
         @posts[:id => 11]
       end
-      assert_match %r{select \* from `posts` where \(?`id` = \?\)?}i, segment.params[:sql]
-      assert_segment_has_explain_plan( segment )
+      assert_match %r{select \* from `posts` where \(?`id` = \?\)?}i, node.params[:sql]
+      assert_node_has_explain_plan( node )
     end
   end
 

data/test/multiverse/suites/sequel/sequel_helpers.rb

@@ -26,26 +26,26 @@ module SequelHelpers
 
   # This is particular to sqlite plans currently. To abstract it up, we'd need to
   # be able to specify a flavor (e.g., :sqlite, :postgres, :mysql, etc.)
-  def assert_segment_has_explain_plan( segment, msg=nil )
-    msg = "Expected #{segment.inspect} to have an explain plan"
-    assert_block( msg ) { segment.params[:explain_plan].join =~ SQLITE_EXPLAIN_PLAN_COLUMNS_RE }
+  def assert_node_has_explain_plan( node, msg=nil )
+    msg = "Expected #{node.inspect} to have an explain plan"
+    assert_block( msg ) { node.params[:explain_plan].join =~ SQLITE_EXPLAIN_PLAN_COLUMNS_RE }
   end
 
-  def last_segment_for(options={})
+  def last_node_for(options={})
       in_transaction('sandwiches/index') do
         yield
       end
       sample = NewRelic::Agent.instance.transaction_sampler.last_sample
       sample.prepare_to_send!
-      last_segment(sample)
+      last_node(sample)
   end
 
-  def last_segment(txn_sample)
-    l_segment = nil
-    txn_sample.root_segment.each_segment do |segment|
-      l_segment = segment
+  def last_node(txn_sample)
+    l_node = nil
+    txn_sample.root_node.each_node do |node|
+      l_node = node
     end
-    l_segment
+    l_node
   end
 
   def product_name
@@ -59,4 +59,4 @@ module SequelHelpers
   def assert_datastore_metrics_recorded_exclusive(metrics, options = {})
     assert_metrics_recorded_exclusive(metrics, {:filter => /^Datastores/}.update(options))
   end
-end
+end

data/test/multiverse/suites/sequel/sequel_plugin_test.rb

@@ -164,20 +164,20 @@ class SequelPluginTest < Minitest::Test
   def test_slow_queries_get_an_explain_plan
     with_config( :'transaction_tracer.explain_threshold' => -0.01,
                  :'transaction_tracer.record_sql' => 'raw' ) do
-      segment = last_segment_for do
+      node = last_node_for do
         Post[11]
       end
-      assert_match %r{select \* from `posts` where `id` = 11}i, segment.params[:sql]
-      assert_segment_has_explain_plan( segment )
+      assert_match %r{select \* from `posts` where `id` = 11}i, node.params[:sql]
+      assert_node_has_explain_plan( node )
     end
   end
 
   def test_sql_is_recorded_in_tt_for_non_select
     with_config(:'transaction_tracer.record_sql' => 'raw') do
-      segment = last_segment_for do
+      node = last_node_for do
         Post.create(:title => 'title', :content => 'content')
       end
-      assert_match %r{insert into `posts` \([^\)]*\) values \([^\)]*\)}i, segment.params[:sql]
+      assert_match %r{insert into `posts` \([^\)]*\) values \([^\)]*\)}i, node.params[:sql]
     end
   end
 
@@ -189,11 +189,11 @@ class SequelPluginTest < Minitest::Test
 
     with_config(:'transaction_tracer.explain_threshold' => -0.01,
                 :'transaction_tracer.record_sql' => 'raw') do
-      segment = last_segment_for do
+      node = last_node_for do
         model_class[11]
       end
-      assert_match %r{select \* from `posts` where `id` = 11}i, segment.params[:sql]
-      assert_equal([], segment.params[:explain_plan], "Should not capture explain plan with single-threaded connection pool")
+      assert_match %r{select \* from `posts` where `id` = 11}i, node.params[:sql]
+      assert_equal([], node.params[:explain_plan], "Should not capture explain plan with single-threaded connection pool")
     end
   end
 
@@ -203,11 +203,11 @@ class SequelPluginTest < Minitest::Test
       :'transaction_tracer.record_sql' => 'obfuscated'
     }
     with_config(config) do
-      segment = last_segment_for(:record_sql => :obfuscated) do
+      node = last_node_for(:record_sql => :obfuscated) do
         Post[11]
       end
-      assert_match %r{select \* from `posts` where `id` = \?}i, segment.params[:sql]
-      assert_segment_has_explain_plan( segment )
+      assert_match %r{select \* from `posts` where `id` = \?}i, node.params[:sql]
+      assert_node_has_explain_plan( node )
     end
   end
 

data/test/multiverse/suites/sidekiq/Envfile

@@ -6,12 +6,9 @@ end
 if RUBY_VERSION >= '2.0.0' || (RUBY_PLATFORM == 'java')
   gemfile <<-RB
     gem 'json'
-    gem 'sidekiq', '~> 3.2.0'
+    gem 'sidekiq', '~> 3.3.4'
     gem 'rack'
 
-    # Work around for https://github.com/celluloid/celluloid/issues/457
-    gem 'celluloid', '0.15.2'
-
     gem 'newrelic_rpm', :require => false, :path => File.expand_path('../../../../')
   RB
 end

data/test/multiverse/suites/sidekiq/after_suite.rb

@@ -2,6 +2,15 @@
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
+module Sidekiq
+  class CLI
+    def exit(*args)
+      # No-op Sidekiq's exit since we don't want it shutting us down and eating
+      # our exit code
+    end
+  end
+end
+
 if defined?(SidekiqServer)
   SidekiqServer.instance.stop
 end

data/test/multiverse/suites/sidekiq/sidekiq_instrumentation_test.rb

@@ -51,7 +51,7 @@ class SidekiqTest < Minitest::Test
 
   def run_delayed
     run_and_transmit do |i|
-      TestWorker.delay(:queue => SidekiqServer.instance.queue_name).record('jobs_completed', i + 1)
+      TestWorker.delay(:queue => SidekiqServer.instance.queue_name, :retry => false).record('jobs_completed', i + 1)
     end
   end
 
@@ -62,7 +62,7 @@ class SidekiqTest < Minitest::Test
       end
     end
 
-    NewRelic::Agent.instance.send(:transmit_data)
+    run_harvest
   end
 
   def test_delayed
@@ -93,14 +93,16 @@ class SidekiqTest < Minitest::Test
 
   def test_doesnt_capture_args_by_default
     run_jobs
-    assert_no_params_on_jobs
+    refute_attributes_on_transaction_trace
+    refute_attributes_on_events
   end
 
   def test_isnt_influenced_by_global_capture_params
     with_config(:capture_params => true) do
       run_jobs
     end
-    assert_no_params_on_jobs
+    refute_attributes_on_transaction_trace
+    refute_attributes_on_events
   end
 
   def test_agent_posts_captured_args_to_job
@@ -108,18 +110,16 @@ class SidekiqTest < Minitest::Test
       run_jobs
     end
 
-    transaction_samples = $collector.calls_for('transaction_sample_data')
-    refute transaction_samples.empty?, "Expected a transaction trace"
-
-    transaction_samples.each do |post|
-      post.samples.each do |sample|
-        assert_equal sample.metric_name, TRANSACTION_NAME, "Huh, that transaction shouldn't be in there!"
+    assert_attributes_on_transaction_trace
+    refute_attributes_on_events
+  end
 
-        args = sample.tree.custom_params["job_arguments"]
-        assert_equal args.length, 2
-        assert_equal args[0], "jobs_completed"
-      end
+  def test_arguments_are_captured_on_transaction_events_when_enabled
+    with_config(:'attributes.include' => 'job.sidekiq.args.*') do
+      run_jobs
     end
+
+    assert_attributes_on_events
   end
 
   def assert_metric_and_call_count(name, expected_call_count)
@@ -134,14 +134,47 @@ class SidekiqTest < Minitest::Test
     assert_equal(expected_call_count, call_count)
   end
 
-  def assert_no_params_on_jobs
+  def assert_attributes_on_transaction_trace
+    transaction_samples = $collector.calls_for('transaction_sample_data')
+    refute transaction_samples.empty?, "Expected a transaction trace"
+
+    transaction_samples.each do |post|
+      post.samples.each do |sample|
+        assert_equal sample.metric_name, TRANSACTION_NAME, "Huh, that transaction shouldn't be in there!"
+
+        actual = sample.agent_attributes.keys.to_set
+        expected = Set.new ["job.sidekiq.args.0", "job.sidekiq.args.1"]
+        assert_equal expected, actual
+      end
+    end
+  end
+
+  def refute_attributes_on_transaction_trace
     transaction_samples = $collector.calls_for('transaction_sample_data')
     refute transaction_samples.empty?, "Didn't find any transaction samples!"
 
     transaction_samples.each do |post|
       post.samples.each do |sample|
         assert_equal sample.metric_name, TRANSACTION_NAME, "Huh, that transaction shouldn't be in there!"
-        assert_nil sample.tree.custom_params["job_arguments"]
+        assert sample.agent_attributes.keys.none? { |k| k =~ /^job.sidekiq.args.*/ }
+      end
+    end
+  end
+
+  def assert_attributes_on_events
+    event_posts = $collector.calls_for('analytic_event_data')
+    event_posts.each do |post|
+      post.events.each do |event|
+        assert_equal Set.new(["job.sidekiq.args.0", "job.sidekiq.args.1"]), event[2].keys.to_set
+      end
+    end
+  end
+
+  def refute_attributes_on_events
+    event_posts = $collector.calls_for('analytic_event_data')
+    event_posts.each do |post|
+      post.events.each do |event|
+        assert event[2].keys.none? { |k| k.start_with?("job.sidekiq.args") }, "Found unexpected sidekiq arguments"
       end
     end
   end

data/test/multiverse/suites/sidekiq/test_worker.rb

@@ -5,8 +5,7 @@
 class TestWorker
   include Sidekiq::Worker
 
-  sidekiq_options :queue => SidekiqServer.instance.queue_name
-
+  sidekiq_options :queue => SidekiqServer.instance.queue_name, :retry => false
   @jobs = {}
   @jobs_mutex = Mutex.new
 

data/test/multiverse/suites/sinatra/Envfile

@@ -1,5 +1,5 @@
 gemfile <<-RB
-  gem 'sinatra', '~> 1.4.5'
+  gem 'sinatra', '~> 1.4.6'
   gem 'rack',    '~> 1.5.0'
   gem 'rack-test', :require => 'rack/test'
 RB

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

@@ -11,6 +11,7 @@ development:
   app_name: test
   host: 127.0.0.1
   api_host: 127.0.0.1
+  port: <%= $collector && $collector.port %>
   transaction_tracer:
     record_sql: obfuscated
     enabled: true

data/test/multiverse/suites/sinatra/sinatra_classic_test.rb

@@ -83,10 +83,6 @@ get(/\/regex.*/) do
   "Yeah, regex's!"
 end
 
-post '/files' do
-  "file uploaded"
-end
-
 module Sinatra
   class Application < Base
     # Override to not accidentally start the app in at_exit handler

data/test/multiverse/suites/sinatra/sinatra_modular_test.rb

@@ -78,10 +78,6 @@ class SinatraModularTestApp < Sinatra::Base
   get(/\/regex.*/) do
     "Yeah, regex's!"
   end
-
-  post '/files' do
-    "file uploaded"
-  end
 end
 
 class SinatraModularTest < Minitest::Test

data/test/multiverse/suites/sinatra/sinatra_parameter_capture_test.rb

@@ -0,0 +1,65 @@
+# 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 SinatraParameterCaptureTestApp < Sinatra::Base
+  post "/capture_test" do
+    "capture test"
+  end
+
+  post '/files' do
+    "file uploaded"
+  end
+end
+
+
+class SinatraParameterCaptureTest < Minitest::Test
+  include Rack::Test::Methods
+  include MultiverseHelpers
+
+  setup_and_teardown_agent
+
+  def app
+    SinatraParameterCaptureTestApp
+  end
+
+  def app_name
+    app.to_s
+  end
+
+  def test_request_params_are_captured_for_transaction_events
+    with_config(:'attributes.include' => 'request.parameters.*') do
+      params = {
+        :foo => "bar",
+        :bar => "baz"
+      }
+      post '/capture_test', params
+    end
+
+    expected = {
+      "request.parameters.foo" => "bar",
+      "request.parameters.bar" => "baz"
+    }
+
+    actual = agent_attributes_for_single_event_posted_without_ignored_attributes
+
+    assert_equal(expected, actual)
+  end
+
+  def test_file_upload_params_are_filtered
+    with_config(:capture_params => true) do
+      params = {
+        :title => "blah",
+        :file => Rack::Test::UploadedFile.new(__FILE__, 'text/plain')
+      }
+      post '/files', params
+
+      expected = {
+        "request.parameters.title" => "blah",
+        "request.parameters.file" => "[FILE]"
+      }
+
+      assert_equal(expected, last_transaction_trace_request_params)
+    end
+  end
+end