newrelic_rpm 2.10.3 → 2.10.4

data/CHANGELOG

@@ -1,3 +1,7 @@
+v2.10.4
+  * Fix incompatibility with Capistrano 2.5.16
+  * Strip down URLs reported in transactions and errors to path only.
+  
 v2.10.3
   * optimization to reduce overhead: move background samplers into foreground thread
   * change default config file to ignore RoutingErrors

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

@@ -318,8 +318,8 @@ module NewRelic
         category = 'Controller'
         path = newrelic_metric_path
         available_params = self.respond_to?(:params) ? self.params : {}
-        frame_data.request = self.request if self.respond_to? :request
       end
+      frame_data.request ||= self.request if self.respond_to? :request
       frame_data.push(category, path)
       frame_data.filtered_params = (respond_to? :filter_parameters) ? filter_parameters(available_params) : available_params
       frame_data

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

@@ -9,7 +9,12 @@ module NewRelic::Agent::Instrumentation
     attr_accessor :start, :apdex_start, :exception, 
                 :filtered_params, :force_flag, 
                 :jruby_cpu_start, :process_cpu_start, :database_metric_name
-                
+          
+    # Give the current metric frame a request context.  Use this to 
+    # get the URI and referer.  The request is interpreted loosely
+    # as a Rack::Request or an ActionController::AbstractRequest.
+    attr_accessor :request
+    
     # 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)
@@ -55,24 +60,17 @@ module NewRelic::Agent::Instrumentation
     def self.abort_transaction!
       current.abort_transaction! if current
     end
-
-    # Give the current metric frame a request context.  Use this to 
-    # get the URI and referer.  The request is interpreted loosely
-    # as a Rack::Request or an ActionController::AbstractRequest.
-    def request=(request)
-      @request = request
-    end
     
     # For the current web transaction, return the path of the URI minus the host part and query string, or nil.
     def uri
       return @uri if @uri || @request.nil?
       approximate_uri = case
-        when @request.respond_to?(:url) then @request.url
-        when @request.respond_to?(:uri) then @request.uri
         when @request.respond_to?(:fullpath) then @request.fullpath
         when @request.respond_to?(:path) then @request.path
+        when @request.respond_to?(:uri) then @request.uri
+        when @request.respond_to?(:url) then @request.url
       end
