newrelic_rpm 3.11.2.286 → 3.12.0.288

data/test/new_relic/agent/transaction/trace_test.rb

@@ -0,0 +1,394 @@
+# 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('../../../../test_helper.rb', __FILE__)
+require 'new_relic/agent/transaction/trace'
+
+class NewRelic::Agent::Transaction::TraceTest < Minitest::Test
+  def setup
+    freeze_time
+    @start_time = Time.now
+    @trace = NewRelic::Agent::Transaction::Trace.new(@start_time)
+    @trace.root_node.end_trace(@start_time)
+
+    filter = NewRelic::Agent.instance.attribute_filter
+    @fake_attributes = NewRelic::Agent::Transaction::Attributes.new(filter)
+
+    @trace.attributes = @fake_attributes
+  end
+
+  def test_start_time
+    assert_equal @start_time, @trace.start_time
+  end
+
+  def test_node_count
+    assert_equal 0, @trace.node_count
+  end
+
+  def test_sample_id_is_the_object_id
+    assert_equal @trace.object_id, @trace.sample_id
+  end
+
+  def test_create_node_increases_node_count
+    @trace.create_node(0.0, 'foo')
+    assert_equal 1, @trace.node_count
+  end
+
+  def test_duration_is_the_root_node_duration
+    assert_equal @trace.duration, @trace.root_node.duration
+  end
+
+  def test_create_node
+    result = @trace.create_node(0.0, 'goo')
+    assert_equal 0.0, result.entry_timestamp
+    assert_equal 'goo', result.metric_name
+  end
+
+  def test_each_node_delegates_to_root_node
+    block = Proc.new {}
+    @trace.root_node.expects(:each_node)
+    @trace.each_node(&block)
+  end
+
+  def test_collector_array_contains_start_time
+    expected = NewRelic::Helper.time_to_millis(@start_time)
+    assert_collector_array_contains(:start_time, expected)
+  end
+
+  def test_root_node
+    assert_equal 0.0, @trace.root_node.entry_timestamp
+    assert_equal "ROOT", @trace.root_node.metric_name
+  end
+
+  def test_prepare_to_send_returns_self
+    result = @trace.prepare_to_send!
+    assert_equal @trace, result
+  end
+
+  def test_prepare_to_send_returns_self_if_already_prepared
+    @trace.prepare_to_send!
+
+    result = @trace.prepare_to_send!
+    assert_equal @trace, result
+  end
+
+  def test_prepare_to_send_is_idempotent
+    NewRelic::Agent::Database.stubs(:should_record_sql?).returns true
+    @trace.expects(:collect_explain_plans!).once
+    @trace.expects(:prepare_sql_for_transmission!).once
+    @trace.prepare_to_send!
+    @trace.prepare_to_send!
+  end
+
+  def test_prepare_to_send_handles_sql_and_does_not_strip_if_should_record_sql_is_true
+    NewRelic::Agent::Database.stubs(:should_record_sql?).returns true
+    @trace.expects(:collect_explain_plans!).once
+    @trace.expects(:prepare_sql_for_transmission!).once
+    @trace.expects(:strip_sql!).never
+    @trace.prepare_to_send!
+  end
+
+  def test_prepare_to_send_strips_and_does_not_handle_sql_if_should_record_sql_is_false
+    NewRelic::Agent::Database.stubs(:should_record_sql?).returns false
+    @trace.expects(:collect_explain_plans!).never
+    @trace.expects(:prepare_sql_for_transmission!).never
+    @trace.expects(:strip_sql!).once
+    @trace.prepare_to_send!
+  end
+
+  def test_prepare_to_send_collects_explain_plans
+    node = @trace.create_node(0.0, 'has_sql')
+    node.stubs(:duration).returns(2)
+    node.stubs(:explain_sql).returns('')
+    node[:sql] = ''
+
+    @trace.root_node.add_called_node(node)
+
+    with_config(:'transaction_tracer.explain_threshold' => 1) do
+      @trace.prepare_to_send!
+    end
+
+    assert node[:explain_plan]
+  end
+
+  def test_prepare_to_send_prepares_sql_for_transmission
+    NewRelic::Agent::Database.stubs(:record_sql_method).returns :obfuscated
+
+    node = @trace.create_node(0.0, 'has_sql')
+    node.stubs(:duration).returns(2)
+    node[:sql] = "select * from pelicans where name = '1337807';"
+    @trace.root_node.add_called_node(node)
+
+    @trace.prepare_to_send!
+    assert_equal "select * from pelicans where name = ?;", node[:sql]
+  end
+
+  def test_prepare_to_send_strips_sql
+    NewRelic::Agent::Database.stubs(:should_record_sql?).returns false
+    node = @trace.create_node(0.0, 'has_sql')
+    node.stubs(:duration).returns(2)
+    node.stubs(:explain_sql).returns('')
+    node[:sql] = 'select * from pelicans;'
+
+    @trace.root_node.add_called_node(node)
+    @trace.prepare_to_send!
+
+    refute node[:sql]
+  end
+
+  def test_collect_explain_plans!
+    node = @trace.create_node(0.0, 'has_sql')
+    node.stubs(:duration).returns(2)
+    node.stubs(:explain_sql).returns('')
+    node[:sql] = ''
+
+    @trace.root_node.add_called_node(node)
+
+    with_config(:'transaction_tracer.explain_threshold' => 1) do
+      @trace.collect_explain_plans!
+    end
+
+    assert node[:explain_plan]
+  end
+
+  def test_collect_explain_plans_does_not_attach_explain_plans_if_duration_is_too_short
+    node = @trace.create_node(0.0, 'has_sql')
+    node.stubs(:duration).returns(1)
+    node.stubs(:explain_sql).returns('')
+    node[:sql] = ''
+
+    @trace.root_node.add_called_node(node)
+
+    with_config(:'transaction_tracer.explain_threshold' => 2) do
+      @trace.collect_explain_plans!
+    end
+
+    refute node[:explain_plan]
+  end
+
+  def test_collect_explain_plans_does_not_attach_explain_plans_without_sql
+    node = @trace.create_node(0.0, 'nope_sql')
+    node.stubs(:duration).returns(2)
+    node.stubs(:explain_sql).returns('')
+    node[:sql] = nil
+
+    @trace.root_node.add_called_node(node)
+
+    with_config(:'transaction_tracer.explain_threshold' => 1) do
+      @trace.collect_explain_plans!
+    end
+
+    refute node[:explain_plan]
+  end
+
+  def test_collect_explain_plans_does_not_attach_explain_plans_if_db_says_not_to
+    node = @trace.create_node(0.0, 'has_sql')
+    node.stubs(:duration).returns(2)
+    node.stubs(:explain_sql).returns('')
+    node[:sql] = ''
+
+    NewRelic::Agent::Database.stubs(:should_collect_explain_plans?).returns(false)
+
+    @trace.root_node.add_called_node(node)
+
+    with_config(:'transaction_tracer.explain_threshold' => 1) do
+      @trace.collect_explain_plans!
+    end
+
+    refute node[:explain_plan]
+  end
+
+  def test_prepare_sql_for_transmission_obfuscates_sql_if_record_sql_method_is_obfuscated
+    NewRelic::Agent::Database.stubs(:record_sql_method).returns :obfuscated
+
+    node = @trace.create_node(0.0, 'has_sql')
+    node[:sql] = "select * from pelicans where name = '1337807';"
+    @trace.root_node.add_called_node(node)
+
+    @trace.prepare_sql_for_transmission!
+    assert_equal "select * from pelicans where name = ?;", node[:sql]
+  end
+
+  def test_prepare_sql_for_transmission_does_not_modify_sql_if_record_sql_method_is_raw
+    NewRelic::Agent::Database.stubs(:record_sql_method).returns :raw
+
+    node = @trace.create_node(0.0, 'has_sql')
+    node[:sql] = "select * from pelicans where name = '1337807';"
+    @trace.root_node.add_called_node(node)
+
+    @trace.prepare_sql_for_transmission!
+    assert_equal "select * from pelicans where name = '1337807';", node[:sql]
+  end
+
+  def test_prepare_sql_for_transmission_removes_sql_if_record_sql_method_is_off
+    NewRelic::Agent::Database.stubs(:record_sql_method).returns :off
+
+    node = @trace.create_node(0.0, 'has_sql')
+    node[:sql] = "select * from pelicans where name = '1337807';"
+    @trace.root_node.add_called_node(node)
+
+    @trace.prepare_sql_for_transmission!
+    refute node[:sql]
+  end
+
+  def test_strip_sql!
+    node = @trace.create_node(0.0, 'has_sql')
+    node.stubs(:duration).returns(2)
+    node.stubs(:explain_sql).returns('')
+    node[:sql] = 'select * from pelicans;'
+
+    @trace.root_node.add_called_node(node)
+    @trace.strip_sql!
+
+    refute node[:sql]
+  end
+
+  def test_collector_array_contains_root_node_duration
+    @trace.root_node.end_trace(1)
+    assert_collector_array_contains(:duration, 1000)
+  end
+
+  def test_collector_array_contains_transaction_name
+    @trace.transaction_name = 'zork'
+    assert_collector_array_contains(:transaction_name, 'zork')
+  end
+
+  def test_transaction_name_gets_coerced_into_a_string
+    @trace.transaction_name = 1337807
+    assert_collector_array_contains(:transaction_name, '1337807')
+  end
+
+  def test_collector_array_contains_uri
+    @trace.uri = 'http://windows95tips.com/'
+    assert_collector_array_contains(:uri, 'http://windows95tips.com/')
+  end
+
+  def test_uri_gets_coerced_into_a_string
+    @trace.uri = 95
+    assert_collector_array_contains(:uri, '95')
+  end
+
+  def test_collector_array_contains_trace_tree
+    assert_collector_array_contains(:trace_tree, @trace.trace_tree)
+  end
+
+  def test_collector_array_contains_guid
+    @trace.guid = 'DEADBEEF8BADF00D'
+    assert_collector_array_contains(:guid, 'DEADBEEF8BADF00D')
+  end
+
+  def test_guid_gets_coerced_into_a_string
+    @trace.guid = 42
+    assert_collector_array_contains(:guid, '42')
+  end
+
+  def test_collector_array_contains_nil_for_reserved
+    assert_collector_array_contains(:reserved, nil)
+  end
+
+  def test_collector_array_contains_forced_true_if_in_an_xray_session
+    @trace.xray_session_id = 7
+    assert_collector_array_contains(:forced?, true)
+  end
+
+  def test_collector_array_contains_forced_false_if_not_in_an_xray_session
+    @trace.xray_session_id = nil
+    assert_collector_array_contains(:forced?, false)
+  end
+
+  def test_collector_array_contains_xray_session_id
+    @trace.xray_session_id = 112357
+    assert_collector_array_contains(:xray_session_id, 112357)
+  end
+
+  def test_xray_session_id_gets_coerced_to_an_integer
+    @trace.xray_session_id = '112357'
+    assert_collector_array_contains(:xray_session_id, 112357)
+  end
+
+  def test_xray_session_id_does_not_coerce_nil_to_an_integer
+    @trace.xray_session_id = nil
+    assert_collector_array_contains(:xray_session_id, nil)
+  end
+
+  def test_collector_array_contains_synthetics_resource_id
+    @fake_attributes.add_intrinsic_attribute(:synthetics_resource_id, '31415926')
+    assert_collector_array_contains(:synthetics_resource_id, '31415926')
+  end
+
+  def test_to_collector_array_encodes_trace_tree_with_given_encoder
+    fake_encoder = mock
+    fake_encoder.expects(:encode).with(@trace.trace_tree)
+    @trace.to_collector_array(fake_encoder)
+  end
+
+  def test_synthetics_resource_id_gets_coerced_to_a_string
+    @fake_attributes.add_intrinsic_attribute(:synthetics_resource_id, 31415926)
+    assert_collector_array_contains(:synthetics_resource_id, '31415926')
+  end
+
+  def test_trace_tree_coerces_start_time_to_a_float
+    assert_kind_of Float, @trace.trace_tree.first
+  end
+
+  def test_trace_tree_includes_start_time
+    assert_trace_tree_contains(:start_time, @start_time.to_f)
+  end
+
+  def test_trace_tree_includes_unused_legacy_request_params
+    assert_trace_tree_contains(:unused_legacy_request_params, {})
+  end
+
+  def test_trace_tree_includes_unused_legacy_custom_params
+    assert_trace_tree_contains(:unused_legacy_custom_params, {})
+  end
+
+  def test_trace_tree_contains_serialized_root_node
+    assert_trace_tree_contains(:root_node, @trace.root_node.to_array)
+  end
+
+  def test_trace_tree_contains_attributes
+    @fake_attributes.add_agent_attribute(:foo, 'bar', NewRelic::Agent::AttributeFilter::DST_ALL)
+    @fake_attributes.add_intrinsic_attribute(:foo, 'bar')
+    @fake_attributes.merge_custom_attributes(:foo => 'bar')
+
+    expected = {
+      'agentAttributes' => { :foo => 'bar' },
+      'userAttributes'  => { "foo" => 'bar' },
+      'intrinsics'      => { :foo => 'bar' }
+    }
+
+    assert_trace_tree_contains(:attributes, expected)
+  end
+
+  def assert_trace_tree_contains(key, expected)
+    indices = [
+      :start_time,
+      :unused_legacy_request_params,
+      :unused_legacy_custom_params,
+      :root_node,
+      :attributes
+    ]
+
+    assert_equal expected, @trace.trace_tree[indices.index(key)]
+  end
+
+  def assert_collector_array_contains(key, expected)
+    indices = [
+      :start_time,
+      :duration,
+      :transaction_name,
+      :uri,
+      :trace_tree,
+      :guid,
+      :reserved,
+      :forced?,
+      :xray_session_id,
+      :synthetics_resource_id
+    ]
+
+    encoder = NewRelic::Agent::NewRelicService::Encoders::Identity
+    assert_equal expected, @trace.to_collector_array(encoder)[indices.index(key)]
+  end
+end

