newrelic_rpm 3.11.2.286 → 3.12.0.288

data/test/multiverse/lib/multiverse/suite.rb

@@ -180,8 +180,12 @@ module Multiverse
         f.puts "  gem 'mocha', '0.14.0', :require => false"
 
         if debug
+          pry_version = RUBY_VERSION >= '1.8.7' ? '0.10.0' : '0.9.12'
+
           # Pry 0.10.0 breaks compatibility with Ruby 1.8.7 :(
-          f.puts "  gem 'pry', '~> 0.9.12'"
+          f.puts "  gem 'pry', '~> #{pry_version}'"
+          f.puts "  gem 'pry-byebug'" if RUBY_VERSION >= "2.0.0"
+          f.puts "  gem 'pry-stack_explorer'"
         end
       end
       puts yellow("Gemfile.#{env_index} set to:") if verbose?

data/test/multiverse/suites/active_record/active_record_test.rb

@@ -208,10 +208,10 @@ class ActiveRecordInstrumentationTest < Minitest::Test
     end
     sample = NewRelic::Agent.instance.transaction_sampler.last_sample
     metric = "Datastore/statement/#{current_product}/Order/find"
-    segment = find_segment_with_name(sample, metric)
-    assert_equal(metric, segment.metric_name)
+    node = find_node_with_name(sample, metric)
+    assert_equal(metric, node.metric_name)
 
-    sql = segment.params[:sql]
+    sql = node.params[:sql]
     assert_match(/^SELECT /, sql)
 
     assert_equal(adapter.to_s, sql.adapter)
@@ -227,16 +227,16 @@ class ActiveRecordInstrumentationTest < Minitest::Test
 
       sample = NewRelic::Agent.instance.transaction_sampler.last_sample
       metric = "Datastore/statement/#{current_product}/Order/find"
-      sql_segment = find_segment_with_name(sample, metric)
+      sql_node = find_node_with_name(sample, metric)
 
-      assert_match(/^SELECT /, sql_segment.params[:sql])
+      assert_match(/^SELECT /, sql_node.params[:sql])
 
       sample.prepare_to_send!
-      explanations = sql_segment.params[:explain_plan]
+      explanations = sql_node.params[:explain_plan]
       if supports_explain_plans?
-        refute_nil explanations, "No explains in segment: #{sql_segment}"
+        refute_nil explanations, "No explains in node: #{sql_node}"
         assert_equal(2, explanations.size,
-                     "No explains in segment: #{sql_segment}")
+                     "No explains in node: #{sql_node}")
       end
     end
   end

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

