newrelic_rpm 8.2.0 → 8.3.0

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

@@ -6,7 +6,7 @@ module NewRelic
   module Agent
     module Configuration
       class DottedHash < ::Hash
-        def initialize(hash, keep_nesting=false)
+        def initialize(hash, keep_nesting = false)
           # Add the hash keys to our collection explicitly so they survive the
           # dot flattening.  This is typical for full config source instances,
           # but not for uses of DottedHash serializing for transmission.
@@ -31,8 +31,9 @@ module NewRelic
         end
 
         protected
+
         # turns {'a' => {'b' => 'c'}} into {'a.b' => 'c'}
-        def dot_flattened(nested_hash, names=[], result={})
+        def dot_flattened(nested_hash, names = [], result = {})
           nested_hash.each do |key, val|
             next if val == nil
             if val.respond_to?(:has_key?)
@@ -44,7 +45,6 @@ module NewRelic
           result
         end
       end
-
     end
   end
 end

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

@@ -7,9 +7,9 @@ module NewRelic
     module Configuration
       class EnvironmentSource < DottedHash
         SUPPORTED_PREFIXES = /^new_relic_|^newrelic_/i
-        SPECIAL_CASE_KEYS  = [
+        SPECIAL_CASE_KEYS = [
           'NEW_RELIC_ENV', # read by NewRelic::Control::Frameworks::Ruby
-          'NEW_RELIC_LOG',  # read by set_log_file
+          'NEW_RELIC_LOG', # read by set_log_file
           /^NEW_RELIC_METADATA_/ # read by NewRelic::Agent::Connect::RequestBuilder
         ]
 
@@ -43,7 +43,7 @@ module NewRelic
           config_setting = original_config_setting.to_s
 
           if config_setting.include? '.'
-            config_alias = config_setting.gsub(/\./,'_').to_sym
+            config_alias = config_setting.gsub(/\./, '_').to_sym
             self.alias_map[config_alias] = original_config_setting
           end
         end
@@ -111,7 +111,6 @@ module NewRelic
         def collect_new_relic_environment_variable_keys
           ENV.keys.select { |key| key.match(SUPPORTED_PREFIXES) }
         end
-
       end
     end
   end

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

@@ -6,13 +6,12 @@ module NewRelic
   module Agent
     module Configuration
       module EventHarvestConfig
-
         extend self
 
         EVENT_HARVEST_CONFIG_KEY_MAPPING = {
           :analytic_event_data => :'analytics_events.max_samples_stored',
           :custom_event_data => :'custom_insights_events.max_samples_stored',
-          :error_event_data => :'error_collector.max_event_samples_stored',
+          :error_event_data => :'error_collector.max_event_samples_stored'
         }
 
         def from_config(config)
@@ -22,8 +21,7 @@ module NewRelic
             ).inject({}) do |connect_payload, (connect_payload_key, config_key)|
               connect_payload[connect_payload_key] = config[config_key]
               connect_payload
-            end
-          }
+            end}
         end
 
         def to_config_hash(connect_reply)

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

@@ -10,17 +10,17 @@ module NewRelic
       class HighSecuritySource < DottedHash
         def initialize(local_settings)
           super({
-            :capture_params           => false,
-            :'resque.capture_params'  => false,
+            :capture_params => false,
+            :'resque.capture_params' => false,
             :'sidekiq.capture_params' => false,
-            :'attributes.include'     => [],
+            :'attributes.include' => [],
 
             :'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,
+            :'slow_sql.record_sql' => record_sql_setting(local_settings, :'slow_sql.record_sql'),
+            :'mongo.obfuscate_queries' => true,
             :'transaction_tracer.record_redis_arguments' => false,
 
-            :'custom_insights_events.enabled'   => false,
+            :'custom_insights_events.enabled' => false,
             :'strip_exception_messages.enabled' => true
           })
         end
@@ -32,7 +32,7 @@ module NewRelic
         SET_TO_OBFUSCATED = [RAW, OBFUSCATED]
 
         def record_sql_setting(local_settings, key)
-          original_value  = local_settings[key]
+          original_value = local_settings[key]
           result = if SET_TO_OBFUSCATED.include?(original_value)
             OBFUSCATED
           else

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

@@ -31,10 +31,10 @@ module NewRelic
 
         def initialize
           reset_to_defaults
-          @callbacks = Hash.new {|hash,key| hash[key] = [] }
+          @callbacks = Hash.new { |hash, key| hash[key] = [] }
         end
 
-        def add_config_for_testing(source, level=0)
+        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]
@@ -45,12 +45,12 @@ module NewRelic
         def remove_config_type(sym)
           source = case sym
           when :security_policy then @security_policy_source