data/test/new_relic/agent/transaction/xray_sample_buffer_test.rb

@@ -62,7 +62,7 @@ class NewRelic::Agent::Transaction
     end
 
     def sample_with(opts={})
-      sample = NewRelic::TransactionSample.new
+      sample = NewRelic::Agent::Transaction::Trace.new(Time.now)
       sample.transaction_name = opts[:transaction_name]
       sample
     end

data/test/new_relic/agent/transaction_event_aggregator_test.rb

@@ -6,19 +6,22 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper'))
 require File.expand_path(File.join(File.dirname(__FILE__),'..','data_container_tests'))
 require 'new_relic/agent/transaction_event_aggregator'
+require 'new_relic/agent/transaction/attributes'
 
 class NewRelic::Agent::TransactionEventAggregatorTest < Minitest::Test
 
   def setup
     freeze_time
     @event_listener = NewRelic::Agent::EventListener.new
-    @sampler = NewRelic::Agent::TransactionEventAggregator.new(@event_listener)
+    @event_aggregator = NewRelic::Agent::TransactionEventAggregator.new(@event_listener)
+
+    @attributes = nil
   end
 
   # Helpers for DataContainerTests
 
   def create_container
-    @sampler
+    @event_aggregator
   end
 
   def populate_container(sampler, n)
