newrelic_rpm 3.18.1.330 → 4.0.0.332

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aea433d0e5dddee05b76a21d682702ef9b6858e1
-  data.tar.gz: f9bd9e91d487865e5d33630eda81c49cadb29757
+  metadata.gz: 6f033acf8bf5efe89fd548f55aba3e3b7b9c58e2
+  data.tar.gz: 0e523aeaaca318f6bf863c4f7b9269d4b212f63a
 SHA512:
-  metadata.gz: 41eb55392a0eb008ef66bd77979e15cd45617536cbe81e331a36cf86a1f1606301250bb538b2b48049b057818116e90bc8e5bf5d1c4d191c4225b240bc99d506
-  data.tar.gz: 537960507a71710172aaa29442595c172559921fe7ee8c4c071a1f864e7f7e4917042c10442decd3a169008abf3ebce2755d1432c418eab519d1e7c3ae7ed9b8
+  metadata.gz: 9b18921ad5e63244778c06a6d45fcf7fa556a19cac8eb61f58cdfce341033ea87c9e9c3eb1832c8c5c3dd4ce9ad30030340497772c5a1144bfd408b2be0dfd0e
+  data.tar.gz: 809cc815755c0d2be8555ac9e8bec2d057a849617e196e62644131588d7c8a697f19f1e91a1f73f0c4ace692efbd1d7ece2ce7996548a2f1828c7cd56b0649a9

data/.travis.yml

@@ -8,10 +8,8 @@ language: ruby
 sudo: required
 
 before_install:
-  - ./test/script/before_install/revert_rubygems.sh
   - gem --version
   - ./test/script/before_install/gemstash_mirror.sh
-  - ./test/script/before_install/update_bundler.sh
   - bundle --version
 
 install: bundle install
@@ -33,18 +31,12 @@ notifications:
 
 rvm:
   # Run slowest builds first to try and optimize overall cycle time.
-  - jruby-1.7.23
   - jruby-9.1.2.0
   - 2.4.0
   - 2.3.3
   - 2.2.6
   - 2.1.10
   - 2.0.0-p648
-  - 1.9.3
-  - 1.9.2
-  - ree
-  - 1.8.7
-  - rbx-2.5.8
 
 env:
   global:
@@ -57,9 +49,11 @@ env:
     - TESTOPTS="-v"
     - VERBOSE = 1
   matrix:
+    # RUBY-1668 rails21, rails22, and rails23 are all excluded below
     - TYPE=UNIT ENVIRONMENT=rails21
     - TYPE=UNIT ENVIRONMENT=rails22
     - TYPE=UNIT ENVIRONMENT=rails23
+
     - TYPE=UNIT ENVIRONMENT=rails30
     - TYPE=UNIT ENVIRONMENT=rails31
     - TYPE=UNIT ENVIRONMENT=rails32
@@ -81,14 +75,8 @@ env:
     - TYPE=NULLVERSE
 
 matrix:
-  allow_failures:
-    - rvm: rbx-2.5.8
-    - rvm: ree
   fast_finish: true
   exclude:
-    - rvm: rbx-2.5.8 # Currently hangs
-      env: TYPE=FUNCTIONAL GROUP=agent
-
     # Unsupported Rails/Ruby combinations
     # 2.4
     - rvm: 2.4.0
@@ -146,52 +134,6 @@ matrix:
     - rvm: 2.0.0-p648
       env: TYPE=UNIT ENVIRONMENT=rails50
 
