newrelic_rpm 3.5.1.alpha → 3.5.1.beta1

data/CHANGELOG

@@ -2,34 +2,69 @@
 # New Relic Ruby Agent Release Notes #
 
 ### Next Up ###
+## v3.5.2 ##
+
+### current version ###
 ## v3.5.1 ##
 
- * Enabling Memory Profiling on Lion and Moutain Lion
+ * Enabling Memory Profiling on Lion and Mountain Lion
 
    The agent's list of supported platforms for memory profiling wasn't correctly checking
    for more recent versions of OS X.
 
+ * Fixed an arity issue encountered when calling newrelic_notice_error from Rails applications.
+
+ * End user queue time was not being properly reported, works properly now.
+
+ * Better handling of a thread safety issue.  
+
+   Some issues may remain, which we are working to address, but they should be gracefully handled 
+   now, rather than crashing the running app.
+
+ * Use "java_import" rather than "include_class" when require Java Jars into a JRuby app.
+   
+   Thanks to Jan Habermann for the pull request
+
+ * Replaced alias_method mechanism with super call in DataMapper instrumentation.
+
+   Thanks to Michael Rykov for the pull request
+
+ * Fixed the Rubinius GC profiler.
+
+   Thanks to Dirkjan Bussink
+
+ * Use ActiveSupport.on_load to load controller instrumentation Rails 3.
+
+   Thanks to Jonathan del Strother
+
+ * Reduce the number of thread local reference in a particular high traffic method
+
+   Thanks to Jeremy Kemper
+
+## v3.5.0.1 ##
+
+ * (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 instrument
+   v3.4.2.1 introduced a bug that caused the browser monitor auto instrumentation
    (for RUM) default to be false. The correct value of true is now used
 
- * When the Ruby Agent detects Unicorn is the dispatcher create an INFO level log message
+ * When the Ruby Agent detects Unicorn as the dispatcher it creates an INFO level log message
+   with additional information
 
    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 config value for Apdex T was 
-   disgregarded
+ * (Fix) In version 3.4.2 of the Ruby Agent the server side value for Apdex T was disgregarded
 
-   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.
+   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.
 
  * Improved Error Detection/Reporting capabilities for Rails 3 apps
 
@@ -40,18 +75,26 @@
 
  * The Ruby Agent now logs certain information it receives from the New Relic servers
 
-   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.
+   After connecting to the New Relic servers the agent logs the New Relic URL
+   of the app it is reporting to.
 
  * GC profiling overhead for Ruby 1.9 reduced
 
-   For Ruby 1.9 the amount of time spent in GC profiling has been reduce.
+   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. 
+
 
 ### 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
@@ -75,7 +118,6 @@
    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 

data/lib/new_relic/agent/agent.rb

@@ -85,17 +85,8 @@ 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
@@ -763,9 +754,6 @@ 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
 
@@ -898,22 +886,9 @@ 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
@@ -1038,6 +1013,7 @@ module NewRelic
         end
 
         def transmit_data
+          now = Time.now
           log.debug "Sending data to New Relic Service"
           harvest_and_send_errors
           harvest_and_send_slowest_sample
@@ -1053,6 +1029,8 @@ module NewRelic
           raise e
         ensure
           NewRelic::Agent::Database.close_connections unless forked?
+          @stats_engine.get_stats_no_scope('Supportability/Harvest') \
+            .record_data_point((Time.now - now).to_f)
         end
 
         # This method contacts the server to send remaining data and
@@ -1086,7 +1064,6 @@ module NewRelic
       extend ClassMethods
       include InstanceMethods
       include BrowserMonitoring
-      include CrossProcessMonitoring
     end
   end
 end

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

@@ -35,6 +35,7 @@ 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/error_collector.rb

@@ -25,15 +25,22 @@ module NewRelic
         @ignore = {}
         @capture_source = Agent.config[:'error_collector.capture_source']
 
-        ignore_errors = Agent.config[:'error_collector.ignore_errors']
-        ignore_errors = ignore_errors.split(",") if ignore_errors.is_a? String
-        ignore_errors.each { |error| error.strip! }
-        ignore(ignore_errors)
+        initialize_ignored_errors(Agent.config[:'error_collector.ignore_errors'])
         @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."
         end
+        Agent.config.register_callback(:'error_collector.ignore_errors') do |ignore_errors|
+          initialize_ignored_errors(ignore_errors)
+        end
+      end
+      
+      def initialize_ignored_errors(ignore_errors)
+        @ignore.clear
+        ignore_errors = ignore_errors.split(",") if ignore_errors.is_a? String
+        ignore_errors.each { |error| error.strip! }
+        ignore(ignore_errors)
       end
 
       def enabled?

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

@@ -269,11 +269,9 @@ module NewRelic
                 else
                   perform_action_without_newrelic_trace(*args)
                 end
-                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)
+                if defined?(request) && request && defined?(response) &&
+                    response && !Agent.config[:disable_mobile_headers]
+                  NewRelic::Agent::BrowserMonitoring.insert_mobile_response_header(request, response)
                 end
                 result
               rescue => e

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

