newrelic_rpm 3.14.2.312 → 3.14.3.313

data/test/fixtures/cross_agent_tests/transaction_segment_terms.json

@@ -4,7 +4,7 @@
     "transaction_segment_terms": [
       {
         "prefix": "WebTransaction/Custom",
-        "terms":  ["one", "two", "three"]
+        "terms": ["one", "two", "three"]
       },
       {
         "prefix": "WebTransaction/Uri",
@@ -40,61 +40,349 @@
         "expected": "WebTransaction/Custom/a/b/*"
       },
       {
-        "input": "WebTransaction/Customer/a/b/c",
-        "expected": "WebTransaction/Customer/a/b/c"
+        "input": "WebTransaction/Other/a/b/c",
+        "expected": "WebTransaction/Other/a/b/c"
+      }
+    ]
+  },
+  {
+    "testname": "prefix_with_trailing_spaces_and_then_slash",
+    "transaction_segment_terms": [
+      {
+        "prefix": "WebTransaction/Custom    /",
+        "terms": ["a", "b"]
+      }
+    ],
+    "tests": [
+      {
+        "input": "WebTransaction/Custom    /a/b/c",
+        "expected": "WebTransaction/Custom    /a/b/*"
+      },
+      {
+        "input": "WebTransaction/Custom  /a/b/c",
+        "expected": "WebTransaction/Custom  /a/b/c"
+      },
+      {
+        "input": "WebTransaction/Custom/a/b/c",
+        "expected": "WebTransaction/Custom/a/b/c"
       }
     ]
   },
   {
-    "testname": "rule_chaining",
+    "testname": "prefix_with_trailing_spaces",
+    "transaction_segment_terms": [
+      {
+        "prefix": "WebTransaction/Custom    ",
+        "terms": ["a", "b"]
+      }
+    ],
+    "tests": [
+      {
+        "input": "WebTransaction/Custom    /a/b/c",
+        "expected": "WebTransaction/Custom    /a/b/*"
+      },
+      {
+        "input": "WebTransaction/Custom  /a/b/c",
+        "expected": "WebTransaction/Custom  /a/b/c"
+      },
+      {
+        "input": "WebTransaction/Custom/a/b/c",
+        "expected": "WebTransaction/Custom/a/b/c"
+      }
+    ]
+  },
+  {
+    "testname": "overlapping_prefix_last_one_only_applied",
     "transaction_segment_terms": [
       {
         "prefix": "WebTransaction/Foo",
         "terms": ["one", "two", "three"]
       },
       {
-        "prefix": "WebTransaction/Foo/one",
+        "prefix": "WebTransaction/Foo",
+        "terms": ["one", "two", "zero"]
+      }
+    ],
+    "tests": [
+      {
+        "input": "WebTransaction/Foo/zero/one/two/three/four",
+        "expected": "WebTransaction/Foo/zero/one/two/*"
+      }
+    ]
+  },
+  {
+    "testname": "terms_are_order_independent",
+    "transaction_segment_terms": [
+      {
+        "prefix": "WebTransaction/Foo",
+        "terms": ["one", "two", "three"]
+      }
+    ],
+    "tests": [
+      {
+        "input": "WebTransaction/Foo/bar/one/three/two",
+        "expected": "WebTransaction/Foo/*/one/three/two"
+      },
+      {
+        "input": "WebTransaction/Foo/three/one/one/two/three",
+        "expected": "WebTransaction/Foo/three/one/one/two/three"
+      }
+    ]
+  },
+  {
+    "testname": "invalid_rule_not_enough_prefix_segments",
+    "transaction_segment_terms": [
+      {
+        "prefix": "WebTransaction",
         "terms": ["one", "two"]
       }
     ],
     "tests": [
       {
-        "input": "WebTransaction/Foo/one/two/three/four",
-        "expected": "WebTransaction/Foo/one/two/three/*"
+        "input": "WebTransaction/Foo/bar/one/three/two",
+        "expected": "WebTransaction/Foo/bar/one/three/two"
+      },
+      {
+        "input": "WebTransaction/Foo/three/one/one/two/three",
+        "expected": "WebTransaction/Foo/three/one/one/two/three"
       }
     ]
   },
   {
-    "testname": "rule_with_prefix_not_ending_in_segment_boundary",
+    "testname": "invalid_rule_not_enough_prefix_segments_ending_in_slash",
     "transaction_segment_terms": [
       {
-        "prefix": "WebTrans",
+        "prefix": "WebTransaction/",
         "terms": ["one", "two"]
       }
     ],
     "tests": [
       {
-        "input": "WebTransaction/Foo/one/two",
-        "expected": "WebTrans*/one/two"
+        "input": "WebTransaction/Foo/bar/one/three/two",
+        "expected": "WebTransaction/Foo/bar/one/three/two"
+      },
+      {
+        "input": "WebTransaction/Foo/three/one/one/two/three",
+        "expected": "WebTransaction/Foo/three/one/one/two/three"
       }
     ]
   },
   {
-    "testname": "terms_are_order_independent",
+    "testname": "invalid_rule_too_many_prefix_segments",
+    "transaction_segment_terms": [
+      {
+        "prefix": "WebTransaction/Foo/bar",
+        "terms": ["one", "two"]
+      }
+    ],
+    "tests": [
+      {
+        "input": "WebTransaction/Foo/bar/one/three/two",
+        "expected": "WebTransaction/Foo/bar/one/three/two"
+      },
+      {
+        "input": "WebTransaction/Foo/three/one/one/two/three",
+        "expected": "WebTransaction/Foo/three/one/one/two/three"
+      }
+    ]
+  },
+  {
+    "testname": "invalid_rule_prefix_with_trailing_slash_and_then_space",
+    "transaction_segment_terms": [
+      {
+        "prefix": "WebTransaction/Custom/    ",
+        "terms": ["a", "b"]
+      }
+    ],
+    "tests": [
+      {
+        "input": "WebTransaction/Custom/a/b/c",
+        "expected": "WebTransaction/Custom/a/b/c"
+      }
+    ]
+  },
+  {
+    "testname": "invalid_rule_prefix_with_multiple_trailing_slashes",
+    "transaction_segment_terms": [
+      {
+        "prefix": "WebTransaction/Custom////",
+        "terms": ["a", "b"]
+      }
+    ],
+    "tests": [
+      {
+        "input": "WebTransaction/Custom/a/b/c",
+        "expected": "WebTransaction/Custom/a/b/c"
+      }
+    ]
+  },
+  {
+    "testname": "invalid_rule_null_prefix",
     "transaction_segment_terms": [
       {
-        "prefix": "Foo",
         "terms": ["one", "two", "three"]
       }
     ],
     "tests": [
       {
-        "input": "Foo/bar/one/three/two",
-        "expected": "Foo/*/one/three/two"
+        "input": "WebTransaction/Custom/one/two/seven/user/nine/account",
+        "expected": "WebTransaction/Custom/one/two/seven/user/nine/account"
+      }
+    ]
+  },
+  {
+    "testname": "invalid_rule_null_terms",
+    "transaction_segment_terms": [
+      {
+        "prefix": "WebTransaction/Custom"
+      }
+    ],
+    "tests": [
+      {
+        "input": "WebTransaction/Custom/one/two/seven/user/nine/account",
+        "expected": "WebTransaction/Custom/one/two/seven/user/nine/account"
+      }
+    ]
+  },
+  {
+    "testname": "empty_terms",
+    "transaction_segment_terms": [
+      {
+        "prefix": "WebTransaction/Custom",
+        "terms": []
+      }
+    ],
+    "tests": [
+      {
+        "input": "WebTransaction/Custom/one/two/seven/user/nine/account",
+        "expected": "WebTransaction/Custom/*"
+      },
+      {
+        "input": "WebTransaction/Custom/",
+        "expected": "WebTransaction/Custom/"
       },
       {
-        "input": "Foo/three/one/one/two/three",
-        "expected": "Foo/three/one/one/two/three"
+        "input": "WebTransaction/Custom",
+        "expected": "WebTransaction/Custom"
+      }
+    ]
+  },
+  {
+    "testname": "two_segment_transaction_name",
+    "transaction_segment_terms": [
+      {
+        "prefix": "WebTransaction/Foo",
+        "terms": ["a", "b", "c"]
+      }
+    ],
+    "tests": [
+      {
+        "input": "WebTransaction/Foo",
+        "expected": "WebTransaction/Foo"
+      }
+    ]
+  },
+  {
+    "testname": "two_segment_transaction_name_with_trailing_slash",
+    "transaction_segment_terms": [
+      {
+        "prefix": "WebTransaction/Foo",
+        "terms": ["a", "b", "c"]
+      }
+    ],
+    "tests": [
+      {
+        "input": "WebTransaction/Foo/",
+        "expected": "WebTransaction/Foo/"
+      }
+    ]
+  },
+  {
+    "testname": "transaction_segment_with_adjacent_slashes",
+    "transaction_segment_terms": [
+      {
+        "prefix": "WebTransaction/Foo",
+        "terms": ["a", "b", "c"]
+      }
+    ],
+    "tests": [
+      {
+        "input": "WebTransaction/Foo///a/b///c/d/",
+        "expected": "WebTransaction/Foo/*/a/b/*/c/*"
+      },
+      {
+        "input": "WebTransaction/Foo///a/b///c///",
+        "expected": "WebTransaction/Foo/*/a/b/*/c/*"
+      }
+    ]
+  },
+  {
+    "testname": "transaction_name_with_single_segment",
+    "transaction_segment_terms": [
+      {
+        "prefix": "WebTransaction/Foo",
+        "terms": ["a", "b", "c"]
+      }
+    ],
+    "tests": [
+      {
+        "input": "WebTransaction",
+        "expected": "WebTransaction"
+      }
+    ]
+  },
+  {
+    "testname": "prefix_must_match_first_two_segments",
+    "transaction_segment_terms": [
+      {
+        "prefix": "WebTransaction/Zip",
+        "terms": ["a", "b"]
+      }
+    ],
+    "tests": [
+      {
+        "input": "WebTransaction/Zip/a/b/c",
+        "expected": "WebTransaction/Zip/a/b/*"
+      },
+      {
+        "input": "WebTransaction/ZipZap/a/b/c",
+        "expected": "WebTransaction/ZipZap/a/b/c"
+      }
+    ]
+  },
+  {
+    "testname": "one_bad_rule_does_not_scrap_all_rules",
+    "transaction_segment_terms": [
+      {
+        "prefix": "WebTransaction/MissingTerms"
+      },
+      {
+        "prefix": "WebTransaction/Uri",
+        "terms": ["seven", "eight", "nine"]
+      }
+    ],
+    "tests": [
+      {
+        "input": "WebTransaction/Uri/one/two/seven/user/nine/account",
+        "expected": "WebTransaction/Uri/*/seven/*/nine/*"
+      }
+    ]
+  },
+  {
+    "testname": "one_bad_matching_rule_at_end_does_not_scrap_other_matching_rules",
+    "transaction_segment_terms": [
+      {
+        "prefix": "WebTransaction/Uri",
+        "terms": ["seven", "eight", "nine"]
+      },
+      {
+        "prefix": "WebTransaction/Uri"
+      }
+    ],
+    "tests": [
+      {
+        "input": "WebTransaction/Uri/one/two/seven/user/nine/account",
+        "expected": "WebTransaction/Uri/*/seven/*/nine/*"
       }
     ]
   }

