newrelic_rpm 7.1.0 → 8.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 768b946a5433cf79422bbbc2cda40878a70a6aad22a159e5eb0dcdb351aa9e6d
-  data.tar.gz: efa504f22c2029103d7ccba6940a47b77d12ef4f1d13fbff2da34d9ba7443c1a
+  metadata.gz: dee9561e93a6cd3e2ae811234dae75cd65310c394031fcf3ad3091b46185cb6a
+  data.tar.gz: 7c017fcfeefe7fcce7ce662bed42cc3258028fb42a36e849cbc0d84231e8c4be
 SHA512:
-  metadata.gz: d982762c9dadd2457e49a6ae480b39ad91d0484de4c8788cc0cb3ab3c677e001c57aa8047daaa0d1010b7a7b2b5b15c74790d60badecd81a3987bc4dc3a3d151
-  data.tar.gz: '079081d14361839642d5339bf1a2be928cded80310cfd951f43f2d2885c6fb71c3a6a713db6ae9e03e7bcf9e244c4a8cf48d1e132a7ba47f928b4bff974426d6'
+  metadata.gz: 7b51ea238bcbaadfc37ed5364556dbb994788a0214dcd4c890ecbf4bb20aac744db0c733e32955da60c60f1e28220f44b8529bdab74d3af613985a5ac6076ab2
+  data.tar.gz: d3400acd658bffec6058a3a7f7ac7e2df0a36ee95777bfc44768f839ec7b6c29184c8172b43d3f9f43a211add2c108aa68a3358f7b93d1e9581b19eeb8f37bd3

data/.gitignore

