contrast-agent 6.0.0 → 6.1.2

data/lib/contrast/config/logger_configuration.rb

@@ -3,9 +3,10 @@
 
 module Contrast
   module Config
-    # Common Configuration settings. Those in this section pertain to the
-    # logging in the Agent.
-    class LoggerConfiguration < BaseConfiguration
+    # Common Configuration settings. Those in this section pertain to the logging in the Agent.
+    class LoggerConfiguration
+      include Contrast::Config::BaseConfiguration
+
       # @return [String, nil]
       attr_accessor :path
       # @return [String, nil]
@@ -14,9 +15,11 @@ module Contrast
       attr_accessor :progname
 
       def initialize hsh = {}
-        @path = traverse_config(hsh, :path)
-        @level = traverse_config(hsh, :level)
-        @progname = traverse_config(hsh, :progname)
+        return unless hsh
+
+        @path = hsh[:path]
+        @level = hsh[:level]
+        @progname = hsh[:progname]
       end
     end
   end

data/lib/contrast/config/protect_configuration.rb

@@ -3,17 +3,20 @@
 
 module Contrast
   module Config
-    # Common Configuration settings. Those in this section pertain to the
-    # protect functionality of the Agent.
-    class ProtectConfiguration < BaseConfiguration
+    # Common Configuration settings. Those in this section pertain to the protect functionality of the Agent.
+    class ProtectConfiguration
+      include Contrast::Config::BaseConfiguration
+
       # @return [Boolean, nil]
       attr_accessor :enable
       attr_writer :exceptions, :rules
 
       def initialize hsh = {}
-        @exceptions = Contrast::Config::ExceptionConfiguration.new(traverse_config(hsh, :exceptions))
-        @rules = Contrast::Config::ProtectRulesConfiguration.new(traverse_config(hsh, :rules))
-        @enable = traverse_config(hsh, :enable)
+        return unless hsh
+
+        @exceptions = Contrast::Config::ExceptionConfiguration.new(hsh[:exceptions])
+        @rules = Contrast::Config::ProtectRulesConfiguration.new(hsh[:rules])
+        @enable = hsh[:enable]
       end
 
       # @return [Contrast::Config::ExceptionConfiguration]

data/lib/contrast/config/protect_rule_configuration.rb

@@ -5,22 +5,26 @@ require 'set'
 
 module Contrast
   module Config
-    # Common Configuration settings. Those in this section pertain to the
-    # rule mode of a single protect rule in the Agent.
-    class ProtectRuleConfiguration < BaseConfiguration
+    # Common Configuration settings. Those in this section pertain to the rule mode of a single protect rule in the
+    # Agent.
+    class ProtectRuleConfiguration
+      include Contrast::Config::BaseConfiguration
+
       # @return [Boolean, nil]
       attr_accessor :enable
       # @return [String, nil]
       attr_accessor :mode
-      # @retrun [Boolean, nil]
+      # @return [Boolean, nil]
       attr_accessor :disable_system_commands
       attr_writer :detect_custom_code_accessing_system_files
 
       def initialize hsh = {}
-        @enable = traverse_config(hsh, :enable)
-        @mode = traverse_config(hsh, :mode)
-        @disable_system_commands = traverse_config(hsh, :disable_system_commands)
-        @detect_custom_code_accessing_system_files = traverse_config(hsh, :detect_custom_code_accessing_system_files)
+        return unless hsh
+
+        @enable = hsh[:enable]
+        @mode = hsh[:mode]
+        @disable_system_commands = hsh[:disable_system_commands]
+        @detect_custom_code_accessing_system_files = hsh[:detect_custom_code_accessing_system_files]
       end
 
       # @return [Boolean, true]

data/lib/contrast/config/protect_rules_configuration.rb

@@ -5,30 +5,31 @@ require 'contrast/config/protect_rule_configuration'
 
 module Contrast
   module Config
-    # Common Configuration settings. Those in this section pertain to the
-    # protect rule modes of the Agent.
-    class ProtectRulesConfiguration < BaseConfiguration
+    # Common Configuration settings. Those in this section pertain to the protect rule modes of the Agent.
+    class ProtectRulesConfiguration
+      include Contrast::Config::BaseConfiguration
+
       attr_accessor :disabled_rules
       attr_writer :bot_blocker, :cmd_injection, :sql_injection, :nosql_injection, :untrusted_deserialization,
