rack-mini-profiler 2.0.4 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e54608bc4885796e11d6e4fac9cc56fe478f60c5cd43d53637451ef3524f086
-  data.tar.gz: 6a87a58c7821a279ce08b66432de9a199a6f775f897610e03e12d497eb7ccc46
+  metadata.gz: 287f0fe8da1845abde81f60250c960808168f0d278cf905786293c584fe78c23
+  data.tar.gz: c43613852efe89a7e59c642220b4609b086190473a0c2c5a83ead3b1abbdce9c
 SHA512:
-  metadata.gz: 3730c9e4610fd90cc0fac86c1cddcf6181e15cef5932ba86f8f8cbca1df77c02ba7847c2e1868b48e51299b6c51224fe533818c3cc245dd02a2da11b2298569c
-  data.tar.gz: 98f54eed006f7f13840481b777dbe4add5f9983c5ed367f8046a942a584a5ad3eb4ea5ae6e3aef7e4aa0760b37c78ac5dd6ee5bcd45e42091a943dfabdb343b1
+  metadata.gz: c4944a4bbf9021b4639dc18d5e13d6f901eef47785b1e66ac37b261307cf82f70dd5ebc242fb099fecada4c450594155e600150baedfd7cb2b1d7f7b7527ef69
+  data.tar.gz: ba0ee401a63f3fe3a27acc1812d790a1e11de26f6d6ffd38d34730bfec3ecf26c96f20f9912fe071917a31a346115c10cd959bff35516624d3f816c5aa84426c

data/CHANGELOG.md

@@ -1,5 +1,33 @@
 # CHANGELOG
 
+## 2.3.1 - 2021-01-29
+
+- [FIX] compatability with Ruby 3.0
+- [FIX] compatability with peek-mysql2
+
+## 2.3.0 - 2020-12-29
+
+- [FEATURE] flamegraphs are now based off speedscope
+
+## 2.2.1 - 2020-12-23
+
+- [FIX] Turbolinks integration causing increasing number of GET requests
+- [FEATURE] enahanced log transporter with compression and exponential backoff
+- [FEATURE] sameSite=Lax added to MiniProfiler cookie
+
+## 2.2.0 - 2020-10-19
+
+- [UX] Enhancements to snapshots UI
+- [FEATURE] Mini Profiler cookie is now sameSite=lax
+- [FEATURE] Snapshots transporter
+- [FEATURE] Redact SQL queries in snapshots by default
+
+## 2.1.0 - 2020-09-17
+
+- [FEATURE] Allow assets to be precompiled with Sprockets
+- [FEATURE] Snapshots sampling (see README in repo)
+- [FEATURE] Allow `skip_paths` config to contain regular expressions
+
 ## 2.0.4 - 2020-08-04
 
 - [FIX] webpacker may exist with no config, allow for that

data/README.md

@@ -1,7 +1,5 @@
 # rack-mini-profiler
 
