newrelic_rpm 3.5.0.1 → 3.5.1.alpha

data/CHANGELOG

@@ -4,31 +4,32 @@
 ### Next Up ###
 ## v3.5.1 ##
 
-### current version ###
-## v3.5.0.1 ##
+ * Enabling Memory Profiling on Lion and Moutain Lion
+
+   The agent's list of supported platforms for memory profiling wasn't correctly checking
+   for more recent versions of OS X.
 
- * (Fix) Due to a serious resource leak we have ended support for versions of Phusion Passenger 
-   older than 2.1.1. Users of older versions are encouraged upgrade to a more recent version.
 
+### current version ###
 ## v3.5.0 ##
 
  * (Fix) RUM Stops Working After 3.4.2.1 Agent Upgrade
 
-   v3.4.2.1 introduced a bug that caused the browser monitor auto instrumentation
+   v3.4.2.1 introduced a bug that caused the browser monitor auto instrument
    (for RUM) default to be false. The correct value of true is now used
 
- * When the Ruby Agent detects Unicorn as the dispatcher it creates an INFO level log message
-   with additional information
+ * When the Ruby Agent detects Unicorn is the dispatcher create an INFO level log message
 
    To help customers using Unicorn, if the agent detects it (Unicorn) is being used as the 
    dispatcher an INFO level log message it created that includes a link to New Relic
    online doc that has additional steps that may be required to get performance data reporting.
 
- * (Fix) In version 3.4.2 of the Ruby Agent the server side value for Apdex T was disgregarded
+ * (Fix) In version 3.4.2 of the Ruby Agent the server side config value for Apdex T was 
+   disgregarded
 
-   With version 3.4.2 of the agent, the value set in the newrelic.yml file took precedence over the 
-   value set in the New Relic UI.  As of version 3.5.0 only the value for Apdex T set in the
-   New Relic UI will be used. Any setting in the yaml file will be ignored.
+   When server side config was being used with version 3.4.2 of the agent it ignored the Apdex T
+   value that was in the New Relic UI.  The server side value for Apdex T now always takes
+   precedence.
 
  * Improved Error Detection/Reporting capabilities for Rails 3 apps
 
@@ -39,26 +40,18 @@
 
  * The Ruby Agent now logs certain information it receives from the New Relic servers
 
-   After connecting to the New Relic servers the agent logs the New Relic URL
-   of the app it is reporting to.
+   When the agent connects to the New Relic servers it receives various bits of information
+   back. Different amounts of this information will appear in the agent log, depending on
+   the current log level setting.
 
  * GC profiling overhead for Ruby 1.9 reduced
 
-   For Ruby 1.9 the amount of time spent in GC profiling has been reduced.
-
- * Know issue with Ruby 1.8.7-p334, sqlite3-ruby 1.3.0 or older, and resque 1.23.0
-
-   The Ruby Agent will not work in conjunction with Ruby 1.8.7-p334, sqlite3-ruby 1.3.3 
-   or earlier, and resque 1.23.0. Your app will likely stop functioning. This is a known problem
-   with Ruby versions up to 1.8.7-p334. Upgrading to the last release of Ruby 1.8.7 
-   is recommended.  This issue has been present in every version of the agent we've tested 
-   going back for a year. 
-
+   For Ruby 1.9 the amount of time spent in GC profiling has been reduce.
 
 ### previous versions ###
 ## v3.4.2.1 ##
 
-* Fix issue when app_name is nil
+ * Fix issue when app_name is nil
 
   If the app_name setting ends up being nil an exception got generated and the application
   wouldn't run. This would notably occur when running a Heroku app locally without the
@@ -82,6 +75,7 @@
    The code that reads the configuration information and confirgures the agent
    got substantially reorganized, consolidated, simplified, and made more robust.
 
+
 ## v3.4.1 ##
 #### Bug Fixes ####
  * Fix edge case in RUM auto instrumentation where X-UA-Compatible meta tag is 
@@ -406,7 +400,7 @@ v2.10.1.
   * add 'multi_threaded' config option to indicate when the app is running
     multi-threaded, so we can disable some instrumentation
   * fix test failures in JRuby, REE
-  * improve Net::HTTP instrumentation so its more efficient and distinguishes calls
+  * improve Net::HTTP instrumentation so it's more efficient and distinguishes calls
     between web and non-web transactions.
   * database instrumentation notices all database commands in addition to the core commands
   * add support for textmate to dev mode

data/config.dot