-                  :method_tampering, :xxe, :path_traversal, :reflected_xss, :unsafe_file_upload, :rule_base
+                  :xxe, :path_traversal, :reflected_xss, :unsafe_file_upload, :rule_base
 
       BASE_RULE = 'Contrast::Agent::Protect::Rule::Base'.cs__freeze
 
       def initialize hsh = {}
-        @disabled_rules = traverse_config(hsh, :disabled_rules)
-        @bot_blocker = Contrast::Config::ProtectRuleConfiguration.new(traverse_config(hsh, 'bot-blocker'))
-        @cmd_injection = Contrast::Config::ProtectRuleConfiguration.new(traverse_config(hsh, 'cmd-injection'))
-        @sql_injection = Contrast::Config::ProtectRuleConfiguration.new(traverse_config(hsh, 'sql-injection'))
-        @nosql_injection = Contrast::Config::ProtectRuleConfiguration.new(traverse_config(hsh, 'nosql-injection'))
-        @untrusted_deserialization = Contrast::Config::ProtectRuleConfiguration.new(traverse_config(
-                                                                                        hsh,
-                                                                                        'untrusted-deserialization'))
-        @method_tampering = Contrast::Config::ProtectRuleConfiguration.new(traverse_config(hsh, 'method-tampering'))
-        @xxe = Contrast::Config::ProtectRuleConfiguration.new(traverse_config(hsh, :xxe))
-        @path_traversal = Contrast::Config::ProtectRuleConfiguration.new(traverse_config(hsh, 'path-traversal'))
-        @reflected_xss = Contrast::Config::ProtectRuleConfiguration.new(traverse_config(hsh, 'reflected-xss'))
-        @unsafe_file_upload = Contrast::Config::ProtectRuleConfiguration.new(traverse_config(hsh, 'unsafe-file-upload'))
-        @rule_base = Contrast::Config::ProtectRuleConfiguration.new(traverse_config(hsh, BASE_RULE))
+        return unless hsh
+
+        @disabled_rules = hsh[:disabled_rules]
+        @rule_base = Contrast::Config::ProtectRuleConfiguration.new(hsh[BASE_RULE.to_sym])
+        @bot_blocker = Contrast::Config::ProtectRuleConfiguration.new(hsh[:'bot-blocker'])
+        @cmd_injection = Contrast::Config::ProtectRuleConfiguration.new(hsh[:'cmd-injection'])
+        @method_tampering = Contrast::Config::ProtectRuleConfiguration.new(hsh[:'method-tampering'])
+        @nosql_injection = Contrast::Config::ProtectRuleConfiguration.new(hsh[:'nosql-injection'])
+        @path_traversal = Contrast::Config::ProtectRuleConfiguration.new(hsh[:'path-traversal'])
+        @reflected_xss = Contrast::Config::ProtectRuleConfiguration.new(hsh[:'reflected-xss'])
+        @sql_injection = Contrast::Config::ProtectRuleConfiguration.new(hsh[:'sql-injection'])
+        @unsafe_file_upload = Contrast::Config::ProtectRuleConfiguration.new(hsh[:'unsafe-file-upload'])
+        @untrusted_deserialization = Contrast::Config::ProtectRuleConfiguration.new(hsh[:'untrusted-deserialization'])
+        @xxe = Contrast::Config::ProtectRuleConfiguration.new(hsh[:xxe])
       end
 
       def bot_blocker

data/lib/contrast/config/request_audit_configuration.rb

@@ -3,18 +3,21 @@
 
 module Contrast
   module Config
-    # This class holds the Common Settings for the
-    # hidden functionality of the TS
-    class RequestAuditConfiguration < BaseConfiguration
+    # This class holds the Common Settings for the hidden functionality of the TS
+    class RequestAuditConfiguration
+      include Contrast::Config::BaseConfiguration
+
       DEFAULT_PATH = './messages'
 
       attr_writer :enable, :requests, :responses, :path
 
       def initialize hsh = {}
