newrelic_rpm 3.6.8.168 → 3.6.9.171

data/test/multiverse/suites/curb/curb_test.rb

@@ -188,6 +188,14 @@ class CurbTest < MiniTest::Unit::TestCase
     Curl::Easy.http_post( default_url, '' )
   end
 
+  def put_response
+    Curl::Easy.http_put( default_url, '' )
+  end
+
+  def delete_response
+    Curl::Easy.http_delete( default_url )
+  end
+
   def body(res)
     res.body_str
   end

data/test/multiverse/suites/excon/excon_test.rb

@@ -36,6 +36,14 @@ class ExconTest < MiniTest::Unit::TestCase
     Excon.post(default_url, :body => "")
   end
 
+  def put_response
+    Excon.put(default_url, :body => "")
+  end
+
+  def delete_response
+    Excon.delete(default_url)
+  end
+
   def request_instance
     NewRelic::Agent::HTTPClients::ExconHTTPRequest.new({:headers => ""})
   end

data/test/multiverse/suites/httpclient/httpclient_test.rb

@@ -28,6 +28,14 @@ class HTTPClientTest < MiniTest::Unit::TestCase
     HTTPClient.post(default_url, :body => "")
   end
 
+  def put_response
+    HTTPClient.put(default_url, :body => "")
+  end
+
+  def delete_response
+    HTTPClient.delete(default_url, :body => "")
+  end
+
   def request_instance
     httpclient_req = HTTP::Message.new_request(:get, 'http://newrelic.com')
     NewRelic::Agent::HTTPClients::HTTPClientRequest.new(httpclient_req)

data/test/multiverse/suites/net_http/net_http_test.rb

@@ -50,6 +50,14 @@ class NetHttpTest < MiniTest::Unit::TestCase
     start(default_uri) { |http| http.post(default_uri.path, "") }
   end
 
+  def put_response
+    start(default_uri) { |http| http.put(default_uri.path, "") }
+  end
+
+  def delete_response
+    start(default_uri) { |http| http.delete(default_uri.path) }
+  end
+
   def create_http(uri)
     http = Net::HTTP.new(uri.host, uri.port)
     if use_ssl?

data/test/multiverse/suites/padrino/Envfile

@@ -1,5 +1,6 @@
-suite_condition("Sinatra not compatible with 1.8.6") do
-  RUBY_VERSION != '1.8.6'
+suite_condition("Sinatra not compatible with 1.8.6 or Rubinius") do
+  is_rbx = defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'
+  RUBY_VERSION != '1.8.6' && !is_rbx # https://github.com/rubinius/rubinius/issues/2671
 end
 
 gemfile <<-RB

data/test/multiverse/suites/rails/gc_instrumentation_test.rb

@@ -5,18 +5,27 @@
 require './app'
 require 'multiverse_helpers'
 
-# GC instrumentation only works with REE or 1.9.x
+# GC instrumentation only works with REE or MRI >= 1.9.2
 if (defined?(RUBY_DESCRIPTION) && RUBY_DESCRIPTION =~ /Enterprise/) ||
-    RUBY_VERSION >= '1.9.2'
+    (RUBY_VERSION >= '1.9.2' && !NewRelic::LanguageSupport.using_engine?('jruby'))
 
 class GcController < ApplicationController
   include Rails.application.routes.url_helpers
   def gc_action
-    long_string = "01234567" * 100_000
-    long_string = nil
-    another_long_string = "01234567" * 100_000
-
-    GC.start
+    begin
+      profiler = NewRelic::Agent::StatsEngine::GCProfiler.init
+      gc_count = profiler.call_count
+
+      Timeout.timeout(5) do
+        until profiler.call_count > gc_count
+          long_string = "01234567" * 100_000
+          long_string = nil
+          another_long_string = "01234567" * 100_000
+        end
+      end
+    rescue Timeout::Error
+      puts "Timed out waiting for GC..."
+    end
 
     render :text => 'ha'
   end
@@ -52,7 +61,7 @@ class GCRailsInstrumentationTest < ActionController::TestCase
 
   def assert_in_range(duration, gc_time)
     assert gc_time > 0.0, "GC Time wasn't recorded!"
-    assert gc_time < duration, "GC Time can't be more than elapsed!"
+    assert gc_time < duration, "GC Time #{gc_time} can't be more than elapsed #{duration}!"
   end
 
   def get_call_time(name, scope=nil)

