newrelic_rpm 3.8.1.221 → 3.9.0.229

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

@@ -1,7 +1,6 @@
 ---
 development:
   error_collector:
-    capture_source: true
     enabled: true
   apdex_t: 0.5
   ssl: false

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

@@ -1,7 +1,6 @@
 ---
 development:
   error_collector:
-    capture_source: true
     enabled: true
   apdex_t: 0.5
   ssl: false

data/test/multiverse/suites/sidekiq/Envfile

@@ -6,12 +6,14 @@ gemfile <<-RB
   gem 'json'
   gem 'sidekiq', '~> 3.0.0'
   gem 'rack'
+  gem 'newrelic_rpm', :require => false, :path => File.expand_path('../../../../')
 RB
 
 gemfile <<-RB
   gem 'json'
   gem 'sidekiq', '~> 2.17.7'
   gem 'rack'
+  gem 'newrelic_rpm', :require => false, :path => File.expand_path('../../../../')
 RB
 
 gemfile <<-RB
@@ -19,5 +21,7 @@ gemfile <<-RB
   # Having rbx issues on 2.8.0, 2.9.0 seems fine.
   gem 'json'
   gem 'sidekiq', '~> 2.9.0'
+  gem 'timers', '~> 1.1.0'
   gem 'rack'
+  gem 'newrelic_rpm', :require => false, :path => File.expand_path('../../../../')
 RB

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

@@ -0,0 +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.
+
+if defined?(SidekiqServer)
+  SidekiqServer.instance.stop
+end

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

@@ -1,7 +1,6 @@
 ---
 development:
   error_collector:
-    capture_source: true
     enabled: true
   apdex_t: 0.5
   ssl: false

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

@@ -4,63 +4,82 @@
 
 # https://newrelic.atlassian.net/browse/RUBY-775
 
-require 'sidekiq'
-require 'sidekiq/testing/inline'
+require File.join(File.dirname(__FILE__), "sidekiq_server")
+SidekiqServer.instance.run
+
+# Important to require after Sidekiq server starts for middleware to install
 require 'newrelic_rpm'
+
+require 'logger'
+require 'stringio'
+
 require 'fake_collector'
 require 'multiverse_helpers'
+require File.join(File.dirname(__FILE__), "test_worker")
 require File.join(File.dirname(__FILE__), "..", "..", "..", "agent_helper")
 
 class SidekiqTest < Minitest::Test
   JOB_COUNT = 5
-  TRANSACTION_NAME = 'OtherTransaction/SidekiqJob/SidekiqTest::TestWorker/perform'
-
-  include MultiverseHelpers
 
-  setup_and_teardown_agent
+  ROLLUP_METRIC            = 'OtherTransaction/SidekiqJob/all'
+  TRANSACTION_NAME         = 'OtherTransaction/SidekiqJob/TestWorker/perform'
+  DELAYED_TRANSACTION_NAME = 'OtherTransaction/SidekiqJob/TestWorker/record'
+  DELAYED_FAILED_TXN_NAME  = 'OtherTransaction/SidekiqJob/Sidekiq::Extensions::DelayedClass/perform'
 
-  class TestWorker
-    include Sidekiq::Worker
-
-    @jobs = {}
+  include MultiverseHelpers
 
-    def self.reset
-      @jobs = {}
-    end
+  setup_and_teardown_agent do
+    TestWorker.register_signal('jobs_completed')
+    @sidekiq_log = ::StringIO.new
 
-    def self.record(key, val)
-      @jobs[key] ||= []
-      @jobs[key] << val
-    end
+    string_logger = ::Logger.new(@sidekiq_log)
+    string_logger.formatter = Sidekiq.logger.formatter
+    Sidekiq.logger = string_logger
+  end
 
-    def self.records_for(key)
-      @jobs[key]
+  def teardown
+    teardown_agent
+    if !passed? || ENV["VERBOSE"]
+      @sidekiq_log.rewind
+      puts @sidekiq_log.read
     end
+  end
 
-    def perform(key, val)
-      TestWorker.record(key, val)
+  def run_jobs
+    run_and_transmit do |i|
+      TestWorker.perform_async('jobs_completed', i + 1)
     end
   end
 
-  # Running inline doesn't set up server middlewares
-  # Using the client middleware to get there instead
-  Sidekiq.configure_client do |config|
-    config.client_middleware do |chain|
-      chain.add NewRelic::SidekiqInstrumentation
+  def run_delayed
+    run_and_transmit do |i|
+      TestWorker.delay(:queue => SidekiqServer.instance.queue_name).record('jobs_completed', i + 1)
     end
   end
 
-  def run_jobs
+  def run_and_transmit
     with_config(:'transaction_tracer.transaction_threshold' => 0.0) do
-      TestWorker.reset
-      JOB_COUNT.times do |i|
-        TestWorker.perform_async('jobs_completed', i + 1)
+      TestWorker.run_jobs(JOB_COUNT) do |i|
+        yield i
       end
     end
 
     NewRelic::Agent.instance.send(:transmit_data)
   end
 