-        @enable = traverse_config(hsh, :enable)
-        @requests = traverse_config(hsh, :requests)
-        @responses = traverse_config(hsh, :responses)
-        @path = traverse_config(hsh, :path)
+        return unless hsh
+
+        @enable = hsh[:enable]
+        @requests = hsh[:requests]
+        @responses = hsh[:responses]
+        @path = hsh[:path]
       end
 
       # @return [Boolean, false]

data/lib/contrast/config/root_configuration.rb

@@ -4,23 +4,40 @@
 module Contrast
   module Config
     # The base of the Common Configuration settings.
-    class RootConfiguration < BaseConfiguration
-      attr_writer :api, :agent, :application, :server, :assess, :inventory, :protect, :service
+    class RootConfiguration
+      include Contrast::Config::BaseConfiguration
+
+      # @return [Contrast::Config::ApiConfiguration]
+      attr_writer :api
+      # @return [Contrast::Config::AgentConfiguration]
+      attr_writer :agent
+      # @return [Contrast::Config::ApplicationConfiguration]
+      attr_writer :application
+      # @return [Contrast::Config::ServerConfiguration]
+      attr_writer :server
+      # @return [Contrast::Config::AssessConfiguration]
+      attr_writer :assess
+      # @return [Contrast::Config::InventoryConfiguration]
+      attr_writer :inventory
+      # @return [Contrast::Config::ProtectConfiguration]
+      attr_writer :protect
+      # @return [Contrast::Config::ServiceConfiguration]
+      attr_writer :service
       # @return [Boolean, nil]
       attr_accessor :enable
 
       def initialize hsh = {}
-        raise ArgumentError, 'Expected a hash' unless hsh.is_a?(Hash)
+        raise(ArgumentError, 'Expected a hash') unless hsh.is_a?(Hash)
 
-        @api = Contrast::Config::ApiConfiguration.new(traverse_config(hsh, :api))
-        @enable = traverse_config(hsh, :enable)
-        @agent = Contrast::Config::AgentConfiguration.new(traverse_config(hsh, :agent))
-        @application = Contrast::Config::ApplicationConfiguration.new(traverse_config(hsh, :application))
-        @server = Contrast::Config::ServerConfiguration.new(traverse_config(hsh, :server))
-        @assess = Contrast::Config::AssessConfiguration.new(traverse_config(hsh, :assess))
-        @inventory = Contrast::Config::InventoryConfiguration.new(traverse_config(hsh, :inventory))
-        @protect = Contrast::Config::ProtectConfiguration.new(traverse_config(hsh, :protect))
-        @service = Contrast::Config::ServiceConfiguration.new(traverse_config(hsh, :service))
+        @api = Contrast::Config::ApiConfiguration.new(hsh[:api])
+        @enable = hsh[:enable]
+        @agent = Contrast::Config::AgentConfiguration.new(hsh[:agent])
+        @application = Contrast::Config::ApplicationConfiguration.new(hsh[:application])
+        @server = Contrast::Config::ServerConfiguration.new(hsh[:server])
+        @assess = Contrast::Config::AssessConfiguration.new(hsh[:assess])
+        @inventory = Contrast::Config::InventoryConfiguration.new(hsh[:inventory])
+        @protect = Contrast::Config::ProtectConfiguration.new(hsh[:protect])
+        @service = Contrast::Config::ServiceConfiguration.new(hsh[:service])
       end
 
       # @return [Contrast::Config::ApiConfiguration]

data/lib/contrast/config/ruby_configuration.rb

@@ -3,9 +3,10 @@
 
 module Contrast
   module Config
