newrelic_rpm 3.9.1.236 → 3.9.2.239

data.tar.gz.sig

@@ -1,4 +1,2 @@
-��eD�nqPWZ���\.�׮�"���x"=�$S��z��3�R*����`�$�3��}�+�;�
-������y,������pO�?t�yVoZӚm�7�U��u�8�Xϑ��"(��2wR��� ����*�yG~�R����4�ݬ�w�q
-��`>T�q�#p�bie'?t�.q���[R�2��P�2y���LڟO�Ig	�!��C��
-��O�"��ba�
+�$�SU���뛙�ug'�{��Pe��?o���B�T˨��؅��af�%�x��N��9�D�qC�S�vb{|	�梘\�ٸ5��*�|��*Å�l4.B�b`Z����:.h��ykJ$���!��!��jt+kN�"�����I���ql$?)�mO��Gy���������N�;�[�0�/]�K�b�מ��������d)j}�e��GU���L_��l��-��p��V?4�,�An
+�´5�;�t

data/CHANGELOG

@@ -1,5 +1,88 @@
 # New Relic Ruby Agent Release Notes #
 
+## v3.9.2 ##
+
+  * Added API for ignoring transactions
+
+  This release adds three new API calls for ignoring transactions:
+
+    - `NewRelic::Agent.ignore_transaction`
+    - `NewRelic::Agent.ignore_apdex`
+    - `NewRelic::Agent.ignore_enduser`
+
+  The first of these ignores a transaction completely: nothing about it will be
+  reported to New Relic. The second ignores only the Apdex metric for a single
+  transaction. The third disables javascript injection for browser monitoring
+  for the current transaction.
+
+  These methods differ from the existing newrelic_ignore_* method in that they
+  may be called *during* a transaction based on some dynamic runtime criteria,
+  as opposed to at the class level on startup.
+
+  See the docs for more details on how to use these methods:
+  https://docs.newrelic.com/docs/agents/ruby-agent/installation-and-configuration/ignoring-specific-transactions
+
+  * Improved SQL obfuscation
+
+  SQL queries containing string literals ending in backslash ('\') characters
+  would previously not have been obfuscated correctly by the Ruby agent prior to
+  transmission to New Relic. In addition, SQL comments were left un-obfuscated.
+  This has been fixed, and the test coverage for SQL obfuscation has been
+  improved.
+
+  * newrelic_ignore* methods now work when called in a superclass
+
+  The newrelic_ignore* family of methods previously did not apply to subclasses
+  of the class from which it was called, meaning that Rails controllers
+  inheriting from a single base class where newrelic_ignore had been called
+  would not be ignored. This has been fixed.
+
+  * Fix for rare crashes in Rack::Request#params on Sinatra apps
+
+  Certain kinds of malformed HTTP requests could previously have caused
+  unhandled exceptions in the Ruby agent's Sinatra instrumentation, in the
+  Rack::Request#params method. This has been fixed.
+
+  * Improved handling for rare errors caused by timeouts in Excon requests
+
+  In some rare cases, the agent would emit a warning message in its log file and
+  abort instrumentation of a transaction if a timeout occurred during an
+  Excon request initiated from within that transaction. This has been fixed.
+
+  * Improved behavior when the agent is misconfigured
+
+  When the agent is misconfigured by attempting to shut it down without
+  it ever having been started, or by attempting to disable instrumentation after
+  instrumentation has already been installed, the agent will no longer raise an
+  exception, but will instead log an error to its log file.
+
+  * Fix for ignore_error_filter not working in some configurations
+
+  The ignore_error_filter method allows you to specify a block to be evaluated
+  in order to determine whether a given error should be ignored by the agent.
+  If the agent was initially disabled, and then later enabled with a call to
+  manual_start, the ignore_error_filter would not work. This has been fixed.
+
+  * Fix for Capistrano 3 ignoring newrelic_revion
+
+  New Relic's Capistrano recipies support passing parameters to control the
+  values recorded with deployments, but user provided :newrelic_revision was
+  incorrectly overwritten. This has been fixed.
+
+  * Agent errors logged with ruby-prof in production
+
+  If the ruby-prof gem was available in an environment without New Relic's
+  developer mode enabled, the agent would generate errors to its log. This has
+  been fixed.
+
+  * Tighter requirements on naming for configuration environment variables
+
+  The agent would previously assume any environment variable containing
+  'NEWRELIC' was a configuration setting. It now looks for this string as a
+  prefix only.
+
+  Thanks to Chad Woolley for the contribution!
+
 ## v3.9.1 ##
 
   * Ruby 1.8.7 users: upgrade or add JSON gem now
@@ -14,6 +97,18 @@
   For more details, see:
   https://docs.newrelic.com/docs/ruby/ruby-1.8.7-support
 
+  * Support for new Cross Application Trace view
+
+  This release enhances cross application tracing with a visualization of
+  the cross application calls that a specific Transaction Trace is involved
+  in. The new visualization helps you spot bottlenecks in external services
+  within Transaction Traces and gives you an end-to-end understanding
+  of how the transaction trace is used by other applications and services.
+  This leads to faster problem diagnosis and better collaboration across
+  teams. All agents involved in the cross application communication must
+  be upgraded to see the complete graph. You can view cross application
+  traces from in the Transaction Trace drill-down.
+
   * High security mode V2
 
   The Ruby agent now supports V2 of New Relic's high security mode. To enable
@@ -60,7 +155,7 @@
 
   * Fix for occasional spikes in external services time
 
-  Certain kinds of failures during HTTP reqeusts made by an application could
+  Certain kinds of failures during HTTP requests made by an application could
   have previously resulted in the Ruby agent reporting erroneously large amounts
   of time spent in outgoing HTTP requests. This issue manifested most obviously
   in spikes on the 'Web external' band on the main overview graph. This issue
@@ -1036,7 +1131,6 @@
    going back for a year.
 
 
-### previous versions ###
 ## v3.4.2.1 ##
 
 * Fix issue when app_name is nil

data/lib/new_relic/agent.rb

@@ -90,6 +90,7 @@ module NewRelic
     require 'new_relic/agent/shim_agent'
     require 'new_relic/agent/method_tracer'
     require 'new_relic/agent/worker_loop'
+    require 'new_relic/agent/event_loop'
     require 'new_relic/agent/stats_engine'
     require 'new_relic/agent/transaction_sampler'
     require 'new_relic/agent/sql_sampler'
@@ -150,7 +151,10 @@ module NewRelic
 
     # The singleton Agent instance.  Used internally.
     def agent #:nodoc:
-      @agent || raise("Plugin not initialized!")
+      return @agent if @agent
+      NewRelic::Agent.logger.warn("Agent unavailable as it hasn't been started.")
+      NewRelic::Agent.logger.warn(caller.join("\n"))
+      nil
     end
 
     def agent=(new_instance)#:nodoc:
@@ -322,7 +326,7 @@ module NewRelic
     # @api public
     #
     def shutdown(options={})
-      agent.shutdown(options)
+      agent.shutdown(options) if agent
     end
 
     # Add instrumentation files to the agent.  The argument should be
@@ -393,11 +397,46 @@ module NewRelic
       end
     end
 
+    # This method disables the recording of the current transaction. No metrics,
+    # traced errors, transaction traces, Insights events, slow SQL traces,
+    # or RUM injection will happen for this transaction.
+    #
+    # @api public
+    #
+    def ignore_transaction
+      txn = NewRelic::Agent::Transaction.tl_current
+      txn.ignore! if txn
+    end
+
+    # This method disables the recording of Apdex metrics in the current
+    # transaction.
+    #
+    # @api public
+    #
+    def ignore_apdex
+      txn = NewRelic::Agent::Transaction.tl_current
+      txn.ignore_apdex! if txn
+    end
+
+    # This method disables browser monitoring javascript injection in the
+    # current transaction.
+    #
+    # @api public
+    #
+    def ignore_enduser
+      txn = NewRelic::Agent::Transaction.tl_current
+      txn.ignore_enduser! if txn
+    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!
@@ -446,7 +485,11 @@ module NewRelic
     # @api public
     #
     def ignore_error_filter(&block)
-      agent.error_collector.ignore_error_filter(&block)
+      if block
+        NewRelic::Agent::ErrorCollector.ignore_error_filter = block
+      else
+        NewRelic::Agent::ErrorCollector.ignore_error_filter
+      end
     end
 
     # Record the given error.  It will be passed through the
@@ -568,7 +611,7 @@ module NewRelic
     # to any registered handlers.
     def notify(event_type, *args)
       agent.events.notify( event_type, *args )
-    rescue => err
+    rescue
       NewRelic::Agent.logger.debug "Ignoring exception during %p event notification" % [event_type]
     end
 

data/lib/new_relic/agent/agent.rb

@@ -137,8 +137,6 @@ module NewRelic
           # we should be ready to run and shouldn't restarting if we can't.
           @harvester.mark_started
 
-          Agent.config.replace_or_add_config(NewRelic::Agent::Configuration::ManualSource.new(options))
-
           if channel_id = options[:report_to_channel]
             @service = NewRelic::Agent::PipeService.new(channel_id)
             if connected?
@@ -178,7 +176,7 @@ module NewRelic
           return if not started?
           ::NewRelic::Agent.logger.info "Starting Agent shutdown"
 
-          stop_worker_loop
+          stop_event_loop
           trap_signals_for_litespeed
           untraced_graceful_disconnect
           revert_to_default_configuration
@@ -192,10 +190,10 @@ module NewRelic
           NewRelic::Agent.config.remove_config_type(:server)
         end
 
-        def stop_worker_loop
-          if @worker_loop
-            @worker_loop.run_task if Agent.config[:force_send]
-            @worker_loop.stop
+        def stop_event_loop
+          if @event_loop
+            @event_loop.run_once(true) if Agent.config[:force_send]
+            @event_loop.stop
           end
         end
 
@@ -527,13 +525,6 @@ module NewRelic
         # start_worker_thread method - this is an artifact of
         # refactoring and can be moved, renamed, etc at will
         module StartWorkerThread
-          # logs info about the worker loop so users can see when the
-          # agent actually begins running in the background
-          def log_worker_loop_start
-            ::NewRelic::Agent.logger.debug "Reporting performance data every #{Agent.config[:data_report_period]} seconds."
-            ::NewRelic::Agent.logger.debug "Running worker loop"
-          end
-
           # Synchronize with the harvest loop. If the harvest thread has taken
           # a lock (DNS lookups, backticks, agent-owned locks, etc), and we
           # fork while locked, this can deadlock child processes. For more
@@ -552,15 +543,39 @@ module NewRelic
             harvest_lock.unlock if harvest_lock.locked?
           end
 
-          def create_worker_loop
-            WorkerLoop.new
+          def create_event_loop
+            EventLoop.new
           end
 
-          def create_and_run_worker_loop
-            @worker_loop = create_worker_loop
-            @worker_loop.run(Agent.config[:data_report_period]) do
+          # Never allow any data type to be reported more frequently than once
+          # per second.
+          MIN_ALLOWED_REPORT_PERIOD = 1.0
+
+          def report_period_for(method)
+            config_key = "data_report_periods.#{method}".to_sym
+            period = Agent.config[config_key]
+            if !period
+              period = Agent.config[:data_report_period]
+              ::NewRelic::Agent.logger.warn("Could not find configured period for #{method}, falling back to data_report_period (#{period} s)")
+            end
+            if period < MIN_ALLOWED_REPORT_PERIOD
+              ::NewRelic::Agent.logger.warn("Configured #{config_key} was #{period}, but minimum allowed is #{MIN_ALLOWED_REPORT_PERIOD}, using #{MIN_ALLOWED_REPORT_PERIOD}.")
+              period = MIN_ALLOWED_REPORT_PERIOD
+            end
+            period
+          end
+
+          def create_and_run_event_loop
+            @event_loop = create_event_loop
+            @event_loop.on(:report_data) do
               transmit_data
             end
+            @event_loop.on(:report_transaction_event_data) do
+              transmit_transaction_event_data
+            end
+            @event_loop.fire_every(Agent.config[:data_report_period],       :report_data)
+            @event_loop.fire_every(report_period_for(:analytic_event_data), :report_transaction_event_data)
+            @event_loop.run
           end
 
           # Handles the case where the server tells us to restart -
@@ -618,14 +633,9 @@ module NewRelic
           def deferred_work!(connection_options)
             catch_errors do
               NewRelic::Agent.disable_all_tracing do
-                # We try to connect.  If this returns false that means
-                # the server rejected us for a licensing reason and we should
-                # just exit the thread.  If it returns nil
-                # that means it didn't try to connect because we're in the master.
                 connect(connection_options)
                 if connected?
-                  log_worker_loop_start
-                  create_and_run_worker_loop
+                  create_and_run_event_loop
                   # never reaches here unless there is a problem or
                   # the agent is exiting
                 else
@@ -756,6 +766,7 @@ module NewRelic
               :host => local_host,
               :app_name => Agent.config.app_names,
               :language => 'ruby',
+              :labels => Agent.config.parsed_labels,
               :agent_version => NewRelic::VERSION::STRING,
               :environment => @environment_report,
               :settings => Agent.config.to_collector_hash,
@@ -1008,6 +1019,20 @@ module NewRelic
           end
         end
 
+        def transmit_transaction_event_data
+          now = Time.now
+          ::NewRelic::Agent.logger.debug "Sending analytics data to New Relic Service"
+
+          harvest_lock.synchronize do
+            @service.session do # use http keep-alive
+              harvest_and_send_analytic_event_data
+            end
+          end
+        ensure
+          duration = (Time.now - now).to_f
+          NewRelic::Agent.record_metric('Supportability/TransactionEventHarvest', duration)
+        end
+
         # This method is expected to only be called with the harvest_lock
         # already held
         def transmit_data_already_locked
@@ -1020,7 +1045,6 @@ module NewRelic
             harvest_and_send_transaction_traces
             harvest_and_send_slowest_sql
             harvest_and_send_timeslice_data
-            harvest_and_send_analytic_event_data
 
             check_for_and_handle_agent_commands
             harvest_and_send_for_agent_commands
@@ -1047,6 +1071,7 @@ module NewRelic
 
               @events.notify(:before_shutdown)
               transmit_data
+              transmit_transaction_event_data
 
               if @connected_pid == $$ && !@service.kind_of?(NewRelic::Agent::NewRelicService)
                 ::NewRelic::Agent.logger.debug "Sending New Relic service agent run shutdown message"

data/lib/new_relic/agent/agent_logger.rb

@@ -172,6 +172,10 @@ module NewRelic
       def gather_startup_logs
         StartupLogger.instance.dump(self)
       end
+
+      def log_formatter=(formatter)
+        @log.formatter = formatter
+      end
     end
 
     # In an effort to not lose messages during startup, we trap them in memory

data/lib/new_relic/agent/configuration.rb

@@ -3,6 +3,8 @@
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
 require 'new_relic/agent/configuration/manager'
+require 'new_relic/agent/configuration/dotted_hash'
+require 'new_relic/agent/configuration/manual_source'
 
 # The agent's configuration is accessed through a configuration object exposed
 # by ::NewRelic::Agent.config.  It provides a hash like interface to the
@@ -28,38 +30,6 @@ require 'new_relic/agent/configuration/manager'
 module NewRelic
   module Agent
     module Configuration
-      class DottedHash < ::Hash
-        def initialize(hash)
-          self.merge!(dot_flattened(hash))
-          keys.each do |key|
-            self[(key.to_sym rescue key) || key] = delete(key)
-          end
-        end
-
-        def inspect
-          "#<#{self.class.name}:#{object_id} #{super}>"
-        end
-
-        def to_hash
-          {}.replace(self)
-        end
-
-        protected
-        # turns {'a' => {'b' => 'c'}} into {'a.b' => 'c'}
-        def dot_flattened(nested_hash, names=[], result={})
-          nested_hash.each do |key, val|
-            next if val == nil
-            if val.respond_to?(:has_key?)
-              dot_flattened(val, names + [key], result)
-            else
-              result[(names + [key]).join('.')] = val
-            end
-          end
-          result
-        end
-      end
-
-      class ManualSource < DottedHash; end
     end
   end
 end

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

@@ -106,6 +106,13 @@ module NewRelic
           Proc.new { NewRelic::Agent::NewRelicService::JsonMarshaller.is_supported? ? 'json' : 'pruby' }
         end
 
+        # On Rubies with string encodings support (1.9.x+), default to always
+        # normalize encodings since it's safest and fast. Without that support
+        # the conversions are too expensive, so only enable if overridden to.
+        def self.normalize_json_string_encodings
+          Proc.new { NewRelic::LanguageSupport.supports_string_encodings? }
+        end
+
         def self.thread_profiler_enabled
           Proc.new { NewRelic::Agent::Threading::BacktraceService.is_supported? }
         end
@@ -235,6 +242,96 @@ module NewRelic
           :type => String,
           :description => "New Relic license key."
         },
