newrelic_rpm 3.17.2.327 → 3.18.0.329

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

@@ -30,21 +30,45 @@ module NewRelic
           assert_equal ["Segment/all", "Other/all"], segment.unscoped_metrics
         end
 
-        def test_segment_records_metrics
+        def test_segment_does_not_record_metrics_outside_of_txn
           segment = Segment.new  "Custom/simple/segment", "Segment/all"
           segment.start
           advance_time 1.0
           segment.finish
 
-          assert_metrics_recorded ["Custom/simple/segment", "Segment/all"]
+          refute_metrics_recorded ["Custom/simple/segment", "Segment/all"]
         end
 
-        def test_segment_records_metrics_when_given_as_array
-          segment = Segment.new  "Custom/simple/segment", ["Segment/all", "Other/all"]
+        def test_segment_does_not_record_metrics_outside_of_txn
+          segment = Segment.new  "Custom/simple/segment", "Segment/all"
           segment.start
           advance_time 1.0
           segment.finish
 
+          assert_metrics_not_recorded ["Custom/simple/segment", "Segment/all"]
+        end
+
+        def test_segment_records_metrics
+          in_transaction do |txn|
+            segment = Segment.new  "Custom/simple/segment", "Segment/all"
+            txn.add_segment segment
+            segment.start
+            advance_time 1.0
+            segment.finish
+          end
+
+          assert_metrics_recorded ["Custom/simple/segment", "Segment/all"]
+        end
+
+        def test_segment_records_metrics_when_given_as_array
+          in_transaction do |txn|
+            segment = Segment.new  "Custom/simple/segment", ["Segment/all", "Other/all"]
+            txn.add_segment segment
+            segment.start
+            advance_time 1.0
+            segment.finish
+          end
+
           assert_metrics_recorded ["Custom/simple/segment", "Segment/all", "Other/all"]
         end
       end

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

@@ -18,15 +18,6 @@ module NewRelic
           NewRelic::Agent.drop_buffered_data
         end
 
-        def test_segment_without_transaction_records_metrics
-          segment = Transaction.start_segment  "Custom/simple/segment", "Segment/all"
-          segment.start
-          advance_time 1.0
-          segment.finish
-
-          assert_metrics_recorded ["Custom/simple/segment", "Segment/all"]
-        end
-
         def test_segment_bound_to_transaction_records_metrics
           in_transaction "test_txn" do
             segment = Transaction.start_segment  "Custom/simple/segment", "Segment/all"
@@ -47,6 +38,10 @@ module NewRelic
             segment.start
             advance_time 1.0
             segment.finish
+
+            #clean up traced method stack
+            txn.unstub(:segment_complete)
+            txn.segment_complete(segment)
           end
         end
 
@@ -92,12 +87,28 @@ module NewRelic
         end
 
         def test_start_datastore_segment_provides_defaults_without_params
-            segment = Transaction.start_datastore_segment
-            segment.finish
+          segment = Transaction.start_datastore_segment
+          segment.finish
 
-            assert_equal "Datastore/operation/Unknown/other", segment.name
-            assert_equal "Unknown", segment.product
-            assert_equal "other", segment.operation
+          assert_equal "Datastore/operation/Unknown/other", segment.name
+          assert_equal "Unknown", segment.product
+          assert_equal "other", segment.operation
+        end
+
+        def test_start_datastore_segment_does_not_record_metrics_outside_of_txn
+          segment = Transaction.start_datastore_segment "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_start_segment_with_tracing_disabled_in_transaction
@@ -113,24 +124,51 @@ module NewRelic
           refute_metrics_recorded ["Custom/segment/method", "Custom/all"]
         end
 
-        def test_start_segment_with_tracing_disabled_outside_transaction
-          segment = nil
-          NewRelic::Agent.disable_all_tracing do
-            segment = Transaction.start_segment "Custom/segment/method", "Custom/all"
-            advance_time 1
+
+        def test_current_segment_in_transaction
+          in_transaction "test_txn" do |txn|
+            segment = Transaction.start_datastore_segment "SQLite", "insert", "Blog"
+            assert_equal segment, txn.current_segment
             segment.finish
           end
