newrelic_rpm 3.18.1.330 → 4.0.0.332

data/lib/new_relic/metric_spec.rb

@@ -42,23 +42,6 @@ class NewRelic::MetricSpec
     @name.hash ^ @scope.hash
   end
 
-  # return a new metric spec if the given regex
-  # matches the name or scope.
-  def sub(pattern, replacement, apply_to_scope = true)
-    ::NewRelic::Agent.logger.warn("The sub method on metric specs is deprecated") rescue nil
-    return nil if name !~ pattern &&
-     (!apply_to_scope || scope.nil? || scope !~ pattern)
-    new_name = name.sub(pattern, replacement)[LENGTH_RANGE]
-
-    if apply_to_scope
-      new_scope = (scope && scope.sub(pattern, replacement)[LENGTH_RANGE])
-    else
-      new_scope = scope
-    end
-
-    self.class.new new_name, new_scope
-  end
-
   def to_s
     return name if scope.empty?
     "#{name}:#{scope}"

data/lib/new_relic/noticed_error.rb

@@ -15,12 +15,13 @@ class NewRelic::NoticedError
 
   attr_reader   :exception_id, :is_internal
 
-  STRIPPED_EXCEPTION_REPLACEMENT_MESSAGE = "Message removed by New Relic 'strip_exception_messages' setting"
+  STRIPPED_EXCEPTION_REPLACEMENT_MESSAGE = "Message removed by New Relic 'strip_exception_messages' setting".freeze
+  UNKNOWN_ERROR_CLASS_NAME = 'Error'.freeze
+  NIL_ERROR_MESSAGE = '<no message>'.freeze
 
   def initialize(path, exception, timestamp = Time.now)
     @exception_id = exception.object_id
     @path = path
-    @exception_class_name = exception.is_a?(Exception) ? exception.class.name : 'Error'
 
     # It's critical that we not hold onto the exception class constant in this
     # class. These objects get serialized for Resque to a process that might
@@ -28,24 +29,7 @@ class NewRelic::NoticedError
     # while we have the actual exception!
     @is_internal = (exception.class < NewRelic::Agent::InternalAgentError)
 
-    if exception.nil?
-      @message = '<no message>'
-    elsif exception.respond_to?(:cause)
-      @message = (exception.cause || exception).to_s
-    elsif exception.respond_to?(:original_exception)
-      @message = (exception.original_exception || exception).to_s
-    else # exception is not nil, but does not respond to original_exception
-      @message = exception.to_s
-    end
-
-
-    unless @message.is_a?(String)
-      # In pre-1.9.3, Exception.new({}).to_s.class != String
-      # That is, Exception#to_s may not return a String instance if one wasn't
-      # passed in upon creation of the Exception. So, try to generate a useful
-      # String representation of the exception message, falling back to failsafe
-      @message = String(@message.inspect) rescue '<unknown message type>'
-    end
+    extract_class_name_and_message_from(exception)
 
     # clamp long messages to 4k so that we don't send a lot of
     # overhead across the wire
@@ -62,13 +46,6 @@ class NewRelic::NoticedError
     @timestamp = timestamp
   end
 
-  # @exception_class has been deprecated in favor of the more descriptive
-  # @exception_class_name.
-  # @deprecated
-  def exception_class
-    exception_class_name
-  end
-
   def ==(other)
     if other.respond_to?(:exception_id)
       exception_id == other.exception_id
@@ -181,4 +158,18 @@ class NewRelic::NoticedError
   def intrinsic_attributes
     processed_attributes[INTRINSIC_ATTRIBUTES]
   end
+
+  def extract_class_name_and_message_from(exception)
+    if exception.nil?
+      @exception_class_name = UNKNOWN_ERROR_CLASS_NAME
+      @message = NIL_ERROR_MESSAGE
+    else
+      if defined?(Rails) && Rails::VERSION::MAJOR < 5 && exception.respond_to?(:original_exception)
+        exception = exception.original_exception || exception
+      end
+      @exception_class_name = exception.is_a?(Exception) ? exception.class.name : UNKNOWN_ERROR_CLASS_NAME
+      @message = exception.to_s
+    end
+  end
+
 end

data/lib/new_relic/version.rb

@@ -10,9 +10,9 @@ module NewRelic
       parts.compact.join('.')
     end
 
-    MAJOR = 3
-    MINOR = 18
-    TINY  = 1
+    MAJOR = 4
+    MINOR = 0
+    TINY  = 0
 
     begin
       require File.join(File.dirname(__FILE__), 'build')
