newrelic_rpm 3.5.4.35.beta → 3.5.5.38

data/lib/new_relic/agent/instrumentation/metric_frame/pop.rb

@@ -14,7 +14,7 @@ module NewRelic
           end
 
           def log_underflow
-            NewRelic::Agent.logger.error "Underflow in metric frames: #{caller.join("\n   ")}"
+            ::NewRelic::Agent.logger.error "Underflow in metric frames: #{caller.join("\n   ")}"
           end
 
           def notice_scope_empty

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

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

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

@@ -6,10 +6,10 @@ DependencyDetection.defer do
   end
 
   executes do
-    NewRelic::Agent.logger.debug "Installing Passenger event hooks."
+    ::NewRelic::Agent.logger.debug "Installing Passenger event hooks."
 
     ::PhusionPassenger.on_event(:stopping_worker_process) do
-      NewRelic::Agent.logger.debug "Passenger stopping this process, shutdown the agent."
+      ::NewRelic::Agent.logger.debug "Passenger stopping this process, shutdown the agent."
       NewRelic::Agent.instance.shutdown
     end
 

data/lib/new_relic/agent/instrumentation/rails/action_controller.rb

@@ -8,7 +8,7 @@ DependencyDetection.defer do
   end
   
   executes do
-    NewRelic::Agent.logger.debug 'Installing Rails 2.1 View instrumentation'
+    ::NewRelic::Agent.logger.info 'Installing Rails 2.1 View instrumentation'
   end
 
   executes do
@@ -32,7 +32,7 @@ DependencyDetection.defer do
   end
   
   executes do
-    NewRelic::Agent.logger.debug 'Installing Rails 1.* - 2.0 View instrumentation'
+    ::NewRelic::Agent.logger.info 'Installing Rails 1.* - 2.0 View instrumentation'
   end
   
   executes do
@@ -53,7 +53,7 @@ DependencyDetection.defer do
   end
 
   executes do
-    NewRelic::Agent.logger.debug 'Installing Rails 2.2 - 2.3 View instrumentation'
+    ::NewRelic::Agent.logger.info 'Installing Rails 2.2 - 2.3 View instrumentation'
   end
   
   executes do    
@@ -78,7 +78,7 @@ DependencyDetection.defer do
   end
   
   executes do
-    NewRelic::Agent.logger.debug 'Installing Rails 2 Controller instrumentation'
+    ::NewRelic::Agent.logger.info 'Installing Rails 2 Controller instrumentation'
   end
   
   executes do

data/lib/new_relic/agent/instrumentation/rails/action_web_service.rb

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

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

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

data/lib/new_relic/agent/instrumentation/rails3/action_controller.rb

@@ -78,7 +78,7 @@ DependencyDetection.defer do
   end
 
   executes do
-    NewRelic::Agent.logger.debug 'Installing Rails 3 Controller instrumentation'
+    ::NewRelic::Agent.logger.info 'Installing Rails 3 Controller instrumentation'
   end
 
   executes do
@@ -100,7 +100,7 @@ DependencyDetection.defer do
   end
 
   executes do
-    NewRelic::Agent.logger.debug 'Installing Rails 3.0 view instrumentation'
+    ::NewRelic::Agent.logger.info 'Installing Rails 3.0 view instrumentation'
   end
 
   executes do
@@ -139,7 +139,7 @@ DependencyDetection.defer do
   end
 
   executes do
-    NewRelic::Agent.logger.debug 'Installing Rails 3.1/3.2 view instrumentation'
+    ::NewRelic::Agent.logger.info 'Installing Rails 3.1/3.2 view instrumentation'
   end
 
   executes do

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

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

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

@@ -7,7 +7,7 @@ DependencyDetection.defer do
   end
 
   executes do
-    NewRelic::Agent.logger.debug 'Installing Resque instrumentation'
+    ::NewRelic::Agent.logger.info 'Installing Resque instrumentation'
   end
   
   executes do
@@ -62,7 +62,8 @@ DependencyDetection.defer do
       ::Resque.before_first_fork do
         NewRelic::Agent.manual_start(:dispatcher   => :resque,
                                      :sync_startup => true,
-                                     :start_channel_listener => true)
+                                     :start_channel_listener => true,
+                                     :report_instance_busy => false)
       end
       
       ::Resque.before_fork do |job|

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

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

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

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

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

