newrelic_rpm 8.9.0 → 8.10.1

data/lib/new_relic/agent/agent/start_worker_thread.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
+# frozen_string_literal: true
 
 module NewRelic
   module Agent
@@ -18,11 +19,11 @@ module NewRelic
       # See #connect for a description of connection_options.
       def start_worker_thread(connection_options = {})
         if disable = NewRelic::Agent.config[:disable_harvest_thread]
-          NewRelic::Agent.logger.info "Not starting Ruby Agent worker thread because :disable_harvest_thread is #{disable}"
+          NewRelic::Agent.logger.info("Not starting Ruby Agent worker thread because :disable_harvest_thread is #{disable}")
           return
         end
 
-        ::NewRelic::Agent.logger.debug "Creating Ruby Agent worker thread."
+        ::NewRelic::Agent.logger.debug("Creating Ruby Agent worker thread.")
         @worker_thread = Threading::AgentThread.create('Worker Loop') do
           deferred_work!(connection_options)
         end
@@ -44,7 +45,7 @@ module NewRelic
         # Wait the end of the event loop thread.
         if @worker_thread
           unless @worker_thread.join(3)
-            ::NewRelic::Agent.logger.debug "Event loop thread did not stop within 3 seconds"
+            ::NewRelic::Agent.logger.debug("Event loop thread did not stop within 3 seconds")
           end
         end
       end
@@ -52,7 +53,7 @@ module NewRelic
       # Certain event types may sometimes need to be on the same interval as metrics,
       # so we will check config assigned in EventHarvestConfig to determine the interval
       # on which to report them
-      def interval_for event_type
+      def interval_for(event_type)
         interval = Agent.config[:"event_report_period.#{event_type}"]
         :"#{interval}_second_harvest"
       end
@@ -66,19 +67,19 @@ module NewRelic
           transmit_data
         end
 
-        @event_loop.on(interval_for TRANSACTION_EVENT_DATA) do
+        @event_loop.on(interval_for(TRANSACTION_EVENT_DATA)) do
           transmit_analytic_event_data
         end
-        @event_loop.on(interval_for CUSTOM_EVENT_DATA) do
+        @event_loop.on(interval_for(CUSTOM_EVENT_DATA)) do
           transmit_custom_event_data
         end
-        @event_loop.on(interval_for ERROR_EVENT_DATA) do
+        @event_loop.on(interval_for(ERROR_EVENT_DATA)) do
           transmit_error_event_data
         end
-        @event_loop.on(interval_for SPAN_EVENT_DATA) do
+        @event_loop.on(interval_for(SPAN_EVENT_DATA)) do
           transmit_span_event_data
         end
-        @event_loop.on(interval_for LOG_EVENT_DATA) do
+        @event_loop.on(interval_for(LOG_EVENT_DATA)) do
           transmit_log_event_data
         end
 
@@ -96,18 +97,18 @@ module NewRelic
       # this clears the data, clears connection attempts, and
       # waits a while to reconnect.
       def handle_force_restart(error)
-        ::NewRelic::Agent.logger.debug error.message
+        ::NewRelic::Agent.logger.debug(error.message)
         drop_buffered_data
         @service.force_restart if @service
         @connect_state = :pending
-        sleep 30
+        sleep(30)
       end
 
       # when a disconnect is requested, stop the current thread, which
       # is the worker thread that gathers data and talks to the
       # server.
       def handle_force_disconnect(error)
-        ::NewRelic::Agent.logger.warn "Agent received a ForceDisconnectException from the server, disconnecting. (#{error.message})"
+        ::NewRelic::Agent.logger.warn("Agent received a ForceDisconnectException from the server, disconnecting. (#{error.message})")
         disconnect
       end
 
@@ -115,7 +116,7 @@ module NewRelic
       # it and disconnecting the agent, since we are now in an
       # unknown state.
       def handle_other_error(error)
-        ::NewRelic::Agent.logger.error "Unhandled error in worker thread, disconnecting."
+        ::NewRelic::Agent.logger.error("Unhandled error in worker thread, disconnecting.")
         # These errors are fatal (that is, they will prevent the agent from
         # reporting entirely), so we really want backtraces when they happen
         ::NewRelic::Agent.logger.log_exception(:error, error)
@@ -153,7 +154,7 @@ module NewRelic
               # never reaches here unless there is a problem or
               # the agent is exiting
             else