@@ -27,21 +27,11 @@ 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
 
@@ -263,7 +253,7 @@ module NewRelic
         end
         
         def queue_time
-          apdex_start - start
+          start - apdex_start
         end
 
         def add_custom_parameters(p)

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,17 +21,3 @@ 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/rails3/errors.rb

@@ -6,7 +6,11 @@ module NewRelic
           def newrelic_notice_error(exception, custom_params = {})
             filtered_params = (respond_to? :filter_parameters) ? filter_parameters(params) : params
             filtered_params.merge!(custom_params)
-            NewRelic::Agent.agent.error_collector.notice_error(exception, request, newrelic_metric_path, filtered_params)
+            NewRelic::Agent::Instrumentation::MetricFrame.notice_error( \
+                exception, \
+                :request => request, \
+                :metric => newrelic_metric_path, \
+                :custom_params => filtered_params)
           end
         end
       end

data/lib/new_relic/agent/pipe_channel_manager.rb

@@ -77,10 +77,15 @@ module NewRelic
           return if @started == true
           @started = true
           @thread = Thread.new do
+            now = nil
             loop do
               clean_up_pipes
               pipes_to_listen_to = @pipes.values.map{|pipe| pipe.out} + [wake.out]
+              NewRelic::Agent.instance.stats_engine \
+                .get_stats_no_scope('Supportability/Listeners') \
+                .record_data_point((Time.now - now).to_f) if now
               if ready = IO.select(pipes_to_listen_to, [], [], @select_timeout)
+                now = Time.now
                 pipe = ready[0][0]
                 if pipe == wake.out
                   pipe.read(1)
@@ -92,7 +97,7 @@ module NewRelic
               break if !should_keep_listening?
             end
           end
-          @thread #.abort_on_exception = true
+          @thread['newrelic_label'] = 'Pipe Channel Manager'
           sleep 0.001 # give time for the thread to spawn
         end
 

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

@@ -35,7 +35,7 @@ module NewRelic
         end
 
         def self.supported_on_this_platform?
-          defined?(JRuby) or platform =~ /linux|darwin|freebsd|solaris/
+          defined?(JRuby) or platform =~ /linux|darwin9|darwin10|freebsd|solaris/
         end
 
         def self.platform

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

@@ -8,34 +8,69 @@ module NewRelic
         # A simple mutex-synchronized hash to make sure our statistics
         # are internally consistent even in truly-threaded rubies like JRuby
         class SynchronizedHash < ::Hash
-          include NewRelic::LanguageSupport::SynchronizedHash
-          
+          attr_reader :lock
+
           def initialize
             @lock = Mutex.new
           end
-          
+
+          def initialize_copy(old)
+            super
+            old.each do |key, value|
+              self.store(key, value.dup)
+            end
+          end
+
           def []=(*args)
             @lock.synchronize { super }
+          rescue => e
+            log_error(e)
           end
 
           def clear(*args)
             @lock.synchronize { super }
+          rescue => e
+            log_error(e)
           end
 
           def delete(*args)
             @lock.synchronize { super }
+          rescue => e
+            log_error(e)
           end
 
           def delete_if(*args)
             @lock.synchronize { super }
