newrelic_rpm 8.5.0 → 8.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff4bb770c2546249bd596030077d4bd4b6d8da0ec6fb219dfa4e0990ed4de01f
-  data.tar.gz: 07541c66a40a3aad42080456cf14e4614d2047961ab25b69ba78cbbf89e01a15
+  metadata.gz: 0eb3871a3ff66d8707dd01f40025d812d34904c02631d3a83af046bdbaeacdeb
+  data.tar.gz: 4e73dfe935bcd268ad0969a2c076e83313e75c3f3f0b711a7cba8c3af1327677
 SHA512:
-  metadata.gz: 68f9b48eb971dec54dfcb0c95f8e870f2b04e77835b04e48a87dfdbd9e0d2b16ffbdf8c823be84ebe9faccd60e7dfbb9a6f7343af92a0976d978687ed342a87c
-  data.tar.gz: '0689a97e70e353df30773421725ceb217ea62202dc5f6299b1058afc03449c5b6e26383335ce0245e1611e5ac12760e5e23647aee7427ce487f07f4b7bc0661f'
+  metadata.gz: 07566af3aff20a1fe5951fb36e34086f665e8788ecb7edfd2664213e73877e7a1c58d4447f2dd85efb75beeda0ce2f484c513d4a7a09c01bcbe4c20e8a5cba1a
+  data.tar.gz: 577944d3712cdd9908d4a564346e7f4bd6fd5772fa00069d73acdb3d8a033621042c72346ddd4ca22585910f035116701f0f904dd8f40c8f0b1e9934bd787705

data/.rubocop.yml

@@ -819,9 +819,6 @@ Lint/UselessAccessModifier:
 Lint/UselessAssignment:
   Enabled: false
 
-Lint/UselessElseWithoutRescue:
-  Enabled: true
-
 Lint/UselessMethodDefinition:
   Enabled: false
 
@@ -967,6 +964,9 @@ Performance/CollectionLiteralInLoop:
 Performance/CompareWithBlock:
   Enabled: true
 
+Performance/ConcurrentMonotonicTime:
+  Enabled: true
+
 # Disabling for now
 Performance/ConstantRegexp:
   Enabled: false
@@ -1072,6 +1072,9 @@ Performance/Squeeze:
 Performance/StartWith:
   Enabled: false
 
+Performance/StringIdentifierArgument:
+  Enabled: true
+
 Performance/StringInclude:
   Enabled: false
 

data/.yardopts

@@ -1,6 +1,7 @@
 --non-transitive-tag api
 --api public
 lib/new_relic/agent.rb
+lib/new_relic/traced_thread.rb
 lib/new_relic/agent/method_tracer.rb
 lib/new_relic/agent/distributed_tracing.rb
 lib/new_relic/agent/distributed_trace_payload.rb

data/CHANGELOG.md

@@ -1,5 +1,131 @@
 # New Relic Ruby Agent Release Notes #
 