+        :agent_enabled => {
+          :default => DefaultSource.agent_enabled,
+          :public => true,
+          :type => Boolean,
+          :description => 'Enable or disable the agent.'
+        },
+        :enabled => {
+          :default => true,
+          :public => false,
+          :type => Boolean,
+          :aliases => [:enable],
+          :description => 'Enable or disable the agent.'
+        },
+        :app_name => {
+          :default => DefaultSource.app_name,
+          :public => true,
+          :type => String,
+          :description => "Semicolon delimited list of application names where metrics will be recorded in the dashboard (e.g. 'MyApplication' or 'MyAppStaging;Instance1')."
+        },
+        :monitor_mode => {
+          :default => DefaultSource.monitor_mode,
+          :public => true,
+          :type => Boolean,
+          :description => 'Enable or disable transmission of data to the New Relic data collection service.'
+        },
+        :developer_mode => {
+          :default => DefaultSource.developer_mode,
+          :public => true,
+          :type => Boolean,
+          :description => "Enable or disable developer mode, a local analytics package built into the agent for rack applications. Access developer mode analytics by visiting '/newrelic' in your application."
+        },
+        :developer => {
+          :default => false,
+          :public => false,
+          :type => Boolean,
+          :description => 'Alternative method of enabling developer_mode.'
+        },
+        :log_level => {
+          :default => 'info',
+          :public => true,
+          :type => String,
+          :description => 'Log level for agent logging: error, warn, info or debug.'
+        },
+        :high_security => {
+          :default => false,
+          :public => true,
+          :type => Boolean,
+          :description => 'Enable or disable security features designed to protect data in an enterprise setting.'
+        },
+        :ssl => {
+          :default => true,
+          :allow_nil => true,
+          :public => true,
+          :type => Boolean,
+          :description => "Enable or disable SSL for transmissions to the New Relic data collection service. Default is true starting in version 3.5.6."
+        },
+        :proxy_host => {
+          :default => nil,
+          :allow_nil => true,
+          :public => true,
+          :type => String,
+          :description => 'Host for proxy server.'
+        },
+        :proxy_port => {
+          :default => nil,
+          :allow_nil => true,
+          :public => true,
+          :type => Fixnum,
+          :description => 'Port for proxy server.'
+        },
+        :proxy_user => {
+          :default => nil,
+          :allow_nil => true,
+          :public => true,
+          :type => String,
+          :description => 'User for proxy server.'
+        },
+        :proxy_pass => {
+          :default => nil,
+          :allow_nil => true,
+          :public => true,
+          :type => String,
+          :description => 'Password for proxy server.'
+        },
+        :capture_params => {
+          :default => false,
+          :public => true,
+          :type => Boolean,
+          :description => 'Enable or disable capturing and attachment of HTTP request parameters to transaction traces and traced errors.'
+        },
         :config_path => {
           :default => DefaultSource.config_path,
           :public => true,
@@ -247,12 +344,6 @@ module NewRelic
           :type => Array,
           :description => "An array of candidate locations for the agent's configuration file."
         },