+  def test_delayed
+    run_delayed
+    assert_metric_and_call_count(ROLLUP_METRIC, JOB_COUNT)
+    assert_metric_and_call_count(DELAYED_TRANSACTION_NAME, JOB_COUNT)
+  end
+
+  def test_delayed_with_malformed_yaml
+    YAML.stubs(:load).raises(RuntimeError.new("Ouch"))
+    run_delayed
+    assert_metric_and_call_count(ROLLUP_METRIC, JOB_COUNT)
+    assert_metric_and_call_count(DELAYED_FAILED_TXN_NAME, JOB_COUNT)
+  end
+
   def test_all_jobs_ran
     run_jobs
     completed_jobs = Set.new(TestWorker.records_for('jobs_completed').map(&:to_i))
@@ -70,7 +89,8 @@ class SidekiqTest < Minitest::Test
 
   def test_agent_posts_correct_metric_data
     run_jobs
-    assert_metric_and_call_count('OtherTransaction/SidekiqJob/all', JOB_COUNT)
+    assert_metric_and_call_count(ROLLUP_METRIC, JOB_COUNT)
+    assert_metric_and_call_count(TRANSACTION_NAME, JOB_COUNT)
   end
 
   def test_doesnt_capture_args_by_default
@@ -91,7 +111,7 @@ class SidekiqTest < Minitest::Test
     end
 
     transaction_samples = $collector.calls_for('transaction_sample_data')
-    assert_false transaction_samples.empty?
+    refute transaction_samples.empty?, "Expected a transaction trace"
 
     transaction_samples.each do |post|
       post.samples.each do |sample|
@@ -109,7 +129,8 @@ class SidekiqTest < Minitest::Test
     assert_equal(1, metric_data.size, "expected exactly one metric_data post from agent")
 
     metric = metric_data.first.metrics.find { |m| m[0]['name'] == name }
-    assert(metric, "could not find metric named #{name}")
+    assert(metric, "Could not find metric named #{name}. Did have metrics:\n"+
+                   metric_data.first.metrics.map{|m| m[0]['name']}.join("\t\n"))
 
     call_count = metric[1][0]
     assert_equal(expected_call_count, call_count)
@@ -117,7 +138,7 @@ class SidekiqTest < Minitest::Test
 
   def assert_no_params_on_jobs
     transaction_samples = $collector.calls_for('transaction_sample_data')
-    assert_false transaction_samples.empty?
+    refute transaction_samples.empty?, "Didn't find any transaction samples!"
 
     transaction_samples.each do |post|
       post.samples.each do |sample|

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

@@ -0,0 +1,30 @@
+# 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 'sidekiq'
+require 'sidekiq/cli'
+
+class SidekiqServer
+  include Singleton
+
+  attr_reader :queue_name
+
+  def initialize
+    @queue_name = "sidekiq#{Process.pid}"
+    @sidekiq = Sidekiq::CLI.instance
+  end
+
+  def run(file="test_worker.rb")
+    @sidekiq.parse(["--require", File.join(File.dirname(__FILE__), file),
+                    "--queue", "#{queue_name},1"])
+    Thread.new { @sidekiq.run }
+  end
+
+  # If we just let the process go away, occasional timing issues cause the
+  # Launcher actor in Sidekiq to throw a fuss and exit with a failed code.
+  def stop
+    puts "Trying to stop Sidekiq gracefully"
+    @sidekiq.launcher.stop
+  end
+end

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

@@ -0,0 +1,60 @@
+# 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 TestWorker
+  include Sidekiq::Worker
+
+  sidekiq_options :queue => SidekiqServer.instance.queue_name
+
+  @jobs = {}
+  @jobs_mutex = Mutex.new
+
+  @done = Queue.new
+
+  def self.register_signal(key)
+    return if @registered_signal
+
+    NewRelic::Agent.subscribe(:transaction_finished) do |payload|
+      @done.push(true)
+    end
+    @registered_signal = true
+  end
+
+  def self.run_jobs(count)
+    reset(count)
+    count.times do |i|
+      yield i
+    end
+    wait
+  end
+
+  def self.reset(done_at)
+    @jobs = {}
+    @done_at = done_at
+  end
+
+  def self.record(key, val)
+    @jobs_mutex.synchronize do
+      @jobs[key] ||= []
+      @jobs[key] << val
+    end
+  end
+
+  def self.records_for(key)
+    @jobs[key]
+  end
+
+  def self.wait
+    # Don't hang out forever, but shouldn't count on the timeout functionally
+    Timeout.timeout(60) do
+      @done_at.times do
+        @done.pop
+      end
+    end
+  end
+
+  def perform(key, val)
+    TestWorker.record(key, val)
+  end
+end

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

@@ -1,7 +1,6 @@
 ---
 development:
   error_collector:
-    capture_source: true
     enabled: true
   apdex_t: 0.5
   ssl: false

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

@@ -32,8 +32,14 @@ class SinatraIgnoreTestApp < Sinatra::Base
   get '/no_apdex' do request.path_info end
 
   newrelic_ignore_enduser '/no_enduser'
