newrelic_rpm 3.6.4.122 → 3.6.5.130

data/test/multiverse/suites/typhoeus/config/newrelic.yml

@@ -0,0 +1,21 @@
+---
+development:
+  error_collector:
+    capture_source: true
+    enabled: true
+  apdex_t: 0.5
+  ssl: false
+  monitor_mode: true
+  license_key: bootstrap_newrelic_admin_license_key_000
+  developer_mode: false
+  app_name: test
+  host: 127.0.0.1
+  api_host: 127.0.0.1
+  port: <%= 30_000 + ($$ % 10_000) %>
+  transaction_tracer:
+    record_sql: obfuscated
+    enabled: true
+    stack_trace_threshold: 0.5
+    transaction_threshold: 1.0
+  capture_params: false
+  log_level: debug

data/test/multiverse/suites/typhoeus/typhoeus_test.rb

@@ -0,0 +1,77 @@
+# 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 "typhoeus"
+require "newrelic_rpm"
+require "test/unit"
+require "http_client_test_cases"
+
+require File.join(File.dirname(__FILE__), "..", "..", "..", "agent_helper")
+
+if NewRelic::Agent::Instrumentation::TyphoeusTracing.is_supported_version?
+
+  class TyphoeusTest < Test::Unit::TestCase
+    include HttpClientTestCases
+
+    USE_SSL_VERIFYPEER_VERSION = NewRelic::VersionNumber.new("0.5.0")
+
+    def ssl_option
+      if NewRelic::VersionNumber.new(Typhoeus::VERSION) >= USE_SSL_VERIFYPEER_VERSION
+        { :ssl_verifypeer => false }
+      else
+        { :disable_ssl_peer_verification => true }
+      end
+    end
+
+    def client_name
+      "Typhoeus"
+    end
+
+    # We use the Typhoeus::Request rather than right on Typhoeus to support
+    # prior to convenience methods being added on the top-level module (0.5.x)
+    def get_response(url=nil)
+      Typhoeus::Request.get(url || default_url, ssl_option)
+    end
+
+    def head_response
+      Typhoeus::Request.head(default_url, ssl_option)
+    end
+
+    def post_response
+      Typhoeus::Request.post(default_url, ssl_option.merge(:body => ""))
+    end
+
+    def request_instance
+      NewRelic::Agent::HTTPClients::TyphoeusHTTPRequest.new(Typhoeus::Request.new("http://newrelic.com"))
+    end
+
+    def response_instance
+      headers = "HTTP/1.1 200 OK \r\nX-Whatever-Man: 42"
+      NewRelic::Agent::HTTPClients::TyphoeusHTTPResponse.new(Typhoeus::Response.new(:response_headers => headers))
+    end
+
+
+    def test_hydra
+      in_transaction("test") do
+        hydra = Typhoeus::Hydra.new
+        5.times { hydra.queue(Typhoeus::Request.new(default_url, ssl_option)) }
+        hydra.run
+
+        last_segment = find_last_transaction_segment()
+        assert_equal "External/Multiple/Typhoeus::Hydra/run", last_segment.metric_name
+      end
+    end
+  end
+
+else
+
+  class TyphoeusNotInstrumented < Test::Unit::TestCase
+    def test_works_without_instrumentation
+      # Typhoeus.get wasn't supported back before 0.5.x
+      Typhoeus::Request.get("http://localhost/not/there")
+      assert_metrics_not_recorded(["External/all"])
+    end
+  end
+
+end

data/test/new_relic/agent/agent_test_controller_test.rb

@@ -89,30 +89,31 @@ class NewRelic::Agent::AgentTestControllerTest < ActionController::TestCase
   end if ::Rails::VERSION::MAJOR.to_i <= 3
 
   def test_new_queue_integration
-    # make this test deterministic
-    Time.stubs(:now => Time.at(1360973845))
+    now = freeze_time
 
     NewRelic::Agent::AgentTestController.clear_headers
     engine.clear_stats
-    start = ((Time.now - 1).to_f * 1_000_000).to_i
+    start = ((now - 1).to_f * 1_000_000).to_i
     NewRelic::Agent::AgentTestController.set_some_headers 'HTTP_X_QUEUE_START'=> "t=#{start}"
     get :index
 
