newrelic_rpm 6.13.0 → 7.1.0

data/lib/new_relic/environment_report.rb

@@ -69,13 +69,7 @@ module NewRelic
     report_on('Arch'              ) { ::NewRelic::Agent::SystemInfo.processor_arch         }
     report_on('OS version'        ) { ::NewRelic::Agent::SystemInfo.os_version             }
     report_on('OS'                ) { ::NewRelic::Agent::SystemInfo.ruby_os_identifier     }
-    report_on('Database adapter'  ) do
-      begin
-        ActiveRecord::Base.configurations.configs_for(env_name: NewRelic::Control.instance.env, spec_name: "primary").config['adapter']
-      rescue NoMethodError
-        ActiveRecord::Base.configurations[NewRelic::Control.instance.env]['adapter']
-      end
-    end
+    report_on('Database adapter'  ) { ::NewRelic::Agent::DatabaseAdapter.value }
     report_on('Framework'       ) { Agent.config[:framework].to_s  }
     report_on('Dispatcher'      ) { Agent.config[:dispatcher].to_s }
     report_on('Environment'     ) { NewRelic::Control.instance.env }

data/lib/new_relic/noticed_error.rb

@@ -70,11 +70,7 @@ class NewRelic::NoticedError
   end
 
   def self.passes_message_allowlist(exception_class)
-    # For backwards compatibility until we remove :'strip_exception_messages.whitelist' config option
-
-    allowed = NewRelic::Agent.config[:'strip_exception_messages.allowed_classes'].concat(NewRelic::Agent.config[:'strip_exception_messages.whitelist'])
-
-    allowed.any? do |klass|
+    NewRelic::Agent.config[:'strip_exception_messages.allowed_classes'].any? do |klass|
       exception_class <= klass
     end
   end

data/lib/new_relic/supportability_helper.rb

