newrelic_rpm 3.9.3.241 → 3.9.4.245

data/test/fixtures/cross_agent_tests/sql_obfuscation/pathological/README.md

@@ -0,0 +1,4 @@
+# Pathological SQL Obfuscation Test Cases
+
+## Why are these pathological?
+Because obfuscating dialect-specific SQL is difficult without building a comprehensive lexer, so there are some edge cases where agents are expected to err on the side of over-obfuscation, even though the resulting obfuscation differs from how a perfect lexer might parse and obfuscate it.

data/test/multiverse/suites/agent_only/cross_application_tracing_test.rb

@@ -59,11 +59,11 @@ class CrossApplicationTracingTest < Minitest::Test
 
   load_cross_agent_test("cat_map").each do |test_case|
     # We only can do test cases here that don't involve outgoing calls 
-    if !test_case["outgoingTxnNames"]
-      if test_case['referringPayload']
+    if !test_case["outboundRequests"]
+      if test_case['inboundPayload']
         request_headers = {
           'X-NewRelic-ID'          => Base64.encode64('1#234'),
-          'X-NewRelic-Transaction' => json_dump_and_encode(test_case['referringPayload'])
+          'X-NewRelic-Transaction' => json_dump_and_encode(test_case['inboundPayload'])
         }
       else
         request_headers = {}
@@ -82,7 +82,12 @@ class CrossApplicationTracingTest < Minitest::Test
         end
 
         event = get_last_analytics_event
-        assert_event_attributes(event, test_case['name'], test_case['expectedAttributes'], test_case['nonExpectedAttributes'])
+        assert_event_attributes(
+          event,
+          test_case['name'],
+          test_case['expectedIntrinsicFields'],
+          test_case['nonExpectedIntrinsicFields']
+        )
       end
     end
   end

data/test/multiverse/suites/rails/Envfile

@@ -1,4 +1,10 @@
 if RUBY_VERSION >= '1.9.3'
+  gemfile <<-RB
+    gem 'rails', '~>4.2.0.beta1'
+    gem 'haml', :require => false
+    gem 'minitest', '5.2.3'
+  RB
+
   gemfile <<-RB
     gem 'rails', '~>4.1.0'
     # Multiverse has an incompatibility with Minitest 5.3.0, so lock here for

data/test/multiverse/suites/rails/ignore_test.rb

@@ -47,32 +47,32 @@ class IgnoredActionsTest < RailsMultiverseTest
   end
 
   def test_metric__ignore
-    get 'ignored/action_to_ignore'
+    get '/ignored/action_to_ignore'
     assert_metrics_recorded_exclusive([])
   end
 
   def test_metric__ignore_apdex
-    get 'ignored/action_to_ignore_apdex'
+    get '/ignored/action_to_ignore_apdex'
     assert_metrics_recorded(["Controller/ignored/action_to_ignore_apdex"])
     assert_metrics_not_recorded(["Apdex"])
   end
 
   def test_ignored_transaction_traces_dont_leak
-    get 'ignored/action_to_ignore'
-    get 'request_stats/stats_action'
+    get '/ignored/action_to_ignore'
+    get '/request_stats/stats_action'
 
     trace = NewRelic::Agent.instance.transaction_sampler.last_sample
     assert_equal 1, trace.root_segment.called_segments.count
   end
 
   def test_should_not_write_cat_response_headers_for_ignored_transactions
-    get 'ignored/action_to_ignore', nil, {'X-NewRelic-ID' => Base64.encode64('1#234')}
+    get '/ignored/action_to_ignore', nil, {'X-NewRelic-ID' => Base64.encode64('1#234')}
     assert_nil @response.headers["X-NewRelic-App-Data"]
   end
 
   def test_apdex_ignored_if_ignored_in_parent_class
-    get 'child/foo'
-    get 'child/bar'
+    get '/child/foo'
+    get '/child/bar'
 
     assert_metrics_not_recorded("Apdex")
   end

