newrelic_rpm 3.7.2.195 → 3.7.3.199

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

@@ -7,7 +7,7 @@ require 'fake_collector'
 require './testing_app'
 require 'multiverse_helpers'
 
-class CrossApplicationTracingTest < MiniTest::Unit::TestCase
+class CrossApplicationTracingTest < Minitest::Test
 
   # Important because the hooks are global that we only wire one AgentHooks up
   @@app = TestingApp.new

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

@@ -4,7 +4,7 @@
 
 if RUBY_VERSION >= '1.9'
 
-class CollectorExceptionHandlingTest < MiniTest::Unit::TestCase
+class CollectorExceptionHandlingTest < Minitest::Test
   include MultiverseHelpers
 
   setup_and_teardown_agent

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

@@ -5,7 +5,7 @@
 require 'newrelic_rpm'
 require 'multiverse_helpers'
 
-class HarvestTimestampsTest < MiniTest::Unit::TestCase
+class HarvestTimestampsTest < Minitest::Test
   include MultiverseHelpers
 
   setup_and_teardown_agent

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

@@ -6,7 +6,7 @@
 require 'fake_collector'
 require 'multiverse_helpers'
 
-class HttpResponseCodeTest < MiniTest::Unit::TestCase
+class HttpResponseCodeTest < Minitest::Test
   include MultiverseHelpers
 
   setup_and_teardown_agent

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

@@ -5,7 +5,7 @@
 require File.join(File.dirname(__FILE__), '..', '..', '..', 'agent_helper')
 require 'multiverse_helpers'
 
-class KeyTransactionsTest < MiniTest::Unit::TestCase
+class KeyTransactionsTest < Minitest::Test
 
   include MultiverseHelpers
 

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

@@ -11,7 +11,7 @@ require 'newrelic_rpm'
 require 'fake_collector'
 require 'multiverse_helpers'
 
-class LoggingTest < MiniTest::Unit::TestCase
+class LoggingTest < Minitest::Test
 
   include MultiverseHelpers
 

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

@@ -7,7 +7,7 @@
 require 'ostruct'
 require 'multiverse_helpers'
 
-class MarshalingTest < MiniTest::Unit::TestCase
+class MarshalingTest < Minitest::Test
   include MultiverseHelpers
 
   setup_and_teardown_agent(:'transaction_tracer.transaction_threshold' => 0.0) do |collector|

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

@@ -6,7 +6,7 @@
 
 require 'multiverse_helpers'
 
-class PipeManagerTest < MiniTest::Unit::TestCase
+class PipeManagerTest < Minitest::Test
   include MultiverseHelpers
 
   setup_and_teardown_agent

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

@@ -4,7 +4,7 @@
 
 require 'multiverse_helpers'
 
-class RenameRuleTest < MiniTest::Unit::TestCase
+class RenameRuleTest < Minitest::Test
 
   include MultiverseHelpers
 

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

@@ -7,7 +7,7 @@ require 'new_relic/rack/browser_monitoring'
 require './testing_app'
 require 'multiverse_helpers'
 
-class RumAutoTest < MiniTest::Unit::TestCase
+class RumAutoTest < Minitest::Test
 
   attr_reader :app
 

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

@@ -4,7 +4,7 @@
 
 require 'socket'
 
-class ServiceTimeoutTest < MiniTest::Unit::TestCase
+class ServiceTimeoutTest < Minitest::Test
 
   def setup
     hk = TCPServer.new('127.0.0.1',0)

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

@@ -4,7 +4,7 @@
 
 require 'multiverse_helpers'
 
-class SetTransactionNameTest < MiniTest::Unit::TestCase
+class SetTransactionNameTest < Minitest::Test
   include NewRelic::Agent::MethodTracer
 
   include MultiverseHelpers

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

@@ -4,7 +4,7 @@
 
 require 'multiverse_helpers'
 
-class SSLTest < MiniTest::Unit::TestCase
+class SSLTest < Minitest::Test
 
   include MultiverseHelpers
 

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

@@ -5,7 +5,7 @@
 # RUBY-839 make sure there is no STDOUT chatter
 require 'open3'
 
