newrelic_rpm 4.0.0.332 → 4.1.0.333

data/lib/new_relic/agent/supported_versions.rb

@@ -11,22 +11,22 @@ module NewRelic
       {
         :type        => :ruby,
         :name        => "MRI",
-        :supported   => ["2.0.0", "~> 2.1.0", "~> 2.2.0", "~> 2.3.0", "~> 2.4.0"],
+        :supported   => ["2.0.0", "~>2.1.0", "~>2.2.0", "~>2.3.0", "~>2.4.0"],
         :deprecated  => ["1.8.6", "1.8.7", "1.9.2", "1.9.3"],
         :url         => "https://www.ruby-lang.org",
         :feed        => "https://www.ruby-lang.org/en/feeds/news.rss",
-        :notes       => ["Last supported agent for 1.8.7, 1.9.2, and 1.9.3 was 3.18.0.329.",
+        :notes       => ["Last supported agent for 1.8.7, 1.9.2, and 1.9.3 was 3.18.1.330.",
                          "Last supported agent on 1.8.6 was 3.6.8.168."]
       },
       :jruby =>
       {
         :type        => :ruby,
         :name        => "JRuby",
-        :supported   => ["~> 9.0", "~> 9.1"],
-        :deprecated  => ["~> 1.7.0"],
+        :supported   => ["~>9.0", "~>9.1"],
+        :deprecated  => ["~>1.7.0"],
         :url         => "http://jruby.org",
         :feed        => "http://jruby.org/atom.xml",
-        :notes       => ["Last supported agent for ~> 1.7.0 was 3.18.0.329."]
+        :notes       => ["Last supported agent for ~>1.7.0 was 3.18.1.330."]
       },
 
       # App servers
@@ -78,11 +78,11 @@ module NewRelic
       :rails =>
       {
         :type        => :web,
-        :supported   => ["~3.0.0", "~>3.1.0", "~>3.2.0", "~>4.0.0", "~>4.1.0", "~>4.2.0", "~> 5.0.0"],
+        :supported   => ["~3.0.0", "~>3.1.0", "~>3.2.0", "~>4.0.0", "~>4.1.0", "~>4.2.0", "~>5.0.0"],
         :deprecated  => ["~>2.0.0", "~>2.1.0", "~>2.2.0", "~>2.3.0"],
         :url         => "https://rubygems.org/gems/rails",
         :feed        => "https://rubygems.org/gems/rails/versions.atom",
-        :notes       => ["Last supported agent for ~>2.1.0, ~>2.2.0, and ~>2.3.0 was 3.18.0.329.",
+        :notes       => ["Last supported agent for ~>2.1.0, ~>2.2.0, and ~>2.3.0 was 3.18.1.330.",
                          "Last supported agent for 2.0.x was 3.6.8.168."]
       },
       :sinatra =>
@@ -149,7 +149,7 @@ module NewRelic
       :redis =>
       {
         :type        => :database,
-        :supported   => ["~> 3.0"],
+        :supported   => ["~>3.0"],
         :url         => "https://rubygems.org/gems/redis",
         :feed        => "https://rubygems.org/gems/redis/versions.atom"
       },
@@ -158,7 +158,7 @@ module NewRelic
       :rake =>
       {
         :type        => :background,
-        :supported   => ["~> 10.0"],
+        :supported   => ["~>10.0"],
         :url         => "https://rubygems.org/gems/rake",
         :feed        => "https://rubygems.org/gems/rake/versions.atom"
       },

data/lib/new_relic/agent/traced_method_stack.rb

@@ -86,7 +86,7 @@ module NewRelic
       end
 
       def sampler_enabled?
-        Agent.config[:'transaction_tracer.enabled'] || Agent.config[:developer_mode]
+        Agent.config[:'transaction_tracer.enabled']
       end
 
       def transaction_sampler

data/lib/new_relic/agent/transaction/attributes.rb

@@ -122,8 +122,6 @@ module NewRelic
           # Avoid allocating anything if there are no attrs at all
           return EMPTY_HASH if attributes.empty?
 
-          return attributes.dup if destination == NewRelic::Agent::AttributeFilter::DST_DEVELOPER_MODE
-
           attributes.inject({}) do |memo, (key, value)|
             if @filter.allows?(calculated_destinations[key], destination)
               memo[key] = value

data/lib/new_relic/agent/transaction/external_request_segment.rb

@@ -13,7 +13,7 @@ module NewRelic
 
         def initialize library, uri, procedure
           @library = library
-          @uri = normalize_uri uri
+          @uri = HTTPClients::URIUtil.parse_and_normalize_url(uri)
           @procedure = procedure
           @host_header = nil
           @app_data = nil
@@ -90,10 +90,6 @@ module NewRelic
           Agent.instance.transaction_sampler.add_node_parameters node_params
         end
 
-        def normalize_uri uri
-          uri.is_a?(URI) ? uri : HTTPClients::URIUtil.parse_url(uri)
-        end
-
         def process_host_header request
           if @host_header = request.host_from_header
             update_segment_name

data/lib/new_relic/agent/transaction/trace_node.rb

@@ -146,16 +146,6 @@ module NewRelic
           summary.current_nest_count -= 1 if summary
         end
 
-        # This is only for use by developer mode
-        def find_node(id)
-          return self if object_id == id
-          called_nodes.each do |node|
-            found = node.find_node(id)
-            return found if found
-          end
-          nil
-        end
-
         def explain_sql
           return params[:explain_plan] if params.key?(:explain_plan)
 

data/lib/new_relic/agent/transaction_sample_builder.rb

@@ -2,7 +2,6 @@
 # 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/collection_helper'
 require 'new_relic/agent/transaction'
 require 'new_relic/agent/transaction/trace'
 
@@ -44,8 +43,6 @@ module NewRelic
 
       attr_reader :current_node, :sample
 
-      include NewRelic::CollectionHelper
-
       def initialize(time=Time.now)
         @sample = NewRelic::Agent::Transaction::Trace.new(time.to_f)
         @sample_start = time.to_f

data/lib/new_relic/agent/transaction_sampler.rb

@@ -3,7 +3,6 @@
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
 require 'new_relic/agent/transaction_sample_builder'
-require 'new_relic/agent/transaction/developer_mode_sample_buffer'
 require 'new_relic/agent/transaction/slowest_sample_buffer'
 require 'new_relic/agent/transaction/synthetics_sample_buffer'
 require 'new_relic/agent/transaction/xray_sample_buffer'
@@ -20,14 +19,12 @@ module NewRelic
     #
     # @api public
     class TransactionSampler
-      attr_reader :last_sample, :dev_mode_sample_buffer, :xray_sample_buffer
+      attr_reader :last_sample, :xray_sample_buffer
 
       def initialize
-        @dev_mode_sample_buffer = NewRelic::Agent::Transaction::DeveloperModeSampleBuffer.new
         @xray_sample_buffer = NewRelic::Agent::Transaction::XraySampleBuffer.new
 
         @sample_buffers = []
-        @sample_buffers << @dev_mode_sample_buffer
         @sample_buffers << @xray_sample_buffer
         @sample_buffers << NewRelic::Agent::Transaction::SlowestSampleBuffer.new
         @sample_buffers << NewRelic::Agent::Transaction::SyntheticsSampleBuffer.new
@@ -54,7 +51,7 @@ module NewRelic
       end
 
       def enabled?
-        Agent.config[:'transaction_tracer.enabled'] || Agent.config[:developer_mode]
+        Agent.config[:'transaction_tracer.enabled']
       end
 
       def on_start_transaction(state, start_time)
@@ -65,18 +62,11 @@ module NewRelic
 
       # This delegates to the builder to create a new open transaction node
       # for the frame, beginning at the optionally specified time.
-      #
-      # Note that in developer mode, this captures a stacktrace for
-      # the beginning of each node, which can be fairly slow
       def notice_push_frame(state, time=Time.now)
         builder = state.transaction_sample_builder
         return unless builder
 
-        node = builder.trace_entry(time.to_f)
-        if @dev_mode_sample_buffer
-          @dev_mode_sample_buffer.visit_node(node)
-        end
-        node
+        builder.trace_entry(time.to_f)
       end
 
       # Informs the transaction sample builder about the end of a traced frame

data/lib/new_relic/collection_helper.rb

@@ -31,24 +31,6 @@ module NewRelic
     end
   end
 
-  # Return an array of strings (backtrace), cleaned up for readability
-  # Return nil if there is no backtrace
-
-  def strip_nr_from_backtrace(backtrace)
-    if backtrace && !Agent.config[:disable_backtrace_cleanup]
-      # this is for 1.9.1, where strings no longer have Enumerable
-      backtrace = backtrace.split("\n") if String === backtrace
-      backtrace = backtrace.map(&:to_s)
-      backtrace = backtrace.reject do |line|
-        line.include?(NewRelic::Control.newrelic_root) or
-        line =~ /^newrelic_rpm\s/
-      end
-      # rename methods back to their original state
-      backtrace = backtrace.collect {|line| line.gsub(/_without_(newrelic|trace)/, "")}
-    end
-    backtrace
-  end
-
   private
 
   # Convert any kind of object to a short string.

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

@@ -12,7 +12,7 @@ module NewRelic
       class Rails < NewRelic::Control::Frameworks::Ruby
 
         def env
-          @env ||= RAILS_ENV.dup
+          @env ||= ( ENV['NEW_RELIC_ENV'] || RAILS_ENV.dup )
         end
 
         # Rails can return an empty string from this method, causing
@@ -58,7 +58,6 @@ module NewRelic
             # is running, if it thinks it's a rake task, or if the agent_enabled is false.
             ::NewRelic::Agent.logger.info("New Relic Agent not running.")
           else
-            install_developer_mode(rails_config) if Agent.config[:developer_mode]
             install_browser_monitoring(rails_config)
             install_agent_hooks(rails_config)
           end
@@ -95,25 +94,6 @@ module NewRelic
           end
         end
 
-        def install_developer_mode(rails_config)
-          return if defined?(@developer_mode_installed) && @developer_mode_installed
-          @developer_mode_installed = true
-          if rails_config && rails_config.respond_to?(:middleware)
-            begin
-              require 'new_relic/rack/developer_mode'
-              rails_config.middleware.use NewRelic::Rack::DeveloperMode
-              ::NewRelic::Agent.logger.info("New Relic Agent Developer Mode enabled.")
-              if env == "production"
-                ::NewRelic::Agent.logger.warn("***New Relic Developer Mode is not intended to be enabled in production environments! We highly recommend setting developer_mode: false for the production environment in your newrelic.yml.")
-              end
-            rescue => e
-              ::NewRelic::Agent.logger.warn("Error installing New Relic Developer Mode", e)
-            end
-          elsif rails_config
-            ::NewRelic::Agent.logger.warn("Developer mode not available for Rails versions prior to 2.2")
-          end
-        end
-
         def rails_version
           @rails_version ||= Gem::Version.new(::Rails::VERSION::STRING)
         end

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

@@ -15,7 +15,7 @@ module NewRelic
       class Rails3 < NewRelic::Control::Frameworks::Rails
 
         def env
-          @env ||= ::Rails.env.to_s
+          @env ||= ( ENV['NEW_RELIC_ENV'] || ::Rails.env.to_s )
         end
 
         def rails_root

data/lib/new_relic/noticed_error.rb

@@ -4,6 +4,7 @@
 
 require 'new_relic/helper'
 require 'new_relic/agent/attribute_filter'
+require 'new_relic/collection_helper'
 
 # This class encapsulates an error that was noticed by New Relic in a managed app.
 class NewRelic::NoticedError

data/lib/new_relic/version.rb

@@ -11,7 +11,7 @@ module NewRelic
     end
 
     MAJOR = 4
-    MINOR = 0
+    MINOR = 1
     TINY  = 0
 
     begin

data/newrelic.yml

@@ -30,10 +30,6 @@ development:
   <<: *default_settings
   app_name: <%= app_name %> (Development)
 
-  # NOTE: There is substantial overhead when running in developer mode.
-  # Do not use for production or load testing.
-  developer_mode: true
-
 test:
   <<: *default_settings
   # It doesn't make sense to report to New Relic from automated test runs.

data/newrelic_rpm.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   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')
-  s.licenses    = ['New Relic', 'MIT', 'Ruby']
+  s.licenses    = ['New Relic']
   s.description = <<-EOS
 New Relic is a performance management system, developed by New Relic,
 Inc (http://www.newrelic.com).  New Relic provides you with deep

data/test/config/newrelic.yml

@@ -11,7 +11,7 @@ test:
   log_level: info
   agent_enabled: false
   monitor_mode: false
-  developer_mode: true
+  test_mode: true
   disable_samplers: true
   api_host: 127.0.0.1
   api_port: 443

data/test/multiverse/lib/multiverse/runner.rb

@@ -91,14 +91,22 @@ module Multiverse
       "rails"         => ["active_record", "rails"],
       "serialization" => ["json", "marshalling", "yajl"],
       "sinatra"       => ["sinatra", "padrino"],
-      "background_2"  => ["rake", "resque"],
+      "background_2"  => ["resque"],
 
       "rest"          => []  # Specially handled below
     }
 
+    # Would like to reinstate but requires investigation, see RUBY-1749
+    unless RUBY_VERSION >= '2.1' and RUBY_VERSION < '2.3'
+      GROUPS['background_2'] << 'rake'
+    end
+
     def passes_filter?(dir, filter)
       return true if filter.nil?
 
+      # Would like to reinstate but requires investigation, see RUBY-1749
+      return false if dir == 'rake' and RUBY_VERSION >= '2.1' and RUBY_VERSION < '2.3'
+
       if filter.include?("group=")
         key = filter.sub("group=", "")
         group = GROUPS[key]

data/test/multiverse/suites/active_record/config/newrelic.yml

@@ -6,7 +6,6 @@ development:
   ssl: false
   monitor_mode: true
   license_key: bootstrap_newrelic_admin_license_key_000
-  developer_mode: false
   app_name: test
   host: 127.0.0.1
   api_host: 127.0.0.1

data/test/multiverse/suites/agent_only/config/newrelic.yml

@@ -6,7 +6,6 @@ development:
   ssl: false
   monitor_mode: true
   license_key: bootstrap_newrelic_admin_license_key_000
-  developer_mode: false
   app_name: test
   host: 127.0.0.1
   api_host: 127.0.0.1

data/test/multiverse/suites/capistrano/config/newrelic.yml

@@ -7,7 +7,6 @@ production:
   agent_enabled: true
   monitor_mode: true
   license_key: bootstrap_newrelic_admin_license_key_000
-  developer_mode: false
   app_name: test
   host: 127.0.0.1
   api_host: 127.0.0.1

data/test/multiverse/suites/capistrano2/config/newrelic.yml

@@ -7,7 +7,6 @@ development:
   agent_enabled: true
   monitor_mode: true
   license_key: bootstrap_newrelic_admin_license_key_000
-  developer_mode: false
   app_name: test
   host: 127.0.0.1
   api_host: 127.0.0.1

data/test/multiverse/suites/curb/config/newrelic.yml

@@ -6,7 +6,6 @@ development:
   ssl: false
   monitor_mode: true
   license_key: bootstrap_newrelic_admin_license_key_000
-  developer_mode: false
   app_name: test
   host: 127.0.0.1
   api_host: 127.0.0.1

data/test/multiverse/suites/datamapper/config/newrelic.yml

@@ -6,7 +6,6 @@ development:
   ssl: false
   monitor_mode: true
   license_key: bootstrap_newrelic_admin_license_key_000
-  developer_mode: false
   app_name: test
   host: 127.0.0.1
   api_host: 127.0.0.1

data/test/multiverse/suites/deferred_instrumentation/config/newrelic.yml

@@ -7,7 +7,6 @@ development:
   agent_enabled: true
   monitor_mode: true
   license_key: bootstrap_newrelic_admin_license_key_000
-  developer_mode: false
   app_name: test
   host: 127.0.0.1
   api_host: 127.0.0.1

data/test/multiverse/suites/delayed_job/config/newrelic.yml

@@ -6,7 +6,6 @@ development:
   ssl: false
   monitor_mode: true
   license_key: bootstrap_newrelic_admin_license_key_000
-  developer_mode: false
   app_name: test
   host: 127.0.0.1
   api_host: 127.0.0.1

data/test/multiverse/suites/excon/config/newrelic.yml

@@ -6,7 +6,6 @@ development:
   ssl: false
   monitor_mode: true
   license_key: bootstrap_newrelic_admin_license_key_000
-  developer_mode: false
   app_name: test
   host: 127.0.0.1
   api_host: 127.0.0.1

data/test/multiverse/suites/grape/config/newrelic.yml

@@ -6,7 +6,6 @@ development:
   ssl: false
   monitor_mode: true
   license_key: bootstrap_newrelic_admin_license_key_000
-  developer_mode: false
   app_name: test
   host: 127.0.0.1
   api_host: 127.0.0.1

data/test/multiverse/suites/high_security/config/newrelic.yml

@@ -58,7 +58,6 @@ development:
   apdex_t: 0.24
   monitor_mode: true
   license_key: bootstrap_newrelic_admin_license_key_000
-  developer_mode: false
   app_name: test
   host: localhost
   api_host: localhost

data/test/multiverse/suites/httpclient/config/newrelic.yml

@@ -6,7 +6,6 @@ development:
   ssl: false
   monitor_mode: true
   license_key: bootstrap_newrelic_admin_license_key_000
-  developer_mode: false
   app_name: test
   host: 127.0.0.1
   api_host: 127.0.0.1

data/test/multiverse/suites/httprb/config/newrelic.yml

@@ -6,7 +6,6 @@ development:
   ssl: false
   monitor_mode: true
   license_key: bootstrap_newrelic_admin_license_key_000
-  developer_mode: false
   app_name: test
   host: 127.0.0.1
   api_host: 127.0.0.1