2 files changed, 28 insertions, 18 deletions
diff --git a/activesupport/lib/active_support/testing/performance.rb b/activesupport/lib/active_support/testing/performance.rb
index 517926c74d..a6c57cd0ff 100644
--- a/activesupport/lib/active_support/testing/performance.rb
+++ b/activesupport/lib/active_support/testing/performance.rb
@@ -1,5 +1,4 @@
 require 'fileutils'
-require 'rails/version'
 require 'active_support/concern'
 require 'active_support/core_ext/class/delegating_attributes'
 require 'active_support/core_ext/string/inflections'
@@ -149,26 +148,20 @@ module ActiveSupport
         end
 
         def environment
-          unless defined? @env
-            app = "#{$1}.#{$2}" if File.directory?('.git') && `git branch -v` =~ /^\* (\S+)\s+(\S+)/
-
-            rails = Rails::VERSION::STRING
-            if File.directory?('vendor/rails/.git')
-              Dir.chdir('vendor/rails') do
-                rails += ".#{$1}.#{$2}" if `git branch -v` =~ /^\* (\S+)\s+(\S+)/
-              end
-            end
-
-            ruby = "#{RUBY_ENGINE}-#{RUBY_VERSION}.#{RUBY_PATCHLEVEL}"
-
-            @env = [app, rails, ruby, RUBY_PLATFORM] * ','
-          end
-
-          @env
+          @env ||= [].tap do |env|
+            env << "#{$1}.#{$2}" if File.directory?('.git') && `git branch -v` =~ /^\* (\S+)\s+(\S+)/
+            env << rails_version if defined?(Rails::VERSION::STRING)
+            env << "#{RUBY_ENGINE}-#{RUBY_VERSION}.#{RUBY_PATCHLEVEL}"
+            env << RUBY_PLATFORM
+          end.join(',')
         end
 
         protected
-          HEADER = 'measurement,created_at,app,rails,ruby,platform'
+          if defined?(Rails::VERSION::STRING)
+            HEADER = 'measurement,created_at,app,rails,ruby,platform'
+          else
+            HEADER = 'measurement,created_at,app,ruby,platform'
+          end
 
           def with_output_file
             fname = output_filename
@@ -186,6 +179,18 @@ module ActiveSupport
           def output_filename
             "#{super}.csv"
           end
+
+          def rails_version
+            "rails-#{Rails::VERSION::STRING}#{rails_branch}"
+          end
+
+          def rails_branch
+            if File.directory?('vendor/rails/.git')
+              Dir.chdir('vendor/rails') do
+                ".#{$1}.#{$2}" if `git branch -v` =~ /^\* (\S+)\s+(\S+)/
+              end
+            end
+          end
       end
 
       module Metrics
diff --git a/activesupport/lib/active_support/testing/performance/ruby.rb b/activesupport/lib/active_support/testing/performance/ruby.rb
index 1104fc0a03..12aef0d7fe 100644
--- a/activesupport/lib/active_support/testing/performance/ruby.rb
+++ b/activesupport/lib/active_support/testing/performance/ruby.rb
@@ -18,6 +18,7 @@ module ActiveSupport
         end).freeze
 
       protected
+        remove_method :run_gc
         def run_gc
           GC.start
         end
@@ -28,6 +29,7 @@ module ActiveSupport
           @supported = @metric.measure_mode rescue false
         end
 
+        remove_method :run
         def run
           return unless @supported
 
@@ -39,6 +41,7 @@ module ActiveSupport
           @total = @data.threads.sum(0) { |thread| thread.methods.max.total_time }
         end
 
+        remove_method :record
         def record
           return unless @supported
 
@@ -78,6 +81,7 @@ module ActiveSupport
             self.class::Mode
           end
 
+          remove_method :profile
           def profile
             RubyProf.resume
             yield
@@ -86,6 +90,7 @@ module ActiveSupport
           end
 
           protected
+            remove_method :with_gc_stats
             def with_gc_stats
               GC::Profiler.enable
               GC.start