+          rescue => e
+            log_error(e)
+          end
+
+          def reset
+            values.each { |s| s.reset }
+          end
+
+          def log_error(e)
+            backtraces = Thread.list.map { |t| log_thread(t) }.join("\n\n")
+            NewRelic::Control.instance.log.warn(
+              "SynchronizedHash failure: #{e.class.name}: #{e.message}\n#{backtraces}")
+          end
+
+          def log_thread(t)
+            # Ruby 1.8 doesn't expose backtrace properly, so make sure it's there
+            if t.nil? || !t.respond_to?(:backtrace) || t.backtrace.nil?
+              return "#{t}\n\tNo backtrace for thread" 
+            end
+
+            backtrace = t.backtrace.map { |b| "\t#{b}" }.join("\n")
+            "\t#{t}\n#{backtrace}"
           end
         end
-        
+
         # Returns all of the metric names of all the stats in the engine
         def metrics
           stats_hash.keys.map(&:to_s)
         end
-        
+
         # a simple accessor for looking up a stat with no scope -
         # returns a new stats object if no stats object for that
         # metric exists yet
@@ -64,17 +99,16 @@ module NewRelic
           end
           stats
         end
-        
+
         # Returns a stat if one exists, otherwise returns nil. If you
         # want auto-initialization, use one of get_stats or get_stats_no_scope
         def lookup_stats(metric_name, scope_name = '')
           stats_hash[NewRelic::MetricSpec.new(metric_name, scope_name)]
         end
-        
+
         # This module was extracted from the harvest method and should
         # be refactored
         module Harvest
-          
           # merge data from previous harvests into this stats engine -
           # takes into account the case where there are new stats for
           # that metric, and the case where there is no current data
@@ -135,10 +169,12 @@ module NewRelic
 
           def merge_stats(other_engine_or_hash, metric_ids)
             old_data = get_stats_hash_from(other_engine_or_hash)
-
             timeslice_data = {}
-            stats_hash.each do | metric_spec, stats |
-
+            stats_hash.lock.synchronize do
+              Thread.current['newrelic_stats_hash'] = stats_hash.clone
+              stats_hash.reset
+            end
+            Thread.current['newrelic_stats_hash'].each do |metric_spec, stats|
               metric_spec = coerce_to_metric_spec(metric_spec)
               stats_copy = clone_and_reset_stats(metric_spec, stats)
               merge_old_data!(metric_spec, stats_copy, old_data)
@@ -160,7 +196,6 @@ module NewRelic
         # sacrificing efficiency.
         # +++
         def harvest_timeslice_data(previous_timeslice_data, metric_ids)
-
           poll harvest_samplers
           merge_stats(previous_timeslice_data, metric_ids)
         end
@@ -173,9 +208,9 @@ module NewRelic
 
         # Reset each of the stats, such as when a new passenger instance starts up.
         def reset_stats
-          stats_hash.values.each { |s| s.reset }
+          stats_hash.reset
         end
-        
+
         # returns a memoized SynchronizedHash that holds the actual
         # instances of Stats keyed off their MetricName
         def stats_hash

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

@@ -28,10 +28,15 @@ module Agent
         return if periodic_samplers.empty?
 
         @sampler_thread = Thread.new do
-          while true do
+          loop do
+            now = Time.now
             begin
               sleep POLL_PERIOD
               poll periodic_samplers
+            ensure
+              NewRelic::Agent.instance.stats_engine \
+                .get_stats_no_scope('Supportability/Samplers') \
+                .record_data_point((Time.now - now).to_f)
             end
           end
         end

data/lib/new_relic/agent.rb

@@ -77,7 +77,6 @@ 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'

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

@@ -158,13 +158,12 @@ module NewRelic
         def install_shim
           super
           require 'new_relic/agent/instrumentation/controller_instrumentation'
-          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 }
+          if !ActiveSupport.respond_to?(:on_load) # rails 3+
+            ActionController::Base.class_eval do
+              include NewRelic::Agent::Instrumentation::ControllerInstrumentation::Shim
+            end
           end
         end
-
       end
     end
   end

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

@@ -79,6 +79,13 @@ module NewRelic
           end
           local_env.append_plugin_list { ::Rails.configuration.plugins.to_a }
         end
