newrelic_rpm 3.14.3.313 → 3.15.0.314

data/lib/new_relic/agent/supported_versions.rb

@@ -86,6 +86,7 @@ module NewRelic
       {
         :type        => :web,
         :supported   => ["~>2.1.0", "~>2.2.0", "~>2.3.0", "~3.0.0", "~>3.1.0", "~>3.2.0", "~>4.0.0", "~>4.1.0", "~>4.2.0"],
+        :experimental=> ["5.0.0beta2"],
         :deprecated  => ["~>2.0.0"],
         :url         => "https://rubygems.org/gems/rails",
         :feed        => "https://rubygems.org/gems/rails/versions.atom",

data/lib/new_relic/agent/system_info.rb

@@ -244,7 +244,7 @@ module NewRelic
       end
 
       def self.parse_linux_meminfo_in_mib(meminfo)
-        if mem_total = meminfo[/MemTotal:\s*(\d*)\skB/,1]
+        if meminfo && mem_total = meminfo[/MemTotal:\s*(\d*)\skB/,1]
           (mem_total.to_i / 1024).to_i
         else
           ::NewRelic::Agent.logger.debug("Failed to parse MemTotal from /proc/meminfo: #{meminfo}")

data/lib/new_relic/control/frameworks/rails5.rb

@@ -0,0 +1,14 @@
+# 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 'new_relic/control/frameworks/rails4'
+require 'new_relic/rack/error_collector'
+module NewRelic
+  class Control
+    module Frameworks
+      class Rails5 < NewRelic::Control::Frameworks::Rails4
+      end
+    end
+  end
+end

data/lib/new_relic/version.rb

@@ -11,8 +11,8 @@ module NewRelic
     end
 
     MAJOR = 3
-    MINOR = 14
-    TINY  = 3
+    MINOR = 15
+    TINY  = 0
 
     begin
       require File.join(File.dirname(__FILE__), 'build')

data/lib/tasks/config.rake

@@ -2,12 +2,14 @@ namespace :newrelic do
   namespace :config do
     desc "Describe available New Relic configuration settings."
 
-    GENERAL   = "general"
-    DISABLING = "disabling"
+    GENERAL    = "general"
+    DISABLING  = "disabling"
+    ATTRIBUTES = "attributes"
 
     SECTION_DESCRIPTIONS = {
       GENERAL              => 'These settings are available for agent configuration. Some settings depend on your New Relic subscription level.',
       DISABLING            => 'Use these settings to toggle instrumentation types during agent startup.',
+      ATTRIBUTES           => '<a href="https://docs.newrelic.com/docs/features/agent-attributes">Attributes</a> are key-value pairs containing information that determines the properties of an event or transaction. These key-value pairs can be viewed within transaction traces in New Relic APM, traced errors in New Relic APM, transaction events in Insights, and page views in Insights. You can customize exactly which attributes will be sent to each of these destinations.',
       "transaction_tracer" => 'The <a href="/docs/apm/traces/transaction-traces/transaction-traces">transaction traces</a> feature collects detailed information from a selection of transactions, including a summary of the calling sequence, a breakdown of time spent, and a list of SQL queries and their query plans (on mysql and postgresql). Available features depend on your New Relic subscription level.',
       "error_collector"    => 'The agent collects and reports all uncaught exceptions by default. These configuration options allow you to customize the error collection.',
       "browser_monitoring" => 'New Relic Browser\'s <a href="/docs/browser/new-relic-browser/page-load-timing/page-load-timing-process">page load timing</a> feature (sometimes referred to as real user monitoring or RUM) gives you insight into the performance real users are experiencing with your website. This is accomplished by measuring the time it takes for your users\' browsers to download and render your web pages by injecting a small amount of JavaScript code into the header and footer of each page.',
@@ -32,22 +34,23 @@ namespace :newrelic do
         next unless value[:public]
 
         section_key = GENERAL
-        section = key.to_s.match(/(.*)\.(.*)/)
+        key = key.to_s
+        components = key.split(".")
 
-        if section
-          section_key = section[1]
-          key = section[2]
-        elsif key.to_s.match(/^disable_/)
+        if key.match(/^disable_/)           # "disable_httpclient"
           section_key = DISABLING
-          key = key.to_s
+        elsif components.length == 2        # "analytics_events.enabled"
+          section_key = components.first
+        elsif components[1] == "attributes" # "transaction_tracer.attributes.enabled"
+          section_key = ATTRIBUTES
         end
 
         sections[section_key] << {
-          :key         => format_key(section_key, key),
+          :key         => key,
           :type        => format_type(value[:type]),
           :description => format_description(value),
           :default     => format_default_value(value),
-          :env_var     => format_env_var(section_key, key)
+          :env_var     => format_env_var(key)
         }
       end
       sections
@@ -75,14 +78,6 @@ namespace :newrelic do
       end
     end
 
-    def format_key(section_key, key)
-      if section_key == GENERAL || section_key == DISABLING
-        key.to_s
-      else
-        "#{section_key}.#{key}"
-      end
-    end
-
     def format_name(key)
       name = NAME_OVERRIDES[key]
       return name if name
@@ -114,11 +109,8 @@ namespace :newrelic do
       end
     end
 
-    def format_env_var(section_key, key)
-      v = "NEW_RELIC_"
-      v << "#{section_key}_" unless section_key == GENERAL || section_key == DISABLING
-      v << key.to_s
-      v.upcase
+    def format_env_var(key)
+      "NEW_RELIC_#{key.gsub(".", "_").upcase}"
     end
 
     def pluck(key, config_hash)

data/lib/tasks/tests.rake

@@ -4,7 +4,7 @@ rescue LoadError => e
 end
 
 if defined? Rake::TestTask
-  namespace :test do |t|
+  namespace :test do
     def look_for_seed(tasks)
       matches = tasks.map { |t| /(seed=.*?)[,\]]/.match(t) }.compact
       if matches.any?

data/newrelic.yml

@@ -4,7 +4,7 @@
 # overhead.  For more information, visit www.newrelic.com.
 #
 # Generated <%= Time.now.strftime('%B %d, %Y') %><%= ", for version #{@agent_version}" if @agent_version %>
-# <%= "\n# #{generated_for_user}\n#" if generated_for_user %>
+#<%= "\n# #{generated_for_user}\n#" if generated_for_user %>
 # For full documentation of agent configuration options, please refer to
 # https://docs.newrelic.com/docs/agents/ruby-agent/installation-configuration/ruby-agent-configuration
 

data/newrelic_rpm.gemspec

@@ -19,7 +19,7 @@ Inc (http://www.newrelic.com).  New Relic provides you with deep
 information about the performance of your web application as it runs
 in production. The New Relic Ruby Agent is dual-purposed as a either a
 Gem or plugin, hosted on
-http://github.com/newrelic/rpm/
+https://github.com/newrelic/rpm/
 EOS
   s.email = "support@newrelic.com"
   s.executables = [ "mongrel_rpm", "newrelic_cmd", "newrelic", "nrdebug" ]
@@ -36,7 +36,7 @@ EOS
   file_list << build_file_path if File.exist?(build_file_path)
   s.files = file_list
 
-  s.homepage = "http://www.github.com/newrelic/rpm"
+  s.homepage = "https://github.com/newrelic/rpm"
   s.require_paths = ["lib"]
   s.rubygems_version = Gem::VERSION
   s.summary = "New Relic Ruby Agent"

data/test/environments/lib/environments/runner.rb

@@ -11,13 +11,17 @@ module Environments
     include Multiverse::Color
 
     BLACKLIST = {
+      "2.2.1"       => ["rails50"],
+      "2.2.0"       => ["rails50"],
+      "2.1"         => ["rails50"],
+      "2.0"         => ["rails50"],
       "2"           => ["rails21", "rails22", "rails23"],
-      "1.9"         => ["rails21", "rails22"],
-      "1.9.2"       => ["rails40", "rails41", "rails42"],
-      "1.8.7"       => ["rails40", "rails41", "rails42"],
-      "ree"         => ["rails40", "rails41", "rails42"],
-      "jruby-1.6"   => ["rails40", "rails41", "rails42"],
-      "jruby-1.7"   => ["rails21", "rails22", "rails23"],
+      "1.9"         => ["rails21", "rails22", "rails50"],
+      "1.9.2"       => ["rails40", "rails41", "rails42", "rails50"],
+      "1.8.7"       => ["rails40", "rails41", "rails42", "rails50"],
+      "ree"         => ["rails40", "rails41", "rails42", "rails50"],
+      "jruby-1.6"   => ["rails40", "rails41", "rails42", "rails50"],
+      "jruby-1.7"   => ["rails21", "rails22", "rails23", "rails50"],
       "jruby-9.0"   => ["rails21", "rails22", "rails23", "rails30", "rails31", "rails32"],
       "rbx-2.0"     => ["rails21", "rails22", "rails23", "rails30", "rails31", "rails32"],
     }

data/test/environments/rails40/Gemfile

@@ -24,7 +24,7 @@ platforms :jruby do
 end
 
 platforms :ruby do
-  gem "mysql"
+  gem "mysql2", '~> 0.3.20'
   gem "sqlite3"
 end
 

data/test/environments/rails40/config/database.yml

@@ -1,5 +1,5 @@
 mysql: &mysql
-  adapter: mysql
+  adapter: mysql2
   socket: <%= (`uname -s` =~ /Linux/ ) ? "" :"/tmp/mysql.sock" %>
   username: root
   host: localhost

data/test/environments/rails41/Gemfile

@@ -16,7 +16,7 @@ platforms :jruby do
 end
 
 platforms :ruby do
-  gem "mysql"
+  gem "mysql2", '~> 0.3.20'
   gem "sqlite3"
 end
 

data/test/environments/rails41/config/database.yml

@@ -1,5 +1,5 @@
 mysql: &mysql
-  adapter: mysql
+  adapter: mysql2
   socket: <%= (`uname -s` =~ /Linux/ ) ? "" :"/tmp/mysql.sock" %>
   username: root
   host: localhost

data/test/environments/rails42/Gemfile

@@ -16,7 +16,7 @@ platforms :jruby do
 end
 
 platforms :ruby do
-  gem "mysql"
+  gem "mysql2"
   gem "sqlite3"
 end
 

data/test/environments/rails42/config/database.yml

@@ -1,5 +1,5 @@
 mysql: &mysql
-  adapter: mysql
+  adapter: mysql2
   socket: <%= (`uname -s` =~ /Linux/ ) ? "" :"/tmp/mysql.sock" %>
   username: root
   host: localhost

data/test/environments/rails50/Gemfile

@@ -0,0 +1,36 @@
+source 'https://rubygems.org'
+
+gem 'rake'
+
+gem 'rails', '~>5.0.0beta2'
+
+gem 'minitest', '5.2.3'
+gem 'mocha', :require => false
+gem 'rack'
+gem 'rack-test'
+
+platforms :jruby do
+  gem "jruby-openssl"
+end
+
+platforms :ruby do
+  gem "mysql2"
+end
+
+platforms :rbx do
+  gem "rubysl"
+  gem "json"
+  # If we don't skip the require here, test-unit tries to install its at_exit
+  # hook and run when we run our rake task to create the test DB.
+  gem "rubysl-test-unit", :require => false
+  gem "racc"  # https://github.com/rubinius/rubinius/issues/2632
+
+  # Compilation issues with rubysl-openssl 2.2.1, lock at 2.1.0 for now.
+  # https://github.com/rubysl/rubysl-openssl/issues/11
+  gem "rubysl-openssl", "2.1.0"
+end
+
+gem "newrelic_rpm", :path => "../../.."
+
+gem 'pry', '~> 0.9.12'
+gem 'hometown', '~> 0.2.5'

data/test/environments/rails50/Rakefile

@@ -0,0 +1,11 @@
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+
+require File.expand_path('../config/application', __FILE__)
+require 'rake'
+
+RpmTestApp::Application.load_tasks
+require 'tasks/all'
+
+Rake::Task["default"].clear
+task :default => [:'test:newrelic']

data/test/environments/rails50/config/application.rb

@@ -0,0 +1,18 @@
+# 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 File.expand_path('../boot', __FILE__)
+
+require 'rails/all'
+
+Bundler.require(:default, Rails.env) if defined?(Bundler)
+
+module RpmTestApp
+  class Application < Rails::Application
+    config.encoding = "utf-8"
+    config.filter_parameters += [:password]
+    config.secret_key_base = '414fd9af0cc192729b2b6bffe9e7077c9ac8eed5cbb74c8c4cd628906b716770598a2b7e1f328052753a4df72e559969dc05b408de73ce040c93cac7c51a348e'
+    config.eager_load = false
+  end
+end

data/test/environments/rails50/config/boot.rb

@@ -0,0 +1,10 @@
+# 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 'rubygems'
+
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+
+require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])