@@ -0,0 +1,290 @@
+digraph AgentEnabled {
+  node[color=green]
+  "[agent_enabled]"
+  "[developer_mode]"
+  "[monitor_mode]"
+  "[slow_sql.explain_threshold]"
+  "[slow_sql.stack_trace_threshold]"
+  "[slow_sql.explain_enabled]"
+  "[slow_sql.enabled]"
+  "[slow_sql.record_sql]"
+  "[transaction_tracer.limit_segments]"
+  "[transaction_tracer.stack_trace_threshold]"
+  "[transaction_tracer.explain_threshold]"
+  "[transaction_tracer.explain_enabled]"
+  "[transaction_tracer.transaction_threshold]"
+  "[transaction_tracer.record_sql]"
+  "[transaction_tracer.random_sample]"
+  "[transaction_tracer.enabled]"
+  "[error_collector.capture_source]"
+  "[error_collector.enabled]"
+  "[error_collector.ignore_errors]"
+  "[browser_monitoring.auto_instrument]"
+  "[license_key]"
+  "[ssl]"
+  "[verify_certificate]"
+  "[api_host]"
+  "[api_port]"
+  "[proxy_host]"
+  "[proxy_port]"
+  "[proxy_user]"
+  "[proxy_pass]"
+  "[host]"
+  "[port]"
+  "[timeout]"
+  "[log_level]"
+  "[apdex_t]"
+  "[capture_params]"
+  "[app_name]"
+  "[multi_homed]"
+  "[disable_samplers]"
+  "[log_file_name]"
+  "[log_file_path]"
+  "[dispatcher]"
+  "[force_send]"
+  "[disable_mobile_headers]"
+  "[textmate]"
+  "[post_size_limit]"
+  "[sync_startup]"
+  "[send_data_on_exit]"
+  "[high_security]"
+  "[validate_seed]"
+  "[validate_token]"
+  "[disable_backtrace_cleanup]"
+  "[disable_activerecord_instrumentation]"
+  "[disable_dj]"
+  "[capture_memcache_keys]"
+  "[disable_memcache_instrumentation]"
+  "[disable_view_instrumentation]"
+  "[disable_resque]"
+
+  node[shape=box,color=orange]
+  "Control#init_plugin"
+  "Control#api_server"
+  "Control#proxy_server"
+  "Control#server_from_host"
+  "Control#http_connection"
+  "Control#set_log_level!"
+  "Control#log_path"
+  "Control#log_to_stdout?"
+  "Control#convert_to_ip_address"
+  "Control#server"
+  "Control#setup_log"
+  "Control#should_log?"
+  "Control#log!"
+
+  node[color=green]
+  "Config#app_names"
+
+  node[color=black]
+  "Agent#initialize"
+  "Agent#after_fork"
+  "Agent#disabled?"
+  "Agent#shutdown"
+  "Agent#using_forking_dispatcher?"
+  "Agent#has_license_key?"
+  "Agent#correct_license_length"
+  "Agent#apdex_f"
+  "Agent#check_config_and_start_agent"
+  "Agent#install_exit_handler"
+  "Agent#log_app_names"
+  "Agent#connect_settings"
+  "Agent#log_seed_token"
+  "Agent#log_error"
+  "Agent#monitoring?"
+  "Agent#check_trasaction_sampler_status"
+  "Agent#check_sql_sampler_status"
+  "Agent#config_transaction_tracer"
+  "Agent#set_sql_recording!"
+  "Agent#already_started?"
+  "Agent#log_connection"
+  "Agent#manual_start"
+
+  "MethodTracer#remove_method_tracer"
+
+  "ErrorCollector#initialize"
+  "ErrorCollector#request_params_from_opts"
+
+  "ControllerInstrumentation#perform_action_with_newrelic_trace"
+
+  "NewRelicService#initialize"
+  "NewRelicService#check_post_size"
+  "NewRelicService#connect"
+  "NewRelicService#send_request"
+
+  "SqlSampler#configure!"
+
+  "TransactionSampler#configure!"
+  "TransactionSampler#notice_push_scope"
+  "TransactionSampler#capture_segment_trace"
+  "TransactionSampler#store_segment_for_developer_mode"
+
+  "NoticedError#initialize"
+
+  "BeaconConfiguration#license_bytes"
+
+  "ActiveRecord#depends_on"
+  "DelayedJobInstrumentation#depends_on"
+  "Memcache#memcache_key_snippet"
+  "Memcache#depends_on"
+  "Rails::ActionController#depends_on"
+  "Rails3::ActionController#depends_on"
+  "Resque#depends_on"
+
+  "DelayedJobSampler#initialize"
+  "DelayedJobInjection#depends_on"
+
+  "MetricFrame.update_apdex"
+
+  "TranactionInfo#force_persist_sample?"
+  "TranactionInfo#include_guid?"
+
+  "TransactionSampleBuilder#initialize"
+  "TransactionSampleBuilder#set_transaction_info"
+
+  "Rails#install_browser_monitoring"
+  "Rails#log!"
+  "Rails3#log!"
+
+  "CollectionHelper#strip_nr_from_backtrace"
+
+  "Deployments#initialize"
+
+#######
+
+  "Control#init_plugin" -> "[agent_enabled]"
+  "Control#init_plugin" -> "Control#setup_log"
+  "Control#init_plugin" -> "[disable_samplers]"
+  "Control#should_log?" -> "[agent_enabled]" 
+  "Control#api_server" -> "[api_host]"
+  "Control#api_server" -> "[api_port]"
+  "Control#proxy_server" -> "[proxy_host]"
+  "Control#proxy_server" -> "[proxy_port]"
+  "Control#proxy_server" -> "[proxy_user]"
+  "Control#proxy_server" -> "[proxy_pass]"
+  "Control#server_from_host" -> "[host]"
+  "Control#server_from_host" -> "[port]"
+  "Control#server_from_host" -> "Control#convert_to_ip_address"
+  "Control#http_connection" -> "[ssl]"
+  "Control#http_connection" -> "[verify_certificate]"
+  "Control#http_connection" -> "Control#proxy_server"
+  "Control#set_log_level!" -> "[log_level]"
+  "Control#log_path" -> "[log_file_path]"
+  "Control#log_path" -> "Control#log_to_stdout?"
+  "Control#log_to_stdout?" -> "[log_file_path]"
+  "Control#convert_to_ip_address" -> "[ssl]"
+  "Control#convert_to_ip_address" -> "[verify_certificate]"
+  "Control#server" -> "Control#server_from_host"
+  "Control#setup_log" -> "Control#set_log_level!"
+  "Control#setup_log" -> "Control#log_path"
+  "Control#setup_log" -> "Control#log_to_stdout?"
+  "Control#setup_log" -> "[log_file_name]"
+  "Control#log!" -> "Control#should_log?"
+  "Control#log!" -> "Control#log_path"
+
+  "Agent#initialize" -> "[monitor_mode]"
+  "Agent#after_fork" -> "[agent_enabled]"
+  "Agent#after_fork" -> "[monitor_mode]"
+  "Agent#disabled?" -> "[agent_enabled]"
+  "Agent#shutdown" -> "[force_send]"
+  "Agent#shutdown" -> "[dispatcher]"
+  "Agent#using_forking_dispatcher?" -> "[dispatcher]"
+  "Agent#has_license_key?" -> "[license_key]"
+  "Agent#correct_license_length" -> "[license_key]"
+  "Agent#apdex_f" -> "[apdex_t]"
+  "Agent#check_config_and_start_agent" -> "[sync_startup]"
+  "Agent#install_exit_handler" -> "[send_data_on_exit]"
+  "Agent#log_app_names" -> "Config#app_names"
+  "Agent#connect_settings" -> "Config#app_names"
+  "Agent#log_seed_token" -> "[validate_seed]"
+  "Agent#log_seed_token" -> "[validate_token]"
+  "Agent#validate_settings" -> "[validate_seed]"
+  "Agent#validate_settings" -> "[validate_token]"
+  "Agent#log_error" -> "Control#server"
+  "Agent#monitoring?" -> "[monitor_mode]"
+  "Agent#check_trasaction_sampler_status" -> "[developer_mode]"
+  "Agent#check_sql_sampler_status" -> "[slow_sql.enabled]"
+  "Agent#check_sql_sampler_status" -> "[slow_sql.record_sql]"
+  "Agent#check_sql_sampler_status" -> "[transaction_tracer.enabled]"
+  "Agent#config_transaction_tracer" -> "[transaction_tracer.enabled]"
+  "Agent#config_transaction_tracer" -> "[transaction_tracer.random_sample]"
+  "Agent#config_transaction_tracer" -> "[transaction_tracer.transaction_threshold]"
+  "Agent#set_sql_recording!" -> "[transaction_tracer.record_sql]"
+  "Agent#already_started?" -> "Control#log!"
+  "Agent#log_connection" -> "Control#log!"
+  "Agent#manual_start" -> "Control#init_plugin"
+
+  "MethodTracer#remove_method_tracer" -> "[agent_enabled]"
+
+  "Rails#init_config" -> "[agent_enabled]"
+  "Rails#init_config" -> "[developer_mode]"
+
+  "ErrorCollector#initialize" -> "[error_collector.enabled]"
+  "ErrorCollector#initialize" -> "[error_collector.capture_source]"
+  "ErrorCollector#initialize" -> "[error_collector.ignore_errors]"
+  "ErrorCollector#request_params_from_opts" -> "[capture_params]"
+
+  "ControllerInstrumentation#perform_action_with_newrelic_trace" -> "[disable_mobile_headers]"
+
+  "NewRelicService#initialize" -> "[timeout]"
+  "NewRelicService#initialize" -> "[license_key]"
+  "NewRelicService#initialize" -> "Control#server"
+  "NewRelicService#check_post_size" -> "[post_size_limit]"
+  "NewRelicService#connect" -> "Control#server_from_host"
+  "NewRelicService#send_request" -> "Control#http_connection"
+
+  "SqlSampler#configure!" -> "[slow_sql.explain_threshold]"
+  "SqlSampler#configure!" -> "[slow_sql.explain_enabled]"
+  "SqlSampler#configure!" -> "[slow_sql.stack_trace_threshold]"
+  "SqlSampler#configure!" -> "[slow_sql.enabled]"
+
+  "TransactionSampler#configure!" -> "[transaction_tracer.limit_segments]"
+  "TransactionSampler#configure!" -> "[transaction_tracer.stack_trace_threshold]"
+  "TransactionSampler#configure!" -> "[transaction_tracer.explain_threshold]"
+  "TransactionSampler#configure!" -> "[transaction_tracer.explain_enabled]"
+  "TransactionSampler#configure!" -> "[transaction_tracer.transaction_threshold]"
+  "TransactionSampler#configure!" -> "[developer_mode]"
+  "TransactionSampler#notice_push_scope" -> "[developer_mode]"
+  "TransactionSampler#capture_segment_trace" -> "[developer_mode]"
+  "TransactionSampler#store_segment_for_developer_mode" -> "[developer_mode]"
+
+  "NoticedError#initialize" -> "[high_security]"
+
+  "BeaconConfiguration#license_bytes" -> "[license_key]"
+
+  "ActiveRecord#depends_on" -> "[disable_activerecord_instrumentation]"
+
+  "DelayedJobInstrumentation#depends_on" -> "[disable_dj]"
+
+  "Memcache#memcache_key_snippet" -> "[capture_memcache_keys]"
+  "Memcache#depends_on" -> "[disable_memcache_instrumentation]"
+
+  "Rails::ActionController#depends_on" -> "[disable_view_instrumentation]"
+  "Rails3::ActionController#depends_on" -> "[disable_view_instrumentation]"
+  "Resque#depends_on" -> "[disable_resque]"
+
+  "DelayedJobSampler#initialize" -> "[disable_dj]"
+  "DelayedJobInjection#depends_on" -> "[disable_dj]"
+  "DelayedJobInjection#executes" -> "Control#init_plugin"
+
+  "MetricFrame.update_apdex" -> "[apdex_t]"
+
+  "TranactionInfo#force_persist_sample?" -> "[apdex_t]"
+  "TranactionInfo#include_guid?" -> "[apdex_t]"
+
+  "TransactionSampleBuilder#initialize" -> "[transaction_tracer.limit_segments]"
+  "TransactionSampleBuilder#set_transaction_info" -> "[capture_params]"
+
+  "Rails#install_browser_monitoring" -> "[browser_monitoring.auto_instrument]"
+  "Rails#log!" -> "Control#should_log?"
+  "Rails3#log!" -> "Control#should_log?"
+
+  "CollectionHelper#strip_nr_from_backtrace" -> "[disable_backtrace_cleanup]"
+
+  "Deployments#initialize" -> "Config#app_names"
+  "Deployments#run" -> "Control#http_connection"
+  "Deployments#run" -> "[license_key]"
+  "Deployments#run" -> "Control#api_server"
+
+  "Config#app_names" -> "[app_name]"
+}

