newrelic_rpm 4.0.0.332 → 4.1.0.333

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f033acf8bf5efe89fd548f55aba3e3b7b9c58e2
-  data.tar.gz: 0e523aeaaca318f6bf863c4f7b9269d4b212f63a
+  metadata.gz: b3d8215fa6708cb77746b4bb7042b19ce62c863b
+  data.tar.gz: 817f76b9f47cc4d993b919ba6b25d27874635ab3
 SHA512:
-  metadata.gz: 9b18921ad5e63244778c06a6d45fcf7fa556a19cac8eb61f58cdfce341033ea87c9e9c3eb1832c8c5c3dd4ce9ad30030340497772c5a1144bfd408b2be0dfd0e
-  data.tar.gz: 809cc815755c0d2be8555ac9e8bec2d057a849617e196e62644131588d7c8a697f19f1e91a1f73f0c4ace692efbd1d7ece2ce7996548a2f1828c7cd56b0649a9
+  metadata.gz: 207d7d3c3bf702d48da4caa3e45f9414914fcad1aa5ba1dee9e1f3e8c72dff1b893e5d117ef54add04eb6e6ee05aeef7012ba242322910902a970c2e2c13b1e9
+  data.tar.gz: 359c0dcdeda0ba4380df1715e116753dc54e4249cf38c72f85c9b57dde3102e5fd5432e1a71c9a209561c42927c7fa2fc7d776e6e575be7f6f59745c4689866b

data/.yardopts

@@ -10,7 +10,6 @@ lib/new_relic/agent/datastores.rb
 lib/new_relic/agent/sql_sampler.rb
 lib/new_relic/agent/transaction.rb
 lib/new_relic/agent/transaction_sampler.rb
-lib/new_relic/rack/developer_mode.rb
 lib/new_relic/rack/agent_hooks.rb
 lib/new_relic/rack/browser_monitoring.rb
 lib/new_relic/rack/error_collector.rb

data/CHANGELOG.md

@@ -1,5 +1,27 @@
 # New Relic Ruby Agent Release Notes #
 
