newrelic_rpm 3.5.6.48.beta → 3.5.6.55

data/lib/new_relic/agent/pipe_service.rb

@@ -39,6 +39,13 @@ module NewRelic
         write_to_pipe('EOF')
         NewRelic::Agent::PipeChannelManager.channels[@channel_id].close
       end
+
+      # Invokes the block it is passed.  This is used to implement HTTP
+      # keep-alive in the NewRelicService, and is a required interface for any
+      # Service class.
+      def session
+        yield
+      end
       
       private
 
@@ -52,6 +59,8 @@ module NewRelic
 
       def write_to_pipe(data)
         NewRelic::Agent::PipeChannelManager.channels[@channel_id].write(data)
+      rescue => e
+        NewRelic::Agent.logger.error("#{e.message}: Unable to send data to parent process, please see https://newrelic.com/docs/ruby/resque-instrumentation for more information.")
       end
     end
   end

data/lib/new_relic/agent/sql_sampler.rb

@@ -189,7 +189,7 @@ module NewRelic
         @params = {} #FIXME
         @sql_id = consistent_hash(normalized_query)
         set_primary slow_sql, path, uri
-        record_data_point slow_sql.duration
+        record_data_point(float(slow_sql.duration))
       end
 
       def set_primary(slow_sql, path, uri)
@@ -207,7 +207,7 @@ module NewRelic
           set_primary slow_sql, path, uri
         end
 
-        record_data_point slow_sql.duration
+        record_data_point(float(slow_sql.duration))
       end
 
       def prepare_to_send
@@ -223,8 +223,15 @@ module NewRelic
         Agent.config[:'slow_sql.explain_enabled']
       end
 
+      include NewRelic::Coerce
+
       def to_collector_array(encoder)
