newrelic_rpm 3.9.4.245 → 3.9.5.251

data/test/fixtures/cross_agent_tests/transaction_segment_terms.json

@@ -0,0 +1,101 @@
+[
+  {
+    "testname": "basic",
+    "transaction_segment_terms": [
+      {
+        "prefix": "WebTransaction/Custom",
+        "terms":  ["one", "two", "three"]
+      },
+      {
+        "prefix": "WebTransaction/Uri",
+        "terms": ["seven", "eight", "nine"]
+      }
+    ],
+    "tests": [
+      {
+        "input": "WebTransaction/Uri/one/two/seven/user/nine/account",
+        "expected": "WebTransaction/Uri/*/seven/*/nine/*"
+      },
+      {
+        "input": "WebTransaction/Custom/one/two/seven/user/nine/account",
+        "expected": "WebTransaction/Custom/one/two/*"
+      },
+      {
+        "input": "WebTransaction/Other/one/two/foo/bar",
+        "expected": "WebTransaction/Other/one/two/foo/bar"
+      }
+    ]
+  },
+  {
+    "testname": "prefix_with_trailing_slash",
+    "transaction_segment_terms": [
+      {
+        "prefix": "WebTransaction/Custom/",
+        "terms": ["a", "b"]
+      }
+    ],
+    "tests": [
+      {
+        "input": "WebTransaction/Custom/a/b/c",
+        "expected": "WebTransaction/Custom/a/b/*"
+      },
+      {
+        "input": "WebTransaction/Customer/a/b/c",
+        "expected": "WebTransaction/Customer/a/b/c"
+      }
+    ]
+  },
+  {
+    "testname": "rule_chaining",
+    "transaction_segment_terms": [
+      {
+        "prefix": "WebTransaction/Foo",
+        "terms": ["one", "two", "three"]
+      },
+      {
+        "prefix": "WebTransaction/Foo/one",
+        "terms": ["one", "two"]
+      }
+    ],
+    "tests": [
+      {
+        "input": "WebTransaction/Foo/one/two/three/four",
+        "expected": "WebTransaction/Foo/one/two/three/*"
+      }
+    ]
+  },
+  {
+    "testname": "rule_with_prefix_not_ending_in_segment_boundary",
+    "transaction_segment_terms": [
+      {
+        "prefix": "WebTrans",
+        "terms": ["one", "two"]
+      }
+    ],
+    "tests": [
+      {
+        "input": "WebTransaction/Foo/one/two",
+        "expected": "WebTrans*/one/two"
+      }
+    ]
+  },
+  {
+    "testname": "terms_are_order_independent",
+    "transaction_segment_terms": [
+      {
+        "prefix": "Foo",
+        "terms": ["one", "two", "three"]
+      }
+    ],
+    "tests": [
+      {
+        "input": "Foo/bar/one/three/two",
+        "expected": "Foo/*/one/three/two"
+      },
+      {
+        "input": "Foo/three/one/one/two/three",
+        "expected": "Foo/three/one/one/two/three"
+      }
+    ]
+  }
+]

data/test/multiverse/lib/multiverse/suite.rb

@@ -395,7 +395,7 @@ module Multiverse
       Dir.chdir directory
       ordered_ruby_files(directory).each do |file|
         puts yellow("Executing #{file.inspect}") if verbose?
-        load file
+        require "./" + File.basename(file, ".rb")
       end
     end
 

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

@@ -0,0 +1,40 @@
+# 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 'newrelic_rpm'
+require 'multiverse_helpers'
+
+class AgentRunIdHandlingTest < Minitest::Test
+  include MultiverseHelpers
+
+  NON_NUMERIC_RUN_ID = 'some-crazy-non-integer-thing'
+
+  setup_and_teardown_agent do
+    $collector.stub('connect', { "agent_run_id" => NON_NUMERIC_RUN_ID })
+  end
+
+  # This test verifies that the Ruby agent is able to accept non-numeric values
+  # of the agent run ID handed down by the collector in response to the connect
+  # method. This is required for agent protocol version 14.
+  def test_handles_non_numeric_agent_run_ids
+    NewRelic::Agent.agent.send(:transmit_data)
+    metric_data_post = $collector.calls_for('metric_data').last
+    assert_equal(NON_NUMERIC_RUN_ID, metric_data_post[0])
+  end
+
+  # The sql_data endpoint sends the agent run ID as a query string parameter,
+  # rather than embedded within the body, so make sure we handle that.
+  def test_handles_non_numeric_agent_run_id_on_slow_sql_traces
+    simulate_slow_sql_trace
+    sql_data_post = $collector.calls_for('sql_trace_data').last
+    assert_equal(NON_NUMERIC_RUN_ID, sql_data_post.query_params['run_id'])
+  end
+
+  def simulate_slow_sql_trace
+    in_transaction do
+      agent.sql_sampler.notice_sql("select * from test", "Database/test/select", nil, 1.5)
+    end
+    NewRelic::Agent.agent.send(:harvest_and_send_slowest_sql)
+  end
+end

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