+        end
+
+        def test_segment_started_oustide_txn_does_not_record_metrics
+          segment = Transaction.start_segment "Custom/segment/method", "Custom/all"
+          advance_time 1
+          segment.finish
+
           assert_nil segment.transaction, "Did not expect segment to associated with a transaction"
           refute_metrics_recorded ["Custom/segment/method", "Custom/all"]
         end
 
-        def test_current_segment_in_transaction
+        def test_start_external_request_segment
           in_transaction "test_txn" do |txn|
-            segment = Transaction.start_datastore_segment "SQLite", "insert", "Blog"
-            assert_equal segment, txn.current_segment
+            segment = Transaction.start_external_request_segment "Net::HTTP", "http://site.com/endpoint", "GET"
+            assert_equal Time.now, segment.start_time
+            assert_equal txn, segment.transaction
+            assert_equal "Net::HTTP", segment.library
+            assert_equal "http://site.com/endpoint", segment.uri.to_s
+            assert_equal "GET", segment.procedure
+
+            advance_time 1
             segment.finish
+            assert_equal Time.now, segment.end_time
           end
         end
+
+        def test_segment_does_not_record_metrics_outside_of_txn
+          segment = Transaction.start_external_request_segment "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
       end
     end
   end

data/test/new_relic/agent_test.rb

@@ -14,7 +14,6 @@ module NewRelic
 
     def setup
       NewRelic::Agent.drop_buffered_data
-      NewRelic::Agent.manual_start
       NewRelic::Agent.reset_config
       NewRelic::Agent.instance.stubs(:start_worker_thread)
     end
@@ -98,6 +97,7 @@ module NewRelic
 
         NewRelic::Agent.manual_start
       end
+      NewRelic::Agent.shutdown
     end
 
     def test_get_stats
@@ -195,6 +195,7 @@ module NewRelic
     def test_instance
       NewRelic::Agent.manual_start
       assert_equal(NewRelic::Agent.agent, NewRelic::Agent.instance, "should return the same agent for both identical methods")
+      NewRelic::Agent.shutdown
     end
 
     def test_register_report_channel

data/test/new_relic/collection_helper_test.rb

@@ -13,6 +13,7 @@ class NewRelic::CollectionHelperTest < Minitest::Test
     super
   end
   def teardown
+    NewRelic::Agent.shutdown
     super
   end
 

data/test/new_relic/dispatcher_test.rb

@@ -54,6 +54,7 @@ class DispatcherTest < Minitest::Test
     NewRelic::Agent.manual_start(:dispatcher   => :resque)
     assert_equal :resque, NewRelic::Agent.config[:dispatcher]
     assert_dispatcher_reported_to_environment_report :resque
+    NewRelic::Agent.shutdown
   end
 
 end

data/test/new_relic/fake_external_server.rb

@@ -3,7 +3,7 @@
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
 require 'rack'
-require 'fake_server'
+require 'new_relic/fake_server'
 require 'new_relic/rack/agent_hooks'
 
 require 'json' if RUBY_VERSION >= '1.9'

data/test/new_relic/filtering_test_app.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.
 
 # This is a simple test app for testing parameter filtering as provided by

data/test/new_relic/http_client_test_cases.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 "newrelic_rpm"
@@ -95,7 +95,8 @@ module HttpClientTestCases
   end
 
   def test_get
-    res = get_response
+    res = nil
+    in_transaction { res = get_response }
 
     assert_match %r/<head>/i, body(res)
     assert_externals_recorded_for("localhost", "GET")
@@ -108,7 +109,11 @@ module HttpClientTestCases
   def test_get_with_host_header
     uri = default_uri
     uri.host = '127.0.0.1'
-    res = get_response(uri.to_s, 'Host' => 'test.local')
+    res = nil
+
+    in_transaction do
+      res = get_response(uri.to_s, 'Host' => 'test.local')
+    end
 
     assert_match %r/<head>/i, body(res)
     assert_externals_recorded_for("test.local", "GET")
