newrelic_rpm 2.13.2 → 2.13.3.beta

data/lib/new_relic/commands/install.rb

@@ -56,7 +56,17 @@ you receive upon registration.
 E-mail support@newrelic.com with any problems or questions.
 
     EOF
+    puts <<-EOF
 
+Installing the plugin from Rubyforge is deprecated. This repository will not be updated after January 2011
+
+Please use one of the following options:
+
+Gems: gem install newrelic_rpm
+
+Github! git clone git://github.com/newrelic/rpm.git vendor/plugins/newrelic_rpm
+
+    EOF
   end
 
   def content

data/lib/new_relic/control.rb

@@ -93,6 +93,8 @@ module NewRelic
     # is called one or more times.
     #
     def init_plugin(options={})
+      require 'conditional_vendored_metric_parser'
+      
       options['app_name'] = ENV['NEWRELIC_APP_NAME'] if ENV['NEWRELIC_APP_NAME']
 
       require 'new_relic/agent'
@@ -171,6 +173,17 @@ module NewRelic
     # the server for change detection.  Override in subclasses
     def append_environment_info; end
 
+    def bundler_gem_list
+      if defined?(Bundler) && Bundler.instance_eval do @load end
+        Bundler.load.specs.map do | spec |
+          version = (spec.respond_to?(:version) && spec.version)
+          spec.name + (version ? "(#{version})" : "")
+        end
+      else
+        []
+      end
+    end
+    
     def config_file
       File.expand_path(File.join(root,"config","newrelic.yml"))
     end

data/lib/new_relic/control/configuration.rb

@@ -23,7 +23,7 @@ module NewRelic
           'host' => 'collector.newrelic.com',
           'ssl' => false,
           'log_level' => 'info',
-          'apdex_t' => 1.0
+          'apdex_t' => 0.5
         }
         s.merge! settings_hash if settings_hash
         # monitor_daemons replaced with agent_enabled

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

@@ -84,6 +84,14 @@ class NewRelic::Control::Frameworks::Rails < NewRelic::Control
     File.join(root,'vendor','rails')
   end
 
+  def rails_gem_list
+    ::Rails.configuration.gems.map do | gem |
+      version = (gem.respond_to?(:version) && gem.version) ||
+        (gem.specification.respond_to?(:version) && gem.specification.version)
+      gem.name + (version ? "(#{version})" : "")
+    end
+  end
+  
   # Collect the Rails::Info into an associative array as well as the list of plugins
   def append_environment_info
     local_env.append_environment_value('Rails version'){ ::Rails::VERSION::STRING }
@@ -95,11 +103,7 @@ class NewRelic::Control::Frameworks::Rails < NewRelic::Control
     local_env.append_environment_value('Rails Env') { ENV['RAILS_ENV'] }
     if rails_version >= NewRelic::VersionNumber.new('2.1.0')
       local_env.append_gem_list do
-        ::Rails.configuration.gems.map do | gem |
-          version = (gem.respond_to?(:version) && gem.version) ||
-            (gem.specification.respond_to?(:version) && gem.specification.version)
-          gem.name + (version ? "(#{version})" : "")
-        end
+        (bundler_gem_list + rails_gem_list).uniq
       end
       # The plugins is configured manually.  If it's nil, it loads everything non-deterministically
       if ::Rails.configuration.plugins

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

@@ -44,17 +44,13 @@ class NewRelic::Control::Frameworks::Rails3 < NewRelic::Control::Frameworks::Rai
   def append_environment_info
     local_env.append_environment_value('Rails version'){ version }
     local_env.append_environment_value('Rails threadsafe') do
-      ::Rails.configuration.action_controller.allow_concurrency == true
+      true == ::Rails.configuration.action_controller.allow_concurrency
     end
     local_env.append_environment_value('Rails Env') { env }
     local_env.append_gem_list do
-      ::Rails.configuration.gems.map do | gem |
-        version = (gem.respond_to?(:version) && gem.version) ||
-          (gem.specification.respond_to?(:version) && gem.specification.version)
-        gem.name + (version ? "(#{version})" : "")
-      end
+      bundler_gem_list
     end
