newrelic_rpm 6.12.0.367 → 7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: efe710ed6af08e45e611d34471d346723637357202d478afa086aac1f253516f
-  data.tar.gz: b184b7a749f8f64810aa39955c05d598ad5f747d90eb4f847b135e52024e8123
+  metadata.gz: 01dec51b68827b0fa9cd58d7882d9ddb29e7de80bcaa55cda486c30ff8529da9
+  data.tar.gz: 358e73adb1e93b0e12bc7f415df728a4a8670bed0ac4eb36b81df545cc1c4651
 SHA512:
-  metadata.gz: 107f74976e67377a0a620ad71fa29f236d7c8325a124c702fa13d7a3687cd8210b162a8fb460f4ab4462b5badb53b2ef8082c6be47d66cd5032a915a59600ea6
-  data.tar.gz: 76108939cf031153994e9b914a7952fab254bf457609bb521d2c095693558f686ed153331fb8d5a37cf9a2023ad77293152633407087b86ce91b1c9055372422
+  metadata.gz: b06d4efcd172c4517ac7be9c7271833cef6709ff18040ceaa81240bf4a3f8ce66f9c609cc78dfffbadc698cc761a2c7e7b439c72d69b024808c10d4b9873180f
+  data.tar.gz: 6f665d24f019d4e5c55aef8851a48f3fe7ff9735e16c41ba97cc27664fdfc9f66cdbcfd698aebe2072b12c7124431e00f4c08bdb4b15a57350d886ff98745f08

data/.gitignore

@@ -1,3 +1,4 @@
+.ruby-version
 Gemfile.lock
 Guard*
 .DS\_Store
