newrelic_rpm 3.14.3.313 → 3.15.0.314

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0bda6a646d6112679fd28258a00acdbd96924b7
-  data.tar.gz: 0425f49e3544124c46ad1c4a43c0e061510137f1
+  metadata.gz: 391d2537bee4bdb7f87f25c7d20d017876638851
+  data.tar.gz: 974e57e947784e5cba3caf6b802e5d62fd5d8cf3
 SHA512:
-  metadata.gz: 0553dab5397468ae5e48fc4a983bfd5ac2b6000b42497ac0f7068f95bfd50865bb024cf5a32aa047f5675708ce51b925f77cce2511b61c1e2c52f9ea7e375c5f
-  data.tar.gz: 2d0a942e509d2d5dd400dab3ba4c3b48e1154129e6b8041725a4fcb3978562e6f7a32579d3d1c4548b1eb1f9587e37f22b67ce752fb008e44487239f7a7e9b62
+  metadata.gz: 50197fcecbff1272846495f6ac2948f274d6c3cca935d34d26aa024c8606bff4b3fb47c59a54a915904a419e227e2a3ab9445d245200f6b2d38a25d8cb2208c0
+  data.tar.gz: 56a7a8be8c4e01941baf2dd8c03395debab36e5311ca4e92b4c704d73945a5176f1629a7937b08636de570cf9ef5c7cfcadb830232fb62f32b67b69aacec38cd

data/.travis.yml

@@ -41,7 +41,7 @@ rvm:
   - jruby-1.7.23
   - jruby-9.0.4.0
   - 2.2.4
-  - 2.1.7
+  - 2.1.8
   - 2.0.0-p648
   - 1.9.3
   - 1.9.2
@@ -54,7 +54,7 @@ env:
     - CI_BUNDLE_PATH=/home/travis/bundle
     - BUNDLE_PATH=/home/travis/bundle
     - MONGODB=2.6.11
-    - JAVA_OPTS="-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
+    - JAVA_OPTS="-XX:+TieredCompilation -XX:TieredStopAtLevel=1 -Xmx512m"
     - JRUBY_OPTS="-Xcompile.invokedynamic=false -J-Djruby.compile.mode=OFF"
     - RBXOPT="-Xcompiler.no_rbc -Xint"
     - SERIALIZE=1
@@ -70,6 +70,7 @@ env:
     - TYPE=UNIT ENVIRONMENT=rails40
     - TYPE=UNIT ENVIRONMENT=rails41
     - TYPE=UNIT ENVIRONMENT=rails42
+    - TYPE=UNIT ENVIRONMENT=rails50
     - TYPE=UNIT ENVIRONMENT=norails
     - TYPE=FUNCTIONAL GROUP=agent
     - TYPE=FUNCTIONAL GROUP=api
@@ -100,12 +101,14 @@ matrix:
       env: TYPE=UNIT ENVIRONMENT=rails23
 
     # 2.1
-    - rvm: 2.1.7
+    - rvm: 2.1.8
       env: TYPE=UNIT ENVIRONMENT=rails21
-    - rvm: 2.1.7
+    - rvm: 2.1.8
       env: TYPE=UNIT ENVIRONMENT=rails22
-    - rvm: 2.1.7
+    - rvm: 2.1.8
       env: TYPE=UNIT ENVIRONMENT=rails23
+    - rvm: 2.1.8
+      env: TYPE=UNIT ENVIRONMENT=rails50
 
     # 2.0
     - rvm: 2.0.0-p648
@@ -114,18 +117,24 @@ matrix:
       env: TYPE=UNIT ENVIRONMENT=rails22
     - rvm: 2.0.0-p648
       env: TYPE=UNIT ENVIRONMENT=rails23
+    - 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
@@ -134,6 +143,8 @@ matrix:
       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
@@ -142,6 +153,8 @@ matrix:
       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
@@ -150,6 +163,8 @@ matrix:
       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.0.4.0
@@ -178,4 +193,3 @@ matrix:
       env: TYPE=UNIT ENVIRONMENT=rails31
     - rvm: rbx-2.5.8
       env: TYPE=UNIT ENVIRONMENT=rails32
-

data/CHANGELOG

@@ -1,5 +1,36 @@
 # New Relic Ruby Agent Release Notes #
 