+        
+        def install_shim
+          super
+          ActiveSupport.on_load(:action_controller) do
+            include NewRelic::Agent::Instrumentation::ControllerInstrumentation::Shim
+          end
+        end
       end
     end
   end

data/lib/new_relic/language_support.rb

@@ -1,6 +1,6 @@
 module NewRelic::LanguageSupport
   extend self
-  
+
   module Control
     def self.included(base)
       # need to use syck rather than psych when possible
@@ -21,23 +21,8 @@ module NewRelic::LanguageSupport
       end
     end
   end
-  
-  module SynchronizedHash
-    def self.included(base)
-      # need to lock iteration of stats hash in 1.9.x
-      if NewRelic::LanguageSupport.using_version?('1.9') ||
-          NewRelic::LanguageSupport.using_engine?('jruby')
-        base.class_eval do
-          def each(*args, &block)
-            @lock.synchronize { super }
-          end
-        end
-      end
-    end
-  end
-  
+
   @@forkable = nil
-  
   def can_fork?
     # this is expensive to check, so we should only check once
     return @@forkable if @@forkable != nil
@@ -51,7 +36,7 @@ module NewRelic::LanguageSupport
 
     @@forkable
   end
-  
+
   def using_engine?(engine)
     if defined?(::RUBY_ENGINE)
       ::RUBY_ENGINE == engine
@@ -81,7 +66,7 @@ module NewRelic::LanguageSupport
       yield
     end
   end
-  
+
   def with_cautious_gc
     if broken_gc?
       with_disabled_gc { yield }

data/lib/new_relic/local_environment.rb

@@ -14,7 +14,6 @@ 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
@@ -23,7 +22,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
@@ -397,7 +396,7 @@ module NewRelic
     end
 
     def check_for_passenger
-      if (defined?(::Passenger) && defined?(::Passenger::AbstractServer)) || defined?(::PhusionPassenger)
+      if defined?(::PhusionPassenger)
         @dispatcher = :passenger
       end
     end

data/lib/new_relic/version.rb

@@ -4,7 +4,7 @@ module NewRelic
     MAJOR = 3
     MINOR = 5
     TINY  = 1
-    BUILD = 'alpha' # Set to nil for a release, 'beta1', 'alpha', etc for prerelease builds
+    BUILD = 'beta1' # 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,15 +4,20 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = "newrelic_rpm"
-  s.version = "3.5.1.alpha"
+  s.name = %q{newrelic_rpm}
+  s.version = "3.5.1.beta1"
 