data/test/multiverse/suites/rails/view_instrumentation_test.rb

@@ -103,17 +103,17 @@ class ViewInstrumentationTest < RailsMultiverseTest
     next if method == 'proc_render' && Rails::VERSION::MAJOR <= 2
 
     define_method("test_sanity_#{method}") do
-      get "views/#{method}"
+      get "/views/#{method}"
       assert_equal 200, status
     end
 
     def test_should_allow_uncaught_exception_to_propagate
-      get "views/raise_render"
+      get "/views/raise_render"
       assert_equal 500, status
     end
 
     def test_should_count_all_the_template_and_partial_segments
-      get 'views/template_render_with_3_partial_renders'
+      get '/views/template_render_with_3_partial_renders'
       sample = NewRelic::Agent.agent.transaction_sampler.last_sample
       segments = find_all_segments_with_name_matching(sample, ['^Nested/Controller/views', '^View'])
       segments_list = "Found these nodes:\n  #{segments.map(&:metric_name).join("\n  ")}"
@@ -126,7 +126,7 @@ class ViewInstrumentationTest < RailsMultiverseTest
     end
 
     def test_should_have_3_segments_with_the_correct_metric_name
-      get 'views/template_render_with_3_partial_renders'
+      get '/views/template_render_with_3_partial_renders'
 
       sample = NewRelic::Agent.agent.transaction_sampler.last_sample
       partial_segments = find_all_segments_with_name_matching(sample, 'View/views/_a_partial.html.erb/Partial')
@@ -138,7 +138,7 @@ class ViewInstrumentationTest < RailsMultiverseTest
     # We don't capture text or inline template rendering on Rails 2
     if Rails::VERSION::MAJOR >= 3
       def test_should_create_a_metric_for_the_rendered_inline_template
-        get 'views/inline_render'
+        get '/views/inline_render'
 
         sample = NewRelic::Agent.agent.transaction_sampler.last_sample
         text_segment = find_segment_with_name(sample, 'View/inline template/Rendering')
@@ -150,13 +150,13 @@ class ViewInstrumentationTest < RailsMultiverseTest
       # It doesn't seem worth it to get consistent behavior here.
       if Rails::VERSION::MAJOR.to_i == 3 && Rails::VERSION::MINOR.to_i == 0
         def test_should_not_instrument_rendering_of_text
-          get 'views/text_render'
+          get '/views/text_render'
           sample = NewRelic::Agent.agent.transaction_sampler.last_sample
           refute find_segment_with_name(sample, 'View/text template/Rendering')
         end
       else
         def test_should_create_a_metric_for_the_rendered_text
-          get 'views/text_render'
+          get '/views/text_render'
 
           sample = NewRelic::Agent.agent.transaction_sampler.last_sample
           text_segment = find_segment_with_name(sample, 'View/text template/Rendering')
@@ -168,7 +168,7 @@ class ViewInstrumentationTest < RailsMultiverseTest
     end
 
     def test_should_create_a_metric_for_the_rendered_haml_template
-      get 'views/haml_render'
+      get '/views/haml_render'
 
       sample = NewRelic::Agent.agent.transaction_sampler.last_sample
       text_segment = find_segment_with_name(sample, 'View/views/haml_view.html.haml/Rendering')
@@ -178,7 +178,7 @@ class ViewInstrumentationTest < RailsMultiverseTest
     end
 
     def test_should_create_a_proper_metric_when_the_template_is_unknown
-      get 'views/no_template'
+      get '/views/no_template'
       sample = NewRelic::Agent.agent.transaction_sampler.last_sample
 
       # Different versions have significant difference in handling, but we're
@@ -193,7 +193,7 @@ class ViewInstrumentationTest < RailsMultiverseTest
     end
 
     def test_should_create_a_proper_metric_when_we_render_a_collection