@@ -34,52 +37,111 @@ class NewRelic::Agent::TransactionEventAggregatorTest < Minitest::Test
   def test_samples_on_transaction_finished_event
     with_sampler_config do
       generate_request
-      assert_equal 1, @sampler.samples.length
+      assert_equal 1, @event_aggregator.samples.length
     end
   end
 
   EVENT_DATA_INDEX = 0
   CUSTOM_ATTRIBUTES_INDEX = 1
+  AGENT_ATTRIBUTES_INDEX = 2
 
-  def test_custom_parameters_in_event_are_normalized_to_string_keys
+  def test_custom_attributes_in_event_are_normalized_to_string_keys
     with_sampler_config do
-      generate_request('whatever', :custom_params => {:bing => 2, 1 => 3})
-      custom_attrs = single_sample[CUSTOM_ATTRIBUTES_INDEX]
-      assert_equal 2, custom_attrs['bing']
-      assert_equal 3, custom_attrs['1']
+      attributes.merge_custom_attributes(:bing => 2, 1 => 3)
+      generate_request('whatever')
+
+      result = captured_transaction_event[CUSTOM_ATTRIBUTES_INDEX]
+      assert_equal 2, result['bing']
+      assert_equal 3, result['1']
     end
   end
 
-  def test_includes_custom_parameters_in_event
+  def test_agent_attributes_in_event_are_normalized_to_string_keys
     with_sampler_config do
