newrelic_rpm 9.0.0 → 9.2.2

data/lib/new_relic/cli/commands/deployments.rb

@@ -16,7 +16,7 @@ require 'new_relic/control' unless defined? NewRelic::Control
 
 class NewRelic::Cli::Deployments < NewRelic::Cli::Command
   attr_reader :control
-  def self.command; "deployments"; end
+  def self.command; 'deployments'; end
 
   # Initialize the deployment uploader with command line args.
   # Use -h to see options.
@@ -33,7 +33,8 @@ class NewRelic::Cli::Deployments < NewRelic::Cli::Command
     @changelog = nil
     @user = nil
     super(command_line_args)
-    @description ||= @leftover && @leftover.join(" ")
+    # needs else branch coverage
+    @description ||= @leftover && @leftover.join(' ') # rubocop:disable Style/SafeNavigation
     @user ||= ENV['USER']
     control.env = @environment if @environment
 
@@ -71,17 +72,17 @@ class NewRelic::Cli::Deployments < NewRelic::Cli::Command
       end
 
       if !api_v1? && (@revision.nil? || @revision.empty?)
-        raise "revision required when using New Relic REST API v2 with api_key. Pass in revision using: -r, --revision=REV"
+        raise 'revision required when using New Relic REST API v2 with api_key. Pass in revision using: -r, --revision=REV'
       end
 
       request = if api_v1?
-        uri = "/deployments.xml"
-        create_request(uri, {'x-license-key' => @license_key}, "application/octet-stream").tap do |req|
+        uri = '/deployments.xml'
+        create_request(uri, {'x-license-key' => @license_key}, 'application/octet-stream').tap do |req|
           set_params_v1(req)
         end
       else
         uri = "/v2/applications/#{application_id}/deployments.json"
-        create_request(uri, {"Api-Key" => @api_key}, "application/json").tap do |req|
+        create_request(uri, {'Api-Key' => @api_key}, 'application/json').tap do |req|
           set_params_v2(req)
         end
       end
@@ -92,7 +93,7 @@ class NewRelic::Cli::Deployments < NewRelic::Cli::Command
       if response.is_a?(Net::HTTPSuccess)
         info("Recorded deployment to '#{@appname}' (#{@description || Time.now})")
       else
-        err_string = REXML::Document.new(response.body).elements['errors/error'].map(&:to_s).join("; ") rescue response.message
+        err_string = REXML::Document.new(response.body).elements['errors/error'].map(&:to_s).join('; ') rescue response.message
         raise NewRelic::Cli::Command::CommandFailure, "Deployment not recorded: #{err_string}"
       end
     rescue SystemCallError, SocketError => e