data/lib/new_relic/agent.rb

@@ -77,6 +77,7 @@ module NewRelic
     require 'new_relic/agent'
     require 'new_relic/agent/chained_call'
     require 'new_relic/agent/browser_monitoring'
+    require 'new_relic/agent/cross_process_monitoring'
     require 'new_relic/agent/agent'
     require 'new_relic/agent/shim_agent'
     require 'new_relic/agent/method_tracer'
@@ -305,7 +306,8 @@ module NewRelic
 
     # Check to see if we are capturing metrics currently on this thread.
     def is_execution_traced?
-      Thread.current[:newrelic_untraced].nil? || Thread.current[:newrelic_untraced].last != false
+      untraced = Thread.current[:newrelic_untraced]
+      untraced.nil? || untraced.last != false
     end
     
     # helper method to check the thread local to determine whether the

data/lib/new_relic/agent/agent.rb

@@ -85,8 +85,17 @@ module NewRelic
         # handles things like static setup of the header for inclusion
         # into pages
         attr_reader :beacon_configuration
+        attr_reader :cross_process_id
         attr_accessor :service
 
+        def cross_process_encoding_bytes
+          if @cross_process_encoding_key && @cross_process_encoding_bytes.nil?
+            @cross_process_encoding_bytes = []
+            @cross_process_encoding_key.each_byte {|byte| @cross_process_encoding_bytes << byte}
+          end
+          @cross_process_encoding_bytes
+        end
+
         # Returns the length of the unsent errors array, if it exists,
         # otherwise nil
         def unsent_errors_size
