newrelic_rpm 3.7.3.204 → 3.8.0.218

data/test/multiverse/suites/agent_only/custom_queue_time_test.rb

@@ -0,0 +1,57 @@
+# 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 'newrelic_rpm'
+require 'multiverse_helpers'
+
+class CustomQueueTimeTest < Minitest::Test
+  include MultiverseHelpers
+
+  setup_and_teardown_agent
+
+  DummyRequest = Struct.new(:headers, :cookies)
+
+  class DummyApp
+    include NewRelic::Agent::Instrumentation::ControllerInstrumentation
+
+    def run_transaction(request, simulated_queue_time)
+      opts = { :name => 'run_transaction', :class_name => 'DummyApp', :request => request }
+
+      advance_time(simulated_queue_time)
+
+      perform_action_with_newrelic_trace(opts) do
+        # nothing
+      end
+    end
+  end
+
+  def setup
+    freeze_time
+    @headers = { 'HTTP_X_REQUEST_START' => "t=#{Time.now.to_f}" }
+  end
+
+  def test_pulls_request_headers_from_passed_in_rack_request
+    request = Rack::Request.new(@headers)
+    DummyApp.new.run_transaction(request, 10)
+
+    assert_metrics_recorded(
+      'WebFrontend/QueueTime' => {
+        :call_count      => 1,
+        :total_call_time => 10
+      }
+    )
+  end
+
+  def test_pulls_request_headers_from_passed_in_request_responding_to_headers
+    request = DummyRequest.new(@headers, {})
+    DummyApp.new.run_transaction(request, 10)
+
+    assert_metrics_recorded(
+      'WebFrontend/QueueTime' => {
+        :call_count      => 1,
+        :total_call_time => 10
+      }
+    )
+  end
+end

data/test/multiverse/suites/config_file_loading/config_file_loading_test.rb

@@ -69,7 +69,7 @@ bazbangbarn:
 
   def assert_config_read_from(path)
     setup_config(path)
-    assert NewRelic::Agent.config[:foo] == "success!!", "Failed to read yaml config from #{path.inspect}\n\n#{NewRelic::Agent.config.inspect}"
+    assert NewRelic::Agent.config[:foo] == "success!!", "Failed to read yaml config from #{path.inspect[0..100]}\n\n#{NewRelic::Agent.config.inspect[0..100]}"
   end
 
   def assert_config_not_read_from(path)

data/test/multiverse/suites/mongo/Envfile

@@ -1,3 +1,11 @@
+# Versions >= 1.10.0 are not supported at this time.
+if defined?(RUBY_ENGINE) && RUBY_ENGINE != 'jruby'
+  gemfile <<-RB
+    gem 'mongo', '1.10.0'
+    gem 'bson_ext', :platforms => :ruby
+  RB
+end
+
 gemfile <<-RB
   gem 'mongo', '1.9.2'
   gem 'bson_ext', :platforms => :ruby
@@ -8,7 +16,7 @@ gemfile <<-RB
   gem 'bson_ext', :platforms => :ruby
 RB
 
-# Newest unsupported version of the driver!
+# Versions <= 1.7.1 are not supported and never will be.
 gemfile <<-RB
   gem 'mongo', '~>1.7.1'
   gem 'bson_ext', :platforms => :ruby

data/test/multiverse/suites/rails/Envfile

@@ -1,6 +1,6 @@
 if RUBY_VERSION >= '1.9.3'
   gemfile <<-RB
-    gem 'rails', '~>4.1.0.rc1'
+    gem 'rails', '~>4.1.0'
     # Multiverse has an incompatibility with Minitest 5.3.0, so lock here for
     # now
     gem 'minitest', '5.2.3'
@@ -10,7 +10,7 @@ if RUBY_VERSION >= '1.9.3'
   RB
 
   gemfile <<-RB
-    gem 'rails', '~>4.0.2'
+    gem 'rails', '~>4.0.4'
     gem 'haml', '4.0.2'   # Getting load issues with haml 4.0.3
   RB
 end

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