@@ -117,7 +122,11 @@ module HttpClientTestCases
   def test_get_with_host_header_lowercase
     uri = default_uri
     uri.host = '127.0.0.1'
-    res = get_response(uri.to_s, 'host' => 'test.local')
+    res = nil
+
+    in_transaction do
+      res = get_response(uri.to_s, 'host' => 'test.local')
+    end
 
     assert_match %r/<head>/i, body(res)
     assert_externals_recorded_for("test.local", "GET")
@@ -128,7 +137,11 @@ module HttpClientTestCases
   def test_get_with_reused_connection
     if self.respond_to?(:get_response_multi)
       n = 2
-      responses = get_response_multi(default_url, n)
+      responses = nil
+
+      in_transaction do
+        responses = get_response_multi(default_url, n)
+      end
 
       responses.each do |res|
         assert_match %r/<head>/i, body(res)
@@ -195,28 +208,31 @@ module HttpClientTestCases
   end
 
   def test_head
-    head_response
+    in_transaction { head_response }
     assert_externals_recorded_for("localhost", "HEAD")
   end
 
   def test_post
-    post_response
+    in_transaction { post_response }
     assert_externals_recorded_for("localhost", "POST")
   end
 
   def test_put
-    put_response
+    in_transaction { put_response }
     assert_externals_recorded_for("localhost", "PUT")
   end
 
   def test_delete
-    delete_response
+    in_transaction { delete_response }
     assert_externals_recorded_for("localhost", "DELETE")
   end
 
   if defined?(::Addressable)
     def test_url_not_supported_by_stdlib_uri
-      res = get_response("#{protocol}://foo:^password*12@localhost:#{server.port}/status")
+      res = nil
+      in_transaction do
+        res = get_response("#{protocol}://foo:^password*12@localhost:#{server.port}/status")
+      end
 
       assert_match %r/<head>/i, body(res)
       assert_externals_recorded_for("localhost", "GET")
@@ -228,14 +244,14 @@ module HttpClientTestCases
 
   def test_adds_a_request_header_to_outgoing_requests_if_xp_enabled
     with_config(:"cross_application_tracer.enabled" => true) do
-      get_response
+      in_transaction { get_response }
       assert_equal "VURQV1BZRkZdXUFT", server.requests.last["HTTP_X_NEWRELIC_ID"]
     end
   end
 
   def test_adds_a_request_header_to_outgoing_requests_if_old_xp_config_is_present
     with_config(:cross_application_tracing => true) do
-      get_response
+      in_transaction { get_response }
       assert_equal "VURQV1BZRkZdXUFT", server.requests.last["HTTP_X_NEWRELIC_ID"]
     end
   end
@@ -263,14 +279,14 @@ module HttpClientTestCases
   end
 
   def test_agent_doesnt_add_a_request_header_to_outgoing_requests_if_xp_disabled
-    get_response
+    in_transaction { get_response }
     assert_equal false, server.requests.last.keys.any? {|k| k =~ /NEWRELIC_ID/}
   end
 
   def test_agent_doesnt_add_a_request_header_if_empty_cross_process_id
     with_config(:'cross_application_tracer.enabled' => true,
                 :cross_process_id => "") do
-      get_response
+      in_transaction { get_response }
       assert_equal false, server.requests.last.keys.any? {|k| k =~ /NEWRELIC_ID/}
     end
   end
@@ -278,7 +294,7 @@ module HttpClientTestCases
   def test_agent_doesnt_add_a_request_header_if_empty_encoding_key
     with_config(:'cross_application_tracer.enabled' => true,
                 :encoding_key => "") do
-      get_response
+      in_transaction { get_response }
       assert_equal false, server.requests.last.keys.any? {|k| k =~ /NEWRELIC_ID/}
     end
   end
@@ -376,7 +392,7 @@ module HttpClientTestCases
       raises( NoMethodError, "undefined method `push_scope'" )
 
     with_config(:"cross_application_tracer.enabled" => true) do
