newrelic_rpm 3.11.2.286 → 3.12.0.288

data/test/performance/suites/transaction_tracing.rb

@@ -3,6 +3,13 @@
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
 class TransactionTracingPerfTests < Performance::TestCase
+  FAILURE_MESSAGE = "O_o"
+
+  BOO = "boo"
+  HOO = "hoo"
+  OH  = "oh"
+  NO  = "no"
+
   def klass(instrument)
     Class.new do
       def self.name
@@ -13,12 +20,22 @@ class TransactionTracingPerfTests < Performance::TestCase
         method_4
       end
 
+      def transaction_with_attributes
+        method_4
+        NewRelic::Agent.add_custom_attributes(BOO => HOO, OH => NO)
+      end
+
       def long_transaction(n)
         n.times do
           method_1
         end
       end
 
+
+      def failure
+        raise FAILURE_MESSAGE
+      end
+
       def method_1
         method_2
         method_3
@@ -36,12 +53,16 @@ class TransactionTracingPerfTests < Performance::TestCase
       if instrument
         include NewRelic::Agent::Instrumentation::ControllerInstrumentation
         include NewRelic::Agent::MethodTracer
+
         add_method_tracer :method_1
         add_method_tracer :method_2
         add_method_tracer :method_3
         add_method_tracer :method_4
+
         add_transaction_tracer :short_transaction
         add_transaction_tracer :long_transaction
+        add_transaction_tracer :transaction_with_attributes
+        add_transaction_tracer :failure
       end
 
     end
@@ -68,4 +89,18 @@ class TransactionTracingPerfTests < Performance::TestCase
       @dummy.long_transaction(10000)
     end
   end
+
+  def test_with_custom_attributes
+    measure { @dummy.transaction_with_attributes }
+  end
+
+  def test_failure
+    measure do
+      begin
+        @dummy.failure
+      rescue
+        # Whatever...
+      end
+    end
+  end
 end

data/test/test_helper.rb

@@ -30,6 +30,14 @@ Hometown.watch(::Thread)
 # us to rely on, so instead we'll just watch for it.
 class Minitest::Test
   def before_setup
+    if self.respond_to?(:name)
+      test_method_name = self.name
+    else
+      test_method_name = self.__name__
+    end
+
+    NewRelic::Agent.logger.info("*** #{self.class}##{test_method_name} **")
+
     @__thread_count = ruby_threads.count
     super
   end
@@ -240,7 +248,7 @@ module TransactionSampleTestHelper
     sampler = nil
     state = NewRelic::Agent::TransactionState.tl_get
 
-    request = stub(:uri => path)
+    request = stub(:path => path)
 
     in_transaction("Controller/sandwiches/index", :request => request) do
       sampler = NewRelic::Agent.instance.transaction_sampler

data/ui/helpers/developer_mode_helper.rb

@@ -17,7 +17,7 @@ module NewRelic::DeveloperModeHelper
   end
 
   def trace_row_display_limit_reached
-   (!@detail_segment_count.nil? && @detail_segment_count > trace_row_display_limit) || @sample.sql_segments.length > trace_row_display_limit
+   (!@detail_node_count.nil? && @detail_node_count > trace_row_display_limit) || sql_segments(@sample).length > trace_row_display_limit
   end
 
   # return the highest level in the call stack for the trace that is not rails or
@@ -101,7 +101,7 @@ module NewRelic::DeveloperModeHelper
   end
 
   def explain_sql_url(segment)
-    "explain_sql?id=#{@sample.sample_id}&segment=#{segment.segment_id}"
+    "explain_sql?id=#{@sample.sample_id}&segment=#{segment.object_id}"
   end
 
   def segment_duration_value(segment)
@@ -115,7 +115,7 @@ module NewRelic::DeveloperModeHelper
   def render_sample_details(sample)
     @indentation_depth=0
     # skip past the root segments to the first child, which is always the controller
-    first_segment = sample.root_segment.called_segments.first
+    first_segment = sample.root_node.called_nodes.first
 
     # render the segments, then the css classes to indent them
     render_segment_details(first_segment).to_s + render_indentation_classes(@indentation_depth).to_s