-      @uri = approximate_uri.split('?').first || '/' if approximate_uri
+      @uri = approximate_uri[%r{^(https?://.*?)?(/[^?]*)}, 2] || '/' if approximate_uri
     end
     
     # For the current web transaction, return the full referer, minus the host string, or nil.

data/lib/new_relic/recipes.rb

@@ -70,7 +70,7 @@ make_notify_task = lambda do
   end
 end
 require 'capistrano/version'
-if Capistrano::Version::MAJOR < 2
+if defined?(Capistrano::Version::MAJOR) && Capistrano::Version::MAJOR < 2
   STDERR.puts "Unable to load #{__FILE__}\nNew Relic Capistrano hooks require at least version 2.0.0"
 else
   instance = Capistrano::Configuration.instance

data/lib/new_relic/version.rb

@@ -3,7 +3,7 @@ module NewRelic
   module VERSION #:nodoc:
     MAJOR = 2
     MINOR = 10
-    TINY  = 3
+    TINY  = 4
     EXPERIMENTAL = nil 
     STRING = [MAJOR, MINOR, TINY, EXPERIMENTAL].compact.join('.')
   end

data/newrelic_rpm.gemspec

@@ -0,0 +1,210 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{newrelic_rpm}
+  s.version = "2.10.4"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Bill Kayser"]
+  s.date = %q{2010-02-16}
+  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
+application as it runs in production. The New Relic Agent is
+dual-purposed as a either a Rails plugin or a Gem, hosted on
+http://github.com/newrelic/rpm/tree/master.
+}
+  s.email = %q{support@newrelic.com}
+  s.executables = ["mongrel_rpm", "newrelic_cmd"]
+  s.extra_rdoc_files = [
+    "CHANGELOG",
+     "LICENSE",
+     "README.md"
+  ]
+  s.files = [
+    "CHANGELOG",
+     "LICENSE",
+     "README.md",
+     "bin/mongrel_rpm",
+     "bin/newrelic_cmd",
+     "cert/cacert.pem",
+     "install.rb",
+     "lib/new_relic/agent.rb",
+     "lib/new_relic/agent/agent.rb",
+     "lib/new_relic/agent/busy_calculator.rb",
+     "lib/new_relic/agent/chained_call.rb",
+     "lib/new_relic/agent/collection_helper.rb",
+     "lib/new_relic/agent/error_collector.rb",
+     "lib/new_relic/agent/instrumentation/active_merchant.rb",
+     "lib/new_relic/agent/instrumentation/active_record_instrumentation.rb",
+     "lib/new_relic/agent/instrumentation/authlogic.rb",
+     "lib/new_relic/agent/instrumentation/controller_instrumentation.rb",
+     "lib/new_relic/agent/instrumentation/data_mapper.rb",
+     "lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb",
+     "lib/new_relic/agent/instrumentation/memcache.rb",
+     "lib/new_relic/agent/instrumentation/merb/controller.rb",
+     "lib/new_relic/agent/instrumentation/merb/errors.rb",
+     "lib/new_relic/agent/instrumentation/metric_frame.rb",
+     "lib/new_relic/agent/instrumentation/net.rb",
+     "lib/new_relic/agent/instrumentation/passenger_instrumentation.rb",
+     "lib/new_relic/agent/instrumentation/rack.rb",
+     "lib/new_relic/agent/instrumentation/rails/action_controller.rb",
+     "lib/new_relic/agent/instrumentation/rails/action_web_service.rb",
+     "lib/new_relic/agent/instrumentation/rails/errors.rb",
+     "lib/new_relic/agent/instrumentation/sinatra.rb",
+     "lib/new_relic/agent/method_tracer.rb",
+     "lib/new_relic/agent/sampler.rb",
+     "lib/new_relic/agent/samplers/cpu_sampler.rb",
+     "lib/new_relic/agent/samplers/delayed_job_lock_sampler.rb",
+     "lib/new_relic/agent/samplers/memory_sampler.rb",
+     "lib/new_relic/agent/samplers/object_sampler.rb",
+     "lib/new_relic/agent/shim_agent.rb",
+     "lib/new_relic/agent/stats_engine.rb",
+     "lib/new_relic/agent/stats_engine/metric_stats.rb",
+     "lib/new_relic/agent/stats_engine/samplers.rb",
+     "lib/new_relic/agent/stats_engine/transactions.rb",
+     "lib/new_relic/agent/transaction_sampler.rb",
+     "lib/new_relic/agent/worker_loop.rb",
+     "lib/new_relic/commands/deployments.rb",
+     "lib/new_relic/commands/new_relic_commands.rb",
+     "lib/new_relic/control.rb",
+     "lib/new_relic/control/external.rb",
+     "lib/new_relic/control/merb.rb",
+     "lib/new_relic/control/rails.rb",
+     "lib/new_relic/control/ruby.rb",
+     "lib/new_relic/control/sinatra.rb",
+     "lib/new_relic/delayed_job_injection.rb",
+     "lib/new_relic/histogram.rb",
+     "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/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",
+     "lib/new_relic/rack/metric_app.rb",
+     "lib/new_relic/rack/mongrel_rpm.ru",
+     "lib/new_relic/rack/newrelic.yml",
+     "lib/new_relic/rack_app.rb",
+     "lib/new_relic/recipes.rb",
+     "lib/new_relic/stats.rb",
+     "lib/new_relic/transaction_analysis.rb",
+     "lib/new_relic/transaction_sample.rb",
+     "lib/new_relic/version.rb",
+     "lib/new_relic_api.rb",
+     "lib/newrelic_rpm.rb",
+     "lib/tasks/all.rb",
+     "lib/tasks/install.rake",
+     "lib/tasks/tests.rake",
+     "newrelic.yml",
+     "newrelic_rpm.gemspec",
+     "recipes/newrelic.rb",
+     "test/active_record_fixtures.rb",
+     "test/config/newrelic.yml",
+     "test/config/test_control.rb",
+     "test/new_relic/agent/active_record_instrumentation_test.rb",
+     "test/new_relic/agent/agent_controller_test.rb",
+     "test/new_relic/agent/agent_test_controller.rb",
+     "test/new_relic/agent/busy_calculator_test.rb",
+     "test/new_relic/agent/collection_helper_test.rb",
+     "test/new_relic/agent/error_collector_test.rb",
+     "test/new_relic/agent/method_tracer_test.rb",
+     "test/new_relic/agent/metric_data_test.rb",
+     "test/new_relic/agent/metric_frame_test.rb",
+     "test/new_relic/agent/mock_ar_connection.rb",
+     "test/new_relic/agent/mock_scope_listener.rb",
+     "test/new_relic/agent/net_instrumentation_test.rb",
+     "test/new_relic/agent/rpm_agent_test.rb",
+     "test/new_relic/agent/stats_engine/metric_stats_test.rb",
+     "test/new_relic/agent/stats_engine/samplers_test.rb",
+     "test/new_relic/agent/stats_engine/stats_engine_test.rb",
+     "test/new_relic/agent/task_instrumentation_test.rb",
+     "test/new_relic/agent/testable_agent.rb",
+     "test/new_relic/agent/transaction_sample_builder_test.rb",
+     "test/new_relic/agent/transaction_sample_test.rb",
+     "test/new_relic/agent/transaction_sampler_test.rb",
+     "test/new_relic/agent/worker_loop_test.rb",
+     "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/shim_agent_test.rb",
+     "test/new_relic/stats_test.rb",
+     "test/new_relic/version_number_test.rb",
+     "test/test_helper.rb",
+     "test/ui/newrelic_controller_test.rb",
+     "test/ui/newrelic_helper_test.rb",
+     "ui/controllers/newrelic_controller.rb",
+     "ui/helpers/google_pie_chart.rb",
+     "ui/helpers/newrelic_helper.rb",
+     "ui/views/layouts/newrelic_default.rhtml",
+     "ui/views/newrelic/_explain_plans.rhtml",
+     "ui/views/newrelic/_sample.rhtml",
+     "ui/views/newrelic/_segment.rhtml",
+     "ui/views/newrelic/_segment_limit_message.rhtml",
+     "ui/views/newrelic/_segment_row.rhtml",
+     "ui/views/newrelic/_show_sample_detail.rhtml",
+     "ui/views/newrelic/_show_sample_sql.rhtml",
+     "ui/views/newrelic/_show_sample_summary.rhtml",
+     "ui/views/newrelic/_sql_row.rhtml",
+     "ui/views/newrelic/_stack_trace.rhtml",
+     "ui/views/newrelic/_table.rhtml",
+     "ui/views/newrelic/explain_sql.rhtml",
+     "ui/views/newrelic/images/arrow-close.png",
+     "ui/views/newrelic/images/arrow-open.png",
+     "ui/views/newrelic/images/blue_bar.gif",
+     "ui/views/newrelic/images/file_icon.png",
+     "ui/views/newrelic/images/gray_bar.gif",
+     "ui/views/newrelic/images/new-relic-rpm-desktop.gif",
+     "ui/views/newrelic/images/new_relic_rpm_desktop.gif",
+     "ui/views/newrelic/images/textmate.png",
+     "ui/views/newrelic/index.rhtml",
+     "ui/views/newrelic/javascript/prototype-scriptaculous.js",
+     "ui/views/newrelic/javascript/transaction_sample.js",
+     "ui/views/newrelic/sample_not_found.rhtml",
+     "ui/views/newrelic/show_sample.rhtml",
+     "ui/views/newrelic/show_source.rhtml",
+     "ui/views/newrelic/stylesheets/style.css",
+     "ui/views/newrelic/threads.rhtml"
+  ]
+  s.homepage = %q{http://www.github.com/newrelic/rpm}
+  s.post_install_message = %q{
+Please see http://support.newrelic.com/faqs/docs/ruby-agent-release-notes
+for a complete description of the features and enhancements available
+in version 2.10 of the Ruby Agent.
+
+For details on this specific release, refer to the CHANGELOG file.
+
+}
+  s.rdoc_options = ["--charset=UTF-8", "--line-numbers", "--inline-source", "--title", "New Relic RPM"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{New Relic Ruby Performance Monitoring Agent}
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    else
+    end
+  else
+  end
+end
+

data/test/new_relic/agent/metric_frame_test.rb

@@ -32,20 +32,20 @@ class NewRelic::Agent::MetricFrameTest < Test::Unit::TestCase
   def test_request_parsing__uri
     request = stub(:uri => 'http://creature.com/path?hello=bob#none', :referer => '/path/hello?bob=none&foo=bar')
     f.request = request
-    assert_equal "http://creature.com/path", f.uri
+    assert_equal "/path", f.uri
     assert_equal "/path/hello", f.referer
   end
   
   def test_request_parsing__hostname_only
     request = stub(:uri => 'http://creature.com')
     f.request = request
-    assert_equal "http://creature.com", f.uri
+    assert_equal "/", f.uri
     assert_nil f.referer
   end
   def test_request_parsing__slash
     request = stub(:uri => 'http://creature.com/')
     f.request = request
-    assert_equal "http://creature.com/", f.uri
+    assert_equal "/", f.uri
     assert_nil f.referer
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: newrelic_rpm
 version: !ruby/object:Gem::Version 
-  version: 2.10.3
+  version: 2.10.4
 platform: ruby
 authors: 
 - Bill Kayser
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-13 00:00:00 -08:00
+date: 2010-02-16 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -119,6 +119,7 @@ files:
 - lib/tasks/install.rake
 - lib/tasks/tests.rake
 - newrelic.yml
+- newrelic_rpm.gemspec
 - recipes/newrelic.rb
 - test/active_record_fixtures.rb
 - test/config/newrelic.yml