-              ::NewRelic::Agent.logger.debug "No connection.  Worker thread ending."
+              ::NewRelic::Agent.logger.debug("No connection.  Worker thread ending.")
             end
           end
         end

data/lib/new_relic/agent/agent/startup.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
+# frozen_string_literal: true
 
 module NewRelic
   module Agent
@@ -68,7 +69,7 @@ module NewRelic
       # Log the environment the app thinks it's running in.
       # Useful in debugging, as this is the key for config YAML lookups.
       def log_environment
-        ::NewRelic::Agent.logger.info "Environment: #{NewRelic::Control.instance.env}"
+        ::NewRelic::Agent.logger.info("Environment: #{NewRelic::Control.instance.env}")
       end
 
       # Logs the dispatcher to the log file to assist with
@@ -78,21 +79,21 @@ module NewRelic
         dispatcher_name = Agent.config[:dispatcher].to_s
 
         if dispatcher_name.empty?
-          ::NewRelic::Agent.logger.info 'No known dispatcher detected.'
+          ::NewRelic::Agent.logger.info('No known dispatcher detected.')
         else
-          ::NewRelic::Agent.logger.info "Dispatcher: #{dispatcher_name}"
+          ::NewRelic::Agent.logger.info("Dispatcher: #{dispatcher_name}")
         end
       end
 
       def log_app_name
-        ::NewRelic::Agent.logger.info "Application: #{Agent.config[:app_name].join(", ")}"
+        ::NewRelic::Agent.logger.info("Application: #{Agent.config[:app_name].join(", ")}")
       end
 
       def log_ignore_url_regexes
         regexes = NewRelic::Agent.config[:'rules.ignore_url_regexes']
 
         unless regexes.empty?
-          ::NewRelic::Agent.logger.info "Ignoring URLs that match the following regexes: #{regexes.map(&:inspect).join(", ")}."
+          ::NewRelic::Agent.logger.info("Ignoring URLs that match the following regexes: #{regexes.map(&:inspect).join(", ")}.")
         end
       end
 
@@ -100,7 +101,7 @@ module NewRelic
       # so we can disambiguate processes in the log file and make
       # sure they're running a reasonable version
       def log_version_and_pid
-        ::NewRelic::Agent.logger.debug "New Relic Ruby Agent #{NewRelic::VERSION::STRING} Initialized: pid = #{$$}"
+        ::NewRelic::Agent.logger.debug("New Relic Ruby Agent #{NewRelic::VERSION::STRING} Initialized: pid = #{$$}")
       end
 
       # Logs the configured application names
@@ -164,21 +165,21 @@ module NewRelic
         return false if already_started? || disabled?
 
         if defer_for_delayed_job?
-          ::NewRelic::Agent.logger.debug "Deferring startup for DelayedJob"
+          ::NewRelic::Agent.logger.debug("Deferring startup for DelayedJob")
           return false
         end
 
         if defer_for_resque?
-          ::NewRelic::Agent.logger.debug "Deferring startup for Resque in case it daemonizes"
+          ::NewRelic::Agent.logger.debug("Deferring startup for Resque in case it daemonizes")
           return false
         end
 
         unless app_name_configured?
-          NewRelic::Agent.logger.error "No application name configured.",
+          NewRelic::Agent.logger.error("No application name configured.",
             "The Agent cannot start without at least one. Please check your ",
             "newrelic.yml and ensure that it is valid and has at least one ",
             "value set for app_name in the #{NewRelic::Control.instance.env} ",
-            "environment."
+            "environment.")
           return false
         end
 

data/lib/new_relic/agent/agent.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
+# frozen_string_literal: true
 
 require 'socket'
 require 'net/https'
@@ -69,23 +70,23 @@ module NewRelic
         @stats_engine = StatsEngine.new
         @transaction_sampler = TransactionSampler.new
         @sql_sampler = SqlSampler.new
-        @agent_command_router = Commands::AgentCommandRouter.new @events
-        @monitors = Monitors.new @events
-        @error_collector = ErrorCollector.new @events
+        @agent_command_router = Commands::AgentCommandRouter.new(@events)
+        @monitors = Monitors.new(@events)
+        @error_collector = ErrorCollector.new(@events)
         @transaction_rules = RulesEngine.new
-        @harvest_samplers = SamplerCollection.new @events
+        @harvest_samplers = SamplerCollection.new(@events)
         @monotonic_gc_profiler = VM::MonotonicGCProfiler.new