data/test/environments/rails50/config/database.yml

@@ -0,0 +1,26 @@
+mysql: &mysql
+  adapter: mysql2
+  socket: <%= (`uname -s` =~ /Linux/ ) ? "" :"/tmp/mysql.sock" %>
+  username: root
+  host: localhost
+  database: <%= db = "#{ENV['RUBY_VERSION']}#{ENV['BRANCH']}"; db.empty? ? "rails_blog" : db %>
+
+sqlite3: &sqlite3
+<% if defined?(JRuby) %>
+  adapter: jdbcsqlite3
+<% else %>
+  adapter: sqlite3
+<% end %>
+  database: db/all.sqlite3
+  pool: 5
+  timeout: 5000
+  host: localhost
+
+development:
+  <<: *sqlite3
+
+test:
+  <<: *mysql
+
+production:
+  <<: *mysql

data/test/environments/rails50/config/environment.rb

@@ -0,0 +1,6 @@
+# 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 File.expand_path('../application', __FILE__)
+RpmTestApp::Application.initialize!

data/test/environments/rails50/db/schema.rb

@@ -0,0 +1,5 @@
+# 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.
+
+# File is required to exist by Rails

data/test/fixtures/cross_agent_tests/sql_obfuscation/sql_obfuscation.json

@@ -28,7 +28,8 @@
       "mysql",
       "postgres",
       "oracle",
