newrelic_rpm 3.6.6.147 → 3.6.7.152

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

@@ -6,43 +6,44 @@ module NewRelic
   module Agent
     module Configuration
       class EnvironmentSource < DottedHash
+        SUPPORTED_PREFIXES = /^new_relic_|newrelic_/i
+
+        attr_accessor :alias_map, :type_map
+
         def initialize
-          string_map = {
-            'NRCONFIG'              => :config_path,
-            'NEW_RELIC_LICENSE_KEY' => :license_key,
-            'NEWRELIC_LICENSE_KEY'  => :license_key,
-            'NEW_RELIC_APP_NAME'    => :app_name,
-            'NEWRELIC_APP_NAME'     => :app_name,
-            'NEW_RELIC_HOST'        => :host,
-            'NEW_RELIC_PORT'        => :port
-          }.each do |key, val|
-            self[val] = ENV[key] if ENV[key]
+          set_log_file
+          set_config_file
+
+          @alias_map = {}
+          @type_map = {}
+
+          DEFAULTS.each do |config_setting, value|
+            self.type_map[config_setting] = value[:type]
+            set_aliases(config_setting, value)
           end
 
-          symbol_map = {
-            'NEW_RELIC_DISPATCHER'  => :dispatcher,
-            'NEWRELIC_DISPATCHER'   => :dispatcher,
-            'NEW_RELIC_FRAMEWORK'   => :framework,
-            'NEWRELIC_FRAMEWORK'    => :framework
-          }.each do |key, val|
-            self[val] = ENV[key].intern if ENV[key]
+          set_values_from_new_relic_environment_variables
+        end
+
+        def set_aliases(config_setting, value)
+          set_dotted_alias(config_setting)
+
+          return unless value[:aliases]
+          value[:aliases].each do |config_alias|
+            self.alias_map[config_alias] = config_setting
           end
+        end
 
-          boolean_map = {
-            'NEWRELIC_ENABLE'   => :agent_enabled,
-            'NEWRELIC_ENABLED'  => :agent_enabled,
-            'NEW_RELIC_ENABLE'  => :agent_enabled,
-            'NEW_RELIC_ENABLED' => :agent_enabled,
-            'NEWRELIC_DISABLE_HARVEST_THREAD'  => :disable_harvest_thread,
-            'NEW_RELIC_DISABLE_HARVEST_THREAD' => :disable_harvest_thread
-          }.each do |key, val|
-            if ENV[key].to_s =~ /false|off|no/i
-              self[val] = false
-            elsif ENV[key] != nil
-              self[val] = true
-            end
+        def set_dotted_alias(original_config_setting)
+          config_setting = original_config_setting.to_s
+
+          if config_setting.include? '.'
+            config_alias = config_setting.gsub(/\./,'_').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'
               self[:log_file_path] = self[:log_file_name] = 'STDOUT'
@@ -52,6 +53,58 @@ module NewRelic
             end
           end
         end
+
+        def set_config_file
+          self[:config_path] = ENV['NRCONFIG'] if ENV['NRCONFIG']
+        end
+
+        def set_values_from_new_relic_environment_variables
+          nr_env_var_keys = collect_new_relic_environment_variable_keys
+
+          nr_env_var_keys.each do |key|
+            set_value_from_environment_variable(key)
+          end
+        end
+
+        def set_value_from_environment_variable(key)
+          config_key = convert_environment_key_to_config_key(key)
+          set_key_by_type(config_key, key)
+        end
+
+        def set_key_by_type(config_key, environment_key)
+          value = ENV[environment_key]
+          type = self.type_map[config_key]
+
+          if type == String
+            self[config_key] = value
+          elsif type == Fixnum
+            self[config_key] = value.to_i
+          elsif type == Float
+            self[config_key] = value.to_f
+          elsif type == Symbol
+            self[config_key] = value.to_sym
+          elsif type == NewRelic::Agent::Configuration::Boolean
+            if value =~ /false|off|no/i
+              self[config_key] = false
+            elsif value != nil
+              self[config_key] = true
+            end
+          else
+            ::NewRelic::Agent.logger.info("#{environment_key} does not have a corresponding configuration setting (#{config_key} does not exist).")
+            ::NewRelic::Agent.logger.info("Run `rake newrelic:config:docs` or visit https://newrelic.com/docs/ruby/ruby-agent-configuration to see a list of available configuration settings.")
+            self[config_key] = value
+          end
+        end
+
+        def convert_environment_key_to_config_key(key)
+          stripped_key = key.gsub(SUPPORTED_PREFIXES, '').downcase.to_sym
+          self.alias_map[stripped_key] || stripped_key
+        end
+
+        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/manager.rb