@@ -300,7 +309,7 @@ module NewRelic
         end
 
         # Herein lies the corpse of the former 'start' method. May
-        # it's unmatched flog score rest in pieces.
+        # its unmatched flog score rest in pieces.
         module Start
           # Check whether we have already started, which is an error condition
           def already_started?
@@ -754,6 +763,9 @@ module NewRelic
             Agent.config.apply_config(server_config, 1)
             log_connection!(config_data) if @service
 
+            @cross_process_id = Agent.config[:cross_process_id]
+            @cross_process_encoding_key = Agent.config[:encoding_key]
+
             @beacon_configuration = BeaconConfiguration.new
           end
 
@@ -886,9 +898,22 @@ module NewRelic
 
           @unsent_timeslice_data ||= {}
           @unsent_timeslice_data = @stats_engine.harvest_timeslice_data(@unsent_timeslice_data, @metric_ids)
+
+          warn_if_no_unicorn_metrics
+
           @unsent_timeslice_data
         end
 
+        # this is just a support band-aid until we get a chance to
+        # overhaul the Unicorn instrumentation properly
+        def warn_if_no_unicorn_metrics
+          if Agent.config[:dispatcher].to_s == 'unicorn'
+            if @stats_engine.get_stats_no_scope('HttpDispatcher').call_count == 0
+              NewRelic::Control.instance.log.warn('Unicorn detected but no metric send, please see https://newrelic.com/docs/troubleshooting/im-using-unicorn-and-i-dont-see-any-data')
+            end
+          end
+        end
+
         # takes an array of arrays of spec and id, adds it into the
         # metric cache so we can save the collector some work by
         # sending integers instead of strings