-      "cassandra"
+      "cassandra",
+      "sqlite"
     ],
     "sql": "SELECT * FROM t WHERE foo='bar/*' AND baz='whatever */qux'"
   },
@@ -62,7 +63,8 @@
       "mysql",
       "postgres",
       "oracle",
-      "cassandra"
+      "cassandra",
+      "sqlite"
     ],
     "sql": "SELECT * FROM t WHERE foo='bar--' AND\n  baz='qux--'"
   },
@@ -75,7 +77,8 @@
       "mysql",
       "postgres",
       "oracle",
-      "cassandra"
+      "cassandra",
+      "sqlite"
     ],
     "sql": "SELECT * FROM foo WHERE bar='baz' /* Hide Me */"
   },
@@ -88,7 +91,8 @@
       "mysql",
       "postgres",
       "oracle",
-      "cassandra"
+      "cassandra",
+      "sqlite"
     ],
     "sql": "SELECT * FROM foobar WHERE password='hunter2'\n-- No peeking!"
   },
@@ -101,7 +105,8 @@
       "mysql",
       "postgres",
       "oracle",
-      "cassandra"
+      "cassandra",
+      "sqlite"
     ],
     "sql": "SELECT foo, bar FROM baz WHERE password='hunter2' # Secret"
   },
@@ -140,7 +145,8 @@
       "mysql",
       "postgres",
       "oracle",
