From 57240319a5d8e0d2c6c3fd5f1421d148f64ccb73 Mon Sep 17 00:00:00 2001 From: Jon Guymon Date: Thu, 25 Aug 2011 12:59:05 -0700 Subject: [PATCH] Revert "Fix tests and suppress warning for Rails 3 views." This reverts commit d1e556998ebe3c681e5b1e70bf4ddd2cabe794da. --- .../agent/instrumentation/rails3/action_controller.rb | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/lib/new_relic/agent/instrumentation/rails3/action_controller.rb b/lib/new_relic/agent/instrumentation/rails3/action_controller.rb index c3004802be..5c08b4ccbc 100644 --- a/lib/new_relic/agent/instrumentation/rails3/action_controller.rb +++ b/lib/new_relic/agent/instrumentation/rails3/action_controller.rb @@ -39,11 +39,7 @@ def process_action(*args) module ActionView def _render_template(template, layout = nil, options = {}) #:nodoc: - if template.respond_to?(:virtual_path) - NewRelic::Agent.trace_execution_scoped "View/#{template.virtual_path}/Rendering" do - super - end - else + NewRelic::Agent.trace_execution_scoped "View/#{template.virtual_path}/Rendering" do super end end @@ -95,7 +91,6 @@ class ActionView::Base include NewRelic::Agent::Instrumentation::Rails3::ActionView end old_klass = ActionView::Partials::PartialRenderer - ActionView::Partials.send :remove_const, :PartialRenderer ActionView::Partials::PartialRenderer = Class.new(old_klass) class ActionView::Partials::PartialRenderer def render_partial(*args)