-        [ @path, @url, @sql_id, @sql, @database_metric_name, @call_count,
+        [ string(@path),
+          string(@url),
+          int(@sql_id),
+          string(@sql),
+          string(@database_metric_name),
+          int(@call_count),
           Helper.time_to_millis(@total_call_time),
           Helper.time_to_millis(@min_call_time),
           Helper.time_to_millis(@max_call_time),

data/lib/new_relic/agent/thread_profiler.rb

@@ -202,6 +202,8 @@ EOF
 
       THREAD_PROFILER_NODES = 20_000
 
+      include NewRelic::Coerce
+
       def to_collector_array(encoder)
         prune!(THREAD_PROFILER_NODES)
 
@@ -212,11 +214,15 @@ EOF
           "BACKGROUND" => @traces[:background].map{|t| t.to_array }
         }
 
-        [[@profile_id,
-          @start_time.to_f, @stop_time.to_f,
-          @poll_count,
-          encoder.encode(traces),
-          @sample_count, 0]]
+        [[
+          int(@profile_id),
+          float(@start_time),
+          float(@stop_time),
+          int(@poll_count),
+          string(encoder.encode(traces)),
+          int(@sample_count),
+          0
+        ]]
       end
 
       def now_in_millis
@@ -280,9 +286,16 @@ EOF
           [-runnable_count, depth] <=> [-y.runnable_count, y.depth]
         end
 
+        include NewRelic::Coerce
+
         def to_array
-          [[@file, @method, @line_no],
-            @runnable_count, 0,
+          [[
+              string(@file),
+              string(@method),
+              int(@line_no)
+            ],
+            int(@runnable_count),
+            0,
             @children.map {|c| c.to_array}]
         end
 

data/lib/new_relic/coerce.rb

@@ -0,0 +1,37 @@
+module NewRelic
+  # We really don't want to send bad values to the collector, and it doesn't
+  # accept types like Rational that have occasionally slipped into our data.
+  #
+  # These methods are intended to safely coerce things into the form we want,
+  # to provide documentation of expected types on to_collector_array methods,
+  # and to log failures if totally invalid data gets into outgoing data
+  module Coerce
+    def int(value, context=nil)
+      Integer(value)
+    rescue => error
+      log_failure(value, Integer, context, error)
+      0
+    end
+
+    def float(value, context=nil)
+      Float(value)
+    rescue => error
+      log_failure(value, Float, context, error)
+      0.0
+    end
+
+    def string(value, context=nil)
+      return value if value.nil?
+      String(value)
+    rescue => error
+      log_failure(value.class, String, context, error)
+      ""
+    end
+
+    def log_failure(value, type, context, error)
+      msg = "Unable to convert '#{value}' to #{type}"
+      msg += " in context '#{context}'" if context
+      NewRelic::Agent.logger.warn(msg, error)
+    end
+  end
+end

data/lib/new_relic/commands/deployments.rb

@@ -54,7 +54,7 @@ class NewRelic::Command::Deployments < NewRelic::Command
       }.each do |k, v|
         create_params["deployment[#{k}]"] = v unless v.nil? || v == ''
       end
-      http = control.http_connection(control.api_server)
+      http = ::NewRelic::Agent::NewRelicService.new(nil, control.api_server).http_connection
 
       uri = "/deployments.xml"
 

data/lib/new_relic/control/frameworks/rails.rb

@@ -10,14 +10,24 @@ module NewRelic
         def env
           @env ||= RAILS_ENV.dup
         end
+
+        # Rails can return an empty string from this method, causing
+        # the agent not to start even when it is properly in a rails 3
+        # application, so we test the value to make sure it actually
+        # has contents, and bail to the parent class if it is empty.
         def root
-          if defined?(RAILS_ROOT) && RAILS_ROOT.to_s != ''
-            RAILS_ROOT.to_s
+          root = rails_root.to_s
+          if !root.empty?
+            root
           else
             super
           end
         end
 
+        def rails_root
+          RAILS_ROOT if defined?(RAILS_ROOT)
+        end
+
         def rails_config
           if defined?(::Rails) && ::Rails.respond_to?(:configuration)
             ::Rails.configuration

data/lib/new_relic/control/frameworks/rails3.rb

@@ -14,17 +14,8 @@ module NewRelic
           @env ||= ::Rails.env.to_s
         end
 
-        # Rails can return an empty string from this method, causing
-        # the agent not to start even when it is properly in a rails 3
-        # application, so we test the value to make sure it actually
-        # has contents, and bail to the parent class if it is empty.
-        def root
-          value = ::Rails.root.to_s
-          if value.empty?
-            super
-          else
-            value
-          end
+        def rails_root
+          ::Rails.root.to_s
         end
 
         def init_config(options={})

data/lib/new_relic/control/instance_methods.rb

@@ -49,7 +49,10 @@ module NewRelic
 
         Agent.config.replace_or_add_config(Agent::Configuration::ManualSource.new(options), 1)
 
-        ::NewRelic::Agent.logger = NewRelic::Agent::AgentLogger.new(Agent.config, root, options.delete(:log))
+        # Be sure to only create once! RUBY-1020
+        if ::NewRelic::Agent.logger.is_startup_logger?
+          ::NewRelic::Agent.logger = NewRelic::Agent::AgentLogger.new(Agent.config, root, options.delete(:log))
+        end
 
         # Merge the stringified options into the config as overrides:
         environment_name = options.delete(:env) and self.env = environment_name
@@ -100,6 +103,12 @@ module NewRelic
         NewRelic::Agent.config[:dispatcher]
       end
 
+      # Delegates to the class method newrelic_root, implemented by
+      # each subclass
+      def newrelic_root
+        self.class.newrelic_root
+      end
+
       protected
 
       # Append framework specific environment information for uploading to
@@ -130,11 +139,6 @@ module NewRelic
         '.'
       end
 
-      # Delegates to the class method newrelic_root, implemented by
-      # each subclass
-      def newrelic_root
-        self.class.newrelic_root
-      end
     end
     include InstanceMethods
   end

data/lib/new_relic/control/server_methods.rb

@@ -7,20 +7,20 @@ module NewRelic
     end
 
     ProxyServer = Struct.new :name, :port, :user, :password #:nodoc:
-    
+
     # Contains methods that deal with connecting to the server
     module ServerMethods
-      
+
       def server
         @remote_server ||= server_from_host(nil)
       end
-      
+
       # the server we should contact for api requests, like uploading
       # deployments and the like
       def api_server
         @api_server ||= NewRelic::Control::Server.new(Agent.config[:api_host], Agent.config[:api_port], nil)
       end
-      
+
       # a new instances of the proxy server - this passes through if
       # there is no proxy, otherwise it has proxy configuration
       # information pulled from the config file
@@ -30,7 +30,7 @@ module NewRelic
                                                              Agent.config[:proxy_user],
                                                              Agent.config[:proxy_pass])
       end