-        :app_name => {
-          :default => DefaultSource.app_name,
-          :public => true,
-          :type => String,
-          :description => "Semicolon delimited list of application names where metrics will be recorded in the dashboard (e.g. 'MyApplication' or 'MyAppStaging;Instance1')."
-        },
         :dispatcher => {
           :default => DefaultSource.dispatcher,
           :public => false,
@@ -265,25 +356,6 @@ module NewRelic
           :type => Symbol,
           :description => 'Autodetected application framework used to enable framework-specific functionality.'
         },
-        :enabled => {
-          :default => true,
-          :public => false,
-          :type => Boolean,
-          :aliases => [:enable],
-          :description => 'Enable or disable the agent.'
-        },
-        :monitor_mode => {
-          :default => DefaultSource.monitor_mode,
-          :public => true,
-          :type => Boolean,
-          :description => 'Enable or disable transmission of data to the New Relic data collection service.'
-        },
-        :agent_enabled => {
-          :default => DefaultSource.agent_enabled,
-          :public => true,
-          :type => Boolean,
-          :description => 'Enable or disable the agent.'
-        },
         :'autostart.blacklisted_constants' => {
           :default => 'Rails::Console',
           :public => true,
@@ -302,18 +374,6 @@ module NewRelic
           :type => String,
           :description => "Comma delimited list of rake tasks that should not be instrumented by the agent (e.g. 'assets:precompile,db:migrate')."
         },