@@ -3,9 +3,9 @@
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
 require 'forwardable'
-require 'new_relic/agent/configuration/defaults'
 require 'new_relic/agent/configuration/mask_defaults'
 require 'new_relic/agent/configuration/yaml_source'
+require 'new_relic/agent/configuration/default_source'
 require 'new_relic/agent/configuration/server_source'
 require 'new_relic/agent/configuration/environment_source'
 
@@ -14,7 +14,7 @@ module NewRelic
     module Configuration
       class Manager
         extend Forwardable
-        def_delegators :@cache, :[], :has_key?
+        def_delegators :@cache, :[], :has_key?, :keys
         attr_reader :config_stack, :stripped_exceptions_whitelist
 
         def initialize
@@ -53,9 +53,9 @@ module NewRelic
         end
 
         def replace_or_add_config(source, level=0)
-          idx = @config_stack.map{|s| s.class}.index(source.class)
-          @config_stack.delete_at(idx) if idx
-          apply_config(source, idx || level)
+          index = @config_stack.map{|s| s.class}.index(source.class)
+          @config_stack.delete_at(index) if index
+          apply_config(source, index || level)
         end
 
         def source(key)
@@ -111,7 +111,7 @@ module NewRelic
 
         def flattened
           @config_stack.reverse.inject({}) do |flat,layer|
-            thawed_layer = layer.dup
+            thawed_layer = layer.to_hash.dup
             thawed_layer.each do |k,v|
               begin
                 thawed_layer[k] = instance_eval(&v) if v.respond_to?(:call)
@@ -121,7 +121,7 @@ module NewRelic
               end
               thawed_layer.delete(:config)
             end
-            flat.merge(thawed_layer)
+            flat.merge(thawed_layer.to_hash)
           end
         end
 
@@ -146,7 +146,7 @@ module NewRelic
 
         # Generally only useful during initial construction and tests
         def reset_to_defaults
-          @config_stack = [ EnvironmentSource.new, DEFAULTS ]
+          @config_stack = [ EnvironmentSource.new, DefaultSource.new ]
           reset_cache
         end
 

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

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

data/lib/new_relic/agent/cross_app_monitor.rb

@@ -3,7 +3,8 @@
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
 require 'new_relic/rack/agent_hooks'
-require 'new_relic/agent/thread'
+require 'new_relic/agent/transaction_state'
+require 'new_relic/agent/threading/agent_thread'
 
 module NewRelic
   module Agent
@@ -21,14 +22,6 @@ module NewRelic
       }
       CONTENT_LENGTH_HEADER_KEYS = %w{Content-Length HTTP_CONTENT_LENGTH CONTENT_LENGTH}
 
-      # Because we aren't in the right spot when our transaction actually
-      # starts, hold client_cross_app_id we get thread local until then.
-      THREAD_ID_KEY = :newrelic_client_cross_app_id
-
-      # Same for the referring transaction guid
-      THREAD_TXN_KEY = :newrelic_cross_app_referring_txn_info
-
-
       # Functions for obfuscating and unobfuscating header values
       module EncodingFunctions
 
@@ -101,15 +94,15 @@ module NewRelic
       end
 
       def save_client_cross_app_id(request_headers)
-        NewRelic::Agent::AgentThread.current[THREAD_ID_KEY] = decoded_id(request_headers)
+        TransactionState.get.client_cross_app_id = decoded_id(request_headers)
       end
 
       def clear_client_cross_app_id
-        NewRelic::Agent::AgentThread.current[THREAD_ID_KEY] = nil
+        TransactionState.get.client_cross_app_id = nil
       end
 
       def client_cross_app_id