-      
+
       # turns a hostname into an ip address and returns a
       # NewRelic::Control::Server that contains the configuration info
       def server_from_host(hostname=nil)
@@ -72,38 +72,6 @@ module NewRelic
           nil
         end
       end
-      
-      # The path to the certificate file used to verify the SSL
-      # connection if verify_peer is enabled
-      def cert_file_path
-        File.expand_path(File.join(newrelic_root, 'cert', 'cacert.pem'))
-      end
-
-      # Return the Net::HTTP with proxy configuration given the NewRelic::Control::Server object.
-      # Default is the collector but for api calls you need to pass api_server
-      #
-      # Experimental support for SSL verification:
-      # swap 'VERIFY_NONE' for 'VERIFY_PEER' line to try it out
-      # If verification fails, uncomment the 'http.ca_file' line
-      # and it will use the included certificate.
-      def http_connection(host = nil)
-        host ||= server
-        # Proxy returns regular HTTP if @proxy_host is nil (the default)
-        http_class = Net::HTTP::Proxy(proxy_server.name, proxy_server.port,
-                                      proxy_server.user, proxy_server.password)
-        http = http_class.new(host.ip || host.name, host.port)
-        ::NewRelic::Agent.logger.debug("Http Connection opened to #{host.ip||host.name}:#{host.port}")
-        if Agent.config[:ssl]
-          http.use_ssl = true
-          if Agent.config[:verify_certificate]
-            http.verify_mode = OpenSSL::SSL::VERIFY_PEER
-            http.ca_file = cert_file_path
-          else
-            http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-          end
-        end
-        http
-      end
     end
 
     include ServerMethods

data/lib/new_relic/local_environment.rb

@@ -242,7 +242,7 @@ module NewRelic
     # Although you can override the dispatcher with NEWRELIC_DISPATCHER this
     # is not advisable since it implies certain api's being available.
     def discover_dispatcher
-      dispatchers = %w[passenger torquebox glassfish thin mongrel litespeed webrick fastcgi unicorn sinatra]
+      dispatchers = %w[passenger torquebox trinidad glassfish thin mongrel litespeed webrick fastcgi unicorn sinatra]
       while dispatchers.any? && @discovered_dispatcher.nil?
         send 'check_for_'+(dispatchers.shift)
       end

data/lib/new_relic/metric_data.rb

@@ -1,3 +1,5 @@
+require 'new_relic/coerce'
+
 module NewRelic
   class MetricData
     # nil, or a NewRelic::MetricSpec object if we have no cached ID
@@ -49,11 +51,20 @@ module NewRelic
       "#<MetricData metric_spec:#{metric_spec.inspect}, stats:#{stats.inspect}, metric_id:#{metric_id.inspect}>"
     end
 
+    include NewRelic::Coerce
+
     def to_collector_array(encoder=nil)
       stat_key = metric_id || { 'name' => metric_spec.name, 'scope' => metric_spec.scope }
       [ stat_key,
-        [ stats.call_count, stats.total_call_time, stats.total_exclusive_time,
-          stats.min_call_time, stats.max_call_time, stats.sum_of_squares ] ]
+        [
+          int(stats.call_count, stat_key),
+          float(stats.total_call_time, stat_key),
+          float(stats.total_exclusive_time, stat_key),
+          float(stats.min_call_time, stat_key),
+          float(stats.max_call_time, stat_key),
+          float(stats.sum_of_squares, stat_key)
+        ]
+      ]
     end
   end
 end