+## v4.1.0 ##
+
+  * Developer Mode removed
+
+  The Ruby Agent's Developer Mode, which provided a very limited view of your
+  application performance data, has been removed. For more information, check
+  out our [community forum](https://discuss.newrelic.com/t/feedback-on-the-ruby-agent-s-developer-mode/46957).
+
+  * Support NEW_RELIC_ENV for Rails apps
+
+  Previously, users could set the agent environment with NEW_RELIC_ENV only
+  for non-Rails apps. For Rails app, the agent environment would use whatever
+  the Rails environment was set to. Now, NEW_RELIC_ENV can also be used for
+  Rails apps, so that it is possible to have an agent environment that is
+  different from the Rails environment. Thanks Andrea Campolonghi for the
+  contribution, as well as Steve Schwartz for also looking into this issue!
+
+  * Normalization of external hostnames
+
+  Hostnames from URIs used in external HTTP requests are now always downcased
+  to prevent duplicate metrics when only case is different.
+
 ## v4.0.0 ##
 
   * Require Ruby 2.0.0+

data/LICENSE

@@ -1,30 +1,4 @@
-This product includes jquery 1.4.2, written by John Resig
-and distributed under an MIT license.
-See https://github.com/jquery/jquery/blob/1.4.2/MIT-LICENSE.txt
-
-    Copyright (c) 2010 John Resig, http://jquery.com/
-
-    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.
-
-
-All other components of this product are
+All components of this product are
 Copyright (c) 2008-2017 New Relic, Inc.  All rights reserved.
 
 Certain inventions disclosed in this file may be claimed within

data/README.md

@@ -3,21 +3,10 @@
 New Relic is a performance management system, developed by
 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](https://github.com/newrelic/rpm/tree/master).
-
-The New Relic Ruby Agent runs in one of two modes:
-
-**Production Mode**
-Low overhead instrumentation that captures detailed information on
-your application running in production and transmits them to
-newrelic.com where you can monitor them in real time.
-
-**Developer Mode**
-A Rack middleware that maps `/newrelic` to an application for showing
-detailed performance metrics on a page by page basis.  Installed
-automatically in Rails applications.
+application as it runs in production and transmits them to
+newrelic.com where you can monitor them in real time. The New Relic
+Ruby Agent is dual-purposed as a either a Gem or a Rails plugin,
+hosted on [github](https://github.com/newrelic/rpm/tree/master).
 
 ## Supported Environments
 
@@ -90,9 +79,6 @@ Then make sure you set `RACK_ENV` to the environment corresponding to the
 configuration definitions in the newrelic.yml file; e.g., development,
 staging, production, etc.
 
-To use Developer Mode in Sinatra, add `NewRelic::Rack::DeveloperMode` to
-the middleware stack.  See the `config.ru` sample below.
-
 #### Other Environments
 
 You can use the Ruby Agent to monitor any Ruby application. Add:
@@ -118,45 +104,6 @@ frameworks.  You can find a list of community created intrumentation plugins
 (e.g. [newrelic-redis](https://github.com/evanphx/newrelic-redis)) in the
 [extends_newrelic_rpm project](https://github.com/newrelic/extends_newrelic_rpm).
 
-## Developer Mode
-
-When running the Developer Mode, the Ruby Agent will track the
-performance of every HTTP request serviced by your application, and
-store in memory this information for the last 100 HTTP transactions.
-
-To view this performance information, including detailed SQL statement
-analysis, open `/newrelic` in your web application.  For instance if
-you are running mongrel or thin on port 3000, enter the following into
-your browser:
-
-    http://localhost:3000/newrelic
-
-Developer Mode is only initialized if the `developer_mode` setting in
-the newrelic.yml file is set to true.  By default, it is turned off in
-all environments but `development`.
-
-#### Developer Mode in Rails
-
-Developer Mode is available automatically in Rails Applications based
-on Rails 2.3 and later.  No additional configuration is required. When
-your application starts and `developer_mode` is enabled, the Ruby
-Agent injects a middleware into your Rails middleware stack.
-
-For earlier versions of Rails that support Rack, you can use
-a `config.ru` as below.
-
-#### Developer Mode in Rack Applications
-
-Developer Mode is available for any Rack based application such as
-Sinatra by installing the NewRelic::Rack::DeveloperMode
-middleware. This middleware passes all requests that do not start with
-/newrelic.
-
-Here's an example entry for Developer Mode in a `config.ru` file:
-
-    require 'new_relic/rack/developer_mode'
-    use NewRelic::Rack::DeveloperMode
-
 ## Production Mode
 
 When your application runs in the production environment, the New

data/lib/new_relic/agent.rb

@@ -29,7 +29,6 @@ module NewRelic
     require 'new_relic/metrics'
     require 'new_relic/metric_spec'
     require 'new_relic/metric_data'
-    require 'new_relic/collection_helper'
     require 'new_relic/noticed_error'
 
     require 'new_relic/agent/encoding_normalizer'

data/lib/new_relic/agent/attribute_filter.rb

@@ -68,7 +68,6 @@ module NewRelic
       DST_TRANSACTION_TRACER = 1 << 1
       DST_ERROR_COLLECTOR    = 1 << 2
       DST_BROWSER_MONITORING = 1 << 3
-      DST_DEVELOPER_MODE     = 1 << 4
 
       DST_ALL = 0xF
 

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

@@ -108,7 +108,7 @@ module NewRelic
         def self.agent_enabled
           Proc.new {
             NewRelic::Agent.config[:enabled] &&
-            (NewRelic::Agent.config[:developer_mode] || NewRelic::Agent.config[:monitor_mode]) &&
+            (NewRelic::Agent.config[:test_mode] || NewRelic::Agent.config[:monitor_mode]) &&
             NewRelic::Agent::Autostart.agent_should_start?
           }
         end
@@ -278,19 +278,12 @@ module NewRelic
           :allowed_from_server => false,
           :description => 'When <code>true</code>, the agent transmits data about your app to the New Relic <a href="https://docs.newrelic.com/docs/apm/new-relic-apm/getting-started/glossary#collector">collector</a>.'
         },
-        :developer_mode => {
-          :default => value_of(:developer),
-          :public => true,
-          :type => Boolean,
-          :allowed_from_server => false,
-          :description => 'When <code>true</code>, enables developer mode, a local analytics package built into the agent for rack applications. Access developer mode analytics by visiting <b>/newrelic</b> in your application.'
-        },
-        :developer => {
+        :test_mode => {
           :default => false,
           :public => false,
           :type => Boolean,
           :allowed_from_server => false,
-          :description => 'Alternative method of enabling developer_mode.'
+          :description => 'Used in tests for agent to start up but not connect to collector. Formerly used <code>developer_mode</code> in test config for this purpose.'
         },
         :log_level => {
           :default => 'info',
@@ -433,13 +426,6 @@ module NewRelic
           :allowed_from_server => false,
           :description => 'Timeout for waiting on connect to complete before a rake task'
         },
-        :'profiling.available' => {
-          :default => DefaultSource.profiling_available,
-          :public => false,
-          :type => Boolean,
-          :allowed_from_server => false,
-          :description => 'Determines if ruby-prof is available for developer mode profiling.'
-        },
         :apdex_t => {
           :default => 0.5,
           :public => true,
@@ -669,13 +655,6 @@ module NewRelic
           :allowed_from_server => false,
           :description => 'If <code>true</code>, disables view instrumentation.'
         },
-        :disable_backtrace_cleanup => {
-          :default => false,
-          :public => true,
-          :type => Boolean,
-          :allowed_from_server => false,
-          :description => 'If <code>true</code>, the agent won\'t remove <code>newrelic_rpm</code> from backtraces.'
-        },
         :disable_harvest_thread => {
           :default => false,
           :public => false,
@@ -1315,14 +1294,6 @@ module NewRelic
           :allowed_from_server => false,
           :description  => 'If <code>true</code>, prevents the agent from hooking into Puma::Rack::URLMap to install middleware tracing.'
         },
-        :disable_rubyprof => {
-          :default      => false,
-          :public       => true,
-          :type         => Boolean,
-          :dynamic_name => true,
-          :allowed_from_server => false,
-          :description  => 'If <code>true</code>, the agent won\'t use RubyProf in developer mode.'
-        },
         :disable_typhoeus => {
           :default      => false,
           :public       => true,

data/lib/new_relic/agent/error_collector.rb

@@ -9,8 +9,6 @@ module NewRelic
     # This class collects errors from the parent application, storing
     # them until they are harvested and transmitted to the server
     class ErrorCollector
-      include NewRelic::CollectionHelper
-
       # Maximum possible length of the queue - defaults to 20, may be
       # made configurable in the future. This is a tradeoff between
       # memory and data retention

data/lib/new_relic/agent/http_clients/curb_wrappers.rb

@@ -40,7 +40,7 @@ module NewRelic
         end
 
         def uri
-          @uri ||= NewRelic::Agent::HTTPClients::URIUtil.parse_url(@curlobj.url)
+          @uri ||= NewRelic::Agent::HTTPClients::URIUtil.parse_and_normalize_url(@curlobj.url)
         end
       end
 

data/lib/new_relic/agent/http_clients/typhoeus_wrappers.rb

@@ -40,7 +40,7 @@ module NewRelic
           @request = request
           @uri = case request.url
             when ::URI then request.url
-            else NewRelic::Agent::HTTPClients::URIUtil.parse_url(request.url)
+            else NewRelic::Agent::HTTPClients::URIUtil.parse_and_normalize_url(request.url)
             end
         end
 

data/lib/new_relic/agent/http_clients/uri_util.rb

@@ -26,14 +26,19 @@ module NewRelic
         # There are valid URI strings that some HTTP client libraries will
         # accept that the stdlib URI module doesn't handle. If we find that
         # Addressable is around, use that to normalize out our URL's.
-        def self.parse_url(url)
-          if defined?(::Addressable::URI)
-            address = ::Addressable::URI.parse(url)
-            address.normalize!
-            URI.parse(address.to_s)
-          else
-            URI.parse(url)
+        def self.parse_and_normalize_url(url)
+          uri = url
+          unless ::URI === uri
+            if defined?(::Addressable::URI)
+              address = ::Addressable::URI.parse(url)
+              address.normalize!
+              uri = ::URI.parse(address.to_s)
+            else
+              uri = ::URI.parse(url)
+            end
           end
+          uri.host.downcase!
+          uri
         end
 
         QUESTION_MARK = "?".freeze

data/lib/new_relic/agent/stats.rb

@@ -141,19 +141,5 @@ module NewRelic
         (other.min_call_time < min_call_time && other.call_count > 0) || call_count == 0
       end
     end
-
-    class ChainedStats
-      attr_accessor :scoped_stats, :unscoped_stats
-
-      def initialize(scoped_stats, unscoped_stats)
-        @scoped_stats = scoped_stats
-        @unscoped_stats = unscoped_stats
-      end
-
-      def method_missing(method, *args)
-        unscoped_stats.send(method, *args)
-        scoped_stats.send(method, *args)
-      end
-    end
   end
 end

data/lib/new_relic/agent/stats_engine.rb

@@ -2,16 +2,14 @@
 # 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/stats_engine/metric_stats'
 require 'new_relic/agent/stats_engine/gc_profiler'
 require 'new_relic/agent/stats_engine/stats_hash'
+require 'new_relic/language_support'
 
 module NewRelic
   module Agent
     # This class handles all the statistics gathering for the agent
     class StatsEngine
-      include MetricStats
-
       attr_accessor :metric_rules
 
       def initialize
@@ -25,6 +23,176 @@ module NewRelic
       def with_stats_lock
         @stats_lock.synchronize { yield }
       end
+
+      # Update the unscoped metrics given in metric_names.
+      # metric_names may be either a single name, or an array of names.
+      #
+      # This is an internal method, subject to change at any time. Client apps
+      # and gems should use the public API (NewRelic::Agent.record_metric)
+      # instead.
+      #
+      # There are four ways to use this method:
+      #
+      # 1. With a numeric value, it will update the Stats objects associated
+      #    with the given metrics by calling record_data_point(value, aux).
+      #    aux will be treated in this case as the exclusive time associated
+      #    with the call being recorded.
+      #
+      # 2. With a value of :apdex_s, :apdex_t, or :apdex_f, it will treat the
+      #    associated stats as an Apdex metric, updating it to reflect the
+      #    occurrence of a transaction falling into the given category.
+      #    The aux value in this case should be the apdex threshold used in
+      #    bucketing the request.
+      #
+      # 3. If a block is given, value and aux will be ignored, and instead the
+      #    Stats object associated with each named unscoped metric will be
+      #    yielded to the block for customized update logic.
+      #
+      # 4. If value is a Stats instance, it will be merged into the Stats
+      #    associated with each named unscoped metric.
+      #
+      # If this method is called during a transaction, the metrics will be
+      # attached to the Transaction, and not merged into the global set until
+      # the end of the transaction.
+      #
+      # Otherwise, the metrics will be recorded directly into the global set
+      # of metrics, under a lock.
+      #
+      # @api private
+      #
+      def tl_record_unscoped_metrics(metric_names, value=nil, aux=nil, &blk)
+        state = NewRelic::Agent::TransactionState.tl_get
+        record_unscoped_metrics(state, metric_names, value, aux, &blk)
+      end
+
+      def record_unscoped_metrics(state, metric_names, value=nil, aux=nil, &blk)
+        txn = state.current_transaction
+        if txn
+          txn.metrics.record_unscoped(metric_names, value, aux, &blk)
+        else
+          specs = coerce_to_metric_spec_array(metric_names, nil)
+          with_stats_lock do
+            @stats_hash.record(specs, value, aux, &blk)
+          end
+        end
+      end
+
+      # Like tl_record_unscoped_metrics, but records a scoped metric as well.
+      #
+      # This is an internal method, subject to change at any time. Client apps
+      # and gems should use the public API (NewRelic::Agent.record_metric)
+      # instead.
+      #
+      # The given scoped_metric will be recoded as both a scoped *and* an
+      # unscoped metric. The summary_metrics will be recorded as unscoped
+      # metrics only.
+      #
+      # If called during a transaction, all metrics will be attached to the
+      # Transaction, and not merged into the global set of metrics until the
+      # end of the transaction.
+      #
+      # If called outside of a transaction, only the *unscoped* metrics will
+      # be recorded, directly into the global set of metrics (under a lock).
+      #
+      # @api private
+      #
+      def tl_record_scoped_and_unscoped_metrics(scoped_metric, summary_metrics=nil, value=nil, aux=nil, &blk)
+        state = NewRelic::Agent::TransactionState.tl_get
+        record_scoped_and_unscoped_metrics(state, scoped_metric, summary_metrics, value, aux, &blk)
+      end
+
+      def record_scoped_and_unscoped_metrics(state, scoped_metric, summary_metrics=nil, value=nil, aux=nil, &blk)
+        txn = state.current_transaction
+        if txn
+          txn.metrics.record_scoped_and_unscoped(scoped_metric, value, aux, &blk)
+          if summary_metrics
+            txn.metrics.record_unscoped(summary_metrics, value, aux, &blk)
+          end
+        else
+          specs = coerce_to_metric_spec_array(scoped_metric, nil)
+          if summary_metrics
+            specs.concat(coerce_to_metric_spec_array(summary_metrics, nil))
+          end
+          with_stats_lock do
+            @stats_hash.record(specs, value, aux, &blk)
+          end
+        end
+      end
+
+      # Helper for recording a straight value into the count
+      def tl_record_supportability_metric_count(metric, value)
+        real_name = "Supportability/#{metric}"
+        tl_record_unscoped_metrics(real_name) do |stat|
+          stat.call_count = value
+        end
+      end
+
+      def reset!
+        with_stats_lock do
+          old = @stats_hash
+          @stats_hash = StatsHash.new
+          old
+        end
+      end
+
+      # merge data from previous harvests into this stats engine
+      def merge!(other_stats_hash)
+        with_stats_lock do
+          @stats_hash.merge!(other_stats_hash)
+          @stats_hash
+        end
+      end
+
+      def merge_transaction_metrics!(txn_metrics, scope)
+        with_stats_lock do
+          @stats_hash.merge_transaction_metrics!(txn_metrics, scope)
+        end
+      end
+
+      def harvest!
+        now = Time.now
+        snapshot = reset!
+        snapshot = apply_rules_to_metric_data(@metric_rules, snapshot)
+        snapshot.harvested_at = now
+        snapshot
+      end
+
+      def apply_rules_to_metric_data(rules_engine, stats_hash)
+        renamed_stats = NewRelic::Agent::StatsHash.new(stats_hash.started_at)
+        stats_hash.each do |spec, stats|
+          new_name = rules_engine.rename(spec.name)
+          unless new_name.nil?
+            new_spec = NewRelic::MetricSpec.new(new_name, spec.scope)
+            renamed_stats[new_spec].merge!(stats)
+          end
+        end
+        renamed_stats
+      end
+
+      def coerce_to_metric_spec_array(metric_names_or_specs, scope)
+        specs = []
+        Array(metric_names_or_specs).map do |name_or_spec|
+          case name_or_spec
+          when String
+            specs << NewRelic::MetricSpec.new(name_or_spec)
+            specs << NewRelic::MetricSpec.new(name_or_spec, scope) if scope
+          when NewRelic::MetricSpec
+            specs << name_or_spec
+          end
+        end
+        specs
+      end
+
+      # For use by test code only.
+      def clear_stats
+        reset!
+        NewRelic::Agent::BusyCalculator.reset
+      end
+
+      # For use by test code only.
+      def to_h
+        with_stats_lock { @stats_hash.to_h }
+      end
     end
   end
 end