newrelic_rpm 3.11.2.286 → 3.12.0.288

data/test/new_relic/agent/instrumentation/action_view_subscriber_test.rb

@@ -152,7 +152,7 @@ class NewRelic::Agent::Instrumentation::ActionViewSubscriberTest < Minitest::Tes
     assert_metrics_not_recorded('View/model/_user.html.erb/Partial')
   end
 
-  def test_creates_txn_segment_for_simple_render
+  def test_creates_txn_node_for_simple_render
     params = { :identifier => '/root/app/views/model/index.html.erb' }
 
     in_transaction do
@@ -164,16 +164,16 @@ class NewRelic::Agent::Instrumentation::ActionViewSubscriberTest < Minitest::Tes
       @subscriber.finish('render_template.action_view', :id, params)
     end
 
-    last_segment = nil
+    last_node = nil
     sampler = NewRelic::Agent.instance.transaction_sampler
-    sampler.last_sample.root_segment.each_segment{|s| last_segment = s }
+    sampler.last_sample.root_node.each_node{|s| last_node = s }
     NewRelic::Agent.shutdown
 
     assert_equal('View/model/index.html.erb/Rendering',
-                 last_segment.metric_name)
+                 last_node.metric_name)
   end
 
-  def test_creates_nested_partial_segment_within_render_segment
+  def test_creates_nested_partial_node_within_render_node
     in_transaction do
       @subscriber.start('render_template.action_view', :id,
                         :identifier => 'model/index.html.erb')
@@ -194,13 +194,13 @@ class NewRelic::Agent::Instrumentation::ActionViewSubscriberTest < Minitest::Tes
     end
 
     sampler = NewRelic::Agent.instance.transaction_sampler
-    template_segment = sampler.last_sample.root_segment.called_segments[0].called_segments[0]
-    partial_segment = template_segment.called_segments[0]
+    template_node = sampler.last_sample.root_node.called_nodes[0].called_nodes[0]
+    partial_node = template_node.called_nodes[0]
 
     assert_equal('View/model/index.html.erb/Rendering',
-                 template_segment.metric_name)
+                 template_node.metric_name)
     assert_equal('View/model/_list.html.erb/Partial',
-                 partial_segment.metric_name)
+                 partial_node.metric_name)
   end
 
   def test_creates_nodes_for_each_in_a_collection_event
@@ -226,11 +226,11 @@ class NewRelic::Agent::Instrumentation::ActionViewSubscriberTest < Minitest::Tes
     end
 
     sampler = NewRelic::Agent.instance.transaction_sampler
-    partial_segments = sampler.last_sample.root_segment.called_segments[0].called_segments
+    partial_nodes = sampler.last_sample.root_node.called_nodes[0].called_nodes
 
-    assert_equal 3, partial_segments.size
+    assert_equal 3, partial_nodes.size
     assert_equal('View/model/_list.html.erb/Partial',
-                 partial_segments[0].metric_name)
+                 partial_nodes[0].metric_name)
   end
 end if ::Rails::VERSION::MAJOR.to_i >= 4
 

data/test/new_relic/agent/instrumentation/active_record_subscriber_test.rb

@@ -73,21 +73,21 @@ class NewRelic::Agent::Instrumentation::ActiveRecordSubscriberTest < Minitest::T
     )
   end
 
-  def test_creates_txn_segment
+  def test_creates_txn_node
     freeze_time
 
     in_transaction do
       simulate_query(2)
     end
 
-    last_segment = nil
+    last_node = nil
     sampler = NewRelic::Agent.instance.transaction_sampler
-    sampler.last_sample.root_segment.each_segment{|s| last_segment = s }
+    sampler.last_sample.root_node.each_node{|s| last_node = s }
 
     assert_equal('Datastore/statement/ActiveRecord/NewRelic::Agent::Instrumentation::ActiveRecordSubscriberTest::Order/find',
-                 last_segment.metric_name)
+                 last_node.metric_name)
     assert_equal('SELECT * FROM sandwiches',
-                 last_segment.params[:sql])
+                 last_node.params[:sql])
   end
 
   def test_creates_slow_sql_node

data/test/new_relic/agent/instrumentation/controller_instrumentation_test.rb

@@ -307,19 +307,19 @@ module NewRelic::Agent::Instrumentation
       end
     end
 