@@ -129,22 +129,22 @@ module NewRelic::DeveloperModeHelper
 
   def expand_segment_image(segment, depth)
     if depth > 0
-      if !segment.called_segments.empty?
+      if !segment.called_nodes.empty?
         row_class =segment_child_row_class(segment)
-        link_to_function("<img src=\"#{collapsed_image_path}\" id=\"image_#{row_class}\" class_for_children=\"#{row_class}\" class=\"#{(!segment.called_segments.empty?) ? 'parent_segment_image' : 'child_segment_image'}\" />", "toggle_row_class(this)")
+        link_to_function("<img src=\"#{collapsed_image_path}\" id=\"image_#{row_class}\" class_for_children=\"#{row_class}\" class=\"#{(!segment.called_nodes.empty?) ? 'parent_segment_image' : 'child_segment_image'}\" />", "toggle_row_class(this)")
       end
     end
   end
 
   def segment_child_row_class(segment)
-    "segment#{segment.segment_id}"
+    "segment#{segment.object_id}"
   end
 
   def summary_pie_chart(sample, width, height)
     pie_chart = GooglePieChart.new
     pie_chart.color, pie_chart.width, pie_chart.height = '6688AA', width, height
 
-    chart_data = sample.breakdown_data(6)
+    chart_data = breakdown_data(sample, 6)
     chart_data.each { |s| pie_chart.add_data_point dev_name(s.metric_name), to_ms(s.exclusive_time) }
 
     pie_chart.render
@@ -153,10 +153,8 @@ module NewRelic::DeveloperModeHelper
   def segment_row_classes(segment, depth)
     classes = []
 
-    classes << "segment#{segment.parent_segment.segment_id}" if depth > 1
-
+    classes << "segment#{segment.parent_node.object_id}" if depth > 1
     classes << "view_segment" if segment.metric_name.index('View') == 0
-    classes << "summary_segment" if segment.is_a?(NewRelic::TransactionSample::CompositeSegment)
 
     classes.join(' ')
   end
@@ -171,7 +169,7 @@ module NewRelic::DeveloperModeHelper
   end
 
   def sql_link_mouseover_options(segment)
-    { :onmouseover => "sql_mouse_over(#{segment.segment_id})", :onmouseout => "sql_mouse_out(#{segment.segment_id})"}
+    { :onmouseover => "sql_mouse_over(#{segment.object_id})", :onmouseout => "sql_mouse_out(#{segment.object_id})"}
   end
 
   def explain_sql_link(segment, child_sql = false)
@@ -183,7 +181,7 @@ module NewRelic::DeveloperModeHelper
       explain_sql_link segment
     else
       links = []
-      segment.called_segments.each do |child|
+      segment.called_nodes.each do |child|
         if child[:sql]
           links << explain_sql_link(child, true)
         end
@@ -204,22 +202,17 @@ module NewRelic::DeveloperModeHelper
   end
 
   def render_segment_details(segment, depth=0)
-    @detail_segment_count ||= 0
-    @detail_segment_count += 1
+    @detail_node_count ||= 0
+    @detail_node_count += 1
 
-    return '' if @detail_segment_count > trace_row_display_limit
+    return '' if @detail_node_count > trace_row_display_limit
 
     @indentation_depth = depth if depth > @indentation_depth
     repeat = nil
-    if segment.is_a?(NewRelic::TransactionSample::CompositeSegment)
-      html = ''
-    else
-      repeat = segment.parent_segment.detail_segments.length if segment.parent_segment.is_a?(NewRelic::TransactionSample::CompositeSegment)
-      html = render(:partial => 'segment', :object => [segment, depth, repeat])
-      depth += 1
-    end
+    html = render(:partial => 'segment', :object => [segment, depth, repeat])
+    depth += 1
 
-    segment.called_segments.each do |child|
+    segment.called_nodes.each do |child|
       html << render_segment_details(child, depth)
     end
 

data/ui/views/newrelic/_sample.rhtml