data/test/multiverse/suites/resque/Envfile

@@ -1,5 +1,5 @@
-suite_condition("Resque tests not compatible with 1.8.6, JRuby") do
-  RUBY_VERSION != '1.8.6' && RUBY_PLATFORM != 'java'
+suite_condition("Resque tests not compatible with 1.8.6") do
+  RUBY_VERSION != '1.8.6'
 end
 
 gemfile <<-RB
@@ -9,7 +9,7 @@ gemfile <<-RB
 RB
 
 gemfile <<-RB
-  gem 'resque', '~>1.24.1'
+  gem 'resque', '~>1.25.1'
   gem 'json'
   gem 'rake'
 RB

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

@@ -9,6 +9,7 @@ require 'logger'
 require 'newrelic_rpm'
 require 'fake_collector'
 require 'multiverse_helpers'
+require File.join(File.dirname(__FILE__), "..", "..", "..", "agent_helper")
 
 class ResqueTest < MiniTest::Unit::TestCase
   include MultiverseHelpers
@@ -27,13 +28,14 @@ class ResqueTest < MiniTest::Unit::TestCase
       @count
     end
 
-    def self.perform(sleep_duration=0)
+    def self.perform(name, sleep_duration=0)
       sleep sleep_duration
       @count += 1
     end
   end
 
   JOB_COUNT = 5
+  TRANSACTION_NAME = 'OtherTransaction/ResqueJob/ResqueTest::JobForTesting/perform'
 
   def run_jobs
     JobForTesting.reset_counter
@@ -43,8 +45,10 @@ class ResqueTest < MiniTest::Unit::TestCase
     # will be done in our upcoming end-to-end testing suites
     Resque.inline = true
 
-    JOB_COUNT.times do |i|
-      Resque.enqueue(JobForTesting)
+    with_config(:'transaction_tracer.transaction_threshold' => 0.0) do
+      JOB_COUNT.times do |i|
+        Resque.enqueue(JobForTesting, "testing")
+      end
     end
 
     NewRelic::Agent.instance.send(:transmit_data)
@@ -66,16 +70,54 @@ class ResqueTest < MiniTest::Unit::TestCase
     assert NewRelic::Agent.instance.started?
   end
 
-  METRIC_VALUES_POSITION = 3
+  def test_doesnt_capture_args_by_default
+    run_jobs
+    assert_no_params_on_jobs
+  end
+
+  def test_isnt_influenced_by_global_capture_params
+    with_config(:capture_params => true) do
+      run_jobs
+    end
+    assert_no_params_on_jobs
+  end
+
+  def test_agent_posts_captured_args_to_job
+    with_config(:'resque.capture_params' => true) do
+      run_jobs
+    end
+
+    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 sample.tree.custom_params["job_arguments"], ["testing"]
+      end
+    end
+  end
 
   def assert_metric_and_call_count(name, expected_call_count)
     metric_data = $collector.calls_for('metric_data')
     assert_equal(1, metric_data.size, "expected exactly one metric_data post from agent")
 
-    metric = metric_data.first[METRIC_VALUES_POSITION].find { |m| m[0]['name'] == name }
+    metric = metric_data.first.metrics.find { |m| m[0]['name'] == name }
     assert(metric, "could not find metric named #{name}")
 
     call_count = metric[1][0]
     assert_equal(expected_call_count, call_count)
   end
+
+  def assert_no_params_on_jobs
+    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"]
+      end
+    end
+  end
 end

data/test/multiverse/suites/sequel/Envfile

@@ -31,12 +31,9 @@ gemfile <<-RB
   gem 'sequel', '3.47.0'
 RB
 
-
 gemfile <<-RB
   gem 'newrelic_rpm', :require => false, :path => File.expand_path('../../../../')
   gem 'jdbc-sqlite3', '3.7.2', :platform => :jruby
   gem 'sqlite3', '1.3.7', :platform => :ruby
   gem 'sequel', '4.0.0'
 RB
-
-

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