-class StartUpTest < MiniTest::Unit::TestCase
+class StartUpTest < Minitest::Test
   def test_should_not_print_to_stdout_when_logging_available
     ruby = 'require "newrelic_rpm"; NewRelic::Agent.manual_start; NewRelic::Agent.shutdown'
     cmd = "bundle exec ruby -e '#{ruby}'"

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

@@ -10,7 +10,7 @@ if RUBY_VERSION >= '1.9'
 require 'thread'
 require 'multiverse_helpers'
 
-class ThreadProfilingTest < MiniTest::Unit::TestCase
+class ThreadProfilingTest < Minitest::Test
 
   include MultiverseHelpers
 

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

@@ -11,7 +11,7 @@ require 'rack/test'
 require 'multiverse_helpers'
 require './testing_app'
 
-class XraySessionsTest < MiniTest::Unit::TestCase
+class XraySessionsTest < Minitest::Test
 
   AGENT_RUN_ID = 123
 

data/test/multiverse/suites/bare/standalone_instrumentation_test.rb

@@ -10,7 +10,7 @@
 
 require 'new_relic/agent/method_tracer' 
 
-class StandaloneInstrumentationTest < MiniTest::Unit::TestCase
+class StandaloneInstrumentationTest < Minitest::Test
   class InstrumentedClass
     def instance_method(*args)
       args

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

@@ -16,7 +16,7 @@
 
 require 'multiverse_helpers'
 
-class ConfigFileLoadingTest < MiniTest::Unit::TestCase
+class ConfigFileLoadingTest < Minitest::Test
   include MultiverseHelpers
 
   def setup

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

@@ -10,7 +10,7 @@ require 'new_relic/agent/http_clients/curb_wrappers'
 
 require File.join(File.dirname(__FILE__), "..", "..", "..", "agent_helper")
 
-class CurbTest < MiniTest::Unit::TestCase
+class CurbTest < Minitest::Test
 
   #
   # Tests

data/test/multiverse/suites/datamapper/datamapper_test.rb

@@ -27,7 +27,7 @@ class DummyConnection
   include NewRelic::Agent::Instrumentation::DataMapperInstrumentation
 end
 
-class DataMapperTest < MiniTest::Unit::TestCase
+class DataMapperTest < Minitest::Test
   include MultiverseHelpers
 
   setup_and_teardown_agent

data/test/multiverse/suites/deferred_instrumentation/sinatra_test.rb

@@ -80,7 +80,7 @@ class DeferredSinatraTestApp < Sinatra::Base
   end
 end
 
-class DeferredSinatraTest < MiniTest::Unit::TestCase
+class DeferredSinatraTest < Minitest::Test
   include SinatraTestCases
 
   def app

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

@@ -8,7 +8,7 @@ require "http_client_test_cases"
 
 require File.join(File.dirname(__FILE__), "..", "..", "..", "agent_helper")
 
-class ExconTest < MiniTest::Unit::TestCase
+class ExconTest < Minitest::Test
   include HttpClientTestCases
 
   def client_name

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

@@ -8,7 +8,7 @@ require "http_client_test_cases"
 
 require File.join(File.dirname(__FILE__), "..", "..", "..", "agent_helper")
 
-class HTTPClientTest < MiniTest::Unit::TestCase
+class HTTPClientTest < Minitest::Test
   include HttpClientTestCases
 
   def client_name

data/test/multiverse/suites/mongo/helpers/mongo_operation_tests.rb

@@ -97,9 +97,13 @@ module MongoOperationTests
   end
 
   def test_records_metrics_for_group
-    @collection.group({:key => "name",
-                       :initial => {:count => 0},
-                       :reduce => "function(k,v) { v.count += 1; }" })
+    begin
+      @collection.group({:key => "name",
+                        :initial => {:count => 0},
+                        :reduce => "function(k,v) { v.count += 1; }" })
+    rescue Mongo::OperationFailure
+      # We get occasional group failures, but should still record metrics
+    end
 
     metrics = build_test_metrics(:group)
     expected = metrics_with_attributes(metrics)

data/test/multiverse/suites/mongo/mongo_instrumentation_test.rb