@@ -11,9 +11,10 @@ module NewRelic
     # transaction, just to eke out a bit less performance hit
     #
     API_SUPPORTABILITY_METRICS = [
+      :insert_distributed_trace_headers,
       :accept_distributed_trace_headers,
-      :create_distributed_trace_headers,
       :add_custom_attributes,
+      :add_custom_span_attributes,
       :add_instrumentation,
       :add_method_tracer,
       :add_transaction_tracer,
@@ -73,7 +74,7 @@ module NewRelic
       caller_location = caller_locations.first.label
 
       message = "Bad argument passed to ##{caller_location}. " \
-        "Expected #{klass} for `#{name}` but got #{headers.class}"
+        "Expected #{klass} for `#{name}` but got #{arg.class}"
 
       NewRelic::Agent.logger.warn message
       nil

data/lib/new_relic/version.rb

@@ -10,8 +10,8 @@ module NewRelic
       parts.compact.join('.')
     end
 
-    MAJOR = 6
-    MINOR = 13
+    MAJOR = 7
+    MINOR = 1
     TINY  = 0
 
     begin

data/lib/tasks/config.html.erb

@@ -1,32 +1,21 @@
 <% sections.each do |(section_key, section_name, section_description, configs)| %>
-<h2 id="<%=section_key%>"><%=section_name%></h2>
+## <%=section_name%>
 
-<%= "<p>#{section_description}</p>" unless section_description.nil? %>
+<%= "#{section_description}" unless section_description.nil? %>
 
-<dl class="clamshell-list">
+<CollapserGroup>
   <% configs.each do |config|%>
-  <!-- ********** <%= config[:key] %> ********** -->
-  <dt id="<%= config[:key].gsub('.', '-') %>"><%=config[:key]%></dt>
-  <dd>
-  <table class="specs">
-    <tbody>
-      <tr>
-        <th>Type</th>
-        <td><%=config[:type]%></td>
-      </tr>
-      <tr>
-        <th>Default</th>
-        <td><%=config[:default]%></td>
-      </tr>
-      <tr>
-        <th>Environ variable</th>
-        <td><code><%=config[:env_var]%></code></td>
-      </tr>
-    </tbody>
-  </table>
+  <Collapser id="<%= config[:key].gsub('.', '-') %>" title="<%=config[:key]%>">
+    <table>
+      <tbody>
+        <tr><th>Type</th><td><%=config[:type]%></td></tr>
+        <tr><th>Default</th><td>`<%=config[:default]%>`</td></tr>
+        <tr><th>Environ variable</th><td>`<%=config[:env_var]%>`</td></tr>
+      </tbody>
+    </table>
 
-  <p><%=config[:description]%></p>
-  </dd>
+  <%=config[:description]%>
+  </Collapser>
   <% end %>
-</dl>
+</CollapserGroup>
 <% end %>

data/lib/tasks/config.rake

@@ -9,11 +9,11 @@ namespace :newrelic do
     SECTION_DESCRIPTIONS = {
       GENERAL              => 'These settings are available for agent configuration. Some settings depend on your New Relic subscription level.',
       DISABLING            => 'Use these settings to toggle instrumentation types during agent startup.',
-      ATTRIBUTES           => '<a href="https://docs.newrelic.com/docs/features/agent-attributes">Attributes</a> are key-value pairs containing information that determines the properties of an event or transaction. These key-value pairs can be viewed within transaction traces in New Relic APM, traced errors in New Relic APM, transaction events in Insights, and page views in Insights. You can customize exactly which attributes will be sent to each of these destinations.',
-      "transaction_tracer" => 'The <a href="/docs/apm/traces/transaction-traces/transaction-traces">transaction traces</a> feature collects detailed information from a selection of transactions, including a summary of the calling sequence, a breakdown of time spent, and a list of SQL queries and their query plans (on mysql and postgresql). Available features depend on your New Relic subscription level.',
+      ATTRIBUTES           => '[Attributes](/docs/features/agent-attributes) are key-value pairs containing information that determines the properties of an event or transaction. These key-value pairs can be viewed within transaction traces in APM, traced errors in APM, transaction events in dashboards, and page views in dashboards. You can customize exactly which attributes will be sent to each of these destinations',
+      "transaction_tracer" => 'The [transaction traces](/docs/apm/traces/transaction-traces/transaction-traces) feature collects detailed information from a selection of transactions, including a summary of the calling sequence, a breakdown of time spent, and a list of SQL queries and their query plans (on mysql and postgresql). Available features depend on your New Relic subscription level.',
       "error_collector"    => 'The agent collects and reports all uncaught exceptions by default. These configuration options allow you to customize the error collection.',
-      "browser_monitoring" => 'New Relic Browser\'s <a href="/docs/browser/new-relic-browser/page-load-timing/page-load-timing-process">page load timing</a> feature (sometimes referred to as real user monitoring or RUM) gives you insight into the performance real users are experiencing with your website. This is accomplished by measuring the time it takes for your users\' browsers to download and render your web pages by injecting a small amount of JavaScript code into the header and footer of each page.',
-      "analytics_events"   => '<a href="/docs/insights/new-relic-insights/understanding-insights/new-relic-insights">New Relic Insights</a> is a software analytics resource to gather and visualize data about your software and what it says about your business. With it you can quickly and easily create real-time dashboards to get immediate answers about end-user experiences, clickstreams, mobile activities, and server transactions.'
+      "browser_monitoring" => 'The Browser monitoring [page load timing](/docs/browser/new-relic-browser/page-load-timing/page-load-timing-process) feature (sometimes referred to as real user monitoring or RUM) gives you insight into the performance real users are experiencing with your website. This is accomplished by measuring the time it takes for your users\' browsers to download and render your web pages by injecting a small amount of JavaScript code into the header and footer of each page.',
+      "analytics_events"   => '[New Relic dashboards](/docs/query-your-data/explore-query-data/dashboards/introduction-new-relic-one-dashboards) is a resource to gather and visualize data about your software and what it says about your business. With it you can quickly and easily create real-time dashboards to get immediate answers about end-user experiences, clickstreams, mobile activities, and server transactions.'
     }
 
     NAME_OVERRIDES = {
@@ -96,8 +96,9 @@ namespace :newrelic do
     end
 
     def format_description(value)
-      description = value[:description]
-      description = "<b>DEPRECATED</b> #{description}" if value[:deprecated]
+      description = ''
+      description += "<b>DEPRECATED</b> " if value[:deprecated]
+      description += value[:description]
       description
     end
 
@@ -105,7 +106,7 @@ namespace :newrelic do
       if spec[:default].is_a?(Proc)
         '(Dynamic)'
       else
-        "<code>#{spec[:default].inspect}</code>"
+        "#{spec[:default].inspect}"
       end
     end
 

data/newrelic_rpm.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.version = NewRelic::VERSION::STRING
   s.required_ruby_version = '>= 2.0.0'
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
-  s.authors = [ "Rachel Klein", "Tanna McClure", "Michael Lang" ]
+  s.authors = [ "Aaron Huntsman", "Tanna McClure", "Michael Lang" ]
   s.date = Time.now.strftime('%Y-%m-%d')
   s.licenses    = ['Apache-2.0']
   s.description = <<-EOS
@@ -39,7 +39,7 @@ EOS
     "homepage_uri"      => "https://newrelic.com/ruby",
   }
 
-  file_list = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|infinite_tracing)/(?!agent_helper.rb)}) }
+  file_list = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|infinite_tracing|\.github)/(?!agent_helper.rb)}) }
   build_file_path = 'lib/new_relic/build.rb'
   file_list << build_file_path if File.exist?(build_file_path)
   s.files = file_list