data/test/multiverse/suites/active_record/active_record_test.rb

@@ -473,7 +473,7 @@ class ActiveRecordInstrumentationTest < Minitest::Test
     statement = node.params[:sql]
     assert_match(/^SELECT /, statement.sql)
 
-    assert_equal(adapter.to_s, statement.adapter)
+    assert_equal(adapter, statement.adapter)
     refute_nil(statement.config)
     refute_nil(statement.explainer)
   end

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

@@ -12,7 +12,7 @@ class RenameRuleTest < Minitest::Test
       { 'match_expression' => 'Nothing',        'replacement' => 'Something' }
     ]
     segment_terms_rules = [
-      { 'prefix' => 'other', 'terms' => ['Nothing', 'one', 'two'] }
+      { 'prefix' => 'other/qux', 'terms' => ['Nothing', 'one', 'two'] }
     ]
     collector.stub('connect', {
       'agent_run_id'              => 666,
@@ -60,32 +60,32 @@ class RenameRuleTest < Minitest::Test
 
   def test_transaction_segment_terms_do_not_apply_to_metrics
     in_transaction do
-      NewRelic::Agent.record_metric("other/foo/bar", 42)
+      NewRelic::Agent.record_metric("other/qux/foo/bar", 42)
     end
 
-    assert_metrics_recorded(['other/foo/bar'])
+    assert_metrics_recorded(['other/qux/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')
+      NewRelic::Agent.set_transaction_name('qux/one/two/three/four')
     end
 
-    assert_metrics_recorded(['other/one/two/*'])
-    assert_metrics_not_recorded(['other/one/two/three/four'])
+    assert_metrics_recorded(['other/qux/one/two/*'])
+    assert_metrics_not_recorded(['other/qux/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')
+      NewRelic::Agent.set_transaction_name('qux/Nothing/one/two/three')
     end
 
-    assert_metrics_recorded(['other/*/one/two/*'])
+    assert_metrics_recorded(['other/qux/*/one/two/*'])
     assert_metrics_not_recorded([
-      'other/Something/one/two/*',
-      'other/Something/one/two/three',
-      'other/Nothing/one/two/*',
-      'other/Nothing/one/two/three'
+      'other/qux/Something/one/two/*',
+      'other/qux/Something/one/two/three',
+      'other/qux/Nothing/one/two/*',
+      'other/qux/Nothing/one/two/three'
     ])
   end
 end

data/test/multiverse/suites/datamapper/datamapper_test.rb

@@ -311,6 +311,29 @@ class DataMapperTest < Minitest::Test
     db.send(:log, msg)
   end
 
+  def test_obfuscate_query_in_sqlerror
+    invalid_query = "select * from users where password='Slurms McKenzie' limit 1"
+    with_config(:'slow_sql.record_sql' => 'obfuscated') do
+      begin
+        DataMapper.repository.adapter.select(invalid_query)
+      rescue => e
+        NewRelic::Agent.notice_error(e)
+      end
+    end
+
+    refute last_traced_error.message.include?(invalid_query)
+  end
+
+  def test_splice_user_password_from_sqlerror
+    begin
+      DataMapper.repository.adapter.select("select * from users")
+    rescue => e
+      NewRelic::Agent.notice_error(e)
+    end
+
+    refute last_traced_error.message.include?('&password=')
+  end
+
   def assert_against_record(operation)
     post = Post.create!(:title => "Dummy post", :body => "whatever, man")