@@ -14,7 +14,7 @@ if NewRelic::Agent::Datastores::Mongo.is_supported_version?
   require File.join(File.dirname(__FILE__), 'helpers', 'mongo_replica_set')
   require File.join(File.dirname(__FILE__), 'helpers', 'mongo_operation_tests')
 
-  class NewRelic::Agent::Instrumentation::MongoInstrumentationTest < MiniTest::Unit::TestCase
+  class NewRelic::Agent::Instrumentation::MongoInstrumentationTest < Minitest::Test
     include Mongo
     include ::NewRelic::TestHelpers::MongoMetricBuilder
     include ::MongoOperationTests

data/test/multiverse/suites/mongo/mongo_unsupported_version_test.rb

@@ -10,7 +10,7 @@ require File.join(File.dirname(__FILE__), '..', '..', '..', 'agent_helper')
 if !NewRelic::Agent::Datastores::Mongo.is_supported_version?
   require File.join(File.dirname(__FILE__), 'helpers', 'mongo_server')
 
-  class NewRelic::Agent::Instrumentation::MongoUnsupportedVersionTest < MiniTest::Unit::TestCase
+  class NewRelic::Agent::Instrumentation::MongoInstrumentationTest < Minitest::Test
     include Mongo
 
     def setup
@@ -32,7 +32,7 @@ if !NewRelic::Agent::Datastores::Mongo.is_supported_version?
 
     def test_records_metrics_for_insert
       @collection.insert(@tribble)
-      assert_metrics_not_recorded(["Datastore/allWeb", "Datastore/allOther"])
+      assert_metrics_not_recorded(["Datastore/all", "Datastore/allWeb", "Datastore/allOther"])
     end
   end
 end

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

@@ -8,7 +8,7 @@ require "http_client_test_cases"
 
 require File.join(File.dirname(__FILE__), "..", "..", "..", "agent_helper")
 
-class NetHttpTest < MiniTest::Unit::TestCase
+class NetHttpTest < Minitest::Test
   include HttpClientTestCases
 
   #

data/test/multiverse/suites/padrino/Envfile

@@ -5,7 +5,7 @@ end
 
 gemfile <<-RB
   # Gemspec from rubygems on this version gets illformed warnings on 1.8.7
-  gem 'http_router', '0.11.0', :git => 'git://github.com/joshbuddy/http_router.git'
+  gem 'http_router', '0.11.0', :git => 'git://github.com/joshbuddy/http_router.git', :tag => 'v0.11.0'
 
   gem 'activesupport', '~> 3'
   gem 'padrino', '~> 0.11.0'

data/test/multiverse/suites/padrino/padrino_test.rb

@@ -22,7 +22,7 @@ class PadrinoTestApp < Padrino::Application
   end
 end
 
-class PadrinoRoutesTest < MiniTest::Unit::TestCase
+class PadrinoRoutesTest < Minitest::Test
   include Rack::Test::Methods
 
   def app

data/test/multiverse/suites/rails/Envfile

@@ -1,4 +1,14 @@
 if RUBY_VERSION >= '1.9.3'
+  gemfile <<-RB
+    gem 'rails', '~>4.1.0.rc1'
+    # Multiverse has an incompatibility with Minitest 5.3.0, so lock here for
+    # now
+    gem 'minitest', '5.2.3'
+
+    # Load error with beta haml + rails, so hold require until test needs it.
+    gem 'haml', '~>4.1.0.beta1', :require => false
+  RB
+
   gemfile <<-RB
     gem 'rails', '~>4.0.2'
     gem 'haml', '4.0.2'   # Getting load issues with haml 4.0.3

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

@@ -17,14 +17,18 @@ class RequestStatsController < ApplicationController
     render :text => 'some stuff'
   end
 
+  def cross_app_action
+    NewRelic::Agent::TransactionState.get.is_cross_app_caller = true
+    render :text => 'some stuff'
+  end
+
   def stats_action_with_custom_params
     ::NewRelic::Agent.add_custom_parameters('color' => 'blue', 1 => :bar, 'bad' => {})
     render :text => 'some stuff'
   end
 end
 
-class RequestStatsTest < ActionController::TestCase
-  tests RequestStatsController
+class RequestStatsTest < ActionDispatch::IntegrationTest
   extend Multiverse::Color
 
   include MultiverseHelpers