@@ -31,3 +32,6 @@ test/performance/script/log/
 infinite_tracing/log/
 infinite_tracing/test/new_relic/infinite_tracing/log
 test/fixtures/cross_agent_tests/*/README.md
+node_modules/
+yarn.lock
+errors.txt

data/CHANGELOG.md

@@ -1,38 +1,299 @@
 # New Relic Ruby Agent Release Notes #
 
+  ## v7.0.0
+
+  * **Ruby Agent 6.x to 7.x Migration Guide Available**
+
+    Please see our [Ruby Agent 6.x to 7.x migration guide](https://docs.newrelic.com/docs/agents/ruby-agent/getting-started/migration-7x-guide/) for helpful strategies and tips for migrating from earlier versions of the Ruby agent to 7.0.0.  We cover new configuration settings, diagnosiing and installing SSL CA certificates and deprecated items and their replacements in this guide.
+
+  * **Ruby 2.0 and 2.1 Dropped**
+
+    Support for Ruby 2.0 and 2.1 dropped with this release.  No code changes that would prevent the agent from continuing to
+    work with these releases are known.  However, Rubies 2.0 and 2.1 are no longer included in our test matrices and are not supported
+    for 7.0.0 and onward.
+
+  * **Implemented prepend auto-instrumentation strategies for most Ruby gems/libraries**
+
+    This release brings the auto-instrumentation strategies for most gems into the modern era for Ruby by providing both
+    prepend and method-chaining (a.k.a. method-aliasing) strategies for auto instrumenting.  Prepend, which has been available since
+    Ruby 2.0 is now the default strategy employed in auto-instrumenting.  It is known that some external gems lead to Stack Level
+    too Deep exceptions when prepend and method-chaining are mixed.  In such known cases, auto-instrumenting strategy will fall back
+    to method-chaining automatically.
+
+    This release also deprecates many overlapping and inconsistently named configuration settings in favor of being able to control
+    behavior of instrumentation per library with one setting that can be one of auto (the default), disabled, prepend, or chain.
+
+    Please see the above-referenced migration guide for further details.
+
+  * **Removed SSL cert bundle**
+
+    The agent will no longer ship this bundle and will rely on system certs.
+
+  * **Removed deprecated config options**
+
+    The following config options were previously deprecated and are no longer available
+    - `disable_active_record_4`
+    - `disable_active_record_5`
+    - `autostart.blacklisted_constants`
+    - `autostart.blacklisted_executables`
+    - `autostart.blacklisted_rake_tasks`
+    - `strip_exception_messages.whitelist`
+
+  * **Removed deprecated attribute**
+
+    The attribute `httpResponseCode` was previously deprecated and replaced with `http.statusCode`. This deprecated attribute has now been removed.
+
+  * **Removed deprecated option in notice_error**
+
+    Previously, the `:trace_only` option to NewRelic::Agent.notice_error was deprecated and replaced with `:expected`. This deprecated option has been removed.
+
+  * **Removed deprecated api methods**
+
+    Previously the api methods `create_distributed_trace_payload` and `accept_distributed_trace_payload` were deprecated. These have now been removed. Instead, please see `insert_distributed_trace_headers` and `accept_distributed_trace_headers`, respectively.
+
+  * **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
+    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.
+
+  * **Skip constructing Time for transactions**
+
+    Thanks to @viraptor, we are no longer constructing an unused Time object with every call to starting a new Transaction.
+
+  * **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.
+    This has now been fixed and the Ruby agent correctly instruments only once as well as gracefully handles nil middleware
+    classes in general.
+
+  * **Bugfix: Ensure transaction nesting max depth is always consistent with length of segments**
+
+    Thanks to @warp for noticing and fixing the scenario where Transaction nesting_max_depth can get out of sync
+    with segments length resulting in an exception when attempting to nest the initial segment which does not exist.
+
+  ## v6.15.0
+
+  * **Official Ruby 3.0 support**
+
+    The ruby agent has been verified to run on ruby 3.0.0
+
+  * **Added support for Rails 6.1**
+
+    The ruby agent has been verified to run with Rails 6.1
+    Special thanks to @hasghari for setting this up!
+
+  * **Added support for Sidekiq 6.0, 6.1**
+
+    The ruby agent has been verified to run with both 6.0 and 6.1 versions of sidekiq
+
+  * **Bugfix: No longer overwrites sidekiq trace data**
+
+    Distributed tracing data is now added to the job trace info rather than overwriting the existing data.
+
+  * **Bugfix: Fixes cases where errors are reported for spans with no other attributes**
+
+    Previously, in cases where a span does not have any agent/custom attributes on it, but an error
+    is noticed and recorded against the span, a `FrozenError: can't modify frozen Hash` is thrown.
+    This is now fixed and errors are now correctly recorded against such span events.
+
+  * **Bugfix: `DistributedTracing.insert_distributed_trace_headers` Supportability metric now recorded**
+
+    Previously, API calls to `DistributedTracing.insert_distributed_trace_headers` would lead to an exception
+    about the missing supportability metric rather than flowing through the API implementation as intended.
+    This would potentially lead to broken distributed traces as the trace headers were not inserted on the API call.
+    `DistributedTracing.insert_distributed_trace_headers` now correctly records the supportability metric and
+    inserts the distributed trace headers as intended.
+
+  * **Bugfix: child completions after parent completes sometimes throws exception attempting to access nil parent**
+
+    In scenarios where the child segment/span is completing after the parent in jRuby, the parent may have already
+    been freed and no longer accessible.  This would lead to an attempt to call `descendant_complete` on a Nil
+    object.  This is fixed to protect against calling the `descendant_complete` in such cases.
+
+  * **Feature: implements `force_install_exit_handler` config flag**
+
+    The `force_install_exit_handler` configuration flag allows an application to instruct the agent to install its
+    graceful shutdown exit handler, which will send any locally cached data to the New Relic collector prior to the
+    application shutting down.  This is useful for when the primary framework has an embedded Sinatra application that
+    is otherwise detected and skips installing the exit hook for graceful shutdowns.
+
+  * **Default prepend_net_instrumentation to false**
+
+    Previously, `prepend_net_instrumentation` defaulted to true. However, many gems are still using monkey patching on Net::HTTP, which causes compatibility issues with using prepend. Defaulting this to false minimizes instances of
+    unexpected compatibilty issues.
+
+  ## v6.14.0
+
+  * **Bugfix: Method tracers no longer cloning arguments**
+
+    Previously, when calling add_method_tracer with certain combination of arguments, it would lead to the wrapped method's arguments being cloned rather than passed to the original method for manipulation as intended.  This has been fixed.
+
+  * **Bugfix: Delayed Job instrumentation fixed for Ruby 2.7+**
+
+    Previously, the agent was erroneousy separating positional and keyword arguments on the instrumented method calls into
+    Delayed Job's library.  The led to Delayed job not auto-instrumenting correctly and has been fixed.
+
+  * **Bugfix: Ruby 2.7+ methods sometimes erroneously attributed compiler warnings to the Agent's `add_method_tracer`**
+
+    The specific edge cases presented are now fixed by this release of the agent.  There are still some known corner-cases
+    that will be resolved with upcoming changes in next major release of the Agent.  If you encounter a problem with adding
+    method tracers and compiler warnings raised, please continue to submit small repoducible examples.
+
+  * **Bugfix: Ruby 2.7+ fix for keyword arguments on Rack apps is unnecessary and removed**
+
+    A common fix for positional and keyword arguments for method parameters was implemented where it was not needed and
+    led to RackApps getting extra arguments converted to keyword arguments rather than Hash when it expected one.  This
+    Ruby 2.7+ change was reverted so that Rack apps behave correctly for Ruby >= 2.7.
+
+  * **Feature: captures incoming and outgoing request headers for distributed tracing**
+
+    HTTP request headers will be logged when log level is at least debug level.  Similarly, request headers
+    for exchanges with New Relic servers are now audit logged when audit logging is enabled.
+
+  * **Bugfix: `newrelic.yml.erb` added to the configuration search path**
+
+    Previously, when a user specifies a `newrelic.yml.erb` and no `newrelic.yml` file, the agent fails to find
+    the `.erb` file because it was not in the list of files searched at startup.  The Ruby agent has long supported this as a
+    means of configuring the agent programatically.  The `newrelic.yml.erb` filename is restored to the search
+    path and will be utilized if present.  NOTE:  `newrelic.yml` still takes precedence over `newrelic.yml.erb`  If found,
+    the `.yml` file is used instead of the `.erb` file.  Search directories and order of traversal remain unchanged.
+
+  * **Bugfix: dependency detection of Redis now works without raising an exception**
+
+    Previously, when detecting if Redis was available to instrument, the dependency detection would fail with an Exception raised
+    (with side effect of not attempting to instrument Redis).  This is now fixed with a better dependency check that resolves falsly without raising an `Exception`.
+
+  * **Bugfix: Gracefully handles NilClass as a Middleware Class when instrumenting**
+
+    Previously, if a NilClass is passed as the Middleware Class to instrument when processing the middleware stack,
+    the agent would fail to fully load and instrument the middleware stack.  This fix gracefully skips over nil classes.
+
+  * **Memory Sampler updated to recognize macOS Big Sur**
+
+    Previously, the agent was unable to recognize the platform macOS Big Sur in the memory sampler, resulting in an error being logged. The memory sampler is now able to recognize Big Sur.
+
+  * **Prepend implementation of Net::HTTP instrumentation available**
+
+    There is now a config option (`prepend_net_instrumentation`) that will enable the agent to use prepend while instrumenting Net::HTTP. This option is set to true by default.
+
+  ## v6.13.1
+
+  * **Bugfix: obfuscating URLs to external services no longer modifying original URI**
+
+    A recent change to the Ruby agent to obfuscate URIs sent to external services had the unintended side-effect of removing query parameters
+    from the original URI.  This is fixed to obfuscate while also preserving the original URI.
+
+    Thanks to @VictorJimenezKwast for pinpointing and helpful unit test to demonstrate.
+
+  ## v6.13.0
+
+  * **Bugfix: never use redirect host when accessing preconnect endpoint**
+
+    When connecting to New Relic, the Ruby Agent uses the value in `Agent.config[:host]` to post a request to the New Relic preconnect endpoint. This endpoint returns a "redirect host" which is the URL to which agents send data from that point on.
+
+    Previously, if the agent needed to reconnect to the collector, it would incorrectly use this redirect host to call the preconnect
+    endpoint, when it should have used the original configured value in `Agent.config[:host]`. The agent now uses the correct host
+    for all calls to preconnect.
+
+  * **Bugfix: calling `add_custom_attributes` no longer modifies the params of the caller**
+
+    The previous agent's improvements to recording attributes at the span level had an unexpected
+    side-effect of modifying the params passed to the API call as duplicated attributes were deleted
+    in the process. This is now fixed and params passed in are no longer modified.
+
+    Thanks to Pete Johns (@johnsyweb) for the PR that resolves this bug.
+
+  * **Bugfix: `http.url` query parameters spans are now obfuscated**
+
+    Previously, the agent was recording the full URL of the external requests, including
+    the query and fragment parts of the URL as part of the attributes on the external request
+    span.  This has been fixed so that the URL is obfuscated to filter out potentially sensitive data.
+
+  * **Use system SSL certificates by default**
+
+    The Ruby agent previously used a root SSL/TLS certificate bundle by default. Now the agent will attempt to use
+    the default system certificates, but will fall back to the bundled certs if there is an issue (and log that this occurred).
+
+  * **Bugfix: reduce allocations for segment attributes**
+
+    Previously, every segment received an `Attributes` object on initialization. The agent now lazily creates attributes
+    on segments, resulting in a significant reduction in object allocations for a typical transaction.
+
+  * **Bugfix: eliminate errors around Rake::VERSION with Rails**
+
+    When running a Rails application with rake tasks, customers could see the following error:
+
+  * **Prevent connecting agent thread from hanging on shutdown**
+
+    A bug in `Net::HTTP`'s Gzip decoder can cause the (un-catchable)
+    thread-kill exception to be replaced with a (catchable) `Zlib` exception,
+    which prevents a connecting agent thread from exiting during shutdown,
+    causing the Ruby process to hang indefinitely.
+    This workaround checks for an `aborting` thread in the `#connect` exception handler
+    and re-raises the exception, allowing a killed thread to continue exiting.
+
+    Thanks to Will Jordan (@wjordan) for chasing this one down and patching with tests.
+
+  * **Fix error messages about Rake instrumentation**
+
+    When running a Rails application with rake tasks, customers could see the following error in logs resulting from
+    a small part of rake functionality being loaded with the Rails test runner:
+
+    ```
+    ERROR : Error while detecting rake_instrumentation:
+    ERROR : NameError: uninitialized constant Rake::VERSION
+    ```
+
+    Such error messages should no longer appear in this context.
+
+    Thanks to @CamilleDrapier for pointing out this issue.
+
+  * **Remove NewRelic::Metrics**
+
+    The `NewRelic::Metrics` module has been removed from the agent since it is no longer used.
+
+    Thanks to @csaura for the contribution!
+
   ## 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 [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**
 
     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 
+    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 
+    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" 
+    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.

data/CONTRIBUTING.md

@@ -6,8 +6,8 @@ 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
-application environments (e.g. Rails, Sinatra, roll-your-own, etc.) See
-https://docs.newrelic.com/docs/agents/ruby-agent/getting-started/ruby-agent-requirements-supported-frameworks
+application environments (e.g. Rails, Sinatra, roll-your-own, etc.) See [Ruby agent requirements and supported frameworks]
+(https://docs.newrelic.com/docs/agents/ruby-agent/getting-started/ruby-agent-requirements-supported-frameworks)
 for the current full list.
 
 Because of this, we need to be more defensive in our coding practices than most
@@ -17,12 +17,52 @@ we can't assume the presence of any specific libraries, including `ActiveSupport
 
 ## Process
 
+### Version Support
+
+When contributing, keep in mind that New Relic customers (that's you!) are
+running many different versions of Ruby, some of them pretty old. Changes that
+depend on the newest version of Ruby will probably be rejected, especially if
+they replace something backwards compatible.
+
+Be aware that the instrumentation needs to work with a wide range of versions of
+the instrumented modules, and that code that looks nonsensical or
+overcomplicated may be that way for compatibility-related reasons. Read all the
+comments and check the related tests before deciding whether existing code is
+incorrect.
+
+If you are planning on contributing a new feature or an otherwise complex
+contribution, we kindly ask you to start a conversation with the maintainer team
+by opening up an Github issue first.
+
+
+### General Guidelines
+The Ruby agent avoids requiring any dependencies in the main agent code base.
+Instrumentations and features that would otherwise require a dependency (such as
+Infinite Tracing, which require gRPC and protobuf) are built as separate gems.
+If you have a feature or instrumentation request that would require a
+dependency, please open an Issue to discuss with the maintainers before
+proceeding.
+
+Your code will be evaluated for completeness and accuracy in
+implementation and must be accompanied with appropriate unit tests.  New
+additions that do not break existing tests are the easiest and quickest to be
+accepted and merged.  New features and improvements that break existing
+functionality are slower to be accepted and merged as they require agreement
+with maintainers across a majority of the languages New Relic supports.  Any
+such breaking changes will require a major version bump whereas non-breaking
+additions only lead to minor version bumps.
+
+Please be aware that the maintainers of New Relic’s agents aim to have as much
+commonality of functionality across all language agents as makes sense, so we are
+always working to reconcile language-specific changes against the cross-language
+community set of agreements.
+
 ### 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).
+issues](../../issues?q=is%3Aissue+is%3Aclosed).
 
 ### Pull Requests
 
@@ -31,9 +71,9 @@ licensing restrictions.
 
 ### Code of Conduct
 
-Before contributing please read the [code of conduct](./CODE_OF_CONDUCT.md)
+Before contributing please read the [code of conduct](https://github.com/newrelic/.github/blob/master/CODE_OF_CONDUCT.md)
 
-Note that our [code of conduct](./CODE_OF_CONDUCT.md) applies to all platforms
+Note that our [code of conduct](https://github.com/newrelic/.github/blob/master/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.
 
@@ -61,13 +101,16 @@ Running the test suite is simple.  Just invoke:
     bundle
     bundle exec rake
 
-This will run the unit tests in standalone mode, bootstrapping a basic Rails
-3.2 environment for the agent to instrument, then executing the test suite.
+This will run the unit tests in standalone mode. You can run against a specific Rails version
+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]
 
 These tests are setup to run automatically in
-[Travis CI](https://travis-ci.org/newrelic/rpm) under several Ruby implementations.
-When you've pushed your changes to GitHub, you can confirm that the Travis
-build passes for your fork.
+[GitHub Actions](https://github.com/newrelic/newrelic-ruby-agent/actions) under several
+Ruby implementations. When you've pushed your changes to GitHub, you can confirm that
+the GitHub Actions test matrix passes for your fork.
 
 Additionally, our own CI jobs runs these tests under multiple versions of Rails
 to verify compatibility.
@@ -124,7 +167,7 @@ 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:
 
-[Explorer's Hub](https://discuss.newrelic.com/c/support-products-agents/ruby-agent)
+[Explorer's Hub](https://discuss.newrelic.com/tags/rubyagent)
 
 ## And Finally...
 

data/README.md

@@ -1,11 +1,11 @@
-[![Community Project header](https://github.com/newrelic/opensource-website/raw/master/src/images/categories/Community_Project.png)](https://opensource.newrelic.com/oss-category/#community-project)
+[![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)
 
 # New Relic Ruby Agent
 
-The New Relic Ruby agent monitors your applications to help you 
-[identify and solve performance issues](https://docs.newrelic.com/docs/agents/ruby-agent/getting-started/introduction-new-relic-ruby#monitor-performance). 
-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) 
+The New Relic Ruby agent monitors your applications to help you
+[identify and solve performance issues](https://docs.newrelic.com/docs/agents/ruby-agent/getting-started/introduction-new-relic-ruby#monitor-performance).
+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,
@@ -47,7 +47,7 @@ and then require the New Relic Ruby agent in your Ruby start-up sequence:
 require 'newrelic_rpm'
 ```
 
-#### Oher Environments
+#### Other Environments
 
 Assuming you have installed the agent per above, you may also need to tell the Ruby agent to start for some frameworks and non-framework environments. To do so, add the following to your Ruby start-up sequence start the agent:
 
@@ -79,29 +79,53 @@ for more information.
 
 ## Support
 
-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:
+Should you need assistance with New Relic products, you are in good hands with several support diagnostic tools and support channels.
 
-https://discuss.newrelic.com/c/support-products-agents/ruby-agent
+This [troubleshooting framework](https://discuss.newrelic.com/t/ruby-troubleshooting-framework-install/108685) steps you through common troubleshooting questions.
+
+New Relic offers NRDiag, [a client-side diagnostic utility](https://docs.newrelic.com/docs/using-new-relic/cross-product-functions/troubleshooting/new-relic-diagnostics) that automatically detects common problems with New Relic agents. If NRDiag detects a problem, it suggests troubleshooting steps. NRDiag can also automatically attach troubleshooting data to a New Relic Support ticket.
+
+If the issue has been confirmed as a bug or is a Feature request, please file a Github issue.
+
+**Support Channels**
+
+* [New Relic Documentation](https://docs.newrelic.com/docs/agents/ruby-agent): Comprehensive guidance for using our platform
+* [New Relic Community](https://discuss.newrelic.com/tags/rubyagent): The best place to engage in troubleshooting questions
+* [New Relic Developer](https://developer.newrelic.com/): Resources for building a custom observability applications
+* [New Relic University](https://learn.newrelic.com/): A range of online training for New Relic users of every level
+* [New Relic Technical Support](https://support.newrelic.com/) 24/7/365 ticketed support. Read more about our [Technical Support Offerings](https://docs.newrelic.com/docs/licenses/license-information/general-usage-licenses/support-plan).
+
+## Privacy
+
+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.
+
+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.
 
-If you would like to contribute to this project, please review [these guidelines](./CONTRIBUTING.md).
+**A note about vulnerabilities**
+
+As noted in our [security policy](https://github.com/newrelic/newrelic-ruby-agent/security/policy), New Relic is committed to the privacy and security of our customers and their data. We believe that providing coordinated disclosure by security researchers and engaging with the security community are important means to achieve our security goals.
+
+If you believe you have found a security vulnerability in this project or any of New Relic's products or websites, we welcome and greatly appreciate you reporting it to New Relic through [HackerOne](https://hackerone.com/newrelic).
+
+If you would like to contribute to this project, please review [these guidelines](https://github.com/newrelic/newrelic-ruby-agent/blob/main/CONTRIBUTING.md).
 
-To [all contributors](https://github.com/newrelic/newrelic-ruby-agent/graphs/contributors), we thank you!  Without your contribution, this project would not be what it is today.  We also host a community project page dedicated to 
+To [all contributors](https://github.com/newrelic/newrelic-ruby-agent/graphs/contributors), we thank you!  Without your contribution, this project would not be what it is today.  We also host a community project page dedicated to
 the [New Relic Ruby agent](https://opensource.newrelic.com/projects/newrelic/newrelic-ruby-agent).
 
 ## 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](./THIRD_PARTY_NOTICES.md).
-
-## Support
-
-You can find more detailed documentation [on our website](http://newrelic.com/docs),
-and specifically in the [Ruby category](http://newrelic.com/docs/ruby).
+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).
 
 ## Thank You