-    check_metric_time('WebFrontend/QueueTime', 1, 0.1)
+    assert_metrics_recorded('WebFrontend/QueueTime' => { :total_call_time => 1 })
   end
 
   def test_new_frontend_work_integration
-    # make this test deterministic
-    Time.stubs(:now => Time.at(1360973845))
+    now = freeze_time
 
     engine.clear_stats
-    times = [Time.now - 3, Time.now - 2, Time.now - 1]
+    times = [now - 3, now - 2, now - 1]
     times.map! {|t| (t.to_f * 1_000_000).to_i }
-    NewRelic::Agent::AgentTestController.set_some_headers({
-                                                            'HTTP_X_REQUEST_START'=> "t=#{times[0]}", 'HTTP_X_QUEUE_START' => "t=#{times[1]}", 'HTTP_X_MIDDLEWARE_START' => "t=#{times[2]}"})
+    NewRelic::Agent::AgentTestController.set_some_headers(
+      'HTTP_X_REQUEST_START'    => "t=#{times[0]}",
+      'HTTP_X_QUEUE_START'      => "t=#{times[1]}",
+      'HTTP_X_MIDDLEWARE_START' => "t=#{times[2]}"
+    )
     get :index
 
-    check_metric_time('WebFrontend/QueueTime', 3, 0.1)
+    assert_metrics_recorded('WebFrontend/QueueTime' => { :total_call_time => 3 })
   end
 
   def test_render_inline

data/test/new_relic/agent/configuration/server_source_test.rb

@@ -54,12 +54,14 @@ module NewRelic::Agent::Configuration
     def test_should_disable_gated_features_when_server_says_to
       rsp = {
         'collect_errors' => false,
-        'collect_traces' => false
+        'collect_traces' => false,
+        'collect_analytics_events' => false
       }
       existing_config = {
         :'error_collector.enabled'    => true,
         :'slow_sql.enabled'           => true,
-        :'transaction_tracer.enabled' => true
+        :'transaction_tracer.enabled' => true,
+        :'request_sampler.enabled'    => true
       }
       @source = ServerSource.new(rsp, existing_config)
       assert !@source[:'error_collector.enabled']
@@ -70,54 +72,64 @@ module NewRelic::Agent::Configuration
     def test_should_enable_gated_features_when_server_says_to
       rsp = {
         'collect_errors' => true,
-        'collect_traces' => true
+        'collect_traces' => true,
+        'collect_analytics_events' => true
       }
       existing_config = {
         :'error_collector.enabled'    => true,
         :'slow_sql.enabled'           => true,
-        :'transaction_tracer.enabled' => true
+        :'transaction_tracer.enabled' => true,
+        :'request_sampler.enabled'    => true
       }
       @source = ServerSource.new(rsp, existing_config)
       assert @source[:'error_collector.enabled']
       assert @source[:'slow_sql.enabled']
       assert @source[:'transaction_tracer.enabled']
+      assert @source[:'request_sampler.enabled']
     end
 
     def test_should_allow_manual_disable_of_gated_features
       rsp = {
         'collect_errors' => true,
-        'collect_traces' => true
+        'collect_traces' => true,
+        'collect_analytics_events' => true
       }
       existing_config = {
         :'error_collector.enabled'    => false,
         :'slow_sql.enabled'           => false,
-        :'transaction_tracer.enabled' => false
+        :'transaction_tracer.enabled' => false,
+        :'request_sampler.enabled'    => false
       }
       @source = ServerSource.new(rsp, existing_config)
       assert !@source[:'error_collector.enabled']
       assert !@source[:'slow_sql.enabled']
       assert !@source[:'transaction_tracer.enabled']