-      get 'views/collection_render'
+      get '/views/collection_render'
       sample = NewRelic::Agent.agent.transaction_sampler.last_sample
       assert find_segment_with_name(sample, "View/foos/_foo.html.haml/Partial")
     end
@@ -201,7 +201,7 @@ class ViewInstrumentationTest < RailsMultiverseTest
     [:js_render, :xml_render, :proc_render, :json_render ].each do |action|
       next if action == :proc_render && Rails::VERSION::MAJOR <= 2
       define_method("test_should_not_instrument_rendering_of_#{action}") do
-        get "views/#{action}"
+        get "/views/#{action}"
         sample = NewRelic::Agent.agent.transaction_sampler.last_sample
         view_segment = find_segment_with_name_matching(sample, /^View\//)
         refute view_segment, "Should not instrument rendering of #{action}, found #{view_segment}."
@@ -212,7 +212,7 @@ class ViewInstrumentationTest < RailsMultiverseTest
     # hasn't been a problem thus far, so we're letting it slide.
     if Rails::VERSION::MAJOR >= 3
       def test_should_create_a_metric_for_rendered_file_that_does_not_include_the_filename_so_it_doesnt_metric_explode
-        get 'views/file_render'
+        get '/views/file_render'
         sample = NewRelic::Agent.agent.transaction_sampler.last_sample
         assert find_segment_with_name(sample, 'View/file/Rendering')
         refute find_segment_with_name_matching(sample, 'dummy')
@@ -220,7 +220,7 @@ class ViewInstrumentationTest < RailsMultiverseTest
     end
 
     def test_exclusive_time_for_template_render_metrics_should_not_include_partial_rendering_time
-      get 'views/render_with_delays'
+      get '/views/render_with_delays'
 
       expected_stats_partial = {
         :call_count           => 3,

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

@@ -165,6 +165,14 @@ module NewRelic::Agent::Configuration
       assert_equal keys, result
     end
 
+    def test_does_not_warn_for_new_relic_env_environment_variable
+      expects_no_logging(:warn)
+      expects_no_logging(:info)
+      with_environment('NEW_RELIC_ENV' => 'foo') do
+        @environment_source.set_values_from_new_relic_environment_variables
+      end
+    end
+
     def assert_applied_string(env_var, config_var)
       ENV[env_var] = 'test value'
       assert_equal 'test value', EnvironmentSource.new[config_var.to_sym]

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

@@ -67,7 +67,7 @@ module NewRelic::Agent::Configuration
     end
 
     def test_should_log_if_environment_is_not_present
-      expects_logging(:error, any_parameters)
+      expects_logging(:error, includes(@test_yml_path))
       YamlSource.new(@test_yml_path, 'nonsense')
     end
 

data/test/new_relic/agent/database/sql_obfuscation_test.rb

@@ -49,19 +49,28 @@ module NewRelic::Agent::Database
 
       query
     end
+    
+    def self.create_regular_obfuscation_test(filename, type = "normal")
+      name = name_for_input_file(filename)
 
-    # Normal queries
-    input_files.each do |input_file|
-      name = name_for_input_file(input_file)
-
-      define_method("test_sql_obfuscation_#{name}") do
-        query               = read_query(input_file)
-        expected_obfuscated = File.read(obfuscated_filename(input_file))
+      define_method("test_sql_obfuscation_#{type}_#{name}") do
+        query               = read_query(filename)
+        expected_obfuscated = File.read(obfuscated_filename(filename))
         actual_obfuscated   = NewRelic::Agent::Database.obfuscate_sql(query)
-        assert_equal(expected_obfuscated, actual_obfuscated, "Failed to obfuscate query from #{input_file}\nQuery: #{query}")
+        assert_equal(expected_obfuscated, actual_obfuscated, "Failed to obfuscate #{type} query from #{filename}\nQuery: #{query}")
       end
     end
 
+    # Normal queries
+    input_files.each do |input_file|
+      create_regular_obfuscation_test(input_file)
+    end
+    
+    # Pathological queries
+    input_files('pathological').each do |input_file|
+      create_regular_obfuscation_test(input_file, "pathological")
+    end
+
     # Malformed queries
     input_files('malformed').each do |input_file|
       name = name_for_input_file(input_file)

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

@@ -301,6 +301,37 @@ class NewRelic::Agent::Instrumentation::NewActiveRecordInstrumentationTest < Min
     end
   end
 
+  def test_cached_calls_are_not_recorded_with_find
+    in_web_transaction do
+      order = ActiveRecordFixtures::Order.create(:name => 'Oberon')
+      ActiveRecordFixtures::Order.connection.cache do
+        ActiveRecordFixtures::Order.find(order.id)
+        ActiveRecordFixtures::Order.find(order.id)
+        ActiveRecordFixtures::Order.find(order.id)
+      end
+    end
+
+    call_count = active_record_query_caching_broken_for_find ? 3 : 1
+    assert_activerecord_metrics(ActiveRecordFixtures::Order, 'find', :call_count => call_count)
+    assert_remote_service_metrics
+  end
+
+  def test_cached_calls_are_not_recorded_with_select_all
+    query = "SELECT * FROM #{ActiveRecordFixtures::Order.table_name} WHERE name = 'Oberon'"
+    in_web_transaction do
+      ActiveRecordFixtures::Order.create(:name => 'Oberon')
+      ActiveRecordFixtures::Order.connection.cache do
+        ActiveRecordFixtures::Order.connection.select_all(query)
+        ActiveRecordFixtures::Order.connection.select_all(query)
+        ActiveRecordFixtures::Order.connection.select_all(query)
+      end
+    end
+
+    assert_metrics_recorded(
+      {'Database/SQL/select' => {:call_count => 1}}
+    )
+  end
+
   # helpers
 
   def rails_env
@@ -354,13 +385,25 @@ class NewRelic::Agent::Instrumentation::NewActiveRecordInstrumentationTest < Min
     end
   end
 
-  def assert_activerecord_metrics(model, operation)
-    assert_metrics_recorded([
-      "ActiveRecord/all",
-      "ActiveRecord/#{operation}",
-      "ActiveRecord/#{model}/#{operation}",
-      "Datastore/all"
-    ])
+  def active_record_query_caching_broken_for_find
+    # For ActiveRecord 3.1 and 3.2 running in JRuby, some
+    # query caching does not work.
+    return false unless defined? JRuby
+    return false unless active_record_major_version == 3
+
+    case active_record_minor_version
+    when 1, 2 then true
+    else false
+    end
+  end
+
+  def assert_activerecord_metrics(model, operation, stats={})
+    assert_metrics_recorded({
+      "ActiveRecord/all" => {},
+      "ActiveRecord/#{operation}" => {},
+      "ActiveRecord/#{model}/#{operation}" => stats,
+      "Datastore/all" => {}
+    })
   end
 
   def assert_generic_rollup_metrics(operation)

data/test/new_relic/agent/new_relic_service_test.rb

@@ -150,6 +150,13 @@ class NewRelicServiceTest < Minitest::Test
     assert_equal File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'cert', 'cacert.pem')), @service.cert_file_path
   end
 