-        @javascript_instrumentor = JavascriptInstrumentor.new @events
+        @javascript_instrumentor = JavascriptInstrumentor.new(@events)
         @adaptive_sampler = AdaptiveSampler.new(Agent.config[:sampling_target],
           Agent.config[:sampling_target_period_in_seconds])
 
-        @harvester = Harvester.new @events
+        @harvester = Harvester.new(@events)
         @after_fork_lock = Mutex.new
 
-        @transaction_event_recorder = TransactionEventRecorder.new @events
-        @custom_event_aggregator = CustomEventAggregator.new @events
-        @span_event_aggregator = SpanEventAggregator.new @events
-        @log_event_aggregator = LogEventAggregator.new @events
+        @transaction_event_recorder = TransactionEventRecorder.new(@events)
+        @custom_event_aggregator = CustomEventAggregator.new(@events)
+        @span_event_aggregator = SpanEventAggregator.new(@events)
+        @log_event_aggregator = LogEventAggregator.new(@events)
 
         @connect_state = :pending
         @connect_attempts = 0
@@ -209,7 +210,7 @@ module NewRelic
             disconnected? ||
             !control.security_settings_valid?
 
-          ::NewRelic::Agent.logger.debug "Starting the worker thread in #{Process.pid} (parent #{Process.ppid}) after forking."
+          ::NewRelic::Agent.logger.debug("Starting the worker thread in #{Process.pid} (parent #{Process.ppid}) after forking.")
 
           channel_id = options[:report_to_channel]
           install_pipe_service(channel_id) if channel_id
@@ -356,7 +357,7 @@ module NewRelic
           # to tell the user what happened, since this is not an error
           # we can handle gracefully.
           def log_error(error)
-            ::NewRelic::Agent.logger.error "Error establishing connection with New Relic Service at #{control.server}:", error
+            ::NewRelic::Agent.logger.error("Error establishing connection with New Relic Service at #{control.server}:", error)
           end
 
           # When the server sends us an error with the license key, we
@@ -399,26 +400,27 @@ module NewRelic
           # connects, then configures the agent using the response from
           # the connect service
           def connect_to_server
-            request_builder = ::NewRelic::Agent::Connect::RequestBuilder.new \
+            request_builder = ::NewRelic::Agent::Connect::RequestBuilder.new( \
               @service,
               Agent.config,
               event_harvest_config,
               environment_for_connect
-            connect_response = @service.connect request_builder.connect_payload
+            )
+            connect_response = @service.connect(request_builder.connect_payload)
 
             response_handler = ::NewRelic::Agent::Connect::ResponseHandler.new(self, Agent.config)
             response_handler.configure_agent(connect_response)
 
-            log_connection connect_response if connect_response
+            log_connection(connect_response) if connect_response
             connect_response
           end
 
           # Logs when we connect to the server, for debugging purposes
           # - makes sure we know if an agent has not connected
           def log_connection(config_data)
-            ::NewRelic::Agent.logger.debug "Connected to NewRelic Service at #{@service.collector.name}"
-            ::NewRelic::Agent.logger.debug "Agent Run       = #{@service.agent_id}."
-            ::NewRelic::Agent.logger.debug "Connection data = #{config_data.inspect}"
+            ::NewRelic::Agent.logger.debug("Connected to NewRelic Service at #{@service.collector.name}")
+            ::NewRelic::Agent.logger.debug("Agent Run       = #{@service.agent_id}.")
+            ::NewRelic::Agent.logger.debug("Connection data = #{config_data.inspect}")
             if config_data['messages'] && config_data['messages'].any?
               log_collector_messages(config_data['messages'])
             end
@@ -482,7 +484,7 @@ module NewRelic
 
         def merge_data_for_endpoint(endpoint, data)
           if data && !data.empty?
-            container = container_for_endpoint endpoint
+            container = container_for_endpoint(endpoint)
             if container.respond_to?(:has_metadata?) && container.has_metadata?
               container_for_endpoint(endpoint).merge!(data, false)
             else
@@ -522,7 +524,7 @@ module NewRelic
 
           return unless should_connect?(opts[:force_reconnect])
 
-          ::NewRelic::Agent.logger.debug "Connecting Process to New Relic: #$0"
+          ::NewRelic::Agent.logger.debug("Connecting Process to New Relic: #$0")
           connect_to_server
           @connected_pid = $$
           @connect_state = :connected
@@ -541,12 +543,12 @@ module NewRelic
           log_error(e)
           if opts[:keep_retrying]
             note_connect_failure