-      generate_request('whatever', :custom_params => {'bing' => 2})
-      custom_attrs = single_sample[CUSTOM_ATTRIBUTES_INDEX]
+      attributes.add_agent_attribute(:yahoo, 7, NewRelic::Agent::AttributeFilter::DST_ALL)
+      attributes.add_agent_attribute(4, 2, NewRelic::Agent::AttributeFilter::DST_ALL)
+      generate_request('puce')
+
+      result = captured_transaction_event[AGENT_ATTRIBUTES_INDEX]
+      assert_equal 7, result[:yahoo]
+      assert_equal 2, result[4]
+    end
+  end
+
+  def test_includes_custom_attributes_in_event
+    with_sampler_config do
+      attributes.merge_custom_attributes('bing' => 2)
+      generate_request('whatever')
+
+      custom_attrs = captured_transaction_event[CUSTOM_ATTRIBUTES_INDEX]
       assert_equal 2, custom_attrs['bing']
     end
   end
 
-  def test_doesnt_include_custom_parameters_in_event_when_configured_not_to
+  def test_includes_agent_attributes_in_event
+    with_sampler_config do
+      attributes.add_agent_attribute('bing', 2, NewRelic::Agent::AttributeFilter::DST_ALL)
+      generate_request('whatever')
+
+      agent_attrs = captured_transaction_event[AGENT_ATTRIBUTES_INDEX]
+      assert_equal 2, agent_attrs['bing']
+    end
+  end
+
+  def test_doesnt_include_custom_attributes_in_event_when_configured_not_to
+    with_sampler_config('transaction_events.attributes.enabled' => false) do
+      attributes.merge_custom_attributes('bing' => 2)
+      generate_request('whatever')
+
+      custom_attrs = captured_transaction_event[CUSTOM_ATTRIBUTES_INDEX]
+      assert_empty custom_attrs
+    end
+  end
+
+  def test_doesnt_include_agent_attributes_in_event_when_configured_not_to
+    with_sampler_config('transaction_events.attributes.enabled' => false) do
+      attributes.add_agent_attribute('bing', 2, NewRelic::Agent::AttributeFilter::DST_ALL)
+      generate_request('whatever')
+
+      agent_attrs = captured_transaction_event[AGENT_ATTRIBUTES_INDEX]
+      assert_empty agent_attrs
+    end
+  end
+
+
+  def test_doesnt_include_custom_attributes_in_event_when_configured_not_to_with_legacy_setting
+    with_sampler_config('analytics_events.capture_attributes' => false) do
+      attributes.merge_custom_attributes('bing' => 2)
+      generate_request('whatever')
+
+      custom_attrs = captured_transaction_event[CUSTOM_ATTRIBUTES_INDEX]
+      assert_empty custom_attrs
+    end
+  end
+
+  def test_doesnt_include_agent_attributes_in_event_when_configured_not_to_with_legacy_setting
     with_sampler_config('analytics_events.capture_attributes' => false) do
