newrelic_rpm 3.5.0 → 3.5.0.1

data/CHANGELOG

@@ -5,6 +5,11 @@
 ## v3.5.1 ##
 
 ### current version ###
+## 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.
+
 ## v3.5.0 ##
 
  * (Fix) RUM Stops Working After 3.4.2.1 Agent Upgrade

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/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
 

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

@@ -1,19 +1,19 @@
 DependencyDetection.defer do
   @name = :passenger
-  
+
   depends_on do
-    defined?(PhusionPassenger)
+    defined?(::PhusionPassenger)
   end
 
   executes do
     NewRelic::Agent.logger.debug "Installing Passenger event hooks."
 
-    PhusionPassenger.on_event(:stopping_worker_process) do
+    ::PhusionPassenger.on_event(:stopping_worker_process) do
       NewRelic::Agent.logger.debug "Passenger stopping this process, shutdown the agent."
       NewRelic::Agent.instance.shutdown
     end
 
-    PhusionPassenger.on_event(:starting_worker_process) do |forked|
+    ::PhusionPassenger.on_event(:starting_worker_process) do |forked|
       # We want to reset the stats from the stats engine in case any carried
       # over into the spawned process.  Don't clear them in case any were
       # cached.  We do this even in conservative spawning.
@@ -21,17 +21,3 @@ DependencyDetection.defer do
     end
   end
 end
-
-DependencyDetection.defer do
-  depends_on do
-    defined?(::Passenger) && defined?(::Passenger::AbstractServer) || defined?(::IN_PHUSION_PASSENGER)
-  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/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?(::IN_PHUSION_PASSENGER)
+      if defined?(::PhusionPassenger)
         @dispatcher = :passenger
       end
     end

data/lib/new_relic/rack/developer_mode.rb

@@ -229,6 +229,9 @@ module NewRelic
         if params['d']
           @sql_segments.sort!{|a,b| b.duration <=> a.duration }
         end
+
+        sort_method = params['sort'] || :total_time
+        @profile_options = {:min_percent => 0.5, :sort_method => sort_method.to_sym}
         
         render(:show_sample)
       end

data/lib/new_relic/version.rb

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

data/newrelic.yml

@@ -1,7 +1,7 @@
 #
 # This file configures the New Relic Ruby Agent, New Relic monitors
-# Rails applications with deep visibility and low overhead.  For more
-# information, visit www.newrelic.com
+# Rails applications with deep visibility and low overhead. For more
+# information, visit www.newrelic.com.
 #
 # Generated <%= Time.now.strftime('%B %d, %Y') %>, for version <%= NewRelic::VERSION::STRING %>
 #
@@ -21,7 +21,7 @@ common: &default_settings
   # Use this setting to force the agent to run or not run.
   # Default is 'auto' which means the agent will install and run only
   # if a valid dispatcher such as Mongrel is running.  This prevents
-  # it from running with Rake or the console.  Set to false to
+  # it from running with Rake or the console. Set to false to
   # completely turn the agent off regardless of the other settings.
   # Valid values are true, false and auto.
   #
@@ -47,7 +47,7 @@ common: &default_settings
   # When "true", the agent collects performance data about your 
   # application and reports this data to the New Relic service at 
   # newrelic.com. This global switch is normally overridden for each 
-  # environment below. (formerly called 'enabled')
+  # environment below (formerly called 'enabled').
   monitor_mode: true
 
   # Developer mode should be off in every environment but
@@ -55,7 +55,7 @@ common: &default_settings
   developer_mode: false
 
   # The newrelic agent generates its own log file to keep its logging
-  # information separate from that of your application.  Specify its
+  # information separate from that of your application. Specify its
   # log level here.
   log_level: info
 
@@ -101,7 +101,7 @@ common: &default_settings
   # Proxy settings for connecting to the service.
   #
   # If a proxy is used, the host setting is required.  Other settings
-  # are optional.  Default port is 8080.
+  # are optional. Default port is 8080.
   #
   # proxy_host: hostname
   # proxy_port: 8080
@@ -141,13 +141,13 @@ common: &default_settings
     # When transaction tracer is on, SQL statements can optionally be
     # recorded. The recorder has three modes, "off" which sends no
     # SQL, "raw" which sends the SQL statement in its original form,
-    # and "obfuscated", which strips out numeric and string literals
+    # and "obfuscated", which strips out numeric and string literals.
     record_sql: obfuscated
     
     # Threshold in seconds for when to collect stack trace for a SQL
     # call. In other words, when SQL statements exceed this threshold,
     # then capture and send the current stack trace. This is
-    # helpful for pinpointing where long SQL calls originate from
+    # helpful for pinpointing where long SQL calls originate from.
     stack_trace_threshold: 0.500
 
     # Determines whether the agent will capture query plans for slow
@@ -160,12 +160,12 @@ common: &default_settings
     # explain_threshold: 0.5
   
   # Error collector captures information about uncaught exceptions and