+  def test_cert_file_path_uses_path_from_config
+    fake_cert_path = '/certpath/cert.pem'
+    with_config(:ca_bundle_path => fake_cert_path) do
+      assert_equal @service.cert_file_path, fake_cert_path
+    end
+  end
+
   def test_initialize_uses_correct_license_key_settings
     with_config(:license_key => 'abcde') do
       service = NewRelic::Agent::NewRelicService.new
@@ -323,6 +330,12 @@ class NewRelicServiceTest < Minitest::Test
     assert_equal({ "profile" => 123 }, response)
   end
 
+  def test_profile_data_does_not_normalize_encodings
+    @http_handle.respond_to(:profile_data, nil)
+    NewRelic::JSONWrapper.expects(:normalize).never
+    @service.profile_data([])
+  end
+
   def test_get_agent_commands
     @service.agent_id = 666
     @http_handle.respond_to(:get_agent_commands, [1,2,3])
@@ -419,7 +432,7 @@ class NewRelicServiceTest < Minitest::Test
     def test_raises_serialization_error_if_json_serialization_fails
       ::NewRelic::JSONWrapper.stubs(:dump).raises(RuntimeError.new('blah'))
       assert_raises(NewRelic::Agent::SerializationError) do
-        @service.send(:invoke_remote, 'wiggle', {})
+        @service.send(:invoke_remote, 'wiggle', [{}])
       end
     end
 