-    # 1.9.3
-    - rvm: 1.9.3
-      env: TYPE=UNIT ENVIRONMENT=rails21
-    - rvm: 1.9.3
-      env: TYPE=UNIT ENVIRONMENT=rails22
-    - rvm: 1.9.3
-      env: TYPE=UNIT ENVIRONMENT=rails50
-
-    # 1.9.2
-    - rvm: 1.9.2
-      env: TYPE=UNIT ENVIRONMENT=rails21
-    - rvm: 1.9.2
-      env: TYPE=UNIT ENVIRONMENT=rails22
-    - rvm: 1.9.2
-      env: TYPE=UNIT ENVIRONMENT=rails50
-
-    # REE
-    - rvm: ree
-      env: TYPE=UNIT ENVIRONMENT=rails40
-    - rvm: ree
-      env: TYPE=UNIT ENVIRONMENT=rails41
-    - rvm: ree
-      env: TYPE=UNIT ENVIRONMENT=rails42
-    - rvm: ree
-      env: TYPE=UNIT ENVIRONMENT=rails50
-
-    # 1.8.7
-    - rvm: 1.8.7
-      env: TYPE=UNIT ENVIRONMENT=rails40
-    - rvm: 1.8.7
-      env: TYPE=UNIT ENVIRONMENT=rails41
-    - rvm: 1.8.7
-      env: TYPE=UNIT ENVIRONMENT=rails42
-    - rvm: 1.8.7
-      env: TYPE=UNIT ENVIRONMENT=rails50
-
-    # jruby 1.7
-    - rvm: jruby-1.7.23
-      env: TYPE=UNIT ENVIRONMENT=rails21
-    - rvm: jruby-1.7.23
-      env: TYPE=UNIT ENVIRONMENT=rails22
-    - rvm: jruby-1.7.23
-      env: TYPE=UNIT ENVIRONMENT=rails23
-    - rvm: jruby-1.7.23
-      env: TYPE=UNIT ENVIRONMENT=rails50
-
     # jruby 9.0
     - rvm: jruby-9.1.2.0
       env: TYPE=UNIT ENVIRONMENT=rails21
@@ -205,17 +147,3 @@ matrix:
       env: TYPE=UNIT ENVIRONMENT=rails31
     - rvm: jruby-9.1.2.0
       env: TYPE=UNIT ENVIRONMENT=rails32
-
-    # rbx
-    - rvm: rbx-2.5.8
-      env: TYPE=UNIT ENVIRONMENT=rails21
-    - rvm: rbx-2.5.8
-      env: TYPE=UNIT ENVIRONMENT=rails22
-    - rvm: rbx-2.5.8
-      env: TYPE=UNIT ENVIRONMENT=rails23
-    - rvm: rbx-2.5.8
-      env: TYPE=UNIT ENVIRONMENT=rails30
-    - rvm: rbx-2.5.8
-      env: TYPE=UNIT ENVIRONMENT=rails31
-    - rvm: rbx-2.5.8
-      env: TYPE=UNIT ENVIRONMENT=rails32

data/CHANGELOG.md

@@ -1,5 +1,80 @@
 # New Relic Ruby Agent Release Notes #
 
