newrelic_rpm 3.5.4.35.beta → 3.5.5.38

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

@@ -9,12 +9,19 @@ module NewRelic
             '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]
+          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] if ENV[key]
+            self[val] = ENV[key].intern if ENV[key]
           end
 
           boolean_map = {
@@ -35,20 +42,6 @@ module NewRelic
               self[:log_file_name] = File.basename(ENV['NEW_RELIC_LOG'])
             end
           end
-
-          initialize_thread_profiler_settings
-        end
-
-
-        def initialize_thread_profiler_settings
-          thread_profiler_supported = NewRelic::Agent::ThreadProfiler.is_supported?
-          self[:'thread_profiler.is_supported'] = thread_profiler_supported
-
-          # If not supporting thread profiling, ignore all other enabled's.
-          # Otherwise, don't set so defaulting is heeded.
-          if !thread_profiler_supported
-            self[:'thread_profiler.enabled'] = false
-          end
         end
       end
     end

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

@@ -1,5 +1,6 @@
 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/server_source'
 require 'new_relic/agent/configuration/environment_source'
@@ -22,6 +23,7 @@ module NewRelic
           invoke_callbacks(:add, source)
           @config_stack.insert(level, source.freeze)
           reset_cache
+          log_config(:add, source)
         end
 
         def remove_config(source=nil)
@@ -32,6 +34,7 @@ module NewRelic
           end
           reset_cache
           invoke_callbacks(:remove, source)
+          log_config(:remove, source)
         end
 
         def replace_or_add_config(source, level=0)
@@ -83,14 +86,14 @@ module NewRelic
           end
         end
 
-        def flattened_config
+        def flattened
           @config_stack.reverse.inject({}) do |flat,layer|
             thawed_layer = layer.dup
             thawed_layer.each do |k,v|
               begin
                 thawed_layer[k] = instance_eval(&v) if v.respond_to?(:call)
               rescue => e
-                NewRelic::Control.instance.log.debug("#{e.class.name} : #{e.message} - when accessing config key #{k}")
+                ::NewRelic::Agent.logger.debug("#{e.class.name} : #{e.message} - when accessing config key #{k}")
                 thawed_layer[k] = nil
               end
               thawed_layer.delete(:config)
@@ -99,6 +102,17 @@ module NewRelic
           end
         end
 
+        def apply_mask(hash)
+          MASK_DEFAULTS. \
+            select {|_, proc| proc.call}. \
+            each {|key, _| hash.delete(key) }
+          hash
+        end
+
+        def to_collector_hash
+          DottedHash.new(apply_mask(flattened)).to_hash
+        end
+
         def app_names
           case self[:app_name]
           when Array then self[:app_name]
@@ -110,6 +124,12 @@ module NewRelic
         def reset_cache
           @cache = Hash.new {|hash,key| hash[key] = self.fetch(key) }
         end
+
+        def log_config(direction, source)
+          ::NewRelic::Agent.logger.debug(
+            "Updating config (#{direction}) from #{source.class}. Results:",
+            flattened.inspect)
+        end
       end
     end
   end

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

@@ -0,0 +1,10 @@
+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? },
+      }
+    end
+  end
+end

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

@@ -7,11 +7,13 @@ module NewRelic
         attr_accessor :file_path
 
         def initialize(path, env)
+          ::NewRelic::Agent.logger.debug("Reading configuration from #{path}")
+
           config = {}
           begin
             @file_path = File.expand_path(path)
             if !File.exists?(@file_path)
-              NewRelic::Control.instance.log.error("Unable to load configuration from #{path}")
+              ::NewRelic::Agent.logger.error("Unable to load configuration from #{path}")
               return
             end
 
@@ -25,7 +27,7 @@ module NewRelic
             erb = ERB.new(file).result(binding)
             config = merge!(YAML.load(erb)[env] || {})
           rescue ScriptError, StandardError => e
-            NewRelic::Control.instance.log.warn("Unable to read configuration file: #{e}")
+            ::NewRelic::Agent.logger.error("Unable to read configuration file #{path}: #{e}")
           end
 
           if config['transaction_tracer'] &&