-        :developer_mode => {
-          :default => DefaultSource.developer_mode,
-          :public => true,
-          :type => Boolean,
-          :description => "Enable or disable developer mode, a local analytics package built into the agent for rack applications. Access developer mode analytics by visiting '/newrelic' in your application."
-        },
-        :developer => {
-          :default => false,
-          :public => false,
-          :type => Boolean,
-          :description => 'Alternative method of enabling developer_mode.'
-        },
         :'profiling.available' => {
           :default => DefaultSource.profiling_available,
           :public => false,
@@ -324,7 +384,8 @@ module NewRelic
           :default => 0.5,
           :public => true,
           :type => Float,
-          :description => 'Threshold at which New Relic will begin alerting. By default the agent will send alerts when the Apdex score drops below 0.5, or when more than half of users are experiencing degraded application performance.'
+          :deprecated => true,
+          :description => 'As of Ruby Agent version 3.5.0, setting your Apdex T has been moved to the New Relic UI. Threshold at which New Relic will begin alerting. By default the agent will send alerts when the Apdex score drops below 0.5, or when more than half of users are experiencing degraded application performance.'
         },
         :monitor_daemons => {
           :default => false,
@@ -332,12 +393,6 @@ module NewRelic
           :type => Boolean,
           :description => 'Enables or disables the agent for background processes. No longer necessary as the agent now automatically instruments background processes.'
         },
