newrelic_rpm 3.14.2.312 → 3.14.3.313

data/test/multiverse/suites/rails/Envfile

@@ -22,7 +22,11 @@ if RUBY_VERSION >= '1.9.3'
 end
 
 gemfile <<-RB
-  gem 'rails', '~>3.2.20'
+  if RUBY_VERSION < '1.9.3' # Rails 3.2.22.1 is incompatible with MRI 1.8.7 / ree
+    gem 'rails', '3.2.22'
+  else
+    gem 'rails', '~>3.2.20'
+  end
   gem 'i18n', '~>0.6.11'
   gem 'haml', '4.0.2'   # Getting load issues with haml 4.0.3
   gem 'minitest_tu_shim', :require => false
@@ -30,7 +34,11 @@ gemfile <<-RB
 RB
 
 gemfile <<-RB
-  gem 'rails', '~>3.2.20'
+  if RUBY_VERSION < '1.9.3' # Rails 3.2.22.1 is incompatible with MRI 1.8.7 / ree
+    gem 'rails', '3.2.22'
+  else
+    gem 'rails', '~>3.2.20'
+  end
   gem 'i18n', '~>0.6.11'
   gem 'sinatra', '~> 1.4.5'
   gem 'haml', '4.0.2'   # Getting load issues with haml 4.0.3

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

@@ -6,20 +6,15 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'te
 
 module NewRelic::Agent::Database
   class SqlObfuscationTest < Minitest::Test
-    DIALECT_MAP = {
-      'postgres' => :postgresql,
-      'mysql'    => :mysql
-    }
-
     def self.create_input_statements(raw_query, dialects)
       dialects.map do |dialect|
-        NewRelic::Agent::Database::Statement.new(raw_query, {:adapter => DIALECT_MAP[dialect]})
+        NewRelic::Agent::Database::Statement.new(raw_query, {:adapter => dialect})
       end
     end
 
     def build_failure_message(statement, acceptable_outputs, actual_output)
       msg = "Failed to obfuscate #{statement.adapter} query correctly.\n"
-      msg << "Input:    #{statement.to_s}\n"
+      msg << "Input:    #{statement.inspect}\n"
       if acceptable_outputs.size == 1
         msg << "Expected: #{acceptable_outputs.first}\n"
       else

data/test/performance/README.md

@@ -104,13 +104,6 @@ by specifying the path to the agent you want to test against by passing the `-A`
 flag to the `runner` script, or by setting the `AGENT_PATH` environment variable
 when using the rake task.
 
-## Sending results to Hako
-
-This is currently considered experimental, but you can send results
-automatically to Hako by passing `-R HakoReporter` on the command line to the
-`runner`. This will produce JSON-formatted versions of each test result, and
-submit them to Hako. You will need to set the `HAKO_TOKEN` environment variable
-to a valid Hako access token when doing this.
 
 ## Writing tests
 
@@ -146,10 +139,10 @@ compatibility with JRuby.
 Additionally, when operating in this mode, the `newrelic_rpm` gem will not be
 loaded until *after* the fork call. This means that your **test cases must be
 loadable (though not necessarily runnable) without the `newrelic_rpm` gem
-avaiable**.
+available**.
 
 Not all command-line options to the runner work with this test isolation yet.
-You can disable it by passing the `-I/--inline` flag to the runner.
+You can disable it by passing the `-I` or `--inline` flag to the runner.
 
 ## Adding instrumentation layers
 
@@ -164,7 +157,7 @@ Instrumentors inherit from `Performance::Instrumentation::Instrumentor`, and may
 constrain themselves to running only on certain platforms (see `instrumentor.rb`
 for a list) by calling the `platforms` method in their class definitions. They
 may also signal that they should be used by default by calling `on_by_default`.
-They should imlement the `before`, `after` and `results` methods as follows:
+They should implement the `before`, `after` and `results` methods as follows:
 
 The `before` method is called before each test is run. The test class and test
 name are passed as arguments.

data/test/performance/lib/performance/table.rb

@@ -61,7 +61,7 @@ module Performance
     def column_widths
       widths = Array.new(@schema.size, 0)
       @schema.each_with_index do |col, idx|
-        widths[idx] = col.name.size
+        widths[idx] = col.name.to_s.size
       end
       @rows.each do |row|
         row.each_with_index do |cell, idx|

