newrelic_rpm 6.9.0.363 → 6.12.0.367

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3eb269d5c36e6139c7b617d3083418a8c8acf85e94c4f1005b1241aafc9471dd
-  data.tar.gz: da6387b811e5402cd2a0da7b80acc5b88338768cf36e01b1c86d7576c2592f3d
+  metadata.gz: efe710ed6af08e45e611d34471d346723637357202d478afa086aac1f253516f
+  data.tar.gz: b184b7a749f8f64810aa39955c05d598ad5f747d90eb4f847b135e52024e8123
 SHA512:
-  metadata.gz: 077d136a9c8e3771f506ee67422983ae4782e23b9118e9cb070f35fdf3af7b8a9d9ed125725db34945d8195529c0c22bbde0a7ab313d1fae9488485e40f7398d
-  data.tar.gz: c577d7a04fac1e22f043156635d4d2eeb3674707a2f50f7b11756855f4b4ae7e3479a6783d45decdc1a4950ce2b69e8d1d691bad6ebe67b504b098838fa6c86f
+  metadata.gz: 107f74976e67377a0a620ad71fa29f236d7c8325a124c702fa13d7a3687cd8210b162a8fb460f4ab4462b5badb53b2ef8082c6be47d66cd5032a915a59600ea6
+  data.tar.gz: 76108939cf031153994e9b914a7952fab254bf457609bb521d2c095693558f686ed153331fb8d5a37cf9a2023ad77293152633407087b86ce91b1c9055372422

data/.gitignore

@@ -28,3 +28,6 @@ lib/new_relic/build.rb
 artifacts/
 test/performance/log/
 test/performance/script/log/
