Skip to content

Commit

Permalink
Merge pull request #1735 from newrelic/update-default-source-815
Browse files Browse the repository at this point in the history
Update default_source to match config docs
  • Loading branch information
kaylareopelle authored Jan 6, 2023
2 parents d034a83 + 049767c commit bd1c848
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions lib/new_relic/agent/configuration/default_source.rb
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ def self.enforce_fallback(allowed_values: nil, fallback: nil)
:public => true,
:type => String,
:allowed_from_server => false,
:description => 'Your New Relic API key. Required when using the New Relic REST API v2 to record deployments using the `newrelic deployments` command.'
:description => 'Your New Relic [user key](/docs/apis/intro-apis/new-relic-api-keys/#overview-keys). Required when using the New Relic REST API v2 to record deployments using the `newrelic deployments` command.'
},
:backport_fast_active_record_connection_lookup => {
:default => false,
Expand Down Expand Up @@ -1452,7 +1452,7 @@ def self.enforce_fallback(allowed_values: nil, fallback: nil)
If `true`, disables agent middleware for Sinatra. This middleware is responsible for advanced feature support such as [cross application tracing](/docs/apm/transactions/cross-application-traces/cross-application-tracing), [page load timing](/docs/browser/new-relic-browser/getting-started/new-relic-browser), and [error collection](/docs/apm/applications-menu/events/view-apm-error-analytics).
<Callout variant="important">
Cross application tracing is deprecated in favor of [distributed tracing](https://docs.newrelic.com/docs/apm/distributed-tracing/getting-started/introduction-distributed-tracing). Distributed tracing is on by default for Ruby agent versions 8.0.0 and above. Middlewares are not required to support distributed tracing.
Cross application tracing is deprecated in favor of [distributed tracing](/docs/apm/distributed-tracing/getting-started/introduction-distributed-tracing). Distributed tracing is on by default for Ruby agent versions 8.0.0 and above. Middlewares are not required to support distributed tracing.
To continue using cross application tracing, update the following options in your `newrelic.yml` configuration file:
Expand Down Expand Up @@ -1868,7 +1868,7 @@ def self.enforce_fallback(allowed_values: nil, fallback: nil)
# Rails
:'defer_rails_initialization' => {
:default => false,
:public => true,
:public => false,
:type => Boolean,
:allowed_from_server => false,
:description => 'This configuration option is currently unreachable. Please do not use. ' \
Expand Down Expand Up @@ -1912,7 +1912,7 @@ def self.enforce_fallback(allowed_values: nil, fallback: nil)
: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. See documentation on (ignoring specific transactions)[https://docs.newrelic.com/docs/agents/ruby-agent/api-guides/ignoring-specific-transactions/#config-ignoring] for more details.'
:description => 'Define transactions you want the agent to ignore, by specifying a list of patterns matching the URI you want to ignore. For more detail, see [the docs on ignoring specific transactions](/docs/agents/ruby-agent/api-guides/ignoring-specific-transactions/#config-ignoring).'
},
# Sidekiq
:'sidekiq.capture_params' => {
Expand Down

0 comments on commit bd1c848

Please sign in to comment.