-      generate_request('whatever', :custom_params => {'bing' => 2})
-      custom_attrs = single_sample[CUSTOM_ATTRIBUTES_INDEX]
-      assert_equal nil, custom_attrs['bing']
+      attributes.add_agent_attribute('bing', 2, NewRelic::Agent::AttributeFilter::DST_ALL)
+      generate_request('whatever')
+
+      agent_attrs = captured_transaction_event[AGENT_ATTRIBUTES_INDEX]
+      assert_empty agent_attrs
     end
   end
 
-  def test_custom_parameters_in_event_cant_override_reserved_attributes
+  def test_custom_attributes_in_event_cant_override_reserved_attributes
     with_sampler_config do
       metrics = NewRelic::Agent::TransactionMetrics.new()
       metrics.record_unscoped('HttpDispatcher', 0.01)
 
-      generate_request('whatever',
-        :metrics       => metrics,
-        :custom_params => {'type' => 'giraffe', 'duration' => 'hippo'}
-      )
-      txn_event = single_sample[EVENT_DATA_INDEX]
+      attributes.merge_custom_attributes('type' => 'giraffe', 'duration' => 'hippo')
+      generate_request('whatever', :metrics => metrics)
+
+      txn_event = captured_transaction_event[EVENT_DATA_INDEX]
       assert_equal 'Transaction', txn_event['type']
       assert_equal 0.1, txn_event['duration']
 