+      assert !@source[:'request_sampler.enabled']
     end
 
     def test_should_enable_gated_features_when_server_says_yes_and_existing_says_no
       rsp = {
         'collect_errors' => true,
         'collect_traces' => true,
+        'collect_analytics_events' => true,
         'agent_config' => {
           'transaction_tracer.enabled' => true,
           'slow_sql.enabled'           => true,
-          'error_collector.enabled'    => true
+          'error_collector.enabled'    => true,
+          'request_sampler.enabled'    => true
         }
       }
       existing_config = {
         :'error_collector.enabled'    => false,
         :'slow_sql.enabled'           => false,
-        :'transaction_tracer.enabled' => false
+        :'transaction_tracer.enabled' => false,
+        :'reqeust_sampler.enabled'    => false
       }
       @source = ServerSource.new(rsp, existing_config)
       assert @source[:'error_collector.enabled']
       assert @source[:'slow_sql.enabled']
       assert @source[:'transaction_tracer.enabled']
+      assert @source[:'request_sampler.enabled']
     end
 
     def test_should_not_gate_when_gating_keys_absent
@@ -125,13 +137,15 @@ module NewRelic::Agent::Configuration
         'agent_config' => {
           'transaction_tracer.enabled' => true,
           'slow_sql.enabled'           => true,
-          'error_collector.enabled'    => true
+          'error_collector.enabled'    => true,
+          'request_sampler.enabled'    => true
         }
       }
       @source = ServerSource.new(rsp, {})
       assert @source[:'error_collector.enabled']
       assert @source[:'slow_sql.enabled']
       assert @source[:'transaction_tracer.enabled']
+      assert @source[:'request_sampler.enabled']
     end
   end
 end

data/test/new_relic/agent/database_test.rb

@@ -208,4 +208,10 @@ class NewRelic::Agent::DatabaseTest < Test::Unit::TestCase
 
     assert_equal false, error_log.array.join.include?('VOLDEMORT')
   end
+
+  def test_default_sql_obfuscator_obfuscates_double_quoted_literals_with_unknown_adapter
+    expected = "SELECT * FROM ? WHERE ? = ?"
+    result = NewRelic::Agent::Database.obfuscate_sql("SELECT * FROM \"table\" WHERE \"col\" = 'value'")
+    assert_equal expected, result
+  end
 end

data/test/new_relic/agent/http_clients/uri_util_test.rb

@@ -0,0 +1,64 @@
+# 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/http_clients/uri_util'
+
+class URIUtilTest < Test::Unit::TestCase
+
+  def test_filter_uri
+    assert_filtered("http://foo.com/bar/baz",
+                    "http://foo.com/bar/baz")
+  end
+
+  def test_filter_uri_custom_port
+    assert_filtered("http://foo.com:1234/bar/baz",
+                    "http://foo.com:1234/bar/baz")
+  end
+
+  def test_filtered_uri_omits_query_params
+    assert_filtered("http://foo.com/bar/baz?a=1&b=2",
+                    "http://foo.com/bar/baz")
+  end
+
+  def test_filtered_uri_omits_fragment
+    assert_filtered("http://foo.com/bar/baz#fragment",
+                    "http://foo.com/bar/baz")
+  end
+
+  def test_filtered_uri_omits_query_params_and_fragment
+    assert_filtered("http://foo.com/bar/baz?a=1&b=2#fragment",
+                    "http://foo.com/bar/baz")
+  end
+
+  def test_filtered_uri_reflects_use_of_ssl
+    assert_filtered('https://foo.com/bar/baz',
+                    "https://foo.com/bar/baz")
+  end
+
+  def test_filtered_uri_reflects_use_of_ssl_with_custom_port
+    assert_filtered('https://foo.com:9999/bar/baz',
+                    "https://foo.com:9999/bar/baz")
+  end
+
+  def test_filter_uri_with_full_uri_request_path
+    assert_filtered("http://foo.com/bar/baz?a=1&b=2#fragment",
+                    "http://foo.com/bar/baz")
+  end
+
+  def test_filter_uri_with_full_uri_request_path_https
+    assert_filtered("https://foo.com/bar/baz?a=1&b=2#fragment",
+                    "https://foo.com/bar/baz")
+  end
+
+  def test_strips_credentials_embedded_in_uri
+    assert_filtered("http://user:pass@foo.com/bar/baz",
+                    "http://foo.com/bar/baz")
+  end
+
+  def assert_filtered(original, expected)
+    assert_equal(expected, NewRelic::Agent::HTTPClients::URIUtil.filter_uri(URI(original)))
+  end
+
+end

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