@@ -35,3 +35,5 @@ test/fixtures/cross_agent_tests/*/README.md
 node_modules/
 yarn.lock
 errors.txt
+.history/
+vendor/

data/CHANGELOG.md

@@ -1,14 +1,197 @@
 # New Relic Ruby Agent Release Notes #
 
+  ## v8.2.0
+
+  * **New Instrumentation for Tilt gem**
+
+    Template rendering using [Tilt](https://github.com/rtomayko/tilt) is now instrumented. See [PR #847](https://github.com/newrelic/newrelic-ruby-agent/pull/847) for details.
+
+  * **Configuration `error_collector.ignore_errors` is marked as deprecated**
+
+    This setting has been marked as deprecated in the documentation since version 7.2.0 and is now flagged as deprecated within the code.
+
+  * **Remove Rails 2 instrumentation**
+
+    Though any version of Rails 2 has not been supported by the Ruby Agent since v3.18.1.330, instrumentation for ActionController and ActionWebService specific to that version were still part of the agent. This instrumentation has been removed.
+
+  * **Remove duplicated settings from newrelic.yml**
+
+    Thank you @jakeonfire for bringing this to our attention and @kuroponzu for making the changes!
+
+  * **Bugfix: Span Events recorded when using newrelic_ignore**
+
+    Previously, the agent was incorrectly recording span events only on transactions that should be ignored. This fix will prevent any span events from being created for transactions using newrelic_ignore, or ignored through the `rules.ignore_url_regexes` configuration option.
+  
+  * **Bugfix: Print deprecation warning for Cross-Application Tracing if enabled**
+
+    Prior to this change, the deprecation warning would log whenever the agent started up, regardless of configuration. Thank you @alpha-san for bringing this to our attention!
+
+  * **Bugfix: Scrub non-unicode characters from DecoratingLogger**
+
+    To prevent `JSON::GeneratorErrors`, the DecoratingLogger replaces non-unicode characters with the replacement character: �. Thank you @jdelStrother for bringing this to our attention!
+    
+  * **Bugfix: Distributed tracing headers emitted errors when agent was not connected**
+
+    Previously, when the agent had not yet connected it would fail to create a trace context payload and emit an error, "TypeError: no implicit conversion of nil into String," to the agent logs. The correct behavior in this situation is to not create these headers due to the lack of required information. Now, the agent will not attempt to create trace context payloads until it has connected. Thank you @Izzette for bringing this to our attention!
+
+
+  ## v8.1.0
+
+  * **Instrumentation for Ruby standard library Logger**
+
+    The agent will now automatically instrument Logger, recording number of lines and size of logging output, with breakdown by severity.
+
+  * **Bugfix for Padrino instrumentation**
+
+    A bug was introduced to the way the agent installs padrino instrumentation in 7.0.0. This release fixes the issues with the padrino instrumentation. Thanks to @sriedel for bringing this issue to our attention.
+
+  * **Bugfix: Stop deadlocks between New Relic thread and Delayed Job sampling thread**
+
+    Running the agent's polling queries for the DelayedJobSampler within the same ActiveRecord connection decreases the frequency of deadlocks in development environments. Thanks @jdelStrother for bringing this to our attention and providing excellent sample code to speed up development!
+
+  * **Bugfix: Allow Net::HTTP request to IPv6 addresses**
+
+    The agent will no longer raise an `URI::InvalidURIError` error if an IPv6 address is passed to Net::HTTP. Thank you @tristinbarnett and @tabathadelane for crafting a solution!
+
+  * **Bugfix: Allow integers to be passed to error_collector.ignore_status_codes configuration**
+
+    Integers not wrapped in quotation marks can be passed to `error_collector.ignore_status_codes` in the `newrelic.yml` file. Our thanks goes to @elaguerta and @brammerl for resolving this issue!
+
+  * **Bugfix: Allow add_method_tracer to be used on BasicObjects**
+
+    Previously, our `add_method_tracer` changes referenced `self.class` which is not available on `BasicObjects`. This has been fixed. Thanks to @toncid for bringing this issue to our attention.
+
+
+  ## v8.0.0
+
+  * **`add_method_tracer` refactored to use prepend over alias_method chaining**
+
+    This release overhauls the implementation of `add_method_tracer`, as detailed in [issue #502](https://github.com/newrelic/newrelic-ruby-agent/issues/502). The main breaking updates are as follows:
+    - A metric name passed to `add_method_tracer` will no longer be interpolated in an instance context as before. To maintain this behavior, pass a Proc object with the same arity as the method being traced. For example:
+      ```ruby
+        # OLD
+        add_method_tracer :foo, '#{args[0]}.#{args[1]}'
+
+        # NEW
+        add_method_tracer :foo, -> (*args) { "#{args[0]}.#{args[1]}" }
+      ```
+
+    - Similarly, the `:code_header` and `:code_footer` options to `add_method_tracer` will *only* accept a Proc object, which will be bound to the calling instance when the traced method is invoked.
+
+    - Calling `add_method_tracer` for a method will overwrite any previously defined tracers for that method. To specify multiple metric names for a single method tracer, pass them to `add_method_tracer` as an array.
+
+    See updated documentation on the following pages for full details:
+    - [Ruby Custom Instrumentation: Method Tracers](https://docs.newrelic.com/docs/agents/ruby-agent/api-guides/ruby-custom-instrumentation/#method_tracers)
+    - [MethodTracer::ClassMethods#add_method_tracer](https://rubydoc.info/github/newrelic/newrelic-ruby-agent/NewRelic/Agent/MethodTracer/ClassMethods#add_method_tracer-instance_method)
+
+
+  * **Distributed tracing is enabled by default**
+
+    [Distributed tracing](https://docs.newrelic.com/docs/distributed-tracing/enable-configure/language-agents-enable-distributed-tracing/) tracks and observes service requests as they flow through distributed systems. Distributed tracing is now enabled by default and replaces [cross application tracing](https://docs.newrelic.com/docs/agents/ruby-agent/features/cross-application-tracing-ruby/).
+
+  * **Bugfix: Incorrectly loading configuration options from newrelic.yml**
+
+    The agent will now  import the configuration options [`error_collector.ignore_messages`](https://docs.newrelic.com/docs/agents/ruby-agent/configuration/ruby-agent-configuration/#error_collector-ignore_messages) and [`error_collector.expected_messages`](https://docs.newrelic.com/docs/agents/ruby-agent/configuration/ruby-agent-configuration/#error_collector-expected_messages) from the `newrelic.yml` file correctly.
+
+  * **Cross Application is now deprecated, and disabled by default**
+
+    [Distributed tracing](https://docs.newrelic.com/docs/distributed-tracing/enable-configure/language-agents-enable-distributed-tracing/) is replacing [cross application tracing](https://docs.newrelic.com/docs/agents/ruby-agent/features/cross-application-tracing-ruby/) as the default means of tracing between services. To continue using it, enable it with `cross_application_tracer.enabled: true` and `distributed_tracing.enabled: false`
+
+  * **Update configuration option default value for `span_events.max_samples_stored` from 1000 to 2000**
+
+    For more information about this congfiguration option, visit [the Ruby agent documentation](https://docs.newrelic.com/docs/agents/ruby-agent/configuration/ruby-agent-configuration/#span_events-max_samples_stored).
+
+  * **Agent now enforces server supplied maximum value for configuration option `span_events.max_samples_stored`**
+
+    Upon connection to the New Relic servers, the agent will now enforce a maximum value allowed for the configuration option [`span_events.max_samples_stored`](https://docs.newrelic.com/docs/agents/ruby-agent/configuration/ruby-agent-configuration/#span_events-max_samples_stored) sent from the New Relic servers.
+
+  * **Remove Ruby 2.0 required kwarg compatibility checks**
+
+    Our agent has code that provides compatibility for required keyword arguments in Ruby versions below 2.1. Since the agent now only supports Ruby 2.2+, this code is no longer required.
+
+  * **Replace Time.now with Process.clock_gettime**
+
+    Calls to `Time.now` have been replaced with calls to `Process.clock_gettime` to leverage the system's built-in clocks for elapsed time (`Process::CLOCK_MONOTONIC`) and wall-clock time (`Process::CLOCK_REALTIME`). This results in fewer object allocations, more accurate elapsed time records, and enhanced performance. Thanks to @sdemjanenko and @viraptor for advocating for this change!
+
+  * **Updated generated default newrelic.yml**
+
+    Thank you @wyhaines and @creaturenex for your contribution. The default newrelic.yml that the agent can generate is now updated with commented out examples of all configuration options.
+
+  * **Bugfix: Psych 4.0 causes errors when loading newrelic.yml**
+
+    Psych 4.0 now uses safe load behavior when using `YAML.load` which by default doesn't allow aliases, causing errors when the agent loads the config file. We have updated how we load the config file to avoid these errors.
+
+  * **Remove support for Excon versions below 0.19.0**
+
+    Excon versions below 0.19.0 will no longer be instrumented through the Ruby agent.
+
+  * **Remove support for Mongo versions below 2.1**
+
+    Mongo versions below 2.1 will no longer be instrumented through the Ruby agent.
+
+  * **Remove tests for Rails 3.0 and Rails 3.1**
+
+    As of the 7.0 release, the Ruby agent stopped supporting Rails 3.0 and Rails 3.1. Despite this, we still had tests for these versions running on the agent's CI. Those tests are now removed.
+
+  * **Update test Gemfiles for patched versions**
+
+    The gem has individual Gemfiles it uses to test against different common user setups. Rails 5.2, 6.0, and 6.1 have been updated to the latest patch versions in the test Gemfiles. Rack was updated in the Rails61 test suite to 2.1.4 to resolve a security vulnerability.
+
+  * **Remove Merb Support**
+
+    This release removes the remaining support for the [Merb](https://weblog.rubyonrails.org/2008/12/23/merb-gets-merged-into-rails-3/) framework. It merged with Rails during the 3.0 release. Now that the Ruby agent supports Rails 3.2 and above, we thought it was time to say goodbye.
+
+  * **Remove deprecated method External.start_segment**
+
+    The method `NewRelic::Agent::External.start_segment` has been deprecated as of Ruby Agent 6.0.0. This method is now removed.
+
+  * **Added testing and support for the following gem versions**
+
+    - activemerchant 1.121.0
+    - bunny 2.19.0
+    - excon 0.85.0
+    - mongo 2.14.0, 2.15.1
+    - padrino 0.15.1
+    - resque 2.1.0
+    - sequel 5.48.0
+    - yajl-ruby 1.4.1
+
+  * **This version adds support for ARM64/Graviton2 platform using Ruby 3.0.2+**
+
+
+  ## v7.2.0
+
+  * **Expected Errors and Ignore Errors**
+    This release adds support for configuration for expected/ignored errors by class name, status code, and message. The following configuration options are now available:
+    - `error_collector.ignore_classes`
+    - `error_collector.ignore_messages`
+    - `error_collector.ignore_status_codes`
+    - `error_collector.expected_classes`
+    - `error_collector.expected_messages`
+    - `error_collector.expected_status_codes`
+    For more details about expected and ignored errors, please see our [configuration documentation](https://docs.newrelic.com/docs/agents/ruby-agent/configuration/)
+
+  * **Bugfix: resolves "can't add a new key into hash during iteration" Errors**
+
+    Thanks to @wyhaines for this fix that prevents "can't add a new key into hash during iteration" errors from occuring when iterating over environment data.
+
+  * **Bugfix: kwarg support fixed for Rack middleware instrumentation**
+
+    Thanks to @walro for submitting this fix. This fixes the rack instrumentation when using kwargs.
+
+  * **Update known conflicts with use of Module#Prepend**
+
+    With our release of v7.0.0, we updated our instrumentation to use Module#Prepend by default, instead of method chaining. We have received reports of conflicts and added a check for these known conflicts. If a known conflict with prepend is detected while using the default value of 'auto' for gem instrumentation, the agent will instead install method chaining instrumentation in order to avoid this conflict. This check can be bypassed by setting the instrumentation method for the gem to 'prepend'.
+
   ## v7.1.0
 
   * **Add support for CSP nonces when using our API to insert the browser agent**
-  
+
     We now support passing in a nonce to our API method `browser_timing_header` to allow the browser agent to run on applications using CSP nonces. This allows users to inject the browser agent themselves and use the nonce required for the script to run. In order to utilize this new feature, you must disable auto instrumentation for the browser agent, and use the API method browser_timing_header to pass the nonce in and inject the script manually.
-    
+
   * **Removed MD5 use in the SQL sampler**
 
-    In order to allow the agent to run in FIPS compliant environments, the usage of MD5 for aggregating slow sql traces has been replaced with SHA1. 
+    In order to allow the agent to run in FIPS compliant environments, the usage of MD5 for aggregating slow sql traces has been replaced with SHA1.
 
   * **Enable server-side configuration of distributed tracing**
 
@@ -16,7 +199,7 @@
 
   * **Bugfix: Fix for missing part of a previous bugfix**
 
-    Our previous fix of "nil Middlewares injection now prevented and gracefully handled in Sinatra" released in 7.0.0 was partially overwritten by some of the other changes in that release. This release adds back those missing sections of the bugfix, and should resolve the issue for sinatra users. 
+    Our previous fix of "nil Middlewares injection now prevented and gracefully handled in Sinatra" released in 7.0.0 was partially overwritten by some of the other changes in that release. This release adds back those missing sections of the bugfix, and should resolve the issue for sinatra users.
 
   * **Update known conflicts with use of Module#Prepend**
 
@@ -35,8 +218,8 @@
     correctly when running in a non-forking Resque worker process.
 
   * **Bugfix: Added check for ruby2_keywords in add_transaction_tracer**
-    
-    Thanks @beauraF for the contribution! Previously, the add_transaction_tracer was not updated when we added support for ruby 3. In order to correctly support `**kwargs`,  ruby2_keywords was added to correctly update the method signature to use **kwargs in ruby versions that support that. 
+
+    Thanks @beauraF for the contribution! Previously, the add_transaction_tracer was not updated when we added support for ruby 3. In order to correctly support `**kwargs`,  ruby2_keywords was added to correctly update the method signature to use **kwargs in ruby versions that support that.
 
   * **Confirmed support for yajl 1.4.0**
 

data/README.md

@@ -11,6 +11,8 @@ to help you improve the customer experience and make data-driven business decisi
 The New Relic Ruby Agent is dual-purposed as a either a Gem or a Rails plugin,
 hosted on [github](https://github.com/newrelic/newrelic-ruby-agent).
 
+[![Gem Version](https://badge.fury.io/rb/newrelic_rpm.svg)](https://badge.fury.io/rb/newrelic_rpm)
+
 ## Supported Environments
 
 An up-to-date list of Ruby versions and frameworks for the latest agent
@@ -21,6 +23,8 @@ Environments" section below.
 
 ## Installing and Using
 
+The latest released gem for the Ruby Agent can be found at [Rubygems.org](https://rubygems.org/gems/newrelic_rpm)
+
 ### Quick Start
 
 #### With Bundler
@@ -131,6 +135,6 @@ The New Relic Ruby agent also uses source code from third-party libraries. Full
 
 Thank you, and may your application scale to infinity plus one.
 
-Lew Cirne, Founder and CEO
+Lew Cirne, Founder
 
 New Relic, Inc.

data/lib/new_relic/agent/adaptive_sampler.rb

@@ -13,7 +13,7 @@ module NewRelic
         @sampled_count = 0
         @period_duration = period_duration
         @first_period = true
-        @period_start = Time.now.to_f
+        @period_start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
         @lock = Mutex.new
         register_config_callbacks
       end
@@ -53,7 +53,7 @@ module NewRelic
       private
 
       def reset_if_period_expired!
-        now = Time.now.to_f
+        now = Process.clock_gettime(Process::CLOCK_MONOTONIC)
         return unless @period_start + @period_duration <= now
 
         elapsed_periods = Integer((now - @period_start) / @period_duration)

data/lib/new_relic/agent/agent.rb

@@ -215,7 +215,7 @@ module NewRelic
             @connected_pid = Process.pid
           else
             ::NewRelic::Agent.logger.debug("Child process #{Process.pid} not reporting to non-connected parent (process #{Process.ppid}).")
-            @service.shutdown(Time.now)
+            @service.shutdown
             disconnect
           end
         end
@@ -1123,7 +1123,7 @@ module NewRelic
         end
 
         def transmit_single_data_type(harvest_method, supportability_name)
-          now = Time.now
+          now = Process.clock_gettime(Process::CLOCK_MONOTONIC)
 
           msg = "Sending #{supportability_name} data to New Relic Service"
           ::NewRelic::Agent.logger.debug msg
@@ -1132,12 +1132,12 @@ module NewRelic
             self.send(harvest_method)
           end
         ensure
-          duration = (Time.now - now).to_f
+          duration = Process.clock_gettime(Process::CLOCK_MONOTONIC) - now
           NewRelic::Agent.record_metric("Supportability/#{supportability_name}Harvest", duration)
         end
 
         def transmit_data
-          now = Time.now
+          now = Process.clock_gettime(Process::CLOCK_MONOTONIC)
           ::NewRelic::Agent.logger.debug "Sending data to New Relic Service"
 
           @events.notify(:before_harvest)
@@ -1154,7 +1154,7 @@ module NewRelic
           end
         ensure
           NewRelic::Agent::Database.close_connections
-          duration = (Time.now - now).to_f
+          duration = Process.clock_gettime(Process::CLOCK_MONOTONIC) - now
           NewRelic::Agent.record_metric('Supportability/Harvest', duration)
         end
 
@@ -1179,7 +1179,7 @@ module NewRelic
 
               if @connected_pid == $$ && !@service.kind_of?(NewRelic::Agent::NewRelicService)
                 ::NewRelic::Agent.logger.debug "Sending New Relic service agent run shutdown message"
-                @service.shutdown(Time.now.to_f)
+                @service.shutdown
               else
                 ::NewRelic::Agent.logger.debug "This agent connected from parent process #{@connected_pid}--not sending shutdown"
               end

data/lib/new_relic/agent/commands/thread_profiler_session.rb

@@ -38,7 +38,7 @@ module NewRelic
             agent_command.arguments
           )
 
-          @started_at = Time.now
+          @started_at = Process.clock_gettime(Process::CLOCK_REALTIME)
           @duration = profile.duration if profile
         end
 
@@ -51,7 +51,9 @@ module NewRelic
         end
 
         def harvest
-          NewRelic::Agent.logger.debug("Harvesting from Thread Profiler #{@finished_profile.to_log_description unless @finished_profile.nil?}")
+          NewRelic::Agent.logger.debug(
+            "Harvesting from Thread Profiler #{@finished_profile.to_log_description unless @finished_profile.nil?}"
+          )
           profile = @finished_profile
           @backtrace_service.profile_agent_code = false
           @finished_profile = nil
@@ -72,7 +74,9 @@ module NewRelic
         end
 
         def past_time?
-          @started_at && (Time.now > @started_at + @duration)
+          @started_at && (
+            Process.clock_gettime(Process::CLOCK_REALTIME) > @started_at + @duration
+          )
         end
 
         def stopped?

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

@@ -39,6 +39,8 @@ module NewRelic
         end
       end
 
+      # Marks the config option as deprecated in the documentation once generated.
+      # Does not appear in logs.
       def self.deprecated_description new_setting, description
         link_ref = new_setting.to_s.gsub(".", "-")
         %{Please see: [#{new_setting}](docs/agents/ruby-agent/configuration/ruby-agent-configuration##{link_ref}). \n\n#{description}}
@@ -120,7 +122,6 @@ module NewRelic
           Proc.new {
             case
             when defined?(::NewRelic::TEST) then :test
-            when defined?(::Merb) && defined?(::Merb::Plugins) then :merb
             when defined?(::Rails::VERSION)
               case Rails::VERSION::MAJOR
               when 0..2
@@ -353,7 +354,7 @@ module NewRelic
         :entity_guid => {
           :default => nil,
           :allow_nil => true,
-          :public => true,
+          :public => false,
           :type => String,
           :allowed_from_server => true,
           :description => 'The [Entity GUID](/attribute-dictionary/span/entityguid) for the entity running this agent.'
@@ -534,7 +535,7 @@ module NewRelic
           :type => Float,
           :allowed_from_server => true,
           :deprecated => true,
-          :description => 'Deprecated. For agent versions 3.5.0 or higher, [set your Apdex T via the New Relic UI](/docs/apm/new-relic-apm/apdex/changing-your-apdex-settings).'
+          :description => 'For agent versions 3.5.0 or higher, [set your Apdex T via the New Relic UI](/docs/apm/new-relic-apm/apdex/changing-your-apdex-settings).'
         },
         :'strip_exception_messages.enabled' => {
           :default => value_of(:high_security),
@@ -998,6 +999,22 @@ module NewRelic
           :allowed_from_server => false,
           :description  => 'Controls auto-instrumentation of dalli gem for Memcache at start up.  May be one of [auto|prepend|chain|disabled].'
         },
+        :'instrumentation.logger' => {
+          :default => "auto",
+          :public => true,
+          :type => String,
+          :dynamic_name => true,
+          :allowed_from_server => false,
+          :description => 'Controls auto-instrumentation of Ruby standard library Logger at start up.  May be one of [auto|prepend|chain|disabled].'
+        },
+        :'instrumentation.tilt' => {
+          :default => "auto",
+          :public => true,
+          :type => String,
+          :dynamic_name => true,
+          :allowed_from_server => false,
+          :description => 'Controls auto-instrumentation of Tilt at start up.  May be one of [auto|prepend|chain|disabled].'
+        },
         :disable_data_mapper => {
           :default => false,
           :public => true,
@@ -1151,7 +1168,7 @@ module NewRelic
           :type => Boolean,
           :deprecated => true,
           :allowed_from_server => false,
-          :description => 'Deprecated; use [`transaction_tracer.attributes.enabled`](#transaction_tracer-attributes-enabled) instead.'
+          :description => 'Use [`transaction_tracer.attributes.enabled`](#transaction_tracer-attributes-enabled) instead.'
         },
         :'transaction_tracer.explain_threshold' => {
           :default => 0.5,
@@ -1194,7 +1211,7 @@ module NewRelic
           :type => Boolean,
           :allowed_from_server => false,
           :deprecated => true,
-          :description => 'Deprecated; use [`disable_sequel_instrumentation`](#disable_sequel_instrumentation) instead.'
+          :description => 'Use [`disable_sequel_instrumentation`](#disable_sequel_instrumentation) instead.'
         },
         :disable_mongo => {
           :default      => false,
@@ -1290,14 +1307,64 @@ module NewRelic
           :type => Boolean,
           :deprecated => true,
           :allowed_from_server => false,
-          :description => 'Deprecated; use [`error_collector.attributes.enabled`](#error_collector-attributes-enabled) instead.'
+          :description => 'Use [`error_collector.attributes.enabled`](#error_collector-attributes-enabled) instead.'
         },
         :'error_collector.ignore_errors' => {
           :default => 'ActionController::RoutingError,Sinatra::NotFound',
           :public => true,
           :type => String,
+          :deprecated => true, 
+          :allowed_from_server => true,
+          :dynamic_name => true,
+          :description => 'Use `error_collector.ignore_classes` instead. Specify a comma-delimited list of error classes that the agent should ignore.'
+        },
+        :'error_collector.ignore_classes' => {
+          :default => [],
+          :public => true,
+          :type => Array,
+          :allowed_from_server => true,
+          :dynamic_name => true,
+          :description => 'A list of error classes that the agent should ignore. *Note: this setting cannot be set via environment variable.*'
+        },
+        :'error_collector.ignore_messages' => {
+          :default => {},
+          :public => true,
+          :type => Hash,
+          :allowed_from_server => true,
+          :dynamic_name => true,
+          :description => 'A map of error classes to a list of messages. When an error of one of the classes specified here occurs, if its error message contains one of the strings corresponding to it here, that error will be ignored. *Note: this setting cannot be set via environment variable.*'
+        },
+        :'error_collector.ignore_status_codes' => {
+          :default => '',
+          :public => true,
+          :type => String,
           :allowed_from_server => true,
-          :description => 'Specify a comma-delimited list of error classes that the agent should ignore.'
+          :dynamic_name => true,
+          :description => 'A comma separated list of status codes, possibly including ranges. Errors associated with these status codes, where applicable, will be ignored.'
+        },
+        :'error_collector.expected_classes' => {
+          :default => [],
+          :public => true,
+          :type => Array,
+          :allowed_from_server => true,
+          :dynamic_name => true,
+          :description => 'A list of error classes that the agent should treat as expected. *Note: this setting cannot be set via environment variable.*'
+        },
+        :'error_collector.expected_messages' => {
+          :default => {},
+          :public => true,
+          :type => Hash,
+          :allowed_from_server => true,
+          :dynamic_name => true,
+          :description => 'A map of error classes to a list of messages. When an error of one of the classes specified here occurs, if its error message contains one of the strings corresponding to it here, that error will be treated as expected. *Note: this setting cannot be set via environment variable.*'
+        },
+        :'error_collector.expected_status_codes' => {
+          :default => '',
+          :public => true,
+          :type => String,
+          :allowed_from_server => true,
+          :dynamic_name => true,
+          :description => 'A comma separated list of status codes, possibly including ranges. Errors associated with these status codes, where applicable, will be treated as expected.'
         },
         :'error_collector.max_backtrace_frames' => {
           :default => 50,
@@ -1376,7 +1443,7 @@ module NewRelic
           :type => Boolean,
           :deprecated => true,
           :allowed_from_server => false,
-          :description => 'Deprecated; use [`browser_monitoring.attributes.enabled`](#browser_monitoring-attributes-enabled) instead.'
+          :description => 'Use [`browser_monitoring.attributes.enabled`](#browser_monitoring-attributes-enabled) instead.'
         },
         :'browser_monitoring.loader' => {
           :default => DefaultSource.browser_monitoring_loader,
@@ -1430,11 +1497,15 @@ module NewRelic
           :description => 'List of trusted New Relic account IDs for the purposes of cross-application tracing. Inbound requests from applications including cross-application headers that do not come from an account in this list will be ignored.'
         },
         :"cross_application_tracer.enabled" => {
-          :default => Proc.new { !NewRelic::Agent.config[:'distributed_tracing.enabled'] },
+          :default => false,
           :public => true,
           :type => Boolean,
           :allowed_from_server => true,
-          :description => 'If `true`, enables [cross-application tracing](/docs/apm/transactions/cross-application-traces/cross-application-tracing).'
+          :deprecated => true,
+          :description => deprecated_description(
+            :'distributed_tracing-enabled',
+            'If `true`, enables [cross-application tracing](/docs/agents/ruby-agent/features/cross-application-tracing-ruby/)'
+          )
         },
         :cross_application_tracing => {
           :default => nil,
@@ -1443,7 +1514,7 @@ module NewRelic
           :type => Boolean,
           :allowed_from_server => false,
           :deprecated => true,
-          :description => 'Deprecated in favor of cross_application_tracer.enabled'
+          :description => 'Deprecated in favor of distributed_tracing.enabled'
         },
         :encoding_key => {
           :default => '',
@@ -1500,7 +1571,7 @@ module NewRelic
           :type => Boolean,
           :deprecated => true,
           :allowed_from_server => false,
-          :description => 'Deprecated; use [`transaction_events.attributes.enabled`](#transaction_events-attributes-enabled) instead.'
+          :description => 'Use [`transaction_events.attributes.enabled`](#transaction_events-attributes-enabled) instead.'
         },
         :restart_thread_in_children => {
           :default => true,
@@ -1743,7 +1814,7 @@ module NewRelic
           :type         => Array,
           :allowed_from_server => true,
           :transform    => DefaultSource.method(:convert_to_regexp_list),
-          :description  => 'Define transactions you want the agent to ignore, by specifying a list of patterns matching the URI you want to ignore.'
+          :description  => 'Define transactions you want the agent to ignore, by specifying a list of patterns matching the URI you want to ignore.' 
         },
         :'synthetics.traces_limit' => {
           :default      => 20,
@@ -2078,7 +2149,7 @@ module NewRelic
           :description => 'The primary id associated with this application.'
         },
         :'distributed_tracing.enabled' => {
-          :default     => false,
+          :default     => true,
           :public      => true,
           :type        => Boolean,
           :allowed_from_server => true,
@@ -2122,7 +2193,7 @@ module NewRelic
           :description => "Sets the maximum number of span events to buffer when streaming to the trace observer."
         },
         :'span_events.max_samples_stored' => {
-          :default => 1000,
+          :default => 2000,
           :public => true,
           :type => Integer,
           :allowed_from_server => true,

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

@@ -13,12 +13,13 @@ module NewRelic
           :analytic_event_data => :'analytics_events.max_samples_stored',
           :custom_event_data => :'custom_insights_events.max_samples_stored',
           :error_event_data => :'error_collector.max_event_samples_stored',
-          :span_event_data => :'span_events.max_samples_stored'
         }
 
         def from_config(config)
-          {:harvest_limits => EVENT_HARVEST_CONFIG_KEY_MAPPING.inject({}) do
-            |connect_payload, (connect_payload_key, config_key)|
+          {:harvest_limits =>
+            EVENT_HARVEST_CONFIG_KEY_MAPPING.merge(
+              :span_event_data => :'span_events.max_samples_stored'
+            ).inject({}) do |connect_payload, (connect_payload_key, config_key)|
               connect_payload[connect_payload_key] = config[config_key]
               connect_payload
             end
@@ -27,16 +28,31 @@ module NewRelic
 
         def to_config_hash(connect_reply)
           event_harvest_interval = connect_reply['event_harvest_config']['report_period_ms'] / 1000
-          config_hash = EVENT_HARVEST_CONFIG_KEY_MAPPING.inject({}) do
-            |event_harvest_config, (connect_payload_key, config_key)|
-              if harvest_limit = connect_reply['event_harvest_config']['harvest_limits'][connect_payload_key.to_s]
-                event_harvest_config[config_key] = harvest_limit
-                report_period_key = :"event_report_period.#{connect_payload_key}"
-                event_harvest_config[report_period_key] = event_harvest_interval
-              end
-              event_harvest_config
-            end
+          config_hash = transform_event_harvest_config_keys(connect_reply, event_harvest_interval)
           config_hash[:event_report_period] = event_harvest_interval
+          config_hash = transform_span_event_harvest_config(config_hash, connect_reply)
+          config_hash
+        end
+
+        private
+
+        def transform_event_harvest_config_keys(connect_reply, event_harvest_interval)
+          EVENT_HARVEST_CONFIG_KEY_MAPPING.inject({}) do |event_harvest_config, (connect_payload_key, config_key)|
+            if harvest_limit = connect_reply['event_harvest_config']['harvest_limits'][connect_payload_key.to_s]
+              event_harvest_config[config_key] = harvest_limit
+              report_period_key = :"event_report_period.#{connect_payload_key}"
+              event_harvest_config[report_period_key] = event_harvest_interval
+            end
+            event_harvest_config
+          end
+        end
+
+        def transform_span_event_harvest_config(config_hash, connect_reply)
+          if span_harvest = connect_reply['span_event_harvest_config']
+            config_hash[:'span_events.max_samples_stored'] = span_harvest['harvest_limit'] if span_harvest['harvest_limit']
+            config_hash[:'event_report_period.span_event_data'] = span_harvest['report_period_ms'] if span_harvest['report_period_ms']
+          end
+
           config_hash
         end
       end