newrelic_rpm 9.19.0 → 9.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a2b588c4be509b5a02bb0516a47e9329cab3bcf79c97f614d4349291db0876f
-  data.tar.gz: 30f1dcd2997242e38836aa3325badb71656aaa3aa074857a2edad75f6e21972b
+  metadata.gz: 7534628f5d1c53ceff110ad76f2c63a3773d32f7f13d7146ff4c7da72ecef143
+  data.tar.gz: aeacda7d6851268da1e67d61376088902e9fa6080d184d91ea1bdbda632af889
 SHA512:
-  metadata.gz: 6915cfd19ea57029473609dd02b4e9bd110aaa3766f13af648705a0132d4608f33051ad0e44f6c03f72b037eb99c64f1992c92408d1caedd3381538e906c4b0d
-  data.tar.gz: 87c1d548bd4a78eb26706eae9f1932c9fb394c05f16e8d4603ce8b690e4df255fdd8748f7f2b09501a7e73770961ec20f6df07435255db293bb4e7395400094c
+  metadata.gz: fa3dfb1d4971a14c83e57b2de5fc20298f95e7e75dbba07631ec7e70c962e263f8c10f046ed5f067d3b38ec629ebc57e5cad502679468f8a0245b0bddc1d7061
+  data.tar.gz: 95f05672fffa1af08da58e1d470cf40d9d0587aa2d2fa1a2db162a46b0bd11abd290e5150ef98de29dd43517ebeb2df1aaa836ae13a33f7835ef76534f14807c

data/CHANGELOG.md

@@ -1,5 +1,43 @@
 # New Relic Ruby Agent Release Notes
 
