rack-mini-profiler 0.1.31 → 0.9.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50a96f45043bb94f118971de9fe539a5af648d9c
-  data.tar.gz: 2deba7160023f7ae64ec39bdc456bcaf2c77fb45
+  metadata.gz: 5b9507bf24483a76c136680a0bbcc6e4a4363471
+  data.tar.gz: 9e99da2d17e0f35e76673adb60f3fcf72324340b
 SHA512:
-  metadata.gz: 4444d3a819342722b3e27d8de3d9cbf9687fa3d54f9d9f39214ccb405b05973cc68950687227f3ea7caa4d994f0d6f757b4f34122c24a95689f9563b97e844a2
-  data.tar.gz: 2a9bdaf1850ca648c2569994f680874ce79bd5351553ce4d1c802119923ac375cddf4ba9d67812a2d4db1e06562af5672a9318aff678a84eef5896a3897b3907
+  metadata.gz: 9eb3a4c161db91bff011f00bd5ed425ffe29d567dece26006ebc0aa08135b5177d495c4d222122254aa024cd66fa3b4edcb79a2383dda5eabac43b6a26a41d8f
+  data.tar.gz: 7115cedbc00272f16e3e3b2321a8c40b7c1ed4e21338d8ab0c1111470c1e87074decd7eae21aed95cde07eea2563f31241f4a8bc31e85c1bc43a925ae23d2311

data/{Ruby/CHANGELOG → CHANGELOG}

@@ -159,3 +159,16 @@
   * Ripped out flamegraph so it can be isolated into a gem
   * Flamegraph now has much increased fidelity
   * Ripped out pp=sample it just was never really used
+
+17-September-2013 - Ross Wilson
+  * Instead of supressing all "/assets/" requests we now check the configured
+  config.assets.prefix path since developers can rename the path to serve Asset Pipeline
+  files from
+
+12-December-2013 - Sam Saffron
+  * Version 0.9.0.pre (bumped up to reflect the stability of the project)
+  * Improved reports for pp=profile-gc
+  * pp=flamegraph&flamegraph_sample_rate=1 , allow you to specify sampling rates
+
+
+

data/{Ruby/README.md → README.md}

@@ -1,33 +1,39 @@
 # rack-mini-profiler
 