@@ -1,20 +1,20 @@
 <% sample = object %>
 <tr class="<%= cycle('even_row', 'odd_row') %>">
 <td align=right nowrap=true>
-  <%= Time.at(sample.timestamp).strftime "%H:%M:%S" %>
+  <%= Time.at(sample.start_time).strftime "%H:%M:%S" %>
 </td>
 <td align=right nowrap=true>
   <%= colorize(sample.duration, 1, 2) %> ms
 </td>
 <td>
-  <%= link_to "#{sample.params[:uri]}", "show_sample_summary?id=#{sample.sample_id}" %>
+  <%= link_to "#{sample.uri}", "show_sample_summary?id=#{sample.sample_id}" %>
 </td>
 <td>
   <% if sample.profile %>
     <%= link_to "[Profile]", "show_sample_summary?id=#{sample.sample_id}" %>
   <% else %>
     <%= link_to "[Detail]", "show_sample_detail?id=#{sample.sample_id}" %><br/>
-    <%= link_to "[SQL (#{sample.sql_segments.size})]", "show_sample_sql?id=#{sample.sample_id}" %>
+    <%= link_to "[SQL (#{sql_segments(sample).size})]", "show_sample_sql?id=#{sample.sample_id}" %>
   <% end %>
 </td>
 </tr>

data/ui/views/newrelic/_segment.rhtml

@@ -2,7 +2,7 @@
 <tr style="<%= 'display:none' if indent > 1 %>" child_row_class="<%=segment_child_row_class(segment)%>" onmouseover="mouse_over_row(this)" onmouseout="mouse_out_row(this)" class='<%=segment_row_classes(segment, indent)%>'>
 
 <td nowrap=true>
-<div class="segment_indent_level<%=indent%> <%='leaf_segment' if segment.called_segments.empty?%>">
+<div class="segment_indent_level<%=indent%> <%='leaf_segment' if segment.called_nodes.empty?%>">
 	<div style="display:inline;">
 		<%= expand_segment_image(segment, indent) %>
 	</div>

data/ui/views/newrelic/_show_sample_summary.rhtml

@@ -1,3 +1,3 @@
 <h3>Performance Summary</h3>
 <%= summary_pie_chart(@sample, 800, 300) %>
-<%= render :partial => 'table', :object => @sample.breakdown_data(6) %>
+<%= render :partial => 'table', :object => breakdown_data(@sample, 6) %>

data/ui/views/newrelic/show_sample.rhtml

@@ -3,15 +3,15 @@
 <table class="light_background">
   <tr>
     <th>URL:</th>
-    <td><%= @sample.params[:uri]%></td>
+    <td><%= @sample.uri %></td>
   </tr>
   <tr>
     <th>Controller:</th>
-    <td><%= @sample_controller_name%></td>
+    <td><%= @sample_controller_name %></td>
   </tr>
   <tr>
     <th>Action:</th>
-    <td><%= @sample_action_name%></td>
+    <td><%= @sample_action_name %></td>
   </tr>
   <tr>
     <th>Start Time:</th>
@@ -23,7 +23,8 @@
   </tr>
   <tr>
     <th>CPU Burn:</th>
-    <td><%= to_ms(@sample.params[:cpu_time]) if @sample.params[:cpu_time] %> ms</td>
+    <% cpu_time = @sample.attributes.intrinsic_attributes_for(NewRelic::Agent::AttributeFilter::DST_TRANSACTION_TRACER)[:cpu_time] %>
+    <td><%= "#{to_ms(cpu_time)} ms" if cpu_time %></td>
   </tr>
   
   <% unless @custom_params.empty? %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 3.11.2.286
+  version: 3.12.0.288
 platform: ruby
 authors:
 - Jason Clark
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-06 00:00:00.000000000 Z
+date: 2015-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -228,6 +228,8 @@ files:
 - lib/new_relic/agent.rb
 - lib/new_relic/agent/agent.rb
 - lib/new_relic/agent/agent_logger.rb