-          when :high_security   then @high_security_source
-          when :environment     then @environment_source
-          when :server          then @server_source
-          when :manual          then @manual_source
-          when :yaml            then @yaml_source
-          when :default         then @default_source
+          when :high_security then @high_security_source
+          when :environment then @environment_source
+          when :server then @server_source
+          when :manual then @manual_source
+          when :yaml then @yaml_source
+          when :default then @default_source
           end
 
           remove_config(source)
@@ -59,14 +59,14 @@ module NewRelic
         def remove_config(source)
           case source
           when SecurityPolicySource then @security_policy_source = nil
-          when HighSecuritySource   then @high_security_source   = nil
-          when EnvironmentSource    then @environment_source     = nil
-          when ServerSource         then @server_source          = nil
-          when ManualSource         then @manual_source          = nil
-          when YamlSource           then @yaml_source            = nil
-          when DefaultSource        then @default_source         = nil
+          when HighSecuritySource then @high_security_source = nil
+          when EnvironmentSource then @environment_source = nil
+          when ServerSource then @server_source = nil
+          when ManualSource then @manual_source = nil
+          when YamlSource then @yaml_source = nil
+          when DefaultSource then @default_source = nil
           else
-            @configs_for_testing.delete_if {|src,lvl| src == source}
+            @configs_for_testing.delete_if { |src, lvl| src == source }
           end
 
           reset_cache
@@ -82,12 +82,12 @@ module NewRelic
 
           case source
           when SecurityPolicySource then @security_policy_source = source
-          when HighSecuritySource   then @high_security_source   = source
-          when EnvironmentSource    then @environment_source     = source
-          when ServerSource         then @server_source          = source
-          when ManualSource         then @manual_source          = source
-          when YamlSource           then @yaml_source            = source
-          when DefaultSource        then @default_source         = source
+          when HighSecuritySource then @high_security_source = source
+          when EnvironmentSource then @environment_source = source
+          when ServerSource then @server_source = source
+          when ManualSource then @manual_source = source
+          when YamlSource then @yaml_source = source
+          when DefaultSource then @default_source = source
           else
             NewRelic::Agent.logger.warn("Invalid config format; config will be ignored: #{source}")
           end
@@ -191,9 +191,9 @@ module NewRelic
         end
 
         def flattened
-          config_stack.reverse.inject({}) do |flat,layer|
+          config_stack.reverse.inject({}) do |flat, layer|
             thawed_layer = layer.to_hash.dup
-            thawed_layer.each do |k,v|
+            thawed_layer.each do |k, v|
               begin
                 thawed_layer[k] = instance_eval(&v) if v.respond_to?(:call)
               rescue => e
@@ -207,9 +207,9 @@ module NewRelic
         end
 
         def apply_mask(hash)
-          MASK_DEFAULTS. \
-            select {|_, proc| proc.call}. \
-            each {|key, _| hash.delete(key) }
+          MASK_DEFAULTS \
+            .select { |_, proc| proc.call } \
+            .each { |key, _| hash.delete(key) }
           hash
         end
 
@@ -228,9 +228,9 @@ module NewRelic
         end
 
         MALFORMED_LABELS_WARNING = "Skipping malformed labels configuration"
-        PARSING_LABELS_FAILURE   = "Failure during parsing labels. Ignoring and carrying on with connect."
+        PARSING_LABELS_FAILURE = "Failure during parsing labels. Ignoring and carrying on with connect."
 
-        MAX_LABEL_COUNT  = 64
+        MAX_LABEL_COUNT = 64
         MAX_LABEL_LENGTH = 255
 
         def parsed_labels
@@ -252,7 +252,7 @@ module NewRelic
         end
 
         def break_label_string_into_pairs(labels)
-          stripped_labels = labels.strip.sub(/^;*/,'').sub(/;*$/,'')
+          stripped_labels = labels.strip.sub(/^;*/, '').sub(/;*$/, '')
           stripped_labels.split(';').map do |pair|
             pair.split(':').map(&:strip)
           end
@@ -268,10 +268,10 @@ module NewRelic
 
         def valid_label_item?(item)
           case item
-          when String  then !item.empty?
+          when String then !item.empty?
           when Numeric then true
-          when true    then true
-          when false   then true
+          when true then true
+          when false then true
           else false
           end
         end
@@ -281,7 +281,7 @@ module NewRelic
           pairs = Array(pairs)
 
           unless valid_label_pairs?(pairs)