+## v9.20.0
+
+- **Feature: Add ECS Docker ID for Fargate**
+
+  Previously, the Ruby agent did not record the Docker ID when running in an AWS ECS Fargate environment. The Docker ID will now be recorded correctly. [PR#3172](https://github.com/newrelic/newrelic-ruby-agent/pull/3172)
+
+- **Feature: Add NewRelic::Helper.version_satisfied?**
+
+  The agent has a new helper method to simplify version comparison. `NewRelic::Helper.version_satisfied?` accepts three arguments: a left-side version number, the comparison operator as a string, and a right-side version number. Our thanks go to [@kekke-n](https://github.com/kekke-n) for this contribution. [PR#3182](https://github.com/newrelic/newrelic-ruby-agent/pull/3182)
+
+- **Feature: Add code.stacktrace attribute on datastore spans when duration exceeds configured threshold**
+
+  The agent will now add the `code.stacktrace` attribute to datastore spans when the duration exceeds the configured threshold. The threshold is configured using the `transaction_tracer.stack_trace_threshold` configuration option. [PR#3220](https://github.com/newrelic/newrelic-ruby-agent/pull/3220)
+
+- **Feature: Consolidate "Unknown" constant values**
+
+  All references to the various capitalization styles for "Unknown" have been consolidated into two constants: `NewRelic::UNKNOWN` and `NewRelic::UNKNOWN_LOWER`. Thank you, [@tsubasa1122](https://github.com/@tsubasa1122), for your contribution! [PR#3185](https://github.com/newrelic/newrelic-ruby-agent/pull/3185)
+
+- **Bugfix: Fix Brewfile source links**
+
+  Previously, the multiverse README's links to the Brewfile were broken. Our thanks go to [@emmanuel-ferdman](https://github.com/emmanuel-ferdman) for submitting a PR to fix them! [PR#3191](https://github.com/newrelic/newrelic-ruby-agent/pull/3191)
+
+- **Bugfix: Fix error when using HTTPX 1.5.0**
+
+  The agent previously encountered an error when using the new HTTPX version 1.5.0. This was due to a change in the way HTTPX stores the response. The agent has been updated to handle this change correctly, and no longer encounters an error when using HTTPX 1.5.0. [PR#3203](https://github.com/newrelic/newrelic-ruby-agent/pull/3203)
+
+- **Bugfix: Bugfixes and improvements to debug level agent logs**
+
+  Improves the information logged at the debug level by the agent when the agent reads in a configuration source. [PR#3221](https://github.com/newrelic/newrelic-ruby-agent/pull/3221)
+
+- **Bugfix: Fix risk of server-side forgery for Slack workflow script**
+
+  Internally, we keep track of gems that are released using a GitHub actions workflow that posts updates on Slack. [@odaysec] identified a way we could reduce the risk of server-side forgery for this workflow. Thank you! [PR#3184](https://github.com/newrelic/newrelic-ruby-agent/pull/3184)
+
+- **Bugfix: Replace JSON.load calls with JSON.parse**
+
+  Generally, JSON.parse is seen as safer than JSON.load. Thank you, [@odaysec](https://github.com/odaysec), for bringing this to our attention! [PR#3183](https://github.com/newrelic/newrelic-ruby-agent/pull/3183) [PR#3230](https://github.com/newrelic/newrelic-ruby-agent/pull/3230)
+
 ## v9.19.0
 
 - **Feature: Add Thread ID as attribute to all spans**

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

@@ -387,9 +387,9 @@ module NewRelic
           :allowed_from_server => false,
           :description => <<~DESCRIPTION
             An array of ActiveSupport custom event names to subscribe to and instrument. For example,
-            - one.custom.event
-            - another.event
-            - a.third.event
+            \t\t- one.custom.event
+            \t\t- another.event
+            \t\t- a.third.event
           DESCRIPTION
         },
         :'ai_monitoring.enabled' => {
@@ -407,11 +407,11 @@ module NewRelic
           :description => <<~DESCRIPTION
             If `false`, LLM instrumentation (OpenAI only for now) will not capture input and output content on specific LLM events.
 
-            The excluded attributes include:
-            - `content` from LlmChatCompletionMessage events
-            - `input` from LlmEmbedding events
+            \tThe excluded attributes include:
+            \t- `content` from LlmChatCompletionMessage events
+            \t- `input` from LlmEmbedding events
 
-            This is an optional security setting to prevent recording sensitive data sent to and received from your LLMs.
+            \tThis is an optional security setting to prevent recording sensitive data sent to and received from your LLMs.
           DESCRIPTION
         },
         # this is only set via server side config
@@ -461,7 +461,7 @@ module NewRelic
             When `true`, the agent captures HTTP request parameters and attaches them to transaction traces, traced errors, and [`TransactionError` events](/attribute-dictionary?attribute_name=&events_tids%5B%5D=8241).
 
             <Callout variant="caution">
-            When using the `capture_params` setting, the Ruby agent will not attempt to filter secret information. `Recommendation:` To filter secret information from request parameters, use the [`attributes.include` setting](/docs/agents/ruby-agent/attributes/enable-disable-attributes-ruby) instead. For more information, see the <a href="/docs/agents/ruby-agent/attributes/ruby-attribute-examples#ex_req_params">Ruby attribute examples</a>.
+            \tWhen using the `capture_params` setting, the Ruby agent will not attempt to filter secret information. `Recommendation:` To filter secret information from request parameters, use the [`attributes.include` setting](/docs/agents/ruby-agent/attributes/enable-disable-attributes-ruby) instead. For more information, see the <a href="/docs/agents/ruby-agent/attributes/ruby-attribute-examples#ex_req_params">Ruby attribute examples</a>.
             </Callout>
           DESCRIPTION
         },
@@ -487,10 +487,10 @@ module NewRelic
           :allowed_from_server => false,
           :description => <<~DESC
             Path to `newrelic.yml`. If undefined, the agent checks the following directories (in order):
-            - `config/newrelic.yml`
-            - `newrelic.yml`
-            - `$HOME/.newrelic/newrelic.yml`
-            - `$HOME/newrelic.yml`
+            \t- `config/newrelic.yml`
+            \t- `newrelic.yml`
+            \t- `$HOME/.newrelic/newrelic.yml`
+            \t- `$HOME/newrelic.yml`
           DESC
         },
         :'exclude_newrelic_header' => {
@@ -676,10 +676,10 @@ module NewRelic
           :allowed_from_server => true,
           :description => <<~DESC
             Obfuscation level for SQL queries reported in transaction trace nodes.
-            By default, this is set to `obfuscated`, which strips out the numeric and string literals.
-            - If you do not want the agent to capture query information, set this to `none`.
-            - If you want the agent to capture all query information in its original form, set this to `raw`.
-            - When you enable [high security mode](/docs/agents/manage-apm-agents/configuration/high-security-mode), this is automatically set to `obfuscated`.
+            \tBy default, this is set to `obfuscated`, which strips out the numeric and string literals.
+            \t- If you do not want the agent to capture query information, set this to `none`.
+            \t- If you want the agent to capture all query information in its original form, set this to `raw`.
+            \t- When you enable [high security mode](/docs/agents/manage-apm-agents/configuration/high-security-mode), this is automatically set to `obfuscated`.
           DESC
         },
 
@@ -722,9 +722,9 @@ module NewRelic
           :dynamic_name => true,
           :description => <<~DESCRIPTION
             A list of error classes that the agent should treat as expected.
-            <Callout variant="caution">
-            This option can't be set via environment variable.
-            </Callout>
+            \t<Callout variant="caution">
+            \t\tThis option can't be set via environment variable.
+            \t</Callout>
           DESCRIPTION
         },
         :'error_collector.expected_messages' => {
@@ -735,9 +735,9 @@ module NewRelic
           :dynamic_name => true,
           :description => <<~DESCRIPTION
             A map of error classes to a list of messages. When an error of one of the classes specified here occurs, if its error message contains one of the strings corresponding to it here, that error will be treated as expected.
-            <Callout variant="caution">
-            This option can't be set via environment variable.
-            </Callout>
+            \t<Callout variant="caution">
+            \t\tThis option can't be set via environment variable.
+            \t</Callout>
           DESCRIPTION
         },
         :'error_collector.expected_status_codes' => {
@@ -756,9 +756,9 @@ module NewRelic
           :dynamic_name => true,
           :description => <<~DESCRIPTION
             A list of error classes that the agent should ignore.
-            <Callout variant="caution">
-            This option can't be set via environment variable.
-            </Callout>
+            \t<Callout variant="caution">
+            \t\tThis option can't be set via environment variable.
+            \t</Callout>
           DESCRIPTION
         },
         :'error_collector.ignore_messages' => {
@@ -774,9 +774,9 @@ module NewRelic
           :dynamic_name => true,
           :description => <<~DESCRIPTION
             A map of error classes to a list of messages. When an error of one of the classes specified here occurs, if its error message contains one of the strings corresponding to it here, that error will be ignored.
-            <Callout variant="caution">
-            This option can't be set via environment variable.
-            </Callout>
+            \t<Callout variant="caution">
+            \t\tThis option can't be set via environment variable.
+            \t</Callout>
           DESCRIPTION
         },
         :'error_collector.ignore_status_codes' => {
@@ -858,19 +858,19 @@ module NewRelic
           :description => <<~DESCRIPTION
             Sets the minimum level a log event must have to be forwarded to New Relic.
 
-            This is based on the integer values of [Ruby's `Logger::Severity` constants](https://github.com/ruby/logger/blob/113b82a06b3076b93a71cd467e1605b23afb3088/lib/logger/severity.rb).
+            \tThis is based on the integer values of [Ruby's `Logger::Severity` constants](https://github.com/ruby/logger/blob/113b82a06b3076b93a71cd467e1605b23afb3088/lib/logger/severity.rb).
 
-            The intention is to forward logs with the level given to the configuration, as well as any logs with a higher level of severity.
+            \tThe intention is to forward logs with the level given to the configuration, as well as any logs with a higher level of severity.
 
-            For example, setting this value to "debug" will forward all log events to New Relic. Setting this value to "error" will only forward log events with the levels "error", "fatal", and "unknown".
+            \tFor example, setting this value to "debug" will forward all log events to New Relic. Setting this value to "error" will only forward log events with the levels "error", "fatal", and "unknown".
 
-            Valid values (ordered lowest to highest):
-            - "debug"
-            - "info"
-            - "warn"
-            - "error"
-            - "fatal"
-            - "unknown"
+            \tValid values (ordered lowest to highest):
+            \t- "debug"
+            \t- "info"
+            \t- "warn"
+            \t- "error"
+            \t- "fatal"
+            \t- "unknown"
           DESCRIPTION
         },
         :'application_logging.forwarding.custom_attributes' => {
@@ -1153,7 +1153,7 @@ module NewRelic
           :public => true,
           :type => Boolean,
           :allowed_from_server => true,
-          :description => "If `true`, the agent will report source code level metrics for traced methods.\nSee: " \
+          :description => "If `true`, the agent will report source code level metrics for traced methods.\n\tSee: " \
                           'https://docs.newrelic.com/docs/apm/agents/ruby-agent/features/ruby-codestream-integration/'
         },
         # Cross application tracer
@@ -1165,7 +1165,7 @@ module NewRelic
           :deprecated => true,
           :description => deprecated_description(
             :'distributed_tracing.enabled',
-            'If `true`, enables [cross-application tracing](/docs/agents/ruby-agent/features/cross-application-tracing-ruby/) when `distributed_tracing.enabled` is set to `false`.'
+            '  If `true`, enables [cross-application tracing](/docs/agents/ruby-agent/features/cross-application-tracing-ruby/) when `distributed_tracing.enabled` is set to `false`.'
           )
         },
         # Custom attributes
@@ -1185,45 +1185,45 @@ module NewRelic
           :description => <<~DESCRIPTION
             An array of `CLASS#METHOD` (for instance methods) and/or `CLASS.METHOD` (for class methods) strings representing Ruby methods that the agent can automatically add custom instrumentation to. This doesn't require any modifications of the source code that defines the methods.
 
-            Use fully qualified class names (using the `::` delimiter) that include any module or class namespacing.
+            \tUse fully qualified class names (using the `::` delimiter) that include any module or class namespacing.
 
-            Here is some Ruby source code that defines a `render_png` instance method for an `Image` class and a `notify` class method for a `User` class, both within a `MyCompany` module namespace:
+            \tHere is some Ruby source code that defines a `render_png` instance method for an `Image` class and a `notify` class method for a `User` class, both within a `MyCompany` module namespace:
 
-            ```rb
-            module MyCompany
-              class Image
-                def render_png
-                  # code to render a PNG
-                end
-              end
+            \t```rb
+            \t\tmodule MyCompany
+            \t\t\tclass Image
+            \t\t\t\tdef render_png
+            \t\t\t\t\t# code to render a PNG
+            \t\t\t\tend
+            \t\t\tend
 
-              class User
-                def self.notify
-                  # code to notify users
-                end
-              end
-            end
-            ```
+            \t\t\tclass User
+            \t\t\t\tdef self.notify
+            \t\t\t\t\t# code to notify users
+            \t\t\t\tend
+            \t\t\tend
+            \t\tend
+            \t```
 
-            Given that source code, the `newrelic.yml` config file might request instrumentation for both of these methods like so:
+            \tGiven that source code, the `newrelic.yml` config file might request instrumentation for both of these methods like so:
 
-            ```yaml
-            automatic_custom_instrumentation_method_list:
-              - MyCompany::Image#render_png
-              - MyCompany::User.notify
-            ```
+            \t```yaml
+            \t\tautomatic_custom_instrumentation_method_list:
+            \t\t\t- MyCompany::Image#render_png
+            \t\t\t- MyCompany::User.notify
+            \t```
 
-            That configuration example uses YAML array syntax to specify both methods. Alternatively, you can use a comma-delimited string:
+            \tThat configuration example uses YAML array syntax to specify both methods. Alternatively, you can use a comma-delimited string:
 
-            ```yaml
-            automatic_custom_instrumentation_method_list: 'MyCompany::Image#render_png, MyCompany::User.notify'
-            ```
+            \t```yaml
+            \t\tautomatic_custom_instrumentation_method_list: 'MyCompany::Image#render_png, MyCompany::User.notify'
+            \t```
 
-            Whitespace around the comma(s) in the list is optional. When configuring the agent with a list of methods via the `NEW_RELIC_AUTOMATIC_CUSTOM_INSTRUMENTATION_METHOD_LIST` environment variable, use this comma-delimited string format:
+            \tWhitespace around the comma(s) in the list is optional. When configuring the agent with a list of methods via the `NEW_RELIC_AUTOMATIC_CUSTOM_INSTRUMENTATION_METHOD_LIST` environment variable, use this comma-delimited string format:
 
-            ```sh
-            export NEW_RELIC_AUTOMATIC_CUSTOM_INSTRUMENTATION_METHOD_LIST='MyCompany::Image#render_png, MyCompany::User.notify'
-            ```
+            \t```sh
+            \t\texport NEW_RELIC_AUTOMATIC_CUSTOM_INSTRUMENTATION_METHOD_LIST='MyCompany::Image#render_png, MyCompany::User.notify'
+            \t```
           DESCRIPTION
         },
         # Custom events
@@ -1426,18 +1426,18 @@ module NewRelic
           :description => <<~DESCRIPTION
             If `true`, disables agent middleware for Sinatra. This middleware is responsible for advanced feature support such as [cross application tracing](/docs/apm/transactions/cross-application-traces/cross-application-tracing), [page load timing](/docs/browser/new-relic-browser/getting-started/new-relic-browser), and [error collection](/docs/apm/applications-menu/events/view-apm-error-analytics).
 
-            <Callout variant="important">
-            Cross application tracing is deprecated in favor of [distributed tracing](/docs/apm/distributed-tracing/getting-started/introduction-distributed-tracing). Distributed tracing is on by default for Ruby agent versions 8.0.0 and above. Middlewares are not required to support distributed tracing.
+            \t<Callout variant="important">
+            \t\tCross application tracing is deprecated in favor of [distributed tracing](/docs/apm/distributed-tracing/getting-started/introduction-distributed-tracing). Distributed tracing is on by default for Ruby agent versions 8.0.0 and above. Middlewares are not required to support distributed tracing.
 
-            To continue using cross application tracing, update the following options in your `newrelic.yml` configuration file:
+            \t\tTo continue using cross application tracing, update the following options in your `newrelic.yml` configuration file:
 
-            ```yaml
-            cross_application_tracer:
-              enabled: true
-            distributed_tracing:
-              enabled: false
-            ```
-            </Callout>
+            \t\t```yaml
+            \t\t\tcross_application_tracer:
+            \t\t\t\tenabled: true
+            \t\t\tdistributed_tracing:
+            \t\t\t\tenabled: false
+            \t\t```
+            \t</Callout>
           DESCRIPTION
         },
         :disable_view_instrumentation => {
@@ -1961,10 +1961,10 @@ module NewRelic
           :transform => DefaultSource.method(:convert_to_list),
           :description => <<~DESCRIPTION
             An array of strings to specify which keys and/or values inside a Stripe event's `user_data` hash should
-            not be reported to New Relic. Each string in this array will be turned into a regular expression via
-            `Regexp.new` to permit advanced matching. For each hash pair, if either the key or value is matched the pair
-            isn't reported. By default, no `user_data` is reported. Use this option only if the
-            `stripe.user_data.include` option is also used.
+            \tnot be reported to New Relic. Each string in this array will be turned into a regular expression via
+            \t`Regexp.new` to permit advanced matching. For each hash pair, if either the key or value is matched the pair
+            \tisn't reported. By default, no `user_data` is reported. Use this option only if the
+            \t`stripe.user_data.include` option is also used.
           DESCRIPTION
         },
         :'instrumentation.thread' => {
@@ -2065,7 +2065,7 @@ module NewRelic
             If `true`, when the agent is in an application using Ruby on Rails, it will start after `config/initializers` run.
 
             <Callout variant="caution">
-            This option may only be set by environment variable.
+            \tThis option may only be set by environment variable.
             </Callout>
           DESCRIPTION
         },

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

@@ -382,6 +382,7 @@ module NewRelic
           @security_policy_source = nil
           @high_security_source = nil
           @environment_source = EnvironmentSource.new
+          log_config(:add, @environment_source) # this is the only place the EnvironmentSource is ever created, so we should log it
           @server_source = nil
           @manual_source = nil
           @yaml_source = nil
@@ -424,8 +425,10 @@ module NewRelic
           # actually going to be logging the message based on our current log
           # level, so use a `do` block.
           NewRelic::Agent.logger.debug do
-            hash = flattened.delete_if { |k, _h| DEFAULTS.fetch(k, {}).fetch(:exclude_from_reported_settings, false) }
-            "Updating config (#{direction}) from #{source.class}. Results: #{hash.inspect}"
+            source_hash = source.dup.to_h.delete_if { |k, _v| DEFAULTS.fetch(k, {}).fetch(:exclude_from_reported_settings, false) }
+            final_hash = flattened.delete_if { |k, _h| DEFAULTS.fetch(k, {}).fetch(:exclude_from_reported_settings, false) }
+
+            "Updating config (#{direction}) from #{source.class} with values: #{source_hash}. \nConfig Stack Results: #{final_hash.inspect}"
           end
         end
 

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

@@ -67,7 +67,7 @@ module NewRelic
         end
 
         def warn_missing_config_file(path)
-          based_on = 'unknown'
+          based_on = NewRelic::UNKNOWN_LOWER
           source = ::NewRelic::Agent.config.source(:config_path)
           candidate_paths = [path]
 
@@ -103,7 +103,7 @@ module NewRelic
             NewRelic::Agent.agent&.health_check&.update_status(NewRelic::Agent::HealthCheck::FAILED_TO_PARSE_CONFIG)
             message = 'Failed ERB processing configuration file. This is typically caused by a Ruby error in <% %> templating blocks in your newrelic.yml file.'
             failure_array = [message, e]
-            failure_array << e.backtrace[0] if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.4.0')
+            failure_array << e.backtrace[0] if NewRelic::Helper.version_satisfied?(RUBY_VERSION, '>=', '3.4.0')
             log_failure(*failure_array)
             nil
           end

data/lib/new_relic/agent/database.rb

@@ -123,7 +123,7 @@ module NewRelic
         return @supports_with_connection if defined?(@supports_with_connection)
 
         @supports_with_connection = defined?(::ActiveRecord::VERSION::STRING) &&
-          Gem::Version.new(ActiveRecord::VERSION::STRING) >= Gem::Version.new('7.2.0')
+          NewRelic::Helper.version_satisfied?(ActiveRecord::VERSION::STRING, '>=', '7.2.0')
       end
 
       def close_connections

data/lib/new_relic/agent/database_adapter.rb

@@ -25,7 +25,7 @@ module NewRelic
       end
 
       def value
-        match = VERSIONS.keys.find { |key| version >= Gem::Version.new(key) }
+        match = VERSIONS.keys.find { |key| NewRelic::Helper.version_satisfied?(version, '>=', key) }
         return unless match
 
         VERSIONS[match].call(env)

data/lib/new_relic/agent/datastores/redis.rb

@@ -83,7 +83,7 @@ module NewRelic
         end
 
         def self.is_supported_version?
-          Gem::Version.new(::Redis::VERSION) >= Gem::Version.new('3.0.0')
+          NewRelic::Helper.version_satisfied?(::Redis::VERSION, '>=', '3.0.0')
         end
 
         def self.ellipsize(result, string)

data/lib/new_relic/agent/distributed_tracing/cross_app_tracing.rb

@@ -207,7 +207,7 @@ module NewRelic
         decoded_appdata.set_encoding(::Encoding::UTF_8) if
           decoded_appdata.respond_to?(:set_encoding)
 
-        ::JSON.load(decoded_appdata)
+        ::JSON.parse(decoded_appdata)
       end
 
       def valid_cross_app_id?(xp_id)

data/lib/new_relic/agent/distributed_tracing.rb

@@ -39,6 +39,7 @@ module NewRelic
       # @return           {Transaction}     The transaction the headers were inserted from,
       #                                     or +nil+ if headers were not inserted.
       #
+      # @!scope class
       # @api public
       #
       def insert_distributed_trace_headers(headers = {})
@@ -93,6 +94,7 @@ module NewRelic
       #
       # @return {Transaction} if successful, +nil+ otherwise
       #
+      # @!scope class
       # @api public
       #
       def accept_distributed_trace_headers(headers, transport_type = NewRelic::HTTP)

data/lib/new_relic/agent/external.rb

@@ -29,6 +29,7 @@ module NewRelic
       #
       # @param request_metadata [String] received obfuscated request metadata
       #
+      # @!scope class
       # @api public
       #
       def process_request_metadata(request_metadata)
@@ -74,6 +75,7 @@ module NewRelic
       #
       # @return [String] obfuscated response metadata to send
       #
+      # @!scope class
       # @api public
       #
       def get_response_metadata

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

@@ -16,7 +16,7 @@ DependencyDetection.defer do
       defined?(ActionDispatch) &&
       defined?(ActionPack) &&
       ActionPack.respond_to?(:gem_version) &&
-      ActionPack.gem_version >= Gem::Version.new('6.0.0') && # notifications for dispatch added in Rails 6
+      NewRelic::Helper.version_satisfied?(ActionPack.gem_version, '>=', '6.0.0') && # notifications for dispatch added in Rails 6
       !NewRelic::Agent::Instrumentation::ActionDispatchSubscriber.subscribed?
   end
 

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

@@ -45,7 +45,7 @@ module NewRelic
         end
 
         PATTERN = /\A([^\.]+)\.action_dispatch\z/
-        UNKNOWN = 'unknown'.freeze
+        UNKNOWN = NewRelic::UNKNOWN_LOWER
 
         METHOD_NAME_MAPPING = Hash.new do |h, k|
           if PATTERN =~ k

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

@@ -15,7 +15,7 @@ DependencyDetection.defer do
     defined?(ActiveSupport) &&
       defined?(ActionMailbox) &&
       ActionMailbox.respond_to?(:gem_version) && # 'require "action_mailbox"' doesn't require version...
-      ActionMailbox.gem_version >= Gem::Version.new('7.1.0.alpha') && # notifications added in Rails 7.1
+      NewRelic::Helper.version_satisfied?(ActionMailbox.gem_version, '>=', '7.1.0.alpha') && # notifications added in Rails 7.1
       !NewRelic::Agent::Instrumentation::ActionMailboxSubscriber.subscribed?
   end
 

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

@@ -15,7 +15,7 @@ DependencyDetection.defer do
     defined?(ActiveSupport) &&
       defined?(ActionMailer) &&
       ActionMailer.respond_to?(:gem_version) &&
-      ActionMailer.gem_version >= Gem::Version.new('5.0') &&
+      NewRelic::Helper.version_satisfied?(ActionMailer.gem_version, '>=', '5.0') &&
       !NewRelic::Agent::Instrumentation::ActionMailerSubscriber.subscribed?
   end
 

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

@@ -30,7 +30,7 @@ DependencyDetection.defer do
   executes do
     if defined?(ActiveSupport) &&
         ActiveJob.respond_to?(:gem_version) &&
-        ActiveJob.gem_version >= Gem::Version.new('6.0.0') &&
+        NewRelic::Helper.version_satisfied?(ActiveJob.gem_version, '>=', '6.0.0') &&
         !NewRelic::Agent.config[:disable_activejob] &&
         !NewRelic::Agent::Instrumentation::ActiveJobSubscriber.subscribed?
       NewRelic::Agent.logger.info('Installing notifications based ActiveJob instrumentation')

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

@@ -13,7 +13,8 @@ module NewRelic
         end
 
         def self.insert_instrumentation
-          if defined?(::ActiveRecord::VERSION::MAJOR) && ::ActiveRecord::VERSION::MAJOR.to_i >= 3
+          if defined?(::ActiveRecord::VERSION::MAJOR) &&
+              NewRelic::Helper.version_satisfied?(::ActiveRecord::VERSION::MAJOR, '>=', 3)
             if ::NewRelic::Agent.config[:prepend_active_record_instrumentation]
               ::ActiveRecord::Base.prepend(::NewRelic::Agent::Instrumentation::ActiveRecordPrepend::BaseExtensions)
               ::ActiveRecord::Relation.prepend(::NewRelic::Agent::Instrumentation::ActiveRecordPrepend::RelationExtensions)
@@ -37,7 +38,7 @@ module NewRelic
           end
         end
 
-        if RUBY_VERSION < '2.7.0'
+        if NewRelic::Helper.version_satisfied?(RUBY_VERSION, '<', '2.7.0')
           def log_with_newrelic_instrumentation(*args, &block)
             state = NewRelic::Agent::Tracer.state
 
@@ -137,7 +138,7 @@ DependencyDetection.defer do
   depends_on do
     defined?(ActiveRecord) && defined?(ActiveRecord::Base) &&
       (!defined?(ActiveRecord::VERSION) ||
-        ActiveRecord::VERSION::MAJOR.to_i <= 3)
+        NewRelic::Helper.version_satisfied?(ActiveRecord::VERSION::MAJOR, '<=', 3))
   end
 
   depends_on do
@@ -151,7 +152,8 @@ DependencyDetection.defer do
   executes do
     require 'new_relic/agent/instrumentation/active_record_helper'
 
-    if defined?(Rails::VERSION::MAJOR) && Rails::VERSION::MAJOR.to_i == 3
+    if defined?(Rails::VERSION::MAJOR) &&
+        NewRelic::Helper.version_satisfied?(Rails::VERSION::MAJOR, '==', 3)
       ActiveSupport.on_load(:active_record) do
         NewRelic::Agent::Instrumentation::ActiveRecord.insert_instrumentation
       end

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

@@ -49,7 +49,7 @@ module NewRelic
 
             alias_method(:delete_all_without_newrelic, :delete_all)
 
-            if RUBY_VERSION < '2.7.0'
+            if NewRelic::Helper.version_satisfied?(RUBY_VERSION, '<', '2.7.0')
               def delete_all(*args, &blk)
                 ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
                   delete_all_without_newrelic(*args, &blk)
@@ -235,7 +235,7 @@ module NewRelic
           }.freeze
 
           DEFAULT = 'default'.freeze
-          UNKNOWN = 'unknown'.freeze
+          UNKNOWN = NewRelic::UNKNOWN_LOWER
           LOCALHOST = 'localhost'.freeze
 
           def adapter_from_config(config)

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

@@ -28,7 +28,7 @@ module NewRelic
             ) { yield }
           rescue => e
             # The translate_exception_class method got introduced in 4.1