@@ -22,49 +22,4 @@ module NewRelic
 
     STRING = build_version_string(MAJOR, MINOR, TINY, BUILD)
   end
-
-  # Helper class for managing version comparisons
-  class VersionNumber
-    attr_reader :parts
-    include Comparable
-    def initialize(version_string)
-      version_string ||= '1.0.0'
-      @parts = version_string.split('.').map{|n| n =~ /^\d+$/ ? n.to_i : n}
-    end
-    def major_version; @parts[0]; end
-    def minor_version; @parts[1]; end
-    def tiny_version; @parts[2]; end
-
-    def <=>(other)
-      other = self.class.new(other) if other.is_a? String
-      self.class.compare(self.parts, other.parts)
-    end
-
-    def to_s
-      @parts.join(".")
-    end
-
-    def hash
-      @parts.hash
-    end
-
-    def eql? other
-      (self <=> other) == 0
-    end
-
-    private
-    def self.compare(parts1, parts2)
-      a, b = parts1.first, parts2.first
-      case
-        when a.nil? && b.nil? then 0
-        when a.nil? then b.is_a?(Integer) ?  -1 : 1
-        when b.nil? then -compare(parts2, parts1)
-        when a.to_s == b.to_s then compare(parts1[1..-1], parts2[1..-1])
-        when a.is_a?(String) then b.is_a?(Integer) ?  -1 : (a <=> b)
-        when b.is_a?(String) then -compare(parts2, parts1)
-        else # they are both fixnums, not nil
-          a <=> b
-      end
-    end
-  end
 end

data/lib/tasks/versions.rake

@@ -25,7 +25,7 @@ namespace :newrelic do
         end
     end
 
-    def build_erb(format)
+    def build_versions_erb(format)
       require 'erb'
       path = File.join(File.dirname(__FILE__), "versions.#{format}.erb")
       template = File.read(File.expand_path(path))
@@ -33,20 +33,22 @@ namespace :newrelic do
     end
 
     def write_versions(title, type, erb)
-      title.downcase.gsub(" ", "_")
-      versions_for_type(type)
+      anchor = title.downcase.gsub(" ", "_")
+      versions = versions_for_type(type)
       puts erb.result(binding).gsub(/^ *$/, '')
+
+      "#{anchor} #{versions}" # silences unused warnings
     end
 
     def include_if_exists(filename)
       path = File.join(File.dirname(__FILE__), filename)
-      puts File.read(path) if File.exists?(path)
+      puts File.read(path) if File.exist?(path)
     end
 
     VersionStruct = Struct.new(:name, :supported, :deprecated, :experimental, :notes)
 
     format = args[:format] || "txt"
-    erb = build_erb(format)
+    erb = build_versions_erb(format)
 
     include_if_exists("versions.preface.#{format}")
 

data/newrelic_rpm.gemspec

@@ -8,7 +8,7 @@ require 'new_relic/latest_changes'
 Gem::Specification.new do |s|
   s.name = "newrelic_rpm"
   s.version = NewRelic::VERSION::STRING
-  s.required_ruby_version = '>= 1.8.7'
+  s.required_ruby_version = '>= 2.0.0'
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = [ "Tim Krajcar", "Matthew Wear", "Katherine Wu", "Kenichi Nakamura" ]
   s.date = Time.now.strftime('%Y-%m-%d')
@@ -50,24 +50,9 @@ EOS
   s.add_development_dependency 'pry', '~> 0.9.12'
   s.add_development_dependency 'hometown', '~> 0.2.5'
 
-  # rack-cache ~> 1.2 is specified by actionpack 3.2, but rack-cache 1.3.1 only works on Ruby 1.9.3 & newer. :(
-  # https://github.com/rtomayko/rack-cache/issues/124
-  if RUBY_VERSION < "1.9.3"
-   s.add_development_dependency "rack-cache", "~> 1.2.0"
-  end
-
-  # version lock down for i18n that is compatible with Ruby 1.8.7
-  s.add_development_dependency 'i18n', '0.6.11'
-
   if RUBY_PLATFORM == 'java'
     s.add_development_dependency 'activerecord-jdbcsqlite3-adapter'
-    s.add_development_dependency 'jruby-openssl', '~> 0.9.10' unless JRUBY_VERSION > '1.7'
   else
     s.add_development_dependency 'sqlite3'
   end
-
-  if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'
-    s.add_development_dependency 'rubysl'
-    s.add_development_dependency 'racc'
-  end
 end

data/test/agent_helper.rb