-    # Common Configuration settings. Those in this section pertain to the
-    # specific settings that apply to Ruby
-    class RubyConfiguration < BaseConfiguration
+    # Common Configuration settings. Those in this section pertain to the specific settings that apply to Ruby
+    class RubyConfiguration
+      include Contrast::Config::BaseConfiguration
+
       DISABLED_RAKE_TASK_LIST = %w[
         about assets:clean assets:clobber assets:environment
         assets:precompile assets:precompile:all db:create db:drop db:fixtures:load db:migrate
@@ -23,14 +24,16 @@ module Contrast
                   :track_frozen_sources, :non_request_tracking, :uninstrument_namespace
 
       def initialize hsh = {}
-        @disabled_agent_rake_tasks = traverse_config(hsh, :disabled_agent_rake_tasks)
-        @exceptions = Contrast::Config::ExceptionConfiguration.new(traverse_config(hsh, :exceptions))
-        @interpolate = traverse_config(hsh, :interpolate)
-        @propagate_yield = traverse_config(hsh, :propagate_yield)
-        @require_scan = traverse_config(hsh, :require_scan)
-        @track_frozen_sources = traverse_config(hsh, :track_frozen_sources)
-        @non_request_tracking = traverse_config(hsh, :non_request_tracking)
-        @uninstrument_namespace = traverse_config(hsh, :uninstrument_namespace)
+        return unless hsh
+
+        @disabled_agent_rake_tasks = hsh[:disabled_agent_rake_tasks]
+        @exceptions = Contrast::Config::ExceptionConfiguration.new(hsh[:exceptions])
+        @interpolate = hsh[:interpolate]
+        @propagate_yield = hsh[:propagate_yield]
+        @require_scan = hsh[:require_scan]
+        @track_frozen_sources = hsh[:track_frozen_sources]
+        @non_request_tracking = hsh[:non_request_tracking]
+        @uninstrument_namespace = hsh[:uninstrument_namespace]
       end
 
       # These commands being detected will result the agent disabling instrumentation, generally any command

data/lib/contrast/config/sampling_configuration.rb

@@ -3,9 +3,10 @@
 
 module Contrast
   module Config
-    # Common Configuration settings. Those in this section pertain to the
-    # sampling functionality of the Agent.
-    class SamplingConfiguration < BaseConfiguration
+    # Common Configuration settings. Those in this section pertain to the sampling functionality of the Agent.
+    class SamplingConfiguration
+      include Contrast::Config::BaseConfiguration
+
       # @return [Integer, nil]
       attr_reader :baseline
       # @return [Integer, nil]
@@ -16,11 +17,13 @@ module Contrast
       attr_reader :window_ms
 
       def initialize hsh = {}
-        @enable = traverse_config(hsh, :enable)
-        @baseline = traverse_config(hsh, :baseline)
-        @request_frequency = traverse_config(hsh, :request_frequency)
-        @response_frequency = traverse_config(hsh, :response_frequency)
-        @window_ms = traverse_config(hsh, :window_ms)
+        return unless hsh
+
+        @enable = hsh[:enable]
+        @baseline = hsh[:baseline]
+        @request_frequency = hsh[:request_frequency]
+        @response_frequency = hsh[:response_frequency]
+        @window_ms = hsh[:window_ms]
       end
 
       # @return [Boolean, false]

data/lib/contrast/config/server_configuration.rb

@@ -3,9 +3,11 @@
 
 module Contrast
   module Config
-    # Common Configuration settings. Those in this section pertain to the
-    # server identification functionality of the Agent.
-    class ServerConfiguration < BaseConfiguration
+    # Common Configuration settings. Those in this section pertain to the server identification functionality of the
+    # Agent.
+    class ServerConfiguration
+      include Contrast::Config::BaseConfiguration
+
       # @return [String, nil]
       attr_accessor :name
       # @return [String, nil]
@@ -20,12 +22,14 @@ module Contrast
       attr_accessor :version
 
       def initialize hsh = {}
-        @path = traverse_config(hsh, :path)
-        @name = traverse_config(hsh, :name)
-        @type = traverse_config(hsh, :type)
-        @tags = traverse_config(hsh, :tags)
-        @environment = traverse_config(hsh, :environment)
-        @version = traverse_config(hsh, :version)
+        return unless hsh
+
+        @path = hsh[:path]
+        @name = hsh[:name]
+        @type = hsh[:type]
+        @tags = hsh[:tags]
+        @environment = hsh[:environment]
+        @version = hsh[:version]
       end
     end
   end

data/lib/contrast/config/service_configuration.rb

@@ -5,11 +5,12 @@ require 'contrast/config/logger_configuration'
 
 module Contrast
   module Config
-    # Common Configuration settings. Those in this section pertain to the
-    # communication between the Agent & the Service.
-    class ServiceConfiguration < BaseConfiguration
-      # We don't set these b/c we've been asked to handle the default values of
-      # these settings differently, logging when we have to use them.
+    # Common Configuration settings. Those in this section pertain to the communication between the Agent & the Service
+    class ServiceConfiguration
+      include Contrast::Config::BaseConfiguration
+
+      # We don't set these b/c we've been asked to handle the default values of these settings differently, logging
+      # when we have to use them.
       DEFAULT_HOST       = '127.0.0.1' # rubocop:disable Style/IpAddresses
       DEFAULT_PORT       = '30555'
 
@@ -24,12 +25,14 @@ module Contrast
       attr_accessor :enable
 
       def initialize hsh = {}
-        @enable = traverse_config(hsh, :enable)
-        @host = traverse_config(hsh, :host)
-        @port = traverse_config(hsh, :port)
-        @socket = traverse_config(hsh, :socket)
-        @logger = Contrast::Config::LoggerConfiguration.new(traverse_config(hsh, :logger))
-        @bypass = traverse_config(hsh, :bypass)
+        return unless hsh
+
+        @enable = hsh[:enable]
+        @host = hsh[:host]
+        @port = hsh[:port]
+        @socket = hsh[:socket]
+        @logger = Contrast::Config::LoggerConfiguration.new(hsh[:logger])
+        @bypass = hsh[:bypass]
       end
 
       # @return [Contrast::Config::LoggerConfiguration]

data/lib/contrast/configuration.rb

@@ -7,7 +7,6 @@ require 'fileutils'
 require 'contrast/config'
 require 'contrast/utils/object_share'
 require 'contrast/components/scope'
-require 'contrast/utils/exclude_key'
 
 module Contrast
   # This is how we read in the local settings for the Agent, both ENV/ CMD line
@@ -27,15 +26,17 @@ module Contrast
     MILLISECOND_MARKER = '_ms'
     CONVERSION = { 'agent.service.enable' => 'agent.start_bundled_service' }.cs__freeze
     CONFIG_BASE_PATHS = ['', 'config/', '/etc/contrast/ruby/', '/etc/contrast/', '/etc/'].cs__freeze
+    KEYS_TO_REDACT = %i[api_key url service_key user_name].cs__freeze
+    REDACTED = '**REDACTED**'
 
     def initialize cli_options = nil, default_name = DEFAULT_YAML_PATH
       @default_name = default_name
 
       # Load config_kv from file
-      config_kv = deep_stringify_all_keys(load_config)
+      config_kv = deep_symbolize_all_keys(load_config)
 
       # Overlay CLI options - they take precedence over config file
-      cli_options = deep_stringify_all_keys(cli_options)
+      cli_options = deep_symbolize_all_keys(cli_options)
       config_kv = deep_merge(cli_options, config_kv) if cli_options
 
       # Some in-flight rewrites to maintain backwards compatibility
@@ -93,7 +94,7 @@ module Contrast
         rescue Psych::Exception => e
           log_yaml_parse_error(path, e)
         rescue RuntimeError => e
-          puts "WARN: Unable to load configuration. #{ e }; path: #{ path }, pwd: #{ Dir.pwd }"
+          puts("WARN: Unable to load configuration. #{ e }; path: #{ path }, pwd: #{ Dir.pwd }")
         end
       end
 
@@ -105,7 +106,7 @@ module Contrast
     def update_prop_keys config
       CONVERSION.each_pair do |old_method, new_method|
         # See if the old value was set and needs to be translated
-        deprecated_keys = old_method.split('.')
+        deprecated_keys = old_method.split('.').map(&:to_sym)
         old_value = config
         deprecated_keys.each do |key|
           old_value = old_value[key]
@@ -114,7 +115,7 @@ module Contrast
         next if old_value.nil? # have to account for literal false
 
         log_deprecated_property(old_method, new_method)
-        new_keys = new_method.split('.')
+        new_keys = new_method.split('.').map(&:to_sym)
         # We changed the seconds values into ms values. Multiply them accordingly
         old_value = old_value.to_i * 1000 if new_method.end_with?(MILLISECOND_MARKER)
         new_value = config
@@ -147,12 +148,12 @@ module Contrast
       end
     end
 
-    def deep_stringify_all_keys hash
+    def deep_symbolize_all_keys hash
       return if hash.nil?
 
       new_hash = {}
       hash.each do |key, value|
-        new_hash[key.to_s] = value.is_a?(Hash) ? deep_stringify_all_keys(value) : value
+        new_hash[key.to_sym] = value.is_a?(Hash) ? deep_symbolize_all_keys(value) : value
       end
       new_hash
     end
@@ -181,7 +182,7 @@ module Contrast
       if logger
         logger.warn('YAML validator found an error', hash)
       else
-        puts "CONTRAST - WARN: YAML validator found an error. #{ hash.inspect }"
+        puts("CONTRAST - WARN: YAML validator found an error. #{ hash.inspect }")
       end
     end
 
@@ -189,7 +190,7 @@ module Contrast
       if logger
         logger.warn('Configuration file is not readable by current user', path: path)
       else
-        puts "CONTRAST - WARN: Configuration file is not readable by current user; path: #{ path }"
+        puts("CONTRAST - WARN: Configuration file is not readable by current user; path: #{ path }")
       end
     end
 
@@ -197,7 +198,7 @@ module Contrast
       if logger
         logger.warn('Deprecated property in use', old_method: old_method, new_method: new_method)
       else
-        puts "CONTRAST - WARN: Deprecated property in use; old_method: #{ old_method }, new_method: #{ new_method }"
+        puts("CONTRAST - WARN: Deprecated property in use; old_method: #{ old_method }, new_method: #{ new_method }")
       end
     end
 
@@ -219,10 +220,9 @@ module Contrast
       when Contrast::Config::BaseConfiguration
         # to_hash returns @configuration_map
         convert.to_hash.each_key do |key|
-          next if Contrast::Utils::ExcludeKey.excludable?(key.to_s)
-
           # change '-' to '_' for ProtectRulesConfiguration
           hash[key] = convert_to_hash(convert.send(key.tr('-', '_').to_sym), {})
+          hash[key] = REDACTED if redactable?(key)
         end
         hash
       else
@@ -234,7 +234,7 @@ module Contrast
       idx = 0
       end_idx = new_keys.length - 1
       while idx < new_keys.length
-        new_key = new_keys[idx]
+        new_key = new_keys[idx].to_sym
         if idx == end_idx
           new_value[new_key] = old_value if new_value[new_key].nil?
         else
@@ -245,5 +245,14 @@ module Contrast
         idx += 1
       end
     end
+
+    # Check if keys with sensitive data needs to be
+    # redacted.
+    #
+    # @param key [Symbol] key to check
+    # @return[Boolean] true | false
+    def redactable? key
+      KEYS_TO_REDACT.include?(key.to_sym)
+    end
   end
 end

data/lib/contrast/extension/assess/array.rb

@@ -53,7 +53,7 @@ module Contrast
               return ret unless Contrast::Agent::Assess::Tracker.tracked?(ret)
 
               properties.cleanup_tags
-              event_data = Contrast::Agent::Assess::Events::EventData.new ARRAY_JOIN_NODE, ret, ary, ret, [separator]
+              event_data = Contrast::Agent::Assess::Events::EventData.new(ARRAY_JOIN_NODE, ret, ary, ret, [separator])
               properties.build_event(event_data)
               properties.event.instance_variable_set(:@_parent_events, parent_events)
               ret

data/lib/contrast/extension/assess/erb.rb

@@ -20,7 +20,7 @@ module ERBPropagator
 
       erb_pre_result = preshift.object.src
       parent_events = []
-      binding_variable_set binding_variable_set, used_binding, erb_pre_result, properties, parent_events, ret
+      binding_variable_set(binding_variable_set, used_binding, erb_pre_result, properties, parent_events, ret)
       properties.build_event(Contrast::Agent::Assess::Events::EventData.new(patcher,
                                                                             ret,
                                                                             preshift.object,

data/lib/contrast/extension/assess/marshal.rb

@@ -43,7 +43,7 @@ module Contrast
               properties.copy_from(source, ret)
 
               node = Contrast::Agent::Assess::Policy::Policy.instance.find_propagator_node('Marshal', :load, false)
-              event_data = Contrast::Agent::Assess::Events::EventData.new node, ret, self, ret, args
+              event_data = Contrast::Agent::Assess::Events::EventData.new(node, ret, self, ret, args)
               properties.build_event(event_data)
             rescue StandardError => e
               logger.error('Unable to run Assess for Marshal.load', e)

data/lib/contrast/extension/assess/string.rb

@@ -43,7 +43,7 @@ module Contrast
               offset = 0
               inputs.each do |input|
                 properties.copy_from(input, result, offset)
-                add_dynamic_sources_info input, result
+                add_dynamic_sources_info(input, result)
                 offset += input.length
                 parent_event = Contrast::Agent::Assess::Tracker.properties(input)&.event
                 parent_events << parent_event if parent_event

data/lib/contrast/extension/extension.rb

@@ -37,9 +37,9 @@ module Contrast
           def assign_value path
             case path
             when /fiber/, /interpolation26/
-              require path if Funchook.available?
+              require(path) if Funchook.available?
             else
-              require path
+              require(path)
             end
             true
           end

data/lib/contrast/framework/base_support.rb

@@ -7,19 +7,19 @@ module Contrast
     module BaseSupport
       # The top level module name used by the framework
       def detection_class
-        raise NoMethodError('Subclasses of BaseSupport should implement this method')
+        raise(NoMethodError('Subclasses of BaseSupport should implement this method'))
       end
 
       def version
-        raise NoMethodError('Subclasses of BaseSupport should implement this method')
+        raise(NoMethodError('Subclasses of BaseSupport should implement this method'))
       end
 
       def application_name
-        raise NoMethodError, 'Subclasses of BaseSupport should implement this method'
+        raise(NoMethodError, 'Subclasses of BaseSupport should implement this method')
       end
 
       def server_type
-        raise NoMethodError, 'Subclasses of BaseSupport should implement this method'
+        raise(NoMethodError, 'Subclasses of BaseSupport should implement this method')
       end
 
       # Find all the predefined routes for this application and append them to the
@@ -27,19 +27,19 @@ module Contrast
       # msg should be a Contrast::Api::Dtm::ApplicationUpdate or some other msg
       # that has a routes array consisting of Contrast::Api::Dtm::RouteCoverage
       def collect_routes
-        raise NoMethodError, 'Subclasses of BaseSupport should implement this method'
+        raise(NoMethodError, 'Subclasses of BaseSupport should implement this method')
       end
 
       def current_route_coverage
-        raise NoMethodError, 'Subclasses of BaseSupport should implement this method'
+        raise(NoMethodError, 'Subclasses of BaseSupport should implement this method')
       end
 
       def current_route
-        raise NoMethodError, 'Subclasses of BaseSupport should implement this method'
+        raise(NoMethodError, 'Subclasses of BaseSupport should implement this method')
       end
 
       def retrieve_request _env
-        raise NoMethodError, 'Subclasses of BaseSupport should implement this method'
+        raise(NoMethodError, 'Subclasses of BaseSupport should implement this method')
       end
 
       # Some Frameworks require specific patching for their classes to handle

data/lib/contrast/framework/grape/support.rb

@@ -112,7 +112,7 @@ module Contrast
             full_route ||= request.env[::Rack::PATH_INFO]
 
             new_route_coverage = Contrast::Agent::Reporting::RouteCoverage.new
-            new_route_coverage.attach_rack_based_data final_controller, method, route_pattern, full_route
+            new_route_coverage.attach_rack_based_data(final_controller, method, route_pattern, full_route)
           end
 
           # Search object space for grape controllers--any class that subclasses ::Grape::API.
@@ -151,7 +151,7 @@ module Contrast
             # Grape controller actually has endpoints and each endpoint
             # has routes and that's why we need to do it that way
             controller = controllers.pop
-            return _route_recurse method, route, controllers unless controller
+            return _route_recurse(method, route, controllers) unless controller
 
             contr_routes = controller.endpoints&.map(&:routes)&.flatten || []
             route_pattern = contr_routes&.find do |r|
@@ -159,7 +159,7 @@ module Contrast
             end
             return controller, route_pattern unless route_pattern.nil?
 
-            _route_recurse method, route, controllers
+            _route_recurse(method, route, controllers)
           end
 
           # Get route and do some cleaning