-        NewRelic::Agent::AgentThread.current[THREAD_ID_KEY]
+        TransactionState.get.client_cross_app_id
       end
 
       def save_referring_transaction_info(request_headers)
@@ -119,27 +112,23 @@ module NewRelic
         txn_info = NewRelic.json_load( txn_header )
         NewRelic::Agent.logger.debug "Referring txn_info: %p" % [ txn_info ]
 
-        NewRelic::Agent::AgentThread.current[THREAD_TXN_KEY] = txn_info
-      end
-
-      def clear_referring_transaction_info
-        NewRelic::Agent::AgentThread.current[THREAD_TXN_KEY] = nil
+        TransactionState.get.referring_transaction_info = txn_info
       end
 
       def client_referring_transaction_guid
-        info = NewRelic::Agent::AgentThread.current[THREAD_TXN_KEY] or return nil
+        info = TransactionState.get.referring_transaction_info or return nil
         return info[0]
       end
 
       def client_referring_transaction_record_flag
-        info = NewRelic::Agent::AgentThread.current[THREAD_TXN_KEY] or return nil
+        info = TransactionState.get.referring_transaction_info or return nil
         return info[1]
       end
 
       def insert_response_header(request_headers, response_headers)
         unless client_cross_app_id.nil?
           NewRelic::Agent::Transaction.freeze_name
-          timings = NewRelic::Agent::BrowserMonitoring.timings
+          timings = NewRelic::Agent::TransactionState.get.timings
           content_length = content_length_from_request(request_headers)
 
           set_response_headers(response_headers, timings, content_length)
@@ -220,7 +209,7 @@ module NewRelic
       end
 
       def transaction_guid
-        NewRelic::Agent::TransactionInfo.get.guid
+        NewRelic::Agent::TransactionState.get.request_guid
       end
 
       private

data/lib/new_relic/agent/cross_app_tracing.rb

@@ -103,7 +103,7 @@ module NewRelic
 
             # Add TT custom parameters
             segment.name = scoped_metric
-            add_transaction_trace_parameters(request, response) if response
+            add_transaction_trace_parameters(request, response)
           end
         ensure
           # We always need to pop the scope stack to avoid an inconsistent
@@ -138,7 +138,7 @@ module NewRelic
         key = cross_app_encoding_key()
         cross_app_id = NewRelic::Agent.config[:cross_process_id] or
           raise NewRelic::Agent::CrossAppTracing::Error, "no cross app ID configured"
-        txn_guid = NewRelic::Agent::TransactionInfo.get.guid
+        txn_guid = NewRelic::Agent::TransactionState.get.request_guid
         txn_data = NewRelic.json_dump([ txn_guid, false ])
 
         request[ NR_ID_HEADER ]  = obfuscate_with_key( key, cross_app_id )
@@ -151,7 +151,7 @@ module NewRelic
       def add_transaction_trace_parameters(request, response)
         filtered_uri = ::NewRelic::Agent::HTTPClients::URIUtil.filter_uri(request.uri)
         transaction_sampler.add_segment_parameters(:uri => filtered_uri)
-        if response_is_crossapp?( response )
+        if response && response_is_crossapp?( response )
           add_cat_transaction_trace_parameters( response )
         end
       end

data/lib/new_relic/agent/error_collector.rb

@@ -20,10 +20,6 @@ module NewRelic
       # memory and data retention
       MAX_ERROR_QUEUE_LENGTH = 20 unless defined? MAX_ERROR_QUEUE_LENGTH
 
-      # This ivar is used to tag exceptions that we've alreday seen, so that we
-      # don't double-count them.
-      EXCEPTION_TAG_IVAR = :@__new_relic_exception_tag
-
       attr_accessor :errors
 
       # Returns a new error collector
@@ -101,20 +97,21 @@ module NewRelic
         end
 
         def seen?(exception)
-          exception.instance_variable_get(EXCEPTION_TAG_IVAR)
+          error_ids = TransactionState.get.transaction_noticed_error_ids
+          error_ids.include?(exception.object_id)
         end
 
         def tag_as_seen(exception)