-            ::NewRelic::Agent.logger.info "Will re-attempt in #{connect_retry_period} seconds"
-            sleep connect_retry_period
+            ::NewRelic::Agent.logger.info("Will re-attempt in #{connect_retry_period} seconds")
+            sleep(connect_retry_period)
             retry
           end
         rescue Exception => e
-          ::NewRelic::Agent.logger.error "Exception of unexpected type during Agent#connect():", e
+          ::NewRelic::Agent.logger.error("Exception of unexpected type during Agent#connect():", e)
 
           raise
         end
@@ -576,14 +578,14 @@ module NewRelic
         #
         def harvest_and_send_from_container(container, endpoint)
           payload = harvest_from_container(container, endpoint)
-          sample_count = harvest_size container, payload
+          sample_count = harvest_size(container, payload)
           if sample_count > 0
             NewRelic::Agent.logger.debug("Sending #{sample_count} items to #{endpoint}")
             send_data_to_endpoint(endpoint, payload, container)
           end
         end
 
-        def harvest_size container, items
+        def harvest_size(container, items)
           if container.respond_to?(:has_metadata?) && container.has_metadata? && !items.empty?
             items.last.size
           else
@@ -657,7 +659,7 @@ module NewRelic
         end
 
         def harvest_and_send_error_event_data
-          harvest_and_send_from_container @error_collector.error_event_aggregator, :error_event_data
+          harvest_and_send_from_container(@error_collector.error_event_aggregator, :error_event_data)
         end
 
         def harvest_and_send_span_event_data
@@ -717,7 +719,7 @@ module NewRelic
           now = Process.clock_gettime(Process::CLOCK_MONOTONIC)
 
           msg = "Sending #{supportability_name} data to New Relic Service"
-          ::NewRelic::Agent.logger.debug msg
+          ::NewRelic::Agent.logger.debug(msg)
 
           @service.session do # use http keep-alive
             self.send(harvest_method)
@@ -729,7 +731,7 @@ module NewRelic
 
         def transmit_data
           now = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-          ::NewRelic::Agent.logger.debug "Sending data to New Relic Service"
+          ::NewRelic::Agent.logger.debug("Sending data to New Relic Service")
 
           @events.notify(:before_harvest)
           @service.session do # use http keep-alive
@@ -771,17 +773,17 @@ module NewRelic
               transmit_log_event_data
 
               if @connected_pid == $$ && !@service.kind_of?(NewRelic::Agent::NewRelicService)
-                ::NewRelic::Agent.logger.debug "Sending New Relic service agent run shutdown message"
+                ::NewRelic::Agent.logger.debug("Sending New Relic service agent run shutdown message")
                 @service.shutdown
               else
-                ::NewRelic::Agent.logger.debug "This agent connected from parent process #{@connected_pid}--not sending shutdown"
+                ::NewRelic::Agent.logger.debug("This agent connected from parent process #{@connected_pid}--not sending shutdown")
               end
-              ::NewRelic::Agent.logger.debug "Graceful disconnect complete"
+              ::NewRelic::Agent.logger.debug("Graceful disconnect complete")
             rescue Timeout::Error, StandardError => e
-              ::NewRelic::Agent.logger.debug "Error when disconnecting #{e.class.name}: #{e.message}"
+              ::NewRelic::Agent.logger.debug("Error when disconnecting #{e.class.name}: #{e.message}")
             end
           else
-            ::NewRelic::Agent.logger.debug "Bypassing graceful disconnect - agent not connected"
+            ::NewRelic::Agent.logger.debug("Bypassing graceful disconnect - agent not connected")
           end
         end
       end

data/lib/new_relic/agent/agent_logger.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
+# frozen_string_literal: true
 
 require 'thread'
 require 'logger'
@@ -178,7 +179,7 @@ module NewRelic
         StartupLogger.instance.dump(self)
       end
 
-      def self.format_fatal_error message
+      def self.format_fatal_error(message)
         "** [NewRelic] FATAL : #{message}\n"
       end
     end

data/lib/new_relic/agent/attribute_filter.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
+# frozen_string_literal: true
 
 # This class applies filtering rules as specified in the Agent Attributes
 # cross-agent spec.

data/lib/new_relic/agent/attribute_processing.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
+# frozen_string_literal: true
 
 module NewRelic
   module Agent