@@ -5,6 +5,9 @@
 require 'action_controller/railtie'
 require 'active_model'
 
+require 'multiverse_helpers'
+require 'rails/test_help'
+
 # We define our single Rails application here, one time, upon the first inclusion
 # Tests should feel free to define their own Controllers locally, but if they
 # need anything special at the Application level, put it here

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

@@ -3,8 +3,6 @@
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
 require './app'
-require 'rails/test_help'
-require 'multiverse_helpers'
 
 class BadInstrumentationController < ApplicationController
   include Rails.application.routes.url_helpers

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

@@ -3,9 +3,8 @@
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
 # https://newrelic.atlassian.net/browse/RUBY-747
-require 'rails/test_help'
+require './app'
 require 'fake_collector'
-require 'multiverse_helpers'
 require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'helpers', 'exceptions'))
 
 class ErrorController < ApplicationController

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

@@ -3,21 +3,20 @@
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
 require './app'
-require 'multiverse_helpers'
 
 # GC instrumentation only works with REE or MRI >= 1.9.2
-if (defined?(RUBY_DESCRIPTION) && RUBY_DESCRIPTION =~ /Enterprise/) ||
-    (RUBY_VERSION >= '1.9.2' && !NewRelic::LanguageSupport.using_engine?('jruby'))
+if NewRelic::LanguageSupport.ree? ||
+    (RUBY_VERSION >= '1.9.2' && !NewRelic::LanguageSupport.jruby?)
 
 class GcController < ApplicationController
   include Rails.application.routes.url_helpers
   def gc_action
     begin
       profiler = NewRelic::Agent::StatsEngine::GCProfiler.init
-      gc_count = profiler.call_count
+      initial_gc_count = current_gc_count
 
       Timeout.timeout(5) do
-        until profiler.call_count > gc_count
+        until current_gc_count > initial_gc_count
           long_string = "01234567" * 100_000
           long_string = nil
           another_long_string = "01234567" * 100_000
@@ -29,6 +28,14 @@ class GcController < ApplicationController
 
     render :text => 'ha'
   end
+
+  def current_gc_count
+    if NewRelic::LanguageSupport.ree?
+      ::GC.collections
+    elsif RUBY_VERSION >= '1.9.2'
+      ::GC.count
+    end
+  end
 end
 
 class GCRailsInstrumentationTest < ActionController::TestCase
@@ -37,6 +44,8 @@ class GCRailsInstrumentationTest < ActionController::TestCase
   include MultiverseHelpers
 
   setup_and_teardown_agent do
+    NewRelic::Agent.drop_buffered_data
+    NewRelic::Agent::StatsEngine::GCProfiler.reset
     enable_gc_stats
     @controller = GcController.new
   end
@@ -46,8 +55,8 @@ class GCRailsInstrumentationTest < ActionController::TestCase
     get :gc_action
     elapsed = Time.now.to_f - start.to_f
 
-    assert_in_range(elapsed, get_call_time('GC/cumulative'))
-    assert_in_range(elapsed, get_call_time('GC/cumulative', 'Controller/gc/gc_action'))
+    assert_in_range(elapsed, get_call_time('GC/Transaction/allWeb'))
+    assert_in_range(elapsed, get_call_time('GC/Transaction/allWeb', 'Controller/gc/gc_action'))
   end
 
   def test_records_transaction_param_for_gc_activity
@@ -71,7 +80,7 @@ class GCRailsInstrumentationTest < ActionController::TestCase
   end
 
   def enable_gc_stats
-    if RUBY_DESCRIPTION =~ /Enterprise/
+    if NewRelic::LanguageSupport.ree?
       GC.enable_stats
     elsif RUBY_VERSION >= '1.9.2'
       GC::Profiler.enable

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

@@ -4,9 +4,7 @@
 
 # https://newrelic.atlassian.net/browse/RUBY-927
 
-require 'rails/test_help'
 require './app'