@@ -14,31 +14,26 @@ class LabelsTest < Minitest::Test
   EXPECTED     = [{'label_type' => 'Server', 'label_value' => 'East'}]
   YML_EXPECTED = [{'label_type' => 'Server', 'label_value' => 'Yaml'}]
 
-  def after_setup
-    $collector.reset
-    make_sure_agent_reconnects({})
-  end
-
   def test_yaml_makes_it_to_the_collector
     # Relies on the agent_only/config/newrelic.yml!
-    NewRelic::Agent.manual_start
+    trigger_agent_reconnect
     assert_connect_had_labels(YML_EXPECTED)
   end
 
   def test_labels_from_config_hash_make_it_to_the_collector
     with_config("labels" => { "Server" => "East" }) do
-      NewRelic::Agent.manual_start
+      trigger_agent_reconnect
       assert_connect_had_labels(EXPECTED)
     end
   end
 
   def test_labels_from_manual_start_hash_make_it_to_the_collector
-    NewRelic::Agent.manual_start(:labels => { "Server" => "East" })
+    trigger_agent_reconnect(:labels => { "Server" => "East" })
     assert_connect_had_labels(EXPECTED)
   end
 
   def test_numeric_values_for_labels
-    NewRelic::Agent.manual_start(:labels => { "Server" => 42 })
+    trigger_agent_reconnect(:labels => { "Server" => 42 })
     expected = [
       { 'label_type' => 'Server', 'label_value' => '42' }
     ]
@@ -46,7 +41,7 @@ class LabelsTest < Minitest::Test
   end
 
   def test_boolean_values_for_labels
-    NewRelic::Agent.manual_start(:labels => { "Server" => true })
+    trigger_agent_reconnect(:labels => { "Server" => true })
     expected = [
       { 'label_type' => 'Server', 'label_value' => 'true' }
     ]
@@ -58,13 +53,13 @@ class LabelsTest < Minitest::Test
   load_cross_agent_test("labels").each do |testcase|
     define_method("test_#{testcase['name']}_from_config_string") do
       with_config("labels" => testcase["labelString"]) do
-        NewRelic::Agent.manual_start
+        trigger_agent_reconnect
         assert_connect_had_labels(testcase["expected"])
       end
     end
 
     define_method("test_#{testcase['name']}_from_manual_start") do
-      NewRelic::Agent.manual_start(:labels => testcase["labelString"])
+      trigger_agent_reconnect(:labels => testcase["labelString"])
       assert_connect_had_labels(testcase["expected"])
     end
 
@@ -74,7 +69,7 @@ class LabelsTest < Minitest::Test
         ENV['NEW_RELIC_LABELS'] = testcase["labelString"]
         NewRelic::Agent.config.reset_to_defaults
 
-        NewRelic::Agent.manual_start
+        trigger_agent_reconnect
         assert_connect_had_labels(testcase["expected"])
       ensure
         ENV['NEW_RELIC_LABELS'] = nil
@@ -83,7 +78,7 @@ class LabelsTest < Minitest::Test
   end
 
   def assert_connect_had_labels(expected)
-    result = $collector.calls_for('connect').first['labels']
+    result = $collector.calls_for('connect').last['labels']
     assert_equal expected, result
   end
 end

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

@@ -67,12 +67,10 @@ class MarshalingTest < Minitest::Test
   end
 
   def test_sql_trace_data_marshalling