@@ -3,54 +3,11 @@
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
-
 require 'net/http'
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','..','test_helper'))
 require 'new_relic/agent/cross_app_tracing'
 
-# Add some stuff to Net::HTTP::HTTPResponse to facilitate building response data
-class Net::HTTPResponse
-  def to_s
-    buf = ''
-    buf << "HTTP/%s %d %s\r\n" % [ self.http_version, self.code, self.message ]
-    self.each_capitalized {|k,v| buf << k << ': ' << v << "\r\n" }
-    buf << "\r\n"
-    buf << @body if @body
-    return buf
-  end
-  def initialize_copy( original )
-    @http_version = @http_version.dup
-    @code         = @code.dup
-    @message      = @message.dup
-    @body         = @body.dup
-    @read         = false
-    @header       = @header.dup
-  end
-
-  unless instance_methods.map {|name| name.to_sym }.include?( :body= )
-    def body=( newbody )
-      @body = newbody
-    end
-  end
-end
-
 class NewRelic::Agent::Instrumentation::NetInstrumentationTest < Test::Unit::TestCase
-  include NewRelic::Agent::Instrumentation::ControllerInstrumentation,
-          NewRelic::Agent::CrossAppMonitor::EncodingFunctions,
-          NewRelic::Agent::CrossAppTracing
-
-  CANNED_RESPONSE = Net::HTTPOK.new( '1.1', '200', 'OK' )
-  CANNED_RESPONSE.body = 
-    '<html><head><title>Canned Response</title></head><body>Canned response.</body></html>'
-  CANNED_RESPONSE['content-type'] = 'text/html; charset=UTF-8'
-  CANNED_RESPONSE['date'] = 'Tue, 29 Jan 2013 21:52:04 GMT'
-  CANNED_RESPONSE['expires'] = '-1'
-  CANNED_RESPONSE['server'] = 'gws'
-  CANNED_RESPONSE.freeze
-
-  TRANSACTION_GUID = 'BEC1BC64675138B9'
-
-
   def setup
     NewRelic::Agent.manual_start(
       :"cross_application_tracer.enabled" => false,
@@ -59,344 +16,10 @@ class NewRelic::Agent::Instrumentation::NetInstrumentationTest < Test::Unit::Tes
       :encoding_key                       => 'gringletoes'
     )
 
-    @response = CANNED_RESPONSE.clone
     @socket = fixture_tcp_socket( @response )
 
     @engine = NewRelic::Agent.instance.stats_engine
     @engine.clear_stats