@@ -0,0 +1,145 @@
+# 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 AgentAttributesTest < Minitest::Test
+
+  include MultiverseHelpers
+
+  setup_and_teardown_agent
+
+  def test_http_response_code_default_destinations
+    run_transaction do |txn|
+      txn.http_response_code = 418
+    end
+
+    assert_transaction_trace_has_agent_attribute("httpResponseCode", 418)
+    assert_event_has_agent_attribute("httpResponseCode", 418)
+    assert_error_has_agent_attribute("httpResponseCode", 418)
+
+    refute_browser_monitoring_has_agent_attribute("httpResponseCode")
+  end
+
+  def test_request_headers_referer_default_destinations
+    txn_options = {:request => stub(:referer => "referrer", :path => "/")}
+    run_transaction({}, txn_options) do |txn|
+    end
+
+    assert_error_has_agent_attribute("request.headers.referer", "referrer")
+
+    refute_transaction_trace_has_agent_attribute("request.headers.referer")
+    refute_event_has_agent_attribute("request.headers.referer")
+    refute_browser_monitoring_has_agent_attribute("request.headers.referer")
+  end
+
+  def test_request_parameters_default_destinations_without_capture_params
+    run_transaction(:capture_params => false) do |txn|
+      txn.merge_request_parameters(:duly => "noted")
+    end
+
+    refute_transaction_trace_has_agent_attribute("request.parameters.duly")
+    refute_event_has_agent_attribute("request.parameters.duly")
+    refute_error_has_agent_attribute("request.parameters.duly")
+    refute_browser_monitoring_has_agent_attribute("request.parameters.duly")
+  end
+
+  def test_request_parameters_default_destinations_with_capture_params
+    run_transaction(:capture_params => true) do |txn|
+      txn.merge_request_parameters(:duly => "noted")
+    end
+
+    assert_transaction_trace_has_agent_attribute("request.parameters.duly", "noted")
+    assert_error_has_agent_attribute("request.parameters.duly", "noted")
+
+    refute_event_has_agent_attribute("request.parameters.duly")
+    refute_browser_monitoring_has_agent_attribute("request.parameters.duly")
+  end
+
+  def test_custom_attributes_included
+    run_transaction do
+      NewRelic::Agent.add_custom_attributes(:foo => 'bar')
+    end
+
+    assert_transaction_tracer_has_custom_attributes('foo', 'bar')
+    assert_transaction_event_has_custom_attributes('foo', 'bar')
+    assert_error_collector_has_custom_attributes('foo', 'bar')
+    assert_browser_monitoring_has_custom_attributes('foo', 'bar')
+  end
+
+  def test_custom_attributes_excluded
+    config = {
+      :'transaction_tracer.attributes.enabled' => false,
+      :'transaction_events.attributes.enabled' => false,
+      :'error_collector.attributes.enabled'    => false,
+      :'browser_monitoring.attributes.enabled' => false
+    }
+
+    run_transaction(config) do
+      NewRelic::Agent.add_custom_attributes(:foo => 'bar')
+    end
+
+    refute_transaction_tracer_has_custom_attributes('foo')
+    refute_transaction_event_has_custom_attributes('foo')
+    refute_error_collector_has_custom_attributes('foo')
+    refute_browser_monitoring_has_custom_attributes('foo')
+  end
+
+  def test_custom_attributes_excluded_with_global_config
+    run_transaction(:'attributes.enabled' => false) do
+      NewRelic::Agent.add_custom_attributes(:foo => 'bar')
+    end
+
+    refute_transaction_tracer_has_custom_attributes('foo')
+    refute_transaction_event_has_custom_attributes('foo')
+    refute_error_collector_has_custom_attributes('foo')
+    refute_browser_monitoring_has_custom_attributes('foo')
+  end
+
+  def test_request_parameters_captured_on_transaction_events_when_enabled
+    config = {:'transaction_events.attributes.include' => 'request.parameters.*'}
+    txn_options = {
+      :filtered_params => {:foo => "bar", :bar => "baz"}
+    }
+    run_transaction(config, txn_options)
+
+    assert_event_has_agent_attribute("request.parameters.foo", "bar")
+    assert_event_has_agent_attribute("request.parameters.bar", "baz")
+  end
+
+  def test_request_parameters_captured_in_bam_when_enabled
+    config = {:'browser_monitoring.attributes.include' => 'request.parameters.*'}
+    txn_options = {
+      :filtered_params => {:foo => "bar", :bar => "baz"}
+    }
+    run_transaction(config, txn_options)
+
+    assert_browser_monitoring_has_agent_attribute("request.parameters.foo", "bar")
+    assert_browser_monitoring_has_agent_attribute("request.parameters.bar", "baz")
+  end
+
+  def run_transaction(config = {}, txn_options = {})
+    default_config = {
+      :'transaction_tracer.transaction_threshold' => -10,
+      :'transaction_tracer.attributes.enabled' => true,
+      :'transaction_events.attributes.enabled' => true,
+      :'error_collector.attributes.enabled'    => true,
+      :'browser_monitoring.attributes.enabled' => true
+    }
+
+    assert_raises(RuntimeError) do
+      with_config(default_config.merge(config)) do
+        in_transaction(txn_options) do |txn|
+          yield(txn) if block_given?
+
+          # JS instrumentation happens within transaction, so capture it now
+          capture_js_data
+
+          # Have to raise an error to exercise attribute capture there
+          raise "O_o"
+        end
+      end
+    end
+
+    run_harvest
+  end
+end

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

@@ -46,6 +46,14 @@ class CrossApplicationTracingTest < Minitest::Test
     assert_nil last_response.headers["X-NewRelic-App-Data"]
   end
 
+  def test_cross_app_error_attaches_process_id_to_intrinsics
+    assert_raises(RuntimeError) do
+      get '/', {'fail' => 'true'}, {'HTTP_X_NEWRELIC_ID' => Base64.encode64('1#234')}
+    end
+
+    assert_includes attributes_for(last_traced_error, :intrinsic), :client_cross_process_id
+  end
+
   load_cross_agent_test("cat_map").each do |test_case|
     # We only can do test cases here that don't involve outgoing calls
     if !test_case["outboundRequests"]

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

@@ -9,7 +9,11 @@ class CustomQueueTimeTest < Minitest::Test
 
   setup_and_teardown_agent
 
-  DummyRequest = Struct.new(:headers, :cookies)
+  DummyRequest = Struct.new(:headers, :cookies) do
+    def path
+      "/"
+    end
+  end
 
   class DummyApp
     include NewRelic::Agent::Instrumentation::ControllerInstrumentation

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