-      custom_attrs = single_sample[CUSTOM_ATTRIBUTES_INDEX]
+      custom_attrs = captured_transaction_event[CUSTOM_ATTRIBUTES_INDEX]
       assert_equal 'giraffe', custom_attrs['type']
       assert_equal 'hippo', custom_attrs['duration']
     end
@@ -94,7 +156,7 @@ class NewRelic::Agent::TransactionEventAggregatorTest < Minitest::Test
 
     with_sampler_config do
       generate_request('name', :metrics => txn_metrics)
-      event_data = single_sample[EVENT_DATA_INDEX]
+      event_data = captured_transaction_event[EVENT_DATA_INDEX]
       assert_equal 13, event_data["queueDuration"]
       assert_equal 14, event_data["externalDuration"]
       assert_equal 15, event_data["databaseDuration"]
@@ -114,7 +176,7 @@ class NewRelic::Agent::TransactionEventAggregatorTest < Minitest::Test
     with_sampler_config do
       generate_request('name', :metrics => txn_metrics)
 
-      event_data = single_sample[EVENT_DATA_INDEX]
+      event_data = captured_transaction_event[EVENT_DATA_INDEX]
       assert_equal 12, event_data["externalDuration"]
       assert_equal 13, event_data["databaseDuration"]
       assert_equal 14, event_data["gcCumulative"]
@@ -128,7 +190,7 @@ class NewRelic::Agent::TransactionEventAggregatorTest < Minitest::Test
     with_sampler_config do
       generate_request('name', :apdex_perf_zone => 'S')
 
-      event_data = single_sample[EVENT_DATA_INDEX]
+      event_data = captured_transaction_event[EVENT_DATA_INDEX]
       assert_equal 'S', event_data['nr.apdexPerfZone']
     end
   end
@@ -136,14 +198,14 @@ class NewRelic::Agent::TransactionEventAggregatorTest < Minitest::Test
   def test_samples_on_transaction_finished_event_includes_guid
     with_sampler_config do
       generate_request('name', :guid => "GUID")
-      assert_equal "GUID", single_sample[EVENT_DATA_INDEX]["nr.guid"]
+      assert_equal "GUID", captured_transaction_event[EVENT_DATA_INDEX]["nr.guid"]
     end
   end
 
   def test_samples_on_transaction_finished_event_includes_referring_transaction_guid
     with_sampler_config do
       generate_request('name', :referring_transaction_guid=> "REFER")