+infinite_tracing/log/
+infinite_tracing/test/new_relic/infinite_tracing/log
+test/fixtures/cross_agent_tests/*/README.md

data/.travis.yml

@@ -4,6 +4,10 @@ services:
   - memcached
   - rabbitmq
 
+notifications:
+  slack:
+    secure: Ziq6vzXmc1S+SZnJF7DyjprRgzZKvVK5TXtnNJAoH4EFchziCqko+75hMxDZ/6Y2kShcijgbzZSkIIVSiuYyx0Jgxdsmwed7yrs91uv2WsUw2/l+taOTBIAMa/m9PZppsRqmkywxWeeTPL6cf65Vg3PYRuqzj83nczUFJo4UNrA=
+
 language: ruby
 
 dist: precise
@@ -28,6 +32,7 @@ addons:
   apt:
     update: true
     packages:
+      - libgmp3-dev
       - openssl
       - libssl-dev
       - build-essential
@@ -39,10 +44,9 @@ script: ./test/script/ci.sh
 
 branches:
   only:
-    - master
+    - main
     - dev
     - release
-    - RUBY-2227_w3c_trace_context_poc
 
 rvm:
   # Run slowest builds first to try and optimize overall cycle time.
@@ -78,6 +82,7 @@ env:
     - TYPE=UNIT ENVIRONMENT=rails42
     - TYPE=UNIT ENVIRONMENT=rails50
     - TYPE=UNIT ENVIRONMENT=rails51
+    - TYPE=UNIT ENVIRONMENT=rails52
     - TYPE=UNIT ENVIRONMENT=rails60
     - TYPE=UNIT ENVIRONMENT=norails
     - TYPE=FUNCTIONAL GROUP=agent
@@ -90,6 +95,7 @@ env:
     - TYPE=FUNCTIONAL GROUP=sinatra
     - TYPE=FUNCTIONAL GROUP=rest
     - TYPE=FUNCTIONAL GROUP=background_2
+    - TYPE=FUNCTIONAL GROUP=infinite_tracing
     - TYPE=NULLVERSE
 
 matrix:
@@ -117,6 +123,8 @@ matrix:
       env: TYPE=UNIT ENVIRONMENT=rails50  # rails (= 5.0.0) depends on bundler (< 2.0, >= 1.3.0)
     - rvm: 2.7.0
       env: TYPE=UNIT ENVIRONMENT=rails51  # rails (= 5.1.0) depends on bundler (< 2.0, >= 1.3.0)
+    - rvm: 2.7.0
+      env: TYPE=UNIT ENVIRONMENT=rails52  # rails (= 5.2.0) depends on bundler (< 2.0, >= 1.3.0)
     - rvm: 2.7.0
       env: TYPE=FUNCTIONAL GROUP=api      # blocked: https://github.com/solnic/coercible/issues/27
     - rvm: 2.7.0
@@ -128,6 +136,8 @@ matrix:
       env: TYPE=UNIT ENVIRONMENT=rails50  # rails (= 5.0.0) depends on bundler (< 2.0, >= 1.3.0)
     - rvm: 2.7.0
       env: TYPE=UNIT ENVIRONMENT=rails51  # rails (= 5.1.0) depends on bundler (< 2.0, >= 1.3.0)
+    - rvm: 2.7.0
+      env: TYPE=UNIT ENVIRONMENT=rails52  # rails (= 5.2.0) depends on bundler (< 2.0, >= 1.3.0)
     - rvm: 2.7.0
       env: TYPE=FUNCTIONAL GROUP=api      # blocked: https://github.com/solnic/coercible/issues/27
     - rvm: 2.7.0
@@ -184,6 +194,8 @@ matrix:
       env: TYPE=UNIT ENVIRONMENT=rails50
     - rvm: 2.1.10
       env: TYPE=UNIT ENVIRONMENT=rails51
+    - rvm: 2.1.10
+      env: TYPE=UNIT ENVIRONMENT=rails52
     - rvm: 2.1.10
       env: TYPE=UNIT ENVIRONMENT=rails60
 
@@ -192,6 +204,8 @@ matrix:
       env: TYPE=UNIT ENVIRONMENT=rails50
     - rvm: 2.0.0-p648
       env: TYPE=UNIT ENVIRONMENT=rails51
+    - rvm: 2.0.0-p648
+      env: TYPE=UNIT ENVIRONMENT=rails52
     - rvm: 2.0.0-p648
       env: TYPE=UNIT ENVIRONMENT=rails60
 
@@ -208,3 +222,19 @@ matrix:
       env: TYPE=UNIT ENVIRONMENT=rails41
     - rvm: jruby-9.2.6.0
       env: TYPE=UNIT ENVIRONMENT=rails60
+    - rvm: jruby-9.2.6.0
+      env: TYPE=UNIT ENVIRONMENT=rails52
+
+    # Excluding unsupported Rubies for grpc
+    - rvm: 2.0.0-p648
+      env: TYPE=FUNCTIONAL GROUP=infinite_tracing
+    - rvm: 2.1.10
+      env: TYPE=FUNCTIONAL GROUP=infinite_tracing
+    - rvm: 2.2.8
+      env: TYPE=FUNCTIONAL GROUP=infinite_tracing
+    - rvm: 2.3.5
+      env: TYPE=FUNCTIONAL GROUP=infinite_tracing
+    - rvm: 2.4.2
+      env: TYPE=FUNCTIONAL GROUP=infinite_tracing
+    - rvm: jruby-9.2.6.0
+      env: TYPE=FUNCTIONAL GROUP=infinite_tracing

data/CHANGELOG.md

@@ -1,5 +1,167 @@
 # New Relic Ruby Agent Release Notes #
 
+  ## v6.12.0
+
+  * **Security: Updated all uses of Rake to >= 12.3.3**
+
+    All versions of Rake testing prior to 12.3.3 were removed to address
+    [CVE-2020-8130](https://nvd.nist.gov/vuln/detail/CVE-2020-8130).
+    No functionality in the agent was removed nor deprecated with this change, and older versions
+    of rake are expected to continue to work as they have in the past.  However, versions of 
+    rake < 12.3.3 are no longer tested nor supported.
+
+  * **Bugfix: fixes an error capturing content length in middleware on multi-part responses**
+
+    In the middleware tracing, the `Content-Length` header is sometimes returned as an array of 
+    values when content is a multi-part response.  Previously, the agent would fail with 
+    "NoMethodError: undefined method `to_i` for Array" Error.  This bug is now fixed and 
+    multi-part content lengths are summed for a total when an `Array` is present.
+    
+  * **Added support for auto-instrumenting Mongo gem versions 2.6 to 2.12**
+  
+  * **Bugfix: MongoDB instrumentation did not handle CommandFailed events when noticing errors**
+
+    The mongo gem sometimes returns a CommandFailed object instead of a CommandSucceeded object with
+    error attributes populated.  The instrumentation did not handle noticing errors on CommandFailed
+    objects and resulted in logging an error and backtrace to the log file.
+
+    Additionally, a bug in recording the metric for "findAndModify" as all lowercased "findandmodify" 
+    for versions 2.1 through 2.5 was fixed.
+
+  * **Bugfix: Priority Sampler causes crash in high throughput environents in rare cases**
+
+    Previously, the priority sampling buffer would, in rare cases, generate an error in high-throughput
+    environments once capacity is reached and the sampling algorthym engages.  This issue is fixed.
+    
+  * **Additional Transaction Information applied to Span Events**
+
+    When Distributed Tracing and/or Infinite Tracing are enabled, the Agent will now incorporate additional information from the Transaction Event on to the root Span Event of the transaction.
+
+    The following items are affected:
+      * Custom attribute values applied to the Transaction via our [add_custom_attributes](http://www.rubydoc.info/github/newrelic/newrelic-ruby-agent/NewRelic/Agent#add_custom_attributes-instance_method) API method.
+      * Request parameters: `request.parameters.*`
+      * Request headers: `request.headers.*`
+      * Response headers: `response.headers.*`
+      * Resque job arguments: `job.resque.args.*`
+      * Sidekiq job arguments: `job.sidekiq.args.*`
+      * Messaging arguments: `message.*`
+      * `httpResponseCode` (deprecated in this version; see note below)/`http.statusCode`
+      * `response.status`
+      * `request.uri`
+      * `request.method`
+      * `host.displayName`
+
+  * **Security Recommendation**
+
+    Review your Transaction attributes [include](https://docs.newrelic.com/docs/agents/ruby-agent/attributes/enable-disable-attributes-ruby#transaction_events-attributes-include) and [exclude](https://docs.newrelic.com/docs/agents/ruby-agent/attributes/enable-disable-attributes-ruby#transaction_events-attributes-exclude) configurations.  Any attribute include or exclude settings specific to Transaction Events should be applied
+    to your Span attributes [include](https://docs.newrelic.com/docs/agents/ruby-agent/attributes/enable-disable-attributes-ruby#span-events-attributes-include) and [exclude](https://docs.newrelic.com/docs/agents/ruby-agent/attributes/enable-disable-attributes-ruby#span-events-attributes-exclude) configuration or your global attributes [include](https://docs.newrelic.com/docs/agents/ruby-agent/attributes/enable-disable-attributes-ruby#attributes-include) and [exclude](https://docs.newrelic.com/docs/agents/ruby-agent/attributes/enable-disable-attributes-ruby#attributes-exclude) configuration.
+
+  * **Agent attribute deprecation: httpResponseCode**
+
+    Starting in this agent version, the [agent attribute](https://docs.newrelic.com/docs/agents/ruby-agent/attributes/ruby-agent-attributes#attributes) `httpResponseCode` (string value) has been deprecated. Customers can begin using `http.statusCode`
+    (integer value) immediately, and `httpResponseCode` will be removed in the agent's next major version update.
+
+  * **Bugfix: Eliminate warnings for distributed tracing when using sidekiq**
+
+    Previously, using sidekiq with distributed tracing disabled resulted in warning messages\
+    `WARN : Not configured to accept distributed trace headers`\
+    ` WARN : Not configured to insert distributed trace headers`\
+    These messages no longer appear.
+
+  ## v6.11.0
+
+  * **Infinite Tracing**
+
+    This release adds support for [Infinite Tracing](https://docs.newrelic.com/docs/understand-dependencies/distributed-tracing/enable-configure/enable-distributed-tracing). Infinite Tracing observes 100% of your distributed traces and provides visualizations for the most actionable data. With Infinite Tracing, you get examples of errors and long-running traces so you can better diagnose and troubleshoot your systems.
+
+    Configure your agent to send traces to a trace observer in New Relic Edge. View distributed traces through New Relic’s UI. There is no need to install a collector on your network.
+
+    Infinite Tracing is currently available on a sign-up basis. If you would like to participate, please contact your sales representative.
+
+  * **Bugfix: Cross Application Tracing (CAT) adds a missing field to response**
+
+    Previously, the Ruby agent's Cross Application Tracing header was missing a reserved field that would lead to an error
+    in the Go agent's processing of incoming headers from the Ruby agent. This fix adds that missing field to the headers, eliminating
+    the issue with traces involving the Ruby agent and the Go agent.
+
+  * **Bugfix: Environment Report now supports Rails >= 6.1**
+
+    Previously, users of Rails 6.1 would see the following deprecation warning appear when the Ruby agent attempted to
+    collect enviroment data: `DEPRECATION WARNING: [] is deprecated and will be removed from Rails 6.2`. These deprecation methods
+    no longer appear.
+
+    Thanks to Sébastien Dubois (sedubois) for reporting this issue and for the contribution!
+
+  * **Added distributed tracing to Sidekiq jobs**
+
+    Previously, Sidekiq jobs were not included in portions of <a href="https://docs.newrelic.com/docs/understand-dependencies/distributed-tracing/get-started/introduction-distributed-tracing">distributed traces</a> captured by the Ruby agent. Now you can view distributed
+    traces that include Sidekiq jobs instrumented by the Ruby agent.
+
+    Thanks to andreaseger for the contribution!
+
+  * **Bugfix: Eliminate warnings appearing when using `add_method_tracer` with Ruby 2.7**
+
+    Previously, using `add_method_tracer` with Ruby 2.7 to trace a method that included keyword arguments resulted in warning messages:
+    `warning: Using the last argument as keyword parameters is deprecated; maybe ** should be added to the call`. These messages no
+    longer appear.
+
+    Thanks to Harm de Wit and Atsuo Fukaya for reporting the issue!
+
+  ## v6.10.0
+
+  * **Error attributes now added to each span that exits with an error or exception**
+
+    Error attributes `error.class` and `error.message` are now included on the span event in which an error
+    or exception was noticed, and, in the case of unhandled exceptions, on any ancestor spans that also exit with an error.
+    The public API method `notice_error` now attaches these error attributes to the currently executing span.
+
+    <a href="https://docs.newrelic.com/docs/apm/distributed-tracing/ui-data/understand-use-distributed-tracing-data#rules-limits">Spans with error details are now highlighted red in the Distributed Tracing UI</a>, and error details will expose the associated
+    `error.class` and `error.message`.  It is also now possible to see when an exception leaves the boundary of the span,
+    and if it is caught in an ancestor span without reaching the entry span. NOTE: This “bubbling up” of exceptions will impact
+    the error count when compared to prior behavior for the same trace. It is possible to have a trace that now has span errors
+    without the trace level showing an error.
+
+    If multiple errors occur on the same span, only the most recent error information is added to the attributes. Prior errors on the same span are overwritten.
+
+    These span event attributes conform to <a href="https://docs.newrelic.com/docs/agents/manage-apm-agents/agent-data/manage-errors-apm-collect-ignore-or-mark-expected#ignore">ignored errors</a> and <a href="https://docs.newrelic.com/docs/agents/manage-apm-agents/agent-data/manage-errors-apm-collect-ignore-or-mark-expected#expected">expected errors</a>.
+
+  * **Added tests for latest Grape / Rack combination**
+
+    For a short period of time, the latest versions of Grape and Rack had compatibility issues.
+    Generally, Rack 2.1.0 should be avoided in all cases due to breaking changes in many gems
+    reliant on Rack. We recommend using either Rack <= 2.0.9, or using latest Rack when using Grape
+    (2.2.2 at the time of this writing).
+
+  * **Bugfix: Calculate Content-Length in bytes**
+
+    Previously, the Content-Length HTTP header would be incorrect after injecting the Browser Monitoring
+    JS when the response contained Unicode characters because the value was not calculated in bytes.
+    The Content-Length is now correctly updated.
+
+    Thanks to thaim for the contribution!
+
+  * **Bugfix: Fix Content-Length calculation when response is nil**
+
+    Previously, calculating the Content-Length HTTP header would result in a `NoMethodError` in the case of
+    a nil response. These errors will no longer occur in such a case.
+
+    Thanks to Johan Van Ryseghem for the contribution!
+
+  * **Bugfix: DecoratingFormatter now logs timestamps as millisecond Integers**
+
+    Previously the agent sent timestamps as a Float with milliseconds as part of the
+    fractional value.  Logs in Context was changed to only accept Integer values and this
+    release changes DecoratingFormatter to match.
+
+  * **Added --force option to `newrelic install` cli command to allow overwriting newrelic.yml**
+
+  * **Bugfix: The fully qualified hostname now works correctly for BSD and Solaris**
+
+    Previously, when running on systems such as BSD and Solaris, the agent was unable to determine the fully
+    qualified domain name, which is used to help link Ruby agent data with data from New Relic Infrastructure.
+    This information is now successfully collected on various BSD distros and Solaris.
+
+
   ## v6.9.0
 
   * **Added support for W3C Trace Context, with easy upgrade from New Relic trace context**
@@ -34,7 +196,7 @@
 
     Known Issues and Workarounds
 
-    * If a .NET agent is initiating traces as the root service, do not upgrade your 
+    * If a .NET agent is initiating traces as the root service, do not upgrade your
       downstream Ruby New Relic agents to this agent release.
 
   * **Official Ruby 2.7 support**
@@ -43,10 +205,10 @@
 
   * **Reduced allocations when tracing transactions using API calls**
 
-    Default empty hashes for `options` parameter were not frozen, leading to 
+    Default empty hashes for `options` parameter were not frozen, leading to
     excessive and unnecessary allocations when calling APIs for tracing transactions.
 
-    Thanks to Joel Turkel (jturkel) for the contribution! 
+    Thanks to Joel Turkel (jturkel) for the contribution!
 
   * **Bugfix for Resque worker thread race conditions**
 
@@ -56,10 +218,10 @@
     Thanks to Bertrand Paquet (bpaquet) for the contribution!
 
   * **Bugfix for Content-Length when injecting Browser Monitoring JS**
-    
+
     The Content-Length HTTP header would be incorrect after injecting the Browser Monitoring
     JS into the HEAD tag of the HTML source with Content-Length and lead to the HTML BODY content
-    being truncated in some cases.  The Content-Length is now correctly updated after injecting the 
+    being truncated in some cases.  The Content-Length is now correctly updated after injecting the
     Browser Monitoring JS script.
 
     Thanks to Slava Kardakov (ojab) for the contribution!
@@ -77,7 +239,7 @@
     level custom attributes, more granular tagging of events is possible for
     easier isolation and review of trace events.  For more information:
 
-    * [`Agent#add_custom_span_attributes`](https://www.rubydoc.info/github/newrelic/rpm/NewRelic/Agent#add_custom_span_attributes)
+    * [`Agent#add_custom_span_attributes`](https://www.rubydoc.info/github/newrelic/newrelic-ruby-agent/NewRelic/Agent#add_custom_span_attributes)
 
   * **Enables ability to migrate to Configurable Security Policies (CSP) on a per agent
   basis for accounts already using High Security Mode (HSM).**
@@ -145,10 +307,10 @@
   * **Trace and Entity Metadata API**
 
     Several new API methods have been added to the agent:
-    * [`Agent#linking_metadata`](https://www.rubydoc.info/github/newrelic/rpm/NewRelic/Agent#linking_metadata-instance_method)
-    * [`Tracer#trace_id`](https://www.rubydoc.info/github/newrelic/rpm/NewRelic/Agent/Tracer#trace_id-class_method)
-    * [`Tracer#span_id`](https://www.rubydoc.info/github/newrelic/rpm/NewRelic/Agent/Tracer#span_id-class_method)
-    * [`Tracer#sampled?`](https://www.rubydoc.info/github/newrelic/rpm/NewRelic/Agent/Tracer#sampled?-class_method)
+    * [`Agent#linking_metadata`](https://www.rubydoc.info/github/newrelic/newrelic-ruby-agent/NewRelic/Agent#linking_metadata-instance_method)
+    * [`Tracer#trace_id`](https://www.rubydoc.info/github/newrelic/newrelic-ruby-agent/NewRelic/Agent/Tracer#trace_id-class_method)
+    * [`Tracer#span_id`](https://www.rubydoc.info/github/newrelic/newrelic-ruby-agent/NewRelic/Agent/Tracer#span_id-class_method)
+    * [`Tracer#sampled?`](https://www.rubydoc.info/github/newrelic/newrelic-ruby-agent/NewRelic/Agent/Tracer#sampled?-class_method)
 
     These API methods allow you to access information that can be used to link data of your choosing to a trace or entity.
 

data/CODE_OF_CONDUCT.md

@@ -0,0 +1,46 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at opensource@newrelic.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/

data/CONTRIBUTING.md

@@ -1,8 +1,8 @@
 # Guidelines for Contributing Code
 
-At New Relic we welcome community code contributions to the Ruby agent, and have
-taken effort to make this process easy for both contributors and our development
-team.
+New Relic welcomes code contributions by the Ruby community, and
+have taken effort to make this process easy for both contributors and our
+development team.
 
 When contributing, keep in mind that the agent runs in a wide variety of Ruby
 language implementations (e.g. 2.x.x, jruby, etc.) as well as a wide variety of
@@ -15,10 +15,32 @@ projects. Syntax must be compatible with all supported Ruby implementations and
 we can't assume the presence of any specific libraries, including `ActiveSupport`,
 `ActiveRecord`, etc.
 
+## Process
+
+### Feature Requests
+
+Feature requests should be submitted in the [Issue tracker](../../issues), with
+a description of the expected behavior & use case. Before submitting an Issue,
+please search for similar ones in the [closed
+issues](../../issues?q=is%3Aissue+is%3Aclosed+label%3Aenhancement).
+
+### Pull Requests
+
+We can only accept PRs for version v6.12.0 or greater due to open source
+licensing restrictions.
+
+### Code of Conduct
+
+Before contributing please read the [code of conduct](./CODE_OF_CONDUCT.md)
+
+Note that our [code of conduct](./CODE_OF_CONDUCT.md) applies to all platforms
+and venues related to this project; please follow it in all your interactions
+with the project and its participants.
+
 ## Branches
 
-The head of master will generally have New Relic's latest release. However,
-New Relic reserves the ability to push an edge to the master. If you download a
+The head of `main` will generally have New Relic's latest release. However,
+New Relic reserves the ability to push an edge to the `main`. If you download a
 release from this repo, use the appropriate tag. New Relic usually pushes beta
 versions of a release to a working branch before tagging them for General
 Availability.
@@ -74,15 +96,37 @@ These tests can be run by invoking:
     bundle exec rake test:multiverse
 
 More details are available in
-[test/multiverse/README.md](https://github.com/newrelic/rpm/blob/master/test/multiverse/README.md).
+[test/multiverse/README.md](https://github.com/newrelic/newrelic-ruby-agent/blob/main/test/multiverse/README.md).
+
+## Contributor License Agreement
+
+Keep in mind that when you submit your Pull Request, you'll need to sign the CLA
+via the click-through using CLA-Assistant. If you'd like to execute our
+corporate CLA, or if you have any questions, please drop us an email at
+opensource@newrelic.com.
+
+For more information about CLAs, please check out Alex Russell’s excellent post,
+[“Why Do I Need to Sign This?”](https://infrequently.org/2008/06/why-do-i-need-to-sign-this/).
+
+## Slack
+
+We host a public Slack with a dedicated channel for contributors and maintainers
+of open source projects hosted by New Relic.  If you are contributing to this
+project, you're welcome to request access to the #oss-contributors channel in
+the newrelicusers.slack.com workspace.  To request access, see
+https://newrelicusers-signup.herokuapp.com/.
+
+## Explorer's Hub
+
+New Relic hosts and moderates an online forum where customers can interact with
+New Relic employees as well as other customers to get help and share best
+practices. Like all official New Relic open source projects, there's a related
+Community topic in the New Relic Explorers Hub. You can find this project's
+topic/threads here:
 
-### And Finally...
+[Explorer's Hub](https://discuss.newrelic.com/c/support-products-agents/ruby-agent)
 
-You are welcome to send pull requests to us - however, by doing so you agree
-that you are granting New Relic a non-exclusive, non-revokable, no-cost license
-to use the code, algorithms, patents, and ideas in that code in our products if
-we so choose. Fortunately, you also agree the code is provided as-is and you provide no
-warranties as to its fitness or correctness for any purpose.
+## And Finally...
 
 If you have any feedback on how we can make contributing easier, please get in
 touch at [support.newrelic.com](http://support.newrelic.com) and let us know!