@@ -35,23 +35,23 @@ class EncodingHandlingTest < Minitest::Test
     assert_endpoint_received_string('transaction_sample_data', normalized_bad_string)
   end
 
-  def test_handles_mis_encoded_custom_params
+  def test_handles_mis_encoded_custom_attributes
     with_config(:'transaction_tracer.transaction_threshold' => 0.0) do
       in_transaction do
-        NewRelic::Agent.add_custom_parameters(:foo => bad_string)
+        NewRelic::Agent.add_custom_attributes(:foo => bad_string)
       end
     end
     assert_endpoint_received_string('transaction_sample_data', normalized_bad_string)
   end
 
-  def test_handles_mis_encoded_custom_params_on_analytics_events
+  def test_handles_mis_encoded_custom_attributes_on_analytics_events
     in_transaction(:category => :controller) do
-      NewRelic::Agent.add_custom_parameters(:foo => bad_string)
+      NewRelic::Agent.add_custom_attributes(:foo => bad_string)
     end
     assert_endpoint_received_string('analytic_event_data', normalized_bad_string)
   end
 
-  def test_handles_mis_encoded_custom_params_on_errors
+  def test_handles_mis_encoded_custom_attributes_on_errors
     NewRelic::Agent.notice_error('bad news', :custom_params => {'foo' => bad_string})
     assert_endpoint_received_string('error_data', normalized_bad_string)
   end
@@ -119,7 +119,7 @@ class EncodingHandlingTest < Minitest::Test
   end
 
   def bad_string
-    (0..250).to_a.pack("C*").force_encoding('UTF-8')
+    [128].to_a.pack("C*").force_encoding('UTF-8')
   end
 
   def normalized_bad_string

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

@@ -34,7 +34,7 @@ class MarshalingTest < Minitest::Test
     encoder = NewRelic::Agent::NewRelicService::Encoders::Identity
 
     expected = expected_sample.to_collector_array(encoder)
-    expected = NewRelic::JSONWrapper.normalize(expected)
+    expected = NewRelic::Agent::EncodingNormalizer.normalize_object(expected)
 
     assert_equal(expected, actual)
   end

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

@@ -72,9 +72,8 @@ class SetTransactionNameTest < Minitest::Test
 
   def test_apply_to_traced_transactions
     TestTransactor.new.parent_txn
-    assert_equal('Controller/TestTransactor/child',
-                 NewRelic::Agent.instance.transaction_sampler.last_sample \
-                   .params[:path])
+    sample = NewRelic::Agent.instance.transaction_sampler.last_sample
+    assert_equal('Controller/TestTransactor/child', sample.transaction_name)
   end
 
   def test_apply_to_traced_errors

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

@@ -84,18 +84,18 @@ class SyntheticsTest < Minitest::Test
     expected_attrs       = trace_spec['expectedIntrinsics']
     non_expected_attrs   = trace_spec['nonExpectedIntrinsics']
 
-    trace_attrs          = trace.tree.custom_params
+    trace_attrs          = trace.intrinsic_attributes
 
     assert_equal(expected_resource_id, trace.synthetics_resource_id)
 
     expected_attrs.each do |key, value|
-      key = "nr.#{key}"
+      key = "#{key}"
       msg = "Incorrect value for transaction trace intrinsic '#{key}'. All intrinsics = #{trace_attrs.inspect}"
       assert_equal(value, trace_attrs[key], msg)
     end
 
     non_expected_attrs.each do |key|
-      key = "nr.#{key}"
+      key = "#{key}"
       msg = "Did not expect key '#{key}' on transaction trace. Actual value was #{trace_attrs[key]}"
       refute_includes(trace_attrs.keys, key, msg)
     end

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

@@ -15,6 +15,10 @@ class TestingApp
   def call(env)
     request = Rack::Request.new(env)
     params = request.params
+    if params['fail']
+      raise "O_o"
+    end
+
     if params['transaction_name']
       opts = {}
       if params['transaction_category']

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

@@ -13,7 +13,7 @@ class ThreadProfilingTest < Minitest::Test
 
   include MultiverseHelpers
 
-  setup_and_teardown_agent(:'thread_profiler.enabled' => true, :force_send => true) do |collector|
+  setup_and_teardown_agent(:'thread_profiler.enabled' => true) do |collector|
     collector.stub('connect', {"agent_run_id" => 666 })
     collector.stub('get_agent_commands', [])
     collector.stub('agent_command_results', [])

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

@@ -9,12 +9,12 @@ class UtilizationDataCollectionTest < Minitest::Test
   include MultiverseHelpers
 
   setup_and_teardown_agent do