-    def test_should_not_set_request
+    def test_should_not_set_request_path
       clazz = Class.new do
         include ControllerInstrumentation
 
         def doit
           perform_action_with_newrelic_trace do
-            NewRelic::Agent::TransactionState.tl_get.current_transaction.request
+            NewRelic::Agent::TransactionState.tl_get.current_transaction.request_path
           end
         end
       end
 
-      request = clazz.new.doit
-      assert_nil request
+      request_path = clazz.new.doit
+      assert_nil request_path
     end
   end
 end

data/test/new_relic/agent/instrumentation/task_instrumentation_test.rb

@@ -20,7 +20,7 @@ class NewRelic::Agent::Instrumentation::TaskInstrumentationTest < Minitest::Test
   end
 
   def run_task_exception
-    NewRelic::Agent.add_custom_parameters(:custom_one => 'one custom val')
+    NewRelic::Agent.add_custom_attributes(:custom_one => 'one custom val')
     assert_equal 1, NewRelic::Agent::BusyCalculator.busy_count
     raise "This is an error"
   end
@@ -120,7 +120,9 @@ class NewRelic::Agent::Instrumentation::TaskInstrumentationTest < Minitest::Test
   end
 
   def test_transaction
-    run_task_outer(10)
+    with_config(:capture_params => true) do
+      run_task_outer(10)
+    end
 
     assert_metrics_recorded({
       'Nested/Controller/NewRelic::Agent::Instrumentation::TaskInstrumentationTest/outer_task'   => { :call_count => 1 },
@@ -129,10 +131,13 @@ class NewRelic::Agent::Instrumentation::TaskInstrumentationTest < Minitest::Test
     assert_metrics_not_recorded(['Controller'])
 
     sample = @agent.transaction_sampler.last_sample
+
     refute_nil(sample)
-    refute_nil(sample.params[:custom_params][:cpu_time], "cpu time nil: \n#{sample}")
-    assert((sample.params[:custom_params][:cpu_time] >= 0), "cpu time: #{sample.params[:cpu_time]},\n#{sample}")
-    assert_equal('10', sample.params[:request_params][:level])
+    cpu_time = attributes_for(sample, :intrinsic)[:cpu_time]
+
+    refute_nil(cpu_time, "cpu time nil: \n#{sample}")
+    assert(cpu_time >= 0, "cpu time: #{cpu_time},\n#{sample}")
+    assert_equal(10, attributes_for(sample, :agent)['request.parameters.level'])
   end
 
   def test_abort_transaction
@@ -147,15 +152,17 @@ class NewRelic::Agent::Instrumentation::TaskInstrumentationTest < Minitest::Test
 
   def test_perform_action_with_newrelic_trace_saves_params
     account = 'Redrocks'
-    perform_action_with_newrelic_trace(:name => 'hello', :force => true,
-      :params => { :account => account }) do
-      self.class.inspect
+    with_config(:capture_params => true) do
+      perform_action_with_newrelic_trace(:name => 'hello', :force => true,
+        :params => { :account => account }) do
+        self.class.inspect
+      end
     end
 
     assert_metrics_recorded(['Controller/NewRelic::Agent::Instrumentation::TaskInstrumentationTest/hello'])
     sample = @agent.transaction_sampler.last_sample
     refute_nil(sample)
-    assert_equal(account, sample.params[:request_params][:account])
+    assert_equal(account, attributes_for(sample, :agent)['request.parameters.account'])
   end
 
   def test_errors_are_noticed_and_not_swallowed
@@ -169,10 +176,13 @@ class NewRelic::Agent::Instrumentation::TaskInstrumentationTest < Minitest::Test
     errors = @agent.error_collector.harvest!
 
     assert_equal(1, errors.size)
+
     error = errors.first
     assert_equal("Controller/NewRelic::Agent::Instrumentation::TaskInstrumentationTest/run_task_exception", error.path)
-    refute_nil(error.params[:stack_trace])
-    refute_nil(error.params[:custom_params])
+    refute_nil(error.stack_trace)
+
+    result = error.attributes.custom_attributes_for(NewRelic::Agent::AttributeFilter::DST_TRANSACTION_TRACER)
+    refute_nil(result["custom_one"])
   end
 
   def test_instrument_background_job

data/test/new_relic/agent/javascript_instrumentor_test.rb

@@ -16,7 +16,8 @@ class NewRelic::Agent::JavascriptInstrumentorTest < Minitest::Test
       :browser_key            => 'browserKey',
       :js_agent_loader        => 'loader',
       :license_key            => "\0",  # no-op obfuscation key
-      :'rum.enabled'          => true
+      :'rum.enabled'          => true,
+      :disable_harvest_thread => true
     }
     NewRelic::Agent.config.add_config_for_testing(@config)
 
@@ -58,8 +59,8 @@ class NewRelic::Agent::JavascriptInstrumentorTest < Minitest::Test
   end
 
   def test_browser_timing_scripts_with_rum_enabled_false
-    in_transaction do
-      with_config(:'rum.enabled' => false) do
+    with_config(:'rum.enabled' => false) do
+      in_transaction do
         assert_equal "", instrumentor.browser_timing_header
       end
     end
@@ -82,24 +83,24 @@ class NewRelic::Agent::JavascriptInstrumentorTest < Minitest::Test
   end
 
   def test_browser_timing_header_without_loader
-    in_transaction do
-      with_config(:js_agent_loader => '') do
+    with_config(:js_agent_loader => '') do
+      in_transaction do
         assert_equal "", instrumentor.browser_timing_header
       end
     end
   end
 
   def test_browser_timing_header_without_beacon
-    in_transaction do
-      with_config(:beacon => '') do
+    with_config(:beacon => '') do
+      in_transaction do
         assert_equal "", instrumentor.browser_timing_header
       end
     end
   end
 
   def test_browser_timing_header_without_browser_key
-    in_transaction do
-      with_config(:browser_key => '') do
+    with_config(:browser_key => '') do
+      in_transaction do
         assert_equal "", instrumentor.browser_timing_header
       end
     end
@@ -150,10 +151,8 @@ class NewRelic::Agent::JavascriptInstrumentorTest < Minitest::Test
 
   def test_config_data_for_js_agent
     freeze_time
-    in_transaction('most recent transaction') do
-      with_config(CAPTURE_ATTRIBUTES => true) do
-        NewRelic::Agent.set_user_attributes(:user => "user")
-
+    with_config(CAPTURE_ATTRIBUTES => true) do
+      in_transaction('most recent transaction') do
         txn = NewRelic::Agent::Transaction.tl_current
         txn.stubs(:queue_time).returns(0)
         txn.stubs(:start_time).returns(Time.now - 10)
@@ -170,20 +169,39 @@ class NewRelic::Agent::JavascriptInstrumentorTest < Minitest::Test
           "transactionName" => pack("most recent transaction"),
           "queueTime"       => 0,
           "applicationTime" => 10000,
-          "agent"           => "",
-          "userAttributes"  => pack('{"user":"user"}')
+          "agent"           => ""
         }
 