@@ -6,8 +6,8 @@ DependencyDetection.defer do
   end
 
   executes do
-    NewRelic::Agent.logger.debug 'Installing Unicorn instrumentation'
-    NewRelic::Agent.logger.info 'Detected Unicorn, please see additional documentation: https://newrelic.com/docs/troubleshooting/im-using-unicorn-and-i-dont-see-any-data'
+    ::NewRelic::Agent.logger.info 'Installing Unicorn instrumentation'
+    ::NewRelic::Agent.logger.info 'Detected Unicorn, please see additional documentation: https://newrelic.com/docs/troubleshooting/im-using-unicorn-and-i-dont-see-any-data'
   end
 
   executes do

data/lib/new_relic/agent/method_tracer.rb

@@ -175,13 +175,11 @@ module NewRelic
           end
           
           # helper for logging errors to the newrelic_agent.log
-          # properly. Logs the error at error level, and includes a
-          # backtrace if we're running at debug level
+          # properly. Logs the error at error level
           def log_errors(code_area, metric)
             yield
           rescue => e
-            NewRelic::Control.instance.log.error("Caught exception in #{code_area}. Metric name = #{metric}, exception = #{e}")
-            NewRelic::Control.instance.log.error(e.backtrace.join("\n"))
+            ::NewRelic::Agent.logger.error("Caught exception in #{code_area}. Metric name = #{metric}", e)
           end
           
           # provides the header for our traced execution scoped
@@ -327,7 +325,7 @@ module NewRelic
           # anything if the method doesn't exist.
           def newrelic_method_exists?(method_name)
             exists = method_defined?(method_name) || private_method_defined?(method_name)
-            NewRelic::Control.instance.log.warn("Did not trace #{self.name}##{method_name} because that method does not exist") unless exists
+            ::NewRelic::Agent.logger.error("Did not trace #{self.name}##{method_name} because that method does not exist") unless exists
             exists
           end
           
@@ -337,7 +335,7 @@ module NewRelic
           # to help with debugging custom instrumentation.
           def traced_method_exists?(method_name, metric_name_code)
             exists = method_defined?(_traced_method_name(method_name, metric_name_code))
-            NewRelic::Control.instance.log.warn("Attempt to trace a method twice with the same metric: Method = #{method_name}, Metric Name = #{metric_name_code}") if exists
+            ::NewRelic::Agent.logger.error("Attempt to trace a method twice with the same metric: Method = #{method_name}, Metric Name = #{metric_name_code}") if exists
             exists
           end
           
@@ -488,7 +486,7 @@ module NewRelic
           alias_method method_name, _traced_method_name(method_name, metric_name_code)
           send visibility, method_name
           send visibility, _traced_method_name(method_name, metric_name_code)