+- lib/new_relic/agent/attribute_filter.rb
+- lib/new_relic/agent/attribute_processing.rb
 - lib/new_relic/agent/audit_logger.rb
 - lib/new_relic/agent/autostart.rb
 - lib/new_relic/agent/busy_calculator.rb
@@ -261,11 +263,13 @@ files:
 - lib/new_relic/agent/datastores/mongo/obfuscator.rb
 - lib/new_relic/agent/datastores/mongo/statement_formatter.rb
 - lib/new_relic/agent/deprecator.rb
+- lib/new_relic/agent/encoding_normalizer.rb
 - lib/new_relic/agent/error_collector.rb
 - lib/new_relic/agent/event_buffer.rb
 - lib/new_relic/agent/event_listener.rb
 - lib/new_relic/agent/event_loop.rb
 - lib/new_relic/agent/harvester.rb
+- lib/new_relic/agent/hash_extensions.rb
 - lib/new_relic/agent/hostname.rb
 - lib/new_relic/agent/http_clients/curb_wrappers.rb
 - lib/new_relic/agent/http_clients/excon_wrappers.rb
@@ -373,10 +377,12 @@ files:
 - lib/new_relic/agent/threading/thread_profile.rb
 - lib/new_relic/agent/traced_method_stack.rb
 - lib/new_relic/agent/transaction.rb
+- lib/new_relic/agent/transaction/attributes.rb
 - lib/new_relic/agent/transaction/developer_mode_sample_buffer.rb
-- lib/new_relic/agent/transaction/force_persist_sample_buffer.rb
 - lib/new_relic/agent/transaction/slowest_sample_buffer.rb
 - lib/new_relic/agent/transaction/synthetics_sample_buffer.rb
+- lib/new_relic/agent/transaction/trace.rb
+- lib/new_relic/agent/transaction/trace_node.rb
 - lib/new_relic/agent/transaction/transaction_sample_buffer.rb
 - lib/new_relic/agent/transaction/xray_sample_buffer.rb
 - lib/new_relic/agent/transaction_event_aggregator.rb
@@ -430,19 +436,12 @@ files:
 - lib/new_relic/rack/agent_middleware.rb
 - lib/new_relic/rack/browser_monitoring.rb
 - lib/new_relic/rack/developer_mode.rb
+- lib/new_relic/rack/developer_mode/segment_summary.rb
 - lib/new_relic/rack/error_collector.rb
 - lib/new_relic/recipes.rb
 - lib/new_relic/recipes/capistrano3.rb
 - lib/new_relic/recipes/capistrano_legacy.rb
 - lib/new_relic/timer_lib.rb
-- lib/new_relic/transaction_analysis.rb
-- lib/new_relic/transaction_analysis/segment_summary.rb
-- lib/new_relic/transaction_sample.rb
-- lib/new_relic/transaction_sample/composite_segment.rb
-- lib/new_relic/transaction_sample/fake_segment.rb
-- lib/new_relic/transaction_sample/segment.rb
-- lib/new_relic/transaction_sample/summary_segment.rb
-- lib/new_relic/url_rule.rb
 - lib/new_relic/version.rb
 - lib/newrelic_rpm.rb
 - lib/sequel/extensions/newrelic_instrumentation.rb
@@ -698,65 +697,7 @@ files:
 - test/fixtures/cross_agent_tests/rum_loader_insertion_location/x_ua_meta_tag_with_others.html
 - test/fixtures/cross_agent_tests/rum_loader_insertion_location/x_ua_meta_tag_with_spaces.html
 - test/fixtures/cross_agent_tests/sql_obfuscation/README.md