-  get '/no_enduser' do request.path_info end
 
+  get '/enduser' do
+    "<html><head></head><body>#{request.path_info}</body></html>"
+  end
+
+  get '/no_enduser' do
+    "<html><head></head><body>#{request.path_info}</body></html>"
+  end
 end
 
 class SinatraTestCase < Minitest::Test
@@ -41,12 +47,25 @@ class SinatraTestCase < Minitest::Test
   include ::NewRelic::Agent::Instrumentation::Sinatra
   include MultiverseHelpers
 
-  setup_and_teardown_agent
+  JS_AGENT_LOADER = "JS_AGENT_LOADER"
+
+  setup_and_teardown_agent(:application_id => 'appId',
+                           :beacon => 'beacon',
+                           :browser_key => 'browserKey',
+                           :js_agent_loader => JS_AGENT_LOADER)
 
   def get_and_assert_ok(path)
     get(path)
     assert_equal 200, last_response.status
-    assert_equal path, last_response.body
+    assert_match(/#{Regexp.escape(path)}/, last_response.body)
+  end
+
+  def assert_enduser_ignored(response)
+    refute_match(/#{JS_AGENT_LOADER}/, response.body)
+  end
+
+  def refute_enduser_ignored(response)
+    assert_match(/#{JS_AGENT_LOADER}/, response.body)
   end
 
   # Keep Test::Unit happy by specifying at least one test method here
@@ -63,12 +82,6 @@ class SinatraIgnoreTest < SinatraTestCase
     app.to_s
   end
 
-  def get_and_assert_ok(path)
-    get(path)
-    assert_equal 200, last_response.status
-    assert_equal path, last_response.body
-  end
-
   def test_seen_route
     get_and_assert_ok '/record'
     assert_metrics_recorded([
@@ -126,10 +139,19 @@ class SinatraIgnoreTest < SinatraTestCase
     assert_metrics_not_recorded(["Apdex/Sinatra/#{app_name}/GET no_apdex"])
   end
 
+  def test_ignore_enduser_should_only_apply_to_specified_route
+    get_and_assert_ok '/enduser'
+
+    refute_enduser_ignored(last_response)
+    assert_metrics_recorded([
+      "Controller/Sinatra/#{app_name}/GET enduser",
+      "Apdex/Sinatra/#{app_name}/GET enduser"])
+  end
+
   def test_ignore_enduser
     get_and_assert_ok '/no_enduser'
 
-    assert NewRelic::Agent::TransactionState.get.request_ignore_enduser
+    assert_enduser_ignored(last_response)
     assert_metrics_recorded([
       "Controller/Sinatra/#{app_name}/GET no_enduser",
       "Apdex/Sinatra/#{app_name}/GET no_enduser"])
@@ -183,6 +205,6 @@ class SinatraIgnoreApdexAndEndUserTest < SinatraTestCase
 
   def test_ignores_enduser
     get_and_assert_ok '/'
-    assert NewRelic::Agent::TransactionState.get.request_ignore_enduser
+    assert_enduser_ignored(last_response)
   end
 end

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

@@ -73,7 +73,9 @@ class SinatraMetricExplosionTest < Minitest::Test
 
     name_beginnings_to_ignore = [
       "Supportability",
-      "GC/Transaction"
+      "GC/Transaction",
+      "Nested/Controller",
+      "Middleware"
     ]
     metric_names.delete_if do|metric|
       name_beginnings_to_ignore.any? {|name| metric.start_with?(name)}

data/test/multiverse/suites/typhoeus/Envfile

@@ -9,6 +9,15 @@ suite_condition("Typhoeus not supported in 1.8.6 and excluded on 1.8.7 non-REE")
   (RUBY_VERSION != '1.8.7' || RUBY_DESCRIPTION =~ /Enterprise/)
 end
 
+gemfile <<-RB
+  gem 'typhoeus', '~> 0.6.5'
+  gem 'rack'
+  gem 'json', :platforms => [:rbx, :mri_18]
+
+  # We try translating URIs through Addressable if it's there, so test with it.
+  gem 'addressable', :require => 'addressable/uri'
+RB
+
 gemfile <<-RB
   gem 'typhoeus', '~> 0.6.5'
   gem 'rack'

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

@@ -1,7 +1,6 @@
 ---
 development:
   error_collector:
-    capture_source: true
     enabled: true
   apdex_t: 0.5
   ssl: false

data/test/multiverse/suites/typhoeus/typhoeus_test.rb

@@ -103,6 +103,16 @@ if NewRelic::Agent::Instrumentation::TyphoeusTracing.is_supported_version?
       end
     end
 
+    def test_request_succeeds_even_if_tracing_doesnt
+      in_transaction("test") do
+        ::NewRelic::Agent::CrossAppTracing.stubs(:start_trace).raises("Booom")
+        res = get_response
+
+        assert_match %r/<head>/i, body(res)
+        assert_metrics_not_recorded(["External/all"])
+      end
+    end
+
     def test_hydra
       in_transaction("test") do
         hydra = Typhoeus::Hydra.new