-
-
-    @sampler = NewRelic::Agent.instance.transaction_sampler
-    NewRelic::Agent::TransactionInfo.get.guid = TRANSACTION_GUID
-
-  end
-
-  def teardown
-    NewRelic::Agent.instance.transaction_sampler.reset!
-    Thread::current[:newrelic_scope_stack] = nil
-    NewRelic::Agent.instance.stats_engine.end_transaction
-  end
-
-
-  #
-  # Helpers
-  #
-
-  def make_app_data_payload( *args )
-    return obfuscate_with_key( 'gringletoes', args.to_json ).gsub( /\n/, '' ) + "\n"
-  end
-
-
-  def find_last_segment
-    builder = NewRelic::Agent.agent.transaction_sampler.builder
-    last_segment = nil
-    builder.current_segment.each_segment {|s| last_segment = s }
-
-    return last_segment
-  end
-
-
-
-  #
-  # Tests
-  #
-
-  def test_get
-    url = URI.parse('http://www.google.com/index.html')
-    res = Net::HTTP.start(url.host, url.port) {|http|
-      http.get('/index.html')
-    }
-
-    assert_match %r/<head>/i, res.body
-    assert_metrics_recorded_exclusive([
-      'External/all',
-      'External/www.google.com/Net::HTTP/GET',
-      'External/allOther',
-      'External/www.google.com/all'
-    ])
-  end
-
-  def test_background
-    res = nil
-
-    perform_action_with_newrelic_trace("task", :category => :task) do
-      url = URI.parse('http://www.google.com/index.html')
-      res = Net::HTTP.start(url.host, url.port) {|http|
-        http.get('/index.html')
-      }
-    end
-
-    assert_match %r/<head>/i, res.body
-    assert_metrics_recorded_exclusive([
-      'External/all',
-      'External/allOther',
-      'External/www.google.com/all',
-      'External/www.google.com/Net::HTTP/GET',
-      ['External/www.google.com/Net::HTTP/GET', 'OtherTransaction/Background/NewRelic::Agent::Instrumentation::NetInstrumentationTest/task'],
-      'OtherTransaction/Background/NewRelic::Agent::Instrumentation::NetInstrumentationTest/task',
-      'OtherTransaction/Background/all',
-      'OtherTransaction/all'
-    ])
-  end
-
-  def test_transactional
-    res = nil
-
-    perform_action_with_newrelic_trace("task") do
-      url = URI.parse('http://www.google.com/index.html')
-      res = Net::HTTP.start(url.host, url.port) {|http|
-        http.get('/index.html')
-      }
-    end
-
-    assert_match %r/<head>/i, res.body
-    assert_metrics_recorded([
-      'External/all',
-      'External/www.google.com/Net::HTTP/GET',
-      'External/allWeb',
-      'External/www.google.com/all',
-      'Controller/NewRelic::Agent::Instrumentation::NetInstrumentationTest/task'
-    ])
-
-    assert_not_includes @engine.metrics, 'External/allOther'
-  end
-
-  def test_get__simple
-    Net::HTTP.get URI.parse('http://www.google.com/index.html')
-
-    assert_metrics_recorded_exclusive([
-      'External/all',
-      'External/www.google.com/Net::HTTP/GET',
-      'External/allOther',
-      'External/www.google.com/all'
-    ])
-  end
-
-
-  # https://newrelic.atlassian.net/browse/RUBY-835
-  def test_direct_get_request_doesnt_double_count
-    uri = URI.parse("http://www.google.com/index.html")
-    http = Net::HTTP.new(uri.host, uri.port)
-    http.request(Net::HTTP::Get.new(uri.request_uri))
-
-    assert_metrics_recorded([
-      'External/www.google.com/Net::HTTP/GET'
-    ])
-  end
-
-  def test_ignore
-    in_transaction do
-      NewRelic::Agent.disable_all_tracing do
-        url = URI.parse('http://www.google.com/index.html')
-        res = Net::HTTP.start(url.host, url.port) {|http|
-          http.post('/index.html','data')
-        }
-      end
-    end
-
-    assert_metrics_recorded_exclusive([])
-  end
-
-  def test_head
-    url = URI.parse('http://www.google.com/index.html')
-    res = Net::HTTP.start(url.host, url.port) {|http|
-      http.head('/index.html')
-    }
-
-    assert_metrics_recorded_exclusive([
-      'External/all',
-      'External/www.google.com/Net::HTTP/HEAD',
-      'External/allOther',
-      'External/www.google.com/all'
-    ])
-  end
-
-  def test_post
-    url = URI.parse('http://www.google.com/index.html')
-    res = Net::HTTP.start(url.host, url.port) {|http|
-      http.post('/index.html','data')
-    }
-
-    assert_metrics_recorded_exclusive([
-      'External/all',
-      'External/www.google.com/Net::HTTP/POST',
-      'External/allOther',
-      'External/www.google.com/all'
-    ])
-  end
-
-  # When an http call is made, the agent should add a request header named
-  # X-NewRelic-ID with a value equal to the encoded cross_app_id.
-
-  def test_adds_a_request_header_to_outgoing_requests_if_xp_enabled
-    @socket.check_write do |data|
-
-      # assert_match /(?i:x-newrelic-id): VURQV1BZRkZdXUFT/, data
-      # The above assertion won't work in Ruby 2.0.0-p0 because of a bug in the
-      # regexp engine.  Until that's fixed we'll check the header name case
-      # sensitively.
-      assert_match(/X-Newrelic-Id: VURQV1BZRkZdXUFT/, data)
-    end
-
-    with_config(:"cross_application_tracer.enabled" => true) do
-      Net::HTTP.get URI.parse('http://www.google.com/index.html')
-    end
-  end
-
-  def test_adds_a_request_header_to_outgoing_requests_if_old_xp_config_is_present
-    @socket.check_write do |data|
-      # assert_match /(?i:x-newrelic-id): VURQV1BZRkZdXUFT/, data
-      # The above assertion won't work in Ruby 2.0.0-p0 because of a bug in the
-      # regexp engine.  Until that's fixed we'll check the header name case
-      # sensitively.
-      assert_match(/X-Newrelic-Id: VURQV1BZRkZdXUFT/, data)
-    end
-
-    with_config(:cross_application_tracing => true) do
-      Net::HTTP.get URI.parse('http://www.google.com/index.html')
-    end
-  end
-
-  def test_agent_doesnt_add_a_request_header_to_outgoing_requests_if_xp_disabled
-    @socket.check_write do |data|
-      # assert_no_match /(?i:x-newrelic-id): VURQV1BZRkZdXUFT/, data
-      # The above assertion won't work in Ruby 2.0.0-p0 because of a bug in the
-      # regexp engine.  Until that's fixed we'll check the header name case
-      # sensitively.
-      assert_no_match(/X-Newrelic-Id: VURQV1BZRkZdXUFT/, data)
-    end
-
-    Net::HTTP.get URI.parse('http://www.google.com/index.html')
-  end
-
-
-  def test_instrumentation_with_crossapp_enabled_records_normal_metrics_if_no_header_present
-    with_config(:"cross_application_tracer.enabled" => true) do
-      in_transaction('test') do
-        Net::HTTP.get URI.parse('http://www.google.com/index.html')
-      end
-    end
-
-    assert_metrics_recorded_exclusive([
-      'External/all',
-      'External/allOther',
-      'External/www.google.com/all',
-      'External/www.google.com/Net::HTTP/GET',
-      ['External/www.google.com/Net::HTTP/GET', 'test']
-    ])
-  end
-
-  def test_instrumentation_with_crossapp_disabled_records_normal_metrics_even_if_header_is_present
-    @response[ NR_APPDATA_HEADER ] = 
-      make_app_data_payload( '18#1884', 'txn-name', 2, 8, 0, TRANSACTION_GUID )
-
-    in_transaction('test') do
-      Net::HTTP.get URI.parse('http://www.google.com/index.html')
-    end
-
-    assert_metrics_recorded_exclusive([
-      'External/all',
-      'External/allOther',
-      'External/www.google.com/all',
-      'External/www.google.com/Net::HTTP/GET',
-       ['External/www.google.com/Net::HTTP/GET', 'test']
-    ])
-  end
-
-
-  def test_instrumentation_with_crossapp_enabled_records_crossapp_metrics_if_header_present
-    @response[ NR_APPDATA_HEADER ] = 
-      make_app_data_payload( '18#1884', 'txn-name', 2, 8, 0, TRANSACTION_GUID )
-
-    with_config(:"cross_application_tracer.enabled" => true) do
-      in_transaction('test') do
-        Net::HTTP.get URI.parse('http://www.google.com/index.html')
-
-        last_segment = find_last_segment()
-        assert_includes last_segment.params.keys, :transaction_guid
-        assert_equal TRANSACTION_GUID, last_segment.params[:transaction_guid]
-      end
-    end
-
-    assert_metrics_recorded_exclusive([
-      'External/all',
-      'External/allOther',
-      'ExternalApp/www.google.com/18#1884/all',
-      'ExternalTransaction/www.google.com/18#1884/txn-name',
-      'External/www.google.com/all',
-      ['ExternalTransaction/www.google.com/18#1884/txn-name', 'test']
-    ])
-  end
-
-  def test_crossapp_metrics_allow_valid_utf8_characters
-    @response[ NR_APPDATA_HEADER ] = 
-      make_app_data_payload( '12#1114', '世界線航跡蔵', 18.0, 88.1, 4096, TRANSACTION_GUID )
-
-    with_config(:"cross_application_tracer.enabled" => true) do
-      in_transaction('test') do
-        Net::HTTP.get URI.parse('http://www.google.com/index.html')
-
-        last_segment = find_last_segment()
-        assert_includes last_segment.params.keys, :transaction_guid
-        assert_equal TRANSACTION_GUID, last_segment.params[:transaction_guid]
-      end
-    end
-
-    assert_metrics_recorded_exclusive([
-      'External/all',
-      'External/allOther',
-      'ExternalApp/www.google.com/12#1114/all',
-      'External/www.google.com/all',
-      'ExternalTransaction/www.google.com/12#1114/世界線航跡蔵',
-      ['ExternalTransaction/www.google.com/12#1114/世界線航跡蔵', 'test']
-    ])
-  end
-
-  def test_crossapp_metrics_ignores_crossapp_header_with_malformed_crossprocess_id
-    @response[ NR_APPDATA_HEADER ] = 
-      make_app_data_payload( '88#88#88', 'invalid', 1, 2, 4096, TRANSACTION_GUID )
-
-    with_config(:"cross_application_tracer.enabled" => true) do
-      in_transaction('test') do
-        Net::HTTP.get URI.parse('http://www.google.com/index.html')
-      end
-    end
-
-    assert_metrics_recorded_exclusive([
-      'External/all',
-      'External/allOther',
-      'External/www.google.com/Net::HTTP/GET',
-      'External/www.google.com/all',
-      ['External/www.google.com/Net::HTTP/GET', 'test']
-    ])
-  end
-
-  def test_doesnt_affect_the_request_if_an_exception_is_raised_while_setting_up_tracing
-    res = nil
-    NewRelic::Agent.instance.stats_engine.stubs( :push_scope ).
-      raises( NoMethodError, "undefined method `push_scope'" )
-
-    with_config(:"cross_application_tracer.enabled" => true) do
-      assert_nothing_raised do
-        res = Net::HTTP.get URI.parse('http://www.google.com/index.html')
-      end
-    end
-
-    assert_equal res, CANNED_RESPONSE.instance_variable_get( :@body )
-  end
-
-  def test_doesnt_affect_the_request_if_an_exception_is_raised_while_finishing_tracing
-    res = nil
-    NewRelic::Agent.instance.stats_engine.stubs( :pop_scope ).
-      raises( NoMethodError, "undefined method `pop_scope'" )
-
-    with_config(:"cross_application_tracer.enabled" => true) do
-      assert_nothing_raised do
-        res = Net::HTTP.get URI.parse('http://www.google.com/index.html')
-      end
-    end
-
-    assert_equal res, CANNED_RESPONSE.instance_variable_get( :@body )
   end
 
   def test_scope_stack_integrity_maintained_on_request_failure