-- test/fixtures/cross_agent_tests/sql_obfuscation/back_quoted_identifiers.mysql.obfuscated
-- test/fixtures/cross_agent_tests/sql_obfuscation/back_quoted_identifiers.mysql.sql
-- test/fixtures/cross_agent_tests/sql_obfuscation/comment_delimiters_in_strings.obfuscated
-- test/fixtures/cross_agent_tests/sql_obfuscation/comment_delimiters_in_strings.sql
-- test/fixtures/cross_agent_tests/sql_obfuscation/double_quoted_identifiers.postgres.obfuscated
-- test/fixtures/cross_agent_tests/sql_obfuscation/double_quoted_identifiers.postgres.sql
-- test/fixtures/cross_agent_tests/sql_obfuscation/end_of_line_comment_in_string.obfuscated
-- test/fixtures/cross_agent_tests/sql_obfuscation/end_of_line_comment_in_string.sql
-- test/fixtures/cross_agent_tests/sql_obfuscation/end_of_query_comment_cstyle.obfuscated
-- test/fixtures/cross_agent_tests/sql_obfuscation/end_of_query_comment_cstyle.sql
-- test/fixtures/cross_agent_tests/sql_obfuscation/end_of_query_comment_doubledash.obfuscated
-- test/fixtures/cross_agent_tests/sql_obfuscation/end_of_query_comment_doubledash.sql
-- test/fixtures/cross_agent_tests/sql_obfuscation/end_of_query_comment_hash.obfuscated
-- test/fixtures/cross_agent_tests/sql_obfuscation/end_of_query_comment_hash.sql
-- test/fixtures/cross_agent_tests/sql_obfuscation/escape_string_constants.postgres.obfuscated
-- test/fixtures/cross_agent_tests/sql_obfuscation/escape_string_constants.postgres.sql
-- test/fixtures/cross_agent_tests/sql_obfuscation/malformed/unterminated_double_quoted_string.mysql.sql
-- test/fixtures/cross_agent_tests/sql_obfuscation/malformed/unterminated_single_quoted_string.sql
-- test/fixtures/cross_agent_tests/sql_obfuscation/multiple_literal_types.mysql.obfuscated
-- test/fixtures/cross_agent_tests/sql_obfuscation/multiple_literal_types.mysql.sql
-- test/fixtures/cross_agent_tests/sql_obfuscation/numbers_in_identifiers.obfuscated
-- test/fixtures/cross_agent_tests/sql_obfuscation/numbers_in_identifiers.sql
-- test/fixtures/cross_agent_tests/sql_obfuscation/numeric_literals.obfuscated
-- test/fixtures/cross_agent_tests/sql_obfuscation/numeric_literals.sql
-- test/fixtures/cross_agent_tests/sql_obfuscation/pathological/README.md
-- test/fixtures/cross_agent_tests/sql_obfuscation/pathological/end_of_line_comments_with_quotes.obfuscated
-- test/fixtures/cross_agent_tests/sql_obfuscation/pathological/end_of_line_comments_with_quotes.sql
-- test/fixtures/cross_agent_tests/sql_obfuscation/pathological/mixed_comments_and_quotes.obfuscated
-- test/fixtures/cross_agent_tests/sql_obfuscation/pathological/mixed_comments_and_quotes.sql
-- test/fixtures/cross_agent_tests/sql_obfuscation/pathological/mixed_quotes_comments_and_newlines.obfuscated
-- test/fixtures/cross_agent_tests/sql_obfuscation/pathological/mixed_quotes_comments_and_newlines.sql
-- test/fixtures/cross_agent_tests/sql_obfuscation/pathological/mixed_quotes_end_of_line_comments.obfuscated
-- test/fixtures/cross_agent_tests/sql_obfuscation/pathological/mixed_quotes_end_of_line_comments.sql
-- test/fixtures/cross_agent_tests/sql_obfuscation/pathological/quote_delimiters_in_comments.obfuscated
-- test/fixtures/cross_agent_tests/sql_obfuscation/pathological/quote_delimiters_in_comments.sql
-- test/fixtures/cross_agent_tests/sql_obfuscation/string_double_quoted.mysql.obfuscated
-- test/fixtures/cross_agent_tests/sql_obfuscation/string_double_quoted.mysql.sql
-- test/fixtures/cross_agent_tests/sql_obfuscation/string_single_quoted.obfuscated
-- test/fixtures/cross_agent_tests/sql_obfuscation/string_single_quoted.sql
-- test/fixtures/cross_agent_tests/sql_obfuscation/string_with_backslash_and_twin_single_quotes.obfuscated
-- test/fixtures/cross_agent_tests/sql_obfuscation/string_with_backslash_and_twin_single_quotes.sql
-- test/fixtures/cross_agent_tests/sql_obfuscation/string_with_embedded_double_quote.obfuscated
-- test/fixtures/cross_agent_tests/sql_obfuscation/string_with_embedded_double_quote.sql
-- test/fixtures/cross_agent_tests/sql_obfuscation/string_with_embedded_newline.obfuscated
-- test/fixtures/cross_agent_tests/sql_obfuscation/string_with_embedded_newline.sql
-- test/fixtures/cross_agent_tests/sql_obfuscation/string_with_embedded_single_quote.mysql.obfuscated
-- test/fixtures/cross_agent_tests/sql_obfuscation/string_with_embedded_single_quote.mysql.sql
-- test/fixtures/cross_agent_tests/sql_obfuscation/string_with_escaped_quotes.mysql.obfuscated
-- test/fixtures/cross_agent_tests/sql_obfuscation/string_with_escaped_quotes.mysql.sql
-- test/fixtures/cross_agent_tests/sql_obfuscation/string_with_trailing_backslash.obfuscated
-- test/fixtures/cross_agent_tests/sql_obfuscation/string_with_trailing_backslash.sql
-- test/fixtures/cross_agent_tests/sql_obfuscation/string_with_trailing_escaped_backslash.mysql.obfuscated
-- test/fixtures/cross_agent_tests/sql_obfuscation/string_with_trailing_escaped_backslash.mysql.sql
-- test/fixtures/cross_agent_tests/sql_obfuscation/string_with_trailing_escaped_backslash_single_quoted.obfuscated
-- test/fixtures/cross_agent_tests/sql_obfuscation/string_with_trailing_escaped_backslash_single_quoted.sql
-- test/fixtures/cross_agent_tests/sql_obfuscation/string_with_trailing_escaped_quote.obfuscated
-- test/fixtures/cross_agent_tests/sql_obfuscation/string_with_trailing_escaped_quote.sql
-- test/fixtures/cross_agent_tests/sql_obfuscation/string_with_twin_single_quotes.obfuscated
-- test/fixtures/cross_agent_tests/sql_obfuscation/string_with_twin_single_quotes.sql
+- test/fixtures/cross_agent_tests/sql_obfuscation/sql_obfuscation.json
 - test/fixtures/cross_agent_tests/sql_parsing.json
 - test/fixtures/cross_agent_tests/synthetics/README.md
 - test/fixtures/cross_agent_tests/synthetics/synthetics.json
@@ -792,6 +733,7 @@ files:
 - test/multiverse/suites/activemerchant/Envfile
 - test/multiverse/suites/activemerchant/activemerchant_test.rb
 - test/multiverse/suites/agent_only/Envfile
+- test/multiverse/suites/agent_only/agent_attributes_test.rb
 - test/multiverse/suites/agent_only/agent_run_id_handling_test.rb
 - test/multiverse/suites/agent_only/audit_log_test.rb
 - test/multiverse/suites/agent_only/collector_exception_handling_test.rb
@@ -968,6 +910,7 @@ files:
 - test/multiverse/suites/sinatra/sinatra_error_tracing_test.rb
 - test/multiverse/suites/sinatra/sinatra_metric_explosion_test.rb
 - test/multiverse/suites/sinatra/sinatra_modular_test.rb
+- test/multiverse/suites/sinatra/sinatra_parameter_capture_test.rb
 - test/multiverse/suites/sinatra/sinatra_routes_test.rb
 - test/multiverse/suites/sinatra/sinatra_test_cases.rb
 - test/multiverse/suites/typhoeus/Envfile
@@ -997,6 +940,8 @@ files:
 - test/new_relic/agent/agent_test.rb
 - test/new_relic/agent/agent_test_controller.rb
 - test/new_relic/agent/apdex_from_server_test.rb
+- test/new_relic/agent/attribute_filter_test.rb
+- test/new_relic/agent/attribute_processing_test.rb
 - test/new_relic/agent/audit_logger_test.rb
 - test/new_relic/agent/autostart_test.rb
 - test/new_relic/agent/busy_calculator_test.rb
@@ -1026,12 +971,13 @@ files:
 - test/new_relic/agent/datastores/mongo/statement_formatter_test.rb
 - test/new_relic/agent/datastores_test.rb
 - test/new_relic/agent/deprecator_test.rb
-- test/new_relic/agent/error_collector/notice_error_test.rb
+- test/new_relic/agent/encoding_normalizer_test.rb
 - test/new_relic/agent/error_collector_test.rb
 - test/new_relic/agent/event_buffer_test_cases.rb
 - test/new_relic/agent/event_listener_test.rb
 - test/new_relic/agent/event_loop_test.rb
 - test/new_relic/agent/harvester_test.rb
+- test/new_relic/agent/hash_extensions_test.rb
 - test/new_relic/agent/hostname_test.rb
 - test/new_relic/agent/http_clients/uri_util_test.rb
 - test/new_relic/agent/inbound_request_monitor_test.rb
@@ -1091,10 +1037,12 @@ files:
 - test/new_relic/agent/threading/thread_profile_test.rb
 - test/new_relic/agent/threading/threaded_test_case.rb
 - test/new_relic/agent/traced_method_stack_test.rb
+- test/new_relic/agent/transaction/attributes_test.rb
 - test/new_relic/agent/transaction/developer_mode_sample_buffer_test.rb
-- test/new_relic/agent/transaction/force_persist_sample_buffer_test.rb
 - test/new_relic/agent/transaction/slowest_sample_buffer_test.rb
 - test/new_relic/agent/transaction/synthetics_sample_buffer_test.rb
+- test/new_relic/agent/transaction/trace_node_test.rb
+- test/new_relic/agent/transaction/trace_test.rb
 - test/new_relic/agent/transaction/xray_sample_buffer_test.rb
 - test/new_relic/agent/transaction_event_aggregator_test.rb
 - test/new_relic/agent/transaction_interrobang_test.rb
@@ -1113,6 +1061,7 @@ files:
 - test/new_relic/agent/worker_loop_test.rb
 - test/new_relic/agent_test.rb
 - test/new_relic/cli/commands/deployments_test.rb
+- test/new_relic/cli/commands/install_test.rb
 - test/new_relic/coerce_test.rb
 - test/new_relic/collection_helper_test.rb
 - test/new_relic/control/class_methods_test.rb
@@ -1149,18 +1098,11 @@ files:
 - test/new_relic/rack/agent_middleware_test.rb
 - test/new_relic/rack/browser_monitoring_test.rb
 - test/new_relic/rack/deferred_instrumentation_test.rb
+- test/new_relic/rack/developer_mode/segment_summary_test.rb
 - test/new_relic/rack/developer_mode_helper_test.rb
 - test/new_relic/rack/developer_mode_test.rb
 - test/new_relic/rack/error_collector_test.rb
-- test/new_relic/transaction_analysis/segment_summary_test.rb
-- test/new_relic/transaction_analysis_test.rb
 - test/new_relic/transaction_ignoring_test_cases.rb
-- test/new_relic/transaction_sample/composite_segment_test.rb
-- test/new_relic/transaction_sample/fake_segment_test.rb
-- test/new_relic/transaction_sample/segment_test.rb
-- test/new_relic/transaction_sample/summary_segment_test.rb
-- test/new_relic/transaction_sample_subtest_test.rb
-- test/new_relic/transaction_sample_test.rb
 - test/new_relic/version_number_test.rb
 - test/performance/README.md
 - test/performance/lib/performance.rb
@@ -1188,6 +1130,7 @@ files:
 - test/performance/script/mega-runner
 - test/performance/script/runner
 - test/performance/suites/active_record.rb
+- test/performance/suites/agent_attributes.rb
 - test/performance/suites/config.rb
 - test/performance/suites/marshalling.rb
 - test/performance/suites/queue_time.rb