-    local_env.append_plugin_list { ::Rails.configuration.plugins }
+    local_env.append_plugin_list { ::Rails.configuration.plugins.to_a }
   end
 
 end

data/lib/new_relic/control/instrumentation.rb

@@ -5,7 +5,7 @@ module NewRelic
         Dir.glob(pattern) do |file|
           begin
             log.debug "Processing instrumentation file '#{file}'"
-            require file
+            require file.to_s
           rescue => e
             log.error "Error loading instrumentation file '#{file}': #{e}"
             log.debug e.backtrace.join("\n")
@@ -83,7 +83,7 @@ module NewRelic
 
         # Instrumentation for the key code points inside rails for monitoring by NewRelic.
         # note this file is loaded only if the newrelic agent is enabled (through config/newrelic.yml)
-        instrumentation_path = File.join(File.dirname(__FILE__), '..', 'agent','instrumentation')
+        instrumentation_path = File.expand_path(File.join(File.dirname(__FILE__), '..', 'agent','instrumentation'))
         @instrumentation_files <<
         File.join(instrumentation_path, '*.rb') <<
         File.join(instrumentation_path, app.to_s, '*.rb')

data/lib/new_relic/delayed_job_injection.rb

@@ -19,7 +19,7 @@ Delayed::Worker.class_eval do
     dispatcher_instance_id = worker_name || "host:#{Socket.gethostname} pid:#{Process.pid}" rescue "pid:#{Process.pid}"
     say "RPM Monitoring DJ worker #{dispatcher_instance_id}"
     NewRelic::DelayedJobInjection.worker_name = worker_name
-    NewRelic::Agent.manual_start :dispatcher => :delayed_job, :dispatcher_instance_id => dispatcher_instance_id
+    NewRelic::Control.instance.init_plugin :dispatcher => :delayed_job, :dispatcher_instance_id => dispatcher_instance_id
   end
 
   alias initialize_without_new_relic initialize

data/lib/new_relic/rack/developer_mode.rb

@@ -216,7 +216,7 @@ class DeveloperMode
 
     controller_metric = @sample.root_segment.called_segments.first.metric_name
 
-    metric_parser = NewRelic::MetricParser.for_metric_named controller_metric
+    metric_parser = NewRelic::MetricParser::MetricParser.for_metric_named controller_metric
     @sample_controller_name = metric_parser.controller_name
     @sample_action_name = metric_parser.action_name
 

data/lib/new_relic/recipes.rb

@@ -8,7 +8,7 @@
 # The task will run on app servers except where no_release is true.
 # If it fails, it will not affect the task execution or do a rollback.
 #
-make_notify_task = lambda do
+make_notify_task = Proc.new do
 
   namespace :newrelic do
 

data/lib/new_relic/transaction_analysis.rb

@@ -49,7 +49,7 @@ module TransactionAnalysis
 
     def developer_name
       return @metric_name if @metric_name == 'Remainder'
-      NewRelic::MetricParser.parse(@metric_name).developer_name
+      NewRelic::MetricParser::MetricParser.parse(@metric_name).developer_name
     end
   end
 

data/lib/new_relic/transaction_sample.rb

@@ -202,8 +202,10 @@ module NewRelic
                 # Note: have to convert from native column element types to string so we can
                 # serialize.  Esp. for postgresql.
                 # Can't use map.  Suck it up.
+                # Can too use map. Lrn2prgm
                 if explain_resultset.respond_to?(:each)
-                  explain_resultset.each { | row | rows << row.map(&:to_s) }
+                  explain_resultset.extend Enumerable unless explain_resultset.respond_to?(:map)
+                  rows = explain_resultset.map { | row | row.map(&:to_s) }
                 else
                   rows << [ explain_resultset ]
                 end

data/lib/new_relic/version.rb

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