-      res = get_response
+      in_transaction { res = get_response }
     end
 
     assert_equal NewRelic::FakeExternalServer::STATUS_MESSAGE, body(res)
@@ -388,7 +404,7 @@ module HttpClientTestCases
       raises( NoMethodError, "undefined method `pop_scope'" )
 
     with_config(:"cross_application_tracer.enabled" => true) do
-      res = get_response
+      in_transaction { res = get_response }
     end
 
     assert_equal NewRelic::FakeExternalServer::STATUS_MESSAGE, body(res)
@@ -401,7 +417,7 @@ module HttpClientTestCases
     NewRelic::Agent.logger = logger
 
     with_config(:"cross_application_tracer.enabled" => true) do
-      get_response
+      in_transaction { get_response }
     end
 
     refute_match( /undefined method `.*" for nil:NilClass/i,
@@ -424,7 +440,7 @@ module HttpClientTestCases
     NewRelic::JSONWrapper.stubs(:dump).raises("Boom!")
 
     with_config(:"cross_application_tracer.enabled" => true) do
-      get_response
+      in_transaction { get_response }
     end
 
     assert_externals_recorded_for("localhost", "GET")
@@ -440,7 +456,9 @@ module HttpClientTestCases
         get_response
 
         last_node = find_last_transaction_node()
-        refute last_node.params.key?(:uri)
+        unless last_node.metric_name.start_with? "External"
+          refute last_node.params.key?(:uri)
+        end
       end
     end
   end

data/test/new_relic/rack/error_collector_test.rb

@@ -32,6 +32,7 @@ module NewRelic::Rack
 
     def teardown
       NewRelic::Agent.drop_buffered_data
+      NewRelic::Agent.shutdown
     end
 
     def test_notice_and_reraise_errors

data/test/performance/suites/external_segment.rb

@@ -0,0 +1,82 @@
+# 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 'net/http'
+require 'new_relic/agent/obfuscator'
+
+class ExternalSegment < Performance::TestCase
+
+  CONFIG = {
+      :license_key     => 'a' * 40,
+      :developer_mode  => false,
+      :'cross_application_tracer.enabled' => true,
+      :cross_process_id                   => "1#1884",
+      :encoding_key                       => "jotorotoes",
+      :trusted_account_ids                => [1]
+  }
+
+  def setup
+    NewRelic::Agent.config.add_config_for_testing(CONFIG)
+
+    NewRelic::Agent.manual_start(
+      :developer_mode => false,
+      :monitor_mode   => false
+    )
+  end
+
+  TEST_URI = URI("http://localhost:3035/status")
+
+  def test_external_request
+    io_server = start_server
+    measure do
+      in_transaction do
+        Net::HTTP.get(TEST_URI)
+      end
+    end
+    stop_server io_server
+  end
+
+  def test_external_cat_request
+    io_server = start_server
+    reply_with_cat_headers io_server
+    measure do
+      in_transaction do
+        Net::HTTP.get(TEST_URI)
+      end
+    end
+    stop_server io_server
+  end
+
+  SERVER_SCRIPT_PATH = File.expand_path('../../../script/external_server.rb', __FILE__)
+
+  def start_server
+    io = IO.popen(SERVER_SCRIPT_PATH, 'r+')
+    response = JSON.parse(io.gets)
+    if response["message"] == "started"
+      io
+    else
+      fail "Could not start server"
+    end
+  end
+
+  def reply_with_cat_headers io_server
+    message = {
+      :command => "add_headers",
+      :payload => cat_response_headers
+    }.to_json
+    io_server.puts message
+  end
+
+  def stop_server io_server
+    message = {:command => "shutdown"}.to_json
+    io_server.puts message
+    Process.wait
+  end
+
+  def cat_response_headers
+    obfuscator = NewRelic::Agent::Obfuscator.new NewRelic::Agent.config[:encoding_key]
+    app_data = obfuscator.obfuscate(["1#1884", "txn-name", 2, 8, 0, 'BEC1BC64675138B9'].to_json) + "\n"
+    {'X-NewRelic-App-Data' => app_data}
+  end
+end