-        assert_equal(expected, data)
-
         js = instrumentor.browser_timing_config(state)
         expected.each do |key, value|
+          assert_equal(value, data[key])
           assert_match(/"#{key.to_s}":#{formatted_for_matching(value)}/, js)
         end
       end
     end
   end
 
+  def test_config_data_for_js_agent_attributes
+    freeze_time
+    with_config(CAPTURE_ATTRIBUTES => true) do
+      in_transaction('most recent transaction') do
+        NewRelic::Agent.add_custom_attributes(:user => "user")
+        NewRelic::Agent::Transaction.add_agent_attribute(:agent, "attribute", NewRelic::Agent::AttributeFilter::DST_ALL)
+
+        state = NewRelic::Agent::TransactionState.tl_get
+        data = instrumentor.data_for_js_agent(state)
+
+        # Handle packed atts key specially since it's obfuscated
+        actual = unpack_to_object(data["atts"])
+        expected = {
+          "u" => {"user" => "user"},
+          "a" => {"agent" => "attribute"}
+        }
+        assert_equal expected, actual
+      end
+    end
+  end
+
   def test_ssl_for_http_not_included_by_default
     state = NewRelic::Agent::TransactionState.tl_get
     data = instrumentor.data_for_js_agent(state)
@@ -206,48 +224,49 @@ class NewRelic::Agent::JavascriptInstrumentorTest < Minitest::Test
     end
   end
 
+  ATTRIBUTES_ENABLED = :'browser_monitoring.attributes.enabled'
   CAPTURE_ATTRIBUTES = :'browser_monitoring.capture_attributes'
-  CAPTURE_ATTRIBUTES_DEPRECATED = :'capture_attributes.page_view_events'
 
-  def test_data_for_js_agent_doesnt_get_custom_parameters_by_default
-    in_transaction do
-      NewRelic::Agent.add_custom_parameters({:boo => "hoo"})
-      assert_user_attributes_missing
+  def test_data_for_js_agent_doesnt_get_custom_attributes_by_default
+    with_config({}) do
+      in_transaction do
+        NewRelic::Agent.add_custom_attributes({:boo => "hoo"})
+        assert_attributes_missing
+      end
     end
   end
 
-  def test_data_for_js_agent_doesnt_get_custom_parameters_outside_transaction
+  def test_data_for_js_agent_doesnt_get_custom_attributes_outside_transaction
     with_config(CAPTURE_ATTRIBUTES => true) do
-      NewRelic::Agent.add_custom_parameters({:boo => "hoo"})
-      assert_user_attributes_missing
+      NewRelic::Agent.add_custom_attributes({:boo => "hoo"})
+      assert_attributes_missing
     end
   end
 
 
-  def test_data_for_js_agent_gets_custom_parameters_when_configured
-    in_transaction do
-      with_config(CAPTURE_ATTRIBUTES => true) do
-        NewRelic::Agent.add_custom_parameters({:boo => "hoo"})
-        assert_user_attributes_are('{"boo":"hoo"}')
+  def test_data_for_js_agent_gets_custom_attributes_with_old_config
+    with_config(CAPTURE_ATTRIBUTES => true) do
+      in_transaction do
+        NewRelic::Agent.add_custom_attributes({:boo => "hoo"})
+        assert_attributes_are('{"u":{"boo":"hoo"}}')
       end
     end
   end
 
-  def test_data_for_js_agent_ignores_custom_parameters_by_config
-    in_transaction do
-      with_config(CAPTURE_ATTRIBUTES => false) do
-        NewRelic::Agent.add_custom_parameters({:boo => "hoo"})
-        assert_user_attributes_missing
+  def test_data_for_js_agent_gets_custom_attributes_when_configured
+    with_config(ATTRIBUTES_ENABLED => true) do
+      in_transaction do
+        NewRelic::Agent.add_custom_attributes({:boo => "hoo"})
+        assert_attributes_are('{"u":{"boo":"hoo"}}')
       end
     end
   end
 
-  def test_data_for_js_agent_gets_custom_parameters_with_deprecated_key
-    in_transaction do
-      with_config(CAPTURE_ATTRIBUTES => false,
-                  CAPTURE_ATTRIBUTES_DEPRECATED => true) do
-        NewRelic::Agent.add_custom_parameters({:boo => "hoo"})
-        assert_user_attributes_are('{"boo":"hoo"}')
+  def test_data_for_js_agent_ignores_custom_attributes_by_config
+    with_config(CAPTURE_ATTRIBUTES => false) do
+      in_transaction do
+        NewRelic::Agent.add_custom_attributes({:boo => "hoo"})
+        assert_attributes_missing
       end
     end
   end
@@ -286,22 +305,27 @@ class NewRelic::Agent::JavascriptInstrumentorTest < Minitest::Test
     assert(footer.include?(snippet), "Expected footer to include snippet: #{snippet}, but instead was #{footer}")
   end
 
-  def assert_user_attributes_are(expected)
+  def assert_attributes_are(expected)
     state = NewRelic::Agent::TransactionState.tl_get
     data = instrumentor.data_for_js_agent(state)
-    assert_equal pack(expected), data["userAttributes"]
+    assert_equal pack(expected), data["atts"]
   end
 
-  def assert_user_attributes_missing
+  def assert_attributes_missing
     state = NewRelic::Agent::TransactionState.tl_get
     data = instrumentor.data_for_js_agent(state)
-    assert_not_includes data, "userAttributes"
+    assert_not_includes data, "atts"
   end
 
   def pack(text)
     [text].pack("m0").gsub("\n", "")
   end
 
+  def unpack_to_object(text)
+    unpacked_atts = instrumentor.obfuscator.deobfuscate(text)
+    NewRelic::JSONWrapper.load(unpacked_atts)
+  end
+
   def formatted_for_matching(value)
     case value
     when String

data/test/new_relic/agent/pipe_service_test.rb

@@ -45,7 +45,7 @@ class PipeServiceTest < Minitest::Test
         @service.metric_data(metric_data0)
       end
 
-      assert_equal 'Custom/something', received_data[:metric_data].keys.sort[0].name
+      assert_equal 'Custom/something', received_data[:metric_data].to_h.keys.sort[0].name
     end
 
     def test_transaction_sample_data
@@ -105,7 +105,7 @@ class PipeServiceTest < Minitest::Test
 
       received_data = read_from_pipe
 
-      assert_equal 'Custom/something', received_data[:metric_data].keys.sort[0].name
+      assert_equal 'Custom/something', received_data[:metric_data].to_h.keys.sort[0].name
       assert_equal ['txn0'], received_data[:transaction_sample_data]
       assert_equal ['err0'], received_data[:error_data].sort
     end

data/test/new_relic/agent/stats_engine/gc_profiler_test.rb

@@ -126,7 +126,7 @@ class NewRelic::Agent::StatsEngine
         assert_metrics_not_recorded(GCProfiler::GC_WEB)
 
         tracer = NewRelic::Agent.instance.transaction_sampler
-        assert_equal(3.0, tracer.last_sample.params[:custom_params][:gc_time])
+        assert_equal(3.0, attributes_for(tracer.last_sample, :intrinsic)[:gc_time])
       end
 
       def test_collect_gc_data_web

data/test/new_relic/agent/stats_engine/metric_stats_test.rb

@@ -231,7 +231,7 @@ class NewRelic::Agent::MetricStatsTest < Minitest::Test
     assert_equal 2, @engine.get_stats("c").call_count
     assert_equal 4, @engine.get_stats("c").total_call_time
 
-    harvested = @engine.harvest!
+    harvested = @engine.harvest!.to_h
 
     # after harvest, all the metrics should be reset
     assert_equal 0, @engine.get_stats("a").call_count
@@ -240,6 +240,7 @@ class NewRelic::Agent::MetricStatsTest < Minitest::Test
     assert_equal 0, @engine.get_stats("c").total_call_time
 
     spec_a = NewRelic::MetricSpec.new('a')
+
     assert(harvested.has_key?(spec_a))
     assert_equal(1, harvested[spec_a].call_count)
     assert_equal(10, harvested[spec_a].total_call_time)
@@ -258,11 +259,11 @@ class NewRelic::Agent::MetricStatsTest < Minitest::Test
     @engine.get_stats_no_scope('Custom/foo/3/bar/44').record_data_point(1)
     @engine.get_stats_no_scope('Custom/foo/5/bar/66').record_data_point(1)
 
-    harvested = @engine.harvest!
+    harvested = @engine.harvest!.to_h
 
-    assert !harvested.has_key?(NewRelic::MetricSpec.new('Custom/foo/1/bar/22'))
-    assert !harvested.has_key?(NewRelic::MetricSpec.new('Custom/foo/3/bar/44'))
-    assert !harvested.has_key?(NewRelic::MetricSpec.new('Custom/foo/5/bar/66'))
+    refute harvested.has_key?(NewRelic::MetricSpec.new('Custom/foo/1/bar/22'))
+    refute harvested.has_key?(NewRelic::MetricSpec.new('Custom/foo/3/bar/44'))
+    refute harvested.has_key?(NewRelic::MetricSpec.new('Custom/foo/5/bar/66'))
     merged = harvested[NewRelic::MetricSpec.new('Custom/foo/*/bar/*')]
     assert_equal(3, merged.call_count)
   end
@@ -282,7 +283,7 @@ class NewRelic::Agent::MetricStatsTest < Minitest::Test
     renamed = @engine.apply_rules_to_metric_data(rules_engine, stats_hash)
 
     assert_equal(1    , renamed.size)
-    assert_equal('foo', renamed.keys.first.name)
+    assert_equal('foo', renamed.to_h.keys.first.name)
   end
 
   def test_harvest_with_merge
@@ -301,7 +302,7 @@ class NewRelic::Agent::MetricStatsTest < Minitest::Test
     # so the stats for metric "a" should have 2 data points
     @engine.merge!(harvest)
     harvest = @engine.harvest!
-    stats = harvest.fetch(NewRelic::MetricSpec.new("a"))
+    stats = harvest[NewRelic::MetricSpec.new("a")]
     assert_equal 2, stats.call_count
     assert_equal 3, stats.total_call_time
   end