-            NewRelic::Agent.logger.warn("#{MALFORMED_LABELS_WARNING}: #{labels||pairs}")
+            NewRelic::Agent.logger.warn("#{MALFORMED_LABELS_WARNING}: #{labels || pairs}")
             return []
           end
 
@@ -289,13 +289,13 @@ module NewRelic
           pairs = remove_duplicates(pairs)
           pairs.map do |key, value|
             {
-              'label_type'  => truncate(key),
+              'label_type' => truncate(key),
               'label_value' => truncate(value.to_s, key)
             }
           end
         end
 
-        def truncate(text, key=nil)
+        def truncate(text, key = nil)
           if text.length > MAX_LABEL_LENGTH
             if key
               msg = "The value for the label '#{key}' is longer than the allowed #{MAX_LABEL_LENGTH} and will be truncated. Value = '#{text}'"
@@ -303,7 +303,7 @@ module NewRelic
               msg = "Label name longer than the allowed #{MAX_LABEL_LENGTH} will be truncated. Name = '#{text}'"
             end
             NewRelic::Agent.logger.warn(msg)
-            text[0..MAX_LABEL_LENGTH-1]
+            text[0..MAX_LABEL_LENGTH - 1]
           else
             text
           end
@@ -331,20 +331,20 @@ module NewRelic
         # Generally only useful during initial construction and tests
         def reset_to_defaults
           @security_policy_source = nil
-          @high_security_source   = nil
-          @environment_source     = EnvironmentSource.new
-          @server_source          = nil
-          @manual_source          = nil
-          @yaml_source            = nil
-          @default_source         = DefaultSource.new
+          @high_security_source = nil
+          @environment_source = EnvironmentSource.new
+          @server_source = nil
+          @manual_source = nil
+          @yaml_source = nil
+          @default_source = DefaultSource.new
 
-          @configs_for_testing    = []
+          @configs_for_testing = []
 
           reset_cache
         end
 
         def reset_cache
-          @cache = Hash.new { |hash,key| hash[key] = self.fetch(key) }
+          @cache = Hash.new { |hash, key| hash[key] = self.fetch(key) }
         end
 
         def log_config(direction, source)
@@ -359,13 +359,13 @@ module NewRelic
 
         def delete_all_configs_for_testing
           @security_policy_source = nil
-          @high_security_source   = nil
-          @environment_source     = nil
-          @server_source          = nil
-          @manual_source          = nil
-          @yaml_source            = nil
-          @default_source         = nil
-          @configs_for_testing    = []
+          @high_security_source = nil
+          @environment_source = nil
+          @server_source = nil
+          @manual_source = nil
+          @yaml_source = nil
+          @default_source = nil
+          @configs_for_testing = []
         end
 
         def num_configs_for_testing
@@ -380,12 +380,12 @@ module NewRelic
 
         def config_stack
           stack = [@security_policy_source,
-                   @high_security_source,
-                   @environment_source,
-                   @server_source,
-                   @manual_source,
-                   @yaml_source,
-                   @default_source]
+            @high_security_source,
+            @environment_source,
+            @server_source,
+            @manual_source,
+            @yaml_source,
+            @default_source]
 
           stack.compact!
 

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

@@ -6,7 +6,7 @@ module NewRelic
   module Agent
     module Configuration
       MASK_DEFAULTS = {
-        :'thread_profiler' =>         Proc.new { !NewRelic::Agent::Threading::BacktraceService.is_supported? },
+        :'thread_profiler' => Proc.new { !NewRelic::Agent::Threading::BacktraceService.is_supported? },
         :'thread_profiler.enabled' => Proc.new { !NewRelic::Agent::Threading::BacktraceService.is_supported? }
       }
     end

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