@@ -150,7 +151,7 @@ class NewRelic::Cli::Deployments < NewRelic::Cli::Command
 
   def set_params_v2(request)
     request.body = {
-      "deployment" => {
+      'deployment' => {
         :description => @description,
         :user => @user,
         :revision => @revision,
@@ -161,25 +162,25 @@ class NewRelic::Cli::Deployments < NewRelic::Cli::Command
 
   def options
     OptionParser.new(%Q(Usage: #{$0} #{self.class.command} [OPTIONS] ["description"] ), 40) do |o|
-      o.separator("OPTIONS:")
-      o.on("-a", "--appname=NAME", String,
-        "Set the application name.",
-        "Default is app_name setting in newrelic.yml. Available only when using API v1.") { |e| @appname = e }
-      o.on("-i", "--appid=ID", String,
-        "Set the application ID",
-        "If not provided, will connect to the New Relic collector to get it") { |i| @application_id = i }
-      o.on("-e", "--environment=name", String,
-        "Override the (RAILS|RUBY|RACK)_ENV setting",
+      o.separator('OPTIONS:')
+      o.on('-a', '--appname=NAME', String,
+        'Set the application name.',
+        'Default is app_name setting in newrelic.yml. Available only when using API v1.') { |e| @appname = e }
+      o.on('-i', '--appid=ID', String,
+        'Set the application ID',
+        'If not provided, will connect to the New Relic collector to get it') { |i| @application_id = i }
+      o.on('-e', '--environment=name', String,
+        'Override the (RAILS|RUBY|RACK)_ENV setting',
         "currently: #{control.env}") { |e| @environment = e }
-      o.on("-u", "--user=USER", String,
-        "Specify the user deploying, for information only",
+      o.on('-u', '--user=USER', String,
+        'Specify the user deploying, for information only',
         "Default: #{@user || '<none>'}") { |u| @user = u }
-      o.on("-r", "--revision=REV", String,
-        "Specify the revision being deployed. Required when using New Relic REST API v2") { |r| @revision = r }
-      o.on("-l", "--license-key=KEY", String,
-        "Specify the license key of the account for the app being deployed") { |l| @license_key = l }
-      o.on("-c", "--changes",
-        "Read in a change log from the standard input") { @changelog = STDIN.read }
+      o.on('-r', '--revision=REV', String,
+        'Specify the revision being deployed. Required when using New Relic REST API v2') { |r| @revision = r }
+      o.on('-l', '--license-key=KEY', String,
+        'Specify the license key of the account for the app being deployed') { |l| @license_key = l }
+      o.on('-c', '--changes',
+        'Read in a change log from the standard input') { @changelog = STDIN.read }
       yield(o) if block_given?
     end
   end

data/lib/new_relic/cli/commands/install.rb

@@ -7,9 +7,9 @@ require 'new_relic/version'
 require 'erb'
 
 class NewRelic::Cli::Install < NewRelic::Cli::Command
-  NO_LICENSE_KEY = "<PASTE LICENSE KEY HERE>"
+  NO_LICENSE_KEY = '<PASTE LICENSE KEY HERE>'
 
-  def self.command; "install"; end
+  def self.command; 'install'; end
 
   # Use -h to see options.
   # When command_line_args is a hash, we are invoking directly and
@@ -25,22 +25,22 @@ class NewRelic::Cli::Install < NewRelic::Cli::Command
     super(command_line_args)
     if @dest_dir.nil?
       # Install a newrelic.yml file into the local config directory.
-      if File.directory?("config")
-        @dest_dir = "config"
+      if File.directory?('config')
+        @dest_dir = 'config'
       else
-        @dest_dir = "."
+        @dest_dir = '.'
       end
     end
     @license_key ||= NO_LICENSE_KEY
-    @app_name ||= @leftover.join(" ")
+    @app_name ||= @leftover.join(' ')
     @agent_version = NewRelic::VERSION::STRING
-    raise CommandFailure.new("Application name required.", @options) unless @app_name && @app_name.size > 0
+    raise CommandFailure.new('Application name required.', @options) unless @app_name && @app_name.size > 0
   end
 
   def run
-    dest_file = File.expand_path(@dest_dir + "/newrelic.yml")
+    dest_file = File.expand_path(@dest_dir + '/newrelic.yml')
     if File.exist?(dest_file) && !@force
-      raise NewRelic::Cli::Command::CommandFailure, "newrelic.yml file already exists.  Use --force flag to overwrite."
+      raise NewRelic::Cli::Command::CommandFailure, 'newrelic.yml file already exists.  Use --force flag to overwrite.'
     end
 
     File.open(dest_file, 'w') { |out| out.puts(content) }
@@ -63,7 +63,7 @@ class NewRelic::Cli::Install < NewRelic::Cli::Command
   end
 
   def content
-    @src_file ||= File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "..", "newrelic.yml"))
+    @src_file ||= File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'newrelic.yml'))
     template = File.read(@src_file)
     ERB.new(template).result(binding)
   end
@@ -72,10 +72,10 @@ class NewRelic::Cli::Install < NewRelic::Cli::Command
 
   def options
     OptionParser.new("Usage: #{$0} #{self.class.command} [ OPTIONS] 'application name'", 40) do |o|
-      o.on("-f", "--force", "Overwrite newrelic.yml if it exists") { |e| @force = true }
-      o.on("-l", "--license_key=NAME", String,
-        "Use the given license key") { |e| @license_key = e }
-      o.on("-d", "--destdir=name", String,
+      o.on('-f', '--force', 'Overwrite newrelic.yml if it exists') { |e| @force = true }
+      o.on('-l', '--license_key=NAME', String,
+        'Use the given license key') { |e| @license_key = e }
+      o.on('-d', '--destdir=name', String,
         "Write the newrelic.yml to the given directory, default is '.'") { |e| @dest_dir = e }
       yield(o) if block_given?
     end

data/lib/new_relic/collection_helper.rb

@@ -40,7 +40,7 @@ module NewRelic
         when nil then ''
         when object.instance_of?(String) then object
         when String then String.new(object) # convert string subclasses to strings
-        else String.new("#<#{object.class}>")
+        else +"#<#{object.class}>"
       end
     end
 
@@ -52,7 +52,7 @@ module NewRelic
         real_string = flatten(string)
         if real_string.size > len
           real_string = real_string.slice(0...len)
-          real_string << "..."
+          real_string << '...'
         end
         real_string
       else

data/lib/new_relic/constants.rb

@@ -7,16 +7,16 @@ module NewRelic
 
   EMPTY_ARRAY = [].freeze
   EMPTY_HASH = {}.freeze
-  EMPTY_STR = ""
+  EMPTY_STR = ''
 
-  HTTP = "HTTP"
-  HTTPS = "HTTPS"
-  UNKNOWN = "Unknown"
+  HTTP = 'HTTP'
+  HTTPS = 'HTTPS'
+  UNKNOWN = 'Unknown'
 
   FORMAT_NON_RACK = 0
   FORMAT_RACK = 1
 
-  NEWRELIC_KEY = "newrelic"
+  NEWRELIC_KEY = 'newrelic'
   CANDIDATE_NEWRELIC_KEYS = [
     NEWRELIC_KEY,
     'NEWRELIC',
@@ -24,8 +24,8 @@ module NewRelic
     'Newrelic'
   ].freeze
 
-  TRACEPARENT_KEY = "traceparent"
-  TRACESTATE_KEY = "tracestate"
+  TRACEPARENT_KEY = 'traceparent'
+  TRACESTATE_KEY = 'tracestate'
 
   STANDARD_OUT = 'STDOUT'
 
@@ -34,6 +34,5 @@ module NewRelic
   HTTP_NEWRELIC_KEY = "HTTP_#{NEWRELIC_KEY.upcase}"
 
   CONNECT_RETRY_PERIODS = [15, 15, 30, 60, 120, 300]
-  MIN_RETRY_PERIOD = 15
   MAX_RETRY_PERIOD = 300
 end

data/lib/new_relic/control/class_methods.rb

@@ -35,8 +35,8 @@ module NewRelic
 
       # nb this does not 'load test' the framework, it loads the 'test framework'
       def load_test_framework
-        config = File.expand_path(File.join('..', '..', '..', '..', "test", "config", "newrelic.yml"), __FILE__)
-        require "config/test_control"
+        config = File.expand_path(File.join('..', '..', '..', '..', 'test', 'config', 'newrelic.yml'), __FILE__)
+        require 'config/test_control'
         NewRelic::Control::Frameworks::Test.new(local_env, config)
       end
 
@@ -54,7 +54,7 @@ module NewRelic
 
       # The root directory for the plugin or gem
       def newrelic_root
-        File.expand_path(File.join("..", "..", "..", ".."), __FILE__)
+        File.expand_path(File.join('..', '..', '..', '..'), __FILE__)
       end
 
       def camelize(snake_case_name)

data/lib/new_relic/control/frameworks/rails.rb

@@ -44,26 +44,38 @@ module NewRelic
         # find a config and use that.
         def init_config(options = {})
           @config = options[:config]
-          # Install the dependency detection,
-          if rails_config && ::Rails.configuration.respond_to?(:after_initialize)
-            rails_config.after_initialize do
-              # This will insure we load all the instrumentation as late as possible.  If the agent
-              # is not enabled, it will load a limited amount of instrumentation.
-              DependencyDetection.detect!
-            end
+          install_dependency_detection
+          install_browser_monitoring_and_agent_hooks
+        rescue => e
+          ::NewRelic::Agent.logger.error('Failure during init_config for Rails. Is Rails required in a non-Rails ' \
+                                         'app? Set NEW_RELIC_FRAMEWORK=ruby to avoid this message. The Ruby agent ' \
+                                         'will continue running, but Rails-specific features may be missing. ' \
+                                         "#{e.class} - #{e.message}")
+        end
+
+        def install_dependency_detection
+          return unless rails_config && ::Rails.configuration.respond_to?(:after_initialize)
+
+          rails_config.after_initialize do
+            # This will insure we load all the instrumentation as late as
+            # possible. If the agent is not enabled, it will load a limited
+            # amount of instrumentation.
+            DependencyDetection.detect!
           end
+        end
+
+        def install_browser_monitoring_and_agent_hooks
+          return unless rails_config
+
           if !Agent.config[:agent_enabled]
-            # Might not be running if it does not think mongrel, thin, passenger, etc
-            # is running, if it thinks it's a rake task, or if the agent_enabled is false.
-            ::NewRelic::Agent.logger.info("New Relic Agent not running.")
+            # Might not be running if it does not think mongrel, thin,
+            # passenger, etc. is running, if it thinks it's a rake task, or
+            # if the agent_enabled is false.
+            ::NewRelic::Agent.logger.info('New Relic Agent not running. Skipping browser monitoring and agent hooks.')
           else
             install_browser_monitoring(rails_config)
             install_agent_hooks(rails_config)
           end
-        rescue => e
-          ::NewRelic::Agent.logger.error("Failure during init_config for Rails. Is Rails required in a non-Rails app? Set NEW_RELIC_FRAMEWORK=ruby to avoid this message.",
-            "The Ruby agent will continue running, but Rails-specific features may be missing.",
-            e)
         end
 
         def install_agent_hooks(config)
@@ -77,9 +89,9 @@ module NewRelic
             return unless NewRelic::Rack::AgentHooks.needed?
 
             config.middleware.use(NewRelic::Rack::AgentHooks)
-            ::NewRelic::Agent.logger.debug("Installed New Relic Agent Hooks middleware")
+            ::NewRelic::Agent.logger.debug('Installed New Relic Agent Hooks middleware')
           rescue => e
-            ::NewRelic::Agent.logger.warn("Error installing New Relic Agent Hooks middleware", e)
+            ::NewRelic::Agent.logger.warn('Error installing New Relic Agent Hooks middleware', e)
           end
         end
 
@@ -93,9 +105,9 @@ module NewRelic
             begin
               require 'new_relic/rack/browser_monitoring'
               config.middleware.use(NewRelic::Rack::BrowserMonitoring)
-              ::NewRelic::Agent.logger.debug("Installed New Relic Browser Monitoring middleware")
+              ::NewRelic::Agent.logger.debug('Installed New Relic Browser Monitoring middleware')
             rescue => e
-              ::NewRelic::Agent.logger.warn("Error installing New Relic Browser Monitoring middleware", e)
+              ::NewRelic::Agent.logger.warn('Error installing New Relic Browser Monitoring middleware', e)
             end
           end
         end

data/lib/new_relic/control/instance_methods.rb

@@ -82,10 +82,10 @@ module NewRelic
         if @started_in_env && @started_in_env != env
           Agent.logger.error("Attempted to start agent in #{env.inspect} environment, but agent was already running " \
             "in #{@started_in_env.inspect}", "The agent will continue running in #{@started_in_env.inspect}. To " \
-            "alter this, ensure the desired environment is set before the agent starts.")
+            'alter this, ensure the desired environment is set before the agent starts.')
         else
           Agent.logger.info("Starting the New Relic agent version #{NewRelic::VERSION::STRING} in #{env.inspect} " \
-            "environment.", "To prevent agent startup add a NEW_RELIC_AGENT_ENABLED=false environment variable or " \
+            'environment.', 'To prevent agent startup add a NEW_RELIC_AGENT_ENABLED=false environment variable or ' \
             "modify the #{env.inspect} section of your newrelic.yml.")
         end
 
@@ -106,9 +106,9 @@ module NewRelic
       end
 
       def handle_invalid_security_settings
-        NewRelic::Agent.logger.error("Security Policies and High Security Mode cannot both be present in the agent " \
-          "configuration. If Security Policies have been set for your account, please ensure the " \
-          "security_policies_token is set but high_security is disabled (default).")
+        NewRelic::Agent.logger.error('Security Policies and High Security Mode cannot both be present in the agent ' \
+          'configuration. If Security Policies have been set for your account, please ensure the ' \
+          'security_policies_token is set but high_security is disabled (default).')
         install_shim
       end
 

data/lib/new_relic/control/instrumentation.rb

@@ -62,9 +62,8 @@ module NewRelic
           File.join(instrumentation_path, app.to_s, '*.rb')
         @instrumentation_files.each { |pattern| load_instrumentation_files(pattern) }
         DependencyDetection.detect!
-        ruby_deprecation
         rails_32_deprecation
-        ::NewRelic::Agent.logger.info("Finished instrumentation")
+        ::NewRelic::Agent.logger.info('Finished instrumentation')
       end
     end
 
@@ -81,19 +80,6 @@ module NewRelic
       )
     end
 
-    def ruby_deprecation
-      return unless RUBY_VERSION < '2.4.0'
-
-      deprecation_msg = 'The Ruby Agent is dropping support for Rubies below 2.4 ' \
-        'in version 9.0.0. Please upgrade your Ruby version to continue receiving support. ' \
-
-      ::NewRelic::Agent.logger.log_once(
-        :warn,
-        :deprecated_ruby_version,
-        deprecation_msg
-      )
-    end
-
     include Instrumentation
   end
 end

data/lib/new_relic/control/private_instance_methods.rb

@@ -12,7 +12,7 @@ module NewRelic
 
       def configure_high_security
         if security_settings_valid? && Agent.config[:high_security]
-          Agent.logger.info("Installing high security configuration based on local configuration")
+          Agent.logger.info('Installing high security configuration based on local configuration')
           Agent.config.replace_or_add_config(Agent::Configuration::HighSecuritySource.new(Agent.config))
         end
       end

data/lib/new_relic/dependency_detection.rb

@@ -35,19 +35,6 @@ module DependencyDetection
     @items.find { |i| i.name == name }
   end
 
-  def installed?(name)
-    item = dependency_by_name(name)
-    item && item.executed
-  end
-
-  def items
-    @items
-  end
-
-  def items=(new_items)
-    @items = new_items
-  end
-
   class Dependent
     attr_reader :executed
     attr_accessor :name
@@ -83,7 +70,7 @@ module DependencyDetection
     # Given "NewRelic::Agent::Instrumentation::NetHTTP::Prepend"
     # Will extract "NetHTTP" which is in the 2nd to last spot
     def extract_supportability_name(instrumenting_module)
-      instrumenting_module.to_s.split("::")[-2]
+      instrumenting_module.to_s.split('::')[-2]
     end
 
     def log_and_instrument(method, instrumenting_module, supportability_name)
@@ -94,20 +81,20 @@ module DependencyDetection
     end
 
     def prepend_instrument(target_class, instrumenting_module, supportability_name = nil)
-      log_and_instrument("Prepend", instrumenting_module, supportability_name) do
+      log_and_instrument('Prepend', instrumenting_module, supportability_name) do
         target_class.send(:prepend, instrumenting_module)
       end
     end
 
     def chain_instrument(instrumenting_module, supportability_name = nil)
-      log_and_instrument("MethodChaining", instrumenting_module, supportability_name) do
+      log_and_instrument('MethodChaining', instrumenting_module, supportability_name) do
         instrumenting_module.instrument!
       end
     end
 
     def chain_instrument_target(target, instrumenting_module, supportability_name = nil)
       NewRelic::Agent.logger.info("Installing deferred #{target} instrumentation")
-      log_and_instrument("MethodChaining", instrumenting_module, supportability_name) do
+      log_and_instrument('MethodChaining', instrumenting_module, supportability_name) do
         instrumenting_module.instrument!(target)
       end
     end
@@ -192,6 +179,15 @@ module DependencyDetection
       return valid_value
     end
 
+    # update any :auto config value to be either :prepend or :chain after auto
+    # determination has selected one of those to use
+    def update_config_value(use_prepend)
+      if config_key && auto_configured?
+        NewRelic::Agent.config.instance_variable_get(:@cache)[config_key] = use_prepend ? :prepend : :chain
+      end
+      use_prepend
+    end
+
     def config_value
       return AUTO_CONFIG_VALUE unless config_key
 
@@ -215,7 +211,7 @@ module DependencyDetection
     end
 
     def use_prepend?
-      prepend_configured? || (auto_configured? && !prepend_conflicts?)
+      update_config_value(prepend_configured? || (auto_configured? && !prepend_conflicts?))
     end
 
     def prepend_conflicts?

data/lib/new_relic/environment_report.rb

@@ -52,7 +52,7 @@ module NewRelic
         # though so try it if the above fails.
         Bundler.load.specs.map do |spec|
           version = (spec.respond_to?(:version) && spec.version)
-          spec.name + (version ? "(#{version})" : "")
+          spec.name + (version ? "(#{version})" : '')
         end
       end
     end
@@ -118,19 +118,19 @@ module NewRelic
     def record_value(data, key, value)
       data[key] = value
 
-      Agent.record_metric("Supportability/EnvironmentReport/success", 0.0)
+      Agent.record_metric('Supportability/EnvironmentReport/success', 0.0)
       Agent.record_metric("Supportability/EnvironmentReport/success/#{key}", 0.0)
     end
 
     def record_empty_value(key, value)
       Agent.logger.debug("EnvironmentReport ignoring value for #{key.inspect} which came back falsey: #{value.inspect}")
-      Agent.record_metric("Supportability/EnvironmentReport/empty", 0.0)
+      Agent.record_metric('Supportability/EnvironmentReport/empty', 0.0)
       Agent.record_metric("Supportability/EnvironmentReport/empty/#{key}", 0.0)
     end
 
     def rescue_initialize(key, exception)
       Agent.logger.debug("EnvironmentReport failed to retrieve value for #{key.inspect}: #{exception}")
-      Agent.record_metric("Supportability/EnvironmentReport/error", 0.0)
+      Agent.record_metric('Supportability/EnvironmentReport/error', 0.0)
       Agent.record_metric("Supportability/EnvironmentReport/error/#{key}", 0.0)
     end
   end

data/lib/new_relic/helper.rb

@@ -63,7 +63,8 @@ module NewRelic
         raise NewRelic::CommandRunFailedError.new("Failed to run command '#{command}': #{message}")
       end
 
-      output.chomp if output
+      # needs else branch coverage
+      output.chomp if output # rubocop:disable Style/SafeNavigation
     end
 
     # TODO: Open3 defers the actual execution of a binary to Process.spawn,

data/lib/new_relic/language_support.rb

@@ -62,7 +62,7 @@ module NewRelic
           #
           # Can't help if the constant isn't a class...
           if result.is_a?(Module)
-            expected_name = "#{namespace}::#{name}".gsub(/^Object::/, "")
+            expected_name = "#{namespace}::#{name}".gsub(/^Object::/, '')
             return unless expected_name == result.to_s
           end
 

data/lib/new_relic/latest_changes.rb

@@ -26,12 +26,12 @@ EOS
     # * This is a patch item (3.7.1.188)
     def self.read_patch(patch_level, changelog = default_changelog)
       latest = extract_latest_changes(File.read(changelog))
-      changes = ["## v#{patch_level}", ""]
+      changes = ["## v#{patch_level}", '']
 
       current_item = nil
       latest.each do |line|
-        if line =~ /^\s*\*.*/
-          if line =~ /\(#{patch_level}\)/
+        if /^\s*\*.*/.match?(line)
+          if /\(#{patch_level}\)/.match?(line)
             # Found a patch level item, so start tracking the lines!
             current_item = line
           else
@@ -52,12 +52,12 @@ EOS
       changes = []
       version_count = 0
       contents.each_line do |line|
-        if line =~ /##\s+v[\d.]+/
+        if /##\s+v[\d.]+/.match?(line)
           version_count += 1
         end
         break if version_count >= 2
 
-        changes << line.sub(/^  \* /, "* ").chomp
+        changes << line.sub(/^  \* /, '* ').chomp
       end
       changes
     end

data/lib/new_relic/noticed_error.rb

@@ -15,18 +15,20 @@ class NewRelic::NoticedError
     :stack_trace, :attributes_from_notice_error, :attributes,
     :expected
 
-  attr_reader :exception_id, :is_internal
+  attr_reader :error_group, :exception_id, :is_internal
 
   STRIPPED_EXCEPTION_REPLACEMENT_MESSAGE = "Message removed by New Relic 'strip_exception_messages' setting"
   UNKNOWN_ERROR_CLASS_NAME = 'Error'
   NIL_ERROR_MESSAGE = '<no message>'
 
-  USER_ATTRIBUTES = "userAttributes"
-  AGENT_ATTRIBUTES = "agentAttributes"
-  INTRINSIC_ATTRIBUTES = "intrinsics"
+  USER_ATTRIBUTES = 'userAttributes'
+  AGENT_ATTRIBUTES = 'agentAttributes'
+  INTRINSIC_ATTRIBUTES = 'intrinsics'
 
   DESTINATION = NewRelic::Agent::AttributeFilter::DST_ERROR_COLLECTOR
 
+  AGENT_ATTRIBUTE_ERROR_GROUP = :'error.group.name'
+
   ERROR_PREFIX_KEY = 'error'
   ERROR_MESSAGE_KEY = "#{ERROR_PREFIX_KEY}.message"
   ERROR_CLASS_KEY = "#{ERROR_PREFIX_KEY}.class"
@@ -141,21 +143,9 @@ class NewRelic::NoticedError
   end
 
   def build_agent_attributes(merged_attributes)
-    agent_attributes = if @attributes
-      @attributes.agent_attributes_for(DESTINATION)
-    else
-      NewRelic::EMPTY_HASH
-    end
-
-    # It's possible to override the request_uri from the transaction attributes
-    # with a uri passed to notice_error. Add it to merged_attributes filter and
-    # merge with the transaction attributes, possibly overriding the request_uri
-    if request_uri
-      merged_attributes.add_agent_attribute(:'request.uri', request_uri, DESTINATION)
-      agent_attributes.merge(merged_attributes.agent_attributes_for(DESTINATION))
-    end
+    return NewRelic::EMPTY_HASH unless @attributes
 
-    agent_attributes
+    @attributes.agent_attributes_for(DESTINATION)
   end
 
   def build_intrinsic_attributes
@@ -197,4 +187,16 @@ class NewRelic::NoticedError
       @message = exception.to_s
     end
   end
+
+  def error_group=(name)
+    return if name.nil? || name.empty?
+
+    if agent_attributes.frozen?
+      processed_attributes[AGENT_ATTRIBUTES] = agent_attributes.merge(AGENT_ATTRIBUTE_ERROR_GROUP => name)
+    else
+      agent_attributes[AGENT_ATTRIBUTE_ERROR_GROUP] = name
+    end
+
+    @error_group = name
+  end
 end