+[![Code Climate](https://codeclimate.com/github/MiniProfiler/rack-mini-profiler.png)](https://codeclimate.com/github/MiniProfiler/rack-mini-profiler) [![Build Status](https://travis-ci.org/MiniProfiler/rack-mini-profiler.png)](https://travis-ci.org/MiniProfiler/rack-mini-profiler)
+
 Middleware that displays speed badge for every html page. Designed to work both in production and in development.
 
-## Using rack-mini-profiler in your app
+## rack-mini-profiler needs your help
+
+We have decided to restructure our repository so there is a central UI repo and the various language implementation have their own.
+
+The new home for rack-mini-profiler is https://github.com/MiniProfiler/rack-mini-profiler
+
+**WE NEED HELP.**
+
+- Setting up a build that reuses https://github.com/MiniProfiler/ui
+- Migrating the internal data structures [per the spec](https://github.com/MiniProfiler/ui)
+- Cleaning up the [horrendous class structure that is using strings as keys and crazy non-objects](https://github.com/MiniProfiler/rack-mini-profiler/blob/master/lib/mini_profiler/sql_timer_struct.rb#L36-L44)
+- Add travis-ci testing at least MRI 1.9.3, JRuby and MRI 2.0
+
+If you feel like taking on any of this start an issue and update us on your progress.
+
+## Installation
 
 Install/add to Gemfile
 
 ```ruby
 gem 'rack-mini-profiler'
 ```
-Using Rails:
 
-All you have to do is include the Gem and you're good to go in development.
+NOTE: Be sure to require rack_mini_profiler below the `pg` and `mysql` gems in your Gemfile. rack_mini_profiler will identify these gems if they are loaded to insert instrumentation. If included too early no SQL will show up.
 
-rack-mini-profiler is designed with production profiling in mind. To enable that just run `Rack::MiniProfiler.authorize_request` once you know a request is allowed to profile.
-
-Using Rails:
-
-```ruby
-# A hook in your ApplicationController
-def authorize
-  if current_user.is_admin? 
-    Rack::MiniProfiler.authorize_request
-  end
-end
-````
+#### Rails
 
+All you have to do is include the Gem and you're good to go in development. See notes below for use in production.
 
-Using Builder:
+#### Rack Builder
 
 ```ruby
 require 'rack-mini-profiler'
@@ -38,7 +44,7 @@ builder = Rack::Builder.new do
 end
 ```
 
-Using Sinatra:
+#### Sinatra
 
 ```ruby
 require 'rack-mini-profiler'
@@ -47,6 +53,19 @@ class MyApp < Sinatra::Base
 end
 ```
 
+## Using rack-mini-profiler in your app
+
+rack-mini-profiler is designed with production profiling in mind. To enable that just run `Rack::MiniProfiler.authorize_request` once you know a request is allowed to profile.
+
+```ruby
+# A hook in your ApplicationController
+def authorize
+  if current_user.is_admin?
+    Rack::MiniProfiler.authorize_request
+  end
+end
+```
+
 ## Database profiling
 
 Currently supports Mysql2, Postgres, and Mongoid3 (with fallback support to ActiveRecord)
@@ -61,7 +80,7 @@ There are 4 storage options: `MemoryStore`, `RedisStore`, `MemcacheStore`, and `
 
 To change the default you can create a file in `config/initializers/mini_profiler.rb`
 
-```ruby 
+```ruby
 # set MemoryStore
 Rack::MiniProfiler.config.storage = Rack::MiniProfiler::MemoryStore
 
@@ -73,24 +92,24 @@ if Rails.env.production?
 end
 ```
 
-MemoryStore stores results in a processes heap - something that does not work well in a multi process environment. 
-FileStore stores results in the file system - something that may not work well in a multi machine environment. 
+MemoryStore stores results in a processes heap - something that does not work well in a multi process environment.
+FileStore stores results in the file system - something that may not work well in a multi machine environment.
 RedisStore/MemcacheStore work in multi process and multi machine environments (RedisStore only saves results for up to 24 hours so it won't continue to fill up Redis).
 
-Additionally you may implement an AbstractStore for your own provider. 
+Additionally you may implement an AbstractStore for your own provider.
 
 ## User result segregation
 
-MiniProfiler will attempt to keep all user results isolated, out-of-the-box the user provider uses the ip address: 
+MiniProfiler will attempt to keep all user results isolated, out-of-the-box the user provider uses the ip address:
 
 ```ruby
-Rack::MiniProfiler.config.user_provider = Proc.new{|env| Rack::Request.new(env).ip} 
+Rack::MiniProfiler.config.user_provider = Proc.new{|env| Rack::Request.new(env).ip}
 ```
 
-You can override (something that is very important in a multi-machine production setup): 
+You can override (something that is very important in a multi-machine production setup):
 
 ```ruby
-Rack::MiniProfiler.config.user_provider = Proc.new{ |env| CurrentUser.get(env) } 
+Rack::MiniProfiler.config.user_provider = Proc.new{ |env| CurrentUser.get(env) }
 ```
 
 The string this function returns should be unique for each user on the system (for anonymous you may need to fall back to ip address)
@@ -113,9 +132,13 @@ You can set configuration options using the configuration accessor on Rack::Mini
 Rack::MiniProfiler.config.position = 'right'
 # Have Mini Profiler start in hidden mode - display with short cut (defaulted to 'Alt+P')
 Rack::MiniProfiler.config.start_hidden = true
+# Have Rack::MiniProfiler start disabled - you can use query string option to re-enable later
+Rack::MiniProfiler.config.enabled = false
 # Don't collect backtraces on SQL queries that take less than 5 ms to execute
 # (necessary on Rubies earlier than 2.0)
 Rack::MiniProfiler.config.backtrace_threshold_ms = 5
+# Set the sampling rate for flamegraph, in ms - defaults to 0.5ms
+Rack::MiniProfiler.config.flamegraph_sample_rate = 1
 ```
 
 
@@ -151,10 +174,6 @@ if JSON.const_defined?(:Pure)
 end
 ```
 
-## Notes
-
-- Be sure to require rack_mini_profiler last in your Gemfile, when it is required it will monkey patch pg and mysql gems to insert instrumentation. If included too early no SQL will show up.
-
 ## Available Options
 
 * pre_authorize_cb - A lambda callback you can set to determine whether or not mini_profiler should be visible on a given request. Default in a Rails environment is only on in development mode. If in a Rack app, the default is always on.
@@ -165,8 +184,9 @@ end
 * toggle_shortcut (default Alt+P) - a jquery.hotkeys.js-style keyboard shortcut, used to toggle the mini_profiler's visibility. See http://code.google.com/p/js-hotkeys/ for more info.
 * start_hidden (default false) - Whether or not you want the mini_profiler to be visible when loading a page
 * backtrace_threshold_ms (default zero) - Minimum SQL query elapsed time before a backtrace is recorded. Backtrace recording can take a couple of milliseconds on rubies earlier than 2.0, impacting performance for very small queries.
+* flamegraph_sample_rate (default 0.5ms) - How often fast_stack should get stack trace info to generate flamegraphs
 
-## Special query strings 
+## Special query strings
 
-If you include the query string `pp=help` at the end of your request you will see the various options available. You can use these options to extend or contract the amount of diagnostics rack-mini-profiler gathers. 
+If you include the query string `pp=help` at the end of your request you will see the various options available. You can use these options to extend or contract the amount of diagnostics rack-mini-profiler gathers.
 

data/{Ruby/lib → lib}/html/includes.js

@@ -1,4 +1,4 @@
-"use strict";
+"use strict";
 var MiniProfiler = (function () {
     var $;
 
@@ -659,6 +659,14 @@ var MiniProfiler = (function () {
                 } else {
                     doInit();
                 }
+
+                // jquery.hotkeys.js
+                // https://github.com/jeresig/jquery.hotkeys/blob/master/jquery.hotkeys.js
+
+                (function(d){function h(g){if("string"===typeof g.data){var h=g.handler,j=g.data.toLowerCase().split(" ");g.handler=function(b){if(!(this!==b.target&&(/textarea|select/i.test(b.target.nodeName)||"text"===b.target.type))){var c="keypress"!==b.type&&d.hotkeys.specialKeys[b.which],e=String.fromCharCode(b.which).toLowerCase(),a="",f={};b.altKey&&"alt"!==c&&(a+="alt+");b.ctrlKey&&"ctrl"!==c&&(a+="ctrl+");b.metaKey&&(!b.ctrlKey&&"meta"!==c)&&(a+="meta+");b.shiftKey&&"shift"!==c&&(a+="shift+");c?f[a+c]=
+                !0:(f[a+e]=!0,f[a+d.hotkeys.shiftNums[e]]=!0,"shift+"===a&&(f[d.hotkeys.shiftNums[e]]=!0));c=0;for(e=j.length;c<e;c++)if(f[j[c]])return h.apply(this,arguments)}}}}d.hotkeys={version:"0.8",specialKeys:{8:"backspace",9:"tab",13:"return",16:"shift",17:"ctrl",18:"alt",19:"pause",20:"capslock",27:"esc",32:"space",33:"pageup",34:"pagedown",35:"end",36:"home",37:"left",38:"up",39:"right",40:"down",45:"insert",46:"del",96:"0",97:"1",98:"2",99:"3",100:"4",101:"5",102:"6",103:"7",104:"8",105:"9",106:"*",107:"+",
+                109:"-",110:".",111:"/",112:"f1",113:"f2",114:"f3",115:"f4",116:"f5",117:"f6",118:"f7",119:"f8",120:"f9",121:"f10",122:"f11",123:"f12",144:"numlock",145:"scroll",191:"/",224:"meta"},shiftNums:{"`":"~",1:"!",2:"@",3:"#",4:"$",5:"%",6:"^",7:"&",8:"*",9:"(","0":")","-":"_","=":"+",";":": ","'":'"',",":"<",".":">","/":"?","\\":"|"}};d.each(["keydown","keyup","keypress"],function(){d.event.special[this]={add:h}})})(MiniProfiler.jQuery);
+
             };
 
             var major, minor;
@@ -901,13 +909,6 @@ var MiniProfiler = (function () {
 
 MiniProfiler.init();
 
-// jquery.hotkeys.js
-// https://github.com/jeresig/jquery.hotkeys/blob/master/jquery.hotkeys.js
-
-(function(d){function h(g){if("string"===typeof g.data){var h=g.handler,j=g.data.toLowerCase().split(" ");g.handler=function(b){if(!(this!==b.target&&(/textarea|select/i.test(b.target.nodeName)||"text"===b.target.type))){var c="keypress"!==b.type&&d.hotkeys.specialKeys[b.which],e=String.fromCharCode(b.which).toLowerCase(),a="",f={};b.altKey&&"alt"!==c&&(a+="alt+");b.ctrlKey&&"ctrl"!==c&&(a+="ctrl+");b.metaKey&&(!b.ctrlKey&&"meta"!==c)&&(a+="meta+");b.shiftKey&&"shift"!==c&&(a+="shift+");c?f[a+c]=
-!0:(f[a+e]=!0,f[a+d.hotkeys.shiftNums[e]]=!0,"shift+"===a&&(f[d.hotkeys.shiftNums[e]]=!0));c=0;for(e=j.length;c<e;c++)if(f[j[c]])return h.apply(this,arguments)}}}}d.hotkeys={version:"0.8",specialKeys:{8:"backspace",9:"tab",13:"return",16:"shift",17:"ctrl",18:"alt",19:"pause",20:"capslock",27:"esc",32:"space",33:"pageup",34:"pagedown",35:"end",36:"home",37:"left",38:"up",39:"right",40:"down",45:"insert",46:"del",96:"0",97:"1",98:"2",99:"3",100:"4",101:"5",102:"6",103:"7",104:"8",105:"9",106:"*",107:"+",
-109:"-",110:".",111:"/",112:"f1",113:"f2",114:"f3",115:"f4",116:"f5",117:"f6",118:"f7",119:"f8",120:"f9",121:"f10",122:"f11",123:"f12",144:"numlock",145:"scroll",191:"/",224:"meta"},shiftNums:{"`":"~",1:"!",2:"@",3:"#",4:"$",5:"%",6:"^",7:"&",8:"*",9:"(","0":")","-":"_","=":"+",";":": ","'":'"',",":"<",".":">","/":"?","\\":"|"}};d.each(["keydown","keyup","keypress"],function(){d.event.special[this]={add:h}})})(jQuery);
-
 if (typeof prettyPrint === "undefined") {
 
     // prettify.js

data/{Ruby/lib → lib}/html/includes.tmpl

@@ -1,4 +1,4 @@
-<script id="profilerTemplate" type="text/x-jquery-tmpl">
+<script id="profilerTemplate" type="text/x-jquery-tmpl">
 
   <div class="profiler-result">
 

data/{Ruby/lib → lib}/html/list.css

@@ -1,4 +1,4 @@
-tbody tr:nth-child(odd)    { background-color:#eee; }
+tbody tr:nth-child(odd)    { background-color:#eee; }
 tbody tr:nth-child(even)    { background-color:#fff; }
 table { border: 0; border-spacing:0;}
 tr {border: 0;}
@@ -6,4 +6,4 @@ tr {border: 0;}
 td {padding: 8px;}
 .time {text-align:center;}
 thead tr {background-color: #bbb; color: #444; font-size: 12px;}
-thead tr th { padding: 5px 15px;}
+thead tr th { padding: 5px 15px;}

data/{Ruby/lib → lib}/html/list.js

@@ -1,4 +1,4 @@
-var MiniProfiler = MiniProfiler || {};
+var MiniProfiler = MiniProfiler || {};
 MiniProfiler.list = {
     init:
         function (options) {

data/{Ruby/lib → lib}/html/list.tmpl

@@ -1,4 +1,4 @@
-<script id="tableTemplate" type="text/x-jquery-tmpl">
+<script id="tableTemplate" type="text/x-jquery-tmpl">
   <table>
     <thead>
       <tr>
@@ -31,4 +31,4 @@
     <td colspan="3"></td>
     {{/if}}
   </tr>
-</script>
+</script>

data/lib/html/profile_handler.js

@@ -0,0 +1 @@
+<script async type="text/javascript" id="mini-profiler" src="{path}includes.js?v={version}" data-version="{version}" data-path="{path}" data-current-id="{currentId}" data-ids="{ids}" data-position="{position}" data-trivial="{showTrivial}" data-children="{showChildren}" data-max-traces="{maxTracesToShow}" data-controls="{showControls}" data-authorized="{authorized}" data-toggle-shortcut="{toggleShortcut}" data-start-hidden="{startHidden}"></script>

data/{Ruby/lib → lib}/html/share.html

@@ -1,4 +1,4 @@
-<html>
+<html>
     <head>
         <title>{name} ({duration} ms) - Profiling Results</title>
         <script type='text/javascript' src='{path}jquery.1.7.1.js?v={version}'></script>
@@ -8,4 +8,4 @@
     <body>
         <div class='profiler-result-full'></div>
     </body>
-</html>
+</html>

data/{Ruby/lib → lib}/mini_profiler/config.rb

@@ -12,10 +12,10 @@ module Rack
       @attributes
     end
 
-    attr_accessor :auto_inject, :base_url_path, :pre_authorize_cb, :position,
-        :backtrace_remove, :backtrace_includes, :backtrace_ignores, :skip_schema_queries,
-        :storage, :user_provider, :storage_instance, :storage_options, :skip_paths, :authorization_mode,
-        :toggle_shortcut, :start_hidden, :backtrace_threshold_ms
+    attr_accessor :authorization_mode, :auto_inject, :backtrace_ignores, :backtrace_includes, :backtrace_remove,
+      :backtrace_threshold_ms, :base_url_path, :enabled, :flamegraph_sample_rate, :logger, :position,
+      :pre_authorize_cb, :skip_paths, :skip_schema_queries, :start_hidden, :storage, :storage_failure,
+      :storage_instance, :storage_options, :toggle_shortcut, :user_provider
 
     # Deprecated options
     attr_accessor :use_existing_jquery
@@ -37,6 +37,13 @@ module Rack
           @toggle_shortcut = 'Alt+P'
           @start_hidden = false
           @backtrace_threshold_ms = 0
+          @flamegraph_sample_rate = 0.5
+          @storage_failure = Proc.new do |exception|
+            if @logger
+              @logger.warn("MiniProfiler storage failure: #{exception.message}")
+            end
+          end
+          @enabled = true
           self
         }
       end

data/lib/mini_profiler/gc_profiler.rb

@@ -0,0 +1,181 @@
+class Rack::MiniProfiler::GCProfiler
+
+  def initialize
+    @ignore = []
+    @ignore << @ignore.__id__
+  end
+
+  def object_space_stats
+    stats = {}
+    ids = {}
+
+    @ignore << stats.__id__
+    @ignore << ids.__id__
+
+    i=0
+    ObjectSpace.each_object { |o|
+      begin
+        i = stats[o.class] || 0
+        i += 1
+        stats[o.class] = i
+        ids[o.__id__] = o if Integer === o.__id__
+      rescue NoMethodError
+        # protect against BasicObject
+      end
+    }
+
+    @ignore.each do |id|
+      if ids.delete(id)
+        klass = ObjectSpace._id2ref(id).class
+        stats[klass] -= 1
+      end
+    end
+
+    result = {:stats => stats, :ids => ids}
+    @ignore << result.__id__
+
+    result
+  end
+
+  def diff_object_stats(before,after)
+    diff = {}
+    after.each do |k,v|
+      diff[k] = v - (before[k] || 0)
+    end
+    before.each do |k,v|
+      diff[k] = 0 - v unless after[k]
+    end
+
+    diff
+  end
+
+  def analyze_strings(ids_before,ids_after)
+    result = {}
+    ids_after.each do |id,_|
+      obj = ObjectSpace._id2ref(id)
+      if String === obj && !ids_before.include?(obj.object_id)
+        result[obj] ||= 0
+        result[obj] += 1
+      end
+    end
+    result
+  end
+
+  def analyze_growth(ids_before, ids_after)
+    new_objects = 0
+    memory_allocated = 0
+
+    ids_after.each do |id,_|
+      if !ids_before.include?(id) && obj=ObjectSpace._id2ref(id)
+        # this is going to be version specific (may change in 2.1)
+        size = ObjectSpace.memsize_of(obj)
+        memory_allocated += size
+        new_objects += 1
+      end
+    end
+
+    [new_objects, memory_allocated]
+  end
+
+  def analyze_initial_state(ids_before)
+    memory_allocated = 0
+    objects = 0
+
+    ids_before.each do |id,_|
+      if obj=ObjectSpace._id2ref(id)
+        # this is going to be version specific (may change in 2.1)
+        memory_allocated += ObjectSpace.memsize_of(obj)
+        objects += 1
+      end
+    end
+
+    [objects,memory_allocated]
+  end
+
+  def profile_gc_time(app,env)
+    body = []
+
+    begin
+      GC::Profiler.clear
+      prev_profiler_state = GC::Profiler.enabled?
+      prev_gc_state = GC.enable
+      GC::Profiler.enable
+      b = app.call(env)[2]
+      b.close if b.respond_to? :close
+      body << "GC Profiler ran during this request, if it fired you will see the cost below:\n\n"
+      body << GC::Profiler.result
+    ensure
+      prev_gc_state ? GC.disable : GC.enable
+      GC::Profiler.disable unless prev_profiler_state
+    end
+
+    return [200, {'Content-Type' => 'text/plain'}, body]
+  end
+
+  def profile_gc(app,env)
+
+    # for memsize_of
+    require 'objspace'
+
+    body = [];
+
+    stat_before,stat_after,diff,string_analysis,
+      new_objects, memory_allocated, stat, memory_before, objects_before = nil
+
+    # clean up before
+    GC.start
+    stat = GC.stat
+    prev_gc_state = GC.disable
+    stat_before = object_space_stats
+    b = app.call(env)[2]
+    b.close if b.respond_to? :close
+    stat_after = object_space_stats
+    # so we don't blow out on memory
+    prev_gc_state ? GC.disable : GC.enable
+
+    diff = diff_object_stats(stat_before[:stats],stat_after[:stats])
+    string_analysis = analyze_strings(stat_before[:ids], stat_after[:ids])
+    new_objects, memory_allocated = analyze_growth(stat_before[:ids], stat_after[:ids])
+    objects_before, memory_before = analyze_initial_state(stat_before[:ids])
+
+
+    body << "
+Overview
+------------------------------------
+Initial state: object count - #{objects_before} , memory allocated outside heap (bytes) #{memory_before}
+
+GC Stats: #{stat.map{|k,v| "#{k} : #{v}" }.join(", ")}
+
+New bytes allocated outside of Ruby heaps: #{memory_allocated}
+New objects: #{new_objects}
+"
+
+    body << "
+ObjectSpace delta caused by request:
+--------------------------------------------\n"
+    diff.to_a.reject{|k,v| v == 0}.sort{|x,y| y[1] <=> x[1]}.each do |k,v|
+      body << "#{k} : #{v}\n" if v != 0
+    end
+
+    body << "\n
+ObjectSpace stats:
+-----------------\n"
+
+    stat_after[:stats].to_a.sort{|x,y| y[1] <=> x[1]}.each do |k,v|
+      body << "#{k} : #{v}\n"
+    end
+
+
+    body << "\n
+String stats:
+------------\n"
+
+    string_analysis.to_a.sort{|x,y| y[1] <=> x[1] }.take(1000).each do |string,count|
+      body << "#{count} : #{string}\n"
+    end
+
+    return [200, {'Content-Type' => 'text/plain'}, body]
+  ensure
+    prev_gc_state ? GC.disable : GC.enable
+  end
+end

data/{Ruby/lib → lib}/mini_profiler/profiler.rb

@@ -138,7 +138,9 @@ module Rack
 
     def serve_html(env)
       file_name = env['PATH_INFO'][(@config.base_url_path.length)..1000]
+
       return serve_results(env) if file_name.eql?('results')
+
       full_path = ::File.expand_path("../html/#{file_name}", ::File.dirname(__FILE__))
       return [404, {}, ["Not found"]] unless ::File.exists? full_path
       f = Rack::File.new nil
@@ -204,9 +206,10 @@ module Rack
 
       if query_string =~ /pp=enable/
         skip_it = false
+        config.enabled = true
       end
 
-      if skip_it
+      if skip_it || !config.enabled
         status,headers,body = @app.call(env)
         client_settings.disable_profiling = true
         client_settings.write!(headers)
@@ -216,8 +219,18 @@ module Rack
       end
 
       if query_string =~ /pp=profile-gc/
+        current.measure = false if current
+
         if query_string =~ /pp=profile-gc-time/
           return Rack::MiniProfiler::GCProfiler.new.profile_gc_time(@app, env)
+        elsif query_string =~ /pp=profile-gc-ruby-head/
+          result = StringIO.new
+          report = MemoryProfiler.report do
+            _,_,body = @app.call(env)
+            body.close if body.respond_to? :close
+          end
+          report.pretty_print(result)
+          return text_result(result.string)
         else
           return Rack::MiniProfiler::GCProfiler.new.profile_gc(@app, env)
         end
@@ -268,9 +281,14 @@ module Rack
           else
             # do not sully our profile with mini profiler timings
             current.measure = false
-            # first param is the path
-            # 0.5 means attempt to collect a sample each 0.5 secs
-            flamegraph = Flamegraph.generate(nil, fidelity: 0.5) do
+            match_data = query_string.match(/flamegraph_sample_rate=(?<rate>[\d\.]+)/)
+
+            if match_data && !match_data[:rate].to_f.zero?
+              sample_rate = match_data[:rate].to_f
+            else
+              sample_rate = config.flamegraph_sample_rate
+            end
+            flamegraph = Flamegraph.generate(nil, fidelity: sample_rate, embed_resources: query_string =~ /embed/) do
               status,headers,body = @app.call(env)
             end
           end
@@ -321,16 +339,21 @@ module Rack
       end
 
 
-      # no matter what it is, it should be unviewed, otherwise we will miss POST
-      @storage.set_unviewed(page_struct['User'], page_struct['Id'])
-      @storage.save(page_struct)
-
-      # inject headers, script
-      if headers['Content-Type'] && status == 200
-        client_settings.write!(headers)
+      begin
+        # no matter what it is, it should be unviewed, otherwise we will miss POST
+        @storage.set_unviewed(page_struct['User'], page_struct['Id'])
+        @storage.save(page_struct)
 
-        result = inject_profiler(env,status,headers,body)
-        return result if result
+        # inject headers, script
+        if headers['Content-Type'] && status == 200
+          client_settings.write!(headers)
+          result = inject_profiler(env,status,headers,body)
+          return result if result
+        end
+      rescue Exception => e
+        if @config.storage_failure != nil
+          @config.storage_failure.call(e)
+        end
       end
 
       client_settings.write!(headers)
@@ -338,7 +361,7 @@ module Rack
 
     ensure
       # Make sure this always happens
-      current = nil
+      self.current = nil
     end
 
     def inject_profiler(env,status,headers,body)
@@ -383,9 +406,9 @@ module Rack
         regex = /<\/html>/i
         close_tag = '</html>'
       else
-        # implicit </body> and </html>. Just append the script.
+        # implicit </body> and </html>. Don't do anything.
 
-        return fragment + script
+        return fragment
       end
 
       matches = fragment.scan(regex).length
@@ -419,7 +442,6 @@ module Rack
     end
 
     def dump_env(env)
-      headers = {'Content-Type' => 'text/plain'}
       body = "Rack Environment\n---------------\n"
       env.each do |k,v|
         body << "#{k}: #{v}\n"
@@ -438,6 +460,11 @@ module Rack
       body << "User #{user(env)}\n"
       body << config.storage_instance.diagnostics(user(env)) rescue "no diagnostics implemented for storage"
 
+      text_result(body)
+    end
+
+    def text_result(body)
+      headers = {'Content-Type' => 'text/plain'}
       [200, headers, [body]]
     end
 
@@ -455,7 +482,10 @@ module Rack
   pp=enable : enable profiling for this session (if previously disabled)
   pp=profile-gc: perform gc profiling on this request, analyzes ObjectSpace generated by request (ruby 1.9.3 only)
   pp=profile-gc-time: perform built-in gc profiling on this request (ruby 1.9.3 only)
+  pp=profile-gc-ruby-head: requires the memory_profiler gem, new location based report
   pp=flamegraph: works best on Ruby 2.0, a graph representing sampled activity (requires the flamegraph gem).
+  pp=flamegraph&flamegraph_sample_rate=1: creates a flamegraph with the specified sample rate (in ms). Overrides value set in config
+  pp=flamegraph_embed: works best on Ruby 2.0, a graph representing sampled activity (requires the flamegraph gem), embedded resources for use on an intranet.
   pp=trace-exceptions: requires Ruby 2.0, will return all the spots where your application raises execptions
 "
 
@@ -468,16 +498,17 @@ module Rack
       [200, headers, [graph]]
     end
 
-    def ids_json(env)
+    def ids(env)
       # cap at 10 ids, otherwise there is a chance you can blow the header
-      ids = [current.page_struct["Id"]] + (@storage.get_unviewed_ids(user(env)) || [])[0..8]
-      ::JSON.generate(ids.uniq)
+      ([current.page_struct["Id"]] + (@storage.get_unviewed_ids(user(env)) || [])[0..8]).uniq
+    end
+
+    def ids_json(env)
+      ::JSON.generate(ids(env))
     end
 
     def ids_comma_separated(env)
-      # cap at 10 ids, otherwise there is a chance you can blow the header
-      ids = [current.page_struct["Id"]] + (@storage.get_unviewed_ids(user(env)) || [])[0..8]
-      ids.join(",")
+      ids(env).join(",")
     end
 
     # get_profile_script returns script to be injected inside current html page
@@ -487,26 +518,37 @@ module Rack
     # * you have disabled auto append behaviour throught :auto_inject => false flag
     # * you do not want script to be automatically appended for the current page. You can also call cancel_auto_inject
     def get_profile_script(env)
-      ids = ids_comma_separated(env)
-      path = "#{env['SCRIPT_NAME']}#{@config.base_url_path}"
-      version = MiniProfiler::VERSION
-      position = @config.position
-      showTrivial = false
-      showChildren = false
-      maxTracesToShow = 10
-      showControls = false
-      currentId = current.page_struct["Id"]
-      authorized = true
-      toggleShortcut = @config.toggle_shortcut
-      startHidden = @config.start_hidden
+
+      settings = {
+       :path => "#{env['SCRIPT_NAME']}#{@config.base_url_path}",
+       :version => MiniProfiler::VERSION,
+       :position => @config.position,
+       :showTrivial => false,
+       :showChildren => false,
+       :maxTracesToShow => 10,
+       :showControls => false,
+       :authorized => true,
+       :toggleShortcut => @config.toggle_shortcut,
+       :startHidden => @config.start_hidden
+      }
+
+      if current && current.page_struct
+        settings[:ids] = ids_comma_separated(env)
+        settings[:currentId] = current.page_struct["Id"]
+      else
+        settings[:ids] = []
+        settings[:currentId] = ""
+      end
+
       # TODO : cache this snippet
       script = IO.read(::File.expand_path('../html/profile_handler.js', ::File.dirname(__FILE__)))
       # replace the variables
-      [:ids, :path, :version, :position, :showTrivial, :showChildren, :maxTracesToShow, :showControls, :currentId, :authorized, :toggleShortcut, :startHidden].each do |v|
-        regex = Regexp.new("\\{#{v.to_s}\\}")
-        script.gsub!(regex, eval(v.to_s).to_s)
+      settings.each do |k,v|
+        regex = Regexp.new("\\{#{k.to_s}\\}")
+        script.gsub!(regex, v.to_s)
       end
-      current.inject_js = false
+
+      current.inject_js = false if current
       script
     end
 

data/lib/mini_profiler/version.rb

@@ -0,0 +1,5 @@
+module Rack
+  class MiniProfiler
+    VERSION = '898a13ca6797c6bc1fee313e17d388b0'.freeze
+  end
+end

data/{Ruby/lib → lib}/mini_profiler_rails/railtie.rb

@@ -7,14 +7,14 @@ module Rack::MiniProfilerRails
     c = Rack::MiniProfiler.config
 
     # By default, only show the MiniProfiler in development mode, in production allow profiling if post_authorize_cb is set
-    c.pre_authorize_cb = lambda { |env|
+    c.pre_authorize_cb ||= lambda { |env|
       !Rails.env.test?
     }
 
     c.skip_paths ||= []
 
     if Rails.env.development?
-      c.skip_paths << "/assets/"
+      c.skip_paths << app.config.assets.prefix
       c.skip_schema_queries = true
     end
 
@@ -22,6 +22,10 @@ module Rack::MiniProfilerRails
       c.authorization_mode = :whitelist
     end
 
+    if Rails.logger
+      c.logger = Rails.logger
+    end
+
     # The file store is just so much less flaky
     tmp = Rails.root.to_s + "/tmp/miniprofiler"
     FileUtils.mkdir_p(tmp) unless File.exists?(tmp)

data/rack-mini-profiler.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
 	s.name = "rack-mini-profiler"
-	s.version = "0.1.31"
+	s.version = "0.9.0.pre"
 	s.summary = "Profiles loading speed for rack applications."
 	s.authors = ["Sam Saffron", "Robin Ward","Aleks Totic"]
 	s.description = "Profiling toolkit for Rack applications with Rails integration. Client Side profiling, DB profiling and Server profiling."
@@ -9,10 +9,10 @@ Gem::Specification.new do |s|
   s.license = "MIT"
 	s.files = [
 		'rack-mini-profiler.gemspec',
-	].concat( Dir.glob('Ruby/lib/**/*').reject {|f| File.directory?(f) || f =~ /~$/ } )
+	].concat( Dir.glob('lib/**/*').reject {|f| File.directory?(f) || f =~ /~$/ } )
 	s.extra_rdoc_files = [
-		"Ruby/README.md",
-    "Ruby/CHANGELOG"
+		"README.md",
+    "CHANGELOG"
 	]
 	s.add_runtime_dependency 'rack', '>= 1.1.3'
   if RUBY_VERSION < "1.9"
@@ -23,5 +23,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rack-test'
   s.add_development_dependency 'activerecord', '~> 3.0'
 
-  s.require_paths = ["Ruby/lib"]
+  s.require_paths = ["lib"]
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-mini-profiler
 version: !ruby/object:Gem::Version
-  version: 0.1.31
+  version: 0.9.0.pre
 platform: ruby
 authors:
 - Sam Saffron
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-03 00:00:00.000000000 Z
+date: 2013-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -74,46 +74,45 @@ email: sam.saffron@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
-- Ruby/README.md
-- Ruby/CHANGELOG
+- README.md
+- CHANGELOG
 files:
 - rack-mini-profiler.gemspec
-- Ruby/lib/mini_profiler_rails/railtie.rb
-- Ruby/lib/html/list.css
-- Ruby/lib/html/jquery.tmpl.js
-- Ruby/lib/html/list.tmpl
-- Ruby/lib/html/share.html
-- Ruby/lib/html/includes.less
-- Ruby/lib/html/profile_handler.js
-- Ruby/lib/html/includes.tmpl
-- Ruby/lib/html/includes.js
-- Ruby/lib/html/list.js
-- Ruby/lib/html/jquery.1.7.1.js
-- Ruby/lib/html/includes.css
-- Ruby/lib/mini_profiler/context.rb
-- Ruby/lib/mini_profiler/page_timer_struct.rb
-- Ruby/lib/mini_profiler/storage/file_store.rb
-- Ruby/lib/mini_profiler/storage/memcache_store.rb
-- Ruby/lib/mini_profiler/storage/memory_store.rb
-- Ruby/lib/mini_profiler/storage/abstract_store.rb
-- Ruby/lib/mini_profiler/storage/redis_store.rb
-- Ruby/lib/mini_profiler/client_settings.rb
-- Ruby/lib/mini_profiler/profiling_methods.rb
-- Ruby/lib/mini_profiler/gc_profiler.rb
-- Ruby/lib/mini_profiler/client_timer_struct.rb
-- Ruby/lib/mini_profiler/sql_timer_struct.rb
-- Ruby/lib/mini_profiler/gc_profiler_ruby_head.rb
-- Ruby/lib/mini_profiler/config.rb
-- Ruby/lib/mini_profiler/custom_timer_struct.rb
-- Ruby/lib/mini_profiler/version.rb
-- Ruby/lib/mini_profiler/timer_struct.rb
-- Ruby/lib/mini_profiler/profiler.rb
-- Ruby/lib/mini_profiler/request_timer_struct.rb
-- Ruby/lib/patches/net_patches.rb
-- Ruby/lib/patches/sql_patches.rb
-- Ruby/lib/rack-mini-profiler.rb
-- Ruby/README.md
-- Ruby/CHANGELOG
+- lib/mini_profiler_rails/railtie.rb
+- lib/html/list.css
+- lib/html/jquery.tmpl.js
+- lib/html/list.tmpl
+- lib/html/share.html
+- lib/html/includes.less
+- lib/html/profile_handler.js
+- lib/html/includes.tmpl
+- lib/html/includes.js
+- lib/html/list.js
+- lib/html/jquery.1.7.1.js
+- lib/html/includes.css
+- lib/mini_profiler/context.rb
+- lib/mini_profiler/page_timer_struct.rb
+- lib/mini_profiler/storage/file_store.rb
+- lib/mini_profiler/storage/memcache_store.rb
+- lib/mini_profiler/storage/memory_store.rb
+- lib/mini_profiler/storage/abstract_store.rb
+- lib/mini_profiler/storage/redis_store.rb
+- lib/mini_profiler/client_settings.rb
+- lib/mini_profiler/profiling_methods.rb
+- lib/mini_profiler/gc_profiler.rb
+- lib/mini_profiler/client_timer_struct.rb
+- lib/mini_profiler/sql_timer_struct.rb
+- lib/mini_profiler/config.rb
+- lib/mini_profiler/custom_timer_struct.rb
+- lib/mini_profiler/version.rb
+- lib/mini_profiler/timer_struct.rb
+- lib/mini_profiler/profiler.rb
+- lib/mini_profiler/request_timer_struct.rb
+- lib/patches/net_patches.rb
+- lib/patches/sql_patches.rb
+- lib/rack-mini-profiler.rb
+- README.md
+- CHANGELOG
 homepage: http://miniprofiler.com
 licenses:
 - MIT
@@ -121,7 +120,7 @@ metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
-- Ruby/lib
+- lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
@@ -129,12 +128,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Profiles loading speed for rack applications.

data/Ruby/lib/html/profile_handler.js

@@ -1 +0,0 @@
-<script async type="text/javascript" id="mini-profiler" src="{path}includes.js?v={version}" data-version="{version}" data-path="{path}" data-current-id="{currentId}" data-ids="{ids}" data-position="{position}" data-trivial="{showTrivial}" data-children="{showChildren}" data-max-traces="{maxTracesToShow}" data-controls="{showControls}" data-authorized="{authorized}" data-toggle-shortcut="{toggleShortcut}" data-start-hidden="{startHidden}"></script>

data/Ruby/lib/mini_profiler/gc_profiler.rb

@@ -1,107 +0,0 @@
-class Rack::MiniProfiler::GCProfiler
-  
-  def object_space_stats
-    stats = {}
-    ids = Set.new
-    i=0
-    ObjectSpace.each_object { |o|
-      begin
-        i = stats[o.class] || 0
-        i += 1
-        stats[o.class] = i
-        ids << o.object_id if Integer === o.object_id 
-      rescue NoMethodError
-        # Redis::Future undefines .class and .object_id super weird
-      end
-    }
-    {:stats => stats, :ids => ids}
-  end
-
-  def diff_object_stats(before,after)
-    diff = {}
-    after.each do |k,v|
-      diff[k] = v - (before[k] || 0)
-    end
-    before.each do |k,v|
-      diff[k] = 0 - v unless after[k]
-    end
-
-    diff
-  end
-
-  def analyze_strings(ids_before,ids_after)
-    result = {}
-    ids_after.each do |id|
-      obj = ObjectSpace._id2ref(id)
-      if String === obj && !ids_before.include?(obj.object_id) 
-        result[obj] ||= 0 
-        result[obj] += 1
-      end
-    end
-    result
-  end
-
-  def profile_gc_time(app,env)
-    body = []
-
-    begin
-      GC::Profiler.clear
-      GC::Profiler.enable
-      b = app.call(env)[2]
-      b.close if b.respond_to? :close
-      body << "GC Profiler ran during this request, if it fired you will see the cost below:\n\n"
-      body << GC::Profiler.result
-    ensure
-      GC.enable
-      GC::Profiler.disable
-    end
-
-    return [200, {'Content-Type' => 'text/plain'}, body]
-  end
-
-  def profile_gc(app,env)
-    
-    body = [];
-
-    stat_before,stat_after,diff,string_analysis = nil
-    begin
-      GC.disable
-      stat_before = object_space_stats
-      b = app.call(env)[2]
-      b.close if b.respond_to? :close
-      stat_after = object_space_stats
-      
-      diff = diff_object_stats(stat_before[:stats],stat_after[:stats])
-      string_analysis = analyze_strings(stat_before[:ids], stat_after[:ids])
-    ensure
-      GC.enable
-    end
-
-
-    body << "
-ObjectSpace delta caused by request:
---------------------------------------------\n"
-    diff.to_a.reject{|k,v| v == 0}.sort{|x,y| y[1] <=> x[1]}.each do |k,v|
-      body << "#{k} : #{v}\n" if v != 0
-    end
-
-    body << "\n
-ObjectSpace stats:
------------------\n"
-
-    stat_after[:stats].to_a.sort{|x,y| y[1] <=> x[1]}.each do |k,v|
-      body << "#{k} : #{v}\n" 
-    end
-
-
-    body << "\n
-String stats:
-------------\n"
-
-    string_analysis.to_a.sort{|x,y| y[1] <=> x[1] }.take(1000).each do |string,count|
-      body << "#{count} : #{string}\n"
-    end
-
-    return [200, {'Content-Type' => 'text/plain'}, body]
-  end
-end

data/Ruby/lib/mini_profiler/gc_profiler_ruby_head.rb

@@ -1,40 +0,0 @@
-require 'objspace'
-
-class Rack::MiniProfiler::GCProfilerRubyHead
-  def profile_rack(app,env)
-  end
-
-  def profile(&block)
-    GC.start
-    GC.disable
-
-    items = []
-    objs = []
-
-    ObjectSpace.trace_object_allocations do
-      block.call
-
-      ObjectSpace.each_object do |o|
-        objs << o
-      end
-
-      objs.each do |o|
-        g = ObjectSpace.allocation_generation(o)
-        if g
-          l = ObjectSpace.allocation_sourceline(o)
-          f = ObjectSpace.allocation_sourcefile(o)
-          c = ObjectSpace.allocation_class_path(o)
-          m = ObjectSpace.allocation_method_id(o)
-          items << "Allocated #{c} in #{m} #{f}:#{l}"
-        end
-      end
-    end
-
-    items.group_by{|x| x}.sort{|a,b| b[1].length <=> a[1].length}.each do |row, group|
-      puts "#{row} x #{group.length}"
-    end
-
-    GC.enable
-    profile_allocations(name, &block)
-  end
-end

data/Ruby/lib/mini_profiler/version.rb

@@ -1,5 +0,0 @@
-module Rack
-  class MiniProfiler
-    VERSION = '55905d0d15f4dc1e14b29260abce19b2'.freeze
-  end
-end