data/test/agent_helper.rb

@@ -418,6 +418,7 @@ end
 # build 'em as appropriate so we can test 'em
 def build_deferred_error_attributes segment
   return unless segment.noticed_error
+  return if segment.noticed_error_attributes.frozen?
   segment.noticed_error.build_error_attributes
 end
 

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 6.13.0
+  version: 7.1.0
 platform: ruby
 authors:
-- Rachel Klein
+- Aaron Huntsman
 - Tanna McClure
 - Michael Lang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-17 00:00:00.000000000 Z
+date: 2021-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -201,31 +201,6 @@ extra_rdoc_files:
 - CONTRIBUTING.md
 - newrelic.yml
 files:
-- ".github/ISSUE_TEMPLATE/bug_report.md"
-- ".github/ISSUE_TEMPLATE/config.yml"
-- ".github/ISSUE_TEMPLATE/feature_request.md"
-- ".github/actions/annotate/README.md"
-- ".github/actions/annotate/action.yml"
-- ".github/actions/annotate/dist/index.js"
-- ".github/actions/annotate/index.js"
-- ".github/actions/annotate/package-lock.json"
-- ".github/actions/annotate/package.json"
-- ".github/actions/annotate/pre-commit"
-- ".github/actions/build-ruby/README.md"
-- ".github/actions/build-ruby/action.yml"
-- ".github/actions/build-ruby/dist/index.js"
-- ".github/actions/build-ruby/index.js"
-- ".github/actions/build-ruby/package-lock.json"
-- ".github/actions/build-ruby/package.json"
-- ".github/actions/build-ruby/pre-commit"
-- ".github/pull_request_template.md"
-- ".github/workflows/ci.yml"
-- ".github/workflows/pr_review_checklist.yml"
-- ".github/workflows/release.yml"
-- ".github/workflows/scripts/rubygems-authenticate.py"
-- ".github/workflows/scripts/rubygems-publish.rb"
-- ".github/workflows/snyk.yml"
-- ".github/workflows/stale.yml"
 - ".gitignore"
 - ".project"
 - ".yardopts"
@@ -242,7 +217,6 @@ files:
 - bin/newrelic
 - bin/newrelic_cmd
 - bin/nrdebug
-- cert/cacert.pem
 - config.dot
 - config/database.yml
 - init.rb
@@ -280,6 +254,7 @@ files:
 - lib/new_relic/agent/database/obfuscation_helpers.rb
 - lib/new_relic/agent/database/obfuscator.rb
 - lib/new_relic/agent/database/postgres_explain_obfuscator.rb
+- lib/new_relic/agent/database_adapter.rb
 - lib/new_relic/agent/datastores.rb
 - lib/new_relic/agent/datastores/metric_helper.rb
 - lib/new_relic/agent/datastores/mongo.rb
@@ -335,31 +310,63 @@ files:
 - lib/new_relic/agent/instrumentation/acts_as_solr.rb
 - lib/new_relic/agent/instrumentation/authlogic.rb
 - lib/new_relic/agent/instrumentation/bunny.rb
+- lib/new_relic/agent/instrumentation/bunny/chain.rb
+- lib/new_relic/agent/instrumentation/bunny/instrumentation.rb
+- lib/new_relic/agent/instrumentation/bunny/prepend.rb
 - lib/new_relic/agent/instrumentation/controller_instrumentation.rb
 - lib/new_relic/agent/instrumentation/curb.rb
+- lib/new_relic/agent/instrumentation/curb/chain.rb
+- lib/new_relic/agent/instrumentation/curb/instrumentation.rb
+- lib/new_relic/agent/instrumentation/curb/prepend.rb
 - lib/new_relic/agent/instrumentation/data_mapper.rb
+- lib/new_relic/agent/instrumentation/delayed_job/chain.rb
+- lib/new_relic/agent/instrumentation/delayed_job/instrumentation.rb
+- lib/new_relic/agent/instrumentation/delayed_job/prepend.rb
 - lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb
 - lib/new_relic/agent/instrumentation/excon.rb
 - lib/new_relic/agent/instrumentation/excon/connection.rb
 - lib/new_relic/agent/instrumentation/excon/middleware.rb
 - lib/new_relic/agent/instrumentation/grape.rb
-- lib/new_relic/agent/instrumentation/http.rb
+- lib/new_relic/agent/instrumentation/grape/chain.rb
+- lib/new_relic/agent/instrumentation/grape/instrumentation.rb
+- lib/new_relic/agent/instrumentation/grape/prepend.rb
 - lib/new_relic/agent/instrumentation/httpclient.rb
+- lib/new_relic/agent/instrumentation/httpclient/chain.rb
+- lib/new_relic/agent/instrumentation/httpclient/instrumentation.rb
+- lib/new_relic/agent/instrumentation/httpclient/prepend.rb
+- lib/new_relic/agent/instrumentation/httprb.rb
+- lib/new_relic/agent/instrumentation/httprb/chain.rb
+- lib/new_relic/agent/instrumentation/httprb/instrumentation.rb
+- lib/new_relic/agent/instrumentation/httprb/prepend.rb
 - lib/new_relic/agent/instrumentation/ignore_actions.rb
 - lib/new_relic/agent/instrumentation/memcache.rb
+- lib/new_relic/agent/instrumentation/memcache/chain.rb
 - lib/new_relic/agent/instrumentation/memcache/dalli.rb
+- lib/new_relic/agent/instrumentation/memcache/helper.rb
+- lib/new_relic/agent/instrumentation/memcache/instrumentation.rb
+- lib/new_relic/agent/instrumentation/memcache/prepend.rb
 - lib/new_relic/agent/instrumentation/merb/controller.rb
 - lib/new_relic/agent/instrumentation/merb/errors.rb
 - lib/new_relic/agent/instrumentation/middleware_proxy.rb
 - lib/new_relic/agent/instrumentation/middleware_tracing.rb
 - lib/new_relic/agent/instrumentation/mongo.rb
 - lib/new_relic/agent/instrumentation/mongodb_command_subscriber.rb
-- lib/new_relic/agent/instrumentation/net.rb
+- lib/new_relic/agent/instrumentation/net_http.rb
+- lib/new_relic/agent/instrumentation/net_http/chain.rb
+- lib/new_relic/agent/instrumentation/net_http/instrumentation.rb
+- lib/new_relic/agent/instrumentation/net_http/prepend.rb
 - lib/new_relic/agent/instrumentation/notifications_subscriber.rb
 - lib/new_relic/agent/instrumentation/padrino.rb
+- lib/new_relic/agent/instrumentation/padrino/chain.rb
+- lib/new_relic/agent/instrumentation/padrino/instrumentation.rb
+- lib/new_relic/agent/instrumentation/padrino/prepend.rb
 - lib/new_relic/agent/instrumentation/passenger_instrumentation.rb
 - lib/new_relic/agent/instrumentation/queue_time.rb
 - lib/new_relic/agent/instrumentation/rack.rb
+- lib/new_relic/agent/instrumentation/rack/chain.rb
+- lib/new_relic/agent/instrumentation/rack/helpers.rb
+- lib/new_relic/agent/instrumentation/rack/instrumentation.rb
+- lib/new_relic/agent/instrumentation/rack/prepend.rb
 - lib/new_relic/agent/instrumentation/rails/action_controller.rb
 - lib/new_relic/agent/instrumentation/rails/action_web_service.rb
 - lib/new_relic/agent/instrumentation/rails3/action_controller.rb
@@ -369,16 +376,32 @@ files:
 - lib/new_relic/agent/instrumentation/rails_notifications/action_view.rb
 - lib/new_relic/agent/instrumentation/rainbows_instrumentation.rb
 - lib/new_relic/agent/instrumentation/rake.rb
+- lib/new_relic/agent/instrumentation/rake/chain.rb
+- lib/new_relic/agent/instrumentation/rake/instrumentation.rb
+- lib/new_relic/agent/instrumentation/rake/prepend.rb
 - lib/new_relic/agent/instrumentation/redis.rb
+- lib/new_relic/agent/instrumentation/redis/chain.rb
+- lib/new_relic/agent/instrumentation/redis/instrumentation.rb
+- lib/new_relic/agent/instrumentation/redis/prepend.rb
 - lib/new_relic/agent/instrumentation/resque.rb
+- lib/new_relic/agent/instrumentation/resque/chain.rb
+- lib/new_relic/agent/instrumentation/resque/helper.rb
+- lib/new_relic/agent/instrumentation/resque/instrumentation.rb
+- lib/new_relic/agent/instrumentation/resque/prepend.rb
 - lib/new_relic/agent/instrumentation/sequel.rb
 - lib/new_relic/agent/instrumentation/sequel_helper.rb
 - lib/new_relic/agent/instrumentation/sidekiq.rb
 - lib/new_relic/agent/instrumentation/sinatra.rb
+- lib/new_relic/agent/instrumentation/sinatra/chain.rb
 - lib/new_relic/agent/instrumentation/sinatra/ignorer.rb
+- lib/new_relic/agent/instrumentation/sinatra/instrumentation.rb
+- lib/new_relic/agent/instrumentation/sinatra/prepend.rb
 - lib/new_relic/agent/instrumentation/sinatra/transaction_namer.rb
 - lib/new_relic/agent/instrumentation/sunspot.rb
 - lib/new_relic/agent/instrumentation/typhoeus.rb
+- lib/new_relic/agent/instrumentation/typhoeus/chain.rb
+- lib/new_relic/agent/instrumentation/typhoeus/instrumentation.rb
+- lib/new_relic/agent/instrumentation/typhoeus/prepend.rb
 - lib/new_relic/agent/internal_agent_error.rb
 - lib/new_relic/agent/javascript_instrumentor.rb
 - lib/new_relic/agent/log_once.rb
@@ -548,7 +571,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: New Relic Ruby Agent

data/.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,31 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: ''
-assignees: ''
-
----
-
-^^ Provide a general summary of the issue in the title above. ^^ 
-
-## Description
-Describe the problem you're encountering.
-TIP: Do NOT share sensitive information, whether personal, proprietary, or otherwise! 
-
-## Expected Behavior
-Tell us what you expected to happen.
-
-## [Troubleshooting](https://discuss.newrelic.com/t/troubleshooting-frameworks/108787) or [NR Diag](https://docs.newrelic.com/docs/using-new-relic/cross-product-functions/troubleshooting/new-relic-diagnostics) results
-Provide any other relevant log data.
-TIP:  Scrub logs and diagnostic information for sensitive information 
-
-## Steps to Reproduce
-Please be as specific as possible.
-TIP:  Link a sample application that demonstrates the issue. 
-
-## Your Environment
-Include as many relevant details about your environment as possible including the running version of the Ruby agent, the Ruby version being used and any other relevant environment information
-
-## Additional context
-Add any other context about the problem here. For example, relevant community posts or support tickets.

data/.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: Troubleshooting
-    url:  https://github.com/newrelic/newrelic-ruby-agent#support
-    about: checkout the README for troubleshooting directions

data/.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,24 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: ''
-assignees: ''
-
----
-
-### Is your feature request related to a problem? Please describe.
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-### Feature Description
-A clear and concise description of the feature you want or need.
-
-### Describe Alternatives
-A clear and concise description of any alternative solutions or features you've considered. Are there examples you could link us to?
-
-### Additional context
-Add any other context here.
-
-### Priority
-Please help us better understand this feature request by choosing a priority from the following options: 
-[Nice to Have, Really Want, Must Have, Blocker]

data/.github/actions/annotate/README.md

@@ -1,79 +0,0 @@
-
-# Install Node
-
-Using Homebrew, install Node (npm will be installed with Node):
-
-```
-brew install node
-```
-
-# Install Yarn
-
-Yarn provides dependency management, so install it:
-
-```
-brew install yarn
-```
-
-# Install NCC
-
-NCC is used to compile the *.js into a dist/index.js
-
-```
-npm i -g @zeit/ncc
-```
-
-# Build the dist/index.js
-
-```
-yarn run package
-```
-
-# Installing new javascript packages
-
-Adding new javascript packages is fairly straightforward.  If you're adding a github @actions/xxx package,
-simply refer to it by its short-hand name:
-
-```
-npm install @actions/core
-```
-
-# Optional pre-commit hook
-
-A pre-commit hook is provided that can help keep dist/index.js in tune with local changes
-
-
-# Using Node as a REPL
-
-If you're developing or working on the index.js script, it can be handy to try out stuff 
-locally.  To do that, use Node to start up a REPL shell by running it from the action's folder:
-
-```
-cd .github/workflow/actions/annotate
-node
-```
-
-Example session:
-
-```javascript
-Welcome to Node.js v14.3.0.
-Type ".help" for more information.
-> const os = require('os')
-undefined
-> const fs = require('fs')
-undefined
-> const path = require('path')
-undefined
->
-> const core = require('@actions/core')
-undefined
-> core.startGroup("hello")
-::group::hello
-undefined
-> console.debug("hello")
-hello
-undefined
-> core.endGroup()
-::endgroup::
-undefined
-```