@@ -0,0 +1,53 @@
+# 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 'sequel'
+
+# This file is intended to define the database connection and schema for all of
+# the Sequel multiverse tests.
+#
+# DO NOT require newrelic_rpm here. Some of the tests rely on the timing of
+# when New Relic gets pulled in.
+if !defined?(DB)
+  def jruby?
+    defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
+  end
+
+  # Use an in-memory SQLite database
+  if (jruby?)
+    DB = Sequel.connect('jdbc:sqlite::memory:')
+  else
+    DB = Sequel.sqlite
+  end
+
+  # Create tables and model classes for testing
+  DB.create_table( :authors ) do
+    primary_key :id
+    string :name
+    string :login
+  end
+  class Author < Sequel::Model; end
+
+  DB.create_table( :posts ) do
+    primary_key :id
+    string :title
+    string :content
+    time :created_at
+  end
+  class Post < Sequel::Model; end
+
+  DB.create_table( :users ) do
+    primary_key :uid
+    string :login
+    string :firstname
+    string :lastname
+  end
+  class User < Sequel::Model; end
+
+  # Version 4.0 of Sequel moved update_except off to a plugin
+  # So we can test that we still instrument it, it's got to be included
+  if defined?(Sequel::MAJOR) && Sequel::MAJOR >= 4
+    Sequel::Model.plugin :blacklist_security
+  end
+end

data/test/{new_relic/agent/instrumentation/sequel_test.rb → multiverse/suites/sequel/sequel_instrumentation_test.rb}

@@ -2,58 +2,22 @@
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
-if defined?(::Rails) && RUBY_VERSION >= "1.8.7"
+require File.join(File.dirname(__FILE__), 'database.rb')
 
-require 'sequel'
+if Sequel.const_defined?( :MAJOR ) &&
+      ( Sequel::MAJOR > 3 ||
+        Sequel::MAJOR == 3 && Sequel::MINOR >= 37 )
 
-require File.expand_path(File.join(File.dirname(__FILE__),'..','..','..','test_helper'))
+require 'newrelic_rpm'
+require File.join(File.dirname(__FILE__), '..', '..', '..', 'agent_helper')
 
-class NewRelic::Agent::Instrumentation::SequelInstrumentationTest < Test::Unit::TestCase
-  require 'active_record_fixtures'
-  include NewRelic::Agent::Instrumentation::ControllerInstrumentation,
-          TransactionSampleTestHelper
-
-  def self.jruby?
-    NewRelic::LanguageSupport.using_engine?('jruby')
-  end
-
-  def jruby?
-    self.class.jruby?
-  end
-
-  # Use an in-memory SQLite database
-  if (jruby?)
-    DB = Sequel.connect('jdbc:sqlite::memory:')
-  else
-    DB = Sequel.sqlite
-  end
-  DB.extension :newrelic_instrumentation
-
-  # Create tables and model classes for testing
-  DB.create_table( :authors ) do
-    primary_key :id
-    string :name
-    string :login
-  end
-  class Author < Sequel::Model; end
-
-  DB.create_table( :posts ) do
-    primary_key :id
-    string :title
-    string :content
-    time :created_at
-  end
-  class Post < Sequel::Model; end
-
-
-
-  #
-  # Setup/teardown
-  #
+class NewRelic::Agent::Instrumentation::SequelInstrumentationTest < MiniTest::Unit::TestCase
 
   def setup
     super
 
+    DB.extension :newrelic_instrumentation
+
     NewRelic::Agent.manual_start
     NewRelic::Agent.instance.transaction_sampler.reset!
     NewRelic::Agent.instance.stats_engine.clear_stats
@@ -65,11 +29,6 @@ class NewRelic::Agent::Instrumentation::SequelInstrumentationTest < Test::Unit::
     NewRelic::Agent.shutdown
   end
 
-
-  #
-  # Tests
-  #
-
   def test_sequel_database_instrumentation_is_loaded
     assert DB.respond_to?( :primary_metric_for )
   end
@@ -144,7 +103,7 @@ class NewRelic::Agent::Instrumentation::SequelInstrumentationTest < Test::Unit::
   def test_model_update_except_method_generates_metrics
     in_web_transaction do
       post = Post.create( :title => 'All The Things', :content => 'A story.' )
-      post.update_except( {:title => 'A Bit More of the Things'}, :created_at )
+      post.update_except( {:title => 'A Bit More of the Things'} )
     end
 
     assert_remote_service_metrics