+  ## v8.8.0
+
+  * **Support Makara database adapters with ActiveRecord**
+
+    Thanks to a community submission from @lucasklaassen with [PR #1177](https://github.com/newrelic/newrelic-ruby-agent/pull/1177), the Ruby agent will now correctly work well with the [Makara gem](https://github.com/instacart/makara). Functionality such as SQL obfuscation should now work when Makara database adapters are used with Active Record.
+
+  * **Lowered the minimum payload size to compress**
+
+    Previously the Ruby agent used a particularly large payload size threshold of 64KiB that would need to be met before the agent would compress data en route to New Relic's collector. The original value stems from segfault issues that very old Rubies (< 2.2) used to encounter when compressing smaller payloads. This value has been lowered to 2KiB (2048 bytes), which should provide a more optimal balance between the CPU cycles spent on compression and the bandwidth savings gained from it.
+
+  * **Provide Code Level Metrics for New Relic CodeStream**
+
+    For Ruby on Rails applications and/or those with manually traced methods, the agent is now capable of reporting metrics with Ruby method-level granularity. When the new `code_level_metrics.enabled` configuration parameter is set to a `true` value, the agent will associate source-code-related metadata with the metrics for things such as Rails controller methods. Then, when the corresponding Ruby class file that defines the methods is loaded up in a [New Relic CodeStream](https://www.codestream.com/)-powered IDE, [the four golden signals](https://sre.google/sre-book/monitoring-distributed-systems/) for each method will be presented to the developer directly.
+
+  * **Supportability Metrics will always report uncompressed payload size**
+
+    New Relic's agent specifications call for Supportability Metrics to always reference the uncompressed payload byte size. Previously, the Ruby agent was calculating the byte size after compression. Furthermore, compression is only performed on payloads of a certain size. This means that sometimes the value could have represented a compressed size and sometimes an uncompressed one. Now the uncompressed value is always used, bringing consistency for comparing two instances of the same metric and alignment with the New Relic agent specifications.
+
+
+  ## v8.7.0
+
+  * **APM logs-in-context log forwarding on by default**
+
+    Automatic application log forwarding is now enabled by default. This version of the agent will automatically send enriched application logs to New Relic. To learn more about about this feature see [here](https://docs.newrelic.com/docs/apm/new-relic-apm/getting-started/get-started-logs-context/), and additional configuration options are available [here](https://docs.newrelic.com/docs/logs/logs-context/configure-logs-context-ruby). To learn about how to toggle log ingestion on or off by account see [here](https://docs.newrelic.com/docs/logs/logs-context/disable-automatic-logging).
+
+  * **Improved async support and Thread instrumentation**
+
+    Previously, the agent was not able to record events and metrics inside Threads created inside of an already running transaction. This release includes 2 new configuration options to support multithreaded applications to automatically instrument threads. A new configuration option,`instrumentation.thread.tracing` (disabled by default), has been introduced that, when enabled, will allow the agent to insert New Relic tracing inside of all Threads created by an application. To support applications that only want some threads instrumented by New Relic, a new class is available, `NewRelic::TracedThread`, that will create a thread that includes New Relic instrumentation, see our [API documentation](https://www.rubydoc.info/gems/newrelic_rpm/NewRelic) for more details.
+
+    New configuration options included in this release:
+    | Configuration name | Default | Behavior |
+    | ----------- | ----------- |----------- |
+    | `instrumentation.thread`  | `auto` (enabled) | Allows the agent to correctly nest spans inside of an asyncronous transaction   |
+    | `instrumentation.thread.tracing` | `false` (disabled)   |  Automatically add tracing to all Threads created in the application. This may be enabled by default in a future release. |
+
+    We'd like to thank @mikeantonelli for sharing a gist with us that provided our team with an entry point for this feature.
+
+  * **Deprecate support for Ruby 2.2**
+
+    Ruby 2.2 reached end of life on March 31, 2018. The agent has deprecated support for Ruby 2.2 and will make breaking changes for this version in its next major release.
+
+  *  **Deprecate instrumentation versions with low adoption and/or versions over five years old**
+
+    This release deprecates the following instrumentation:
+    | Deprecated | Replacement |
+    | ----------- | ----------- |
+    | ActiveMerchant < 1.65.0 | ActiveMerchant >= 1.65.0 |
+    | Acts As Solr (all versions) | none |
+    | Authlogic (all versions) | none |
+    | Bunny < 2.7.0 | bunny >= 2.7.0 |
+    | Dalli < 3.2.1 | Dalli >= 3.2.1 |
+    | DataMapper (all versions) | none |
+    | Delayed Job < 4.1.0 | Delayed Job >= 4.1.0 |
+    | Excon < 0.56.0 | Excon >= 0.56.0 |
+    | Grape < 0.19.2 | Grape >= 0.19.2 |
+    | HTTPClient < 2.8.3 | HTTPClient 2.8.3 |
+    | HTTP.rb < 2.2.2 | HTTP.rb >= 2.2.2 |
+    | Mongo < 2.4.1 | Mongo >= 2.4.1 |
+    | Padrino < 0.15.0 | Padrino >= 0.15.0 |
+    | Passenger < 5.1.3 | Passenger >= 5.1.3 |
+    | Puma < 3.9.0 | Puma >= 3.9.0 |
+    | Rack < 1.6.8 | Rack >= 1.6.8 |
+    | Rails 3.2.x | Rails >= 4.x |
+    | Rainbows (all versions) | none |
+    | Sequel < 4.45.0 | Sequel >= 4.45.0 |
+    | Sidekiq < 5.0.0 | Sidekiq >= 5.0.0 |
+    | Sinatra < 2.0.0 | Sinatra >= 2.0.0 |
+    | Sunspot (all versions) | none |
+    | Typhoeus < 1.3.0 | Typhoeus >= 1.3.0 |
+    | Unicorn < 5.3.0 | Unicorn >= 5.3.0 |
+
+    For the gems with deprecated versions, we will no longer test those versions in our multiverse suite. They may, however, still be compatible with the agent. We will no longer fix bug reports for issues related to these gem versions.
+
+  * **Clarify documentation for `rake.tasks` configuration**
+
+    The `rake.tasks` description in the default `newrelic.yml` file and the [New Relic Ruby Agent Configuration docs](https://docs.newrelic.com/docs/apm/agents/ruby-agent/configuration/ruby-agent-configuration#rake-tasks) have been updated to clarify its behavior and usage. The documentation now reads:
+
+    > Specify an array of Rake tasks to automatically instrument. This configuration option converts the Array to a RegEx list. If you'd like to allow all tasks by default, use `rake.tasks: [.+]`. Rake tasks will not be instrumented unless they're added to this list. For more information, visit the (New Relic Rake Instrumentation docs)[/docs/apm/agents/ruby-agent/background-jobs/rake-instrumentation].
+
+    We thank @robotfelix for suggesting these changes.
+
+  * **Internally leverage `Object.const_get` and `Object.const_defined?`**
+
+    When dynamically checking for or obtaining a handle to a class constant from a string, leverage the `Object` class's built in methods wherever possible to enjoy simpler, more performant operations. All JRubies and CRubies v2.5 and below need a bit of assistance beyond what `Object` can provide given that those Rubies may yield an unwanted constant from a different namespace than the one that was specified. But for all other Rubies and even for those Rubies in contexts where we can 100% trust the string value coming in, leverage the `Object` class's methods and reap the benefits.
+
+  * **Enable Environment Variables setting Array configurations to be converted to Arrays**
+
+    Prior to this change, when comma-separated lists were passed as environment variables, an error would be emitted to the `newrelic_agent.log` and a String would be set as the value. Now, Arrays will be accurately coerced.
+
+  * **Bugfix: Allow TransactionEvents to be sampled at the expected rate**
+
+    The `transaction_events.max_samples_stored` capacity value within the TransactionEventAggregator did not match up with its expected harvest cycle interval, causing TransactionEvents to be over-sampled. This bugfix builds upon the updates made in [#952](https://github.com/newrelic/newrelic-ruby-agent/pull/952) so that the interval and capacity behave as expected for the renamed `transaction_events*` configuration options.
+
+  * **Bugfix: Error events missing attributes when created outside of a transaction**
+
+    Previously the agent was not assigning a priority to error events that were created by calling notice_error outside the scope of a transaction. This caused issues with sampling when the error event buffer was full, resulting in a `NoMethodError: undefined method '<' for nil:NilClass` in the newrelic_agent.log. This bugfix ensures that a priority is always assigned on error events so that the agent will be able to sample these error events correctly. Thank you to @olleolleolle for bringing this issue to our attention.
+    
+
+
+  ## v8.6.0
+
+  * **Telemetry-in-Context: Automatic Application Logs, a quick way to view logs no matter where you are in the platform**
+
+    - Adds support for forwarding application logs to New Relic. This automatically sends application logs that have been enriched to power Telemetry-in-Context. This is disabled by default in this release. This may be on by default in a future release.
+    - Adds support for enriching application logs written to disk or standard out. This can be used with another log forwarder to power Telemetry-in-Context if in-agent log forwarding is not desired. We recommend enabling either log forwarding or local log decorating, but not both features. This is disabled by default in this release.
+    - Improves speed and Resque support for logging metrics which shows the rate of log message by severity in the Logs chart in the APM Summary view. This is enabled by default in this release.
+
+    To learn more about Telemetry-in-Context and the configuration options please see the documentation [here](https://docs.newrelic.com/docs/apm/agents/ruby-agent/configuration/ruby-agent-configuration/).
+
+  * **Improve the usage of the 'hostname' executable and other executables**
+
+    In all places where a call to an executable binary is made (currently this is done only for the 'hostname' and 'uname' binaries), leverage a new helper method when making the call. This new helper will a) not attempt to execute the binary if it cannot be found, and b) prevent STDERR/STDOUT content from appearing anywhere except New Relic's own logs if the New Relic logger is set to the 'debug' level. When calling 'hostname', fall back to `Socket.gethostname` if the 'hostname' binary cannot be found. When calling 'uname', fall back on using a value of 'unknown' if the 'uname' command fails. Many thanks to @metaskills and @brcarp for letting us know that Ruby AWS Lambda functions can't invoke 'hostname' and for providing ideas and feedback with [Issue #697](https://github.com/newrelic/newrelic-ruby-agent/issues/697).
+
+  * **Documentation: remove confusing duplicate RUM entry from newrelic.yml**
+
+    The `browser_monitoring.auto_instrument` configuration option to enable web page load timing (RUM) was confusingly listed twice in the newrelic.yml config file. This option is enabled by default. The newrelic.yml file has been updated to list the option only once. Many thanks to @robotfelix for bringing this to our attention with [Issue #955](https://github.com/newrelic/newrelic-ruby-agent/issues/955).
+
+  * **Bugfix: fix unit test failures when New Relic environment variables are present**
+
+    Previously, unit tests would fail with unexpected invocation errors when `NEW_RELIC_LICENSE_KEY` and `NEW_RELIC_HOST` environment variables were present. Now, tests will discard these environment variables before running.
+
+  * **Bugfix: Curb - satify method_with_tracing's verb argument requirement**
+
+    When Curb instrumentation is used (either via prepend or chain), be sure to always pass the verb argument over to `method_with_tracing` which requires it. Thank you to @knarewski for bringing this issue to our attention, for providing a means of reproducing an error, and for providing a fix. That fix has been replicated by the agent team with permission. See [Issue 1033](https://github.com/newrelic/newrelic-ruby-agent/issues/1033) for more details.
+
+
   ## v8.5.0
 
   * **AWS: Support IMDSv2 by using a token with metadata API calls**
@@ -564,7 +690,7 @@
   ## v6.12.0
 
   * The New Relic Ruby Agent is now open source under the [Apache 2 license](LICENSE)
-    and you can now observe the project roadmap. See our [Contributing guide](https://github.com/newrelic/newrelic-ruby-agent/blob/main/CONTRIBUTING.md)
+    and you can now observe the [issues we're working on](https://github.com/orgs/newrelic/projects/17). See our [Contributing guide](https://github.com/newrelic/newrelic-ruby-agent/blob/main/CONTRIBUTING.md)
     and [Code of Conduct](https://github.com/newrelic/.github/blob/master/CODE_OF_CONDUCT.md) for details on contributing!
 
   * **Security: Updated all uses of Rake to >= 12.3.3**

data/CONTRIBUTING.md

@@ -128,7 +128,7 @@ This will run the unit tests in standalone mode. You can run against a specific
 by passing the version name (which should match the name of a subdirectory in test/environments)
 as an argument to the test:env rake task, like this:
 
-bundle exec rake test:env[rails60]
+bundle exec rake 'test:env[rails60]'
 
 These tests are setup to run automatically in
 [GitHub Actions](https://github.com/newrelic/newrelic-ruby-agent/actions) under several

data/LICENSE

@@ -175,10 +175,6 @@
 
    END OF TERMS AND CONDITIONS
 
-   Versions 6.12.0 and above for this project are licensed under 
-   Apache 2.0.  For prior versions of this project, please see the 
-   LICENSE file in the root directory of that version for more information.
-
    APPENDIX: How to apply the Apache License to your work.
 
       To apply the Apache License to your work, attach the following
@@ -204,5 +200,3 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 
-
-

data/README.md

@@ -1,4 +1,4 @@
-[![Community Plus header](https://github.com/newrelic/opensource-website/raw/master/src/images/categories/Community_Plus.png)](https://opensource.newrelic.com/oss-category/#community-plus)
+[![Blue banner - Community Plus: This code is currently maintained by New Relic engineering teams and delivered here in GitHub. See the README for troubleshooting and defect reporting instructions.](https://github.com/newrelic/opensource-website/raw/master/src/images/categories/Community_Plus.png)](https://opensource.newrelic.com/oss-category/#community-plus)
 
 # New Relic Ruby Agent
 
@@ -8,7 +8,7 @@ You can also extend the agent's performance monitoring to
 [collect and analyze business data](https://docs.newrelic.com/docs/agents/ruby-agent/getting-started/introduction-new-relic-ruby#business-data)
 to help you improve the customer experience and make data-driven business decisions.
 
-The New Relic Ruby Agent is dual-purposed as a either a Gem or a Rails plugin,
+The New Relic Ruby agent is dual-purposed as 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)
@@ -23,13 +23,13 @@ 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)
+The latest released gem for the Ruby agent can be found at [Rubygems.org](https://rubygems.org/gems/newrelic_rpm)
 
 ### Quick Start
 
 #### With Bundler
 
-For using with Bundler, add the Ruby Agent to your project's Gemfile.
+For using with Bundler, add the Ruby agent to your project's Gemfile.
 
 ```ruby
 gem 'newrelic_rpm'
@@ -71,16 +71,18 @@ For complete documentation on installing the New Relic Ruby agent, see the follo
 * [GAE Flexible Environment](https://docs.newrelic.com/docs/agents/ruby-agent/installation/install-new-relic-ruby-agent-gae-flexible-environment)
 * [Pure Rack Apps](http://docs.newrelic.com/docs/ruby/rack-middlewares)
 * [Ruby agent and Heroku](https://docs.newrelic.com/docs/agents/ruby-agent/installation/ruby-agent-heroku)
-* [Background Jobs](https://docs.newrelic.com/docs/agents/ruby-agent/background-jobs)
+* [Background Jobs](https://docs.newrelic.com/docs/agents/ruby-agent/background-jobs/monitor-ruby-background-processes)
 * [Uninstall the Ruby agent](https://docs.newrelic.com/docs/agents/ruby-agent/installation/uninstall-ruby-agent)
 
 ### Recording Deploys
 
-The Ruby Agent supports recording deployments in New Relic via a command line
-tool or Capistrano recipes. For more information on these features see
+The Ruby agent supports* recording deployments in New Relic via a command line
+tool or Capistrano recipes. For more information on these features, see
 [our deployment documentation](http://docs.newrelic.com/docs/ruby/recording-deployments-with-the-ruby-agent)
 for more information.
 
+*There is a [known issue](https://github.com/newrelic/newrelic-ruby-agent/issues/715) that prevents newly generated New Relic API keys from recording deploys.
+
 ## Support
 
 Should you need assistance with New Relic products, you are in good hands with several support diagnostic tools and support channels.
@@ -103,17 +105,14 @@ If the issue has been confirmed as a bug or is a Feature request, please file a
 
 At New Relic we take your privacy and the security of your information seriously, and are committed to protecting your information. We must emphasize the importance of not sharing personal data in public forums, and ask all users to scrub logs and diagnostic information for sensitive information, whether personal, proprietary, or otherwise.
 
-We define “Personal Data” as any information relating to an identified or identifiable individual, including, for example, your name, phone number, post code or zip code, Device ID, IP address and email address.
+We define “Personal Data” as any information relating to an identified or identifiable individual, including, for example, your name, phone number, post code or zip code, Device ID, IP address, and email address.
 
 Please review [New Relic’s General Data Privacy Notice](https://newrelic.com/termsandconditions/privacy) for more information.
 
-## Roadmap
-See our [roadmap](https://github.com/newrelic/newrelic-ruby-agent/blob/main/ROADMAP.md), to learn more about our product vision, understand our plans, and provide us valuable feedback.
-
 ## Contributing
 
-We encourage contributions to improve the New Relic Ruby agent! Keep in mind when you submit your pull request, you'll need to sign the CLA via the click-through using CLA-Assistant. You only have to sign the CLA one time per project.
-If you have any questions, or to execute our corporate CLA, required if your contribution is on behalf of a company,  please drop us an email at opensource@newrelic.com.
+We encourage contributions to improve the New Relic Ruby agent! Keep in mind when you submit your pull request, you'll need to sign the Contributor License Agreement (CLA) via the click-through using CLA-Assistant. You only have to sign the CLA one time per project.
+If you have any questions, or to execute our corporate CLA (required if your contribution is on behalf of a company), please drop us an email at opensource@newrelic.com.
 
 **A note about vulnerabilities**
 
@@ -128,13 +127,12 @@ the [New Relic Ruby agent](https://opensource.newrelic.com/projects/newrelic/new
 
 ## License
 
-The New Relic Ruby agent is licensed under the [Apache 2.0](http://apache.org/licenses/LICENSE-2.0.txt) License.
-The New Relic Ruby agent also uses source code from third-party libraries. Full details on which libraries are used and the terms under which they are licensed can be found in the [THIRD_PARTY_NOTICES.md](https://github.com/newrelic/newrelic-ruby-agent/blob/main/THIRD_PARTY_NOTICES.md).
+As of version 6.12 (released July 16, 2020), the New Relic Ruby agent is licensed under the Apache License, Version 2.0. See [LICENSE](LICENSE) for a copy of the license. For older agent versions, check the LICENSE file included with the source code.
 
-## Thank You
+The New Relic Ruby agent may use source code from third-party libraries. When used, these libraries will be outlined in [THIRD_PARTY_NOTICES.md](THIRD_PARTY_NOTICES.md).
 
-Thank you, and may your application scale to infinity plus one.
+## Thank You
 
-Lew Cirne, Founder
+Thank you,
 
-New Relic, Inc.
+New Relic Ruby agent team

data/Rakefile

@@ -11,15 +11,6 @@ task :test => ['test:newrelic']
 namespace :test do
   desc "Run all tests"
   task :all => %w[newrelic multiverse all_compatible_envs]
-
-  begin
-    require 'test_bisect'
-    TestBisect::BisectTask.new do |t|
-      t.test_task_name = 'test:newrelic'
-    end
-  rescue LoadError
-  end
-
   agent_home = File.expand_path(File.dirname(__FILE__))
 
   desc "Run agent performance tests"
@@ -65,7 +56,7 @@ task :record_build, [:build_number, :stage] do |t, args|
   build_string = args.build_number
   build_string << ".#{args.stage}" unless args.stage.nil? || args.stage.empty?
 
-  gitsha = File.exists?(".git") ? `git rev-parse HEAD` : "Unknown"
+  gitsha = File.exist?(".git") ? `git rev-parse HEAD` : "Unknown"
   gitsha.chomp!
 
   File.open("lib/new_relic/build.rb", "w") do |f|
@@ -116,24 +107,38 @@ task :update_ca_bundle do |t|
 end
 
 namespace :cross_agent_tests do
-  cross_agent_tests_upstream_path = File.expand_path(File.join(File.dirname(__FILE__), '..', 'cross_agent_tests'))
-  cross_agent_tests_local_path = File.expand_path(File.join(File.dirname(__FILE__), 'test', 'fixtures', 'cross_agent_tests'))
+  CROSS_AGENT_TESTS_UPSTREAM_PATH = File.expand_path(File.join('..', 'cross_agent_tests')).freeze
+  CROSS_AGENT_TESTS_LOCAL_PATH = File.expand_path(File.join('test', 'fixtures', 'cross_agent_tests')).freeze
+
+  def prompt_to_continue(command, destination = 'local')
+    puts "The following rsync command will be executed to update the #{destination} copy of the specs:"
+    puts
+    puts command
+    puts
+    puts "CAUTION: Any unsaved changes that exist within the #{destination} content will be OVERWRITTEN!"
+    if destination.eql?('local')
+      puts 'CAUTION 2: Before continuing, make sure your local repo is on the correct, synced branch!'
+    end
+    puts
+    print "Do you wish to continue? ('y' to continue, return to cancel) [n] "
+    continue = STDIN.gets.chomp
+    if continue.downcase.eql?('y')
+      system(command)
+    else
+      puts 'Cancelled'
+    end
+  end
 
-  # Note: before you pull, make sure your local repo is on the correct, synced branch!
   desc 'Pull latest changes from cross_agent_tests repo'
   task :pull do
-    puts "Updating embedded cross_agent_tests from #{cross_agent_tests_upstream_path}..."
-    cmd = "rsync -avu --exclude .git #{cross_agent_tests_upstream_path}/ #{cross_agent_tests_local_path}/"
-    puts cmd
-    system(cmd)
+    command = "  rsync -av --exclude .git #{CROSS_AGENT_TESTS_UPSTREAM_PATH}/ #{CROSS_AGENT_TESTS_LOCAL_PATH}/"
+    prompt_to_continue(command)
   end
 
   desc 'Copy changes from embedded cross_agent_tests to official repo working copy'
   task :push do
-    puts "Copying changes from embedded cross_agent_tests to #{cross_agent_tests_upstream_path}..."
-    cmd = "rsync -avu #{cross_agent_tests_local_path}/ #{cross_agent_tests_upstream_path}/"
-    puts cmd
-    system(cmd)
+    command = "rsync -av #{CROSS_AGENT_TESTS_LOCAL_PATH}/ #{CROSS_AGENT_TESTS_UPSTREAM_PATH}/"
+    prompt_to_continue(command, 'remote (agent spec repo)')
   end
 end
 

data/THIRD_PARTY_NOTICES.md

@@ -1,8 +1,8 @@
 # Third Party Notices
 
-The New Relic Ruby Agent uses source code from third party libraries which carry
-their own copyright notices and license terms. These notices are provided
-below.
+The New Relic Ruby agent may make use of source code from third party libraries
+which carry their own copyright notices and license terms. Any such content will
+be provided below.
 
 In the event that a required notice is missing or incorrect, please notify us
 by e-mailing [open-source@newrelic.com](mailto:open-source@newrelic.com).
@@ -11,203 +11,18 @@ For any licenses that require the disclosure of source
 code, the source code can be found at:
 [https://github.com/newrelic/newrelic-ruby-agent](https://github.com/newrelic/newrelic-ruby-agent).
 
-## Content
 
-* [symantec](#symantec)
+## Current Notices and Terms
 
-### symantec
+As of version 7.0 (released April 23, 2021), the New Relic Ruby agent does not
+include any third party software with its distribution.
 
-This product includes certificates from Symantec which are used under the
-following license (https://docs.broadcom.com/doc/root-certificate-license-agreement-en):
+The Ruby agent team leverages a variety of open source third party software for
+the development of the agent but not distributed with the agent. Some of these
+software packages are referenced as development dependencies in the agent's
+[newrelic_rpm.gemspec](newrelic_rpm.gemspec) file. We are grateful
+to the maintainers and contributors for all of these packages.
 
-```
-ROOT CERTIFICATE LICENSE AGREEMENT
-SYMANTEC CORPORATION AND/OR ITS AFFILIATES (“SYMANTEC”) IS WILLING TO PROVIDE THE
-ROOT CERTIFICATES TO YOU AS THE INDIVIDUAL, THE COMPANY, OR THE LEGAL ENTITY THAT
-WILL BE UTILIZING THE ROOT CERTIFICATES (REFERENCED BELOW AS “YOU” OR “YOUR”)
-ONLY ON THE CONDITION THAT YOU ACCEPT ALL OF THE TERMS OF THIS AGREEMENT
-(“AGREEMENT”). READ THE TERMS AND CONDITIONS OF THIS AGREEMENT CAREFULLY
-BEFORE USING THE ROOT CERTIFICATES. THIS IS A LEGAL AND ENFORCEABLE CONTRACT
-BETWEEN YOU AND SYMANTEC. BY USING THE ROOT CERTIFICATES, YOU AGREE TO THE
-TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT AGREE TO THESE TERMS AND
-CONDITIONS, MAKE NO FURTHER USE OF THE ROOT CERTIFICATES. UNLESS OTHERWISE
-DEFINED HEREIN, CAPITALIZED TERMS WILL HAVE THE MEANING GIVEN IN THE “DEFINITIONS”
-SECTION OF THIS AGREEMENT AND SUCH CAPITALIZED TERMS MAY BE USED IN THE
-SINGULAR OR IN THE PLURAL, AS THE CONTEXT REQUIRES.
-
-ROOT CERTIFICATE TERMS AND CONDITIONS
-1. DEFINITIONS.
-"Certificate" means an electronic file that, at least, states a name or identifies the issuing Certificate
-Authority, identifies the subscriber, contains the subscriber's public key, identifies the Certificate's
-operational period, contains a Certificate serial number, and contains a digital signature of the issuing
-Certificate Authority. 
-“Certificate Authority” or “CA” means a person or entity authorized to issue, suspend, or revoke
-Certificates.
-“Intermediate CA” means a CA Certificate signed by a Root Certificate Intermediate that issues
-Certificates either to end-entities or other Certificate Authorities, but not to both.
-"Products" means all versions of Your product or service with which the Root Certificates are incorporated
-(including successor products and services or any major or minor upgrades thereto).
-"Root Certificate" means a self-signed Certificate issued by a top-level Certificate Authority to itself, which
-includes such Certificate Authority's public key. The Root Certificates and Root Certificate files to be
-provided by Company to Customer pursuant to this Agreement are available for download at
-https://www.verisign.com/support/roots.html, https://www.thawte.com/roots/index.html or
-https://www.geotrust.com/resources/rootcertificates/index.html.
-2. LICENSE. During the term of this Agreement, Symantec grants You a royalty-free, non-exclusive, nontransferable license to (a) use the Root Certificate for the purposes of testing (without the right to modify);
-(b) make copies of Root Certificates only in order to embed and incorporate them, unmodified and in full,
-as roots in Your Products; (c) distribute the Root Certificates as embedded and incorporated in such
-Products; and (d) use the relevant logos and trademarks of Symantec in Your marketing materials,
-advertisements, product data sheets, product packaging and websites solely conjunction with the
-distribution of the Root Certificates in accordance with Symantec’s published guidelines for such usage.
-You shall not have the right to further distribute the Root Certificates other than as described herein
-without an additional license grant, in a separate writing, from Symantec.
-3. RESTRICTIONS. You may not: (a) modify or create any derivative works of Root Certificates; (b)
-assign, sublicense, sell, rent, or lease Symantec's root keys or Root Certificates; (c) use such Root
-Certificates except as expressly permitted under this Agreement; (d) remove or alter any trademark, logo,
-copyright, or other proprietary notices, legends, symbols, or labels provided in the Root Certificates; or (e)
-certify, or cause a third party to certify, the public key contained in the Root Certificates by issuing or
-creating a Certificate containing such public key.
-4. CUSTOMER’S OBLIGATIONS.
-4.1. During the term of this Agreement, You shall use commercially reasonable efforts regularly check the
-applicable Symantec URL for updates to the Root Certificates and update Root Certificates embedded
-into Your Products with the most currently available Root Certificates, unmodified and in full, or as a patch
-or update. If Symantec updates its Root Certificates,, You shall use commercially reasonable efforts to (i)
-discontinue all copying and use of the Root Certificates which have been replaced, and (ii) to use
-Symantec’s then-current Root Certificates. Any updates to the Root Certificates are incorporated into and
-subject to the terms of this Agreement.
-4.2. You shall appoint at least one (1) individual as the administrative contact designated to address any
-Root Certificate issues and shall provide the contact information for such individual to dl-tssroot@symantec.com.
-4.3 In the event You become aware of or suspect any event that diminishes the integrity of Symantec's
-data or public key system ("Compromise"), You shall immediately notify Symantec at dl-tss-
-root@symantec.com of such Compromise, and take reasonable steps to assist and cooperate with
-Symantec to remedy the Compromise.
-4.4 In the event that Symantec modifies these terms of use for the Root certificates for all end users,
-Symantec shall post the modified terms for the Agreement on the applicable URL and may post the
-modified terms on the Symantec corporate website. You shall be responsible for regularly checking the
-applicable URL for modifications to this Agreement. Such modifications shall be effective and binding on
-Customer within thirty (30) days of Symantec’s posting such modifications to its website. If you do not
-accept the modified Agreement, discontinue use of the Root Certificates and this Agreement will be
-deemed as terminated.
-5. CONFIDENTIALITY.
-5.1. Confidential Information. "Confidential Information" means the root private keys corresponding to the
-public key in a Root Certificate, and any confidential, trade secret, or other proprietary information
-disclosed by a party to the other party under this Agreement, except for Information that: (i) is public
-knowledge at the time of disclosure, (ii) was known by the receiving party before disclosure by the
-disclosing party, or becomes public knowledge or otherwise known to the receiving party after such
-disclosure, other than by breach of a confidentiality obligation, or (iii) is independently developed by the
-receiving party by persons without access to Confidential Information of the disclosing party.
-5.2. Protection of Confidential Information. The receiving party shall: (i) not disclose the Confidential
-information to any third party, (ii) not use the Confidential Information except for purposes of performing
-this Agreement, and (iii) take steps consistent with its protection of its own confidential and proprietary
-information (but in no event exercise less than reasonable care) to prevent unauthorized disclosure of the
-Confidential Information. Each party acknowledges that breach of this Section 5 may cause irreparable
-harm to the disclosing party entitling the disclosing party to injunctive relief, among other remedies.
-5.3. Mutual Cooperation. Each party will notify and cooperate with the other party in enforcing the
-disclosing party's rights if such party becomes aware of a threatened or actual violation of the
-confidentiality requirements of this Section 5. Each party shall have confidentiality agreements with its
-employees, agents or independent contractors sufficient in scope to fulfill its confidentiality obligations
-under this Agreement.
-6. INTELLECTUAL PROPERTY. You acknowledge that Symantec, including its wholly owned
-subsidiaries, retains all intellectual property rights and title (including any patent, copyright, trademark,
-trade secret, and other rights) in and to the Root Certificates, the public and private keys corresponding to
-such Root Certificates ("Symantec Intellectual Property"). This Agreement does not give You any
-intellectual property rights in the Symantec intellectual property except for the license granted in Section
-2. To the extent You use Symantec's trademarks or logos as permitted herein, You agree to comply with
-all usage requirements set forth in the then current version of Symantec's Logo and Trademark Usage
-Guide (http://www.symantec.com/about/profile/policies/trademarks.jsp) and any other guides and
-procedures of Symantec.
-7. NO WARRANTIES. THE ROOT CERTIFICATES, INCLUDING UPDATES, ARE PROVIDED "AS IS"
-WITHOUT ANY WARRANTY WHATSOEVER. SYMANTEC HEREBY DISCLAIMS ALL WARRANTIES,
-WHETHER EXPRESS, IMPLIED, OR STATUTORY, INCLUDING WITHOUT LIMITATION, ANY 
-IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR
-NONINFRINGEMENT OF THIRD PARTY RIGHTS.
-8. LIMITATION OF LIABILITY. UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY WILL
-SYMANTEC OR ITS LICENSORS BE LIABLE TO YOU OR ANY THIRD PARTY FOR ANY
-CONSEQUENTIAL, INDIRECT, SPECIAL, INCIDENTAL, OR EXEMPLARY DAMAGES, WHETHER
-FORESEEABLE OR UNFORESEEABLE, EVEN IF SUCH PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES. YOU WILL TAKE REASONABLE MEASURES TO INSURE THAT
-THE TERMS AND CONDITIONS SET FORTH IN THE PRECEDING SENTENCE OF THIS SECTION 8
-ARE INCORPORATED INTO ANY AGREEMENT BETWEEN YOU AND YOUR CUSTOMERS OR
-LICENSEES. SYMANTEC SHALL NOT BE LIABLE TO YOU OR ANY THIRD PARTY FOR ANY
-DAMAGES CAUSED BY YOUR OR A THIRD PARTY’S CONTINUED USE OF ANY OUTDATED
-ROOTS FOR WHICH AN UPDATED VERSION IS MADE AVAILABLE BY SYMANTEC. FURTHER,
-UNDER NO CIRCUMSTANCES WILL SYMANTEC'S LIABILITY FOR ANY ACTION OR CLAIM EXCEED
-USD$1,000, REGARDLESS OF WHETHER SUCH ACTION OR CLAIM IS BASED IN CONTRACT,
-TORT, STRICT LIABILITY, OR OTHERWISE.
-9. TERM AND TERMINATION.
-9.1. Term. This Agreement shall become effective as of the earlier of, Your first use of the Root
-Certificates, and shall remain in effect until the earlier of (i) Your discontinued use of the Root Certificates;
-(ii) termination by either party under the terms of Section 9.2, below; or (iii) Symantec’s notice to You that
-Symantec is no longer providing Root Certificates for use.
-9.2. Termination for Default/Insolvency. Either party shall be entitled to terminate this Agreement in the
-event of a failure by the other party to perform any of its material obligations under this Agreement if such
-breach is not cured within thirty (30) days after receipt of written notice thereof from the non-defaulting
-party or within forty-eight (48) hours after receipt of such written notice if a breach by You may
-compromise the security of the Symantec Trust Network or other system. This Agreement shall terminate
-upon the election of and notice from a party to the other if the other party is adjudged insolvent or
-bankrupt, or the institution of any proceedings by or against the other party seeking relief, reorganization,
-or arrangement under any laws relating to insolvency, or any assignment for the benefit of creditors, or
-the appointment of a receiver, liquidator, or trustee of any of the other party's property or assets, or the
-liquidation, dissolution, or winding up of the other party's business.
-9.3. Effect of Expiration or Termination. Upon expiration or termination of this Agreement, except for a
-breach by You, You may continue to distribute the current version of Your Products which incorporate the
-Root Certificates. Any updates or upgrades thereto may not include the Root Certificates and You shall
-stop making copies of Root Certificates, shall stop including Root Certificates in Your Products, and shall
-stop using Symantec’s logos and trademarks. The provisions of Sections 3, 4.3, 5, 6, 7, 8, 9.3, and 10
-shall survive termination of this Agreement.
-10. GENERAL.
-10.1. Governing Laws. This Agreement and any disputes relating to the services provided hereunder shall
-be governed and interpreted according to each of the following laws, respectively, without regard to its
-conflicts of law provisions: (a) the laws of the State of California, if You are located in North America or
-Latin America; or (b) the law of England, if You are located in Europe, Middle East or Africa; or (c) the 
-laws of Singapore, if You are located in Asia Pacific including Japan. The United Nations Convention on
-Contracts for the International Sale of Goods shall not apply to this Agreement.
-10.2. Binding Upon Successors; Assignment. This Agreement shall be binding upon, and inure to the
-benefit of, the successors, executors, heirs, representatives, administrators, and assigns of the parties
-hereto. Notwithstanding the foregoing, You may not assign Your rights or obligations under this
-Agreement without the prior written consent of Symantec. Any such purported assignment of this
-Agreement without obtaining written consent shall be void and of no effect.
-10.3. Severability; Enforcement; No Waiver. The unenforceability of any provision or provisions of this
-Agreement shall not impair the enforceability of any other part of this Agreement. If any provision of this
-Agreement shall be deemed invalid or unenforceable, in whole or in part, this Agreement shall be deemed
-amended to delete or modify, as necessary, the invalid or unenforceable provision to render it valid,
-enforceable, and, insofar as possible, consistent with the original intent of the parties. The failure of a
-party, at any time or from time to time, to require performance of any obligations of the other party
-hereunder shall not be deemed a waiver and shall not affect its right to enforce any provision of this
-Agreement at a subsequent time.
-10.4. Entire Agreement; Amendments; Waivers. This Agreement constitutes the entire understanding and
-agreement of the parties, whether written or oral, with respect to the subject matter hereof and supersede
-all prior and contemporaneous agreements or understandings between the parties. Any term or provision
-of this Agreement may be amended, and the observance of any term of this Agreement may be waived,
-only by writing signed by the parties to be bound thereby.
-10.5. Compliance with Law, Export Requirements and Foreign Reshipment Liability. Each party shall
-comply with all applicable federal, state and local laws and regulations in connection with its performance
-under this Agreement. Services, including documentation, may include controlled technology or technical
-data (collectively “Controlled Technology”) that is subject to the U.S. Export Administration Regulations
-(EAR), and diversion contrary to U.S. law is prohibited. You agree to comply with all relevant laws
-including the U.S. EAR and the laws of any country from which Controlled Technology is exported. All
-Controlled Technology is prohibited for export or re-export to Cuba, North Korea, Iran, Sudan and Syria
-and to any country or its nationals subject to relevant embargo or sanction or to any entity or person for
-which an export license is required per any relevant restricted party list, without first obtaining a license.
-Furthermore, You hereby agree that You will not use or allow use of Controlled Technology in connection
-with chemical, biological, or nuclear weapons, or missiles, drones or space launch vehicles capable of
-delivering such weapons. Symantec shall have the right to suspend performance of any of its obligations
-under this Agreement, without any prior notice being required and without any liability to Customer, if You
-fail to comply with this provision.
-10.6. Notices. You will make all notices, demands or requests to Symantec with respect to this Agreement
-in writing to the "Contact" address listed on the website from where you downloaded the Root Certificates,
-with a copy to: General Counsel – Legal Department, Symantec Corporation, 350 Ellis Street, Mountain
-View, California 94043, USA. Notices shall be effective on the date received (unless the notice specifies a
-later date) only if it is sent by a courier service that confirms delivery in writing or if sent by certified or
-registered mail, postage prepaid, return receipt requested. Symantec may post notices and updates
-regarding the Agreement or the Root Certificates at the URL provided to You for the Root Certificates.
-You shall be responsible for regularly checking the applicable URL for notices from Symantec regarding 
-the Agreement or the Root Certificates. No notices, demands, or requests to Symantec with respect to
-this Agreement may be delivered by electronic mail. You shall immediately notify Symantec of any legal
-notices served on You that might affect Symantec, and shall promptly forward the original or a copy of
-such notice to Symantec.
-10.7. Independent Parties. The relationship between You and Symantec is that of independent
-contractors. Neither party nor its employees, consultants, contractors, or agents are agents, employees,
-or joint venturers of the other party, nor do they have any authority to bind the other party by contract or
-otherwise to any obligation.
-Root Certificate License Agreement v3.0 (January 2014)
-```
+For versions older than 7.0, please consult the `THIRD_PARTY_NOTICES.md`
+document distributed with the agent. Any version of the agent not containing
+that document are not thought to include any third party software.

data/docker-compose.yml

@@ -53,7 +53,7 @@ services:
     build:
       context: .
       args:
-        - ruby_version=${RUBY_VERSION}
+        - ruby_version=${RUBY_VERSION:-3.1}
     image: newrelic_rpm
     tty: true
     stdin_open: true