@@ -5,6 +5,8 @@
 # These helpers should not have any gem dependencies except on newrelic_rpm
 # itself, and should be usable from within any multiverse suite.
 
+require 'json'
+
 class ArrayLogDevice
   def initialize( array=[] )
     @array = array
@@ -600,7 +602,7 @@ ensure
 end
 
 def json_dump_and_encode(object)
-  Base64.encode64(NewRelic::JSONWrapper.dump(object))
+  Base64.encode64(::JSON.dump(object))
 end
 
 def get_last_analytics_event
@@ -626,7 +628,7 @@ def load_cross_agent_test(name)
   test_file_path = File.join(cross_agent_tests_dir, "#{name}.json")
   data = File.read(test_file_path)
   data.gsub!('callCount', 'call_count')
-  data = NewRelic::JSONWrapper.load(data)
+  data = ::JSON.load(data)
   data.each { |testcase| testcase['testname'].gsub! ' ', '_' if String === testcase['testname'] }
   data
 end

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

@@ -4,8 +4,8 @@
 
 require 'bundler'
 
-require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'multiverse', 'lib', 'multiverse', 'color'))
-require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'multiverse', 'lib', 'multiverse', 'shell_utils'))
+require File.expand_path '../../../../multiverse/lib/multiverse/color', __FILE__
+require File.expand_path '../../../../multiverse/lib/multiverse/shell_utils', __FILE__
 
 module Environments
   class Runner
@@ -13,18 +13,11 @@ module Environments
 
     BLACKLIST = {
       "2.2.1"       => ["rails50"],
-      "2.2.0"       => ["rails50"],
+      "2.2"         => ["rails50"],
       "2.1"         => ["rails50"],
       "2.0"         => ["rails50"],
       "2"           => ["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"],
+      "jruby-9.0"   => ["rails21", "rails22", "rails23", "rails30", "rails31", "rails32"]
     }
 
     attr_reader :envs
@@ -34,7 +27,7 @@ module Environments
     end
 
     def env_root
-      File.join(File.dirname(__FILE__), "..", "..")
+      File.expand_path '../../..', __FILE__
     end
 
     def run_and_report
@@ -69,9 +62,7 @@ module Environments
       dirs = potential_directories
 
       version = RUBY_VERSION
-      version = "ree" if defined?(RUBY_DESCRIPTION) && RUBY_DESCRIPTION =~ /Ruby Enterprise Edition/
       version = "jruby-#{JRUBY_VERSION[0..2]}" if defined?(JRUBY_VERSION)
-      version = "rbx-2.0" if defined?(RUBY_ENGINE) && RUBY_ENGINE == "rbx"
 
       BLACKLIST.each do |check_version, blacklisted|
         if version.start_with?(check_version)

data/test/environments/norails/Gemfile

@@ -12,14 +12,6 @@ else
 end
 
 gem 'rack-test'
-gem 'json', '< 1.8.5' if RUBY_VERSION == "1.8.7"
-
-platforms :rbx do
-  gem "rubysl"
-  gem "rubysl-test-unit"
-  gem "psych"
-  gem "racc"  # https://github.com/rubinius/rubinius/issues/2632
-end
 
 gem "newrelic_rpm", :path => "../../.."
 

data/test/environments/rails21/Gemfile

@@ -21,11 +21,3 @@ end
 
 gem 'pry', '~> 0.9.12'
 gem 'hometown', '~> 0.2.5'
-
-if RUBY_VERSION < '1.9'
-  gem 'git', '< 1.3' # git 1.3.0 requires Ruby version >= 1.9
-  gem 'json_pure', '< 1.8.5'
-  gem 'json', '< 1.8.5'
-  gem 'rdoc', '4.2.0'
-end
-

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

@@ -1,6 +1,6 @@
 mysql: &mysql
   adapter: mysql
-  socket: <%= (`uname -s` =~ /Linux/ ) ? "" :"/tmp/mysql.sock" %>
+  socket: <%= (`uname -s` =~ /Linux/ ) ? "" : "/tmp/mysql.sock" %>
   username: root
   host: localhost
   database: <%= db = "#{ENV['RUBY_VERSION']}#{ENV['BRANCH']}"; db.empty? ? "rails_blog" : db %>

data/test/environments/rails22/Gemfile

@@ -22,11 +22,3 @@ end
 
 gem 'pry', '~> 0.9.12'
 gem 'hometown', '~> 0.2.5'
-
-if RUBY_VERSION < '1.9'
-  gem 'git', '< 1.3' # git 1.3.0 requires Ruby version >= 1.9
-  gem 'json_pure', '< 1.8.5'
-  gem 'json', '< 1.8.5'
-  gem 'rdoc', '4.2.0'
-end
-

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

