lib/bumpspark_helper.rb @@ -44,7 +44,7 @@ version: 2.5.1 /* Styling */ #tuneup { height: 50px; color: #ddd; background: #000 url(/images/tuneup/head.gif) 0 100% repeat-x; padding: 0 0 0 10px; font-family: "Helvetica Neue", "Lucida Grande", Calibri, Helvetica, Verdana, sans-serif; font-size: 12px; } -#tuneup #tuneup-content { margin-left: 170px; color: #000; height: 50px; vertical-align: middle; text-align: left; } +#tuneup #tuneup-content { margin-left: 170px; color: #ddd; height: 50px; vertical-align: middle; text-align: left; } #tuneup #tuneup-root-bar { float: right; } #tuneup a, #tuneup a:visited, #tuneup a:active { color: #fff; text-decoration: underline; font-size: 12px; border: 0; } @@ -176,4 +176,5 @@ version: 2.5.1 #tuneup #tuneup-data:hover #tuneup-schema { display: block; } #tuneup #tuneup-schema table, #tuneup #tuneup-schema tr { background: transparent; } #tuneup #tuneup-schema th { background: #111; color: #fff; border: 0 } -#tuneup #tuneup-schema td { background: #000; font-family: monospace; color: #ddd; padding: 1px; font-size: 11px; } \ No newline at end of file +#tuneup #tuneup-schema td { background: #000; font-family: monospace; color: #ddd; padding: 1px; font-size: 11px; } +#tuneup #tuneup-trend { float: right; width: 100px; } \ No newline at end of file assets/stylesheets/tuneup.css @@ -18,7 +18,7 @@ module Fiveruns attr_writer :collecting attr_accessor :running - attr_accessor :current_run_id + attr_reader :trend def run(controller, request) @running = (!controller.is_a?(TuneupController) && !request.xhr?) @@ -41,12 +41,12 @@ module Fiveruns def record(controller, request) if recording? @stack = [Fiveruns::Tuneup::RootStep.new] + @trend = nil @environment = environment - self.current_run_id = generate_run_id(request.url) yield log :info, "Persisting for #{request.url} using stub #{stub(request.url)}" - persist(self.current_run_id, @environment, schemas, @stack.shift) - self.current_run_id = nil + data = @stack.shift + persist(generate_run_id(request.url, data.time), @environment, schemas, data) elsif !@running # Plugin displaying the data # TODO: Support targeted selection (for historical run) @@ -55,6 +55,7 @@ module Fiveruns log :info, "Retrieved last run id of #{last_id} for #{request.parameters['uri']} using stub #{stub(request.parameters['uri'])}" if last_id && (data = retrieve_run(last_id)) @stack = [data] + @trend = trend_for(last_id) else log :debug, "No stack found" clear_stack @@ -79,7 +80,6 @@ module Fiveruns def start log :info, "Starting..." - reset! unless ENV['FIVERUNS_TUNEUP_RETAIN'] install_instrumentation log :debug, "Using collector at #{collector_url}" log :debug, "Using frontend at #{frontend_url}" @@ -92,13 +92,6 @@ module Fiveruns ####### private ####### - - # Remove all runs from this session - def reset! - FileUtils.rm_rf run_dir - rescue - # Nothing to remove, ignore - end def clear_stack @stack = [] lib/fiveruns/tuneup.rb @@ -21,10 +21,6 @@ module Fiveruns YAML.load(decompressed) end - def run_files - Dir[File.join(run_dir, '*.yml.gz')] - end - def last_filename_for_run_uri(uri) filename_for(last_run_id_for(uri)) end @@ -33,6 +29,12 @@ module Fiveruns private ####### + def trend_for(run_id) + Dir[File.join(run_dir, File.dirname(run_id), "*.gz")].map do |filename| + Integer(File.basename(filename, '.yml.gz').split('_').last) + end + end + def last_run_id_for(url) last_file = Dir[File.join(run_dir, stub(url), '*.gz')].last if last_file @@ -40,9 +42,10 @@ module Fiveruns end end - def generate_run_id(url) + # Use Run ID, current timestamp, and total time (in microseconds) + def generate_run_id(url, time) timestamp = '%d' % (Time.now.to_f * 1000) - File.join(stub(url), timestamp.to_s) + File.join(stub(url), timestamp.to_s << "_#{(time * 1000).to_i}") end def persist(run_id, environment, schemas, data) lib/fiveruns/tuneup/runs.rb @@ -1,4 +1,6 @@ module TuneupHelper #:nodoc: + + include BumpsparkHelper def tuneup_signin_url "#{Fiveruns::Tuneup.collector_url}/users" @@ -39,6 +41,18 @@ module TuneupHelper #:nodoc: Fiveruns::Tuneup.stack.first['schemas'] end + def trend + numbers= if Fiveruns::Tuneup.trend.size > 50 + Fiveruns::Tuneup.trend[-50..-1] + else + Fiveruns::Tuneup.trend + end + return unless numbers.size > 1 + tag(:img, + :src => build_data_url("image/png",bumpspark(numbers)), :alt => '', + :title => "Trend over last #{pluralize(numbers.size, 'run')}") + end + def tuneup_step_link(step) name = tuneup_style_step_name(tuneup_truncate_step_name(step)) link = if step.children.any? lib/tuneup_helper.rb @@ -2,6 +2,15 @@ namespace :fiveruns do namespace :tuneup do + namespace :tmp do + + desc "Clear tempory data (runs, etc)" + task :clear => :environment do + rm_rf File.join(RAILS_ROOT, 'tmp', 'tuneup') + end + + end + namespace :assets do desc "Install assets" tasks/assets.rake @@ -2,7 +2,7 @@ <div id='tuneup-top'> <div id='tuneup-summary'> <%= tuneup_bar(tuneup_data, :id => 'tuneup-root-bar') %> - <%= pluralize(tuneup_data.size, 'step') %> / <%= tuneup_data.time.to_i %> ms + <%= trend %> <%= tuneup_data.time.to_i %> ms </div> <%= link_to_remote "Upload this Run", :url => "/tuneup/upload?uri=#{CGI.escape(params[:uri])}", :html => {:id => 'tuneup-save-link'} %> </div> views/tuneup/_data.html.erb ded4b3df3a16d2ffc7cefc2af62f56b8a5e599b8 Bruce Williams bruce@codefluency.com http://github.com/fiveruns/fiveruns_tuneup/commit/7aa130b7c3921fb8beb7132413b8d5c3bfe0ec00 7aa130b7c3921fb8beb7132413b8d5c3bfe0ec00 2008-05-23T23:50:06-07:00 2008-05-23T23:50:06-07:00 Remove steps (took too much explanation, anyhow), add trending sparkline (pure Ruby, inline img data implementation) a14fc5f06403f6acc1d2792f71b556c623b38b14 Bruce Williams bruce@codefluency.com