data/lib/new_relic/agent/cross_process_monitoring.rb

@@ -0,0 +1,43 @@
+module NewRelic
+  module Agent
+    module CrossProcessMonitoring
+
+      module_function
+
+      def insert_response_header(request, response)
+        if Agent.config[:'cross_process.enabled'] &&
+            NewRelic::Agent.instance.cross_process_id && (id = id_from_request(request))
+
+          content_length = -1
+          timings = NewRelic::Agent::BrowserMonitoring.timings
+
+          # FIXME the transaction name might not be properly encoded.  use a json generator
+          payload = %[["#{NewRelic::Agent.instance.cross_process_id}","#{timings.transaction_name}",#{timings.queue_time_in_millis},#{timings.app_time_in_millis},#{content_length}] ]
+          payload = obfuscate_with_key(payload, NewRelic::Agent.instance.cross_process_encoding_bytes)
+
+          response['X-NewRelic-App-Data'] = payload
+          #FIXME generate ClientApplication metric.  id must be decoded first
+          # String metricName = MessageFormat.format("ClientApplication/{0}/all", id);
+        end
+      end
+
+      def obfuscate_with_key(text, key_bytes)
+        obfuscated = ""
+        index = 0
+        text.each_byte{|byte|
+          obfuscated.concat((byte ^ key_bytes[index % key_bytes.length].to_i))
+          index+=1
+        }
+
+        [obfuscated].pack("m0").gsub("\n", '')
+      end
+
+      def id_from_request(request)
+        %w{X-NewRelic-ID HTTP_X_NEWRELIC_ID X_NEWRELIC_ID}.each do |header|
+          return request.env[header] if request.env.has_key?(header)
+        end
+        nil
+      end
+    end
+  end
+end

data/lib/new_relic/agent/database.rb

@@ -113,8 +113,7 @@ module NewRelic
       rescue => e
         begin
           # guarantees no throw from explain_sql
-          NewRelic::Control.instance.log.error("Error getting query plan: #{e.message}")
-          NewRelic::Control.instance.log.debug(e.backtrace.join("\n"))
+          ::NewRelic::Agent.logger.error("Error getting query plan:", e)
         rescue
           # double exception. throw up your hands
         end
@@ -145,8 +144,7 @@ module NewRelic
             connection = ActiveRecord::Base.send("#{config[:adapter]}_connection", config)
             @connections[config] = connection
           rescue => e
-            NewRelic::Agent.agent.log.error("Caught exception #{e} trying to get connection to DB for explain. Control: #{config}")
-            NewRelic::Agent.agent.log.error(e.backtrace.join("\n"))
+            ::NewRelic::Agent.logger.error("Caught exception trying to get connection to DB for explain. Control: #{config}", e)
             nil
           end
         end

data/lib/new_relic/agent/error_collector.rb

@@ -29,7 +29,7 @@ module NewRelic
         @lock = Mutex.new
 
         Agent.config.register_callback(:'error_collector.enabled') do |config_enabled|
-          log.debug "Errors will #{config_enabled ? '' : 'not '}be sent to the New Relic service."
+          ::NewRelic::Agent.logger.debug "Errors will #{config_enabled ? '' : 'not '}be sent to the New Relic service."
         end
         Agent.config.register_callback(:'error_collector.ignore_errors') do |ignore_errors|
           initialize_ignored_errors(ignore_errors)
@@ -66,7 +66,7 @@ module NewRelic
       def ignore(errors)
         errors.each do |error|
           @ignore[error] = true
-          log.debug("Ignoring errors of type '#{error}'")
+          ::NewRelic::Agent.logger.debug("Ignoring errors of type '#{error}'")
         end
       end
 
@@ -193,7 +193,7 @@ module NewRelic
         # the maximum limit, and logs a warning if we are over the limit.
         def over_queue_limit?(message)
           over_limit = (@errors.length >= MAX_ERROR_QUEUE_LENGTH)
-          log.warn("The error reporting queue has reached #{MAX_ERROR_QUEUE_LENGTH}. The error detail for this and subsequent errors will not be transmitted to New Relic until the queued errors have been sent: #{message}") if over_limit
+          ::NewRelic::Agent.logger.warn("The error reporting queue has reached #{MAX_ERROR_QUEUE_LENGTH}. The error detail for this and subsequent errors will not be transmitted to New Relic until the queued errors have been sent: #{message}") if over_limit
           over_limit
         end
 
@@ -228,7 +228,7 @@ module NewRelic
         add_to_error_queue(NewRelic::NoticedError.new(action_path, exception_options, exception))
         exception
       rescue => e
-        log.error("Error capturing an error #{e}")
+        ::NewRelic::Agent.logger.warn("Failure when capturing error '#{exception}':", e)
       end
 
       # Get the errors currently queued up.  Unsent errors are left
@@ -245,11 +245,6 @@ module NewRelic
           errors
         end
       end
-
-      private
-      def log
-        NewRelic::Agent.logger
-      end
     end
   end
 end

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

@@ -8,7 +8,7 @@ DependencyDetection.defer do
   end
   
   executes do
-    NewRelic::Agent.logger.debug 'Installing ActiveMerchant instrumentation'
+    ::NewRelic::Agent.logger.info 'Installing ActiveMerchant instrumentation'
   end
   
   executes do

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

@@ -104,7 +104,7 @@ DependencyDetection.defer do
   end
   
   executes do
-    NewRelic::Agent.logger.debug 'Installing ActiveRecord instrumentation'
+    ::NewRelic::Agent.logger.info 'Installing ActiveRecord instrumentation'
   end
   
   executes do

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

@@ -37,7 +37,7 @@ DependencyDetection.defer do
   end
   
   executes do
-    NewRelic::Agent.logger.debug 'Installing ActsAsSolr instrumentation'
+    ::NewRelic::Agent.logger.info 'Installing ActsAsSolr instrumentation'
   end
   
   executes do

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

@@ -8,7 +8,7 @@ DependencyDetection.defer do
   end
 
   executes do
-    NewRelic::Agent.logger.debug 'Installing AuthLogic instrumentation'
+    ::NewRelic::Agent.logger.info 'Installing AuthLogic instrumentation'
   end  
   
   executes do

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

@@ -0,0 +1,41 @@
+module NewRelic
+  module Agent
+    module Instrumentation
+      class BrowserMonitoringTimings
+
+        def initialize(queue_time_in_seconds, transaction)
+          if transaction.nil?
+            @start_time_in_seconds = 0.0
+          else
+            @transaction_name = transaction.transaction_name
+            @start_time_in_seconds = transaction.start_time
+          end
+
+          @queue_time_in_seconds = queue_time_in_seconds
+        end
+
+        attr_reader :transaction_name
+
+        def start_time_in_millis
+          convert_to_milliseconds(@start_time_in_seconds)
+        end
+
+        def queue_time_in_millis
+          convert_to_milliseconds(@queue_time_in_seconds)
+        end
+
+        def app_time_in_millis
+          convert_to_milliseconds(Time.now - @start_time_in_seconds)
+        end
+
+        private
+
+        def convert_to_milliseconds(value)
+          value = (value.to_f * 1000.0).round
+          return 0.0 if value < 0
+          value
+        end
+      end
+    end
+  end
+end

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

@@ -60,7 +60,7 @@ module NewRelic
             if specifiers.empty?
               self.newrelic_write_attr property, true
             elsif ! (Hash === specifiers)
-              logger.error "newrelic_#{property} takes an optional hash with :only and :except lists of actions (illegal argument type '#{specifiers.class}')"
+              ::NewRelic::Agent.logger.error "newrelic_#{property} takes an optional hash with :only and :except lists of actions (illegal argument type '#{specifiers.class}')"
             else
               self.newrelic_write_attr property, specifiers
             end
@@ -159,7 +159,7 @@ module NewRelic
             alias_method method.to_s, with_method_name
             send visibility, method
             send visibility, with_method_name
-            NewRelic::Control.instance.log.debug("Traced transaction: class = #{self.name}, method = #{method.to_s}, options = #{options.inspect}")
+            ::NewRelic::Agent.logger.debug("Traced transaction: class = #{self.name}, method = #{method.to_s}, options = #{options.inspect}")
           end
         end
 
@@ -269,9 +269,10 @@ module NewRelic
                 else
                   perform_action_without_newrelic_trace(*args)
                 end
-                if defined?(request) && request && defined?(response) &&
-                    response && !Agent.config[:disable_mobile_headers]
-                  NewRelic::Agent::BrowserMonitoring.insert_mobile_response_header(request, response)
+                if defined?(request) && request && defined?(response) && response
+                  if !Agent.config[:disable_mobile_headers]
+                    NewRelic::Agent::BrowserMonitoring.insert_mobile_response_header(request, response)
+                  end
                 end
                 result
               rescue => e
@@ -449,8 +450,7 @@ module NewRelic
           end
           queue_start || now
         rescue => e
-          NewRelic::Control.instance.log.error("Error detecting upstream wait time: #{e}")
-          NewRelic::Control.instance.log.debug("#{e.backtrace[0..20]}")
+          ::NewRelic::Agent.logger.error("Error detecting upstream wait time:", e)
           now
         end
         

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

@@ -57,7 +57,7 @@ DependencyDetection.defer do
   end
   
   executes do
-    NewRelic::Agent.logger.debug 'Installing DataMapper instrumentation'
+    ::NewRelic::Agent.logger.info 'Installing DataMapper instrumentation'
   end
   
   executes do

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

@@ -14,7 +14,7 @@ DependencyDetection.defer do
   end
   
   executes do
-    NewRelic::Agent.logger.debug 'Installing DelayedJob instrumentation'
+    ::NewRelic::Agent.logger.info 'Installing DelayedJob instrumentation'
   end
   
   executes do

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

@@ -57,24 +57,24 @@ DependencyDetection.defer do
     if defined? ::MemCache
       NewRelic::Agent::Instrumentation::Memcache.instrument_methods(::MemCache,
                                                                     commands)
-      NewRelic::Agent.logger.debug 'Installing MemCache instrumentation'
+      ::NewRelic::Agent.logger.info 'Installing MemCache instrumentation'
     end
     if defined? ::Memcached
       commands << 'cas'
       NewRelic::Agent::Instrumentation::Memcache.instrument_methods(::Memcached,
                                                                     commands)
-      NewRelic::Agent.logger.debug 'Installing Memcached instrumentation'
+      ::NewRelic::Agent.logger.info 'Installing Memcached instrumentation'
     end
     if defined? ::Dalli::Client
       NewRelic::Agent::Instrumentation::Memcache.instrument_methods(::Dalli::Client,
                                                                     commands)
-      NewRelic::Agent.logger.debug 'Installing Dalli Memcache instrumentation'
+      ::NewRelic::Agent.logger.info 'Installing Dalli Memcache instrumentation'
     end
     if defined? ::Spymemcached
       commands << 'multiget'
       NewRelic::Agent::Instrumentation::Memcache.instrument_methods(::Spymemcached,
                                                                     commands)
-      NewRelic::Agent.logger.debug 'Installing Spymemcached instrumentation'
+      ::NewRelic::Agent.logger.info 'Installing Spymemcached instrumentation'
     end
   end
 end

data/lib/new_relic/agent/instrumentation/merb/controller.rb

@@ -8,7 +8,7 @@ DependencyDetection.defer do
   end
   
   executes do
-    NewRelic::Agent.logger.debug 'Installing Merb Controller instrumentation'
+    ::NewRelic::Agent.logger.info 'Installing Merb Controller instrumentation'
   end
   
   executes do

data/lib/new_relic/agent/instrumentation/merb/errors.rb

@@ -10,7 +10,7 @@ DependencyDetection.defer do
   end
   
   executes do
-    NewRelic::Agent.logger.debug 'Installing Merb Errors instrumentation'
+    ::NewRelic::Agent.logger.info 'Installing Merb Errors instrumentation'
   end
   
   executes do