+## v4.0.0 ##
+
+  * Require Ruby 2.0.0+
+
+  The agent no longer supports Ruby versions prior to 2.0, JRuby 1.7 and
+  earlier, and all versions of Rubinius. Customers using affected Rubies
+  can continue to run 3.x agent versions, but new features or bugfixes
+  will not be published for 3.x agents. For more information, check out our
+  [community forum](https://discuss.newrelic.com/t/support-for-ruby-jruby-1-x-is-being-deprecated-in-ruby-agent-4-0-0/44787).
+
+  * OkJson vendored library removed
+
+  Ruby 1.8 did not include the JSON gem by default, so the agent included a
+  vendored version of [OkJson](https://github.com/kr/okjson) that it would fall
+  back on using in cases where the JSON gem was not available. This has been
+  removed.
+
+  * YAJL workaround removed
+
+  [yajl-ruby](https://github.com/brianmario/yajl-ruby) versions prior to 1.2 had
+  the potential to cause a segmentation fault when working large, deeply-nested
+  objects like thread profiles. If you are using yajl-ruby with the `JSON`
+  monkey patches enabled by requiring `yajl/json_gem`, you should upgrade to
+  at least version 1.2.
+
+  * Deprecated APIs removed
+
+    * `Agent.abort_transaction!`
+    * `Agent.add_custom_parameters`
+    * `Agent.add_request_parameters`
+    * `Agent.browser_timing_footer`
+    * `Agent.get_stats`
+    * `Agent.get_stats_no_scope`
+    * `Agent.record_transaction`
+    * `Agent.reset_stats`
+    * `Agent.set_user_attributes`
+    * `Agent::Instrumentation::Rack`
+    * `ActionController#newrelic_notice_error`
+    * `ActiveRecordHelper.rollup_metrics_for` (may be incompatible with newrelic_moped)
+    * `Instrumentation::MetricFrame.recording_web_transaction?`
+    * `Instrumentation::MetricFrame.abort_transaction!`
+    * `MethodTracer.get_stats_scoped`
+    * `MethodTracer.get_stats_unscoped`
+    * `MethodTracer.trace_method_execution`
+    * `MethodTracer.trace_method_execution_no_scope`
+    * `MethodTracer.trace_method_execution_with_scope`
+    * `MetricSpec#sub`
+    * `MetricStats#get_stats`
+    * `MetricStats#get_stats_no_scope`
+    * `NoticedError#exception_class`
+    * `Rack::ErrorCollector`
+    * `StatsEngine::Samplers.add_sampler`
+    * `StatsEngine::Samplers.add_harvest_sampler`
+
+  The above methods have had deprecation notices on them for some time and
+  have now been removed. Assistance migrating usage of these APIs is
+  available at https://docs.newrelic.com/node/2601.
+
+  The agent no longer deletes deprecated keys passed to `add_method_tracer`. Passing
+  in deprecated keys can cause an exception. Ensure that you are not passing any of
+  the following keys: `:force, :scoped_metric_only, :deduct_call_time_from_parent`
+  to `add_method_tracer`.
+
+  The agent no longer deletes deprecated keys passed in as options to
+  `NewRelic::Agent.notice_error`. If you are passing any of these deprecated
+  keys: `:request_params, :request, :referer` to the `notice_error` API, please
+  delete them otherwise they will be collected as custom attributes.
+
+  * Error handling changes
+
+  The agent now only checks for `original_exception` in environments with Rails
+  versions prior to 5. Checking for `Exception#cause` has been removed. In addition,
+  the agent now will match class name with message and backtrace when noticing
+  errors that have an `original_exception`.
+
 ## v3.18.1 ##
 
   * Ensure Mongo aggregate queries are properly obfuscated
@@ -11,6 +86,8 @@
   encouraged to turn off query collection using by setting
   `mongo.capture_queries` to false in their newrelic.yml files.
 
+  This release fixes [New Relic Security Bulletin NR17-03](https://docs.newrelic.com/docs/accounts-partnerships/accounts/security-bulletins/security-bulletin-nr17-03).
+
   * Early access Redis 4.0 instrumentation
 
   Our Redis instrumentation has been tested against Redis 4.0.0.rc1.

data/CONTRIBUTING.md

@@ -5,15 +5,23 @@ taken effort to make this process easy for both contributors and our development
 team.
 
 When contributing, keep in mind that the agent runs in a wide variety of Ruby
-language implementations (e.g. 1.8.7, 1.9.x, 2.x.x, jruby, rbx, etc.) as well as
-a wide variety of application environments (e.g. Rails, Sinatra, roll-your-own,
-etc.) See https://docs.newrelic.com/docs/agents/ruby-agent/getting-started/new-relic-ruby#compat
+language implementations (e.g. 2.x.x, jruby, etc.) as well as a wide variety of
+application environments (e.g. Rails, Sinatra, roll-your-own, etc.) See
+https://docs.newrelic.com/docs/agents/ruby-agent/getting-started/ruby-agent-requirements-supported-frameworks
 for the current full list.
 
 Because of this, we need to be more defensive in our coding practices than most
-projects. Syntax must be compatible with all supported Ruby implementations
-(e.g. no 1.9 specific hash syntax) and we can't assume the presence of any
-specific libraries, including `ActiveSupport`, `ActiveRecord`, etc.
+projects. Syntax must be compatible with all supported Ruby implementations and
+we can't assume the presence of any specific libraries, including `ActiveSupport`,
+`ActiveRecord`, etc.
+
+## Branches
+
+The head of master will generally have New Relic's latest release. However,
+New Relic reserves the ability to push an edge to the master. If you download a
+release from this repo, use the appropriate tag. New Relic usually pushes beta
+versions of a release to a working branch before tagging them for General
+Availability.
 
 ## Testing
 

data/LICENSE

@@ -23,96 +23,9 @@ See https://github.com/jquery/jquery/blob/1.4.2/MIT-LICENSE.txt
     OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
     WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-It includes source derived from 'okjson' by Keith Rarick, distributed under the
-MIT license.
-See https://github.com/kr/okjson/blob/bdd1113/okjson.rb#L3-21
-
-    Copyright 2011, 2012 Keith Rarick
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to deal
-    in the Software without restriction, including without limitation the rights
-    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in
-    all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-    THE SOFTWARE.
-
-It includes source derived from 'system_timer' by David Vollbracht & Philippe
-Hanrigou, distributed under Ruby's license terms.
-
-Copyright:  (C) 2008 David Vollbracht & Philippe Hanrigou
-
-Ruby is copyrighted free software by Yukihiro Matsumoto <matz@netlab.co.jp>.
-You can redistribute it and/or modify it under either the terms of the GPL
-(see COPYING.txt file), or the conditions below:
-
-  1. You may make and give away verbatim copies of the source form of the
-     software without restriction, provided that you duplicate all of the
-     original copyright notices and associated disclaimers.
-
-  2. You may modify your copy of the software in any way, provided that
-     you do at least ONE of the following:
-
-       a) place your modifications in the Public Domain or otherwise
-          make them Freely Available, such as by posting said
-modifications to Usenet or an equivalent medium, or by allowing
-the author to include your modifications in the software.
-
-       b) use the modified software only within your corporation or
-          organization.
-
-       c) rename any non-standard executables so the names do not conflict
-with standard executables, which must also be provided.
-
-       d) make other distribution arrangements with the author.
-
-  3. You may distribute the software in object code or executable
-     form, provided that you do at least ONE of the following:
-
-       a) distribute the executables and library files of the software,
-together with instructions (in the manual page or equivalent)
-on where to get the original distribution.
-
-       b) accompany the distribution with the machine-readable source of
-the software.
-
-       c) give non-standard executables non-standard names, with
-          instructions on where to get the original software distribution.
-
-       d) make other distribution arrangements with the author.
-
-  4. You may modify and include the part of the software into any other
-     software (possibly commercial). But some files in the distribution
-     are not written by the author, so that they are not under this terms.
-
-     They are gc.c(partly), utils.c(partly), regex.[ch], st.[ch] and some
-     files under the ./missing directory. See each file for the copying
-     condition.
-
-  5. The scripts and library files supplied as input to or produced as
-     output from the software do not automatically fall under the
-     copyright of the software, but belong to whomever generated them,
-     and may be sold commercially, and may be aggregated with this
-     software.
-
-  6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
-     IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-     PURPOSE.
-
 
 All other components of this product are