-  # sends them to the service for viewing
+  # sends them to the service for viewing.
   error_collector:
     
     # Error collector is enabled by default. Set this to false to turn
     # it off. This feature is only available at the Professional and above
-    # product levels
+    # product levels.
     enabled: true
     
     # Rails Only - tells error collector whether or not to capture a 
@@ -176,12 +176,11 @@ common: &default_settings
     # To stop specific errors from reporting to New Relic, set this property
     # to comma separated values.  Default is to ignore routing errors
     # which are how 404's get triggered.
-    #
     ignore_errors: ActionController::RoutingError
 
   # (Advanced) Uncomment this to ensure the cpu and memory samplers
-  # won't run.  Useful when you are using the agent to monitor an
-  # external resource
+  # won't run. Useful when you are using the agent to monitor an
+  # external resource.
   # disable_samplers: true
   
   # If you aren't interested in visibility in these areas, you can
@@ -232,16 +231,16 @@ test:
   # unit, functional or integration tests or the like.
   monitor_mode: false
 
-# Turn on the agent in production for 24x7 monitoring.  NewRelic
+# Turn on the agent in production for 24x7 monitoring. NewRelic
 # testing shows an average performance impact of < 5 ms per
-# transaction, you you can leave this on all the time without
+# transaction, you can leave this on all the time without
 # incurring any user-visible performance degradation.
 production:
   <<: *default_settings
   monitor_mode: true
 
 # Many applications have a staging environment which behaves
-# identically to production.  Support for that environment is provided
+# identically to production. Support for that environment is provided
 # here.  By default, the staging environment has the agent turned on.
 staging:
   <<: *default_settings

data/newrelic_rpm.gemspec

@@ -4,14 +4,20 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = "newrelic_rpm"
-  s.version = "3.5.0"
+  s.name = %q{newrelic_rpm}
+  s.version = "3.5.0.1"
 
   s.authors = ["Bill Kayser", "Jon Guymon", "Justin George", "Darin Swanson", "Rob Saul"]
-  s.date = "2012-10-04"
-  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 = ["newrelic_cmd", "newrelic", "mongrel_rpm"]
+  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.extra_rdoc_files = [
     "CHANGELOG",
     "LICENSE",
@@ -306,8 +312,28 @@ 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.summary = "New Relic Ruby Agent"

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

data/ui/helpers/developer_mode_helper.rb

@@ -343,10 +343,25 @@ module NewRelic::DeveloperModeHelper
     parts.join '.'
   end
 
-  def profile_table(profile)
+  SORT_REPLACEMENTS = {
+      "Total" => :total_time,
+      "Self" => :self_time,
+      "Child" => :children_time,
+      "Wait" => :wait_time
+  }
+
+  def profile_table(sample, options)
     out = StringIO.new
-    printer = RubyProf::GraphHtmlPrinter.new(profile)
-    printer.print(out, :min_percent=>0.5)
-    out.string[/<body>(.*)<\/body>/im, 0].gsub('<table>', '<table class=profile>')
+    printer = RubyProf::GraphHtmlPrinter.new(sample.profile)
+    printer.print(out, options)
+    out = out.string[/<body>(.*)<\/body>/im, 0].gsub('<table>', '<table class=profile>')
+    SORT_REPLACEMENTS.each do |text, param|
+      replacement = (options[:sort_method] == param) ?
+          "<th> #{text}&nbsp;&darr;</th>" :
+          "<th>#{link_to text, "show_sample_summary?id=#{sample.sample_id}&sort=#{param}"}</th>"
+
+      out.gsub!(/<th> +#{text}<\/th>/, replacement)
+    end
+    out
   end
 end

data/ui/views/newrelic/show_sample.rhtml

@@ -62,7 +62,7 @@
 <br/>
 <div id="view_sample">
 	<% if @sample.profile %>
-	  <%= profile_table(@sample.profile) %> 
+	  <%= profile_table(@sample, @profile_options) %>
 	<% else %>
 	<div align=center width="100%">
 		<%= show_view_link 'Summary', 'show_sample_summary' %>

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: newrelic_rpm
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 85
   prerelease: 
   segments: 
   - 3
   - 5
   - 0
-  version: 3.5.0
+  - 1
+  version: 3.5.0.1
 platform: ruby
 authors: 
 - Bill Kayser
@@ -19,7 +20,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-04 00:00:00 Z
+date: 2012-10-22 00:00:00 -07:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: jeweler
@@ -73,9 +75,9 @@ description: |
 
 email: support@newrelic.com
 executables: 
-- newrelic_cmd
 - newrelic
 - mongrel_rpm
+- newrelic_cmd
 extensions: []
 
 extra_rdoc_files: 
@@ -370,6 +372,7 @@ files:
 - vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/web_frontend.rb
 - 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
+has_rdoc: true
 homepage: http://www.github.com/newrelic/rpm
 licenses: []
 
@@ -423,7 +426,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: New Relic Ruby Agent