-        :high_security => {
-          :default => false,
-          :public => true,
-          :type => Boolean,
-          :description => 'Enable or disable security features designed to protect data in an enterprise setting.'
-        },
         :'strip_exception_messages.enabled' => {
           :default => DefaultSource.strip_exception_messages_enabled,
           :public => true,
@@ -374,41 +429,6 @@ module NewRelic
           :type => Fixnum,
           :description => 'Port for the New Relic API host.'
         },
-        :ssl => {
-          :default => true,
-          :allow_nil => true,
-          :public => true,
-          :type => Boolean,
-          :description => "Enable or disable SSL for transmissions to the New Relic data collection service."
-        },
-        :proxy_host => {
-          :default => nil,
-          :allow_nil => true,
-          :public => false,
-          :type => String,
-          :description => 'Host for proxy server.'
-        },
-        :proxy_port => {
-          :default => nil,
-          :allow_nil => true,
-          :public => false,
-          :type => Fixnum,
-          :description => 'Port for proxy server.'
-        },
-        :proxy_user => {
-          :default => nil,
-          :allow_nil => true,
-          :public => false,
-          :type => String,
-          :description => 'User for proxy server.'
-        },
-        :proxy_pass => {
-          :default => nil,
-          :allow_nil => true,
-          :public => false,
-          :type => String,
-          :description => 'Password for proxy server.'
-        },
         :sync_startup => {
           :default => false,
           :public => true,
@@ -455,13 +475,21 @@ module NewRelic
           :default => 60,
           :public => false,
           :type => Fixnum,
-          :description => 'Number of seconds betwixt connections to the New Relic data collection service.'
+          :description => 'Number of seconds betwixt connections to the New Relic data collection service. Note that transaction events have a separate report period, specified by data_report_periods.analytic_event_data.'
+        },
+        :'data_report_periods.analytic_event_data' => {
+          :default => 60,
+          :public => false,
+          :type => Fixnum,
+          :dynamic_name => true,
+          :description => 'Number of seconds between connections to the New Relic data collection service for sending transaction event data.'
         },
         :keep_retrying => {
           :default => true,
           :public => false,
           :type => Boolean,
-          :description => '(Deprecated) Enable or disable retrying failed connections to the New Relic data collection service.'
+          :deprecated => true,
+          :description => 'Enable or disable retrying failed connections to the New Relic data collection service.'
         },
         :force_reconnect => {
           :default => false,
@@ -487,12 +515,6 @@ module NewRelic
           :type => String,
           :description => 'Path to the agent log file, excluding the filename.'
         },