@@ -36,7 +40,7 @@ class RequestStatsTest < ActionController::TestCase
 
   def test_doesnt_send_when_disabled
     with_config( :'analytics_events.enabled' => false ) do
-      20.times { get :stats_action }
+      5.times { get '/request_stats/stats_action' }
 
       NewRelic::Agent.agent.send(:harvest_and_send_analytic_event_data)
 
@@ -46,7 +50,7 @@ class RequestStatsTest < ActionController::TestCase
 
   def test_request_times_should_be_reported_if_enabled
     with_config( :'analytics_events.enabled' => true ) do
-      20.times { get :stats_action }
+      5.times { get '/request_stats/stats_action' }
 
       NewRelic::Agent.agent.send(:harvest_and_send_analytic_event_data)
 
@@ -64,12 +68,61 @@ class RequestStatsTest < ActionController::TestCase
       assert_equal 'Transaction', sample['type']
       assert_kind_of Float, sample['duration']
       assert_kind_of Float, sample['timestamp']
+
+      assert_nil sample['nr.guid']
+      assert_nil sample['nr.referringTransactionGuid']
+    end
+  end
+
+  def test_request_should_include_guid_if_cross_app
+    with_config( :'analytics_events.enabled' => true ) do
+      5.times { get '/request_stats/cross_app_action' }
+
+      NewRelic::Agent.agent.send(:harvest_and_send_analytic_event_data)
+
+      post = $collector.calls_for('analytic_event_data').first
+
+      refute_nil( post )
+      assert_kind_of Array, post.body
+      assert_kind_of Array, post.body.first
+
+      sample = post.body.first.first
+      assert_kind_of Hash, sample
+
+      assert_kind_of String, sample['nr.guid']
+    end
+  end
+
+  def test_request_should_include_referring_guid_if_needed
+    with_config(:'analytics_events.enabled' => true,
+                :'cross_process_id' => 'boo',
+                :'encoding_key' => "\0",
+                :'trusted_account_ids' => [1]) do
+      request_headers = {
+        'X-NewRelic-ID' => Base64.encode64('1#234'),
+        'X-NewRelic-Transaction' => Base64.encode64('["8badf00d",1]')
+      }
+      get '/request_stats/cross_app_action', {}, request_headers
+
+      NewRelic::Agent.agent.send(:harvest_and_send_analytic_event_data)
+
+      post = $collector.calls_for('analytic_event_data').first
+
+      refute_nil( post )
+      assert_kind_of Array, post.body
+      assert_kind_of Array, post.body.first
+
+      sample = post.body.first.first
+
+      assert_kind_of Hash, sample
+      assert_kind_of String, sample['nr.guid']
+      assert_equal('8badf00d', sample['nr.referringTransactionGuid'])
     end
   end
 
   def test_custom_params_should_be_reported_with_events_and_coerced_to_safe_types
     with_config( :'analytics_events.enabled' => true ) do
-      20.times { get :stats_action_with_custom_params }
+      5.times { get '/request_stats/stats_action_with_custom_params' }
 
       NewRelic::Agent.agent.send(:harvest_and_send_analytic_event_data)
 
@@ -98,7 +151,7 @@ class RequestStatsTest < ActionController::TestCase
 
   def test_request_samples_should_be_preserved_upon_failure
     with_config(:'analytics_events.enabled' => true) do
-      5.times { get :stats_action }
+      5.times { get '/request_stats/stats_action' }
 
       # fail once
       $collector.stub('analytic_event_data', {}, 503)

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

@@ -4,6 +4,7 @@
 
 require './app'
 require 'rails/test_help'
+require 'haml'
 require 'multiverse_helpers'
 
 ActionController::Base.view_paths = ['app/views']

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

@@ -11,7 +11,7 @@ require 'fake_collector'
 require 'multiverse_helpers'
 require File.join(File.dirname(__FILE__), "..", "..", "..", "agent_helper")
 
-class ResqueTest < MiniTest::Unit::TestCase
+class ResqueTest < Minitest::Test
   include MultiverseHelpers
 
   setup_and_teardown_agent