-    @config = NewRelic::Agent::Configuration::DottedHash.new({:collect_utilization => true }, true)
-    NewRelic::Agent.config.add_config_for_testing(@config, true)
-  end
-
-  def after_teardown
-    NewRelic::Agent.config.remove_config(@config)
+    $collector.stub('connect',
+      {
+        "agent_run_id" => 42,
+        "collect_utilization" => true
+      }
+    )
   end
 
   def test_hostname
@@ -124,7 +124,9 @@ class UtilizationDataCollectionTest < Minitest::Test
   end
 
   def trigger_usage_data_collection_and_submission
-    agent.send(:transmit_utilization_data)
+    if NewRelic::Agent.config[:collect_utilization]
+      agent.send(:transmit_utilization_data)
+    end
   end
 
   def with_fake_metadata_service

data/test/multiverse/suites/curb/Envfile

@@ -2,10 +2,10 @@ suite_condition("Curb is not useful on JRuby") do
   RUBY_PLATFORM != 'java'
 end
 
-# There appears to be a bug in curb 0.8.6 that manifests in hangs of this suite
-# when run on Ruby 1.8.7 or REE, so don't run against that version on those
-# Rubies.
-curb_version_spec = RUBY_VERSION == "1.8.7" ? '0.8.5' : '~>0.8.6'
+# There appears to be a bug in later curbs (> 0.8.6) that manifests in hangs of
+# this suite when run on Ruby 1.8.7 or REE, so don't run against that version
+# on those Rubies.
+curb_version_spec = RUBY_VERSION == "1.8.7" ? '0.8.5' : '~>0.8.8'
 gemfile <<-RB
   gem 'curb', '#{curb_version_spec}'
   gem 'rack'
@@ -21,8 +21,7 @@ gemfile <<-RB
   gem 'json', :platforms => [:rbx, :mri_18]
 RB
 
-# Older curb's than 0.8.6 don't build against Ruby 2.2.0-preview1
-# Recheck on later RC's, but for now, just skip this env for Ruby 2.2.0
+# Older curb's than 0.8.6 don't build against Ruby 2.2.0
 if RUBY_VERSION < "2.2.0"
 gemfile <<-RB
   gem 'curb', '0.8.1'

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

@@ -129,8 +129,8 @@ class CurbTest < Minitest::Test
         assert_match %r/<head>/i, res
       end
 
-      last_segment = find_last_transaction_segment()
-      assert_equal "External/Multiple/Curb::Multi/perform", last_segment.metric_name
+      last_node = find_last_transaction_node()
+      assert_equal "External/Multiple/Curb::Multi/perform", last_node.metric_name
     end
   end
 
@@ -153,8 +153,8 @@ class CurbTest < Minitest::Test
 
       assert_equal(num_requests, successes)
       assert(perform_block_called, "Block passed to Curl::Multi.perform should have been called")
-      last_segment = find_last_transaction_segment()
-      assert_equal "External/Multiple/Curb::Multi/perform", last_segment.metric_name
+      last_node = find_last_transaction_node()
+      assert_equal "External/Multiple/Curb::Multi/perform", last_node.metric_name
     end
   end
 
@@ -211,4 +211,3 @@ class CurbTest < Minitest::Test
   end
 
 end
-

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

@@ -247,8 +247,8 @@ class DataMapperTest < Minitest::Test
       Post.get(42)
     end
 
-    sql_segment = find_last_transaction_segment(last_transaction_trace)
-    refute_nil sql_segment.obfuscated_sql
+    sql_node = find_last_transaction_node(last_transaction_trace)
+    refute_nil sql_node.obfuscated_sql
   end
 
   def test_direct_select_on_adapter

data/test/multiverse/suites/excon/Envfile

@@ -1,10 +1,17 @@
-if defined?(RUBY_ENGINE) && RUBY_ENGINE == "rbx"
-  # Excon 0.10.0 doesn't seem to work on Rubinius 2.2.10
-  excon_versions = %w(0.25.0 0.24.0 0.19.0 0.18.0)
+if RUBY_VERSION >= '2.2.0'
+  excon_versions = %w(0.45.3)
 else
-  excon_versions = %w(0.25.0 0.24.0 0.19.0 0.18.0 0.10.0)
+  excon_versions = %w(0.45.3
+                      0.25.0
+                      0.24.0
+                      0.19.0
+                      0.18.0
+                      0.10.0)
 end
 
+# Excon 0.10.0 doesn't seem to work on Rubinius 2.2.10
+excon_versions.delete("0.10.0") if defined?(RUBY_ENGINE) && RUBY_ENGINE == "rbx"
+
 excon_versions.each do |excon_version|
   gemfile <<-RB
     gem 'excon', '~> #{excon_version}'