@@ -1,6 +1,6 @@
 mysql: &mysql
   adapter: mysql
-  socket: <%= (`uname -s` =~ /Linux/ ) ? "" :"/tmp/mysql.sock" %>
+  socket: <%= (`uname -s` =~ /Linux/ ) ? "" : "/tmp/mysql.sock" %>
   username: root
   host: localhost
   database: <%= db = "#{ENV['RUBY_VERSION']}#{ENV['BRANCH']}"; db.empty? ? "rails_blog" : db %>

data/test/environments/rails23/Gemfile

@@ -7,13 +7,7 @@ gem 'minitest', '~>4.7.5'
 gem 'mocha', :require => false
 gem 'rack', '< 2.0.0'
 gem 'rack-test'
-gem 'json', '< 1.8.5' if RUBY_VERSION == "1.8.7"
-
-if RUBY_VERSION < '2.0'
-  gem 'rdoc', '4.2.0'
-else
-  gem 'rdoc'
-end
+gem 'rdoc'
 
 gem "newrelic_rpm", :path => '../../..'
 

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

@@ -1,6 +1,6 @@
 mysql: &mysql
   adapter: mysql
-  socket: <%= (`uname -s` =~ /Linux/ ) ? "" :"/tmp/mysql.sock" %>
+  socket: <%= (`uname -s` =~ /Linux/ ) ? "" : "/tmp/mysql.sock" %>
   username: root
   host: localhost
   database: <%= db = "#{ENV['RUBY_VERSION']}#{ENV['BRANCH']}"; db.empty? ? "rails_blog" : db %>

data/test/environments/rails30/Gemfile

@@ -7,7 +7,6 @@ gem 'minitest', '~>4.7.5'
 gem 'mocha', :require => false
 gem 'rack', '< 2.0.0'
 gem 'rack-test'
-gem 'json', '< 1.8.5' if RUBY_VERSION == "1.8.7"
 
 gem 'newrelic_rpm', :path => '../../..'
 

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

@@ -1,6 +1,6 @@
 mysql: &mysql
   adapter: mysql
-  socket: <%= (`uname -s` =~ /Linux/ ) ? "" :"/tmp/mysql.sock" %>
+  socket: <%= (`uname -s` =~ /Linux/ ) ? "" : "/tmp/mysql.sock" %>
   username: root
   host: localhost
   database: <%= db = "#{ENV['RUBY_VERSION']}#{ENV['BRANCH']}"; db.empty? ? "rails_blog" : db %>

data/test/environments/rails31/Gemfile

@@ -8,7 +8,6 @@ gem 'minitest', '~>4.7.5'
 gem 'mocha', :require => false
 gem 'rack', '< 2.0.0'
 gem 'rack-test'
-gem 'json', '< 1.8.5' if RUBY_VERSION == "1.8.7"
 
 gem 'newrelic_rpm', :path => '../../..'
 
@@ -23,5 +22,3 @@ end
 
 gem 'pry', '~> 0.9.12'
 gem 'hometown', '~> 0.2.5'
-
-gem 'rack-cache', '< 1.3' if RUBY_VERSION < '1.9.3' # rack-cache 1.3.0 only supports >= 1.9.3

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

@@ -1,6 +1,6 @@
 mysql: &mysql
   adapter: mysql
-  socket: <%= (`uname -s` =~ /Linux/ ) ? "" :"/tmp/mysql.sock" %>
+  socket: <%= (`uname -s` =~ /Linux/ ) ? "" : "/tmp/mysql.sock" %>
   username: root
   host: localhost
   database: <%= db = "#{ENV['RUBY_VERSION']}#{ENV['BRANCH']}"; db.empty? ? "rails_blog" : db %>

data/test/environments/rails32/Gemfile

@@ -8,7 +8,6 @@ gem 'minitest', '~>4.7.5'
 gem 'mocha', :require => false
 gem 'rack', '< 2.0.0'
 gem 'rack-test'
-gem 'json', '< 1.8.5' if RUBY_VERSION == "1.8.7"
 
 gem "newrelic_rpm", :path => "../../.."
 
@@ -25,5 +24,3 @@ end
 
 gem 'pry', '~> 0.9.12'
 gem 'hometown', '~> 0.2.5'
-
-gem 'rack-cache', '< 1.3' if RUBY_VERSION < '1.9.3' # rack-cache 1.3.0 only supports >= 1.9.3