@@ -428,7 +441,7 @@ class NewRelicServiceTest < Minitest::Test
         @http_handle.respond_to(:wiggle, 'hi')
         NewRelic::JSONWrapper.stubs(:normalize).raises('blah')
         assert_raises(NewRelic::Agent::SerializationError) do
-          @service.send(:invoke_remote, 'wiggle', {})
+          @service.send(:invoke_remote, 'wiggle', [{}])
         end
       end
     end
@@ -437,7 +450,7 @@ class NewRelicServiceTest < Minitest::Test
       @http_handle.respond_to(:wiggle, 'hello')
       with_config(:normalize_json_string_encodings => false) do
         NewRelic::JSONWrapper.expects(:normalize).never
-        @service.send(:invoke_remote, 'wiggle', { 'foo' => 'bar' })
+        @service.send(:invoke_remote, 'wiggle', [{ 'foo' => 'bar' }])
       end
     end
 
@@ -689,7 +702,7 @@ class NewRelicServiceTest < Minitest::Test
   def roundtrip_data(data, normalize = true)
     with_config(:normalize_json_string_encodings => normalize) do
       @http_handle.respond_to(:roundtrip, 'roundtrip')
-      @service.send(:invoke_remote, 'roundtrip', data)
+      @service.send(:invoke_remote, 'roundtrip', [data])
       @http_handle.last_request_payload[0]
     end
   end

data/test/new_relic/http_client_test_cases.rb

@@ -482,7 +482,7 @@ module HttpClientTestCases
 
   load_cross_agent_test("cat_map").each do |test_case|
     # Test cases that don't involve outgoing calls are done elsewhere
-    if test_case['outgoingTxnNames']
+    if test_case['outboundRequests']
       define_method("test_#{test_case['name']}") do
         config = {
           :app_name => test_case['appName'],
@@ -491,18 +491,28 @@ module HttpClientTestCases
         with_config(config) do
           in_transaction do
             state = NewRelic::Agent::TransactionState.tl_get
-            state.referring_transaction_info = test_case['referringPayload']
+            state.referring_transaction_info = test_case['inboundPayload']
             stub_transaction_guid(test_case['transactionGuid'])
-            test_case['outgoingTxnNames'].each do |name|
-              set_explicit_transaction_name(name)
+            test_case['outboundRequests'].each do |req|
+              set_explicit_transaction_name(req['outboundTxnName'])
               get_response
+
+              outbound_payload = server.requests.last["HTTP_X_NEWRELIC_TRANSACTION"]
+              decoded_outbound_payload = decode_payload(outbound_payload)
+
+              assert_equal(req['expectedOutboundPayload'], decoded_outbound_payload)
             end
             set_explicit_transaction_name(test_case['transactionName'])
           end
         end
 
         event = get_last_analytics_event
-        assert_event_attributes(event, test_case['name'], test_case['expectedAttributes'], test_case['nonExpectedAttributes'])
+        assert_event_attributes(
+          event,
+          test_case['name'],
+          test_case['expectedIntrinsicFields'],
+          test_case['nonExpectedIntrinsicFields']
+        )
       end
     end
   end