-require 'multiverse_helpers'
 
 class IgnoredController < ApplicationController
   include Rails.application.routes.url_helpers

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

@@ -7,9 +7,7 @@
 # Mongrel is only supported on older versions, so don't check for queue depth
 if Rails::VERSION::MAJOR.to_i < 4
 
-require 'rails/test_help'
 require './app'
-require 'multiverse_helpers'
 require 'ostruct'
 
 class MongrelController < ApplicationController

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

@@ -4,9 +4,7 @@
 
 # https://newrelic.atlassian.net/browse/RUBY-927
 
-require 'rails/test_help'
 require './app'
-require 'multiverse_helpers'
 
 class QueueController < ApplicationController
   include Rails.application.routes.url_helpers
@@ -16,30 +14,61 @@ class QueueController < ApplicationController
       format.html { render :text => "<html><head></head><body>Queued</body></html>" }
     end
   end
+
+  def nested
+    nested_transaction
+    render :text => 'whatever'
+  end
+
+  def nested_transaction; end
+
+  add_transaction_tracer :nested_transaction
 end
 
 class QueueTimeTest < ActionDispatch::IntegrationTest
 
+  REQUEST_START_HEADER = 'HTTP_X_REQUEST_START'
+
   include MultiverseHelpers
 
   setup_and_teardown_agent(:beacon => "beacon", :browser_key => "key", :js_agent_loader => "loader")
 
   def test_should_track_queue_time_metric
-    get_queued
+    t0 = freeze_time
+    t1 = advance_time(2)
+    get_path('/queue/queued', t0)
 
-    stat = agent.stats_engine.lookup_stats('WebFrontend/QueueTime')
-    assert_equal 1, stat.call_count
-    assert stat.total_call_time > 0, "Should track some queue time"
+    assert_metrics_recorded(
+      'WebFrontend/QueueTime' => {
+        :call_count      => 1,
+        :total_call_time => (t1 - t0)
+      }
+    )
   end
 
   def test_should_see_queue_time_in_rum
-    get_queued
-    assert extract_queue_time_from_response > 0, "Queue time was missing or zero"
+    t0 = freeze_time
+    t1 = advance_time(2)
+    get_path('/queue/queued', t0)
+    queue_time = extract_queue_time_from_response
+    assert_equal((t1 - t0) * 1000, queue_time)
+  end
+
+  def test_should_not_track_queue_time_for_nested_transactions
+    t0 = freeze_time
+    t1 = advance_time(2)
+    get_path('/queue/nested', t0)
+    assert_metrics_recorded(
+      'WebFrontend/QueueTime' => {
+        :call_count      => 1,
+        :total_call_time => (t1 - t0)
+      }
+    )
   end
 
-  def get_queued(header="HTTP_X_REQUEST_START")
-    value = "t=#{(Time.now.to_i * 1_000_000) - 1_000}"
-    get('/queue/queued', nil, header => value)
+  def get_path(path, queue_start_time)
+    value = "t=#{(queue_start_time.to_f * 1_000_000).to_i}"
+    get(path, nil, REQUEST_START_HEADER => value)
   end
 
   def extract_queue_time_from_response

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

@@ -4,10 +4,7 @@
 
 # https://newrelic.atlassian.net/browse/RUBY-1096
 
-require 'rails/test_help'
 require './app'
-require 'multiverse_helpers'
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'agent_helper')
 
 class RequestStatsController < ApplicationController
   include Rails.application.routes.url_helpers

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

@@ -3,9 +3,7 @@
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
 require './app'
-require 'rails/test_help'
 require 'haml'
-require 'multiverse_helpers'
 
 ActionController::Base.view_paths = ['app/views']
 

data/test/multiverse/suites/sidekiq/Envfile

@@ -3,9 +3,14 @@ suite_condition("SideKiq requires MRI 1.9.3 or JRuby 1.6 in 1.9 mode") do
 end
 
 gemfile <<-RB
-  # Latest version
   gem 'json'