@@ -11,9 +12,9 @@ module NewRelic
       EMPTY_ARRAY_STRING_LITERAL = "[]".freeze
 
       def flatten_and_coerce(object, prefix = nil, result = {}, &blk)
-        if object.is_a? Hash
+        if object.is_a?(Hash)
           flatten_and_coerce_hash(object, prefix, result, &blk)
-        elsif object.is_a? Array
+        elsif object.is_a?(Array)
           flatten_and_coerce_array(object, prefix, result, &blk)
         elsif prefix
           val = Coerce.scalar(object)
@@ -23,7 +24,7 @@ module NewRelic
             result[prefix] = val
           end
         else
-          NewRelic::Agent.logger.warn "Unexpected object: #{object.inspect} with nil prefix passed to NewRelic::Agent::AttributeProcessing.flatten_and_coerce"
+          NewRelic::Agent.logger.warn("Unexpected object: #{object.inspect} with nil prefix passed to NewRelic::Agent::AttributeProcessing.flatten_and_coerce")
         end
         result
       end

data/lib/new_relic/agent/attributes.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
+# frozen_string_literal: true
 
 require 'new_relic/agent/attribute_processing'
 
@@ -34,7 +35,7 @@ module NewRelic
       end
 
       def add_agent_attribute_with_key_check(key, value, default_destinations)
-        if exceeds_bytesize_limit? key, KEY_LIMIT
+        if exceeds_bytesize_limit?(key, KEY_LIMIT)
           NewRelic::Agent.logger.debug("Agent attribute #{key} was dropped for exceeding key length limit #{KEY_LIMIT}")
           return
         end

data/lib/new_relic/agent/audit_logger.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
+# frozen_string_literal: true
 
 require 'logger'
 require 'fileutils'

data/lib/new_relic/agent/autostart.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
+# frozen_string_literal: true
 
 module NewRelic
   module Agent

data/lib/new_relic/agent/chained_call.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
+# frozen_string_literal: true
 
 # This class is used by NewRelic::Agent.set_sql_obfuscator to chain multiple
 # obfuscation blocks when not using the default :replace action

data/lib/new_relic/agent/commands/agent_command.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
+# frozen_string_literal: true
 
 module NewRelic
   module Agent

data/lib/new_relic/agent/commands/agent_command_router.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
+# frozen_string_literal: true
 
 # This class is the central point for dispatching get_agent_commands messages
 # to the various components that actually process them.
@@ -77,16 +78,16 @@ module NewRelic
 
         def log_profiles(profiles)
           if profiles.empty?
-            ::NewRelic::Agent.logger.debug "No thread profiles with data found to send."
+            ::NewRelic::Agent.logger.debug("No thread profiles with data found to send.")
           else
             profile_descriptions = profiles.map { |p| p.to_log_description }
-            ::NewRelic::Agent.logger.debug "Sending thread profiles [#{profile_descriptions.join(", ")}]"
+            ::NewRelic::Agent.logger.debug("Sending thread profiles [#{profile_descriptions.join(", ")}]")
           end
         end
 
         def get_agent_commands
           commands = new_relic_service.get_agent_commands
-          NewRelic::Agent.logger.debug "Received get_agent_commands = #{commands.inspect}"
+          NewRelic::Agent.logger.debug("Received get_agent_commands = #{commands.inspect}")
           commands.map { |collector_command| AgentCommand.new(collector_command) }
         end
 

data/lib/new_relic/agent/commands/thread_profiler_session.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
+# frozen_string_literal: true
 
 require 'new_relic/agent/threading/agent_thread'
 require 'new_relic/agent/threading/backtrace_service'

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

@@ -1,6 +1,7 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
+# frozen_string_literal: true
 
 require 'forwardable'
 
@@ -46,7 +47,7 @@ module NewRelic
 
       # Marks the config option as deprecated in the documentation once generated.
       # Does not appear in logs.