-[![Code Climate](https://codeclimate.com/github/MiniProfiler/rack-mini-profiler/badges/gpa.svg)](https://codeclimate.com/github/MiniProfiler/rack-mini-profiler) [![Build Status](https://travis-ci.org/MiniProfiler/rack-mini-profiler.svg)](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.
 
 #### Features
@@ -43,7 +41,6 @@ You can also include optional libraries to enable additional features.
 gem 'memory_profiler'
 
 # For call-stack profiling flamegraphs
-gem 'flamegraph'
 gem 'stackprof'
 ```
 
@@ -81,6 +78,16 @@ gem 'rack-mini-profiler', require: ['prepend_net_http_patch']
 
 This conflict happens when a ruby method is patched twice, once using module prepend, and once using method aliasing. See this [ruby issue](https://bugs.ruby-lang.org/issues/11120) for details. The fix is to apply all patches the same way. Mini Profiler by default will apply its patch using method aliasing, but you can change that to module prepend by adding `require: ['prepend_net_http_patch']` to the gem line as shown above.
 
+#### `peek-mysql2` stack level too deep errors
+
+If you use peek-mysql2 with Rails >= 5, you'll need to use this gem spec in your Gemfile:
+
+```ruby
+gem 'rack-mini-profiler', require: ['prepend_mysql2_patch', 'rack-mini-profiler']
+```
+
+This should not be necessary with Rails < 5 because peek-mysql2 hooks into mysql2 gem in different ways depending on your Rails version.
+
 #### Rails and manual initialization
 
 In case you need to make sure rack_mini_profiler is initialized after all other gems, or you want to execute some code before rack_mini_profiler required:
@@ -161,7 +168,7 @@ export RACK_MINI_PROFILER_PATCH="false"
 
 To generate [flamegraphs](http://samsaffron.com/archive/2013/03/19/flame-graphs-in-ruby-miniprofiler):
 
-* add the [**flamegraph**](https://github.com/SamSaffron/flamegraph) gem to your Gemfile
+* add the [**stackprof**](https://rubygems.org/gems/stackprof) gem to your Gemfile
 * visit a page in your app with `?pp=flamegraph`
 
 ### Memory Profiling
@@ -186,6 +193,30 @@ There are two additional `pp` options that can be used to analyze memory which d
 * Use `?pp=profile-gc` to report on Garbage Collection statistics
 * Use `?pp=analyze-memory` to report on ObjectSpace statistics
 
+### Snapshots Sampling
+
+In a complex web application, it's possible for a request to trigger rare conditions that result in poor performance. Mini Profiler ships with a feature to help detect those rare conditions and fix them. It works by enabling invisible profiling on one request every N requests, and saving the performance metrics that are collected during the request (a.k.a snapshot of the request) so that they can be viewed later. To turn this feature on, set the `snapshot_every_n_requests` config to a value larger than 0. The larger the value is, the less frequently requests are profiled.
+
+Mini Profiler will exclude requests that are made to skippd paths (see `skip_paths` config below) from being sampled. Additionally, if profiling is enabled for a request that later finishes with a non-2xx status code, Mini Profiler will discard the snapshot and not save it (this behavior may change in the future).
+
+After enabling snapshots sampling, you can see the snapshots that have been collected at `/mini-profiler-resources/snapshots` (or if you changed the `base_url_path` config, substitute `mini-profiler-resources` with your value of the config). You'll see on that page a table where each row represents a group of snapshots with the duration of the worst snapshot in that group. The worst snapshot in a group is defined as the snapshot whose request took longer than all of the snapshots in the same group. Snapshots grouped by HTTP method and path of the request, and if your application is a Rails app, Mini Profiler will try to convert the path to `controller#action` and group by that instead of request path. Clicking on a group will display the snapshots of that group sorted from worst to best. From there, you can click on a snapshot's ID to see the snapshot with all the performance metrics that were collected.
+
+Access to the snapshots page is restricted to only those who can see the speed badge on their own requests, see the section below this one about access control.
+
+Mini Profiler will keep a maximum of 1000 snapshots by default, and you can change that via the `snapshots_limit` config. When snapshots reach the configured limit, Mini Profiler will save a new snapshot only if it's worse than at least one of the existing snapshots and delete the best one (i.e. the snapshot whose request took the least time compared to other snapshots).
+
+#### Snapshots Transporter
+
+Mini Profiler can be configured so that it sends snapshots over HTTP using the snapshots transporter. The main use-case of the transporter is to allow the aggregation of snapshots from multiple applications/sources in a single place. To enable the snapshots transporter, you need to provide a destination URL to the `snapshots_transport_destination_url` config, and a secure key to the `snapshots_transport_auth_key` config (will be used for authorization). Both of these configs are required for the transporter to be enabled.
+
+The transporter uses a buffer to temporarily hold snapshots in memory with a limit of 100 snapshots. Every 30 seconds, *if* the buffer is not empty, the transporter will make a `POST` request with the buffer content to the destination URL. Requests made by the transporter will have a `Mini-Profiler-Transport-Auth` header with the value of the `snapshots_transport_auth_key` config. The destination should only accept requests that include this header AND the header's value matches the key you set to the `snapshots_transport_auth_key` config.
+
+If the specified destination responds with a non-200 status code, the transporter will increase the interval between requests by `2^n` seconds where `n` is the number of failed requests since the last successful request. The base interval between requests is 30 seconds. So if a request fails, the next request will be `30 + 2^1 = 32` seconds later. If the next request fails too, the next one will be `30 + 2^2 = 34` seconds later and so on until a request succeeds at which point the interval will return to 30 seconds. The interval will not go beyond 1 hour.
+
+Requests made by the transporter can be optionally gzip-compressed by setting the `snapshots_transport_gzip_requests` config to true. The body of the requests (after decompression, if you opt for compression) is a JSON string with a single top-level key called `snapshots` and it has an array of snapshots. The structure of a snapshot is too complex to be explained here, but it has the same structure that Mini Profiler client expects. So if your use-case is to simply be able to view snapshots from multiple sources in one place, you should simply store the snapshots as-is, and then serve them to Mini Profiler client to consume. If the destination application also has Mini Profiler, you can simply use the API of the storage backends to store the incoming snapshots and Mini Profiler will treat them the same as local snapshots (e.g. they'll be grouped and displayed in the same manner described in the previous section).
+
+Mini Profiler offers an API to add extra fields (a.k.a custom fields) to snapshots. For example, you may want to add whether the request was made by a logged-in or anonymous user, the version of your application or any other things that are specific to your application. To add custom fields to a snapshot, call the `Rack::MiniProfiler.add_snapshot_custom_field(<key>, <value>)` method anywhere during the lifetime of a request, and the snapshot of that request will include the fields you added. If you have a Rails app, you can call that method in an `after_action` callback. Custom fields are cleared between requests.
+
 ## Access control in non-development environments
 
 rack-mini-profiler is designed with production profiling in mind. To enable that run `Rack::MiniProfiler.authorize_request` once you know a request is allowed to profile.
@@ -329,6 +360,15 @@ _Note:_ The GUID (`data-version` and the `?v=` parameter on the `src`) will chan
 #### Using MiniProfiler's built in route for apps without HTML responses
 MiniProfiler also ships with a `/rack-mini-profiler/requests` route that displays the speed badge on a blank HTML page. This can be useful when profiling an application that does not render HTML.
 
+#### Register MiniProfiler's assets in the Rails assets pipeline
+MiniProfiler can be configured so it registers its assets in the assets pipeline. To do that, you'll need to provide a lambda (or proc) to the `assets_url` config (see the below section). The callback will receive 3 arguments which are: `name` represents asset name (currently it's either `rack-mini-profiling.js` or `rack-mini-profiling.css`), `assets_version` is a 32 characters long hash of MiniProfiler's assets, and `env` which is the `env` object of the request. MiniProfiler expects the `assets_url` callback to return a URL from which the asset can be loaded (the return value will be used as a `href`/`src` attribute in the DOM). If the `assets_url` callback is not set (the default) or it returns a non-truthy value, MiniProfiler will fallback to loading assets from its own middleware (`/mini-profiler-resources/*`). The following callback should work for most applications:
+
+```ruby
+Rack::MiniProfiler.config.assets_url = ->(name, version, env) {
+  ActionController::Base.helpers.asset_path(name)
+}
+```
+
 ### Configuration Options
 
 You can set configuration options using the configuration accessor on `Rack::MiniProfiler`.
@@ -344,7 +384,7 @@ Option|Default|Description
 -------|---|--------
 pre_authorize_cb|Rails: dev only<br>Rack: always on|A lambda callback that returns true to make mini_profiler visible on a given request.
 position|`'top-left'`|Display mini_profiler on `'top-right'`, `'top-left'`, `'bottom-right'` or `'bottom-left'`.
-skip_paths|`[]`|Paths that skip profiling.
+skip_paths|`[]`|An array of paths that skip profiling. Both `String` and `Regexp` are acceptable in the array.
 skip_schema_queries|Rails dev: `true`<br>Othwerwise: `false`|`true` to skip schema queries.
 auto_inject|`true`|`true` to inject the miniprofiler script in the page.
 backtrace_ignores|`[]`|Regexes of lines to be removed from backtraces.
@@ -360,6 +400,14 @@ max_traces_to_show|20|Maximum number of mini profiler timing blocks to show on o
 html_container|`body`|The HTML container (as a jQuery selector) to inject the mini_profiler UI into
 show_total_sql_count|`false`|Displays the total number of SQL executions.
 enable_advanced_debugging_tools|`false`|Enables sensitive debugging tools that can be used via the UI. In production we recommend keeping this disabled as memory and environment debugging tools can expose contents of memory that may contain passwords.
+assets_url|`nil`|See the "Register MiniProfiler's assets in the Rails assets pipeline" section above.
+snapshot_every_n_requests|`-1`|Determines how frequently snapshots are taken. See the "Snapshots Sampling" above for more details.
+snapshots_limit|`1000`|Determines how many snapshots Mini Profiler is allowed to keep.
+snapshot_hidden_custom_fields|`[]`|Each snapshot custom field will have a dedicated column in the UI by default. Use this config to exclude certain custom fields from having their own columns.
+snapshots_transport_destination_url|`nil`|Set this config to a valid URL to enable snapshots transporter which will `POST` snapshots to the given URL. The transporter requires `snapshots_transport_auth_key` config to be set as well.
+snapshots_transport_auth_key|`nil`|`POST` requests made by the snapshots transporter to the destination URL will have a `Mini-Profiler-Transport-Auth` header with the value of this config. Make sure you use a secure and random key for this config.
+snapshots_redact_sql_queries|`true`|When this is true, SQL queries will be redacted from sampling snapshots, but the backtrace and duration of each SQL query will be saved with the snapshot to keep debugging performance issues possible.
+snapshots_transport_gzip_requests|`false`|Make the snapshots transporter gzip the requests it makes to `snapshots_transport_destination_url`.
 
 ### Using MiniProfiler with `Rack::Deflate` middleware
 

data/lib/html/includes.css

@@ -1,9 +1,20 @@
 @charset "UTF-8";
+.mp-snapshots,
 .profiler-result,
 .profiler-queries {
   color: #555;
   line-height: 1;
   font-size: 12px; }
+  .mp-snapshots pre,
+  .mp-snapshots code,
+  .mp-snapshots label,
+  .mp-snapshots table,
+  .mp-snapshots tbody,
+  .mp-snapshots thead,
+  .mp-snapshots tfoot,
+  .mp-snapshots tr,
+  .mp-snapshots th,
+  .mp-snapshots td,
   .profiler-result pre,
   .profiler-result code,
   .profiler-result label,
@@ -33,27 +44,40 @@
     background-color: transparent;
     overflow: visible;
     max-height: none; }
+  .mp-snapshots table,
   .profiler-result table,
   .profiler-queries table {
     border-collapse: collapse;
     border-spacing: 0; }
+  .mp-snapshots a,
+  .mp-snapshots a:hover,
   .profiler-result a,
   .profiler-result a:hover,
   .profiler-queries a,
   .profiler-queries a:hover {
     cursor: pointer;
     color: #0077cc; }
+  .mp-snapshots a,
   .profiler-result a,
   .profiler-queries a {
     text-decoration: none; }
+    .mp-snapshots a:hover,
     .profiler-result a:hover,
     .profiler-queries a:hover {
       text-decoration: underline; }
+  .mp-snapshots .custom-fields-title,
+  .profiler-result .custom-fields-title,
+  .profiler-queries .custom-fields-title {
+    color: #555;
+    font: Helvetica, Arial, sans-serif;
+    font-size: 14px; }
 
 .profiler-result {
   font-family: Helvetica, Arial, sans-serif; }
   .profiler-result .profiler-toggle-duration-with-children {
     float: right; }
+  .profiler-result .profiler-snapshots-page-link {
+    float: left; }
   .profiler-result table.profiler-client-timings {
     margin-top: 10px; }
   .profiler-result .profiler-label {
@@ -402,3 +426,17 @@
     background: #ffffbb; }
   100% {
     background: #fff; } }
+
+.mp-snapshots {
+  font-family: Helvetica, Arial, sans-serif;
+  font-size: 16px; }
+  .mp-snapshots .snapshots-table thead {
+    background: #6a737c;
+    color: #ffffff; }
+  .mp-snapshots .snapshots-table th, .mp-snapshots .snapshots-table td {
+    padding: 5px 10px;
+    box-sizing: border-box; }
+    .mp-snapshots .snapshots-table th:not(.request-group), .mp-snapshots .snapshots-table td:not(.request-group) {
+      text-align: center; }
+  .mp-snapshots .snapshots-table th {
+    border-right: 1px solid #ffffff; }

data/lib/html/includes.js

@@ -1,12 +1,13 @@
 "use strict";
 
-var MiniProfiler = (function() {
+var _MiniProfiler = (function() {
   var _arguments = arguments;
   var options,
     container,
     controls,
-    fetchedIds = [],
-    fetchingIds = [],
+    fetchedIds = (window.MiniProfiler && window.MiniProfiler.fetchedIds) || [],
+    fetchingIds =
+      (window.MiniProfiler && window.MiniProfiler.fetchingIds) || [],
     // so we never pull down a profiler twice
     ajaxStartTime,
     totalsControl,
@@ -634,6 +635,10 @@ var MiniProfiler = (function() {
     }
   };
 
+  var turbolinksSkipResultsFetch = function turbolinksSkipResultsFetch(event) {
+    event.data.xhr.__miniProfilerSkipResultsFetch = true;
+  };
+
   var bindDocumentEvents = function bindDocumentEvents() {
     document.addEventListener("click", onClickEvents);
     document.addEventListener("keyup", onClickEvents);
@@ -642,6 +647,10 @@ var MiniProfiler = (function() {
     if (typeof Turbolinks !== "undefined" && Turbolinks.supported) {
       document.addEventListener("page:change", unbindDocumentEvents);
       document.addEventListener("turbolinks:load", unbindDocumentEvents);
+      document.addEventListener(
+        "turbolinks:request-start",
+        turbolinksSkipResultsFetch
+      );
     }
   };
 
@@ -651,6 +660,10 @@ var MiniProfiler = (function() {
     document.removeEventListener("keyup", toggleShortcutEvent);
     document.removeEventListener("page:change", unbindDocumentEvents);
     document.removeEventListener("turbolinks:load", unbindDocumentEvents);
+    document.removeEventListener(
+      "turbolinks:request-start",
+      turbolinksSkipResultsFetch
+    );
   };
 
   var initFullView = function initFullView() {
@@ -673,6 +686,34 @@ var MiniProfiler = (function() {
     });
   };
 
+  var initSnapshots = function initSnapshots(dataElement) {
+    var data = JSON.parse(dataElement.textContent);
+    var temp = document.createElement("DIV");
+    if (data.page === "overview") {
+      temp.innerHTML = MiniProfiler.templates.snapshotsGroupsList(data);
+    } else if (data.group_name) {
+      var allCustomFieldsNames = [];
+      data.list.forEach(function(snapshot) {
+        Object.keys(snapshot.custom_fields).forEach(function(k) {
+          if (
+            allCustomFieldsNames.indexOf(k) === -1 &&
+            options.hiddenCustomFields.indexOf(k.toLowerCase()) === -1
+          ) {
+            allCustomFieldsNames.push(k);
+          }
+        });
+      });
+      allCustomFieldsNames.sort();
+      temp.innerHTML = MiniProfiler.templates.snapshotsList({
+        data: data,
+        allCustomFieldsNames: allCustomFieldsNames
+      });
+    }
+    Array.from(temp.children).forEach(function(child) {
+      document.body.appendChild(child);
+    });
+  };
+
   var initControls = function initControls(container) {
     if (options.showControls) {
       var _controls = document.createElement("div");
@@ -741,218 +782,225 @@ var MiniProfiler = (function() {
       fetchResults(options.ids);
     }
 
-    var send = XMLHttpRequest.prototype.send;
-
-    XMLHttpRequest.prototype.send = function(data) {
-      ajaxStartTime = new Date();
-      this.addEventListener("load", function() {
-        // responseURL isn't available in IE11
-        if (
-          this.responseURL &&
-          this.responseURL.indexOf(window.location.origin) !== 0
-        ) {
-          return;
-        }
-        // getAllResponseHeaders isn't available in Edge.
-        var allHeaders = this.getAllResponseHeaders
-          ? this.getAllResponseHeaders()
-          : null;
-        if (
-          allHeaders &&
-          allHeaders.toLowerCase().indexOf("x-miniprofiler-ids") === -1
-        ) {
-          return;
-        }
-        // should be a string of comma-separated ids
-        var stringIds = this.getResponseHeader("X-MiniProfiler-Ids");
-
-        if (stringIds) {
-          var ids = stringIds.split(",");
-          fetchResults(ids);
-        }
-      });
-      send.call(this, data);
-    }; // fetch results after ASP Ajax calls
-
-    if (
-      typeof Sys != "undefined" &&
-      typeof Sys.WebForms != "undefined" &&
-      typeof Sys.WebForms.PageRequestManager != "undefined"
-    ) {
-      // Get the instance of PageRequestManager.
-      var PageRequestManager = Sys.WebForms.PageRequestManager.getInstance();
-      PageRequestManager.add_endRequest(function(sender, args) {
-        if (args) {
-          var response = args.get_response();
+    if (!window.MiniProfiler || !window.MiniProfiler.patchesApplied) {
+      var send = XMLHttpRequest.prototype.send;
 
+      XMLHttpRequest.prototype.send = function(data) {
+        ajaxStartTime = new Date();
+        this.addEventListener("load", function() {
+          // responseURL isn't available in IE11
           if (
-            response.get_responseAvailable() &&
-            response._xmlHttpRequest !== null
+            this.responseURL &&
+            this.responseURL.indexOf(window.location.origin) !== 0
           ) {
-            var stringIds = args
-              .get_response()
-              .getResponseHeader("X-MiniProfiler-Ids");
-
-            if (stringIds) {
-              var ids = stringIds.split(",");
-              fetchResults(ids);
-            }
+            return;
           }
-        }
-      });
-    } // more Asp.Net callbacks
-
-    if (typeof WebForm_ExecuteCallback == "function") {
-      WebForm_ExecuteCallback = (function(callbackObject) {
-        // Store original function
-        var original = WebForm_ExecuteCallback;
-        return function(callbackObject) {
-          original(callbackObject);
-          var stringIds = callbackObject.xmlRequest.getResponseHeader(
-            "X-MiniProfiler-Ids"
-          );
+          if (this.__miniProfilerSkipResultsFetch) {
+            return;
+          }
+          // getAllResponseHeaders isn't available in Edge.
+          var allHeaders = this.getAllResponseHeaders
+            ? this.getAllResponseHeaders()
+            : null;
+          if (
+            allHeaders &&
+            allHeaders.toLowerCase().indexOf("x-miniprofiler-ids") === -1
+          ) {
+            return;
+          }
+          // should be a string of comma-separated ids
+          var stringIds = this.getResponseHeader("X-MiniProfiler-Ids");
 
           if (stringIds) {
             var ids = stringIds.split(",");
             fetchResults(ids);
           }
-        };
-      })();
-    } // also fetch results after ExtJS requests, in case it is being used
+        });
+        send.call(this, data);
+      }; // fetch results after ASP Ajax calls
 
-    if (
-      typeof Ext != "undefined" &&
-      typeof Ext.Ajax != "undefined" &&
-      typeof Ext.Ajax.on != "undefined"
-    ) {
-      // Ext.Ajax is a singleton, so we just have to attach to its 'requestcomplete' event
-      Ext.Ajax.on("requestcomplete", function(e, xhr, settings) {
-        //iframed file uploads don't have headers
-        if (!xhr || !xhr.getResponseHeader) {
-          return;
-        }
+      if (
+        typeof Sys != "undefined" &&
+        typeof Sys.WebForms != "undefined" &&
+        typeof Sys.WebForms.PageRequestManager != "undefined"
+      ) {
+        // Get the instance of PageRequestManager.
+        var PageRequestManager = Sys.WebForms.PageRequestManager.getInstance();
+        PageRequestManager.add_endRequest(function(sender, args) {
+          if (args) {
+            var response = args.get_response();
+
+            if (
+              response.get_responseAvailable() &&
+              response._xmlHttpRequest !== null
+            ) {
+              var stringIds = args
+                .get_response()
+                .getResponseHeader("X-MiniProfiler-Ids");
+
+              if (stringIds) {
+                var ids = stringIds.split(",");
+                fetchResults(ids);
+              }
+            }
+          }
+        });
+      } // more Asp.Net callbacks
+
+      if (typeof WebForm_ExecuteCallback == "function") {
+        WebForm_ExecuteCallback = (function(callbackObject) {
+          // Store original function
+          var original = WebForm_ExecuteCallback;
+          return function(callbackObject) {
+            original(callbackObject);
+            var stringIds = callbackObject.xmlRequest.getResponseHeader(
+              "X-MiniProfiler-Ids"
+            );
 
-        var stringIds = xhr.getResponseHeader("X-MiniProfiler-Ids");
+            if (stringIds) {
+              var ids = stringIds.split(",");
+              fetchResults(ids);
+            }
+          };
+        })();
+      } // also fetch results after ExtJS requests, in case it is being used
 
-        if (stringIds) {
-          var ids = stringIds.split(",");
-          fetchResults(ids);
-        }
-      });
-    }
+      if (
+        typeof Ext != "undefined" &&
+        typeof Ext.Ajax != "undefined" &&
+        typeof Ext.Ajax.on != "undefined"
+      ) {
+        // Ext.Ajax is a singleton, so we just have to attach to its 'requestcomplete' event
+        Ext.Ajax.on("requestcomplete", function(e, xhr, settings) {
+          //iframed file uploads don't have headers
+          if (!xhr || !xhr.getResponseHeader) {
+            return;
+          }
 
-    if (typeof MooTools != "undefined" && typeof Request != "undefined") {
-      Request.prototype.addEvents({
-        onComplete: function onComplete() {
-          var stringIds = this.xhr.getResponseHeader("X-MiniProfiler-Ids");
+          var stringIds = xhr.getResponseHeader("X-MiniProfiler-Ids");
 
           if (stringIds) {
             var ids = stringIds.split(",");
             fetchResults(ids);
           }
-        }
-      });
-    } // add support for AngularJS, which use the basic XMLHttpRequest object.
-
-    if (window.angular && typeof XMLHttpRequest != "undefined") {
-      var _send = XMLHttpRequest.prototype.send;
-
-      XMLHttpRequest.prototype.send = function sendReplacement(data) {
-        if (this.onreadystatechange) {
-          if (
-            typeof this.miniprofiler == "undefined" ||
-            typeof this.miniprofiler.prev_onreadystatechange == "undefined"
-          ) {
-            this.miniprofiler = {
-              prev_onreadystatechange: this.onreadystatechange
-            };
+        });
+      }
 
-            this.onreadystatechange = function onReadyStateChangeReplacement() {
-              if (this.readyState == 4) {
-                var stringIds = this.getResponseHeader("X-MiniProfiler-Ids");
+      if (typeof MooTools != "undefined" && typeof Request != "undefined") {
+        Request.prototype.addEvents({
+          onComplete: function onComplete() {
+            var stringIds = this.xhr.getResponseHeader("X-MiniProfiler-Ids");
 
-                if (stringIds) {
-                  var ids = stringIds.split(",");
-                  fetchResults(ids);
+            if (stringIds) {
+              var ids = stringIds.split(",");
+              fetchResults(ids);
+            }
+          }
+        });
+      } // add support for AngularJS, which use the basic XMLHttpRequest object.
+
+      if (window.angular && typeof XMLHttpRequest != "undefined") {
+        var _send = XMLHttpRequest.prototype.send;
+
+        XMLHttpRequest.prototype.send = function sendReplacement(data) {
+          if (this.onreadystatechange) {
+            if (
+              typeof this.miniprofiler == "undefined" ||
+              typeof this.miniprofiler.prev_onreadystatechange == "undefined"
+            ) {
+              this.miniprofiler = {
+                prev_onreadystatechange: this.onreadystatechange
+              };
+
+              this.onreadystatechange = function onReadyStateChangeReplacement() {
+                if (this.readyState == 4) {
+                  var stringIds = this.getResponseHeader("X-MiniProfiler-Ids");
+
+                  if (stringIds) {
+                    var ids = stringIds.split(",");
+                    fetchResults(ids);
+                  }
                 }
-              }
 
-              if (this.miniprofiler.prev_onreadystatechange !== null)
-                return this.miniprofiler.prev_onreadystatechange.apply(
-                  this,
-                  arguments
-                );
-            };
+                if (this.miniprofiler.prev_onreadystatechange !== null)
+                  return this.miniprofiler.prev_onreadystatechange.apply(
+                    this,
+                    arguments
+                  );
+              };
+            }
           }
-        }
-
-        return _send.apply(this, arguments);
-      };
-    } // https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API
 
-    if (
-      typeof window.fetch === "function" &&
-      window.fetch.__patchedByMiniProfiler === undefined
-    ) {
-      var __originalFetch = window.fetch;
+          return _send.apply(this, arguments);
+        };
+      } // https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API
 
-      window.fetch = function(input, init) {
-        var originalFetchRun = __originalFetch(input, init);
+      if (typeof window.fetch === "function") {
+        var __originalFetch = window.fetch;
 
-        originalFetchRun.then(function(response) {
-          try {
-            // look for x-mini-profile-ids
-            var entries = response.headers.entries();
-            var _iteratorNormalCompletion = true;
-            var _didIteratorError = false;
-            var _iteratorError = undefined;
+        window.fetch = function(input, init) {
+          var originalFetchRun = __originalFetch(input, init);
 
+          originalFetchRun.then(function(response) {
             try {
-              for (
-                var _iterator = entries[Symbol.iterator](), _step;
-                !(_iteratorNormalCompletion = (_step = _iterator.next()).done);
-                _iteratorNormalCompletion = true
-              ) {
-                var pair = _step.value;
-
-                if (pair[0] && pair[0].toLowerCase() == "x-miniprofiler-ids") {
-                  var ids = pair[1].split(",");
-                  fetchResults(ids);
-                }
-              }
-            } catch (err) {
-              _didIteratorError = true;
-              _iteratorError = err;
-            } finally {
+              // look for x-mini-profile-ids
+              var entries = response.headers.entries();
+              var _iteratorNormalCompletion = true;
+              var _didIteratorError = false;
+              var _iteratorError = undefined;
+
               try {
-                if (!_iteratorNormalCompletion && _iterator.return != null) {
-                  _iterator.return();
+                for (
+                  var _iterator = entries[Symbol.iterator](), _step;
+                  !(_iteratorNormalCompletion = (_step = _iterator.next())
+                    .done);
+                  _iteratorNormalCompletion = true
+                ) {
+                  var pair = _step.value;
+
+                  if (
+                    pair[0] &&
+                    pair[0].toLowerCase() == "x-miniprofiler-ids"
+                  ) {
+                    var ids = pair[1].split(",");
+                    fetchResults(ids);
+                  }
                 }
+              } catch (err) {
+                _didIteratorError = true;
+                _iteratorError = err;
               } finally {
-                if (_didIteratorError) {
-                  throw _iteratorError;
+                try {
+                  if (!_iteratorNormalCompletion && _iterator.return != null) {
+                    _iterator.return();
+                  }
+                } finally {
+                  if (_didIteratorError) {
+                    throw _iteratorError;
+                  }
                 }
               }
+            } catch (e) {
+              console.error(e);
             }
-          } catch (e) {
-            console.error(e);
-          }
-        });
-        return originalFetchRun;
-      };
-
-      window.fetch.__patchedByMiniProfiler = true;
-    } // some elements want to be hidden on certain doc events
+          });
+          return originalFetchRun;
+        };
+      }
+      window.MiniProfiler.patchesApplied = true;
+    }
 
     bindDocumentEvents();
   };
 
   return {
+    fetchedIds: fetchedIds,
+    fetchingIds: fetchingIds,
     init: function init() {
       var script = document.getElementById("mini-profiler");
       if (!script || !script.getAttribute) return;
 
-      options = (function() {
+      this.options = options = (function() {
         var version = script.getAttribute("data-version");
         var path = script.getAttribute("data-path");
         var currentId = script.getAttribute("data-current-id");
@@ -980,6 +1028,11 @@ var MiniProfiler = (function() {
           script.getAttribute("data-start-hidden") === "true" ||
           sessionStorage["rack-mini-profiler-start-hidden"] === "true";
         var htmlContainer = script.getAttribute("data-html-container");
+        var cssUrl = script.getAttribute("data-css-url");
+        var hiddenCustomFields = script
+          .getAttribute("data-hidden-custom-fields")
+          .toLowerCase()
+          .split(",");
         return {
           ids: ids,
           path: path,
@@ -996,11 +1049,19 @@ var MiniProfiler = (function() {
           toggleShortcut: toggleShortcut,
           startHidden: startHidden,
           collapseResults: collapseResults,
-          htmlContainer: htmlContainer
+          htmlContainer: htmlContainer,
+          cssUrl: cssUrl,
+          hiddenCustomFields: hiddenCustomFields
         };
       })();
 
       var doInit = function doInit() {
+        var snapshotsElement = document.getElementById("snapshots-data");
+        if (snapshotsElement != null) {
+          initSnapshots(snapshotsElement);
+          return;
+        }
+
         // when rendering a shared, full page, this div will exist
         container = document.querySelectorAll(".profiler-result-full");
 
@@ -1056,7 +1117,7 @@ var MiniProfiler = (function() {
 
       var init = function init() {
         if (options.authorized) {
-          var url = options.path + "includes.css?v=" + options.version;
+          var url = options.cssUrl;
 
           if (document.createStyleSheet) {
             document.createStyleSheet(url);
@@ -1394,8 +1455,37 @@ var MiniProfiler = (function() {
     },
     showTotalSqlCount: function showTotalSqlCount() {
       return options.showTotalSqlCount;
+    },
+    timestampToRelative: function timestampToRelative(timestamp) {
+      var now = Math.round(new Date().getTime() / 1000);
+      timestamp = Math.round(timestamp / 1000);
+      var diff = now - timestamp;
+      if (diff < 60) {
+        return "< 1 minute";
+      }
+      var buildDisplayTime = function buildDisplayTime(num, unit) {
+        var res = num + " " + unit;
+        if (num !== 1) {
+          res += "s";
+        }
+        return res;
+      };
+      diff = Math.round(diff / 60);
+      if (diff <= 60) {
+        return buildDisplayTime(diff, "minute");
+      }
+      diff = Math.round(diff / 60);
+      if (diff <= 24) {
+        return buildDisplayTime(diff, "hour");
+      }
+      diff = Math.round(diff / 24);
+      return buildDisplayTime(diff, "day");
     }
   };
 })();
 
-MiniProfiler.init();
+if (window.MiniProfiler) {
+  _MiniProfiler.patchesApplied = window.MiniProfiler.patchesApplied;
+}
+window.MiniProfiler = _MiniProfiler;
+_MiniProfiler.init();