-            if ::ActiveRecord::VERSION::MINOR == 0
+            if NewRelic::Helper.version_satisfied?(::ActiveRecord::VERSION::MINOR, '==', 0)
               raise translate_exception(e, sql)
             else
               raise translate_exception_class(e, sql)
@@ -86,7 +86,7 @@ DependencyDetection.defer do
   depends_on do
     defined?(ActiveRecord) && defined?(ActiveRecord::Base) &&
       defined?(ActiveRecord::VERSION) &&
-      ActiveRecord::VERSION::MAJOR.to_i >= 4
+      NewRelic::Helper.version_satisfied?(ActiveRecord::VERSION::MAJOR, '>=', 4)
   end
 
   depends_on do
@@ -113,7 +113,7 @@ DependencyDetection.defer do
 
       # Default to .prepending, unless the ActiveRecord version is <=4
       # **AND** the :prepend_active_record_instrumentation config is false
-      if ActiveRecord::VERSION::MAJOR > 4 \
+      if NewRelic::Helper.version_satisfied?(ActiveRecord::VERSION::MAJOR, '>', 4) \
           || NewRelic::Agent.config[:prepend_active_record_instrumentation]
 
         ActiveRecord::Base.send(:prepend,
@@ -131,11 +131,13 @@ DependencyDetection.defer do
       major_version = ActiveRecord::VERSION::MAJOR.to_i
       minor_version = ActiveRecord::VERSION::MINOR.to_i
 
-      activerecord_extension = if major_version == 4
+      activerecord_extension = if NewRelic::Helper.version_satisfied?(major_version, '==', 4)
         NewRelic::Agent::Instrumentation::ActiveRecordNotifications::BaseExtensions4x
-      elsif major_version == 5 && minor_version == 0
+      elsif NewRelic::Helper.version_satisfied?(major_version, '==', 5) &&
+          NewRelic::Helper.version_satisfied?(minor_version, '==', 0)
         NewRelic::Agent::Instrumentation::ActiveRecordNotifications::BaseExtensions50
-      elsif major_version == 5 && minor_version == 1
+      elsif NewRelic::Helper.version_satisfied?(major_version, '==', 5) &&
+          NewRelic::Helper.version_satisfied?(minor_version, '==', 1)
         NewRelic::Agent::Instrumentation::ActiveRecordNotifications::BaseExtensions51
       end
 
@@ -146,9 +148,9 @@ DependencyDetection.defer do
   end
 
   executes do
-    if ActiveRecord::VERSION::MAJOR == 5 \
-        && ActiveRecord::VERSION::MINOR.to_i == 1 \
-        && ActiveRecord::VERSION::TINY.to_i >= 6
+    if NewRelic::Helper.version_satisfied?(ActiveRecord::VERSION::MAJOR, '==', 5) \
+        && NewRelic::Helper.version_satisfied?(ActiveRecord::VERSION::MINOR, '==', 1) \
+        && NewRelic::Helper.version_satisfied?(ActiveRecord::VERSION::TINY, '>=', 6)
 
       ActiveRecord::Base.prepend(NewRelic::Agent::Instrumentation::ActiveRecordPrepend::BaseExtensions516)
     end