-      assert_equal "REFER", single_sample[EVENT_DATA_INDEX]["nr.referringTransactionGuid"]
+      assert_equal "REFER", captured_transaction_event[EVENT_DATA_INDEX]["nr.referringTransactionGuid"]
     end
   end
 
@@ -151,14 +213,14 @@ class NewRelic::Agent::TransactionEventAggregatorTest < Minitest::Test
     with_sampler_config do
       generate_request('a', :type => :controller)
       generate_request('b', :type => :background)
-      assert_equal 2, @sampler.samples.size
+      assert_equal 2, @event_aggregator.samples.size
     end
   end
 
   def test_can_disable_sampling_for_analytics
     with_sampler_config( :'analytics_events.enabled' => false ) do
       generate_request
-      assert @sampler.samples.empty?
+      assert @event_aggregator.samples.empty?
     end
   end
 
@@ -166,52 +228,52 @@ class NewRelic::Agent::TransactionEventAggregatorTest < Minitest::Test
     with_sampler_config do
       5.times { generate_request }
 
-      old_samples = @sampler.harvest!
+      old_samples = @event_aggregator.harvest!
 
       assert_equal 5, old_samples.size
-      assert_equal 0, @sampler.samples.size
+      assert_equal 0, @event_aggregator.samples.size
     end
   end
 
   def test_merge_merges_samples_back_into_buffer
     with_sampler_config do
       5.times { generate_request }
-      old_samples = @sampler.harvest!
+      old_samples = @event_aggregator.harvest!
       5.times { generate_request }
 
-      @sampler.merge!(old_samples)
-      assert_equal(10, @sampler.samples.size)
+      @event_aggregator.merge!(old_samples)
+      assert_equal(10, @event_aggregator.samples.size)
     end
   end
 
   def test_merge_abides_by_max_samples_limit
     with_sampler_config(:'analytics_events.max_samples_stored' => 5) do
       4.times { generate_request }
-      old_samples = @sampler.harvest!
+      old_samples = @event_aggregator.harvest!
       4.times { generate_request }
 
-      @sampler.merge!(old_samples)
-      assert_equal(5, @sampler.samples.size)
+      @event_aggregator.merge!(old_samples)
+      assert_equal(5, @event_aggregator.samples.size)
     end
   end
 
   def test_limits_total_number_of_samples_to_max_samples_stored
     with_sampler_config( :'analytics_events.max_samples_stored' => 100 ) do
       150.times { generate_request }
-      assert_equal 100, @sampler.samples.size
+      assert_equal 100, @event_aggregator.samples.size
     end
   end
 
   def test_resets_limits_on_harvest
     with_sampler_config( :'analytics_events.max_samples_stored' => 100 ) do
       50.times { generate_request('before') }
-      samples_before = @sampler.samples
+      samples_before = @event_aggregator.samples
       assert_equal 50, samples_before.size
 
-      @sampler.harvest!
+      @event_aggregator.harvest!
 
       150.times { generate_request('after') }
-      samples_after = @sampler.samples
+      samples_after = @event_aggregator.samples
       assert_equal 100, samples_after.size
 
       assert_equal 0, (samples_before & samples_after).size
@@ -228,13 +290,13 @@ class NewRelic::Agent::TransactionEventAggregatorTest < Minitest::Test
       end
       threads.each { |t| t.join }
 
-      assert_equal(25 * 100, @sampler.samples.size)
+      assert_equal(25 * 100, @event_aggregator.samples.size)
     end
   end
 
   def test_includes_http_response_code_in_events
     generate_request('whatever', :http_response_code => 404)
-    sample = single_sample
+    sample = captured_transaction_event
     code = sample[EVENT_DATA_INDEX]['httpResponseCode']
     assert_equal('404', code)
   end