@@ -303,7 +262,7 @@ class NewRelic::Agent::Instrumentation::SequelInstrumentationTest < Test::Unit::
         yield
       end
 
-      sample = transaction_samples.first.prepare_to_send(
+      sample = transaction_samples.first.prepare_to_send!(
         :explain_sql=>options[:explain_sql] || -0.01,    # Force to take explain, even if duration's reported as 0.0
         :record_sql=>options[:record_sql])
       segment = last_segment( sample )
@@ -320,5 +279,5 @@ class NewRelic::Agent::Instrumentation::SequelInstrumentationTest < Test::Unit::
 end
 
 else
-  puts "Skipping tests in #{__FILE__} because Rails is unavailable"
+  puts "Skipping tests in #{__FILE__} because unsupported Sequel version"
 end

data/test/multiverse/suites/sequel/{sequel_test.rb → sequel_safety_test.rb}

@@ -5,24 +5,9 @@
 # https://newrelic.atlassian.net/browse/RUBY-1123
 # https://support.newrelic.com/tickets/42515
 
-require 'sequel'
-require 'test/unit'
+require File.join(File.dirname(__FILE__), 'database.rb')
 
-if defined?(JRuby)
-  DB = Sequel.connect('jdbc:sqlite::memory:')
-else
-  DB = Sequel.sqlite
-end
-
-DB.create_table( :users ) do
-  primary_key :uid
-  string :login
-  string :firstname
-  string :lastname
-end
-class User < Sequel::Model; end
-
-class SequelTest < MiniTest::Unit::TestCase
+class SequelSafetyTest < MiniTest::Unit::TestCase
 
   def test_it_doesnt_blow_up
     require 'newrelic_rpm'

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

@@ -10,9 +10,11 @@ require 'test/unit'
 require 'newrelic_rpm'
 require 'fake_collector'
 require 'multiverse_helpers'
+require File.join(File.dirname(__FILE__), "..", "..", "..", "agent_helper")
 
 class SidekiqTest < MiniTest::Unit::TestCase
   JOB_COUNT = 5
+  TRANSACTION_NAME = 'OtherTransaction/SidekiqJob/SidekiqTest::TestWorker/perform'
 
   include MultiverseHelpers
 
@@ -50,9 +52,11 @@ class SidekiqTest < MiniTest::Unit::TestCase
   end
 
   def run_jobs
-    TestWorker.reset
-    JOB_COUNT.times do |i|
-      TestWorker.perform_async('jobs_completed', i + 1)
+    with_config(:'transaction_tracer.transaction_threshold' => 0.0) do
+      TestWorker.reset
+      JOB_COUNT.times do |i|
+        TestWorker.perform_async('jobs_completed', i + 1)
+      end
     end
 
     NewRelic::Agent.instance.send(:transmit_data)
@@ -70,16 +74,57 @@ class SidekiqTest < MiniTest::Unit::TestCase
     assert_metric_and_call_count('OtherTransaction/SidekiqJob/all', JOB_COUNT)
   end
 
-  METRIC_VALUES_POSITION = 3
+  def test_doesnt_capture_args_by_default
+    run_jobs
+    assert_no_params_on_jobs
+  end
+
+  def test_isnt_influenced_by_global_capture_params
+    with_config(:capture_params => true) do
+      run_jobs
+    end
+    assert_no_params_on_jobs
+  end
+
+  def test_agent_posts_captured_args_to_job
+    with_config(:'sidekiq.capture_params' => true) do
+      run_jobs
+    end
+
+    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!"
+
+        args = sample.tree.custom_params["job_arguments"]
+        assert_equal args.length, 2
+        assert_equal args[0], "jobs_completed"
+      end
+    end
+  end
 
   def assert_metric_and_call_count(name, expected_call_count)
     metric_data = $collector.calls_for('metric_data')
     assert_equal(1, metric_data.size, "expected exactly one metric_data post from agent")
 
-    metric = metric_data.first[METRIC_VALUES_POSITION].find { |m| m[0]['name'] == name }
+    metric = metric_data.first.metrics.find { |m| m[0]['name'] == name }
     assert(metric, "could not find metric named #{name}")
 
     call_count = metric[1][0]
     assert_equal(expected_call_count, call_count)
   end
+
+  def assert_no_params_on_jobs
+    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"]
+      end
+    end
+  end
 end