-    state = NewRelic::Agent::TransactionState.tl_get
-    agent.sql_sampler.on_start_transaction(state, nil)
-    agent.sql_sampler.notice_sql("select * from test",
-                                  "Database/test/select",
-                                  nil, 1.5, state)
-    agent.sql_sampler.on_finishing_transaction(state, 'txn')
+    in_transaction do
+      agent.sql_sampler.notice_sql("select * from test", "Database/test/select",
+                                    nil, 1.5)
+    end
 
     agent.service.connect
     agent.send(:harvest_and_send_slowest_sql)

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

@@ -9,11 +9,18 @@ class RenameRuleTest < Minitest::Test
   include MultiverseHelpers
 
   setup_and_teardown_agent do |collector|
-    rules = [ { 'match_expression' => 'RenameRuleTest', 'replacement' => 'Class' } ]
+    rules = [
+      { 'match_expression' => 'RenameRuleTest', 'replacement' => 'Class' },
+      { 'match_expression' => 'Nothing',        'replacement' => 'Something' }
+    ]
+    segment_terms_rules = [
+      { 'prefix' => 'other', 'terms' => ['Nothing', 'one', 'two'] }
+    ]
     collector.stub('connect', {
-      'agent_run_id'           => 666,
-      'transaction_name_rules' => rules,
-      'metric_name_rules'      => rules
+      'agent_run_id'              => 666,
+      'transaction_name_rules'    => rules,
+      'metric_name_rules'         => rules,
+      'transaction_segment_terms' => segment_terms_rules
     })
   end
 
@@ -53,4 +60,34 @@ class RenameRuleTest < Minitest::Test
     assert_not_includes(metric_names, 'Custom/RenameRuleTest::TestWidget/mthd')
   end
 
+  def test_transaction_segment_terms_do_not_apply_to_metrics
+    in_transaction do
+      NewRelic::Agent.record_metric("other/foo/bar", 42)
+    end
+
+    assert_metrics_recorded(['other/foo/bar'])
+  end
+
+  def test_transaction_segment_terms_do_apply_to_transaction_names
+    in_transaction do
+      NewRelic::Agent.set_transaction_name('one/two/three/four')
+    end
+
+    assert_metrics_recorded(['other/one/two/*'])
+    assert_metrics_not_recorded(['other/one/two/three/four'])
+  end
+
+  def test_transaction_segment_terms_applied_after_other_rules
+    in_transaction do
+      NewRelic::Agent.set_transaction_name('Nothing/one/two/three')
+    end
+
+    assert_metrics_recorded(['other/*/one/two/*'])
+    assert_metrics_not_recorded([
+      'other/Something/one/two/*',
+      'other/Something/one/two/three',
+      'other/Nothing/one/two/*',
+      'other/Nothing/one/two/three'
+    ])
+  end
 end

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

@@ -85,9 +85,17 @@ class SetTransactionNameTest < Minitest::Test
   end
 
   def test_set_name_is_subject_to_txn_name_rules
-    rule = NewRelic::Agent::RulesEngine::Rule.new('match_expression' => 'child',
-                                                  'replacement'      => 'kid')
-    NewRelic::Agent.instance.transaction_rules << rule
+    connect_response = {
+      'agent_run_id' => 1,
+      'transaction_name_rules' => [
+        { 'match_expression' => 'child', 'replacement' => 'kid' }
+      ]
+    }
+
+    $collector.stub('connect', connect_response)
+
+    trigger_agent_reconnect
+
     TestTransactor.new.parent_txn
     assert_metrics_recorded(['Controller/TestTransactor/kid'])
   end

data/test/multiverse/suites/config_file_loading/config_file_loading_test.rb

@@ -83,11 +83,11 @@ bazbangbarn:
   end
 
   def test_config_loads_from_config_newrelic_yml
-    assert_config_read_from(File.dirname(__FILE__) + "/config/newrelic.yml")
+    assert_config_read_from(File.join(@cwd, "config/newrelic.yml"))
   end
 
   def test_config_loads_from_newrelic_yml
-    assert_config_read_from(File.dirname(__FILE__) + "/newrelic.yml")
+    assert_config_read_from(File.join(@cwd, "newrelic.yml"))
   end
 
   def test_config_loads_from_home_newrelic_yml
@@ -99,7 +99,7 @@ bazbangbarn:
   end
 
   def test_config_loads_from_config_path_option_to_manual_start