@@ -246,7 +308,7 @@ class NewRelic::Agent::TransactionEventAggregatorTest < Minitest::Test
         generate_request('synthetic', :synthetics_resource_id => 100)
       end
 
-      assert_equal 10, @sampler.samples.size
+      assert_equal 10, @event_aggregator.samples.size
     end
   end
 
@@ -256,7 +318,7 @@ class NewRelic::Agent::TransactionEventAggregatorTest < Minitest::Test
         generate_request('synthetic', :synthetics_resource_id => 100)
       end
 
-      assert_equal 20, @sampler.samples.size
+      assert_equal 20, @event_aggregator.samples.size
     end
   end
 
@@ -269,8 +331,8 @@ class NewRelic::Agent::TransactionEventAggregatorTest < Minitest::Test
 
       generate_request('synthetic', :timestamp => 1, :synthetics_resource_id => 100)
 
-      assert_equal 10, @sampler.samples.size
-      timestamps = @sampler.samples.map do |(main, _)|
+      assert_equal 10, @event_aggregator.samples.size
+      timestamps = @event_aggregator.samples.map do |(main, _)|
         main["timestamp"]
       end.sort
 
@@ -286,7 +348,7 @@ class NewRelic::Agent::TransactionEventAggregatorTest < Minitest::Test
 
       generate_request('synthetic', :timestamp => 1, :synthetics_resource_id => 100)
 
-      assert_equal 11, @sampler.samples.size
+      assert_equal 11, @event_aggregator.samples.size
     end
   end
 
@@ -295,13 +357,13 @@ class NewRelic::Agent::TransactionEventAggregatorTest < Minitest::Test
       20.times do
         generate_request('synthetic', :synthetics_resource_id => 100)
       end
-      @sampler.harvest!
+      @event_aggregator.harvest!
     end
 
     with_sampler_config(:'synthetics.events_limit' => 10,
                         :'analytics_events.max_samples_stored' => 0) do
-      @sampler.merge!(samples)
-      assert_equal 10, @sampler.samples.size
+      @event_aggregator.merge!(samples)
+      assert_equal 10, @event_aggregator.samples.size
     end
   end
 
@@ -311,7 +373,7 @@ class NewRelic::Agent::TransactionEventAggregatorTest < Minitest::Test
         generate_request('synthetic', :synthetics_resource_id => 100)
       end
 
-      @sampler.harvest!
+      @event_aggregator.harvest!
 
       metric = 'Supportability/TransactionEventAggregator/synthetics_events_dropped'
       assert_metrics_not_recorded(metric)
@@ -324,7 +386,7 @@ class NewRelic::Agent::TransactionEventAggregatorTest < Minitest::Test
         generate_request('synthetic', :synthetics_resource_id => 100)
       end
 
-      @sampler.harvest!
+      @event_aggregator.harvest!
 
       metric = 'Supportability/TransactionEventAggregator/synthetics_events_dropped'
       assert_metrics_recorded(metric => { :call_count => 10 })
@@ -341,7 +403,7 @@ class NewRelic::Agent::TransactionEventAggregatorTest < Minitest::Test
       :type => :controller,
       :start_timestamp => options[:timestamp] || Time.now.to_f,
       :duration => 0.1,
-      :custom_params => {}
+      :attributes => attributes
     }.merge(options)
     @event_listener.notify(:transaction_finished, payload)
   end
@@ -355,9 +417,17 @@ class NewRelic::Agent::TransactionEventAggregatorTest < Minitest::Test
     end
   end
 
-  def single_sample
-    assert_equal 1, @sampler.samples.size
-    @sampler.samples.first
+  def captured_transaction_event
+    assert_equal 1, @event_aggregator.samples.size
+    @event_aggregator.samples.first
   end
 
+  def attributes
+    if @attributes.nil?
+      filter = NewRelic::Agent::AttributeFilter.new(NewRelic::Agent.config)
+      @attributes = NewRelic::Agent::Transaction::Attributes.new(filter)
+    end
+
+    @attributes
+  end
 end