-      "cassandra"
+      "cassandra",
+      "sqlite"
     ],
     "sql": "SELECT c11.col1, c22.col2 FROM table c11, table c22 WHERE value='nothing'"
   },
@@ -155,7 +161,8 @@
       "mysql",
       "postgres",
       "oracle",
-      "cassandra"
+      "cassandra",
+      "sqlite"
     ]
   },
   {
@@ -177,7 +184,8 @@
       "mysql",
       "postgres",
       "oracle",
-      "cassandra"
+      "cassandra",
+      "sqlite"
     ],
     "sql": "SELECT * FROM table WHERE name='foo' AND value = 'bar'"
   },
@@ -190,7 +198,8 @@
       "mysql",
       "postgres",
       "oracle",
-      "cassandra"
+      "cassandra",
+      "sqlite"
     ],
     "sql": "SELECT * FROM table WHERE col='foo\\''bar'",
     "comments": [
@@ -208,7 +217,8 @@
       "mysql",
       "postgres",
       "oracle",
-      "cassandra"
+      "cassandra",
+      "sqlite"
     ],
     "sql": "SELECT * FROM table WHERE col1='foo\"bar' AND col2='what\"ever'"
   },
@@ -221,7 +231,8 @@
       "mysql",
       "postgres",
       "oracle",
