From 49cbf98581d377e02157be26a14c23f762145375 Mon Sep 17 00:00:00 2001 From: Ahmed Ejaz Date: Tue, 10 Oct 2023 18:24:47 +0500 Subject: [PATCH] #2154, replace "start up" to "start-up" --- .github/actions/annotate/README.md | 2 +- CHANGELOG.md | 14 ++--- .../agent_integrations/agent.rb | 2 +- .../agent/configuration/default_source.rb | 62 +++++++++---------- .../instrumentation.thor | 6 +- newrelic.yml | 58 ++++++++--------- .../agent_only/thread_profiling_test.rb | 2 +- .../suites/rack/rack_env_mutation_test.rb | 2 +- .../agent/threading/agent_thread_test.rb | 2 +- test/new_relic/multiverse_helpers.rb | 2 +- test/performance/suites/thread_profiling.rb | 2 +- 11 files changed, 77 insertions(+), 77 deletions(-) diff --git a/.github/actions/annotate/README.md b/.github/actions/annotate/README.md index bb87d8fad2..fcdc03e038 100644 --- a/.github/actions/annotate/README.md +++ b/.github/actions/annotate/README.md @@ -46,7 +46,7 @@ A pre-commit hook is provided that can help keep dist/index.js in tune with loca # Using Node as a REPL If you're developing or working on the index.js script, it can be handy to try out stuff -locally. To do that, use Node to start up a REPL shell by running it from the action's folder: +locally. To do that, use Node to start-up a REPL shell by running it from the action's folder: ``` cd .github/workflow/actions/annotate diff --git a/CHANGELOG.md b/CHANGELOG.md index a1dfef7923..e84d29d580 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ Version brings support for gleaning a Docker container id from cgroups v2 - **Feature: Prevent the agent from starting in rails commands in Rails 7** - Previously, the agent ignored many Rails commands by default, such as `rails routes`, using Rake-specific logic. This was accomplished by setting these commands as default values for the config option `autostart.denylisted_rake_tasks`. However, Rails 7 no longer uses Rake for these commands, causing the agent to start running and attempting to record data when running these commands. The commands have now been added to the default value for the config option `autostart.denylisted_constants`, which will allow the agent to recognize these commands correctly in Rails 7 and prevent the agent from starting during ignored tasks. Note that the agent will continue to start up when the `rails server` and `rails runner` commands are invoked. [PR#2239](https://github.com/newrelic/newrelic-ruby-agent/pull/2239) + Previously, the agent ignored many Rails commands by default, such as `rails routes`, using Rake-specific logic. This was accomplished by setting these commands as default values for the config option `autostart.denylisted_rake_tasks`. However, Rails 7 no longer uses Rake for these commands, causing the agent to start running and attempting to record data when running these commands. The commands have now been added to the default value for the config option `autostart.denylisted_constants`, which will allow the agent to recognize these commands correctly in Rails 7 and prevent the agent from starting during ignored tasks. Note that the agent will continue to start-up when the `rails server` and `rails runner` commands are invoked. [PR#2239](https://github.com/newrelic/newrelic-ruby-agent/pull/2239) - **Feature: Enhance Docker container id reporting** @@ -456,7 +456,7 @@ Version 8.15.0 of the agent confirms compatibility with Ruby 3.2.0, adds instrum | Configuration name | Default | Behavior | | --------------------------------- | ------- | ------------------------------------------------------------------------------------------------------------------------------- | - | `instrumentation.concurrent_ruby` | auto | Controls auto-instrumentation of the concurrent-ruby library at start up. May be one of `auto`, `prepend`, `chain`, `disabled`. | + | `instrumentation.concurrent_ruby` | auto | Controls auto-instrumentation of the concurrent-ruby library at start-up. May be one of `auto`, `prepend`, `chain`, `disabled`. | - **Infinite Tracing: Use batching and compression** @@ -555,7 +555,7 @@ Version 8.12.0 of the agent delivers new Elasticsearch instrumentation, increase | Configuration name | Default | Behavior | | --------------------------------- | ------- | ----------------------------------------------------------------------------------------------------------------------------- | - | `instrumentation.elasticsearch` | auto | Controls auto-instrumentation of the elasticsearch library at start up. May be one of `auto`, `prepend`, `chain`, `disabled`. | + | `instrumentation.elasticsearch` | auto | Controls auto-instrumentation of the elasticsearch library at start-up. May be one of `auto`, `prepend`, `chain`, `disabled`. | | `elasticsearch.capture_queries` | true | If `true`, the agent captures Elasticsearch queries in transaction traces. | | `elasticsearch.obfuscate_queries` | true | If `true`, the agent obfuscates Elasticsearch queries in transaction traces. | @@ -1170,7 +1170,7 @@ The multiverse collection of test suites requires a variety of data handling sof - **Bugfix: Prevent browser monitoring middleware from installing to middleware multiple times** In rare cases on jRuby, the BrowserMonitoring middleware could attempt to install itself - multiple times at start up. This bug fix addresses that by using a mutex to introduce + multiple times at start-up. This bug fix addresses that by using a mutex to introduce thread safety to the operation. Sintra in particular can have this race condition because its middleware stack is not installed until the first request is received. @@ -1181,7 +1181,7 @@ The multiverse collection of test suites requires a variety of data handling sof - **Bugfix: nil Middlewares injection now prevented and gracefully handled in Sinatra** Previously, the agent could potentially inject multiples of an instrumented middleware if Sinatra received many - requests at once during start up and initialization due to Sinatra's ability to delay full start up as long as possible. + requests at once during start-up and initialization due to Sinatra's ability to delay full start-up as long as possible. This has now been fixed and the Ruby agent correctly instruments only once as well as gracefully handles nil middleware classes in general. @@ -3398,7 +3398,7 @@ For more details on our Resque support, see https://docs.newrelic.com/docs/agent - Support agent when starting Resque Pool from Rake task When running resque-pool with its provided rake tasks, the agent would not -start up properly. Thanks Tiago Sousa for the fix! +start-up properly. Thanks Tiago Sousa for the fix! - Fix for DelayedJob + Rails 4.x queue depth metrics @@ -5342,7 +5342,7 @@ Agent improvements to support future RPM enhancements - fix incompatibility in the developer mode with the safe_erb plugin - fix module namespace issue causing an error accessing NewRelic::Instrumentation modules -- fix issue where the agent sometimes failed to start up if there was a +- fix issue where the agent sometimes failed to start-up if there was a transient network problem - fix IgnoreSilentlyException message diff --git a/infinite_tracing/lib/infinite_tracing/agent_integrations/agent.rb b/infinite_tracing/lib/infinite_tracing/agent_integrations/agent.rb index 5b1ff268c5..465fd82705 100644 --- a/infinite_tracing/lib/infinite_tracing/agent_integrations/agent.rb +++ b/infinite_tracing/lib/infinite_tracing/agent_integrations/agent.rb @@ -8,7 +8,7 @@ module NewRelic::Agent Agent.class_eval do def new_infinite_tracer # We must start streaming in a thread or we block/deadlock the - # entire start up process for the Agent. + # entire start-up process for the Agent. InfiniteTracing::Client.new.tap do |client| @infinite_tracer_thread = InfiniteTracing::Worker.new(:infinite_tracer) do NewRelic::Agent.logger.debug('Opening Infinite Tracer Stream with gRPC server') diff --git a/lib/new_relic/agent/configuration/default_source.rb b/lib/new_relic/agent/configuration/default_source.rb index 8203627c2b..1c4ff488c9 100644 --- a/lib/new_relic/agent/configuration/default_source.rb +++ b/lib/new_relic/agent/configuration/default_source.rb @@ -1368,7 +1368,7 @@ def self.enforce_fallback(allowed_values: nil, fallback: nil) :public => true, :type => String, :allowed_from_server => false, - :description => 'Controls auto-instrumentation of `ActiveSupport::Logger` at start up. May be one of: `auto`, `prepend`, `chain`, `disabled`.' + :description => 'Controls auto-instrumentation of `ActiveSupport::Logger` at start-up. May be one of: `auto`, `prepend`, `chain`, `disabled`.' }, :'instrumentation.bunny' => { :default => 'auto', @@ -1376,7 +1376,7 @@ def self.enforce_fallback(allowed_values: nil, fallback: nil) :type => String, :dynamic_name => true, :allowed_from_server => false, - :description => 'Controls auto-instrumentation of bunny at start up. May be one of: `auto`, `prepend`, `chain`, `disabled`.' + :description => 'Controls auto-instrumentation of bunny at start-up. May be one of: `auto`, `prepend`, `chain`, `disabled`.' }, :'instrumentation.fiber' => { :default => 'auto', @@ -1384,7 +1384,7 @@ def self.enforce_fallback(allowed_values: nil, fallback: nil) :type => String, :dynamic_name => true, :allowed_from_server => false, - :description => 'Controls auto-instrumentation of the Fiber class at start up. May be one of: `auto`, `prepend`, `chain`, `disabled`.' + :description => 'Controls auto-instrumentation of the Fiber class at start-up. May be one of: `auto`, `prepend`, `chain`, `disabled`.' }, :'instrumentation.concurrent_ruby' => { :default => 'auto', @@ -1392,7 +1392,7 @@ def self.enforce_fallback(allowed_values: nil, fallback: nil) :type => String, :dynamic_name => true, :allowed_from_server => false, - :description => 'Controls auto-instrumentation of the concurrent-ruby library at start up. May be one of: `auto`, `prepend`, `chain`, `disabled`.' + :description => 'Controls auto-instrumentation of the concurrent-ruby library at start-up. May be one of: `auto`, `prepend`, `chain`, `disabled`.' }, :'instrumentation.curb' => { :default => 'auto', @@ -1401,7 +1401,7 @@ def self.enforce_fallback(allowed_values: nil, fallback: nil) :type => String, :dynamic_name => true, :allowed_from_server => false, - :description => 'Controls auto-instrumentation of Curb at start up. May be one of: `auto`, `prepend`, `chain`, `disabled`.' + :description => 'Controls auto-instrumentation of Curb at start-up. May be one of: `auto`, `prepend`, `chain`, `disabled`.' }, :'instrumentation.delayed_job' => { :default => 'auto', @@ -1410,7 +1410,7 @@ def self.enforce_fallback(allowed_values: nil, fallback: nil) :type => String, :dynamic_name => true, :allowed_from_server => false, - :description => 'Controls auto-instrumentation of Delayed Job at start up. May be one of: `auto`, `prepend`, `chain`, `disabled`.' + :description => 'Controls auto-instrumentation of Delayed Job at start-up. May be one of: `auto`, `prepend`, `chain`, `disabled`.' }, :'instrumentation.elasticsearch' => { :default => 'auto', @@ -1418,7 +1418,7 @@ def self.enforce_fallback(allowed_values: nil, fallback: nil) :type => String, :dynamic_name => true, :allowed_from_server => false, - :description => 'Controls auto-instrumentation of the elasticsearch library at start up. May be one of: `auto`, `prepend`, `chain`, `disabled`.' + :description => 'Controls auto-instrumentation of the elasticsearch library at start-up. May be one of: `auto`, `prepend`, `chain`, `disabled`.' }, :'instrumentation.excon' => { :default => 'enabled', @@ -1427,7 +1427,7 @@ def self.enforce_fallback(allowed_values: nil, fallback: nil) :type => String, :dynamic_name => true, :allowed_from_server => false, - :description => 'Controls auto-instrumentation of Excon at start up. May be one of: `enabled`, `disabled`.' + :description => 'Controls auto-instrumentation of Excon at start-up. May be one of: `enabled`, `disabled`.' }, :'instrumentation.grape' => { :default => 'auto', @@ -1435,7 +1435,7 @@ def self.enforce_fallback(allowed_values: nil, fallback: nil) :type => String, :dynamic_name => true, :allowed_from_server => false, - :description => 'Controls auto-instrumentation of Grape at start up. May be one of: `auto`, `prepend`, `chain`, `disabled`.' + :description => 'Controls auto-instrumentation of Grape at start-up. May be one of: `auto`, `prepend`, `chain`, `disabled`.' }, :'instrumentation.grpc_client' => { :default => 'auto', @@ -1444,7 +1444,7 @@ def self.enforce_fallback(allowed_values: nil, fallback: nil) :type => String, :dynamic_name => true, :allowed_from_server => false, - :description => 'Controls auto-instrumentation of gRPC clients at start up. May be one of: `auto`, `prepend`, `chain`, `disabled`.' + :description => 'Controls auto-instrumentation of gRPC clients at start-up. May be one of: `auto`, `prepend`, `chain`, `disabled`.' }, :'instrumentation.grpc.host_denylist' => { :default => [], @@ -1461,7 +1461,7 @@ def self.enforce_fallback(allowed_values: nil, fallback: nil) :type => String, :dynamic_name => true, :allowed_from_server => false, - :description => 'Controls auto-instrumentation of gRPC servers at start up. May be one of: `auto`, `prepend`, `chain`, `disabled`.' + :description => 'Controls auto-instrumentation of gRPC servers at start-up. May be one of: `auto`, `prepend`, `chain`, `disabled`.' }, :'instrumentation.httpclient' => { :default => 'auto', @@ -1470,7 +1470,7 @@ def self.enforce_fallback(allowed_values: nil, fallback: nil) :type => String, :dynamic_name => true, :allowed_from_server => false, - :description => 'Controls auto-instrumentation of HTTPClient at start up. May be one of: `auto`, `prepend`, `chain`, `disabled`.' + :description => 'Controls auto-instrumentation of HTTPClient at start-up. May be one of: `auto`, `prepend`, `chain`, `disabled`.' }, :'instrumentation.httprb' => { :default => 'auto', @@ -1479,7 +1479,7 @@ def self.enforce_fallback(allowed_values: nil, fallback: nil) :type => String, :dynamic_name => true, :allowed_from_server => false, - :description => 'Controls auto-instrumentation of http.rb gem at start up. May be one of: `auto`, `prepend`, `chain`, `disabled`.' + :description => 'Controls auto-instrumentation of http.rb gem at start-up. May be one of: `auto`, `prepend`, `chain`, `disabled`.' }, :'instrumentation.logger' => { :default => instrumentation_value_from_boolean(:'application_logging.enabled'), @@ -1488,7 +1488,7 @@ def self.enforce_fallback(allowed_values: nil, fallback: nil) :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`.' + :description => 'Controls auto-instrumentation of Ruby standard library Logger at start-up. May be one of: `auto`, `prepend`, `chain`, `disabled`.' }, :'instrumentation.memcache' => { :default => 'auto', @@ -1496,7 +1496,7 @@ def self.enforce_fallback(allowed_values: nil, fallback: nil) :type => String, :dynamic_name => true, :allowed_from_server => false, - :description => 'Controls auto-instrumentation of dalli gem for Memcache at start up. May be one of: `auto`, `prepend`, `chain`, `disabled`.' + :description => 'Controls auto-instrumentation of dalli gem for Memcache at start-up. May be one of: `auto`, `prepend`, `chain`, `disabled`.' }, :'instrumentation.memcached' => { :default => 'auto', @@ -1505,7 +1505,7 @@ def self.enforce_fallback(allowed_values: nil, fallback: nil) :type => String, :dynamic_name => true, :allowed_from_server => false, - :description => 'Controls auto-instrumentation of memcached gem for Memcache at start up. May be one of: `auto`, `prepend`, `chain`, `disabled`.' + :description => 'Controls auto-instrumentation of memcached gem for Memcache at start-up. May be one of: `auto`, `prepend`, `chain`, `disabled`.' }, :'instrumentation.memcache_client' => { :default => 'auto', @@ -1514,7 +1514,7 @@ def self.enforce_fallback(allowed_values: nil, fallback: nil) :type => String, :dynamic_name => true, :allowed_from_server => false, - :description => 'Controls auto-instrumentation of memcache-client gem for Memcache at start up. May be one of: `auto`, `prepend`, `chain`, `disabled`.' + :description => 'Controls auto-instrumentation of memcache-client gem for Memcache at start-up. May be one of: `auto`, `prepend`, `chain`, `disabled`.' }, :'instrumentation.mongo' => { :default => 'enabled', @@ -1523,7 +1523,7 @@ def self.enforce_fallback(allowed_values: nil, fallback: nil) :type => String, :dynamic_name => true, :allowed_from_server => false, - :description => 'Controls auto-instrumentation of Mongo at start up. May be one of: `enabled`, `disabled`.' + :description => 'Controls auto-instrumentation of Mongo at start-up. May be one of: `enabled`, `disabled`.' }, :'instrumentation.net_http' => { :default => 'auto', @@ -1532,7 +1532,7 @@ def self.enforce_fallback(allowed_values: nil, fallback: nil) :type => String, :dynamic_name => true, :allowed_from_server => false, - :description => 'Controls auto-instrumentation of `Net::HTTP` at start up. May be one of: `auto`, `prepend`, `chain`, `disabled`.' + :description => 'Controls auto-instrumentation of `Net::HTTP` at start-up. May be one of: `auto`, `prepend`, `chain`, `disabled`.' }, :'instrumentation.puma_rack' => { :default => value_of(:'instrumentation.rack'), @@ -1552,7 +1552,7 @@ def self.enforce_fallback(allowed_values: nil, fallback: nil) :type => String, :dynamic_name => true, :allowed_from_server => false, - :description => 'Controls auto-instrumentation of `Puma::Rack::URLMap` at start up. May be one of: `auto`, `prepend`, `chain`, `disabled`.' + :description => 'Controls auto-instrumentation of `Puma::Rack::URLMap` at start-up. May be one of: `auto`, `prepend`, `chain`, `disabled`.' }, :'instrumentation.rack' => { :default => 'auto', @@ -1572,7 +1572,7 @@ def self.enforce_fallback(allowed_values: nil, fallback: nil) :type => String, :dynamic_name => true, :allowed_from_server => false, - :description => 'Controls auto-instrumentation of `Rack::URLMap` at start up. May be one of: `auto`, `prepend`, `chain`, `disabled`.' + :description => 'Controls auto-instrumentation of `Rack::URLMap` at start-up. May be one of: `auto`, `prepend`, `chain`, `disabled`.' }, :'instrumentation.rake' => { :default => 'auto', @@ -1580,7 +1580,7 @@ def self.enforce_fallback(allowed_values: nil, fallback: nil) :type => String, :dynamic_name => true, :allowed_from_server => false, - :description => 'Controls auto-instrumentation of rake at start up. May be one of: `auto`, `prepend`, `chain`, `disabled`.' + :description => 'Controls auto-instrumentation of rake at start-up. May be one of: `auto`, `prepend`, `chain`, `disabled`.' }, :'instrumentation.redis' => { :default => 'auto', @@ -1588,7 +1588,7 @@ def self.enforce_fallback(allowed_values: nil, fallback: nil) :type => String, :dynamic_name => true, :allowed_from_server => false, - :description => 'Controls auto-instrumentation of Redis at start up. May be one of: `auto`, `prepend`, `chain`, `disabled`.' + :description => 'Controls auto-instrumentation of Redis at start-up. May be one of: `auto`, `prepend`, `chain`, `disabled`.' }, :'instrumentation.resque' => { :default => 'auto', @@ -1597,7 +1597,7 @@ def self.enforce_fallback(allowed_values: nil, fallback: nil) :type => String, :dynamic_name => true, :allowed_from_server => false, - :description => 'Controls auto-instrumentation of resque at start up. May be one of: `auto`, `prepend`, `chain`, `disabled`.' + :description => 'Controls auto-instrumentation of resque at start-up. May be one of: `auto`, `prepend`, `chain`, `disabled`.' }, :'instrumentation.roda' => { :default => 'auto', @@ -1605,7 +1605,7 @@ def self.enforce_fallback(allowed_values: nil, fallback: nil) :type => String, :dynamic_name => true, :allowed_from_server => false, - :description => 'Controls auto-instrumentation of Roda at start up. May be one of: `auto`, `prepend`, `chain`, `disabled`.' + :description => 'Controls auto-instrumentation of Roda at start-up. May be one of: `auto`, `prepend`, `chain`, `disabled`.' }, :'instrumentation.sinatra' => { :default => 'auto', @@ -1613,7 +1613,7 @@ def self.enforce_fallback(allowed_values: nil, fallback: nil) :type => String, :dynamic_name => true, :allowed_from_server => false, - :description => 'Controls auto-instrumentation of Sinatra at start up. May be one of: `auto`, `prepend`, `chain`, `disabled`.' + :description => 'Controls auto-instrumentation of Sinatra at start-up. May be one of: `auto`, `prepend`, `chain`, `disabled`.' }, :'instrumentation.stripe' => { :default => 'enabled', @@ -1656,14 +1656,14 @@ def self.enforce_fallback(allowed_values: nil, fallback: nil) :type => String, :dynamic_name => true, :allowed_from_server => false, - :description => 'Controls auto-instrumentation of the Thread class at start up to allow the agent to correctly nest spans inside of an asynchronous transaction. This does not enable the agent to automatically trace all threads created (see `instrumentation.thread.tracing`). May be one of: `auto`, `prepend`, `chain`, `disabled`.' + :description => 'Controls auto-instrumentation of the Thread class at start-up to allow the agent to correctly nest spans inside of an asynchronous transaction. This does not enable the agent to automatically trace all threads created (see `instrumentation.thread.tracing`). May be one of: `auto`, `prepend`, `chain`, `disabled`.' }, :'instrumentation.thread.tracing' => { :default => true, :public => true, :type => Boolean, :allowed_from_server => false, - :description => 'Controls auto-instrumentation of the Thread class at start up to automatically add tracing to all Threads created in the application.' + :description => 'Controls auto-instrumentation of the Thread class at start-up to automatically add tracing to all Threads created in the application.' }, :'thread_ids_enabled' => { :default => false, @@ -1678,7 +1678,7 @@ def self.enforce_fallback(allowed_values: nil, fallback: nil) :type => String, :dynamic_name => true, :allowed_from_server => false, - :description => 'Controls auto-instrumentation of the Tilt template rendering library at start up. May be one of: `auto`, `prepend`, `chain`, `disabled`.' + :description => 'Controls auto-instrumentation of the Tilt template rendering library at start-up. May be one of: `auto`, `prepend`, `chain`, `disabled`.' }, :'instrumentation.typhoeus' => { :default => 'auto', @@ -1687,7 +1687,7 @@ def self.enforce_fallback(allowed_values: nil, fallback: nil) :type => String, :dynamic_name => true, :allowed_from_server => false, - :description => 'Controls auto-instrumentation of Typhoeus at start up. May be one of: `auto`, `prepend`, `chain`, `disabled`.' + :description => 'Controls auto-instrumentation of Typhoeus at start-up. May be one of: `auto`, `prepend`, `chain`, `disabled`.' }, # Message tracer :'message_tracer.segment_parameters.enabled' => { @@ -2320,7 +2320,7 @@ def self.enforce_fallback(allowed_values: nil, fallback: nil) :public => false, :type => Boolean, :allowed_from_server => false, - :description => 'Used in tests for the agent to start up, but not connect to the collector. Formerly used `developer_mode` in test config for this purpose.' + :description => 'Used in tests for the agent to start-up, but not connect to the collector. Formerly used `developer_mode` in test config for this purpose.' }, :'thread_profiler.max_profile_overhead' => { :default => 0.05, diff --git a/lib/tasks/instrumentation_generator/instrumentation.thor b/lib/tasks/instrumentation_generator/instrumentation.thor index 8cc295d8e0..64fe40acc8 100644 --- a/lib/tasks/instrumentation_generator/instrumentation.thor +++ b/lib/tasks/instrumentation_generator/instrumentation.thor @@ -82,7 +82,7 @@ class Instrumentation < Thor insert_into_file( DEFAULT_SOURCE_LOCATION, config_block(name.downcase), - after: ":description => 'Controls auto-instrumentation of bunny at start up. May be one of [auto|prepend|chain|disabled].' + after: ":description => 'Controls auto-instrumentation of bunny at start-up. May be one of [auto|prepend|chain|disabled].' },\n" ) end @@ -103,7 +103,7 @@ class Instrumentation < Thor :type => String, :dynamic_name => true, :allowed_from_server => false, - :description => 'Controls auto-instrumentation of the #{name} library at start up. May be one of [auto|prepend|chain|disabled].' + :description => 'Controls auto-instrumentation of the #{name} library at start-up. May be one of [auto|prepend|chain|disabled].' }, CONFIG end @@ -111,7 +111,7 @@ class Instrumentation < Thor def yaml_block(name) <<~HEREDOC - # Controls auto-instrumentation of #{name} at start up. + # Controls auto-instrumentation of #{name} at start-up. # May be one of [auto|prepend|chain|disabled] # instrumentation.#{name.downcase}: auto HEREDOC diff --git a/newrelic.yml b/newrelic.yml index 9d74fa56a6..a3630d7b2b 100644 --- a/newrelic.yml +++ b/newrelic.yml @@ -374,39 +374,39 @@ common: &default_settings # Configures the TCP/IP port for the trace observer Host # infinite_tracing.trace_observer.port: 443 - # Controls auto-instrumentation of ActiveSupport::Logger at start up. May be one + # Controls auto-instrumentation of ActiveSupport::Logger at start-up. May be one # of: auto, prepend, chain, disabled. # instrumentation.active_support_logger: auto - # Controls auto-instrumentation of bunny at start up. May be one of: auto, + # Controls auto-instrumentation of bunny at start-up. May be one of: auto, # prepend, chain, disabled. # instrumentation.bunny: auto - # Controls auto-instrumentation of the concurrent-ruby library at start up. May be + # Controls auto-instrumentation of the concurrent-ruby library at start-up. May be # one of: auto, prepend, chain, disabled. # instrumentation.concurrent_ruby: auto - # Controls auto-instrumentation of Curb at start up. May be one of: auto, prepend, + # Controls auto-instrumentation of Curb at start-up. May be one of: auto, prepend, # chain, disabled. # instrumentation.curb: auto - # Controls auto-instrumentation of Delayed Job at start up. May be one of: auto, + # Controls auto-instrumentation of Delayed Job at start-up. May be one of: auto, # prepend, chain, disabled. # instrumentation.delayed_job: auto - # Controls auto-instrumentation of the elasticsearch library at start up. May be + # Controls auto-instrumentation of the elasticsearch library at start-up. May be # one of: auto, prepend, chain, disabled. # instrumentation.elasticsearch: auto - # Controls auto-instrumentation of Excon at start up. May be one of: enabled, + # Controls auto-instrumentation of Excon at start-up. May be one of: enabled, # disabled. # instrumentation.excon: enabled - # Controls auto-instrumentation of the Fiber class at start up. May be one of: + # Controls auto-instrumentation of the Fiber class at start-up. May be one of: # auto, prepend, chain, disabled. # instrumentation.fiber: auto - # Controls auto-instrumentation of Grape at start up. May be one of: auto, + # Controls auto-instrumentation of Grape at start-up. May be one of: auto, # prepend, chain, disabled. # instrumentation.grape: auto @@ -419,43 +419,43 @@ common: &default_settings # example, "private.com$,exception.*" # instrumentation.grpc.host_denylist: [] - # Controls auto-instrumentation of gRPC clients at start up. May be one of: auto, + # Controls auto-instrumentation of gRPC clients at start-up. May be one of: auto, # prepend, chain, disabled. # instrumentation.grpc_client: auto - # Controls auto-instrumentation of gRPC servers at start up. May be one of: auto, + # Controls auto-instrumentation of gRPC servers at start-up. May be one of: auto, # prepend, chain, disabled. # instrumentation.grpc_server: auto - # Controls auto-instrumentation of HTTPClient at start up. May be one of: auto, + # Controls auto-instrumentation of HTTPClient at start-up. May be one of: auto, # prepend, chain, disabled. # instrumentation.httpclient: auto - # Controls auto-instrumentation of http.rb gem at start up. May be one of: auto, + # Controls auto-instrumentation of http.rb gem at start-up. May be one of: auto, # prepend, chain, disabled. # instrumentation.httprb: auto - # Controls auto-instrumentation of Ruby standard library Logger at start up. May + # Controls auto-instrumentation of Ruby standard library Logger at start-up. May # be one of: auto, prepend, chain, disabled. # instrumentation.logger: auto - # Controls auto-instrumentation of dalli gem for Memcache at start up. May be one + # Controls auto-instrumentation of dalli gem for Memcache at start-up. May be one # of: auto, prepend, chain, disabled. # instrumentation.memcache: auto - # Controls auto-instrumentation of memcache-client gem for Memcache at start up. + # Controls auto-instrumentation of memcache-client gem for Memcache at start-up. # May be one of: auto, prepend, chain, disabled. # instrumentation.memcache_client: auto - # Controls auto-instrumentation of memcached gem for Memcache at start up. May be + # Controls auto-instrumentation of memcached gem for Memcache at start-up. May be # one of: auto, prepend, chain, disabled. # instrumentation.memcached: auto - # Controls auto-instrumentation of Mongo at start up. May be one of: enabled, + # Controls auto-instrumentation of Mongo at start-up. May be one of: enabled, # disabled. # instrumentation.mongo: enabled - # Controls auto-instrumentation of Net::HTTP at start up. May be one of: auto, + # Controls auto-instrumentation of Net::HTTP at start-up. May be one of: auto, # prepend, chain, disabled. # instrumentation.net_http: auto @@ -464,7 +464,7 @@ common: &default_settings # application startup. May be one of: auto, prepend, chain, disabled. # instrumentation.puma_rack: auto - # Controls auto-instrumentation of Puma::Rack::URLMap at start up. May be one of: + # Controls auto-instrumentation of Puma::Rack::URLMap at start-up. May be one of: # auto, prepend, chain, disabled. # instrumentation.puma_rack_urlmap: auto @@ -473,27 +473,27 @@ common: &default_settings # startup. May be one of: auto, prepend, chain, disabled. # instrumentation.rack: auto - # Controls auto-instrumentation of Rack::URLMap at start up. May be one of: auto, + # Controls auto-instrumentation of Rack::URLMap at start-up. May be one of: auto, # prepend, chain, disabled. # instrumentation.rack_urlmap: auto - # Controls auto-instrumentation of rake at start up. May be one of: auto, prepend, + # Controls auto-instrumentation of rake at start-up. May be one of: auto, prepend, # chain, disabled. # instrumentation.rake: auto - # Controls auto-instrumentation of Redis at start up. May be one of: auto, + # Controls auto-instrumentation of Redis at start-up. May be one of: auto, # prepend, chain, disabled. # instrumentation.redis: auto - # Controls auto-instrumentation of resque at start up. May be one of: auto, + # Controls auto-instrumentation of resque at start-up. May be one of: auto, # prepend, chain, disabled. # instrumentation.resque: auto - # Controls auto-instrumentation of Roda at start up. May be one of: auto, prepend, + # Controls auto-instrumentation of Roda at start-up. May be one of: auto, prepend, # chain, disabled. # instrumentation.roda: auto - # Controls auto-instrumentation of Sinatra at start up. May be one of: auto, + # Controls auto-instrumentation of Sinatra at start-up. May be one of: auto, # prepend, chain, disabled. # instrumentation.sinatra: auto @@ -501,13 +501,13 @@ common: &default_settings # disabled. # instrumentation.stripe: enabled - # Controls auto-instrumentation of the Thread class at start up to allow the agent + # Controls auto-instrumentation of the Thread class at start-up to allow the agent # to correctly nest spans inside of an asynchronous transaction. This does not # enable the agent to automatically trace all threads created (see # instrumentation.thread.tracing). May be one of: auto, prepend, chain, disabled. # instrumentation.thread: auto - # Controls auto-instrumentation of the Thread class at start up to automatically + # Controls auto-instrumentation of the Thread class at start-up to automatically # add tracing to all Threads created in the application. # instrumentation.thread.tracing: true @@ -515,7 +515,7 @@ common: &default_settings # up. May be one of: auto, prepend, chain, disabled. # instrumentation.tilt: auto - # Controls auto-instrumentation of Typhoeus at start up. May be one of: auto, + # Controls auto-instrumentation of Typhoeus at start-up. May be one of: auto, # prepend, chain, disabled. # instrumentation.typhoeus: auto diff --git a/test/multiverse/suites/agent_only/thread_profiling_test.rb b/test/multiverse/suites/agent_only/thread_profiling_test.rb index 6a9211620d..cbc929bf36 100644 --- a/test/multiverse/suites/agent_only/thread_profiling_test.rb +++ b/test/multiverse/suites/agent_only/thread_profiling_test.rb @@ -105,7 +105,7 @@ def run_transaction_in_thread(category) sleep # sleep until explicitly woken in join_background_threads end end - q.pop # block until the thread has had a chance to start up + q.pop # block until the thread has had a chance to start-up end def let_it_finish diff --git a/test/multiverse/suites/rack/rack_env_mutation_test.rb b/test/multiverse/suites/rack/rack_env_mutation_test.rb index 301baa3c3b..66e9020569 100644 --- a/test/multiverse/suites/rack/rack_env_mutation_test.rb +++ b/test/multiverse/suites/rack/rack_env_mutation_test.rb @@ -27,7 +27,7 @@ def call(env) end end - # Give the thread we just spawned a chance to start up + # Give the thread we just spawned a chance to start-up Thread.pass [200, {}, ['cool story']] diff --git a/test/new_relic/agent/threading/agent_thread_test.rb b/test/new_relic/agent/threading/agent_thread_test.rb index 54110dc1a2..7475f57b66 100644 --- a/test/new_relic/agent/threading/agent_thread_test.rb +++ b/test/new_relic/agent/threading/agent_thread_test.rb @@ -45,7 +45,7 @@ def test_bucket_thread_as_request end q0.pop - # wait until thread has had a chance to start up + # wait until thread has had a chance to start-up assert_equal :request, AgentThread.bucket_thread(t, DONT_CARE) q1.push('unblock background thread') diff --git a/test/new_relic/multiverse_helpers.rb b/test/new_relic/multiverse_helpers.rb index 922641c395..b14a5f8f47 100644 --- a/test/new_relic/multiverse_helpers.rb +++ b/test/new_relic/multiverse_helpers.rb @@ -86,7 +86,7 @@ def teardown_agent NewRelic::Agent.shutdown - # If we didn't start up right, our Control might not have reset on shutdown + # If we didn't start-up right, our Control might not have reset on shutdown NewRelic::Control.reset end diff --git a/test/performance/suites/thread_profiling.rb b/test/performance/suites/thread_profiling.rb index 625bb4358e..9b036d90f2 100644 --- a/test/performance/suites/thread_profiling.rb +++ b/test/performance/suites/thread_profiling.rb @@ -43,7 +43,7 @@ def setup end end - # Ensure that all threads have had a chance to start up + # Ensure that all threads have had a chance to start-up started_count = 0 while started_count < @nthreads @threadq.pop