-      def self.deprecated_description new_setting, description
+      def self.deprecated_description(new_setting, description)
         link_ref = new_setting.to_s.gsub(".", "-")
         %{Please see: [#{new_setting}](docs/agents/ruby-agent/configuration/ruby-agent-configuration##{link_ref}). \n\n#{description}}
       end
@@ -117,7 +118,7 @@ module NewRelic
         def self.config_path
           Proc.new {
             found_path = NewRelic::Agent.config[:config_search_paths].detect do |file|
-              File.expand_path(file) if File.exist? file
+              File.expand_path(file) if File.exist?(file)
             end
             found_path || NewRelic::EMPTY_STR
           }
@@ -134,7 +135,7 @@ module NewRelic
               when 4..7
                 :rails_notifications
               else
-                ::NewRelic::Agent.logger.warn "Detected untested Rails version #{Rails::VERSION::STRING}"
+                ::NewRelic::Agent.logger.warn("Detected untested Rails version #{Rails::VERSION::STRING}")
                 :rails_notifications
               end
             when defined?(::Sinatra) && defined?(::Sinatra::Base) then :sinatra
@@ -211,7 +212,7 @@ module NewRelic
 
         def self.api_host
           Proc.new do
-            if String(NewRelic::Agent.config[:license_key]).start_with? 'eu'
+            if String(NewRelic::Agent.config[:license_key]).start_with?('eu')
               'rpm.eu.newrelic.com'
             else
               'rpm.newrelic.com'
@@ -238,7 +239,7 @@ module NewRelic
         end
 
         SEMICOLON = ';'.freeze
-        def self.convert_to_list_on_semicolon value
+        def self.convert_to_list_on_semicolon(value)
           case value
           when Array then value
           when String then value.split(SEMICOLON)
@@ -1085,6 +1086,32 @@ If `true`, disables agent middleware for Sinatra. This middleware is responsible
           :allowed_from_server => false,
           :description => 'Controls auto-instrumentation of the Tilt template rendering library at start up. May be one of [auto|prepend|chain|disabled].'
         },
+        :'instrumentation.grpc_client' => {
+          :default => instrumentation_value_of(:disable_grpc_client),
+          :documentation_default => 'auto',
+          :public => true,
+          :type => String,
+          :dynamic_name => true,
+          :allowed_from_server => false,
+          :description => 'Controls auto-instrumentation of gRPC clients at start up.  May be one of [auto|prepend|chain|disabled].'
+        },
+        :'instrumentation.grpc.host_denylist' => {
+          :default => [],
+          :public => true,
+          :type => Array,
+          :allowed_from_server => false,
+          :transform => DefaultSource.method(:convert_to_regexp_list),
+          :description => %Q(Specifies a list of hostname patterns separated by commas that will match gRPC hostnames that traffic is to be ignored by New Relic for. New Relic's gRPC client instrumentation will ignore traffic streamed to a host matching any of these patterns, and New Relic's gRPC server instrumentation will ignore traffic for a server running on a host whose hostname matches any of these patterns. By default, no traffic is ignored when gRPC instrumentation is itself enabled. For example, "private.com$,exception.*")
+        },
+        :'instrumentation.grpc_server' => {
+          :default => instrumentation_value_of(:disable_grpc_server),
+          :documentation_default => 'auto',
+          :public => true,
+          :type => String,
+          :dynamic_name => true,
+          :allowed_from_server => false,
+          :description => 'Controls auto-instrumentation of gRPC servers at start up.  May be one of [auto|prepend|chain|disabled].'
+        },
         :disable_data_mapper => {
           :default => false,
           :public => true,
@@ -2011,11 +2038,12 @@ A map of error classes to a list of messages. When an error of one of the classe
           :description => 'If `true`, the agent decorates logs with metadata to link to entities, hosts, traces, and spans.'
         },
         :'code_level_metrics.enabled' => {
-          :default => false,
+          :default => true,
           :public => true,
           :type => Boolean,
           :allowed_from_server => true,
-          :description => 'If `true`, the agent will report source code level metrics for traced methods.'
+          :description => "If `true`, the agent will report source code level metrics for traced methods.\nsee: " \
+                          'https://docs.newrelic.com/docs/apm/agents/ruby-agent/features/ruby-codestream-integration/'
         },
         :'instrumentation.active_support_logger' => {
           :default => instrumentation_value_from_boolean(:'application_logging.enabled'),

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

@@ -1,6 +1,7 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
+# frozen_string_literal: true
 
 module NewRelic
   module Agent

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

@@ -1,6 +1,7 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
+# frozen_string_literal: true
 
 module NewRelic
   module Agent
@@ -42,7 +43,7 @@ module NewRelic
         def set_dotted_alias(original_config_setting)
           config_setting = original_config_setting.to_s
 
-          if config_setting.include? '.'
+          if config_setting.include?('.')
             config_alias = config_setting.gsub(/\./, '_').to_sym
             self.alias_map[config_alias] = original_config_setting
           end

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

@@ -1,6 +1,7 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
+# frozen_string_literal: true
 
 module NewRelic
   module Agent