@@ -52,150 +52,150 @@ module NewRelic
         SECURITY_SETTINGS_MAP = {
           "record_sql" => [
             {
-              option:         :'transaction_tracer.record_sql',
-              supported:      true,
-              enabled_fn:     method(:record_sql_enabled?),
+              option: :'transaction_tracer.record_sql',
+              supported: true,
+              enabled_fn: method(:record_sql_enabled?),
               disabled_value: 'off',
-              permitted_fn:   proc { |policies|
+              permitted_fn: proc { |policies|
                 change_setting(policies, :'transaction_tracer.record_sql', 'obfuscated')
               }
             },
             {
-              option:         :'slow_sql.record_sql',
-              supported:      true,
-              enabled_fn:     method(:record_sql_enabled?),
+              option: :'slow_sql.record_sql',
+              supported: true,
+              enabled_fn: method(:record_sql_enabled?),
               disabled_value: 'off',
-              permitted_fn:   proc { |policies|
+              permitted_fn: proc { |policies|
                 change_setting(policies, :'slow_sql.record_sql', 'obfuscated')
               }
             },
             {
-              option:         :'mongo.capture_queries',
-              supported:      true,
-              enabled_fn:     method(:enabled?),
+              option: :'mongo.capture_queries',
+              supported: true,
+              enabled_fn: method(:enabled?),
               disabled_value: false,
-              permitted_fn:   proc{ |policies|
+              permitted_fn: proc { |policies|
                 change_setting(policies, :'mongo.obfuscate_queries', true)
               }
             },
             {
-              option:         :'transaction_tracer.record_redis_arguments',
-              supported:      true,
-              enabled_fn:     method(:enabled?),
+              option: :'transaction_tracer.record_redis_arguments',
+              supported: true,
+              enabled_fn: method(:enabled?),
               disabled_value: false,
-              permitted_fn:   nil
+              permitted_fn: nil
             }
           ],
           "attributes_include" => [
             {
-              option:         :'attributes.include',
-              supported:      true,
-              enabled_fn:     method(:not_empty?),
+              option: :'attributes.include',
+              supported: true,
+              enabled_fn: method(:not_empty?),
               disabled_value: [],
-              permitted_fn:   nil
+              permitted_fn: nil
             },
             {
-              option:         :'transaction_tracer.attributes.include',
-              supported:      true,
-              enabled_fn:     method(:not_empty?),
+              option: :'transaction_tracer.attributes.include',
+              supported: true,
+              enabled_fn: method(:not_empty?),
               disabled_value: [],
-              permitted_fn:   nil
+              permitted_fn: nil
             },
             {
-              option:         :'transaction_events.attributes.include',
-              supported:      true,
-              enabled_fn:     method(:not_empty?),
+              option: :'transaction_events.attributes.include',
+              supported: true,
+              enabled_fn: method(:not_empty?),
               disabled_value: [],
-              permitted_fn:   nil
+              permitted_fn: nil
             },
             {
-              option:         :'error_collector.attributes.include',
-              supported:      true,
-              enabled_fn:     method(:not_empty?),
+              option: :'error_collector.attributes.include',
+              supported: true,
+              enabled_fn: method(:not_empty?),
               disabled_value: [],
-              permitted_fn:   nil
+              permitted_fn: nil
             },
             {
-              option:         :'browser_monitoring.attributes.include',
-              supported:      true,
-              enabled_fn:     method(:not_empty?),
+              option: :'browser_monitoring.attributes.include',
+              supported: true,
+              enabled_fn: method(:not_empty?),
               disabled_value: [],
-              permitted_fn:   nil
+              permitted_fn: nil
             },
             {
-              option:         :'span_events.attributes.include',
-              supported:      true,
-              enabled_fn:     method(:not_empty?),
+              option: :'span_events.attributes.include',
+              supported: true,
+              enabled_fn: method(:not_empty?),
               disabled_value: [],
-              permitted_fn:   nil
+              permitted_fn: nil
             },
             {
-              option:         :'transaction_segments.attributes.include',
-              supported:      true,
-              enabled_fn:     method(:not_empty?),
+              option: :'transaction_segments.attributes.include',
+              supported: true,
+              enabled_fn: method(:not_empty?),
               disabled_value: [],
-              permitted_fn:   nil
+              permitted_fn: nil
             }
           ],
           "allow_raw_exception_messages" => [
             {
-              option:         :'strip_exception_messages.enabled',
-              supported:      true,
-              enabled_fn:     method(:enabled?),
+              option: :'strip_exception_messages.enabled',
+              supported: true,
+              enabled_fn: method(:enabled?),
               disabled_value: false,
-              permitted_fn:   nil
+              permitted_fn: nil
             }
           ],
           "custom_events" => [
             {
-              option:         :'custom_insights_events.enabled',
-              supported:      true,
-              enabled_fn:     method(:enabled?),
+              option: :'custom_insights_events.enabled',
+              supported: true,
+              enabled_fn: method(:enabled?),
               disabled_value: false,
-              permitted_fn:   nil
+              permitted_fn: nil
             }
           ],
           "custom_parameters" => [
             {
-              option:         :'custom_attributes.enabled',
-              supported:      true,
-              enabled_fn:     method(:enabled?),
+              option: :'custom_attributes.enabled',
+              supported: true,
+              enabled_fn: method(:enabled?),
               disabled_value: false,
-              permitted_fn:   nil
+              permitted_fn: nil
             }
           ],
           "custom_instrumentation_editor" => [
             {
-              option:         nil,
-              supported:      false,
-              enabled_fn:     nil,
+              option: nil,
+              supported: false,
+              enabled_fn: nil,
               disabled_value: nil,
-              permitted_fn:   nil
+              permitted_fn: nil
             }
           ],
           "message_parameters" => [
             {
-              option:         :'message_tracer.segment_parameters.enabled',
-              supported:      true,
-              enabled_fn:     method(:enabled?),
+              option: :'message_tracer.segment_parameters.enabled',
+              supported: true,
+              enabled_fn: method(:enabled?),
               disabled_value: false,
-              permitted_fn:   nil
+              permitted_fn: nil
             }
           ],
           "job_arguments" => [
             {
-              option:         :'resque.capture_params',
-              supported:      true,
-              enabled_fn:     method(:enabled?),
+              option: :'resque.capture_params',
+              supported: true,
+              enabled_fn: method(:enabled?),
               disabled_value: false,
-              permitted_fn:   nil
+              permitted_fn: nil
             },
             {
-              option:         :'sidekiq.capture_params',
-              supported:      true,
-              enabled_fn:     method(:enabled?),
+              option: :'sidekiq.capture_params',
+              supported: true,
+              enabled_fn: method(:enabled?),
               disabled_value: false,
-              permitted_fn:   nil
+              permitted_fn: nil
             }
           ]
         }
@@ -223,7 +223,7 @@ module NewRelic
                     "Source: #{config_source}"
                 end
               else
-                settings[policy[:option]] =  policy[:disabled_value]
+                settings[policy[:option]] = policy[:disabled_value]
                 NewRelic::Agent.logger.info \
                   "Setting applied: {#{policy[:option]}: #{policy[:disabled_value]}}. " \
                   "Source: SecurityPolicySource"

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

@@ -33,7 +33,7 @@ module NewRelic
           "trusted_account_key"
         ]
 
-        def initialize(connect_reply, existing_config={})
+        def initialize(connect_reply, existing_config = {})
           merged_settings = {}
 
           merge_top_level_keys(merged_settings, connect_reply)
@@ -78,10 +78,10 @@ module NewRelic
         EVENT_HARVEST_CONFIG_SUPPORTABILITY_METRIC_NAMES = {
           :'analytics_events.max_samples_stored' => 'Supportability/EventHarvest/AnalyticEventData/HarvestLimit',
           :'custom_insights_events.max_samples_stored' => 'Supportability/EventHarvest/CustomEventData/HarvestLimit',
-          :'error_collector.max_event_samples_stored'=> 'Supportability/EventHarvest/ErrorEventData/HarvestLimit',
+          :'error_collector.max_event_samples_stored' => 'Supportability/EventHarvest/ErrorEventData/HarvestLimit',
           :'span_events.max_samples_stored' => 'Supportability/SpanEvent/Limit',
           :event_report_period => 'Supportability/EventHarvest/ReportPeriod',
-          :'event_report_period.span_event_data' => 'Supportability/SpanEvent/ReportPeriod',
+          :'event_report_period.span_event_data' => 'Supportability/SpanEvent/ReportPeriod'
         }
 
         def add_event_harvest_config(merged_settings, connect_reply)
@@ -133,19 +133,19 @@ module NewRelic
         # do the real enforcement there.
         def apply_feature_gates(merged_settings, connect_reply, existing_config)
           gated_features = {
-            'transaction_tracer.enabled'     => 'collect_traces',
-            'slow_sql.enabled'               => 'collect_traces',
-            'error_collector.enabled'        => 'collect_errors',
-            'analytics_events.enabled'       => 'collect_analytics_events',
+            'transaction_tracer.enabled' => 'collect_traces',
+            'slow_sql.enabled' => 'collect_traces',
+            'error_collector.enabled' => 'collect_errors',
+            'analytics_events.enabled' => 'collect_analytics_events',
             'custom_insights_events.enabled' => 'collect_custom_events',
             'error_collector.capture_events' => 'collect_error_events',
-            'span_events.enabled'            => 'collect_span_events'
+            'span_events.enabled' => 'collect_span_events'
           }
           gated_features.each do |config_key, gate_key|
             if connect_reply.has_key?(gate_key)
               allowed_by_server = connect_reply[gate_key]
-              requested_value   = ungated_value(config_key, merged_settings, existing_config)
-              effective_value   = (allowed_by_server && requested_value)
+              requested_value = ungated_value(config_key, merged_settings, existing_config)
+              effective_value = (allowed_by_server && requested_value)
               merged_settings[config_key] = effective_value
             end
           end