data/newrelic_rpm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{newrelic_rpm}
-  s.version = "2.13.2"
+  s.version = "2.13.3.beta"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bill Kayser", "Justin George"]
-  s.date = %q{2010-10-04}
+  s.date = %q{2010-10-28}
   s.description = %q{New Relic RPM is a Ruby performance management system, developed by
 New Relic, Inc (http://www.newrelic.com).  RPM provides you with deep
 information about the performance of your Ruby on Rails or Merb
@@ -34,6 +34,7 @@ http://github.com/newrelic/rpm/tree/master.
      "bin/newrelic_cmd",
      "cert/cacert.pem",
      "install.rb",
+     "lib/conditional_vendored_metric_parser.rb",
      "lib/new_relic/agent.rb",
      "lib/new_relic/agent/agent.rb",
      "lib/new_relic/agent/busy_calculator.rb",
@@ -95,20 +96,6 @@ http://github.com/newrelic/rpm/tree/master.
      "lib/new_relic/local_environment.rb",
      "lib/new_relic/merbtasks.rb",
      "lib/new_relic/metric_data.rb",
-     "lib/new_relic/metric_parser.rb",
-     "lib/new_relic/metric_parser/action_mailer.rb",
-     "lib/new_relic/metric_parser/active_merchant.rb",
-     "lib/new_relic/metric_parser/active_record.rb",
-     "lib/new_relic/metric_parser/apdex.rb",
-     "lib/new_relic/metric_parser/controller.rb",
-     "lib/new_relic/metric_parser/controller_cpu.rb",
-     "lib/new_relic/metric_parser/errors.rb",
-     "lib/new_relic/metric_parser/external.rb",
-     "lib/new_relic/metric_parser/mem_cache.rb",
-     "lib/new_relic/metric_parser/other_transaction.rb",
-     "lib/new_relic/metric_parser/view.rb",
-     "lib/new_relic/metric_parser/web_frontend.rb",
-     "lib/new_relic/metric_parser/web_service.rb",
      "lib/new_relic/metric_spec.rb",
      "lib/new_relic/metrics.rb",
      "lib/new_relic/noticed_error.rb",
@@ -160,7 +147,6 @@ http://github.com/newrelic/rpm/tree/master.
      "test/new_relic/control_test.rb",
      "test/new_relic/deployments_api_test.rb",
      "test/new_relic/environment_test.rb",
-     "test/new_relic/metric_parser_test.rb",
      "test/new_relic/metric_spec_test.rb",
      "test/new_relic/rack/episodes_test.rb",
      "test/new_relic/shim_agent_test.rb",
@@ -198,7 +184,52 @@ http://github.com/newrelic/rpm/tree/master.
      "ui/views/newrelic/sample_not_found.rhtml",
      "ui/views/newrelic/show_sample.rhtml",
      "ui/views/newrelic/show_source.rhtml",
-     "ui/views/newrelic/threads.rhtml"
+     "ui/views/newrelic/threads.rhtml",
+     "vendor/gems/metric_parser-0.1.0.pre1/LICENSE",
+     "vendor/gems/metric_parser-0.1.0.pre1/README",
+     "vendor/gems/metric_parser-0.1.0.pre1/lib/metric_parser.rb",
+     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser.rb",
+     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/action_mailer.rb",
+     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/active_merchant.rb",
+     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/active_record.rb",
+     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/apdex.rb",
+     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/background_transaction.rb",
+     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/client.rb",
+     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/controller.rb",
+     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/controller_cpu.rb",
+     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/controller_ext.rb",
+     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/database.rb",
+     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/database_pool.rb",
+     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/dot_net.rb",
+     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/dot_net_parser.rb",
+     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/errors.rb",
+     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/external.rb",
+     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/frontend.rb",
+     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/gc.rb",
+     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/hibernate_session.rb",
+     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/java.rb",
+     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/java_parser.rb",
+     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/jsp.rb",
+     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/jsp_tag.rb",
+     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/mem_cache.rb",
+     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/metric_parser.rb",
+     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/orm.rb",
+     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/other_transaction.rb",
+     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/servlet.rb",
+     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/servlet_context_listener.rb",
+     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/servlet_filter.rb",
+     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/solr.rb",
+     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/solr_request_handler.rb",
+     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/spring.rb",
+     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/spring_controller.rb",
+     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/spring_view.rb",
+     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/struts_action.rb",
+     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/struts_result.rb",
+     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/version.rb",
+     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/view.rb",
+     "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"
   ]
   s.homepage = %q{http://www.github.com/newrelic/rpm}
   s.post_install_message = %q{

data/test/new_relic/agent/memcache_instrumentation_test.rb

@@ -1,45 +1,49 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper')) 
 
+memcached_ready = false
+classes = {
+  'memcache' => 'MemCache',
+  'dalli' => 'Dalli::Client',
+}
+begin
+  TCPSocket.new('localhost', 11211)
+  classes.each do |req, const|
+    begin
+      require req
+      MEMCACHED_CLASS = const.constantize
+      puts "Testing #{MEMCACHED_CLASS}"
+      memcached_ready = true
+    rescue LoadError
+    rescue NameError
+    end
+  end
+rescue Errno::ECONNREFUSED
+rescue Errno::ETIMEDOUT
+end
+
 class NewRelic::Agent::MemcacheInstrumentationTest < Test::Unit::TestCase
   include NewRelic::Agent::Instrumentation::ControllerInstrumentation
-  
-  # This implementation: http://seattlerb.rubyforge.org/memcache-client/
-  def using_memcache_client?
-    ::MemCache.method_defined? :cache_get
-  end
-  
+
   def setup
     NewRelic::Agent.manual_start
     @engine = NewRelic::Agent.instance.stats_engine
     
-    if using_memcache_client?
-      @cache = ::MemCache.new('localhost')
-    else
-      server = ::MemCache::Server.new('localhost')
-      @cache = ::MemCache.new(server)
-    end
+    @cache = MEMCACHED_CLASS.new('localhost')
+    @cache.flush_all
     @key = 'schluessel'
   end
   
   def _call_test_method_in_web_transaction(method, *args)
     @engine.clear_stats
-    begin
-      perform_action_with_newrelic_trace(:name=>'action', :category => :controller) do
-        @cache.send(method.to_sym, *[@key, *args])
-      end
-    rescue ::MemCache::MemCacheError
-      # There's probably no memcached around
+    perform_action_with_newrelic_trace(:name=>'action', :category => :controller) do
+      @cache.send(method.to_sym, *[@key, *args])
     end
   end
   
   def _call_test_method_in_background_task(method, *args)
     @engine.clear_stats
-    begin
-      perform_action_with_newrelic_trace(:name => 'bg_task', :category => :task) do
-        @cache.send(method.to_sym, *[@key, *args])
-      end
-    rescue ::MemCache::MemCacheError
-      # There's probably no memcached around
+    perform_action_with_newrelic_trace(:name => 'bg_task', :category => :task) do
+      @cache.send(method.to_sym, *[@key, *args])
     end
   end
   
@@ -100,4 +104,4 @@ class NewRelic::Agent::MemcacheInstrumentationTest < Test::Unit::TestCase
     end
   end
   
-end if defined? MemCache
+end if memcached_ready

data/ui/helpers/developer_mode_helper.rb

@@ -5,12 +5,6 @@ module NewRelic::DeveloperModeHelper
 
   private
   
-  # return the host that serves static content (css, metric documentation, images, etc)
-  # that supports the desktop edition.
-  def server
-    NewRelic::Control.instance['desktop_server'] || "http://rpm.newrelic.com"
-  end
-  
   # limit of how many detail/SQL rows we display - very large data sets (~10000+) crash browsers
   def trace_row_display_limit
     2000
@@ -62,10 +56,6 @@ module NewRelic::DeveloperModeHelper
     path
   end
   
-  def url_for_metric_doc(metric_name)
-    "#{server}/metric_doc?metric=#{CGI::escape(metric_name)}"
-  end
-  
   def url_for_source(trace_line)
     file, line = file_and_line(trace_line)
     
@@ -87,7 +77,7 @@ module NewRelic::DeveloperModeHelper
   end
   
   def dev_name(metric_name)
-    NewRelic::MetricParser.parse(metric_name).developer_name
+    NewRelic::MetricParser::MetricParser.parse(metric_name).developer_name
   end
   
   # write the metric label for a segment metric in the detail view

data/ui/views/newrelic/_segment.rhtml

@@ -7,7 +7,6 @@
 		<%= expand_segment_image(segment, indent) %>
 	</div>
 	<%= write_segment_label segment%>
-	<small><%= link_to '?', url_for_metric_doc(segment.metric_name)%></small>
 </div>
 </td>
 

data/ui/views/newrelic/_segment_row.rhtml

@@ -1,9 +1,7 @@
 <tr class='<%= cycle('even_row', 'odd_row') %>'>
 	<td>
 			<%= write_summary_segment_label object %>
-			<small>
-			<%= link_to "?", url_for_metric_doc(object.metric_name) %>
-      </small>
+
 	</td>
 	<td align=left> <%= object.call_count %></td>
 	<td align=right><%= with_delimiter(to_ms(object.exclusive_time)) %> ms</td>

data/ui/views/newrelic/index.rhtml

@@ -21,6 +21,18 @@
         </table>
 		</td>
 		<td valign=top>
+                          <% if defined?(Unicorn) || defined?(Passenger) %>
+                          <div class="flash">
+                          <p id="errorExplanation">
+                            We've noticed you're running a forking web server, like Unicorn or Passenger. See Below</p><p> Developer mode may be unpredictable, 
+                            since those servers run many processes and developer mode is entirely in the process.</p><p> We suggest you try Thin, 
+                            Mongrel, or another single-process web server for development mode.</p><p>
+                            (You can ignore this message if you're sure that you're running only one process, and it's not being reaped when inactive.)
+                         </p>
+                          </div>
+                          <% end %>
+
+
         <%= link_to_if @samples.size > 0, "Clear Transactions (#{@samples.size})", 'reset' %><br/>
         <%= link_to "List Threads", 'threads' %><br/>
 		<% if NewRelic::Control.instance.profiling_available? %>

data/ui/views/newrelic/threads.rhtml

@@ -1,5 +1,6 @@
+
 <h2>Thread List</h2>
-<p><%= link_to 'Back', :action => 'index' %></p>
+<p><%= link_to 'Back', 'index' %></p>
 <table>
     <thead><th class="title" colspan="5">Application Threads</th></thead>
 	<thead>
@@ -14,7 +15,7 @@
   threads = Thread.list - [ main ]
   nr_threads = []
   threads.delete_if { | thread | nr_threads << thread if thread.key? 'newrelic_label' }
-  ([ main ] + threads).each_with_index do | thread, i | -%>
+  ([ main ] + threads).each_with_index do | thread, i | %>
 <tr class="odd_row">
   <td valign="top"><%= h(thread == main ? 'main' : thread.to_s) %></td>
   <td valign="top"><%= h(thread.status || 'terminated with exception') %></td>
@@ -24,8 +25,8 @@
   	<%= thread.keys.map{|k| h k}.join("</br>") %>
   </td>
 </tr>
-<% end -%>
-<% if nr_threads.size > 0 -%>
+          <% end %>
+<% if nr_threads.size > 0 %>
 <tr><td>&nbsp;</td></tr>
 <thead><th class="title" colspan="5">New Relic Agent Threads</th></thead>
 	<thead>
@@ -36,7 +37,7 @@
 		<th class="left">Locals</th>
 	</thead>
 
-<% nr_threads.each_with_index do | thread, i | -%>
+<% nr_threads.each_with_index do | thread, i | %>
 <tr class="odd_row">
   <td valign="top"><%= h thread['newrelic_label'] %></td>
   <td valign="top"><%= h(thread.status || 'terminated with exception') %></td>
@@ -46,7 +47,7 @@
   	<%= (thread.keys - ['newrelic_label']).map{|k| h k}.join("</br>") %>
   </td>
 </tr>
-<% end -%>
-<% end -%>
+<% end %>
+<% end %>
 
 </table>