-        :log_level => {
-          :default => 'info',
-          :public => true,
-          :type => String,
-          :description => 'Log level for agent logging: error, warn, info or debug.'
-        },
         :'audit_log.enabled' => {
           :default => false,
           :public => true,
@@ -583,12 +605,6 @@ module NewRelic
           :type => Boolean,
           :description => 'Enable or disable usage of GC::Profiler to measure time spent in garbage collection'
         },
-        :capture_params => {
-          :default => false,
-          :public => true,
-          :type => Boolean,
-          :description => 'Enable or disable capturing and attachment of HTTP request parameters to transaction traces and traced errors.'
-        },
         :'sidekiq.capture_params' => {
           :default => false,
           :public => true,
@@ -617,19 +633,25 @@ module NewRelic
           :default => DefaultSource.transaction_tracer_transaction_threshold,
           :public => true,
           :type => Float,
-          :description => 'Transaction traces will be generated for transactions that exceed this threshold.'
+          :description => 'Transaction traces will be generated for transactions that exceed this threshold. Valid values are any float value, or (default) `apdex_f`, which will use the threshold for an dissatisfying Apdex controller action - four times the Apdex T value.'
         },
-        :'transaction_tracer.stack_trace_threshold' => {
-          :default => 0.5,
+        :'transaction_tracer.record_sql' => {
+          :default => 'obfuscated',
           :public => true,
-          :type => Float,
-          :description => 'Stack traces will be included in transaction trace segments with durations that exceed this threshold.'
+          :type => String,
+          :description => "Obfuscation level for sql queries reported in transaction trace segments (e.g. 'obfuscated', 'raw', 'none')."
+        },
+        :'transaction_tracer.capture_attributes' => {
+          :default => true,
+          :public => true,
+          :type => Boolean,
+          :description => 'Enable or disable collection of custom attributes on transaction traces.'
         },
         :'transaction_tracer.explain_threshold' => {
           :default => 0.5,
           :public => true,
           :type => Float,
-          :description => 'Explain plans will be generated and included in transaction trace segments with durations that exceed this threshold.'
+          :description => 'Explain plans will be generated and included in transaction trace segments with durations that exceed this threshold. Relevant only when `explain_enabled` is true.'
         },
         :'transaction_tracer.explain_enabled' => {
           :default => true,
@@ -637,17 +659,11 @@ module NewRelic
           :type => Boolean,
           :description => 'Enable or disable the generation and inclusion of explain queries in transaction trace segments.'
         },
-        :'transaction_tracer.record_sql' => {
-          :default => 'obfuscated',
-          :public => true,
-          :type => String,
-          :description => "Obfuscation level for sql queries reported in transaction trace segments (e.g. 'obfuscated', 'raw', 'none')."
-        },
-        :'transaction_tracer.capture_attributes' => {
-          :default => true,
+        :'transaction_tracer.stack_trace_threshold' => {
+          :default => 0.5,
           :public => true,
-          :type => Boolean,
-          :description => 'Enable or disable collection of custom attributes on transaction traces.'
+          :type => Float,
+          :description => 'Stack traces will be included in transaction trace segments with durations that exceed this threshold.'
         },
         :'transaction_tracer.limit_segments' => {
           :default => 4000,
@@ -729,7 +745,7 @@ module NewRelic
         },
         :'rum.enabled' => {
           :default => true,
-          :public => true,
+          :public => false,
           :type => Boolean,
           :description => 'Enable or disable page load timing (sometimes referred to as real user monitoring or RUM).'
         },
@@ -769,6 +785,12 @@ module NewRelic
           :type => Boolean,
           :description => 'Enable or disable automatic insertion of the JavaScript header into outgoing responses for page load timing (sometimes referred to as real user monitoring or RUM).'
         },
+        :'browser_monitoring.capture_attributes' => {
+          :default => false,
+          :public => true,
+          :type => Boolean,
+          :description => 'Include custom attributes in real user monitoring script in outgoing responses.'
+        },
         :'browser_monitoring.loader' => {
           :default => DefaultSource.browser_monitoring_loader,
           :public => private,
@@ -794,17 +816,12 @@ module NewRelic
           :type => Boolean,
           :description => 'Enable or disable HTTPS instrumentation by JavaScript agent on HTTP pages.'
         },
-        :'browser_monitoring.capture_attributes' => {
-          :default => false,
-          :public => true,
-          :type => Boolean,
-          :description => 'Include custom attributes in real user monitoring script in outgoing responses.'
-        },
         :'capture_attributes.page_view_events' => {
           :default => false,
           :public => false,
           :type => Boolean,
-          :description => 'Deprecated setting that is still in use by a few clients. Correct setting is browser_monitoring.capture_attributes.'
+          :deprecated => true,
+          :description => 'Correct setting is browser_monitoring.capture_attributes.'
         },
         :js_agent_loader => {
           :default => '',
@@ -916,7 +933,7 @@ module NewRelic
           :description => 'Controls whether to check on running a transaction whether to respawn the harvest thread.'
         },
         :normalize_json_string_encodings => {
-          :default => true,
+          :default => DefaultSource.normalize_json_string_encodings,
           :public => false,
           :type => Boolean,
           :description => 'Controls whether to normalize string encodings prior to serializing data for the collector to JSON.'
@@ -1023,6 +1040,24 @@ module NewRelic
           :public       => false,
           :type         => Boolean,
           :description  => 'Controls whether or not we use the heroku dyno name as the hostname.'
+        },
+        :labels => {
+          :default      => '',
+          :public       => true,
+          :type         => String,
+          :description  => 'A dictionary of label names and values that will be applied to the data sent from this agent. May also be expressed as a semi-colon delimited string of colon-separated pairs (e.g. "Server:One;Data Center:Primary".'
+        },
+        :aggressive_keepalive => {
+          :default      => false,
+          :public       => false,
+          :type         => Boolean,
+          :description  => 'If true, attempt to keep the TCP connection to the collector alive between harvests.'
+        },
+        :keep_alive_timeout => {
+          :default      => 60,
+          :public       => false,
+          :type         => Fixnum,
+          :description  => 'Timeout for keep alive on TCP connection to collector if supported by Ruby version. Only used in conjunction when aggressive_keepalive is enabled.'
         }
       }.freeze