newrelic_rpm 8.10.1 → 8.12.0

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

@@ -1,4 +1,3 @@
-# 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
@@ -10,7 +9,7 @@ module NewRelic
     module Configuration
       # Helper since default Procs are evaluated in the context of this module
       def self.value_of(key)
-        Proc.new do
+        proc do
           NewRelic::Agent.config[key]
         end
       end
@@ -28,7 +27,7 @@ module NewRelic
       #     - auto, when returned means, try to use prepend unless conflicting gems discovered
       #
       def self.instrumentation_value_of(disable_key, prepend_key = nil)
-        Proc.new do
+        proc do
           if NewRelic::Agent.config[disable_key]
             "disabled"
           elsif prepend_key && !NewRelic::Agent.config[prepend_key]
@@ -40,7 +39,7 @@ module NewRelic
       end
 
       def self.instrumentation_value_from_boolean(key)
-        Proc.new do
+        proc do
           NewRelic::Agent.config[key] ? 'auto' : 'disabled'
         end
       end
@@ -48,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)
-        link_ref = new_setting.to_s.gsub(".", "-")
+        link_ref = new_setting.to_s.tr(".", "-")
         %{Please see: [#{new_setting}](docs/agents/ruby-agent/configuration/ruby-agent-configuration##{link_ref}). \n\n#{description}}
       end
 
@@ -82,7 +81,7 @@ module NewRelic
         end
 
         def self.config_search_paths
-          Proc.new {
+          proc {
             paths = [
               File.join("config", "newrelic.yml"),
               File.join("newrelic.yml"),
@@ -116,7 +115,7 @@ module NewRelic
         end
 
         def self.config_path
-          Proc.new {
+          proc {
             found_path = NewRelic::Agent.config[:config_search_paths].detect do |file|
               File.expand_path(file) if File.exist?(file)
             end
@@ -125,7 +124,7 @@ module NewRelic
         end
 
         def self.framework
-          Proc.new {
+          proc {
             case
             when defined?(::NewRelic::TEST) then :test
             when defined?(::Rails::VERSION)
@@ -146,7 +145,7 @@ module NewRelic
         end
 
         def self.agent_enabled
-          Proc.new {
+          proc {
             NewRelic::Agent.config[:enabled] &&
               (NewRelic::Agent.config[:test_mode] || NewRelic::Agent.config[:monitor_mode]) &&
               NewRelic::Agent::Autostart.agent_should_start?
@@ -156,9 +155,9 @@ module NewRelic
         DEFAULT_LOG_DIR = 'log/'.freeze
 
         def self.audit_log_path
-          Proc.new {
+          proc {
             log_file_path = NewRelic::Agent.config[:log_file_path]
-            wants_stdout = (log_file_path.upcase == 'STDOUT')
+            wants_stdout = (log_file_path.casecmp('STDOUT').zero?)
             audit_log_dir = wants_stdout ? DEFAULT_LOG_DIR : log_file_path
 
             File.join(audit_log_dir, 'newrelic_audit.log')
@@ -166,30 +165,30 @@ module NewRelic
         end
 
         def self.app_name
-          Proc.new { NewRelic::Control.instance.env }
+          proc { NewRelic::Control.instance.env }
         end
 
         def self.dispatcher
-          Proc.new { NewRelic::Control.instance.local_env.discovered_dispatcher }
+          proc { NewRelic::Control.instance.local_env.discovered_dispatcher }
         end
 
         def self.thread_profiler_enabled
-          Proc.new { NewRelic::Agent::Threading::BacktraceService.is_supported? }
+          proc { NewRelic::Agent::Threading::BacktraceService.is_supported? }
         end
 
         # This check supports the js_errors_beta key we've asked clients to
         # set. Once JS errors are GA, browser_monitoring.loader can stop
         # being dynamic.
         def self.browser_monitoring_loader
-          Proc.new { NewRelic::Agent.config[:js_errors_beta] ? "full" : "rum" }
+          proc { NewRelic::Agent.config[:js_errors_beta] ? "full" : "rum" }
         end
 
         def self.transaction_tracer_transaction_threshold
-          Proc.new { NewRelic::Agent.config[:apdex_t] * 4 }
+          proc { NewRelic::Agent.config[:apdex_t] * 4 }
         end
 
         def self.profiling_available
-          Proc.new {
+          proc {
             begin
               require 'ruby-prof'
               true
@@ -200,7 +199,7 @@ module NewRelic
         end
 
         def self.host
-          Proc.new do
+          proc do
             regex = /\A(?<identifier>.+?)x/
             if matches = regex.match(String(NewRelic::Agent.config[:license_key]))
               "collector.#{matches['identifier']}.nr-data.net"
@@ -211,12 +210,16 @@ module NewRelic
         end
 
         def self.api_host
-          Proc.new do
-            if String(NewRelic::Agent.config[:license_key]).start_with?('eu')
-              'rpm.eu.newrelic.com'
+          # only used for deployment task
+          proc do
+            api_version = if NewRelic::Agent.config[:api_key].nil? || NewRelic::Agent.config[:api_key].empty?
+              "rpm"
             else
-              'rpm.newrelic.com'
+              "api"
             end
+            api_region = "eu." if String(NewRelic::Agent.config[:license_key]).start_with?('eu')
+
+            "#{api_version}.#{api_region}newrelic.com"
           end
         end
 
@@ -260,7 +263,7 @@ module NewRelic
         end
 
         def self.enforce_fallback(allowed_values: nil, fallback: nil)
-          Proc.new do |configured_value|
+          proc do |configured_value|
             if allowed_values.any? { |v| v =~ /#{configured_value}/i }
               configured_value
             else
@@ -330,6 +333,13 @@ module NewRelic
           :allowed_from_server => false,
           :description => 'Your New Relic [license key](/docs/apis/intro-apis/new-relic-api-keys/#ingest-license-key).'
         },
+        :api_key => {
+          :default => '',
+          :public => true,
+          :type => String,
+          :allowed_from_server => false,
+          :description => 'Your New Relic API key. Required when using the New Relic REST API v2 to record deployments using the `newrelic deployments` command.'
+        },
         :agent_enabled => {
           :default => DefaultSource.agent_enabled,
           :documentation_default => true,
@@ -457,7 +467,7 @@ When `true`, the agent captures HTTP request parameters and attaches them to tra
           :public => false,
           :type => Array,
           :allowed_from_server => false,
-          :description => "An array of candidate locations for the agent\'s configuration file."
+          :description => "An array of candidate locations for the agent's configuration file."
         },
         :dispatcher => {
           :default => DefaultSource.dispatcher,
@@ -906,6 +916,14 @@ If `true`, disables agent middleware for Sinatra. This middleware is responsible
           :allowed_from_server => false,
           :description => 'Controls auto-instrumentation of bunny at start up.  May be one of [auto|prepend|chain|disabled].'
         },
+        :'instrumentation.elasticsearch' => {
+          :default => 'auto',
+          :public => true,
+          :type => String,
+          :dynamic_name => true,
+          :allowed_from_server => false,
+          :description => 'Controls auto-instrumentation of the elasticsearch library at start up. May be one of [auto|prepend|chain|disabled].'
+        },
         :'instrumentation.httprb' => {
           :default => instrumentation_value_of(:disable_httprb),
           :documentation_default => 'auto',
@@ -930,7 +948,7 @@ If `true`, disables agent middleware for Sinatra. This middleware is responsible
           :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description => "Controls auto-instrumentation of the Thread class at start up to allow the agent to correctly nest spans inside of an asyncronous transaction. This does not enable the agent to automatically trace all threads created (see `instrumentation.thread.tracing`). May be one of [auto|prepend|chain|disabled]."
+          :description => "Controls auto-instrumentation of the Thread class at start up to allow the agent to correctly nest spans inside of an asynchronous transaction. This does not enable the agent to automatically trace all threads created (see `instrumentation.thread.tracing`). May be one of [auto|prepend|chain|disabled]."
         },
         :'instrumentation.thread.tracing' => {
           :default => false,
@@ -1177,7 +1195,7 @@ If `true`, disables agent middleware for Sinatra. This middleware is responsible
           :type => Boolean,
           :deprecated => true,
           :allowed_from_server => false,
-          :description => deprecated_description(:'instrumentation.memcache', "If `true`, disables instrumentation for the dalli gem\'s additional CAS client support.")
+          :description => deprecated_description(:'instrumentation.memcache', "If `true`, disables instrumentation for the dalli gem's additional CAS client support.")
         },
         :disable_memcache_instrumentation => {
           :default => false,
@@ -1397,6 +1415,20 @@ If `true`, disables agent middleware for Sinatra. This middleware is responsible
           :allowed_from_server => true,
           :description => 'If `true`, the agent obfuscates Mongo queries in transaction traces.'
         },
+        :'elasticsearch.capture_queries' => {
+          :default => true,
+          :public => true,
+          :type => Boolean,
+          :allowed_from_server => true,
+          :description => 'If `true`, the agent captures Elasticsearch queries in transaction traces.'
+        },
+        :'elasticsearch.obfuscate_queries' => {
+          :default => true,
+          :public => true,
+          :type => Boolean,
+          :allowed_from_server => true,
+          :description => 'If `true`, the agent obfuscates Elasticsearch queries in transaction traces.'
+        },
         :'error_collector.enabled' => {
           :default => true,
           :public => true,
@@ -1562,7 +1594,7 @@ A map of error classes to a list of messages. When an error of one of the classe
           :public => false,
           :type => String,
           :allowed_from_server => true,
-          :description => 'Javascript agent file for real user monitoring.'
+          :description => 'JavaScript agent file for real user monitoring.'
         },
         :'browser_monitoring.auto_instrument' => {
           :default => value_of(:'rum.enabled'),
@@ -1921,7 +1953,7 @@ A map of error classes to a list of messages. When an error of one of the classe
           :description => 'If `true`, the agent uses Heroku dyno names as the hostname.'
         },
         :'heroku.dyno_name_prefixes_to_shorten' => {
-          :default => ['scheduler', 'run'],
+          :default => %w[scheduler run],
           :public => true,
           :type => Array,
           :allowed_from_server => false,
@@ -1929,7 +1961,7 @@ A map of error classes to a list of messages. When an error of one of the classe
           :description => 'Ordinarily the agent reports dyno names with a trailing dot and process ID (for example, <b>worker.3</b>). You can remove this trailing data by specifying the prefixes you want to report without trailing data (for example, <b>worker</b>).'
         },
         :'process_host.display_name' => {
-          :default => Proc.new { NewRelic::Agent::Hostname.get },
+          :default => proc { NewRelic::Agent::Hostname.get },
           :public => true,
           :type => String,
           :allowed_from_server => false,
@@ -1962,7 +1994,7 @@ A map of error classes to a list of messages. When an error of one of the classe
           :public => true,
           :type => String,
           :allowed_from_server => false,
-          :description => "Manual override for the path to your local CA bundle. This CA bundle will be used to validate the SSL certificate presented by New Relic\'s data collection service."
+          :description => "Manual override for the path to your local CA bundle. This CA bundle will be used to validate the SSL certificate presented by New Relic's data collection service."
         },
         :'rules.ignore_url_regexes' => {
           :default => [],
@@ -1994,7 +2026,7 @@ A map of error classes to a list of messages. When an error of one of the classe
           :description => 'If `true`, the agent captures [custom events](/docs/insights/new-relic-insights/adding-querying-data/inserting-custom-events-new-relic-apm-agents).'
         },
         :'custom_insights_events.max_samples_stored' => {
-          :default => 1000,
+          :default => 3000,
           :public => true,
           :type => Integer,
           :allowed_from_server => true,
@@ -2436,6 +2468,25 @@ A map of error classes to a list of messages. When an error of one of the classe
           :allowed_from_server => false,
           :external => :infinite_tracing,
           :description => "Configures the TCP/IP port for the Trace Observer Host"
+        },
+        :'infinite_tracing.compression_level' => {
+          :default => :none,
+          :public => false,
+          :type => Symbol,
+          :allowed_from_server => false,
+          :external => :infinite_tracing,
+          :description => "Configure the compression level for data sent to the Trace Observer\nMay be one of " \
+                          "[none|low|medium|high]\nBy default, compression is not used (level = none)"
+        },
+        :'infinite_tracing.batching' => {
+          :default => false,
+          :public => false,
+          :type => Boolean,
+          :allowed_from_server => false,
+          :external => :infinite_tracing,
+          :description => "If true, data sent to the Trace Observer will be batched instead of the default of each " \
+                          "span being sent individually"
+
         }
       }.freeze
     end

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

@@ -1,4 +1,3 @@
-# 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
@@ -36,7 +35,8 @@ module NewRelic
         # turns {'a' => {'b' => 'c'}} into {'a.b' => 'c'}
         def dot_flattened(nested_hash, names = [], result = {})
           nested_hash.each do |key, val|
-            next if val == nil
+            next if val.nil?
+
             if val.respond_to?(:has_key?)
               dot_flattened(val, names + [key], result)
             else

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

@@ -1,4 +1,3 @@
-# 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
@@ -35,6 +34,7 @@ module NewRelic
           set_dotted_alias(config_setting)
 
           return unless value[:aliases]
+
           value[:aliases].each do |config_alias|
             self.alias_map[config_alias] = config_setting
           end
@@ -44,14 +44,14 @@ module NewRelic
           config_setting = original_config_setting.to_s
 
           if config_setting.include?('.')
-            config_alias = config_setting.gsub(/\./, '_').to_sym
+            config_alias = config_setting.tr('.', '_').to_sym
             self.alias_map[config_alias] = original_config_setting
           end
         end
 
         def set_log_file
           if ENV['NEW_RELIC_LOG']
-            if ENV['NEW_RELIC_LOG'].upcase == 'STDOUT'
+            if ENV['NEW_RELIC_LOG'].casecmp('STDOUT').zero?
               self[:log_file_path] = self[:log_file_name] = 'STDOUT'
             else
               self[:log_file_path] = File.dirname(ENV['NEW_RELIC_LOG'])
@@ -96,7 +96,7 @@ module NewRelic
           elsif type == NewRelic::Agent::Configuration::Boolean
             if value =~ /false|off|no/i
               self[config_key] = false
-            elsif value != nil
+            elsif !value.nil?
               self[config_key] = true
             end
           else

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

@@ -1,4 +1,3 @@
-# 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

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

@@ -1,4 +1,3 @@
-# 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
@@ -19,6 +18,7 @@ module NewRelic
             :'transaction_tracer.record_sql' => record_sql_setting(local_settings, :'transaction_tracer.record_sql'),
             :'slow_sql.record_sql' => record_sql_setting(local_settings, :'slow_sql.record_sql'),
             :'mongo.obfuscate_queries' => true,
+            :'elasticsearch.obfuscate_queries' => true,
             :'transaction_tracer.record_redis_arguments' => false,
 
             :'custom_insights_events.enabled' => false,

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

@@ -1,4 +1,3 @@
-# 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
@@ -37,6 +36,7 @@ module NewRelic
 
         def add_config_for_testing(source, level = 0)
           raise 'Invalid config type for testing' unless [Hash, DottedHash].include?(source.class)
+
           invoke_callbacks(:add, source)
           @configs_for_testing << [source.freeze, level]
           reset_cache
@@ -111,6 +111,7 @@ module NewRelic
         def fetch(key)
           config_stack.each do |config|
             next unless config
+
             accessor = key.to_sym
 
             if config.has_key?(accessor)
@@ -156,11 +157,12 @@ module NewRelic
 
         def register_callback(key, &proc)
           @callbacks[key] << proc
-          proc.call(@cache[key])
+          yield(@cache[key])
         end
 
         def invoke_callbacks(direction, source)
           return unless source
+
           source.keys.each do |key|
             begin
               # we need to evaluate and apply transformations for the value to deal with procs as values

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

@@ -1,4 +1,3 @@
-# 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

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

@@ -1,4 +1,3 @@
-# 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
@@ -7,8 +6,8 @@ module NewRelic
   module Agent
     module Configuration
       MASK_DEFAULTS = {
-        :'thread_profiler' => Proc.new { !NewRelic::Agent::Threading::BacktraceService.is_supported? },
-        :'thread_profiler.enabled' => Proc.new { !NewRelic::Agent::Threading::BacktraceService.is_supported? }
+        :'thread_profiler' => proc { !NewRelic::Agent::Threading::BacktraceService.is_supported? },
+        :'thread_profiler.enabled' => proc { !NewRelic::Agent::Threading::BacktraceService.is_supported? }
       }
     end
   end

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

@@ -1,4 +1,3 @@
-# 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
@@ -80,6 +79,15 @@ module NewRelic
                 change_setting(policies, :'mongo.obfuscate_queries', true)
               }
             },
+            {
+              option: :'elasticsearch.capture_queries',
+              supported: true,
+              enabled_fn: method(:enabled?),
+              disabled_value: false,
+              permitted_fn: proc { |policies|
+                change_setting(policies, :'elasticsearch.obfuscate_queries', true)
+              }
+            },
             {
               option: :'transaction_tracer.record_redis_arguments',
               supported: true,
@@ -213,6 +221,7 @@ module NewRelic
           security_policies.inject({}) do |settings, (policy_name, policy_settings)|
             SECURITY_SETTINGS_MAP[policy_name].each do |policy|
               next unless policy[:supported]
+
               if policy_settings[ENABLED]
                 if policy[:enabled_fn].call(policy[:option])
                   if permitted_fn = policy[:permitted_fn]

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

@@ -1,4 +1,3 @@
-# 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

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

@@ -1,4 +1,3 @@
-# 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
@@ -14,7 +13,7 @@ module NewRelic
 
         # These are configuration options that have a value of a Hash
         # This is used in YamlSource#dot_flattened prevent flattening these values
-        CONFIG_WITH_HASH_VALUE = ['expected_messages', 'ignore_messages']
+        CONFIG_WITH_HASH_VALUE = %w[expected_messages ignore_messages]
 
         def initialize(path, env)
           @path = path
@@ -156,7 +155,8 @@ module NewRelic
 
         def dot_flattened(nested_hash, names = [], result = {})
           nested_hash.each do |key, val|
-            next if val == nil
+            next if val.nil?
+
             if val.respond_to?(:has_key?) && !CONFIG_WITH_HASH_VALUE.include?(key)
               dot_flattened(val, names + [key], result)
             else

data/lib/new_relic/agent/configuration.rb

@@ -1,4 +1,3 @@
-# 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

data/lib/new_relic/agent/connect/request_builder.rb

@@ -1,4 +1,3 @@
-# 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
@@ -39,10 +38,11 @@ module NewRelic
         end
 
         # We've seen objects in the environment report (Rails.env in
-        # particular) that can't seralize to JSON. Cope with that here and
+        # particular) that can't serialize to JSON. Cope with that here and
         # clear out so downstream code doesn't have to check again.
         def sanitize_environment_report(environment_report)
           return NewRelic::EMPTY_ARRAY unless @service.valid_to_marshal?(environment_report)
+
           environment_report
         end
 

data/lib/new_relic/agent/connect/response_handler.rb

@@ -1,4 +1,3 @@
-# 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
@@ -20,7 +19,7 @@ module NewRelic
         # Can accommodate most arbitrary data - anything extra is
         # ignored unless we say to do something with it here.
         def configure_agent(config_data)
-          return if config_data == nil
+          return if config_data.nil?
 
           @agent.agent_id = config_data['agent_run_id']
 

data/lib/new_relic/agent/custom_event_aggregator.rb

@@ -1,4 +1,3 @@
-# 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

data/lib/new_relic/agent/database/explain_plan_helpers.rb

@@ -1,4 +1,3 @@
-# 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

data/lib/new_relic/agent/database/obfuscation_helpers.rb

@@ -1,4 +1,3 @@
-# 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
@@ -54,6 +53,7 @@ module NewRelic
 
         def obfuscate_single_quote_literals(sql)
           return sql unless sql =~ COMPONENTS_REGEX_MAP[:single_quotes]
+
           sql.gsub(COMPONENTS_REGEX_MAP[:single_quotes], PLACEHOLDER)
         end
 

data/lib/new_relic/agent/database/obfuscator.rb

@@ -1,4 +1,3 @@
-# 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

data/lib/new_relic/agent/database/postgres_explain_obfuscator.rb

@@ -1,4 +1,3 @@
-# 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

data/lib/new_relic/agent/database.rb

@@ -1,4 +1,3 @@
-# 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
@@ -33,6 +32,8 @@ module NewRelic
       # Take care not to the dup the query more than once as
       # correctly encoded may also dup the query.
       def capture_query(query)
+        return unless query
+
         id = query.object_id
         query = Helper.correctly_encoded(truncate_query(query))
         if query.object_id == id
@@ -43,6 +44,8 @@ module NewRelic
       end
 
       def truncate_query(query)
+        return unless query
+
         if query.length > (MAX_QUERY_LENGTH - 4)
           query[0..MAX_QUERY_LENGTH - 4] << ELLIPSIS
         else
@@ -115,22 +118,23 @@ module NewRelic
       # in a report period, selected for shipment to New Relic
       def explain_sql(statement)
         return nil unless statement.sql && statement.explainer && statement.config
+
         statement.sql = statement.sql.split(";\n")[0] # only explain the first
         return statement.explain || []
       end
 
-      KNOWN_OPERATIONS = [
-        'alter',
-        'select',
-        'update',
-        'delete',
-        'insert',
-        'create',
-        'show',
-        'set',
-        'exec',
-        'execute',
-        'call'
+      KNOWN_OPERATIONS = %w[
+        alter
+        select
+        update
+        delete
+        insert
+        create
+        show
+        set
+        exec
+        execute
+        call
       ]
       OTHER_OPERATION = 'other'.freeze
       SQL_COMMENT_REGEX = Regexp.new('/\*.*?\*/', Regexp::MULTILINE).freeze
@@ -158,7 +162,7 @@ module NewRelic
           return connection if connection
 
           begin
-            @connections[config] = connector.call(config)
+            @connections[config] = yield(config)
           rescue => e
             ::NewRelic::Agent.logger.error("Caught exception trying to get connection to DB for explain.", e)
             nil
@@ -224,6 +228,7 @@ module NewRelic
 
         def explain
           return unless explainable?
+
           handle_exception_in_explain do
             start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
             plan = @explainer.call(self)
@@ -239,6 +244,7 @@ module NewRelic
 
         def append_sql(new_sql)
           return if new_sql.empty?
+
           @sql = Database.truncate_query(@sql << NEWLINE << new_sql)
         end