+## v3.15.0 ##
+
+  * Rails 5 support
+
+  This release includes experimental support for Rails 5 as of 5.0.0.beta2.
+  Please note that this release does not include any support for ActionCable,
+  the WebSockets framework new to Rails 5.
+
+  * Don't include extension from single format Grape API transaction names
+
+  Starting with Grape 0.12.0, an API with a single format no longer declares
+  methods with `.:format`, but with an extension such as `.json`. Thanks Daniel
+  Doubrovkine for the contribution!
+
+  * Fix warnings about shadowing outer local variable when running tests
+
+  Thanks Rafael Almeida de Carvalho for the contribution!
+
+  * Check config first for Rails middleware instrumentation installation
+
+  Checking the config first avoids issues with mock classes that don't implement
+  `VERSION`. Thanks Jesse Sanford for the contribution!
+
+  * Remove a trailing whitespace in the template for generated newrelic.yml
+
+  Thanks Paul Menzel for the contribution!
+
+  * Reference external resources in comments and readme with HTTPS
+
+  Thanks Benjamin Quorning for the contribution!
+
 ## v3.14.3 ##
 
   * Don't inadvertently send sensitive information from DataMapper SQLErrors

data/README.md

@@ -5,7 +5,7 @@ New Relic, Inc (http://www.newrelic.com).  It provides you with deep
 information about the performance of your Rails or Ruby
 application as it runs in production. The New Relic Ruby Agent is
 dual-purposed as a either a Gem or a Rails plugin, hosted on
-[github](http://github.com/newrelic/rpm/tree/master).
+[github](https://github.com/newrelic/rpm/tree/master).
 
 The New Relic Ruby Agent runs in one of two modes:
 

data/lib/new_relic/agent/configuration/default_source.rb

@@ -89,6 +89,8 @@ module NewRelic
                 :rails3
               when 4
                 :rails4
+              when 5
+                :rails5
               else
                 ::NewRelic::Agent.logger.error "Detected unsupported Rails version #{Rails::VERSION::STRING}"
               end
@@ -1413,118 +1415,118 @@ module NewRelic
         },
         :'attributes.enabled' => {
           :default     => true,
-          :public      => false,
+          :public      => true,
           :type        => Boolean,
           :allowed_from_server => false,
           :description => 'If <code>true</code>, enables capture of attributes for all destinations.'
         },
         :'transaction_tracer.attributes.enabled' => {
           :default     => value_of(:'transaction_tracer.capture_attributes'),
-          :public      => false,
+          :public      => true,
           :type        => Boolean,
           :allowed_from_server => false,
-          :description => 'Enable or disable capture of attributes for transaction traces.'
+          :description => 'If <code>true</code>, the agent captures attributes from transaction traces.'
         },
         :'transaction_events.attributes.enabled' => {
           :default     => value_of(:'analytics_events.capture_attributes'),
-          :public      => false,
+          :public      => true,
           :type        => Boolean,
           :allowed_from_server => false,
-          :description => 'Enable or disable capture of attributes for transaction events.'
+          :description => 'If <code>true</code>, the agent captures attributes from transaction events.'
         },
         :'error_collector.attributes.enabled' => {
           :default     => value_of(:'error_collector.capture_attributes'),
-          :public      => false,
+          :public      => true,
           :type        => Boolean,
           :allowed_from_server => false,
-          :description => 'Enable or disable capture of attributes for error collection.'
+          :description => 'If <code>true</code>, the agent captures attributes from error collection.'
         },
         :'browser_monitoring.attributes.enabled' => {
           :default     => value_of(:'browser_monitoring.capture_attributes'),
-          :public      => false,
+          :public      => true,
           :type        => Boolean,
           :allowed_from_server => false,
-          :description => 'Enable or disable capture of attributes for browser monitoring.'
+          :description => 'If <code>true</code>, the agent captures attributes from browser monitoring.'
         },
         :'attributes.exclude' => {
           :default     => [],
-          :public      => false,
+          :public      => true,
           :type        => Array,
           :allowed_from_server => false,
           :transform   => DefaultSource.method(:convert_to_list),
-          :description => 'Prefix of attributes to exclude from all destinations. Allows * as wildcard at end.'
+          :description => 'Prefix of attributes to exclude from all destinations. Allows <code>*</code> as wildcard at end.'
         },
         :'transaction_tracer.attributes.exclude' => {
           :default     => [],
-          :public      => false,
+          :public      => true,
           :type        => Array,
           :allowed_from_server => false,
           :transform   => DefaultSource.method(:convert_to_list),
-          :description => 'Prefix of attributes to exclude from transaction traces. Allows * as wildcard at end.'
+          :description => 'Prefix of attributes to exclude from transaction traces. Allows <code>*</code> as wildcard at end.'
         },
         :'transaction_events.attributes.exclude' => {
           :default     => [],
-          :public      => false,
+          :public      => true,
           :type        => Array,
           :allowed_from_server => false,
           :transform    => DefaultSource.method(:convert_to_list),
-          :description => 'Prefix of attributes to exclude from transaction events. Allows * as wildcard at end.'
+          :description => 'Prefix of attributes to exclude from transaction events. Allows <code>*</code> as wildcard at end.'
         },
         :'error_collector.attributes.exclude' => {
           :default     => [],
-          :public      => false,
+          :public      => true,
           :type        => Array,
           :allowed_from_server => false,
           :transform    => DefaultSource.method(:convert_to_list),
-          :description => 'Prefix of attributes to exclude from error collection. Allows * as wildcard at end.'
+          :description => 'Prefix of attributes to exclude from error collection. Allows <code>*</code> as wildcard at end.'
         },
         :'browser_monitoring.attributes.exclude' => {
           :default     => [],
-          :public      => false,
+          :public      => true,
           :type        => Array,
           :allowed_from_server => false,
           :transform    => DefaultSource.method(:convert_to_list),
-          :description => 'Prefix of attributes to exclude from browser monitoring. Allows * as wildcard at end.'
+          :description => 'Prefix of attributes to exclude from browser monitoring. Allows <code>*</code> as wildcard at end.'
         },
         :'attributes.include' => {
           :default     => [],
-          :public      => false,
+          :public      => true,
           :type        => Array,
           :allowed_from_server => false,
           :transform    => DefaultSource.method(:convert_to_list),
-          :description => 'Prefix of attributes to include in all destinations. Allows * as wildcard at end.'
+          :description => 'Prefix of attributes to include in all destinations. Allows <code>*</code> as wildcard at end.'
         },
         :'transaction_tracer.attributes.include' => {
           :default     => [],
-          :public      => false,
+          :public      => true,
           :type        => Array,
           :allowed_from_server => false,
           :transform    => DefaultSource.method(:convert_to_list),
-          :description => 'Prefix of attributes to include in transaction traces. Allows * as wildcard at end.'
+          :description => 'Prefix of attributes to include in transaction traces. Allows <code>*</code> as wildcard at end.'
         },
         :'transaction_events.attributes.include' => {
           :default     => [],
-          :public      => false,
+          :public      => true,
           :type        => Array,
           :allowed_from_server => false,
           :transform    => DefaultSource.method(:convert_to_list),
-          :description => 'Prefix of attributes to include in transaction events. Allows * as wildcard at end.'
+          :description => 'Prefix of attributes to include in transaction events. Allows <code>*</code> as wildcard at end.'
         },
         :'error_collector.attributes.include' => {
           :default     => [],
-          :public      => false,
+          :public      => true,
           :type        => Array,
           :allowed_from_server => false,
           :transform    => DefaultSource.method(:convert_to_list),
-          :description => 'Prefix of attributes to include in error collection. Allows * as wildcard at end.'
+          :description => 'Prefix of attributes to include in error collection. Allows <code>*</code> as wildcard at end.'
         },
         :'browser_monitoring.attributes.include' => {
           :default     => [],
-          :public      => false,
+          :public      => true,
           :type        => Array,
           :allowed_from_server => false,
           :transform    => DefaultSource.method(:convert_to_list),
-          :description => 'Prefix of attributes to include in browser monitoring. Allows * as wildcard at end.'
+          :description => 'Prefix of attributes to include in browser monitoring. Allows <code>*</code> as wildcard at end.'
         },
         :'utilization.detect_aws' => {
           :default     => true,

data/lib/new_relic/agent/database/obfuscation_helpers.rb

@@ -41,7 +41,7 @@ module NewRelic
         CLEANUP_REGEX = {
           :mysql => /'|"|\/\*|\*\//,
           :postgres => /'|\/\*|\*\/|\$(?!\?)/,
-          :sqlite => /'|\/\*|\*\/|\$/,
+          :sqlite => /'|\/\*|\*\//,
           :cassandra => /'|\/\*|\*\//,
           :oracle => /'|\/\*|\*\//
         }

data/lib/new_relic/agent/instrumentation/active_job.rb

@@ -75,7 +75,13 @@ module NewRelic
         end
 
         def self.adapter
-          clean_adapter_name(::ActiveJob::Base.queue_adapter.name)
+          adapter_class = if ::ActiveJob::Base.queue_adapter.class == Class
+            ::ActiveJob::Base.queue_adapter
+          else
+            ::ActiveJob::Base.queue_adapter.class
+          end
+
+          clean_adapter_name(adapter_class.name)
         end
 
         ADAPTER_REGEX = /ActiveJob::QueueAdapters::(.*)Adapter/

data/lib/new_relic/agent/instrumentation/active_record_4.rb

@@ -18,7 +18,7 @@ DependencyDetection.defer do
   end
 
   executes do
-    ::NewRelic::Agent.logger.info 'Installing ActiveRecord 4 instrumentation'
+    ::NewRelic::Agent.logger.info 'Installing ActiveRecord 4+ instrumentation'
   end
 
   executes do

data/lib/new_relic/agent/instrumentation/data_mapper.rb

@@ -109,7 +109,7 @@ module NewRelic
       end
 
       DATA_MAPPER = "DataMapper".freeze
-      PASSWORD_REGEX = /&password=.*?&/
+      PASSWORD_REGEX = /&password=.*?(&|$)/
       AMPERSAND = '&'.freeze
       PASSWORD_PARAM = '&password='.freeze
 

data/lib/new_relic/agent/instrumentation/grape.rb

@@ -11,7 +11,7 @@ module NewRelic
         extend self
 
         API_ENDPOINT   = 'api.endpoint'.freeze
-        FORMAT_REGEX   = /\(\/?\.:format\)/.freeze
+        FORMAT_REGEX   = /\(\/?\.[\:\w]*\)/.freeze # either :format (< 0.12.0) or .ext (>= 0.12.0)
         VERSION_REGEX  = /:version(\/|$)/.freeze
         EMPTY_STRING   = ''.freeze
         MIN_VERSION    = VersionNumber.new("0.2.0")

data/lib/new_relic/agent/instrumentation/memcache.rb

@@ -7,7 +7,7 @@
 # See:
 #     http://www.deveiate.org/code/Ruby-MemCache/ (Gem: Ruby-MemCache)
 #     http://seattlerb.rubyforge.org/memcache-client/ (Gem: memcache-client)
-#     http://github.com/mperham/dalli (Gem: dalli)
+#     https://github.com/mperham/dalli (Gem: dalli)
 
 require 'new_relic/agent/datastores/metric_helper'
 

data/lib/new_relic/agent/instrumentation/rails5/action_controller.rb

@@ -0,0 +1,29 @@
+# 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/agent/instrumentation/action_controller_subscriber'
+
+
+DependencyDetection.defer do
+  @name = :rails5_controller
+
+  depends_on do
+    defined?(::Rails) && ::Rails::VERSION::MAJOR.to_i == 5
+  end
+
+  depends_on do
+    defined?(ActionController) && defined?(ActionController::Base)
+  end
+
+  executes do
+    ::NewRelic::Agent.logger.info 'Installing Rails 5 Controller instrumentation'
+  end
+
+  executes do
+    class ActionController::Base
+      include NewRelic::Agent::Instrumentation::ControllerInstrumentation
+    end
+    NewRelic::Agent::Instrumentation::ActionControllerSubscriber \
+      .subscribe(/^process_action.action_controller$/)
+  end
+end

data/lib/new_relic/agent/instrumentation/rails5/action_view.rb

@@ -0,0 +1,25 @@
+# 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/agent/instrumentation/action_view_subscriber'
+
+DependencyDetection.defer do
+  @name = :rails5_view
+
+  depends_on do
+    defined?(::Rails) && ::Rails::VERSION::MAJOR.to_i == 5
+  end
+
+  depends_on do
+    !NewRelic::Agent.config[:disable_view_instrumentation] &&
+      !NewRelic::Agent::Instrumentation::ActionViewSubscriber.subscribed?
+  end
+
+  executes do
+    ::NewRelic::Agent.logger.info 'Installing Rails 5 view instrumentation'
+  end
+
+  executes do
+    NewRelic::Agent::Instrumentation::ActionViewSubscriber.subscribe(/render_.+\.action_view$/)
+  end
+end

data/lib/new_relic/agent/instrumentation/rails_middleware.rb

@@ -8,11 +8,11 @@ DependencyDetection.defer do
   named :rails_middleware
 
   depends_on do
-    defined?(::Rails) && ::Rails::VERSION::MAJOR.to_i >= 3
+    !::NewRelic::Agent.config[:disable_middleware_instrumentation]
   end
 
   depends_on do
-    !::NewRelic::Agent.config[:disable_middleware_instrumentation]
+    defined?(::Rails) && ::Rails::VERSION::MAJOR.to_i >= 3
   end
 
   executes do