@@ -410,33 +33,4 @@ class NewRelic::Agent::Instrumentation::NetInstrumentationTest < Test::Unit::Tes
     end
   end
 
-  def test_doesnt_misbehave_when_transaction_tracing_is_disabled
-    @engine.transaction_sampler = nil
-
-    # The error should have any other consequence other than logging the error, so
-    # this will capture logs
-    logger = NewRelic::Agent::MemoryLogger.new
-    NewRelic::Agent.logger = logger
-
-    with_config(:"cross_application_tracer.enabled" => true) do
-      Net::HTTP.get(URI.parse('http://www.google.com/index.html'))
-    end
-
-    assert_no_match( /undefined method `rename_scope_segment' for nil:NilClass/i,
-                     logger.messages.flatten.map {|log| log.to_s }.join(' ') )
-
-  ensure
-    @engine.transaction_sampler = NewRelic::Agent.agent.transaction_sampler
-  end
-
-  def test_includes_full_url_in_transaction_trace
-    uri = 'http://www.google.com/index.html?foo=bar#fragment'
-    in_transaction do 
-      Net::HTTP.get URI.parse(uri)
-      last_segment = find_last_segment()
-      filtered_uri = 'http://www.google.com/index.html'
-      assert_equal filtered_uri, last_segment.params[:uri]
-    end
-  end
-
 end