-      "cassandra"
+      "cassandra",
+      "sqlite"
     ],
     "sql": "select * from accounts where accounts.name != 'dude \n newline' order by accounts.name"
   },
@@ -257,7 +268,8 @@
       "mysql",
       "postgres",
       "oracle",
-      "cassandra"
+      "cassandra",
+      "sqlite"
     ],
     "comments": [
       "If backslashes are being ignored in single-quoted strings",
@@ -284,7 +296,8 @@
       "mysql",
       "postgres",
       "oracle",
-      "cassandra"
+      "cassandra",
+      "sqlite"
     ],
     "sql": "SELECT * FROM table WHERE foo='this string ends with a backslash\\\\'"
   },
@@ -299,7 +312,8 @@
       "mysql",
       "postgres",
       "oracle",
-      "cassandra"
+      "cassandra",
+      "sqlite"
     ]
   },
   {
@@ -311,7 +325,8 @@
       "mysql",
       "postgres",
       "oracle",
-      "cassandra"
+      "cassandra",
+      "sqlite"
     ],
     "sql": "INSERT INTO X values('', 'a''b c',0, 1 , 'd''e f''s h')"
   },
@@ -326,7 +341,8 @@
       "mysql",
       "postgres",
       "oracle",
-      "cassandra"
+      "cassandra",
+      "sqlite"
     ],
     "pathological": true
   },
@@ -341,7 +357,8 @@
       "mysql",
       "postgres",
       "oracle",
-      "cassandra"
+      "cassandra",
+      "sqlite"
     ],
     "pathological": true
   },
@@ -356,7 +373,8 @@
       "mysql",
       "postgres",
       "oracle",
-      "cassandra"
+      "cassandra",
+      "sqlite"
     ],
     "pathological": true
   },
@@ -371,7 +389,8 @@
       "mysql",
       "postgres",
       "oracle",
-      "cassandra"
+      "cassandra",
+      "sqlite"
     ],
     "pathological": true
   },
@@ -386,7 +405,8 @@
       "mysql",
       "postgres",
       "oracle",
-      "cassandra"
+      "cassandra",
+      "sqlite"
     ],
     "pathological": true
   },
@@ -408,7 +428,8 @@
       "mysql",
       "postgres",
       "oracle",
-      "cassandra"
+      "cassandra",
+      "sqlite"
     ],
     "obfuscated": [
       "?"
@@ -445,7 +466,8 @@
       "mysql",
       "postgres",
       "oracle",
-      "cassandra"
+      "cassandra",
+      "sqlite"
     ]
   },
   {
@@ -458,7 +480,8 @@
       "mysql",
       "postgres",
       "oracle",
-      "cassandra"
+      "cassandra",
+      "sqlite"
     ],
     "pathological": true
   },
@@ -509,7 +532,8 @@
       "select * from foo where bar=? and x=?"
     ],
     "dialects": [
-      "cassandra"
+      "cassandra",
+      "sqlite"
     ]
   },
   {
@@ -519,7 +543,9 @@
       "select * from foo where bar=? and x=?"
     ],
     "dialects": [
-      "mysql"
+      "mysql",
+      "cassandra",
+      "sqlite"
     ]
   },
   {
@@ -532,7 +558,8 @@
       "mysql",
       "postgres",
       "oracle",
-      "cassandra"
+      "cassandra",
+      "sqlite"
     ]
   },
   {
@@ -585,7 +612,8 @@
     "dialects": [
       "mysql",
       "postgres",
-      "cassandra"
+      "cassandra",
+      "sqlite"
     ]
   }
 ]