-          NewRelic::Control.instance.log.debug("Traced method: class = #{self.name},"+
+          ::NewRelic::Agent.logger.debug("Traced method: class = #{self.name},"+
                     "method = #{method_name}, "+
                     "metric = '#{metric_name_code}'")
         end
@@ -501,7 +499,7 @@ module NewRelic
           if method_defined? "#{_traced_method_name(method_name, metric_name_code)}"
             alias_method method_name, "#{_untraced_method_name(method_name, metric_name_code)}"
             undef_method "#{_traced_method_name(method_name, metric_name_code)}"
-            NewRelic::Control.instance.log.debug("removed method tracer #{method_name} #{metric_name_code}\n")
+            ::NewRelic::Agent.logger.debug("removed method tracer #{method_name} #{metric_name_code}\n")
           else
             raise "No tracer for '#{metric_name_code}' on method '#{method_name}'"
           end

data/lib/new_relic/agent/new_relic_service.rb

@@ -1,4 +1,5 @@
 require 'zlib'
+require 'new_relic/agent/audit_logger'
 
 module NewRelic
   module Agent
@@ -23,18 +24,24 @@ module NewRelic
         @license_key = license_key || Agent.config[:license_key]
         @collector = collector
         @request_timeout = Agent.config[:timeout]
-        load_marshaller
-      end
 
-      def load_marshaller
-        if Agent.config[:marshaller] == :json
-          require 'json'
-          @marshaller = JsonMarshaller.new
-        else
-          @marshaller = PrubyMarshaller.new
+        @audit_logger = ::NewRelic::Agent::AuditLogger.new(Agent.config)
+        Agent.config.register_callback(:'audit_log.enabled') do |enabled|
+          @audit_logger.enabled = enabled
+        end
+        
+        Agent.config.register_callback(:marshaller) do |marshaller|
+          begin
+            if marshaller == 'json'
+              require 'json'
+              @marshaller = JsonMarshaller.new
+            else
+              @marshaller = PrubyMarshaller.new
+            end
+          rescue LoadError
+            @marshaller = PrubyMarshaller.new
+          end
         end
-      rescue LoadError
-        @marshaller = PrubyMarshaller.new
       end
 
       def connect(settings={})
@@ -72,7 +79,7 @@ module NewRelic
       end
 
       def profile_data(profile)
-        invoke_remote(:profile_data, @agent_id, profile.to_compressed_array) || ''
+        invoke_remote(:profile_data, @agent_id, profile) || ''
       end
 
       def get_agent_commands
@@ -86,6 +93,19 @@ module NewRelic
         invoke_remote(:agent_command_results, @agent_id, { command_id.to_s => results })
       end
 
+      # We do not compress if content is smaller than 64kb.  There are
+      # problems with bugs in Ruby in some versions that expose us
+      # to a risk of segfaults if we compress aggressively.
+      def compress_request_if_needed(data)
+        encoding = 'identity'
+        if data.size > 64 * 1024
+          data = Encoders::Compressed.encode(data)
+          encoding = 'deflate'
+        end
+        check_post_size(data)
+        [data, encoding]
+      end
+
       private
 
       # A shorthand for NewRelic::Control.instance
@@ -93,11 +113,6 @@ module NewRelic
         NewRelic::Control.instance
       end
 
-      # Shorthand to the NewRelic::Agent.logger method
-      def log
-        NewRelic::Agent.logger
-      end
-
       # The path on the server that we should post our data to
       def remote_method_uri(method, format='ruby')
         params = {'run_id' => @agent_id, 'marshal_format' => format}
@@ -117,15 +132,19 @@ module NewRelic
         now = Time.now
 
         data = @marshaller.dump(args)
-        check_post_size(data)
+        data, encoding = compress_request_if_needed(data)
+
+        uri = remote_method_uri(method, @marshaller.format)
+        full_uri = "#{@collector}#{uri}"
+
+        @audit_logger.log_request(full_uri, args, @marshaller)
         response = send_request(:data      => data,
-                                :uri       => remote_method_uri(method,
-                                                          @marshaller.format),
-                                :encoding  => @marshaller.encoding,
+                                :uri       => uri,
+                                :encoding  => encoding,
                                 :collector => @collector)
         @marshaller.load(decompress_response(response))
       rescue NewRelic::Agent::ForceRestartException => e
-        log.info e.message
+        ::NewRelic::Agent.logger.debug e.message
         raise
       ensure
         record_supportability_metrics(method, now)
@@ -140,48 +159,11 @@ module NewRelic
           record_data_point((Time.now - now).to_f)
       end
 
-      # This method handles the compression of the request body that
-      # we are going to send to the server
-      #
-      # We currently optimize for CPU here since we get roughly a 10x
-      # reduction in message size with this, and CPU overhead is at a
-      # premium. For extra-large posts, we use the higher compression
-      # since otherwise it actually errors out.
-      #
-      # We do not compress if content is smaller than 64kb.  There are
-      # problems with bugs in Ruby in some versions that expose us
-      # to a risk of segfaults if we compress aggressively.
-      #
-      # medium payloads get fast compression, to save CPU
-      # big payloads get all the compression possible, to stay under
-      # the 2,000,000 byte post threshold
-      def compress_data(object)
-        dump = marshal_data(object)
-
-        return [dump, 'identity'] if dump.size < (64*1024)
-
-        compressed_dump = Zlib::Deflate.deflate(dump, Zlib::DEFAULT_COMPRESSION)
-
-        # this checks to make sure mongrel won't choke on big uploads
-        check_post_size(compressed_dump)
-
-        [compressed_dump, 'deflate']
-      end
-
-      def marshal_data(data)
-        NewRelic::LanguageSupport.with_cautious_gc do
-          Marshal.dump(data)
-        end
-      rescue => e
-        log.debug("#{e.class.name} : #{e.message} when marshalling #{object}")
-        raise
-      end
-
       # Raises an UnrecoverableServerException if the post_string is longer
       # than the limit configured in the control object
       def check_post_size(post_string)
         return if post_string.size < Agent.config[:post_size_limit]
-        log.debug "Tried to send too much data: #{post_string.size} bytes"
+        ::NewRelic::Agent.logger.debug "Tried to send too much data: #{post_string.size} bytes"
         raise UnrecoverableServerException.new('413 Request Entity Too Large')
       end
 
@@ -201,7 +183,7 @@ module NewRelic
         request.content_type = "application/octet-stream"
         request.body = opts[:data]
 
-        log.debug "Connect to #{opts[:collector]}#{opts[:uri]}"
+        ::NewRelic::Agent.logger.debug "Connect to #{opts[:collector]}#{opts[:uri]}"
 
         response = nil
         http = control.http_connection(@collector)
@@ -211,7 +193,7 @@ module NewRelic
             response = http.request(request)
           end
         rescue Timeout::Error
-          log.warn "Timed out trying to post data to New Relic (timeout = #{@request_timeout} seconds)" unless @request_timeout < 30
+          ::NewRelic::Agent.logger.warn "Timed out trying to post data to New Relic (timeout = #{@request_timeout} seconds)" unless @request_timeout < 30
           raise
         end
         if response.is_a? Net::HTTPUnauthorized
@@ -219,7 +201,7 @@ module NewRelic
         elsif response.is_a? Net::HTTPServiceUnavailable
           raise ServerConnectionException, "Service unavailable (#{response.code}): #{response.message}"
         elsif response.is_a? Net::HTTPGatewayTimeOut
-          log.debug("Timed out getting response: #{response.message}")
+          ::NewRelic::Agent.logger.warn("Timed out getting response: #{response.message}")
           raise Timeout::Error, response.message
         elsif response.is_a? Net::HTTPRequestEntityTooLarge
           raise UnrecoverableServerException, '413 Request Entity Too Large'
@@ -238,10 +220,10 @@ module NewRelic
       # encoded, otherwise returns it verbatim
       def decompress_response(response)
         if response['content-encoding'] != 'gzip'
-          log.debug "Uncompressed content returned"
+          ::NewRelic::Agent.logger.debug "Uncompressed content returned"
           return response.body
         end
-        log.debug "Decompressing return value"
+        ::NewRelic::Agent.logger.debug "Decompressing return value"
         i = Zlib::GzipReader.new(StringIO.new(response.body))
         i.read
       end
@@ -259,34 +241,27 @@ module NewRelic
         "NewRelic-RubyAgent/#{NewRelic::VERSION::STRING} #{ruby_description}#{zlib_version}"
       end
 
-      class Marshaller
-        attr_reader :encoding
-
-        # This method handles the compression of the request body that
-        # we are going to send to the server
-        #
-        # We currently optimize for CPU here since we get roughly a 10x
-        # reduction in message size with this, and CPU overhead is at a
-        # premium. For extra-large posts, we use the higher compression
-        # since otherwise it actually errors out.
-        #
-        # We do not compress if content is smaller than 64kb.  There are
-        # problems with bugs in Ruby in some versions that expose us
-        # to a risk of segfaults if we compress aggressively.
-        #
-        # medium payloads get fast compression, to save CPU
-        # big payloads get all the compression possible, to stay under
-        # the 2,000,000 byte post threshold
-        def compress(data, opts={})
-          if opts[:force] || data.size > 64 * 1024
-            data = Zlib::Deflate.deflate(data, Zlib::DEFAULT_COMPRESSION)
-            @encoding = 'deflate'
-          else
-            @encoding = 'identity'
+      module Encoders
+        module Identity
+          def self.encode(data)
+            data
+          end
+        end
+
+        module Compressed
+          def self.encode(data)
+            Zlib::Deflate.deflate(data, Zlib::DEFAULT_COMPRESSION)
+          end
+        end
+
+        module Base64CompressedJSON
+          def self.encode(data)
+            Base64.encode64(Compressed.encode(JSON.dump(data)))
           end
-          data
         end
+      end
 
+      class Marshaller
         def parsed_error(error)
           error_class = error['error_type'].split('::') \
             .inject(Module) {|mod,const| mod.const_get(const) }
@@ -295,18 +270,27 @@ module NewRelic
           CollectorError.new("#{error['error_type']}: #{error['message']}")
         end
 
-        protected
-
-        def prepare(data)
+        def prepare(data, options={})
+          encoder = options[:encoder] || default_encoder
           if data.respond_to?(:to_collector_array)
-            data.to_collector_array(self)
+            data.to_collector_array(encoder)
           elsif data.kind_of?(Array)
-            data.map {|element| prepare(element) }
+            data.map { |element| prepare(element, options) }
           else
             data
           end
         end
 
+        def default_encoder
+          Encoders::Identity
+        end
+
+        def self.human_readable?
+          false
+        end
+
+        protected
+
         def return_value(data)
           if data.respond_to?(:has_key?)
             if data.has_key?('exception')
@@ -315,7 +299,7 @@ module NewRelic
               return data['return_value']
             end
           end
-          NewRelic::Agent.logger.debug("Unexpected response from collector: #{data}")
+          ::NewRelic::Agent.logger.debug("Unexpected response from collector: #{data}")
           nil
         end
       end
@@ -323,15 +307,15 @@ module NewRelic
       # Primitive Ruby Object Notation which complies JSON format data strutures
       class PrubyMarshaller < Marshaller
         def initialize
-          NewRelic::Agent.logger.debug 'Using Pruby marshaller'
+          ::NewRelic::Agent.logger.debug 'Using Pruby marshaller'
         end
 
-        def dump(ruby)
+        def dump(ruby, opts={})
           NewRelic::LanguageSupport.with_cautious_gc do
-            compress(Marshal.dump(prepare(ruby)))
+            Marshal.dump(prepare(ruby, opts))
           end
         rescue => e
-          NewRelic::Agent.logger.debug("#{e.class.name} : #{e.message} when marshalling #{ruby.inspect}")
+          ::NewRelic::Agent.logger.debug("#{e.class.name} : #{e.message} when marshalling #{ruby.inspect}")
           raise
         end
 
@@ -341,7 +325,7 @@ module NewRelic
             return_value(Marshal.load(data))
           end
         rescue
-          NewRelic::Agent.logger.debug "Error encountered loading collector response: #{data}"
+          ::NewRelic::Agent.logger.debug "Error encountered loading collector response: #{data}"
           raise
         end
 
@@ -357,23 +341,23 @@ module NewRelic
       # Marshal collector protocol with JSON when available
       class JsonMarshaller < Marshaller
         def initialize
-          NewRelic::Agent.logger.debug 'Using JSON marshaller'
+          ::NewRelic::Agent.logger.debug 'Using JSON marshaller'
         end
 
-        def dump(ruby)
-          compress(JSON.dump(prepare(ruby)))
+        def dump(ruby, opts={})
+          JSON.dump(prepare(ruby, opts))
         end
 
         def load(data)
           return unless data && data != ''
           return_value(JSON.load(data))
         rescue
-          NewRelic::Agent.logger.debug "Error encountered loading collector response: #{data}"
+          ::NewRelic::Agent.logger.debug "Error encountered loading collector response: #{data}"
           raise
         end
 
-        def encode_compress(data)
-          Base64.encode64(compress(JSON.dump(data), :force => true))
+        def default_encoder
+          Encoders::Base64CompressedJSON
         end
 
         def format
@@ -383,6 +367,10 @@ module NewRelic
         def self.is_supported?
           RUBY_VERSION >= '1.9.2'
         end
+
+        def self.human_readable?
+          true # for some definitions of 'human'
+        end
       end
 
       class CollectorError < StandardError; end