-  gem 'sidekiq', '~> 2.17.0'
+  gem 'sidekiq', '~> 3.0.0'
+  gem 'rack'
+RB
+
+gemfile <<-RB
+  gem 'json'
+  gem 'sidekiq', '~> 2.17.7'
   gem 'rack'
 RB
 

data/test/multiverse/suites/sinatra/Envfile

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

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

@@ -0,0 +1,41 @@
+# 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.dirname(__FILE__), '..', '..', '..', 'agent_helper'))
+
+class MiddlewareApp < Sinatra::Base
+  get '/middle' do
+    "From the middlewarez"
+  end
+end
+
+class MainApp < Sinatra::Base
+  use MiddlewareApp
+
+  get '/main' do
+    "mainly done"
+  end
+end
+
+class NestedMiddlewareTest < Minitest::Test
+  include Rack::Test::Methods
+  include MultiverseHelpers
+
+  def app
+    MainApp
+  end
+
+  setup_and_teardown_agent
+
+  def test_inner_transaction
+    get '/main'
+    assert_metrics_recorded(["Controller/Sinatra/MainApp/GET main"])
+    assert_metrics_not_recorded(["Controller/Sinatra/MiddlewareApp/GET (unknown)"])
+  end
+
+  def test_outer_transaction
+    get '/middle'
+    assert_metrics_recorded(["Controller/Sinatra/MiddlewareApp/GET middle"])
+  end
+end

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

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

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

@@ -21,11 +21,16 @@ class NewRelic::Agent::Agent::ConnectTest < Minitest::Test
     @stats_engine = NewRelic::Agent::StatsEngine.new
     server = NewRelic::Control::Server.new('localhost', 30303)
     @service = NewRelic::Agent::NewRelicService.new('abcdef', server)
+    NewRelic::Agent.instance.service = @service
+    @local_host = nil
+
     @test_config = { :developer_mode => true }
+    NewRelic::Agent.reset_config
     NewRelic::Agent.config.apply_config(@test_config)
   end
 
   def teardown
+    NewRelic::Agent.reset_config
     NewRelic::Agent.config.remove_config(@test_config)
   end
 
@@ -39,6 +44,10 @@ class NewRelic::Agent::Agent::ConnectTest < Minitest::Test
     fake_control
   end
 
+  def local_host
+    @local_host
+  end
+
   def test_should_connect_if_pending
     @connect_state = :pending
     assert(should_connect?, "should attempt to connect if pending")
@@ -99,11 +108,16 @@ class NewRelic::Agent::Agent::ConnectTest < Minitest::Test
   end
 
   def test_connect_settings
-    NewRelic::Agent.config.expects(:app_names)
-    keys = %w(pid host app_name language agent_version environment settings)
-    value = connect_settings
+    NewRelic::Agent.config.expects(:app_names).returns(["apps"])
+    @local_host = "lo-calhost"
+    @environment_report = {}
+
+    keys = %w(pid host app_name language agent_version environment settings).map(&:to_sym)
+
+    settings = connect_settings
     keys.each do |k|
-      assert(value.has_key?(k.to_sym), "should include the key #{k}")
+      assert_includes(settings.keys, k)
+      refute_nil(settings[k], "expected a value for #{k}")
     end
   end
 
@@ -250,6 +264,20 @@ class NewRelic::Agent::Agent::ConnectTest < Minitest::Test
     end
   end
 
+  def test_finish_setup_replaces_server_config
+    finish_setup(:boo => "boo")
+    finish_setup(:hoo => true)
+
+    assert_equal 1, server_layers.length
+
+    assert NewRelic::Agent.config[:hoo]
+    assert_nil NewRelic::Agent.config[:boo]
+  end
+
+  def server_layers
+    stack = NewRelic::Agent.config.config_stack
+    stack.select{|layer| layer.class == NewRelic::Agent::Configuration::ServerSource}
+  end
 
   def test_logging_collector_messages
     NewRelic::Agent.manual_start