-          exception.instance_variable_set(EXCEPTION_TAG_IVAR, true)
+          txn = Transaction.current
+          txn.noticed_error_ids << exception.object_id if txn
         end
 
         def blamed_metric_name(options)
           if options[:metric] && options[:metric] != ::NewRelic::Agent::UNKNOWN_METRIC
             "Errors/#{options[:metric]}"
           else
-            txn_info = TransactionInfo.get
-            if txn_info && txn_info.transaction
-              "Errors/#{txn_info.transaction.name}"
+            if txn = TransactionState.get.transaction
+              "Errors/#{txn.name}"
             end
           end
         end
@@ -264,7 +261,7 @@ module NewRelic
         return if should_exit_notice_error?(exception)
         increment_error_count!(exception, options)
         NewRelic::Agent.instance.events.notify(:notice_error, exception, options)
-        action_path     = fetch_from_options(options, :metric, (NewRelic::Agent.instance.stats_engine.scope_name || ''))
+        action_path     = fetch_from_options(options, :metric, "")
         exception_options = error_params_from_options(options).merge(exception_info(exception))
         add_to_error_queue(NewRelic::NoticedError.new(action_path, exception_options, exception))
         exception

data/lib/new_relic/agent/http_clients/curb_wrappers.rb

@@ -16,7 +16,7 @@ module NewRelic
         end
 
         def host
-          self.uri.host
+          self["host"] || self["Host"] || self.uri.host
         end
 
         def method

data/lib/new_relic/agent/http_clients/excon_wrappers.rb

@@ -36,7 +36,11 @@ module NewRelic
         end
 
         def host
-          @datum[:host]
+          if hostname = (self['host'] || self['Host'])
+            hostname.split(':').first
+          else
+            @datum[:host]
+          end
         end
 
         def method

data/lib/new_relic/agent/http_clients/httpclient_wrappers.rb

@@ -43,7 +43,11 @@ module NewRelic
         end
 
         def host
-          uri.host.to_s
+          if hostname = (self['host'] || self['Host'])
+            hostname.split(':').first
+          else
+            uri.host.to_s
+          end
         end
 
         def [](key)

data/lib/new_relic/agent/http_clients/net_http_wrappers.rb

@@ -16,7 +16,11 @@ module NewRelic
         end
 
         def host
-          @connection.address
+          if hostname = self['host']
+            hostname.split(':').first
+          else
+            @connection.address
+          end
         end
 
         def method

data/lib/new_relic/agent/http_clients/typhoeus_wrappers.rb

@@ -46,7 +46,7 @@ module NewRelic
         end
 
         def host
-          @uri.host
+          self['host'] || self['Host'] || @uri.host
         end
 
         def method

data/lib/new_relic/agent/instrumentation/action_controller_subscriber.rb

@@ -18,12 +18,12 @@ module NewRelic
                         Agent.logger.debug("Error creating Rack::Request object: #{e}")
                         nil
                       end
-            TransactionInfo.reset(request)
+            TransactionState.reset(request)
           end
         end
 
         def start(name, id, payload)
-          payload[:request] = TransactionInfo.get.request
+          payload[:request] = TransactionState.get.request
           event = ControllerEvent.new(name, Time.now, nil, id, payload)
           push_event(event)
 
@@ -35,7 +35,7 @@ module NewRelic
             NewRelic::Agent.instance.push_trace_execution_flag(false)
           end
         rescue => e
-          handle_tracing_error('ActionControllerSubscriber#start', e)
+          log_notification_error(e, name, 'start')
         end
 
         def finish(name, id, payload)
@@ -55,18 +55,11 @@ module NewRelic
             Agent.instance.pop_trace_execution_flag
           end
         rescue => e
-          handle_tracing_error('ActionControllerSubscriber#finish', e)
-        end
-
-        def handle_tracing_error(identifier, e)
-          # This is an important enough failure that we want the backtrace logged
-          # at error level, hence the explicit log_exception call.
-          NewRelic::Agent.logger.error("Tracing error during #{identifier}:")
-          NewRelic::Agent.logger.log_exception(:error, e)
+          log_notification_error(e, name, 'finish')
         end
 
         def set_enduser_ignore
-          TransactionInfo.get.ignore_end_user = true
+          TransactionState.get.request_ignore_enduser = true
         end
 
         def record_metrics(event)