data/test/performance/suites/rules_engine.rb

@@ -0,0 +1,35 @@
+# 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.
+
+class RulesEngineTests < Performance::TestCase
+  def setup
+    @basic_rule_specs = {
+      "transaction_segment_terms": [
+        {
+          "prefix": "WebTransaction/Custom",
+          "terms": ["one", "two", "three"]
+        },
+        {
+          "prefix": "WebTransaction/Uri",
+          "terms": ["seven", "eight", "nine"]
+        }
+      ]
+    }
+  end
+
+  def test_rules_engine_init_transaction_rules
+    measure do
+      NewRelic::Agent::RulesEngine.create_transaction_rules(@basic_rule_specs)
+    end
+  end
+
+  def test_rules_engine_rename_transaction_rules
+    measure do
+      rules_engine = NewRelic::Agent::RulesEngine.create_transaction_rules(@basic_rule_specs)
+      rules_engine.rename "WebTransaction/Uri/one/two/seven/user/nine/account"
+      rules_engine.rename "WebTransaction/Custom/one/two/seven/user/nine/account"
+      rules_engine.rename "WebTransaction/Other/one/two/foo/bar"
+    end
+  end
+end

data/test/performance/suites/segment_terms_rule.rb

@@ -0,0 +1,27 @@
+# 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.
+
+class SegmentTermsRuleTests < Performance::TestCase
+  def setup
+
+  end
+
+  def test_segment_terms_rule_matches?
+    measure do
+      NewRelic::Agent::RulesEngine::SegmentTermsRule.new({
+        'prefix' => 'foo/bar/',
+        'terms'  => []
+      }).matches?('foo/bar')
+    end
+  end
+
+  def test_segment_terms_rule_apply
+    measure do
+      NewRelic::Agent::RulesEngine::SegmentTermsRule.new({
+        'prefix' => 'foo/bar/',
+        'terms'  => []
+      }).apply('foo/bar/baz/qux')
+    end
+  end
+end

data/test/performance/suites/sql_obfuscation.rb

@@ -28,4 +28,23 @@ class SqlObfuscationTests < Performance::TestCase
       NewRelic::Agent::Database.obfuscate_sql(@short_query_pg)
     end    
   end
+
+  def test_obfuscate_cross_agent_tests
+    test_cases = load_cross_agent_test('sql_obfuscation/sql_obfuscation')
+    statements = []
+
+    test_cases.each do |test_case|
+      query = test_case['sql']
+
+      test_case['dialects'].map do |dialect|
+        statements << NewRelic::Agent::Database::Statement.new(query, {:adapter => dialect})
+      end
+    end
+
+    measure do
+      statements.each do |statement|
+        NewRelic::Agent::Database.obfuscate_sql(statement)
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 3.14.2.312
+  version: 3.14.3.313
 platform: ruby
 authors:
 - Tim Krajcar
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-13 00:00:00.000000000 Z
+date: 2016-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -566,7 +566,12 @@ files:
 - test/fixtures/cross_agent_tests/README.md
 - test/fixtures/cross_agent_tests/attribute_configuration.json
 - test/fixtures/cross_agent_tests/aws.json
+- test/fixtures/cross_agent_tests/cat/README.md
+- test/fixtures/cross_agent_tests/cat/cat_map.json
+- test/fixtures/cross_agent_tests/cat/path_hashing.json
 - test/fixtures/cross_agent_tests/cat_map.json
+- test/fixtures/cross_agent_tests/data_transport/data_transport.json
+- test/fixtures/cross_agent_tests/data_transport/data_transport.md
 - test/fixtures/cross_agent_tests/docker_container_id/README.md
 - test/fixtures/cross_agent_tests/docker_container_id/cases.json
 - test/fixtures/cross_agent_tests/docker_container_id/docker-0.9.1.txt
@@ -1202,7 +1207,9 @@ files:
 - test/performance/suites/queue_time.rb
 - test/performance/suites/rack_middleware.rb
 - test/performance/suites/redis.rb
+- test/performance/suites/rules_engine.rb
 - test/performance/suites/rum_autoinsertion.rb
+- test/performance/suites/segment_terms_rule.rb
 - test/performance/suites/sql_obfuscation.rb
 - test/performance/suites/startup.rb
 - test/performance/suites/stats_hash.rb