data/lib/new_relic/noticed_error.rb

@@ -1,3 +1,5 @@
+require 'new_relic/helper'
+
 # This class encapsulates an error that was noticed by New Relic in a managed app.
 class NewRelic::NoticedError
   extend NewRelic::CollectionHelper
@@ -45,8 +47,13 @@ class NewRelic::NoticedError
     end
   end
 
+  include NewRelic::Coerce
+
   def to_collector_array(encoder=nil)
-    [ (@timestamp.to_f * 1000).round, @path, @message, @exception_class,
+    [ NewRelic::Helper.time_to_millis(@timestamp),
+      string(@path),
+      string(@message),
+      string(@exception_class),
       @params ]
   end
 end

data/lib/new_relic/transaction_sample.rb

@@ -57,15 +57,24 @@ module NewRelic
       JSON.dump(self.to_array)
     end
 
+    include NewRelic::Coerce
+
     def to_array
-      [ @start_time.to_f, @params[:request_params], @params[:custom_params],
+      [ float(@start_time),
+        @params[:request_params],
+        @params[:custom_params],
         @root_segment.to_array ]
     end
 
     def to_collector_array(encoder)
       trace_tree = encoder.encode(self.to_array)
-      [ Helper.time_to_millis(@start_time), Helper.time_to_millis(duration),
-        @params[:path], @params[:uri], trace_tree, @guid, nil,
+      [ Helper.time_to_millis(@start_time),
+        Helper.time_to_millis(duration),
+        string(@params[:path]),
+        string(@params[:uri]),
+        trace_tree,
+        string(@guid),
+        nil,
         !!@force_persist ]
     end
 

data/lib/new_relic/transaction_sample/segment.rb

@@ -33,10 +33,13 @@ module NewRelic
         to_debug_str(0)
       end
 
+      include NewRelic::Coerce
+
       def to_array
-        [ (@entry_timestamp.to_f * 1000).round,
-          (@exit_timestamp.to_f * 1000).round,
-          @metric_name, (@params || {}) ] +
+        [ NewRelic::Helper.time_to_millis(@entry_timestamp),
+          NewRelic::Helper.time_to_millis(@exit_timestamp),
+          string(@metric_name),
+          (@params || {}) ] +
           [ (@called_segments ? @called_segments.map{|s| s.to_array} : []) ]
       end
 

data/newrelic.yml

@@ -68,25 +68,12 @@ common: &default_settings
   # Optionally set the name of the log file, defaults to 'newrelic_agent.log'
   # log_file_name: 'newrelic_agent.log'
 
-  # The newrelic agent communicates with the service via http by
-  # default.  If you want to communicate via https to increase
-  # security, then turn on SSL by setting this value to true.  Note,
-  # this will result in increased CPU overhead to perform the
-  # encryption involved in SSL communication, but this work is done
-  # asynchronously to the threads that process your application code,
-  # so it should not impact response times.
-  ssl: false
-
-  # EXPERIMENTAL: enable verification of the SSL certificate sent by
-  # the server. This setting has no effect unless SSL is enabled
-  # above. This may block your application. Only enable it if the data
-  # you send us needs end-to-end verified certificates.
-  #
-  # This means we cannot cache the DNS lookup, so each request to the
-  # service will perform a lookup. It also means that we cannot
-  # use a non-blocking lookup, so in a worst case, if you have DNS
-  # problems, your app may block indefinitely.
-  # verify_certificate: true
+  # The newrelic agent communicates with the service via https by default.  This
+  # prevents eavesdropping on the performance metrics transmitted by the agent.
+  # The encryption required by SSL introduces a nominal amount of CPU overhead,
+  # which is performed asynchronously in a background thread.  If you'd prefer
+  # to send your metrics over http uncomment the following line.
+  # ssl: false
 
   #============================== Browser Monitoring ===============================
   # New Relic Real User Monitoring gives you insight into the performance real users are