-Copyright (c) 2008-2015 New Relic, Inc.  All rights reserved.
+Copyright (c) 2008-2017 New Relic, Inc.  All rights reserved.
 
 Certain inventions disclosed in this file may be claimed within
 patents owned or patent applications filed by New Relic, Inc. or third

data/lib/new_relic/agent.rb

@@ -31,8 +31,8 @@ module NewRelic
     require 'new_relic/metric_data'
     require 'new_relic/collection_helper'
     require 'new_relic/noticed_error'
-    require 'new_relic/timer_lib'
 
+    require 'new_relic/agent/encoding_normalizer'
     require 'new_relic/agent/stats'
     require 'new_relic/agent/chained_call'
     require 'new_relic/agent/cross_app_monitor'
@@ -56,9 +56,6 @@ module NewRelic
 
     require 'new_relic/agent/instrumentation/controller_instrumentation'
 
-    # this is a shim that's here only for backwards compatibility
-    require 'new_relic/agent/instrumentation/metric_frame'
-
     require 'new_relic/agent/samplers/cpu_sampler'
     require 'new_relic/agent/samplers/memory_sampler'
     require 'new_relic/agent/samplers/object_sampler'
@@ -369,8 +366,7 @@ module NewRelic
     #
     # @api public
     def require_test_helper