@@ -1061,6 +1086,7 @@ module NewRelic
       extend ClassMethods
       include InstanceMethods
       include BrowserMonitoring
+      include CrossProcessMonitoring
     end
   end
 end

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

@@ -35,7 +35,6 @@ module NewRelic
         :send_environment_info  => true,
         :start_channel_listener => false,
         :data_report_period     => 60,
-        :keep_retrying          => true,
 
         :log_file_name => 'newrelic_agent.log',
         :log_file_path => 'log/',

data/lib/new_relic/agent/cross_process_monitoring.rb

@@ -0,0 +1,93 @@
+require 'base64'
+module NewRelic
+  module Agent
+    module CrossProcessMonitoring
+      #start copied from BrowserMonitoring
+
+      class DummyMetricFrame
+        def initialize
+          @attributes = {}
+        end
+
+        def user_attributes
+          @attributes
+        end
+
+        def queue_time
+          0.0
+        end
+      end
+
+      @@dummy_metric_frame = DummyMetricFrame.new
+
+      #end
+
+      module_function
+
+      #start copy from BrowserMonitoring
+
+      def browser_monitoring_transaction_name
+        NewRelic::Agent::TransactionInfo.get.transaction_name
+      end
+
+      def browser_monitoring_queue_time_in_seconds
+        clamp_to_positive((current_metric_frame.queue_time.to_f).round)
+      end
+
+      def browser_monitoring_app_time_in_seconds
+        clamp_to_positive(((Time.now - browser_monitoring_start_time).to_f).round)
+      end
+
+      def current_metric_frame
+        Thread.current[:last_metric_frame] || @@dummy_metric_frame
+      end
+
+      def clamp_to_positive(value)
+        return 0.0 if value < 0
+        value
+      end
+
+      def browser_monitoring_start_time
+        NewRelic::Agent::TransactionInfo.get.start_time
+      end
+
+      # end copy
+
+      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 insert_cross_process_response_header(request, response)
+
+        if NewRelic::Agent.instance.cross_process_id && (id = cross_process_id_from_request(request))
+          content_length = -1
+          # FIXME the transaction name might not be properly encoded.  use a json generator
+          payload = %[["#{NewRelic::Agent.instance.cross_process_id}","#{browser_monitoring_transaction_name}",#{browser_monitoring_queue_time_in_seconds},#{browser_monitoring_app_time_in_seconds},#{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 cross_process_id_from_request(request)
+        headers = ['X-NewRelic-ID', 'HTTP_X_NEWRELIC_ID', 'X_NEWRELIC_ID']
+        headers.each do |header|
+          id = request.env[header]
+          return id if id
+        end
+        nil
+      end
+
+      private
+    end
+  end
+end

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

@@ -269,9 +269,11 @@ 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
+                  NewRelic::Agent::CrossProcessMonitoring.insert_cross_process_response_header(request, response)
                 end
                 result
               rescue => e

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

@@ -180,14 +180,6 @@ module NewRelic
   module Agent
     module Instrumentation
       module DataMapperInstrumentation
-
-        def self.included(klass)
-          klass.class_eval do
-            alias_method :log_without_newrelic_instrumentation, :log
-            alias_method :log, :log_with_newrelic_instrumentation
-          end
-        end
-
         # Unlike in AR, log is called in DM after the query actually ran,
         # complete with metrics.  Since DO has already calculated the
         # duration, there's nothing more to measure, so just record and log.
@@ -195,7 +187,7 @@ module NewRelic
         # We rely on the assumption that all possible entry points have been
         # hooked with tracers, ensuring that notice_sql attaches this SQL to
         # the proper call scope.
-        def log_with_newrelic_instrumentation(msg)
+        def log(msg)
           return unless NewRelic::Agent.is_execution_traced?
           return unless operation = case NewRelic::Helper.correctly_encoded(msg.query)
                                     when /^\s*select/i          then 'find'
@@ -216,7 +208,7 @@ module NewRelic
             NewRelic::Agent.instance.stats_engine.get_stats_no_scope(metric).trace_call(duration)
           end
         ensure
-          log_without_newrelic_instrumentation(msg)
+          super
         end
 
       end # DataMapperInstrumentation

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

@@ -27,11 +27,21 @@ module NewRelic
         attr_accessor :request
 
 
+        @@check_server_connection = false
+        def self.check_server_connection=(value)
+          @@check_server_connection = value
+        end
         # Return the currently active metric frame, or nil.  Call with +true+
         # to create a new metric frame if one is not already on the thread.
         def self.current(create_if_empty=nil)
           f = Thread.current[:newrelic_metric_frame]
           return f if f || !create_if_empty
+
+          # Reconnect to the server if necessary.  This is only done
+          # for old versions of passenger that don't implement an explicit after_fork
+          # event.
+          agent.after_fork(:keep_retrying => false) if @@check_server_connection
+
           Thread.current[:newrelic_metric_frame] = new
         end
 
@@ -54,8 +64,8 @@ module NewRelic
         if defined? JRuby
           begin
             require 'java'
-            include_class 'java.lang.management.ManagementFactory'
-            include_class 'com.sun.management.OperatingSystemMXBean'
+            java_import 'java.lang.management.ManagementFactory'
+            java_import 'com.sun.management.OperatingSystemMXBean'
             @@java_classes_loaded = true
           rescue => e
           end

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

@@ -1,6 +1,6 @@
 DependencyDetection.defer do
   @name = :passenger
-
+  
   depends_on do
     defined?(::PhusionPassenger)
   end
@@ -21,3 +21,17 @@ DependencyDetection.defer do
     end
   end
 end
+
+DependencyDetection.defer do
+  depends_on do
+    defined?(::Passenger) && defined?(::Passenger::AbstractServer)
+  end
+
+  executes do
+    ## We're on an older version of passenger
+    ## FIXME: This warning is printing on current version of passenger
+    # NewRelic::Agent.logger.warn "An older version of Phusion Passenger has been detected.  We recommend using at least release 2.1.1."
+
+    NewRelic::Agent::Instrumentation::MetricFrame.check_server_connection = true
+  end
+end

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

@@ -7,7 +7,7 @@ module NewRelic
       #
       # New Relic will instrument a #call method as if it were a controller
       # action, collecting transaction traces and errors.  The middleware will
-      # be identified only by it's class, so if you want to instrument multiple
+      # be identified only by its class, so if you want to instrument multiple
       # actions in a middleware, you need to use
       # NewRelic::Agent::Instrumentation::ControllerInstrumentation::ClassMethods#add_transaction_tracer
       #

data/lib/new_relic/agent/samplers/memory_sampler.rb

@@ -22,7 +22,7 @@ module NewRelic
             end
           elsif platform =~ /darwin9/ # 10.5
             @sampler = ShellPS.new("ps -o rsz")
-          elsif platform =~ /darwin1[01]/ # 10.6 & 10.7
+          elsif platform =~ /darwin1\d+/ # >= 10.6
             @sampler = ShellPS.new("ps -o rss")
           elsif platform =~ /freebsd/
             @sampler = ShellPS.new("ps -o rss")
@@ -35,7 +35,7 @@ module NewRelic
         end
 
         def self.supported_on_this_platform?
-          defined?(JRuby) or platform =~ /linux|darwin9|darwin10|freebsd|solaris/
+          defined?(JRuby) or platform =~ /linux|darwin|freebsd|solaris/
         end
 
         def self.platform

data/lib/new_relic/agent/stats_engine/gc_profiler.rb

@@ -7,6 +7,7 @@ module NewRelic
           @profiler = RailsBench.new if RailsBench.enabled?
           @profiler = Ruby19.new if Ruby19.enabled?
           @profiler = Rubinius.new if Rubinius.enabled?
+          @profiler = RubiniusAgent.new if RubiniusAgent.enabled?
         end
 
         def self.capture
@@ -97,6 +98,20 @@ module NewRelic
         end
 
         class Rubinius < Profiler
+          def self.enabled?
+            defined?(::Rubinius) && defined?(::Rubinius::GC) && ::Rubinius::GC.respond_to?(:count)
+          end
+
+          def call_time
+            ::Rubinius::GC.time * 1000
+          end
+
+          def call_count
+            ::Rubinius::GC.count
+          end
+        end
+
+        class RubiniusAgent < Profiler
           def self.enabled?
             if NewRelic::LanguageSupport.using_engine?('rbx')
               require 'rubinius/agent'

data/lib/new_relic/agent/transaction_sampler.rb

@@ -213,7 +213,7 @@ module NewRelic
         end
       end
 
-      # Checks to see if the old sample exists, or if it's duration is
+      # Checks to see if the old sample exists, or if its duration is
       # less than the new sample
       def slowest_sample?(old_sample, new_sample)
         old_sample.nil? || (new_sample.duration > old_sample.duration)

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

@@ -45,8 +45,8 @@ module NewRelic
           end
           if !Agent.config[:agent_enabled]
             # Might not be running if it does not think mongrel, thin, passenger, etc
-            # is running, if it things it's a rake task, or if the agent_enabled is false.
-            log! "New Relic Agent not running."
+            # is running, if it thinks it's a rake task, or if the agent_enabled is false.
+            log!("New Relic Agent not running.", :debug)
           else
             log! "Starting the New Relic Agent."
             install_developer_mode rails_config if Agent.config[:developer_mode]
@@ -158,9 +158,11 @@ module NewRelic
         def install_shim
           super
           require 'new_relic/agent/instrumentation/controller_instrumentation'
-          ::ActionController::Base.class_eval {
-            include NewRelic::Agent::Instrumentation::ControllerInstrumentation::Shim
-          }
+          if ActiveSupport.respond_to?(:on_load) # rails 3+
+            ActiveSupport.on_load(:action_controller) { include NewRelic::Agent::Instrumentation::ControllerInstrumentation::Shim }
+          else
+            ActionController::Base.class_eval { include NewRelic::Agent::Instrumentation::ControllerInstrumentation::Shim }
+          end
         end
 
       end

data/lib/new_relic/local_environment.rb

@@ -14,6 +14,7 @@ module NewRelic
   #
   # NewRelic::LocalEnvironment should be accessed through NewRelic::Control#env (via the NewRelic::Control singleton).
   class LocalEnvironment
+    
     # mongrel, thin, webrick, or possibly nil
     attr_accessor :dispatcher
     # used to distinguish instances of a dispatcher from each other, may be nil
@@ -22,7 +23,7 @@ module NewRelic
     attr_accessor :framework
     # The number of cpus, if detected, or nil - many platforms do not
     # support this :(
-    attr_reader :processors
+    attr_reader :processors 
     alias environment dispatcher
 
     def initialize
@@ -396,7 +397,7 @@ module NewRelic
     end
 
     def check_for_passenger
-      if defined?(::PhusionPassenger)
+      if (defined?(::Passenger) && defined?(::Passenger::AbstractServer)) || defined?(::PhusionPassenger)
         @dispatcher = :passenger
       end
     end

data/lib/new_relic/rack/browser_monitoring.rb

@@ -59,8 +59,6 @@ module NewRelic::Rack
           # otherwise put the header right above body start
           body_start
         end
-        # otherwise put the header right above body start
-        head_pos ||= body_start
 
         # check that head_pos is less than body close.  If it's not something
         # is really weird and we should punt.

data/lib/new_relic/version.rb

@@ -3,8 +3,8 @@ module NewRelic
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 5
-    TINY  = 0
-    BUILD = 1 # Set to nil for a release, 'beta1', 'alpha', etc for prerelease builds
+    TINY  = 1
+    BUILD = 'alpha' # Set to nil for a release, 'beta1', 'alpha', etc for prerelease builds
     STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
   end
 

data/newrelic_rpm.gemspec

@@ -4,20 +4,15 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{newrelic_rpm}
-  s.version = "3.5.0.1"
+  s.name = "newrelic_rpm"
+  s.version = "3.5.1.alpha"
 
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bill Kayser", "Jon Guymon", "Justin George", "Darin Swanson", "Rob Saul"]
-  s.date = %q{2012-10-22}
-  s.description = %q{New Relic is a performance management system, developed by New Relic,
-Inc (http://www.newrelic.com).  New Relic provides you with deep
-information about the performance of your web application as it runs
-in production. The New Relic Ruby Agent is dual-purposed as a either a
-Gem or plugin, hosted on
-http://github.com/newrelic/rpm/
-}
-  s.email = %q{support@newrelic.com}
-  s.executables = ["newrelic", "mongrel_rpm", "newrelic_cmd"]
+  s.date = "2012-10-11"
+  s.description = "New Relic is a performance management system, developed by New Relic,\nInc (http://www.newrelic.com).  New Relic provides you with deep\ninformation about the performance of your web application as it runs\nin production. The New Relic Ruby Agent is dual-purposed as a either a\nGem or plugin, hosted on\nhttp://github.com/newrelic/rpm/\n"
+  s.email = "support@newrelic.com"
+  s.executables = ["mongrel_rpm", "newrelic_cmd", "newrelic"]
   s.extra_rdoc_files = [
     "CHANGELOG",
     "LICENSE",
@@ -34,6 +29,7 @@ http://github.com/newrelic/rpm/
     "cert/cacert.pem",
     "cert/oldsite.pem",
     "cert/site.pem",
+    "config.dot",
     "install.rb",
     "lib/conditional_vendored_dependency_detection.rb",
     "lib/conditional_vendored_metric_parser.rb",
@@ -49,6 +45,7 @@ http://github.com/newrelic/rpm/
     "lib/new_relic/agent/configuration/manager.rb",
     "lib/new_relic/agent/configuration/server_source.rb",
     "lib/new_relic/agent/configuration/yaml_source.rb",
+    "lib/new_relic/agent/cross_process_monitoring.rb",
     "lib/new_relic/agent/database.rb",
     "lib/new_relic/agent/error_collector.rb",
     "lib/new_relic/agent/instrumentation.rb",
@@ -312,30 +309,11 @@ http://github.com/newrelic/rpm/
     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/web_service.rb",
     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/web_transaction.rb"
   ]
-  s.homepage = %q{http://www.github.com/newrelic/rpm}
-  s.post_install_message = %q{
-PLEASE NOTE:
-
-Developer Mode is now a Rack middleware.
-
-Developer Mode is no longer available in Rails 2.1 and earlier.
-However, starting in version 2.12 you can use Developer Mode in any
-Rack based framework, in addition to Rails.  To install developer mode
-in a non-Rails application, just add NewRelic::Rack::DeveloperMode to
-your middleware stack.
-
-If you are using JRuby, we recommend using at least version 1.4 or 
-later because of issues with the implementation of the timeout library.
-
-Refer to the README.md file for more information.
-
-Please see http://github.com/newrelic/rpm/blob/master/CHANGELOG
-for a complete description of the features and enhancements available
-in version 3.5 of the Ruby Agent.
-  
-}
+  s.homepage = "http://www.github.com/newrelic/rpm"
+  s.post_install_message = "\nPLEASE NOTE:\n\nDeveloper Mode is now a Rack middleware.\n\nDeveloper Mode is no longer available in Rails 2.1 and earlier.\nHowever, starting in version 2.12 you can use Developer Mode in any\nRack based framework, in addition to Rails.  To install developer mode\nin a non-Rails application, just add NewRelic::Rack::DeveloperMode to\nyour middleware stack.\n\nIf you are using JRuby, we recommend using at least version 1.4 or \nlater because of issues with the implementation of the timeout library.\n\nRefer to the README.md file for more information.\n\nPlease see http://github.com/newrelic/rpm/blob/master/CHANGELOG\nfor a complete description of the features and enhancements available\nin version 3.5 of the Ruby Agent.\n  \n"
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "New Relic Ruby Agent"]
   s.require_paths = ["lib"]
+  s.rubygems_version = "1.6.2"
   s.summary = "New Relic Ruby Agent"
 
   if s.respond_to? :specification_version then

data/test/new_relic/agent/agent_test.rb

@@ -76,6 +76,20 @@ module NewRelic
         end
       end
 
+      def test_harvest_timeslice_data_should_not_warn_normally
+        NewRelic::Control.instance.log.expects(:warn).never
+        @agent.stats_engine.get_stats_no_scope('HttpDispatcher').record_data_point(1.0)
+        @agent.send(:harvest_timeslice_data)
+      end
+
+      def test_harvest_timeslice_data_should_warn_if_unicorn_and_no_web_metrics
+        NewRelic::Control.instance.log.expects(:warn) \
+          .with('Unicorn detected but no metric send, please see https://newrelic.com/docs/troubleshooting/im-using-unicorn-and-i-dont-see-any-data')
+        with_config(:dispatcher => 'unicorn') do
+          @agent.send(:harvest_timeslice_data)
+        end
+      end
+
       def test_harvest_errors
         assert_equal([], @agent.send(:harvest_errors), 'should return errors')
       end

data/test/new_relic/local_environment_test.rb

@@ -28,7 +28,8 @@ class NewRelic::LocalEnvironmentTest < Test::Unit::TestCase
 
   def test_passenger
     class << self
-      module ::PhusionPassenger
+      module ::Passenger
+        const_set "AbstractServer", 0
       end
     end
     e = NewRelic::LocalEnvironment.new
@@ -41,9 +42,9 @@ class NewRelic::LocalEnvironmentTest < Test::Unit::TestCase
       assert_nil e.dispatcher_instance_id
     end
 
-    Object.send(:remove_const, :PhusionPassenger)
+    ::Passenger.class_eval { remove_const :AbstractServer }
   end
-
+  
   def test_snapshot
     e = NewRelic::LocalEnvironment.new
     s = e.snapshot

data/test/script/ci.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Script to run test suites in CI or in development mode.  This script handles
-# checking out test dependencies (currently rpm_test_app and it's dependencies)
+# checking out test dependencies (currently rpm_test_app and its dependencies)
 # and executing them.
 #
 # It relies on 2 environment variables:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: newrelic_rpm
 version: !ruby/object:Gem::Version 
-  hash: 85
-  prerelease: 
+  hash: 2096628268
+  prerelease: 6
   segments: 
   - 3
   - 5
-  - 0
   - 1
-  version: 3.5.0.1
+  - alpha
+  version: 3.5.1.alpha
 platform: ruby
 authors: 
 - Bill Kayser
@@ -20,7 +20,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-22 00:00:00 -07:00
+date: 2012-10-11 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -75,9 +75,9 @@ description: |
 
 email: support@newrelic.com
 executables: 
-- newrelic
 - mongrel_rpm
 - newrelic_cmd
+- newrelic
 extensions: []
 
 extra_rdoc_files: 
@@ -95,6 +95,7 @@ files:
 - cert/cacert.pem
 - cert/oldsite.pem
 - cert/site.pem
+- config.dot
 - install.rb
 - lib/conditional_vendored_dependency_detection.rb
 - lib/conditional_vendored_metric_parser.rb
@@ -110,6 +111,7 @@ files:
 - lib/new_relic/agent/configuration/manager.rb
 - lib/new_relic/agent/configuration/server_source.rb
 - lib/new_relic/agent/configuration/yaml_source.rb
+- lib/new_relic/agent/cross_process_monitoring.rb
 - lib/new_relic/agent/database.rb
 - lib/new_relic/agent/error_collector.rb
 - lib/new_relic/agent/instrumentation.rb
@@ -417,12 +419,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: