newrelic_rpm 8.4.0 → 8.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b90db359ee9a4ce0043d52c3e1a391d6045e3aa292dff13964faee417c9c76e8
-  data.tar.gz: 87def45d9de621a59941831397f503e1c95922027fb07ef1c136d4b4dc186224
+  metadata.gz: ff4bb770c2546249bd596030077d4bd4b6d8da0ec6fb219dfa4e0990ed4de01f
+  data.tar.gz: 07541c66a40a3aad42080456cf14e4614d2047961ab25b69ba78cbbf89e01a15
 SHA512:
-  metadata.gz: 282d678c98d42998e7aef885e909cf9973eb9665c541fbeb24b5113d52b3ff312f5e12adcf808c17348dbe3fe4226aaee47f858f2c7c34588ddf323c7452998f
-  data.tar.gz: '00285b8f884e8e3fd11debaf64c82dc674dcdc7176274b796dcc552abd23501911fd3b67fb4c691cfc280fedbed499f06463e12d27f3fcb6e60ff38f4038e309'
+  metadata.gz: 68f9b48eb971dec54dfcb0c95f8e870f2b04e77835b04e48a87dfdbd9e0d2b16ffbdf8c823be84ebe9faccd60e7dfbb9a6f7343af92a0976d978687ed342a87c
+  data.tar.gz: '0689a97e70e353df30773421725ceb217ea62202dc5f6299b1058afc03449c5b6e26383335ce0245e1611e5ac12760e5e23647aee7427ce487f07f4b7bc0661f'

data/.rubocop.yml

@@ -3,7 +3,7 @@ require:
 
 AllCops:
   # Prevent RuboCop from exploding when it finds an older-than-2.4 .ruby-version
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 2.7
   Exclude: []
 
 Bundler/DuplicatedGem:
@@ -638,7 +638,7 @@ Lint/NumberedParameterAssignment:
   Enabled: true
 
 Lint/OrAssignmentToConstant:
-  Enabled: true
+  Enabled: false
 
 Lint/OrderedMagicComments:
   Enabled: true
@@ -940,8 +940,9 @@ Performance/ArraySemiInfiniteRangeSlice:
 Performance/BigDecimalWithNumericArgument:
   Enabled: true
 
+# Disabled for support of older ruby versions
 Performance/BindCall:
-  Enabled: true
+  Enabled: false
 
 # Disabling for now
 Performance/BlockGivenWithExplicitBlock:
@@ -1136,9 +1137,9 @@ Style/Alias:
 Style/AndOr:
   Enabled: false
 
+# Disabled for support of older ruby versions
 Style/ArgumentsForwarding:
-  Enabled: true
-  AllowOnlyRestArgument: true
+  Enabled: false
 
 Style/ArrayCoercion:
   Enabled: false
@@ -1766,8 +1767,9 @@ Style/SingleLineMethods:
   Enabled: false
   # AllowIfMethodIsEmpty: false
 
+# Disabled for support of older ruby versions
 Style/SlicingWithRange:
-  Enabled: true
+  Enabled: false
 
 Style/SoleNestedConditional:
   Enabled: false

data/CHANGELOG.md

@@ -1,5 +1,49 @@
 # New Relic Ruby Agent Release Notes #
 
+  ## v8.5.0
+
+  * **AWS: Support IMDSv2 by using a token with metadata API calls**
+
+    When querying AWS for instance metadata, include a token in the request headers. If an AWS user configures instances to require a token, the agent will now work. For instances that do not require the inclusion of a token, the agent will continue to work in that context as well.
+
+  * **Muffle anticipated stderr warnings for "hostname" calls**
+
+    When using the `hostname` binary to obtain hostname information, redirect STDERR to /dev/null. Thanks very much to @frenkel for raising this issue on behalf of OpenBSD users everywhere and for providing a solution with [PR #965](https://github.com/newrelic/newrelic-ruby-agent/pull/965).
+
+  * **Added updated configuration options for transaction events and deprecated previous configs**
+    This release deprecates and replaces the following configuration options:
+    | Deprecated      | Replacement |
+    | ----------- | ----------- |
+    | event_report_period.analytic_event_data | event_report_period.transaction_event_data |
+    | analytics_events.enabled | transaction_events.enabled        |
+    | analytics_events.max_samples_stored | transaction_events.max_samples_stored |
+
+  * **Eliminated warnings for redefined constants in ParameterFiltering**
+
+    Fixed the ParameterFiltering constant definitions so that they are not redefined on multiple reloads of the module. Thank you to @TonyArra for bringing this issue to our attention.
+
+  * **Docker for development**
+
+    Docker and Docker Compose may now be used for local development and testing with the provided `Dockerfile` and `docker-compose.yml` files in the project root. See [DOCKER.md](DOCKER.md) for usage instructions.
+
+
+  * **Bugfix: Rails 5 + Puma errors in rack "can't add a new key into hash during iteration"**
+
+    When using rails 5 with puma, the agent would intermittently cause rack to raise a `RuntimeError: can't add a new key into hash during iteration`. We have identified the source of the error in our instrumentation and corrected the behavior so it no longer interferes with rack. Thanks to @sasharevzin for bringing attention to this error and providing a reproduction of the issue for us to investigate.
+
+  * **CI: target JRuby 9.3.3.0**
+
+    Many thanks to @ahorek for [PR #919](https://github.com/newrelic/newrelic-ruby-agent/pull/919), [PR #921](https://github.com/newrelic/newrelic-ruby-agent/pull/921), and [PR #922](https://github.com/newrelic/newrelic-ruby-agent/pull/922) to keep us up to date on the JRuby side of things. The agent is now actively being tested against JRuby 9.3.3.0. NOTE that this release does not contain any non-CI related changes for JRuby. Old agent versions are still expected to work with newer JRubies and the newest agent version is still expected to work with older JRubies.
+
+  * **CI: Update unit tests for Rails 7.0.2**
+
+    Ensure that the 7.0.2 release of Rails is fully compatible with all relevant tests.
+
+  * **CI: Ubuntu 20.04 LTS**
+
+    To stay current and secure, our CI automation is now backed by version 20.04 of Ubuntu's long term support offering (previously 18.04).
+
+
   ## v8.4.0
 
   * **Provide basic support for Rails 7.0**

data/CONTRIBUTING.md

@@ -164,6 +164,10 @@ These tests can be run by invoking:
 More details are available in
 [test/multiverse/README.md](https://github.com/newrelic/newrelic-ruby-agent/blob/main/test/multiverse/README.md).
 
+### Leveraging Docker for Development and/or Testing
+
+See [DOCKER.md](DOCKER.md).
+
 ## Contributor License Agreement
 
 Keep in mind that when you submit your Pull Request, you'll need to sign the CLA

data/DOCKER.md

@@ -0,0 +1,167 @@
+# Using Docker with the New Relic Ruby Agent
+
+These instructions will guide you through the process of setting up Docker for
+use with developing the New Relic Ruby Agent. The use of Docker containers can
+provide for a consistent experience free from machine specific issues.
+
+## Quick Start
+
+```shell
+# unit tests (Ruby only)
+$ docker build -t newrelic_rpm .
+$ docker run --rm newrelic_rpm
+
+# or
+
+# functional tests (MySQL, PostgreSQL, Redis, etc.)
+$ docker-compose up
+$ docker-compose exec app bundle exec rake test:all
+```
+
+
+## Install Docker
+
+You will need to have [Docker Desktop](https://www.docker.com/) installed and
+running on your machine.
+
+If you are using on macOS and using [Homebrew](https://brew.sh/), Docker can be
+installed as a cask via:
+
+```shell
+$ brew install --cask docker
+```
+
+and then launched via the `/Applications/Docker.app` launcher that is installed.
+
+For alternatives to using macOS with Homebrew, see Docker's
+[Get Started Guide](https://www.docker.com/get-started).
+
+
+## Clone the project
+
+Use git to clone the [newrelic/newrelic-ruby-agent](https://github.com/newrelic/newrelic-ruby-agent)
+project.
+
+The [Dockerfile](Dockerfile) and [docker-compose.yml](docker-compose.yml)
+files are located in the root of the project, where this `DOCKER.md`
+document resides.
+
+
+## Using just the Dockerfile (unit tests and standalone dev only)
+
+The project `Dockerfile` can be used by itself to run the project unit tests.
+Docker Compose and the project `docker-compose.yml` file will be needed to
+run functional tests which involve communicating with data systems such as
+PostgreSQL and Redis.
+
+To run the unit tests using `Dockerfile` by itself, first change
+directories to the root of the project, then build an image, and
+finally run a container from the image:
+
+```shell
+$ cd /path/to/project/git/clone
+$ docker build -t newrelic_rpm .
+$ docker run --rm newrelic_rpm
+```
+
+The `Dockerfile` specifies a default Ruby version to test with. To override this
+version, pass the `ruby_version` build arg like so when building the image:
+
+```shell
+docker build --build-arg ruby_version=2.7 .
+```
+
+**Legend:**
+* `build -t <TAG>` applies a tag to the image during building.
+* `.` indicates "here" and tells Docker that the `Dockerfile` file can be found
+  in the current directory
+* `run --rm` tells Docker to remove the container after the tests complete.
+* `--build-arg ruby_version=<RUBY VERSION>` specifies that a given Ruby version should be used (use MAJOR.MINOR or optionally MAJOR.MINOR.PATCH)
+
+
+## Using Docker Compose (for functional tests and developing with services)
+
+Docker Compose launches multiple containers simultaneously to support the
+running of the functional tests that require a variety of data handling
+server applications such as PostgreSQL, Redis, memcached, etc. Each one of
+these server applications uses its own container and then there's a Ruby
+container (referred to as the "app" container) that runs the Minitest tests
+while connecting to the other containers.
+
+In one shell session, change to the root of the project and then bring up all
+containers with Docker Compose:
+
+```shell
+$ docker-compose up
+```
+
+By default, `docker-compose` will use the default Ruby version specified in the
+`Dockerfile` file. To override this version with a custom desired version, set
+the `RUBY_VERSION` environment variable before calling `docker-compose`,
+like so:
+
+```shell
+RUBY_VERSION=3.0 docker-compose up
+```
+
+In a separate shell session (probably in a separate terminal split, tab, or
+window), execute the 'test:all' rake task to test all standard, environment,
+and multiverse tests:
+
+```shell
+$ docker-compose exec app bundle exec rake test:all
+```
+
+In lieu of running the tests, an interactive Bash shell can be
+launched against the running Ruby app container for development and/or
+debugging. While the `docker-compose up` shell session is still running,
+bring up an additional local shell session and run the following:
+
+```shell
+$ docker-compose exec app bash
+```
+
+You will be dropped at a Bash prompt as the "relic" user, with "ruby" and
+"bundle" in your PATH.
+
+
+## Output
+
+When using Docker Compose, one shell session will produce STDOUT output that
+pertains to all of the services (MySQL, MongoDB, etc.) and the other shell
+session will produce STDOUT output related to the Ruby based functional tests.
+Both streams of output may provide information about any errors or warnings
+that take place.
+
+
+## Cleanup
+
+If the project `Dockerfile` is being used without Docker Compose, then use
+`docker ps` to show information about containers and `docker images`
+for information about images. The `docker stop`, `docker kill`, `docker rm`
+and `docker rmi` commands can be used with the appropriate container and image
+ids. Run `docker --help` or read through the hosted [CLI documentation](https://docs.docker.com/engine/reference/commandline/docker/).
+
+When Docker Compose is used, invoking `ctrl-c` in the shell session that is
+running the `docker-compose up` command should suffice to prompt Docker Compose
+to shut down all running containers. Otherwise, `docker-compose down` can be
+ran after the `docker-compose up` process has been stopped. All relevant
+containers and images can then be optionally discarded using the `docker` CLI
+commands described in the previous paragraph.
+
+Use `docker ps -a` to show a list of all containers. Pass a container id to
+`docker rm` (ex: `docker rm 5c15ee2f1c4f`) to remove it.
+
+Use `docker images` to show a list of all images. Typically, you'll want to
+keep these images if you plan on running Docker with them again in the future.
+If you are done with them, you can pass an image id to `docker rmi` to remove
+an image (ex: `docker rmi 4253856b2570`).
+
+## Questions, Feature Requests, Contributions, etc.
+
+The maintainers of New Relic's Ruby agent project are hopeful that the use of
+containers and these instructions can provide consistency and a lowered barrier
+of entry when it comes to providing contributions to the agent project itself.
+
+For questions, feature requests, proposals to support Podman, PRs to improve
+behavior or documentation, etc., please see [CONTRIBUTING.md](CONTRIBUTING.md).

data/Dockerfile

@@ -0,0 +1,10 @@
+ARG ruby_version=3.1
+
+FROM ruby:$ruby_version
+
+WORKDIR /usr/src/app
+
+COPY . .
+RUN bundle install
+
+CMD ["bundle", "exec", "rake"]

data/Rakefile

@@ -10,7 +10,7 @@ task :test => ['test:newrelic']
 
 namespace :test do
   desc "Run all tests"
-  task :all => %w[newrelic multiverse]
+  task :all => %w[newrelic multiverse all_compatible_envs]
 
   begin
     require 'test_bisect'
@@ -37,6 +37,13 @@ namespace :test do
     Environments::Runner.new(args.to_a).run_and_report
   end
 
+  desc "Run all mini environment tests known to work with the current Ruby version"
+  task :all_compatible_envs do |t, args|
+    require File.expand_path(File.join(File.dirname(__FILE__), 'test', 'helpers', 'ruby_rails_mappings'))
+    rails_versions = rails_versions_for_ruby_version(RUBY_VERSION)
+    Rake::Task['test:env'].invoke(*rails_versions)
+  end
+
   Rake::TestTask.new(:intentional_fail) do |t|
     t.libs << "#{agent_home}/test"
     t.libs << "#{agent_home}/lib"

data/docker-compose.yml

@@ -0,0 +1,85 @@
+version: "3.9"
+services:
+  mysql:
+    image: mysql:5.7
+    restart: always
+    environment:
+      MYSQL_ROOT_PASSWORD: mysql_root_password
+      MYSQL_DATABASE: app
+    expose:
+      - "3306"
+    volumes:
+      - mysql:/var/lib/mysql
+  rabbitmq:
+    image: rabbitmq:3.9.12
+    restart: always
+    environment:
+      RABBITMQ_NODENAME: rabbit
+    expose:
+      - "5672"
+      - "15672"
+      - "25672"
+      - "4369"
+  memcached:
+    image: memcached:1.6.12
+    restart: always
+    expose:
+      - "11211"
+  mongodb:
+    image: mongo:5.0.4
+    restart: always
+    volumes:
+      - /data/db
+    expose:
+      - "27017"
+  postgres:
+    image: postgres:14.2
+    restart: always
+    environment:
+      POSTGRES_USER: admin
+      POSTGRES_PASSWORD: postgres_password
+    volumes:
+      - postgres:/var/lib/postgresql/data
+    expose:
+      - "5432"
+  redis:
+    image: redis:6.2.6
+    restart: always
+    volumes:
+      - /var/lib/redis
+    expose:
+      - "6379"
+  app:
+    build:
+      context: .
+      args:
+        - ruby_version=${RUBY_VERSION}
+    image: newrelic_rpm
+    tty: true
+    stdin_open: true
+    environment:
+      MYSQL_USERNAME: root
+      MYSQL_PASSWORD: mysql_root_password
+      DATABASE_NAME: app
+      MYSQL_HOST: mysql
+      POSTGRES_USERNAME: admin
+      POSTGRES_PASSWORD: postgres_password
+    command: ["irb"]
+    volumes:
+      - ".:/usr/src/app"
+    depends_on:
+      - mysql
+      - memcached
+      - mongodb
+      - postgres
+      - rabbitmq
+      - redis
+    sysctls:
+      - "net.ipv6.conf.all.disable_ipv6=0"
+volumes:
+  mongodb:
+    driver: local
+  mysql:
+    driver: local
+  postgres:
+    driver: local

data/lib/new_relic/agent/configuration/default_source.rb

@@ -652,8 +652,17 @@ module NewRelic
           :public => false,
           :type => Integer,
           :dynamic_name => true,
+          :deprecated => true,
+          :allowed_from_server => true,
+          :description => deprecated_description(:'event_report_period.transaction_event_data', 'Number of seconds betwixt connections to the New Relic transaction event collection services.')
+        },
+        :'event_report_period.transaction_event_data' => {
+          :default => value_of(:'event_report_period.analytic_event_data'),
+          :public => false,
+          :type => Integer,
+          :dynamic_name => true,
           :allowed_from_server => true,
-          :description => 'Number of seconds betwixt connections to the New Relic analytic event collection services.'
+          :description => 'Number of seconds betwixt connections to the New Relic transaction event collection services.'
         },
         :'event_report_period.custom_event_data' => {
           :default => 60,
@@ -1550,15 +1559,31 @@ module NewRelic
           :default => true,
           :public => true,
           :type => Boolean,
+          :deprecated => true,
           :allowed_from_server => true,
-          :description => 'If `true`, enables analytics event sampling.'
+          :description => deprecated_description(:'transaction_events.enabled', 'If `true`, enables analytics event sampling.')
         },
         :'analytics_events.max_samples_stored' => {
           :default => 1200,
           :public => true,
           :type => Integer,
+          :deprecated => true,
+          :allowed_from_server => true,
+          :description => deprecated_description(:'transaction_events.max_samples_stored', 'Defines the maximum number of request events reported from a single harvest.')
+        },
+        :'transaction_events.enabled' => {
+          :default => value_of(:'analytics_events.enabled'),
+          :public => true,
+          :type => Boolean,
+          :allowed_from_server => true,
+          :description => 'If `true`, enables transaction event sampling.'
+        },
+        :'transaction_events.max_samples_stored' => {
+          :default => value_of(:'analytics_events.max_samples_stored'),
+          :public => true,
+          :type => Integer,
           :allowed_from_server => true,
-          :description => 'Defines the maximum number of request events reported from a single harvest.'
+          :description => 'Defines the maximum number of transaction events reported from a single harvest.'
         },
         :'analytics_events.capture_attributes' => {
           :default => true,

data/lib/new_relic/agent/configuration/event_harvest_config.rb

@@ -9,11 +9,18 @@ module NewRelic
         extend self
 
         EVENT_HARVEST_CONFIG_KEY_MAPPING = {
-          :analytic_event_data => :'analytics_events.max_samples_stored',
+          :analytic_event_data => :'transaction_events.max_samples_stored',
           :custom_event_data => :'custom_insights_events.max_samples_stored',
           :error_event_data => :'error_collector.max_event_samples_stored'
         }
 
+        # not including span_event_data here because spans are handled separately in transform_span_event_harvest_config
+        EVENT_HARVEST_EVENT_REPORT_PERIOD_KEY_MAPPING = {
+          :analytic_event_data => :'transaction_event_data',
+          :custom_event_data => :'custom_event_data',
+          :error_event_data => :'error_event_data'
+        }
+
         def from_config(config)
           {:harvest_limits =>
             EVENT_HARVEST_CONFIG_KEY_MAPPING.merge(
@@ -38,7 +45,7 @@ module NewRelic
           EVENT_HARVEST_CONFIG_KEY_MAPPING.inject({}) do |event_harvest_config, (connect_payload_key, config_key)|
             if harvest_limit = connect_reply['event_harvest_config']['harvest_limits'][connect_payload_key.to_s]
               event_harvest_config[config_key] = harvest_limit
-              report_period_key = :"event_report_period.#{connect_payload_key}"
+              report_period_key = :"event_report_period.#{EVENT_HARVEST_EVENT_REPORT_PERIOD_KEY_MAPPING[connect_payload_key]}"
               event_harvest_config[report_period_key] = event_harvest_interval
             end
             event_harvest_config

data/lib/new_relic/agent/configuration/manager.rb

@@ -113,10 +113,8 @@ module NewRelic
             accessor = key.to_sym
 
             if config.has_key?(accessor)
-              evaluated = evaluate_procs(config[accessor])
-
               begin
-                return apply_transformations(accessor, evaluated)
+                return evaluate_and_apply_transformations(accessor, config[accessor])
               rescue
                 next
               end
@@ -134,6 +132,10 @@ module NewRelic
           end
         end
 
+        def evaluate_and_apply_transformations(key, value)
+          apply_transformations(key, evaluate_procs(value))
+        end
+
         def apply_transformations(key, value)
           if transform = transform_from_default(key)
             begin
@@ -159,12 +161,21 @@ module NewRelic
         def invoke_callbacks(direction, source)
           return unless source
           source.keys.each do |key|
-            if @cache[key] != source[key]
+            begin
+              # we need to evaluate and apply transformations for the value to deal with procs as values
+              # this is usually done by the fetch method when accessing config, however the callbacks bypass that
+              evaluated_cache = evaluate_and_apply_transformations(key, @cache[key])
+              evaluated_source = evaluate_and_apply_transformations(key, source[key])
+            rescue
+              next
+            end
+
+            if evaluated_cache != evaluated_source
               @callbacks[key].each do |proc|
                 if direction == :add
-                  proc.call(source[key])
+                  proc.call(evaluated_source)
                 else
-                  proc.call(@cache[key])
+                  proc.call(evaluated_cache)
                 end
               end
             end

data/lib/new_relic/agent/configuration/server_source.rb

@@ -76,7 +76,7 @@ module NewRelic
         end
 
         EVENT_HARVEST_CONFIG_SUPPORTABILITY_METRIC_NAMES = {
-          :'analytics_events.max_samples_stored' => 'Supportability/EventHarvest/AnalyticEventData/HarvestLimit',
+          :'transaction_events.max_samples_stored' => 'Supportability/EventHarvest/AnalyticEventData/HarvestLimit',
           :'custom_insights_events.max_samples_stored' => 'Supportability/EventHarvest/CustomEventData/HarvestLimit',
           :'error_collector.max_event_samples_stored' => 'Supportability/EventHarvest/ErrorEventData/HarvestLimit',
           :'span_events.max_samples_stored' => 'Supportability/SpanEvent/Limit',
@@ -136,7 +136,7 @@ module NewRelic
             'transaction_tracer.enabled' => 'collect_traces',
             'slow_sql.enabled' => 'collect_traces',
             'error_collector.enabled' => 'collect_errors',
-            'analytics_events.enabled' => 'collect_analytics_events',
+            'transaction_events.enabled' => 'collect_analytics_events',
             'custom_insights_events.enabled' => 'collect_custom_events',
             'error_collector.capture_events' => 'collect_error_events',
             'span_events.enabled' => 'collect_span_events'

data/lib/new_relic/agent/hostname.rb

@@ -22,7 +22,7 @@ module NewRelic
       # we get back empty string.  So, solution here is to check for non-zero
       # exit status and retry the command without the -f flag.
       def self.get_fqdn
-        fqdn = %x(hostname -f).chomp!
+        fqdn = %x(hostname -f 2>/dev/null).chomp!
         fqdn = %x(hostname).chomp! unless $?.exitstatus.zero?
         fqdn
       rescue => e

data/lib/new_relic/agent/instrumentation/active_job.rb

@@ -65,8 +65,7 @@ module NewRelic
 
         def self.run_in_transaction(job, block)
           ::NewRelic::Agent::Tracer.in_transaction(name: transaction_name_for_job(job),
-            category: :other,
-                                                   &block)
+            category: :other, &block)
         end
 
         def self.transaction_category

data/lib/new_relic/agent/instrumentation/middleware_tracing.rb

@@ -45,7 +45,7 @@ module NewRelic
           opts[:apdex_start_time] = QueueTime.parse_frontend_timestamp(env)
           # this case is for the rare occasion that an app is using Puma::Rack
           # without having ::Rack as a dependency
-          opts[:request] = ::Rack::Request.new(env) if defined? ::Rack
+          opts[:request] = ::Rack::Request.new(env.dup) if defined? ::Rack
           opts
         end
 

data/lib/new_relic/agent/messaging.rb

@@ -316,8 +316,7 @@ module NewRelic
           queue_name: queue_name,
           exchange_type: exchange_type,
           headers: message_properties[:headers],
-          correlation_id: message_properties[:correlation_id],
-                                                &block
+          correlation_id: message_properties[:correlation_id], &block
       end
 
       private

data/lib/new_relic/agent/method_tracer.rb

@@ -273,8 +273,8 @@ module NewRelic
           scoped_metric, unscoped_metrics = _nr_scoped_unscoped_metrics(metric_name, method_name, push_scope: options[:push_scope])
 
           _nr_define_traced_method(method_name, scoped_metric: scoped_metric, unscoped_metrics: unscoped_metrics,
-                                   code_header: options[:code_header], code_footer: options[:code_footer],
-                                   record_metrics: options[:metric], visibility: visibility)
+            code_header: options[:code_header], code_footer: options[:code_footer],
+            record_metrics: options[:metric], visibility: visibility)
 
           prepend(_nr_traced_method_module)
 

data/lib/new_relic/agent/parameter_filtering.rb

@@ -7,18 +7,18 @@ module NewRelic
     module ParameterFiltering
       extend self
 
-      ACTION_DISPATCH_PARAMETER_FILTER = "action_dispatch.parameter_filter".freeze
+      ACTION_DISPATCH_PARAMETER_FILTER ||= "action_dispatch.parameter_filter".freeze
 
       if defined?(Rails) && Gem::Version.new(::Rails::VERSION::STRING) >= Gem::Version.new('5.0.0')
         Rails.application.config.to_prepare do
-          RAILS_FILTER_CLASS = if defined?(ActiveSupport::ParameterFilter)
+          RAILS_FILTER_CLASS ||= if defined?(ActiveSupport::ParameterFilter)
             ActiveSupport::ParameterFilter
           elsif defined?(ActionDispatch::Http::ParameterFilter)
             ActionDispatch::Http::ParameterFilter
           end
         end
       else
-        RAILS_FILTER_CLASS = if defined?(ActiveSupport::ParameterFilter)
+        RAILS_FILTER_CLASS ||= if defined?(ActiveSupport::ParameterFilter)
           ActiveSupport::ParameterFilter
         elsif defined?(ActionDispatch::Http::ParameterFilter)
           ActionDispatch::Http::ParameterFilter

data/lib/new_relic/agent/synthetics_event_aggregator.rb

@@ -13,7 +13,7 @@ module NewRelic
 
       named :SyntheticsEventAggregator
       capacity_key :'synthetics.events_limit'
-      enabled_key :'analytics_events.enabled'
+      enabled_key :'transaction_events.enabled'
       buffer_class TimestampSampledBuffer
 
       def record event

data/lib/new_relic/agent/transaction/trace_context.rb

@@ -99,7 +99,7 @@ module NewRelic
           end
 
           span_guid = Agent.config[:'span_events.enabled'] ? transaction.current_segment.guid : nil
-          transaction_guid = Agent.config[:'analytics_events.enabled'] ? transaction.guid : nil
+          transaction_guid = Agent.config[:'transaction_events.enabled'] ? transaction.guid : nil
 
           TraceContextPayload.create \
             parent_account_id: Agent.config[:account_id],

data/lib/new_relic/agent/transaction_event_aggregator.rb

@@ -12,8 +12,8 @@ module NewRelic
   module Agent
     class TransactionEventAggregator < EventAggregator
       named :TransactionEventAggregator
-      capacity_key :'analytics_events.max_samples_stored'
-      enabled_key :'analytics_events.enabled'
+      capacity_key :'transaction_events.max_samples_stored'
+      enabled_key :'transaction_events.enabled'
       buffer_class PrioritySampledBuffer
 
       def record priority: nil, event: nil, &blk

data/lib/new_relic/agent/transaction_event_recorder.rb

@@ -20,7 +20,7 @@ module NewRelic
       end
 
       def record payload
-        return unless NewRelic::Agent.config[:'analytics_events.enabled']
+        return unless NewRelic::Agent.config[:'transaction_events.enabled']
 
         if synthetics_event? payload
           event = create_event payload

data/lib/new_relic/agent/utilization/aws.rb

@@ -8,9 +8,39 @@ module NewRelic
   module Agent
     module Utilization
       class AWS < Vendor
+        IMDS_BASE_URL = 'http://169.254.169.254/latest'.freeze
+        IMDS_KEYS = %w[instanceId instanceType availabilityZone].freeze
+        IMDS_TOKEN_TTL_SECS = '60'.freeze
+        TOKEN_OPEN_TIMEOUT_SECS = 1.freeze
+        TOKEN_READ_TIMEOUT_SECS = 1.freeze
+
+        class << self
+          def imds_token
+            uri = URI.parse("#{IMDS_BASE_URL}/api/token")
+            http = Net::HTTP.new(uri.hostname)
+            http.open_timeout = TOKEN_OPEN_TIMEOUT_SECS
+            http.read_timeout = TOKEN_READ_TIMEOUT_SECS
+            response = http.send_request('PUT',
+              uri.path,
+              '',
+              {'X-aws-ec2-metadata-token-ttl-seconds' => IMDS_TOKEN_TTL_SECS})
+            unless response.code == Vendor::SUCCESS
+              NewRelic::Agent.logger.debug 'Failed to obtain an AWS token for use with IMDS - encountered ' \
+                                           "#{response.class} with HTTP response code #{response.code} - " \
+                                           'assuming non AWS'
+              return
+            end
+
+            response.body
+          rescue Net::OpenTimeout
+            NewRelic::Agent.logger.debug 'Timed out waiting for AWS IMDS - assuming non AWS'
+          end
+        end
+
         vendor_name "aws"
-        endpoint "http://169.254.169.254/2016-09-02/dynamic/instance-identity/document"
-        keys ["instanceId", "instanceType", "availabilityZone"]
+        endpoint "#{IMDS_BASE_URL}/dynamic/instance-identity/document"
+        keys IMDS_KEYS
+        headers 'X-aws-ec2-metadata-token' => -> { imds_token }
         key_transforms :to_sym
       end
     end

data/lib/new_relic/agent/utilization/vendor.rb

@@ -18,7 +18,7 @@ module NewRelic
           end
 
           def headers headers = nil
-            headers ? @headers = headers.freeze : @headers
+            headers ? @headers = headers.freeze : processed_headers
           end
 
           def keys keys = nil
@@ -28,6 +28,16 @@ module NewRelic
           def key_transforms key_transforms = nil
             key_transforms ? @key_transforms = Array(key_transforms).freeze : @key_transforms
           end
+
+          def processed_headers
+            return unless @headers
+
+            @headers.each_with_object({}) do |(key, value), processed_hash|
+              # Header lambdas are expected to return string values. If nil comes back, replace it with :error
+              # to signify that the call failed.
+              processed_hash[key] = value.class.eql?(Proc) ? value.call || :error : value
+            end
+          end
         end
 
         attr_reader :metadata
@@ -62,10 +72,13 @@ module NewRelic
         private
 
         def request_metadata
+          processed_headers = headers
+          raise if processed_headers.values.include?(:error)
+
           Timeout.timeout 1 do
             response = nil
             Net::HTTP.start endpoint.host, endpoint.port do |http|
-              req = Net::HTTP::Get.new endpoint, headers
+              req = Net::HTTP::Get.new endpoint, processed_headers
               response = http.request req
             end
             response

data/lib/new_relic/language_support.rb

@@ -22,7 +22,8 @@ module NewRelic
     end
 
     def object_space_usable?
-      if defined?(::JRuby) && JRuby.respond_to?(:runtime)
+      if jruby?
+        require 'jruby'
         JRuby.runtime.is_object_space_enabled
       else
         defined?(::ObjectSpace)

data/lib/new_relic/version.rb

@@ -5,20 +5,10 @@
 
 module NewRelic
   module VERSION # :nodoc:
-    def self.build_version_string(*parts)
-      parts.compact.join('.')
-    end
-
     MAJOR = 8
-    MINOR = 4
+    MINOR = 5
     TINY = 0
 
-    begin
-      require File.join(File.dirname(__FILE__), 'build')
-    rescue LoadError
-      BUILD = nil
-    end
-
-    STRING = build_version_string(MAJOR, MINOR, TINY, BUILD)
+    STRING = "#{MAJOR}.#{MINOR}.#{TINY}"
   end
 end

data/newrelic.yml

@@ -26,11 +26,11 @@ common: &default_settings
 # All of the following configuration options are optional. Review them, and
 # uncomment or edit them if they appear relevant to your application needs.
 
-# If true, enables analytics event sampling.
-# analytics_events.enabled: true
+# If true, enables transaction event sampling.
+# transaction_events.enabled: true
 
 # Defines the maximum number of request events reported from a single harvest.
-# analytics_events.max_samples_stored: 1200
+# transaction_events.max_samples_stored: 1200
 
 # Prefix of attributes to exclude from all destinations. Allows * as wildcard at
 # end.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 8.4.0
+  version: 8.5.0
 platform: ruby
 authors:
 - Tanna McClure
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-25 00:00:00.000000000 Z
+date: 2022-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -236,6 +236,8 @@ files:
 - Brewfile
 - CHANGELOG.md
 - CONTRIBUTING.md
+- DOCKER.md
+- Dockerfile
 - Gemfile
 - Guardfile
 - LICENSE
@@ -249,6 +251,7 @@ files:
 - bin/nrdebug
 - config.dot
 - config/database.yml
+- docker-compose.yml
 - init.rb
 - install.rb
 - lefthook.yml