-      path = File.join(__FILE__, '..', '..', '..', 'test', 'agent_helper')
-      require File.expand_path(path)
+      require File.expand_path('../../../test/agent_helper', __FILE__)
     end
 
     # This method sets the block sent to this method as a sql
@@ -624,103 +620,6 @@ module NewRelic
 
     # @!endgroup
 
-    # @!group Deprecated methods
-
-    # In previous agent releases, this method was required for manual RUM
-    # instrumentation. That work is now all done by the browser_timing_header
-    # method, but this is left for compatibility.
-    #
-    # @api public
-    # @deprecated
-    #
-    def browser_timing_footer
-      ""
-    end
-
-    ADD_CUSTOM_ATTRIBUTES  = "NewRelic::Agent.add_custom_attributes".freeze
-    ADD_CUSTOM_PARAMETERS  = "NewRelic::Agent.add_custom_parameters".freeze
-    ADD_REQUEST_PARAMETERS = "NewRelic::Agent.add_request_parameters".freeze
-    SET_USER_ATTRIBUTES    = "NewRelic::Agent.set_user_attributes".freeze
-
-    # Deprecated. Use add_custom_attributes instead.
-    #
-    # @deprecated
-    # @api public
-    #
-    def add_custom_parameters(*args)
-      NewRelic::Agent::Deprecator.deprecate(ADD_CUSTOM_PARAMETERS, ADD_CUSTOM_ATTRIBUTES)
-      add_custom_attributes(*args)
-    end
-
-    # Deprecated. Use add_custom_attributes instead.
-    #
-    # @deprecated
-    # @api public
-    #
-    def add_request_parameters(*args)
-      NewRelic::Agent::Deprecator.deprecate(ADD_REQUEST_PARAMETERS, ADD_CUSTOM_ATTRIBUTES)
-      add_custom_attributes(*args)
-    end
-
-    # Deprecated. Use add_custom_attributes instead.
-    #
-    # @deprecated
-    # @api public
-    #
-    def set_user_attributes(*args)
-      NewRelic::Agent::Deprecator.deprecate(SET_USER_ATTRIBUTES, ADD_CUSTOM_ATTRIBUTES)
-      add_custom_attributes(*args)
-    end
-
-    # Get or create a statistics gatherer that will aggregate numerical data
-    # under a metric name.
-    #
-    # +metric_name+ should follow a slash separated path convention. Application
-    # specific metrics should begin with "Custom/".
-    #
-    # Return a NewRelic::Agent::Stats that accepts data
-    # via calls to add_data_point(value).
-    #
-    # This method is deprecated in favor of record_metric and increment_metric,
-    # and is not thread-safe.
-    #
-    # @api public
-    # @deprecated
-    #
-    def get_stats(metric_name, use_scope=false)
-      return unless agent
-      agent.stats_engine.get_stats(metric_name, use_scope)
-    end
-
-    alias get_stats_no_scope get_stats
-
-    # Deprecated in favor of drop_buffered_data
-    #
-    # @api public
-    # @deprecated
-    def reset_stats; drop_buffered_data; end
-
-    # Cancel the collection of the current transaction in progress, if
-    # any.  Only affects the transaction started on this thread once
-    # it has started and before it has completed.
-    #
-    # This method has been deprecated in favor of ignore_transaction,
-    # which does what people expect this method to do.
-    #
-    # @api public
-    # @deprecated
-    #
-    def abort_transaction!
-      Transaction.abort_transaction!
-    end
-
-    # Remove after 5/9/15
-    def record_transaction(*args)
-      NewRelic::Agent.logger.warn('This method has been deprecated, please see https://docs.newrelic.com/docs/ruby/ruby-agent-api for current API documentation.')
-    end
-
-    # @!endgroup
-
     def_delegator :'NewRelic::Agent::PipeChannelManager', :register_report_channel
   end
 end