-  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 = "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.date = %q{2012-10-31}
+  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_cmd", "newrelic", "mongrel_rpm"]
   s.extra_rdoc_files = [
     "CHANGELOG",
     "LICENSE",
@@ -29,7 +34,6 @@ Gem::Specification.new do |s|
     "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",
@@ -45,7 +49,6 @@ Gem::Specification.new do |s|
     "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",
@@ -309,11 +312,30 @@ Gem::Specification.new do |s|
     "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 = "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.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.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

@@ -68,7 +68,9 @@ module NewRelic
         end
 
         app = Thread.new do
-          @agent.stats_engine.stats_hash["a"] = NewRelic::StatsBase.new
+          200.times do |i|
+            @agent.stats_engine.stats_hash["a#{i}"] = NewRelic::StatsBase.new
+          end
         end
 
         assert_nothing_raised do
@@ -76,20 +78,6 @@ 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/agent/error_collector_test.rb

@@ -143,6 +143,18 @@ class NewRelic::Agent::ErrorCollectorTest < Test::Unit::TestCase
     assert_equal 0, errors.length
   end
 
+  def test_exclude_later_config_changes
+    @error_collector.notice_error(IOError.new("message"))
+
+    NewRelic::Agent.config.apply_config(:'error_collector.ignore_errors' => "IOError")
+    @error_collector.notice_error(IOError.new("message"))
+
+    errors = @error_collector.harvest_errors([])
+
+    assert_equal 1, errors.length
+
+  end
+
   def test_exclude_block
     NewRelic::Agent.logger.expects(:error).never
     @error_collector.ignore_error_filter &wrapped_filter_proc

data/test/new_relic/agent/instrumentation/metric_frame_test.rb

@@ -47,4 +47,10 @@ class NewRelic::Agent::Instrumentation::MetricFrameTest < Test::Unit::TestCase
     assert_equal "/", f.uri
     assert_nil f.referer
   end
+
+  def test_queue_time
+    f.apdex_start = 1000
+    f.start = 1500
+    assert_equal 500, f.queue_time
+  end
 end

data/test/new_relic/agent/stats_engine/metric_stats/harvest_test.rb

@@ -1,30 +1,13 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','..','..','test_helper'))
 require 'new_relic/agent/stats_engine/metric_stats'
+
 class NewRelic::Agent::StatsEngine::MetricStats::HarvestTest < Test::Unit::TestCase
   include NewRelic::Agent::StatsEngine::MetricStats::Harvest
 
   attr_accessor :stats_hash
-  def test_merge_stats_trivial
-    self.stats_hash = {}
-    merge_stats({}, {})
-  end
-
   def test_merge_stats_with_nil_stats
-    metric_ids = mock('metric ids')
-    mock_stats_hash = mock('stats_hash')
-    mock_spec = mock('spec')
-    mock_stats = mock('stats')
-    mock_stats_hash.expects(:each).yields(mock_spec, mock_stats)
-    self.stats_hash = mock_stats_hash
-
-    self.expects(:coerce_to_metric_spec).with(mock_spec).returns(mock_spec)
-    self.expects(:clone_and_reset_stats).with(mock_spec, mock_stats).returns(mock_stats)
-    self.expects(:merge_old_data!).with(mock_spec, mock_stats, {})
-    metric_ids.expects(:[]).with(mock_spec).returns('an id')
-    self.expects(:add_data_to_send_unless_empty).with({}, mock_stats, mock_spec, 'an id')
-
-
-    merge_stats({}, metric_ids)
+    self.stats_hash = NewRelic::Agent::StatsEngine::MetricStats::SynchronizedHash.new
+    assert_equal({}, merge_stats({}, {}))
   end
 
 

data/test/new_relic/agent/stats_engine/metric_stats_test.rb

@@ -44,7 +44,7 @@ class NewRelic::Agent::MetricStatsTest < Test::Unit::TestCase
     assert_equal 4, @engine.get_stats("c").total_call_time
 
     metric_data = @engine.harvest_timeslice_data({}, {}).values
-    
+
     # after harvest, all the metrics should be reset
     assert_equal 0, @engine.get_stats("a").call_count
     assert_equal 0, @engine.get_stats("a").total_call_time
@@ -78,5 +78,16 @@ class NewRelic::Agent::MetricStatsTest < Test::Unit::TestCase
     assert_equal 2, stats.call_count
     assert_equal 3, stats.total_call_time
   end
+
+  def test_rescues_from_synchronization_failure_on_write
+    hash = NewRelic::Agent::StatsEngine::MetricStats::SynchronizedHash.new
+    10.times { |i| hash[i] = i }
+
+    assert_nothing_raised do
+      hash.each do |k, v|
+        hash[11] = 1 
+      end
+    end
+  end
 end
 

data/test/new_relic/local_environment_test.rb

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

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: newrelic_rpm
 version: !ruby/object:Gem::Version 
-  hash: 2096628268
+  hash: -2943348816
   prerelease: 6
   segments: 
   - 3
   - 5
   - 1
-  - alpha
-  version: 3.5.1.alpha
+  - beta
+  - 1
+  version: 3.5.1.beta1
 platform: ruby
 authors: 
 - Bill Kayser
@@ -20,7 +21,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-11 00:00:00 -07:00
+date: 2012-10-31 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -75,9 +76,9 @@ description: |
 
 email: support@newrelic.com
 executables: 
-- mongrel_rpm
 - newrelic_cmd
 - newrelic
+- mongrel_rpm
 extensions: []
 
 extra_rdoc_files: 
@@ -95,7 +96,6 @@ 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
@@ -111,7 +111,6 @@ 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

data/config.dot

@@ -1,290 +0,0 @@
-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/cross_process_monitoring.rb

@@ -1,93 +0,0 @@
-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