newrelic_rpm 3.17.2.327 → 3.18.0.329

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

@@ -30,7 +30,7 @@ class NewRelic::Agent::Instrumentation::MongodbCommandSubscriberTest < Minitest:
     end
 
     def test_records_metrics_for_simple_find
-      simulate_query
+      in_transaction { simulate_query }
 
       metric_name = 'Datastore/statement/MongoDB/users/find'
       assert_metrics_recorded(
@@ -65,31 +65,29 @@ class NewRelic::Agent::Instrumentation::MongodbCommandSubscriberTest < Minitest:
 
     def test_should_not_raise_due_to_an_exception_during_instrumentation_callback
       @subscriber.stubs(:metrics).raises(StandardError)
-      simulate_query
+      in_transaction { simulate_query }
     end
 
     def test_records_instance_metrics_for_tcp_connection
-      simulate_query
+      in_transaction { simulate_query }
       assert_metrics_recorded('Datastore/instance/MongoDB/nerd-server/27017')
     end
 
     def test_records_instance_metrics_for_unix_domain_socket
       address = stub('address', :host => "/tmp/mongodb-27017.sock", :port => nil)
       @started_event.stubs(:address).returns(address)
-      simulate_query
+      in_transaction { simulate_query }
       assert_metrics_recorded('Datastore/instance/MongoDB/nerd-server//tmp/mongodb-27017.sock')
     end
 
     def test_records_unknown_unknown_metric_when_error_gathering_instance_data
       @started_event.stubs(:address).returns(nil)
-      simulate_query
+      in_transaction { simulate_query }
       assert_metrics_recorded('Datastore/instance/MongoDB/unknown/unknown')
     end
 
     def test_records_tt_segment_parameters_for_datastore_instance
-      in_transaction do
-        simulate_query
-      end
+      in_transaction { simulate_query }
 
       tt = last_transaction_trace
 
@@ -103,12 +101,10 @@ class NewRelic::Agent::Instrumentation::MongodbCommandSubscriberTest < Minitest:
     def test_does_not_record_unknown_unknown_metric_when_data_empty
       address = stub('address', :host => "", :port => "")
       @started_event.stubs(:address).returns(address)
-      simulate_query
+      in_transaction { simulate_query }
       assert_metrics_not_recorded('Datastore/instance/MongoDB/unknown/unknown')
     end
 
-
-
     def simulate_query
       @subscriber.started(@started_event)
       advance_time @succeeded_event.duration

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

@@ -23,6 +23,10 @@ class NewRelic::Agent::Instrumentation::NetInstrumentationTest < Minitest::Test
     NewRelic::Agent.instance.stats_engine.clear_stats
   end
 
+  def teardown
+    NewRelic::Agent.shutdown
+  end
+
   def test_scope_stack_integrity_maintained_on_request_failure
     @socket.stubs(:write).raises('fake network error')
     with_config(:"cross_application_tracer.enabled" => true) do

data/test/new_relic/agent/method_tracer/instance_methods/trace_execution_scoped_test.rb

@@ -11,15 +11,6 @@ class NewRelic::Agent::MethodTracer::TraceExecutionScopedTest < Minitest::Test
     NewRelic::Agent.agent.stats_engine.clear_stats
   end
 
-  def test_metric_recording_outside_transaction
-    trace_execution_scoped(['foo']) do
-      # meh
-    end
-    assert_metrics_recorded_exclusive(
-      'foo' => { :call_count => 1 }
-    )
-  end
-
   def test_metric_recording_in_non_nested_transaction
     in_transaction('outer') do
       trace_execution_scoped(['foo', 'bar']) do

data/test/new_relic/agent/method_tracer_test.rb

@@ -95,6 +95,7 @@ class NewRelic::Agent::MethodTracerTest < Minitest::Test
     end
 
     @metric_name = nil
+    NewRelic::Agent.shutdown
     super
   end
 
@@ -112,8 +113,11 @@ class NewRelic::Agent::MethodTracerTest < Minitest::Test
 
   def test_trace_execution_scoped_records_metric_data
     metric = "hello"
-    self.class.trace_execution_scoped(metric) do
-      advance_time 0.05
+
+    in_transaction do
+      self.class.trace_execution_scoped(metric) do
+        advance_time 0.05
+      end
     end
 
     stats = @stats_engine.get_stats(metric)
@@ -177,14 +181,18 @@ class NewRelic::Agent::MethodTracerTest < Minitest::Test
   def test_add_method_tracer__default
     self.class.add_method_tracer :simple_method
 
-    simple_method
+    in_transaction do
+      simple_method
+    end
 
     stats = @stats_engine.get_stats("Custom/#{self.class.name}/simple_method")
     assert stats.call_count == 1
   end
 
   def test_add_class_method_tracer
-    MyClass.class_method
+    in_transaction do
+      MyClass.class_method
+    end
     stats = @stats_engine.get_stats("Custom/MyClass/Class/class_method")
     assert stats.call_count == 1
   end
@@ -196,7 +204,10 @@ class NewRelic::Agent::MethodTracerTest < Minitest::Test
       add_method_tracer :instance_method
     end
 
-    cls.new.instance_method
+    in_transaction do
+      cls.new.instance_method
+    end
+
     stats = @stats_engine.get_stats("Custom/AnonymousClass/instance_method")
     assert stats.call_count == 1
   end
@@ -206,7 +217,9 @@ class NewRelic::Agent::MethodTracerTest < Minitest::Test
     self.class.add_method_tracer :simple_method
     self.class.add_method_tracer :simple_method
 
-    simple_method
+    in_transaction do
+      simple_method
+    end
 
     stats = @stats_engine.get_stats("Custom/#{self.class.name}/simple_method")
     assert stats.call_count == 1
@@ -247,8 +260,11 @@ class NewRelic::Agent::MethodTracerTest < Minitest::Test
     NewRelic::Agent.instance.stubs(:transaction_sampler).returns(@old_sampler)
 
     mock = Insider.new(@stats_engine)
-    mock.catcher(0)
-    mock.catcher(5)
+
+    in_transaction do
+      mock.catcher(0)
+      mock.catcher(5)
+    end
 
     stats = @stats_engine.get_stats("catcher")
     assert_equal 2, stats.call_count

data/test/new_relic/agent/parameter_filtering_test.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-# This file is distributed under New Relic"s license terms.
+# 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(File.join(File.dirname(__FILE__),'..','..','test_helper'))
@@ -36,4 +36,4 @@ module NewRelic
       end
     end
   end
-end
+end

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

@@ -15,6 +15,7 @@ class NewRelic::Agent::MetricStatsTest < Minitest::Test
 
   def teardown
     @engine.reset!
+    NewRelic::Agent.shutdown
     super
   end
 

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

@@ -45,18 +45,21 @@ module NewRelic
         end
 
         def test_segment_records_metrics
-          segment = BasicSegment.new "Custom/basic/segment"
-          segment.start
-          advance_time 1.0
-          segment.finish
+          in_transaction do |txn|
+            segment = BasicSegment.new "Custom/basic/segment"
+            txn.add_segment segment
+            segment.start
+            advance_time 1.0
+            segment.finish
+          end
 
           assert_metrics_recorded ["Custom/basic/segment", "Basic/all"]
         end
 
         def test_segment_records_metrics_in_local_cache_if_part_of_transaction
           segment = BasicSegment.new "Custom/basic/segment"
-          txn = in_transaction "test_transaction" do
-            segment.transaction = txn
+          in_transaction "test_transaction" do |txn|
+            txn.add_segment segment
             segment.start
             advance_time 1.0
             segment.finish
@@ -72,21 +75,27 @@ module NewRelic
         # segments we would like to create a TT node for the segment, but not record
         # metrics
         def test_segments_will_not_record_metrics_when_turned_off
-          segment = BasicSegment.new "Custom/basic/segment"
-          segment.record_metrics = false
-          segment.start
-          advance_time 1.0
-          segment.finish
+          in_transaction do |txn|
+            segment = BasicSegment.new "Custom/basic/segment"
+            txn.add_segment segment
+            segment.record_metrics = false
+            segment.start
+            advance_time 1.0
+            segment.finish
+          end
 
           refute_metrics_recorded ["Custom/basic/segment", "Basic/all"]
         end
 
         def test_segment_complete_callback_executes_when_segment_finished
-          segment = BasicSegment.new "Custom/basic/segment"
-          segment.expects(:segment_complete)
-          segment.start
-          advance_time 1.0
-          segment.finish
+          in_transaction do |txn|
+            segment = BasicSegment.new "Custom/basic/segment"
+            txn.add_segment segment
+            segment.expects(:segment_complete)
+            segment.start
+            advance_time 1.0
+            segment.finish
+          end
         end
       end
     end

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

@@ -28,14 +28,31 @@ module NewRelic
           assert_equal "Datastore/operation/SQLite/select", segment.name
         end
 
-        def test_segment_records_expected_metrics
-          Transaction.stubs(:recording_web_transaction?).returns(true)
 
+        def test_segment_does_not_record_metrics_outside_of_txn
           segment = DatastoreSegment.new "SQLite", "insert", "Blog"
           segment.start
           advance_time 1
           segment.finish
 
+          refute_metrics_recorded [
+            "Datastore/statement/SQLite/Blog/insert",
+            "Datastore/operation/SQLite/insert",
+            "Datastore/SQLite/allWeb",
+            "Datastore/SQLite/all",
+            "Datastore/allWeb",
+            "Datastore/all"
+          ]
+        end
+
+        def test_segment_records_expected_metrics
+          in_web_transaction "text_txn" do
+            segment = NewRelic::Agent::Transaction.start_datastore_segment "SQLite", "insert", "Blog"
+            segment.start
+            advance_time 1
+            segment.finish
+          end
+
           assert_metrics_recorded [
             "Datastore/statement/SQLite/Blog/insert",
             "Datastore/operation/SQLite/insert",
@@ -47,12 +64,12 @@ module NewRelic
         end
 
         def test_segment_records_expected_metrics_without_collection
-          Transaction.stubs(:recording_web_transaction?).returns(true)
-
-          segment = DatastoreSegment.new "SQLite", "select"
-          segment.start
-          advance_time 1
-          segment.finish
+          in_web_transaction "text_txn" do
+            segment = Transaction.start_datastore_segment "SQLite", "select"
+            segment.start
+            advance_time 1
+            segment.finish
+          end
 
           assert_metrics_recorded [
             "Datastore/operation/SQLite/select",
@@ -64,12 +81,12 @@ module NewRelic
         end
 
         def test_segment_records_expected_metrics_with_instance_identifier
-          Transaction.stubs(:recording_web_transaction?).returns(true)
-
-          segment = DatastoreSegment.new "SQLite", "select", nil, "jonan-01", "1337807"
-          segment.start
-          advance_time 1
-          segment.finish
+          in_web_transaction "text_txn" do
+            segment = Transaction.start_datastore_segment "SQLite", "select", nil, "jonan-01", "1337807"
+            segment.start
+            advance_time 1
+            segment.finish
+          end
 
           assert_metrics_recorded [
             "Datastore/instance/SQLite/jonan-01/1337807",
@@ -82,12 +99,12 @@ module NewRelic
         end
 
         def test_segment_records_expected_metrics_with_instance_identifier_host_only
-          Transaction.stubs(:recording_web_transaction?).returns(true)
-
-          segment = DatastoreSegment.new "SQLite", "select", nil, "jonan-01"
-          segment.start
-          advance_time 1
-          segment.finish
+          in_web_transaction "text_txn" do
+            segment = Transaction.start_datastore_segment "SQLite", "select", nil, "jonan-01"
+            segment.start
+            advance_time 1
+            segment.finish
+          end
 
           assert_metrics_recorded [
             "Datastore/instance/SQLite/jonan-01/unknown",
@@ -100,12 +117,12 @@ module NewRelic
         end
 
         def test_segment_records_expected_metrics_with_instance_identifier_port_only
-          Transaction.stubs(:recording_web_transaction?).returns(true)
-
-          segment = DatastoreSegment.new "SQLite", "select", nil, nil, 1337807
-          segment.start
-          advance_time 1
-          segment.finish
+          in_web_transaction "text_txn" do
+            segment = Transaction.start_datastore_segment "SQLite", "select", nil, nil, 1337807
+            segment.start
+            advance_time 1
+            segment.finish
+          end
 
           assert_metrics_recorded [
             "Datastore/instance/SQLite/unknown/1337807",
@@ -118,24 +135,24 @@ module NewRelic
         end
 
         def test_segment_does_not_record_expected_metrics_with_empty_data
-          Transaction.stubs(:recording_web_transaction?).returns(true)
-
-          segment = DatastoreSegment.new "SQLite", "select", nil
-          segment.start
-          advance_time 1
-          segment.finish
+          in_web_transaction "text_txn" do
+            segment = Transaction.start_datastore_segment "SQLite", "select", nil
+            segment.start
+            advance_time 1
+            segment.finish
+          end
 
           assert_metrics_not_recorded "Datastore/instance/SQLite/unknown/unknown"
         end
 
         def test_segment_does_not_record_instance_id_metrics_when_disabled
           with_config(:'datastore_tracer.instance_reporting.enabled' => false) do
-            Transaction.stubs(:recording_web_transaction?).returns(true)
-
-            segment = DatastoreSegment.new "SQLite", "select", nil, "jonan-01", "1337807"
-            segment.start
-            advance_time 1
-            segment.finish
+            in_web_transaction "text_txn" do
+              segment = Transaction.start_datastore_segment "SQLite", "select", nil, "jonan-01", "1337807"
+              segment.start
+              advance_time 1
+              segment.finish
+            end
 
             assert_metrics_not_recorded "Datastore/instance/SQLite/jonan-01/1337807"
           end

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

@@ -0,0 +1,330 @@
+# 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(File.join(File.dirname(__FILE__),'..','..','..','test_helper'))
+
+require 'new_relic/agent/transaction'
+require 'new_relic/agent/transaction/external_request_segment'
+
+module NewRelic
+  module Agent
+    class Transaction
+      class ExternalRequestSegmentTest < Minitest::Test
+        class RequestWrapper
+          attr_reader :headers
+
+          def initialize headers = {}
+            @headers = headers
+          end
+
+          def [] key
+            @headers[key]
+          end
+
+          def []= key, value
+            @headers[key] = value
+          end
+
+          def host_from_header
+            self['host']
+          end
+        end
+
+        TRANSACTION_GUID = 'BEC1BC64675138B9'
+
+        def setup
+          @obfuscator = NewRelic::Agent::Obfuscator.new "jotorotoes"
+          CrossAppTracing.stubs(:obfuscator).returns(@obfuscator)
+          CrossAppTracing.stubs(:valid_encoding_key?).returns(true)
+        end
+
+        def teardown
+          NewRelic::Agent.drop_buffered_data
+        end
+
+        def test_generates_expected_name
+          segment = ExternalRequestSegment.new "Typhoeus", "http://remotehost.com/blogs/index", "GET"
+          assert_equal "External/remotehost.com/Typhoeus/GET", segment.name
+        end
+
+        def test_segment_does_not_record_metrics_outside_of_txn
+          segment = ExternalRequestSegment.new "Net::HTTP", "http://remotehost.com/blogs/index", "GET"
+          segment.finish
+
+          refute_metrics_recorded [
+            "External/remotehost.com/Net::HTTP/GET",
+            "External/all",
+            "External/remotehost.com/all",
+            "External/allWeb",
+            ["External/remotehost.com/Net::HTTP/GET", "test"]
+          ]
+        end
+
+        def test_segment_records_expected_metrics_for_non_cat_txn
+          in_transaction "test", :category => :controller do
+            segment = Transaction.start_external_request_segment "Net::HTTP", "http://remotehost.com/blogs/index", "GET"
+            segment.finish
+          end
+
+          expected_metrics = [
+            "External/remotehost.com/Net::HTTP/GET",
+            "External/all",
+            "External/remotehost.com/all",
+            "External/allWeb",
+            ["External/remotehost.com/Net::HTTP/GET", "test"]
+          ]
+
+          assert_metrics_recorded expected_metrics
+        end
+
+        def test_segment_records_noncat_metrics_when_cat_disabled
+          request = RequestWrapper.new
+          response = {
+            'X-NewRelic-App-Data' => make_app_data_payload("1#1884", "txn-name", 2, 8, 0, TRANSACTION_GUID)
+          }
+
+          with_config(cat_config.merge({:"cross_application_tracer.enabled" => false})) do
+            in_transaction "test", :category => :controller do
+              segment = Transaction.start_external_request_segment "Net::HTTP", "http://remotehost.com/blogs/index", "GET"
+              segment.add_request_headers request
+              segment.read_response_headers response
+              segment.finish
+            end
+          end
+
+          expected_metrics = [
+            "External/remotehost.com/Net::HTTP/GET",
+            "External/all",
+            "External/remotehost.com/all",
+            "External/allWeb",
+            ["External/remotehost.com/Net::HTTP/GET", "test"]
+          ]
+
+          assert_metrics_recorded expected_metrics
+        end
+
+        def test_segment_records_noncat_metrics_without_valid_cross_process_id
+          request = RequestWrapper.new
+          response = {
+            'X-NewRelic-App-Data' => make_app_data_payload("1#1884", "txn-name", 2, 8, 0, TRANSACTION_GUID)
+          }
+
+          with_config(cat_config.merge({:cross_process_id => ''})) do
+            in_transaction "test", :category => :controller do
+              segment = Transaction.start_external_request_segment "Net::HTTP", "http://remotehost.com/blogs/index", "GET"
+              segment.add_request_headers request
+              segment.read_response_headers response
+              segment.finish
+            end
+          end
+
+          expected_metrics = [
+            "External/remotehost.com/Net::HTTP/GET",
+            "External/all",
+            "External/remotehost.com/all",
+            "External/allWeb",
+            ["External/remotehost.com/Net::HTTP/GET", "test"]
+          ]
+
+          assert_metrics_recorded expected_metrics
+        end
+
+        def test_segment_records_noncat_metrics_without_valid_encoding_key
+          CrossAppTracing.unstub(:valid_encoding_key?)
+          request = RequestWrapper.new
+          response = {
+            'X-NewRelic-App-Data' => make_app_data_payload("1#1884", "txn-name", 2, 8, 0, TRANSACTION_GUID)
+          }
+
+          with_config(cat_config.merge({:encoding_key => ''})) do
+            in_transaction "test", :category => :controller do
+              segment = Transaction.start_external_request_segment "Net::HTTP", "http://remotehost.com/blogs/index", "GET"
+              segment.add_request_headers request
+              segment.read_response_headers response
+              segment.finish
+            end
+          end
+
+          expected_metrics = [
+            "External/remotehost.com/Net::HTTP/GET",
+            "External/all",
+            "External/remotehost.com/all",
+            "External/allWeb",
+            ["External/remotehost.com/Net::HTTP/GET", "test"]
+          ]
+
+          assert_metrics_recorded expected_metrics
+        end
+
+        def test_segment_records_expected_metrics_for_cat_transaction
+          response = {
+            'X-NewRelic-App-Data' => make_app_data_payload("1#1884", "txn-name", 2, 8, 0, TRANSACTION_GUID)
+          }
+
+          with_config cat_config do
+            in_transaction "test", :category => :controller do |txn|
+              segment = Transaction.start_external_request_segment "Net::HTTP", "http://newrelic.com/blogs/index", "GET"
+              segment.read_response_headers response
+              segment.finish
+            end
+          end
+
+          expected_metrics = [
+            "ExternalTransaction/newrelic.com/1#1884/txn-name",
+            "ExternalApp/newrelic.com/1#1884/all",
+            "External/all",
+            "External/newrelic.com/all",
+            "External/allWeb",
+            ["ExternalTransaction/newrelic.com/1#1884/txn-name", "test"]
+          ]
+
+          assert_metrics_recorded expected_metrics
+        end
+
+        def test_segment_writes_outbound_request_headers
+          request = RequestWrapper.new
+          with_config cat_config do
+            in_transaction :category => :controller do
+              segment = Transaction.start_external_request_segment "Net::HTTP", "http://remotehost.com/blogs/index", "GET"
+              segment.add_request_headers request
+              segment.finish
+            end
+          end
+          assert request.headers.key?("X-NewRelic-ID"), "Expected to find X-NewRelic-ID header"
+          assert request.headers.key?("X-NewRelic-Transaction"), "Expected to find X-NewRelic-Transaction header"
+        end
+
+        def test_segment_writes_synthetics_header_for_synthetics_txn
+          request = RequestWrapper.new
+          with_config cat_config do
+            in_transaction :category => :controller do |txn|
+              txn.raw_synthetics_header = json_dump_and_encode [1, 42, 100, 200, 300]
+              segment = Transaction.start_external_request_segment "Net::HTTP", "http://remotehost.com/blogs/index", "GET"
+              segment.add_request_headers request
+              segment.finish
+            end
+          end
+          assert request.headers.key?("X-NewRelic-Synthetics"), "Expected to find X-NewRelic-Synthetics header"
+        end
+
+        def test_add_request_headers_renames_segment_based_on_host_header
+          request = RequestWrapper.new({"host" => "anotherhost.local"})
+          with_config cat_config do
+            in_transaction :category => :controller do
+              segment = Transaction.start_external_request_segment "Net::HTTP", "http://remotehost.com/blogs/index", "GET"
+              assert_equal "External/remotehost.com/Net::HTTP/GET", segment.name
+              segment.add_request_headers request
+              assert_equal "External/anotherhost.local/Net::HTTP/GET", segment.name
+              segment.finish
+            end
+          end
+        end
+
+        def test_read_response_headers_decodes_valid_appdata
+          response = {
+            'X-NewRelic-App-Data' => make_app_data_payload("1#1884", "txn-name", 2, 8, 0, TRANSACTION_GUID)
+          }
+
+          with_config cat_config do
+            in_transaction :category => :controller do |txn|
+              segment = Transaction.start_external_request_segment "Net::HTTP", "http://remotehost.com/blogs/index", "GET"
+              segment.read_response_headers response
+              segment.finish
+
+              assert segment.cross_app_request?
+              assert_equal "1#1884", segment.cross_process_id
+              assert_equal "txn-name", segment.cross_process_transaction_name
+              assert_equal "BEC1BC64675138B9", segment.transaction_guid
+            end
+          end
+        end
+
+        def test_read_response_headers_ignores_invalid_appdata
+          response = {
+            'X-NewRelic-App-Data' => "this#is#not#valid#appdata"
+          }
+
+          with_config cat_config do
+            in_transaction :category => :controller do |txn|
+              segment = Transaction.start_external_request_segment "Net::HTTP", "http://remotehost.com/blogs/index", "GET"
+              segment.read_response_headers response
+              segment.finish
+
+              refute segment.cross_app_request?
+              assert_nil segment.cross_process_id
+              assert_nil segment.cross_process_transaction_name
+              assert_nil segment.transaction_guid
+            end
+          end
+        end
+
+        def test_read_response_headers_ignores_invalid_cross_app_id
+          response = {
+            'X-NewRelic-App-Data' => make_app_data_payload("not_an_ID", "txn-name", 2, 8, 0, TRANSACTION_GUID)
+          }
+
+          with_config cat_config do
+            in_transaction :category => :controller do |txn|
+              segment = Transaction.start_external_request_segment "Net::HTTP", "http://remotehost.com/blogs/index", "GET"
+              segment.read_response_headers response
+              segment.finish
+
+              refute segment.cross_app_request?
+              assert_nil segment.cross_process_id
+              assert_nil segment.cross_process_transaction_name
+              assert_nil segment.transaction_guid
+            end
+          end
+        end
+
+        def test_uri_recorded_as_tt_attribute
+          segment = nil
+          uri = "http://newrelic.com/blogs/index"
+
+          in_transaction :category => :controller do
+            segment = Transaction.start_external_request_segment "Net::HTTP", uri, "GET"
+            segment.finish
+          end
+
+          sample = NewRelic::Agent.agent.transaction_sampler.last_sample
+          node = find_node_with_name(sample, segment.name)
+
+          assert_equal uri, node.params[:uri]
+        end
+
+        def test_guid_recorded_as_tt_attribute_for_cat_txn
+          segment = nil
+
+          response = {
+            'X-NewRelic-App-Data' => make_app_data_payload("1#1884", "txn-name", 2, 8, 0, TRANSACTION_GUID)
+          }
+
+          with_config cat_config do
+            in_transaction :category => :controller do
+              segment = Transaction.start_external_request_segment "Net::HTTP", "http://newrelic.com/blogs/index", "GET"
+              segment.read_response_headers response
+              segment.finish
+            end
+          end
+
+          sample = NewRelic::Agent.agent.transaction_sampler.last_sample
+          node = find_node_with_name(sample, segment.name)
+
+          assert_equal TRANSACTION_GUID, node.params[:transaction_guid]
+        end
+
+        def cat_config
+          {
+            :cross_process_id    => "269975#22824",
+            :trusted_account_ids => [1,269975]
+          }
+        end
+
+        def make_app_data_payload( *args )
+          @obfuscator.obfuscate( args.to_json ) + "\n"
+        end
+      end
+    end
+  end
+end