-    path = File.join(File.dirname(__FILE__), 'otherplace', 'newrelic.yml')
+    path = File.join(@cwd, 'otherplace', 'newrelic.yml')
     assert_config_read_from(path, :config_path => path)
   end
 
@@ -139,7 +139,7 @@ bazbangbarn:
   end
 
   def test_warning_logged_when_config_file_yaml_parsing_error
-    path = File.join(File.dirname(__FILE__), 'config', 'newrelic.yml')
+    path = File.join(@cwd, 'config', 'newrelic.yml')
     setup_config(path, {}, '<< bogus junk')
     setup_agent
 
@@ -149,7 +149,7 @@ bazbangbarn:
   end
 
   def test_warning_logged_when_config_file_erb_error
-    path = File.join(File.dirname(__FILE__), 'config', 'newrelic.yml')
+    path = File.join(@cwd, 'config', 'newrelic.yml')
     setup_config(path, {}, "\n\n\n<%= this is not ruby %>") # the error is on line 4
     setup_agent
 
@@ -169,7 +169,7 @@ boom:
   # <%= this is not ruby %>
         YAML
 
-    path = File.join(File.dirname(__FILE__), 'config', 'newrelic.yml')
+    path = File.join(@cwd, 'config', 'newrelic.yml')
     setup_config(path, {}, config_contents)
     setup_agent
 
@@ -189,11 +189,11 @@ boom:
   end
 
   def test_config_isnt_loaded_from_somewhere_crazy
-    assert_config_not_read_from(File.dirname(__FILE__) + "/somewhere/crazy/newrelic.yml")
+    assert_config_not_read_from(File.join(@cwd, "somewhere/crazy/newrelic.yml"))
   end
 
   def test_config_will_load_settings_for_environment_passed_manual_start
-    path = File.dirname(__FILE__) + "/config/newrelic.yml"
+    path = File.join(@cwd, "config/newrelic.yml")
 
     # pass an env key to NewRelic::Agent.manual_start which should cause it to
     # load that section of newrelic.yml

data/test/multiverse/suites/rack/example_app.rb

@@ -48,3 +48,23 @@ class MiddlewareTwo
     [status, headers, body]
   end
 end
+
+class ResponseCodeMiddleware
+  def initialize(app)
+    @app = app
+  end
+
+  def call(env)
+    req = Rack::Request.new(env)
+
+    result = @app.call(env)
+
+    if req.params['override-response-code']
+      response_code = req.params['override-response-code'].to_i
+    else
+      response_code = result[0]
+    end
+
+    [response_code, result[1], result[2]]
+  end
+end

data/test/multiverse/suites/rack/http_response_code_test.rb

@@ -0,0 +1,51 @@
+# 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 'multiverse_helpers'
+require File.join(File.dirname(__FILE__), 'example_app')
+require 'new_relic/rack/browser_monitoring'
+require 'new_relic/rack/agent_hooks'
+require 'new_relic/rack/error_collector'
+
+if NewRelic::Agent::Instrumentation::RackHelpers.rack_version_supported?
+
+class HttpResponseCodeTest < Minitest::Test
+  include MultiverseHelpers
+
+  setup_and_teardown_agent
+
+  include Rack::Test::Methods
+
+  def app
+    Rack::Builder.app do
+      use ResponseCodeMiddleware
+      use NewRelic::Rack::AgentHooks
+      run ExampleApp.new
+    end
+  end
+
+  def test_records_http_response_code_on_analytics_events
+    rsp = get '/', { 'override-response-code' => 404 }
+    assert_equal(404, rsp.status)
+    assert_equal('404', get_last_analytics_event[0]['httpResponseCode'])
+
+    rsp = get '/', { 'override-response-code' => 302 }
+    assert_equal(302, rsp.status)
+    assert_equal('302', get_last_analytics_event[0]['httpResponseCode'])
+  end
+
+  def test_skips_http_response_code_if_middleware_tracing_disabled
+    with_config(:disable_middleware_instrumentation => true) do
+      rsp = get '/', { 'override-response-code' => 404 }
+      assert_equal(404, rsp.status)
+      assert_nil get_last_analytics_event[0]['httpResponseCode']
+
+      rsp = get '/', { 'override-response-code' => 302 }
+      assert_equal(302, rsp.status)
+      assert_nil get_last_analytics_event[0]['httpResponseCode']
+    end
+  end
+end
+
+end