rack-mini-profiler 2.2.0 → 2.3.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (37) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +19 -0
  3. data/README.md +25 -11
  4. data/lib/html/includes.js +213 -182
  5. data/lib/html/includes.tmpl +4 -1
  6. data/lib/html/speedscope/LICENSE +21 -0
  7. data/lib/html/speedscope/README.md +3 -0
  8. data/lib/html/speedscope/demangle-cpp.1768f4cc.js +4 -0
  9. data/lib/html/speedscope/favicon-16x16.f74b3187.png +0 -0
  10. data/lib/html/speedscope/favicon-32x32.bc503437.png +0 -0
  11. data/lib/html/speedscope/file-format-schema.json +324 -0
  12. data/lib/html/speedscope/fonts/source-code-pro-regular.css +8 -0
  13. data/lib/html/speedscope/fonts/source-code-pro-v13-regular.woff +0 -0
  14. data/lib/html/speedscope/fonts/source-code-pro-v13-regular.woff2 +0 -0
  15. data/lib/html/speedscope/import.cf0fa83f.js +115 -0
  16. data/lib/html/speedscope/index.html +2 -0
  17. data/lib/html/speedscope/release.txt +3 -0
  18. data/lib/html/speedscope/reset.8c46b7a1.css +2 -0
  19. data/lib/html/speedscope/source-map.438fa06b.js +24 -0
  20. data/lib/html/speedscope/speedscope.44364064.js +200 -0
  21. data/lib/html/vendor.js +2 -2
  22. data/lib/mini_profiler/asset_version.rb +1 -1
  23. data/lib/mini_profiler/client_settings.rb +5 -5
  24. data/lib/mini_profiler/config.rb +19 -1
  25. data/lib/mini_profiler/profiler.rb +82 -20
  26. data/lib/mini_profiler/profiling_methods.rb +3 -1
  27. data/lib/mini_profiler/snapshots_transporter.rb +31 -6
  28. data/lib/mini_profiler/storage/abstract_store.rb +1 -1
  29. data/lib/mini_profiler/timer_struct/page.rb +9 -3
  30. data/lib/mini_profiler/version.rb +1 -1
  31. data/lib/mini_profiler_rails/railtie.rb +1 -1
  32. data/lib/patches/db/mysql2.rb +4 -27
  33. data/lib/patches/db/mysql2/alias_method.rb +30 -0
  34. data/lib/patches/db/mysql2/prepend.rb +34 -0
  35. data/lib/prepend_mysql2_patch.rb +5 -0
  36. data/rack-mini-profiler.gemspec +5 -4
  37. metadata +46 -14
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 42690a86bcd4e4cfd8bf17289dc7b2f583bdd4ec286b4bbcdd50454f0f73551b
4
- data.tar.gz: 723291f0ae196b09f585a331fc4e33b54bfd4be7fba527b623d851dc77524cce
3
+ metadata.gz: 2984e9dec3cda4d5b86a4ed3b8300725207ba826b6a064402b23dcf04b0d5a51
4
+ data.tar.gz: 4a05074c124ac23085c08f4ae5389b71ef7b85687c40c5e5594dee4884d87632
5
5
  SHA512:
6
- metadata.gz: ca4bd7e3f35d42171bf2e39775a4a8fb565b907ba1eab40002886f7933bb4e9d30bfb8d9a87a7cb408e68b3f7e1a5dbbd360fa633f8e5c94793218abb40b32d5
7
- data.tar.gz: 877164b6caf03efc6fa4183bed8f6dfce09c691e98c9ac3588fae8307d6b1632be8e666140c4a581280b6f0bfb69c2f5d4cb100ecca0f4afe1d3a9cd770b8e7f
6
+ metadata.gz: b29d4a47e99d03489251752bfe57a2b64235400b5ffb9f867738bfb9d165f63ddeeb559fc4edf9a60c91fe2d579b04ee473db1b2c7846ab823580d8b9b5e88c1
7
+ data.tar.gz: 3a0768401c048801bf4adb22792fbdb2643d5b5e0174f92149df96c8ae2ab79d0c504e9e2146d72cc45068df6b88ebc675ef11431d47c17a5b929f375a1e6d74
data/CHANGELOG.md CHANGED
@@ -1,5 +1,24 @@
1
1
  # CHANGELOG
2
2
 
3
+ ## 2.3.2 - 2021-04-30
4
+
5
+ - [FEATURE] Introduce `pp=async-flamegraph` for asynchronous flamegraphs
6
+
7
+ ## 2.3.1 - 2021-01-29
8
+
9
+ - [FIX] compatability with Ruby 3.0
10
+ - [FIX] compatability with peek-mysql2
11
+
12
+ ## 2.3.0 - 2020-12-29
13
+
14
+ - [FEATURE] flamegraphs are now based off speedscope
15
+
16
+ ## 2.2.1 - 2020-12-23
17
+
18
+ - [FIX] Turbolinks integration causing increasing number of GET requests
19
+ - [FEATURE] enahanced log transporter with compression and exponential backoff
20
+ - [FEATURE] sameSite=Lax added to MiniProfiler cookie
21
+
3
22
  ## 2.2.0 - 2020-10-19
4
23
 
5
24
  - [UX] Enhancements to snapshots UI
data/README.md CHANGED
@@ -1,7 +1,5 @@
1
1
  # rack-mini-profiler
2
2
 
3
- [![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)
4
-
5
3
  Middleware that displays speed badge for every html page. Designed to work both in production and in development.
6
4
 
7
5
  #### Features
@@ -43,7 +41,6 @@ You can also include optional libraries to enable additional features.
43
41
  gem 'memory_profiler'
44
42
 
45
43
  # For call-stack profiling flamegraphs
46
- gem 'flamegraph'
47
44
  gem 'stackprof'
48
45
  ```
49
46
 
@@ -81,6 +78,16 @@ gem 'rack-mini-profiler', require: ['prepend_net_http_patch']
81
78
 
82
79
  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.
83
80
 
81
+ #### `peek-mysql2` stack level too deep errors
82
+
83
+ If you use peek-mysql2 with Rails >= 5, you'll need to use this gem spec in your Gemfile:
84
+
85
+ ```ruby
86
+ gem 'rack-mini-profiler', require: ['prepend_mysql2_patch', 'rack-mini-profiler']
87
+ ```
88
+
89
+ This should not be necessary with Rails < 5 because peek-mysql2 hooks into mysql2 gem in different ways depending on your Rails version.
90
+
84
91
  #### Rails and manual initialization
85
92
 
86
93
  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,9 +168,13 @@ export RACK_MINI_PROFILER_PATCH="false"
161
168
 
162
169
  To generate [flamegraphs](http://samsaffron.com/archive/2013/03/19/flame-graphs-in-ruby-miniprofiler):
163
170
 
164
- * add the [**flamegraph**](https://github.com/SamSaffron/flamegraph) gem to your Gemfile
171
+ * add the [**stackprof**](https://rubygems.org/gems/stackprof) gem to your Gemfile
165
172
  * visit a page in your app with `?pp=flamegraph`
166
173
 
174
+ To store flamegraph data for later viewing, append the `?pp=async-flamegraph` parameter. The request will return as normal.
175
+ Flamegraph data for this request, and all subsequent requests made by this page (based on the `REFERER` header) will be stored.
176
+ 'flamegraph' links will appear for these requests in the MiniProfiler UI.
177
+
167
178
  ### Memory Profiling
168
179
 
169
180
  Memory allocations can be measured (using the [memory_profiler](https://github.com/SamSaffron/memory_profiler) gem)
@@ -190,7 +201,7 @@ There are two additional `pp` options that can be used to analyze memory which d
190
201
 
191
202
  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.
192
203
 
193
- 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).
204
+ Mini Profiler will exclude requests that are made to skipped 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).
194
205
 
195
206
  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.
196
207
 
@@ -202,9 +213,11 @@ Mini Profiler will keep a maximum of 1000 snapshots by default, and you can chan
202
213
 
203
214
  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.
204
215
 
205
- The transporter uses a buffer to temporarily hold snapshots in memory with a limit of 100 snapshots. Every 10 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.
216
+ 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.
217
+
218
+ 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.
206
219
 
207
- The body of the requests made by the transporter 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).
220
+ 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).
208
221
 
209
222
  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.
210
223
 
@@ -226,21 +239,21 @@ rack-mini-profiler is designed with production profiling in mind. To enable that
226
239
 
227
240
  Note:
228
241
 
229
- Out-of-the-box we will initialize the `authorization_mode` to `:whitelist` in production. However, in some cases we may not be able to do it:
242
+ Out-of-the-box we will initialize the `authorization_mode` to `:allow_authorized` in production. However, in some cases we may not be able to do it:
230
243
 
231
- - If you are running in development or test we will not enable whitelist mode
244
+ - If you are running in development or test we will not enable the explicit authorization mode
232
245
  - If you use `require: false` on rack_mini_profiler we are unlikely to be able to run the railtie
233
246
  - If you are running outside of rails we will not run the railtie
234
247
 
235
248
  In those cases use:
236
249
 
237
250
  ```ruby
238
- Rack::MiniProfiler.config.authorization_mode = :whitelist
251
+ Rack::MiniProfiler.config.authorization_mode = :allow_authorized
239
252
  ```
240
253
 
241
254
  When deciding to fully profile a page mini profiler consults with the `authorization_mode`
242
255
 
243
- By default in production we attempt to set the authorization mode to `:whitelist` meaning that end user will only be able to see requests where somewhere `Rack::MiniProfiler.authorize_request` is invoked.
256
+ By default in production we attempt to set the authorization mode to `:allow_authorized` meaning that end user will only be able to see requests where somewhere `Rack::MiniProfiler.authorize_request` is invoked.
244
257
 
245
258
  In development we run in the `:allow_all` authorization mode meaning every request is profiled and displayed to the end user.
246
259
 
@@ -398,6 +411,7 @@ snapshot_hidden_custom_fields|`[]`|Each snapshot custom field will have a dedica
398
411
  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.
399
412
  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.
400
413
  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.
414
+ snapshots_transport_gzip_requests|`false`|Make the snapshots transporter gzip the requests it makes to `snapshots_transport_destination_url`.
401
415
 
402
416
  ### Using MiniProfiler with `Rack::Deflate` middleware
403
417
 
data/lib/html/includes.js CHANGED
@@ -1,12 +1,13 @@
1
1
  "use strict";
2
2
 
3
- var MiniProfiler = (function() {
3
+ var _MiniProfiler = (function() {
4
4
  var _arguments = arguments;
5
5
  var options,
6
6
  container,
7
7
  controls,
8
- fetchedIds = [],
9
- fetchingIds = [],
8
+ fetchedIds = (window.MiniProfiler && window.MiniProfiler.fetchedIds) || [],
9
+ fetchingIds =
10
+ (window.MiniProfiler && window.MiniProfiler.fetchingIds) || [],
10
11
  // so we never pull down a profiler twice
11
12
  ajaxStartTime,
12
13
  totalsControl,
@@ -400,7 +401,7 @@ var MiniProfiler = (function() {
400
401
  var px = button.offsetTop - 1,
401
402
  // position next to the button we clicked
402
403
  windowHeight = window.innerHeight,
403
- maxHeight = windowHeight - 40; // make sure the popup doesn't extend below the fold
404
+ maxHeight = windowHeight - px - 40; // make sure the popup doesn't extend below the fold
404
405
 
405
406
  popup.style[options.renderVerticalPosition] = "".concat(px, "px");
406
407
  popup.style.maxHeight = "".concat(maxHeight, "px");
@@ -634,6 +635,10 @@ var MiniProfiler = (function() {
634
635
  }
635
636
  };
636
637
 
638
+ var turbolinksSkipResultsFetch = function turbolinksSkipResultsFetch(event) {
639
+ event.data.xhr.__miniProfilerSkipResultsFetch = true;
640
+ };
641
+
637
642
  var bindDocumentEvents = function bindDocumentEvents() {
638
643
  document.addEventListener("click", onClickEvents);
639
644
  document.addEventListener("keyup", onClickEvents);
@@ -642,6 +647,10 @@ var MiniProfiler = (function() {
642
647
  if (typeof Turbolinks !== "undefined" && Turbolinks.supported) {
643
648
  document.addEventListener("page:change", unbindDocumentEvents);
644
649
  document.addEventListener("turbolinks:load", unbindDocumentEvents);
650
+ document.addEventListener(
651
+ "turbolinks:request-start",
652
+ turbolinksSkipResultsFetch
653
+ );
645
654
  }
646
655
  };
647
656
 
@@ -651,6 +660,10 @@ var MiniProfiler = (function() {
651
660
  document.removeEventListener("keyup", toggleShortcutEvent);
652
661
  document.removeEventListener("page:change", unbindDocumentEvents);
653
662
  document.removeEventListener("turbolinks:load", unbindDocumentEvents);
663
+ document.removeEventListener(
664
+ "turbolinks:request-start",
665
+ turbolinksSkipResultsFetch
666
+ );
654
667
  };
655
668
 
656
669
  var initFullView = function initFullView() {
@@ -680,10 +693,12 @@ var MiniProfiler = (function() {
680
693
  temp.innerHTML = MiniProfiler.templates.snapshotsGroupsList(data);
681
694
  } else if (data.group_name) {
682
695
  var allCustomFieldsNames = [];
683
- data.list.forEach(function (snapshot) {
684
- Object.keys(snapshot.custom_fields).forEach(function (k) {
685
- if (allCustomFieldsNames.indexOf(k) === -1 &&
686
- options.hiddenCustomFields.indexOf(k.toLowerCase()) === -1) {
696
+ data.list.forEach(function(snapshot) {
697
+ Object.keys(snapshot.custom_fields).forEach(function(k) {
698
+ if (
699
+ allCustomFieldsNames.indexOf(k) === -1 &&
700
+ options.hiddenCustomFields.indexOf(k.toLowerCase()) === -1
701
+ ) {
687
702
  allCustomFieldsNames.push(k);
688
703
  }
689
704
  });
@@ -694,7 +709,7 @@ var MiniProfiler = (function() {
694
709
  allCustomFieldsNames: allCustomFieldsNames
695
710
  });
696
711
  }
697
- Array.from(temp.children).forEach(function (child) {
712
+ Array.from(temp.children).forEach(function(child) {
698
713
  document.body.appendChild(child);
699
714
  });
700
715
  };
@@ -767,213 +782,220 @@ var MiniProfiler = (function() {
767
782
  fetchResults(options.ids);
768
783
  }
769
784
 
770
- var send = XMLHttpRequest.prototype.send;
771
-
772
- XMLHttpRequest.prototype.send = function(data) {
773
- ajaxStartTime = new Date();
774
- this.addEventListener("load", function() {
775
- // responseURL isn't available in IE11
776
- if (
777
- this.responseURL &&
778
- this.responseURL.indexOf(window.location.origin) !== 0
779
- ) {
780
- return;
781
- }
782
- // getAllResponseHeaders isn't available in Edge.
783
- var allHeaders = this.getAllResponseHeaders
784
- ? this.getAllResponseHeaders()
785
- : null;
786
- if (
787
- allHeaders &&
788
- allHeaders.toLowerCase().indexOf("x-miniprofiler-ids") === -1
789
- ) {
790
- return;
791
- }
792
- // should be a string of comma-separated ids
793
- var stringIds = this.getResponseHeader("X-MiniProfiler-Ids");
794
-
795
- if (stringIds) {
796
- var ids = stringIds.split(",");
797
- fetchResults(ids);
798
- }
799
- });
800
- send.call(this, data);
801
- }; // fetch results after ASP Ajax calls
802
-
803
- if (
804
- typeof Sys != "undefined" &&
805
- typeof Sys.WebForms != "undefined" &&
806
- typeof Sys.WebForms.PageRequestManager != "undefined"
807
- ) {
808
- // Get the instance of PageRequestManager.
809
- var PageRequestManager = Sys.WebForms.PageRequestManager.getInstance();
810
- PageRequestManager.add_endRequest(function(sender, args) {
811
- if (args) {
812
- var response = args.get_response();
785
+ if (!window.MiniProfiler || !window.MiniProfiler.patchesApplied) {
786
+ var send = XMLHttpRequest.prototype.send;
813
787
 
788
+ XMLHttpRequest.prototype.send = function(data) {
789
+ ajaxStartTime = new Date();
790
+ this.addEventListener("load", function() {
791
+ // responseURL isn't available in IE11
814
792
  if (
815
- response.get_responseAvailable() &&
816
- response._xmlHttpRequest !== null
793
+ this.responseURL &&
794
+ this.responseURL.indexOf(window.location.origin) !== 0
817
795
  ) {
818
- var stringIds = args
819
- .get_response()
820
- .getResponseHeader("X-MiniProfiler-Ids");
821
-
822
- if (stringIds) {
823
- var ids = stringIds.split(",");
824
- fetchResults(ids);
825
- }
796
+ return;
826
797
  }
827
- }
828
- });
829
- } // more Asp.Net callbacks
830
-
831
- if (typeof WebForm_ExecuteCallback == "function") {
832
- WebForm_ExecuteCallback = (function(callbackObject) {
833
- // Store original function
834
- var original = WebForm_ExecuteCallback;
835
- return function(callbackObject) {
836
- original(callbackObject);
837
- var stringIds = callbackObject.xmlRequest.getResponseHeader(
838
- "X-MiniProfiler-Ids"
839
- );
798
+ if (this.__miniProfilerSkipResultsFetch) {
799
+ return;
800
+ }
801
+ // getAllResponseHeaders isn't available in Edge.
802
+ var allHeaders = this.getAllResponseHeaders
803
+ ? this.getAllResponseHeaders()
804
+ : null;
805
+ if (
806
+ allHeaders &&
807
+ allHeaders.toLowerCase().indexOf("x-miniprofiler-ids") === -1
808
+ ) {
809
+ return;
810
+ }
811
+ // should be a string of comma-separated ids
812
+ var stringIds = this.getResponseHeader("X-MiniProfiler-Ids");
840
813
 
841
814
  if (stringIds) {
842
815
  var ids = stringIds.split(",");
843
816
  fetchResults(ids);
844
817
  }
845
- };
846
- })();
847
- } // also fetch results after ExtJS requests, in case it is being used
818
+ });
819
+ send.call(this, data);
820
+ }; // fetch results after ASP Ajax calls
848
821
 
849
- if (
850
- typeof Ext != "undefined" &&
851
- typeof Ext.Ajax != "undefined" &&
852
- typeof Ext.Ajax.on != "undefined"
853
- ) {
854
- // Ext.Ajax is a singleton, so we just have to attach to its 'requestcomplete' event
855
- Ext.Ajax.on("requestcomplete", function(e, xhr, settings) {
856
- //iframed file uploads don't have headers
857
- if (!xhr || !xhr.getResponseHeader) {
858
- return;
859
- }
822
+ if (
823
+ typeof Sys != "undefined" &&
824
+ typeof Sys.WebForms != "undefined" &&
825
+ typeof Sys.WebForms.PageRequestManager != "undefined"
826
+ ) {
827
+ // Get the instance of PageRequestManager.
828
+ var PageRequestManager = Sys.WebForms.PageRequestManager.getInstance();
829
+ PageRequestManager.add_endRequest(function(sender, args) {
830
+ if (args) {
831
+ var response = args.get_response();
832
+
833
+ if (
834
+ response.get_responseAvailable() &&
835
+ response._xmlHttpRequest !== null
836
+ ) {
837
+ var stringIds = args
838
+ .get_response()
839
+ .getResponseHeader("X-MiniProfiler-Ids");
840
+
841
+ if (stringIds) {
842
+ var ids = stringIds.split(",");
843
+ fetchResults(ids);
844
+ }
845
+ }
846
+ }
847
+ });
848
+ } // more Asp.Net callbacks
849
+
850
+ if (typeof WebForm_ExecuteCallback == "function") {
851
+ WebForm_ExecuteCallback = (function(callbackObject) {
852
+ // Store original function
853
+ var original = WebForm_ExecuteCallback;
854
+ return function(callbackObject) {
855
+ original(callbackObject);
856
+ var stringIds = callbackObject.xmlRequest.getResponseHeader(
857
+ "X-MiniProfiler-Ids"
858
+ );
860
859
 
861
- var stringIds = xhr.getResponseHeader("X-MiniProfiler-Ids");
860
+ if (stringIds) {
861
+ var ids = stringIds.split(",");
862
+ fetchResults(ids);
863
+ }
864
+ };
865
+ })();
866
+ } // also fetch results after ExtJS requests, in case it is being used
862
867
 
863
- if (stringIds) {
864
- var ids = stringIds.split(",");
865
- fetchResults(ids);
866
- }
867
- });
868
- }
868
+ if (
869
+ typeof Ext != "undefined" &&
870
+ typeof Ext.Ajax != "undefined" &&
871
+ typeof Ext.Ajax.on != "undefined"
872
+ ) {
873
+ // Ext.Ajax is a singleton, so we just have to attach to its 'requestcomplete' event
874
+ Ext.Ajax.on("requestcomplete", function(e, xhr, settings) {
875
+ //iframed file uploads don't have headers
876
+ if (!xhr || !xhr.getResponseHeader) {
877
+ return;
878
+ }
869
879
 
870
- if (typeof MooTools != "undefined" && typeof Request != "undefined") {
871
- Request.prototype.addEvents({
872
- onComplete: function onComplete() {
873
- var stringIds = this.xhr.getResponseHeader("X-MiniProfiler-Ids");
880
+ var stringIds = xhr.getResponseHeader("X-MiniProfiler-Ids");
874
881
 
875
882
  if (stringIds) {
876
883
  var ids = stringIds.split(",");
877
884
  fetchResults(ids);
878
885
  }
879
- }
880
- });
881
- } // add support for AngularJS, which use the basic XMLHttpRequest object.
882
-
883
- if (window.angular && typeof XMLHttpRequest != "undefined") {
884
- var _send = XMLHttpRequest.prototype.send;
885
-
886
- XMLHttpRequest.prototype.send = function sendReplacement(data) {
887
- if (this.onreadystatechange) {
888
- if (
889
- typeof this.miniprofiler == "undefined" ||
890
- typeof this.miniprofiler.prev_onreadystatechange == "undefined"
891
- ) {
892
- this.miniprofiler = {
893
- prev_onreadystatechange: this.onreadystatechange
894
- };
886
+ });
887
+ }
895
888
 
896
- this.onreadystatechange = function onReadyStateChangeReplacement() {
897
- if (this.readyState == 4) {
898
- var stringIds = this.getResponseHeader("X-MiniProfiler-Ids");
889
+ if (typeof MooTools != "undefined" && typeof Request != "undefined") {
890
+ Request.prototype.addEvents({
891
+ onComplete: function onComplete() {
892
+ var stringIds = this.xhr.getResponseHeader("X-MiniProfiler-Ids");
899
893
 
900
- if (stringIds) {
901
- var ids = stringIds.split(",");
902
- fetchResults(ids);
894
+ if (stringIds) {
895
+ var ids = stringIds.split(",");
896
+ fetchResults(ids);
897
+ }
898
+ }
899
+ });
900
+ } // add support for AngularJS, which use the basic XMLHttpRequest object.
901
+
902
+ if (window.angular && typeof XMLHttpRequest != "undefined") {
903
+ var _send = XMLHttpRequest.prototype.send;
904
+
905
+ XMLHttpRequest.prototype.send = function sendReplacement(data) {
906
+ if (this.onreadystatechange) {
907
+ if (
908
+ typeof this.miniprofiler == "undefined" ||
909
+ typeof this.miniprofiler.prev_onreadystatechange == "undefined"
910
+ ) {
911
+ this.miniprofiler = {
912
+ prev_onreadystatechange: this.onreadystatechange
913
+ };
914
+
915
+ this.onreadystatechange = function onReadyStateChangeReplacement() {
916
+ if (this.readyState == 4) {
917
+ var stringIds = this.getResponseHeader("X-MiniProfiler-Ids");
918
+
919
+ if (stringIds) {
920
+ var ids = stringIds.split(",");
921
+ fetchResults(ids);
922
+ }
903
923
  }
904
- }
905
924
 
906
- if (this.miniprofiler.prev_onreadystatechange !== null)
907
- return this.miniprofiler.prev_onreadystatechange.apply(
908
- this,
909
- arguments
910
- );
911
- };
925
+ if (this.miniprofiler.prev_onreadystatechange !== null)
926
+ return this.miniprofiler.prev_onreadystatechange.apply(
927
+ this,
928
+ arguments
929
+ );
930
+ };
931
+ }
912
932
  }
913
- }
914
-
915
- return _send.apply(this, arguments);
916
- };
917
- } // https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API
918
933
 
919
- if (
920
- typeof window.fetch === "function" &&
921
- window.fetch.__patchedByMiniProfiler === undefined
922
- ) {
923
- var __originalFetch = window.fetch;
934
+ return _send.apply(this, arguments);
935
+ };
936
+ } // https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API
924
937
 
925
- window.fetch = function(input, init) {
926
- var originalFetchRun = __originalFetch(input, init);
938
+ if (typeof window.fetch === "function") {
939
+ var __originalFetch = window.fetch;
927
940
 
928
- originalFetchRun.then(function(response) {
929
- try {
930
- // look for x-mini-profile-ids
931
- var entries = response.headers.entries();
932
- var _iteratorNormalCompletion = true;
933
- var _didIteratorError = false;
934
- var _iteratorError = undefined;
941
+ window.fetch = function(input, init) {
942
+ var originalFetchRun = __originalFetch(input, init);
935
943
 
944
+ originalFetchRun.then(function(response) {
936
945
  try {
937
- for (
938
- var _iterator = entries[Symbol.iterator](), _step;
939
- !(_iteratorNormalCompletion = (_step = _iterator.next()).done);
940
- _iteratorNormalCompletion = true
941
- ) {
942
- var pair = _step.value;
943
-
944
- if (pair[0] && pair[0].toLowerCase() == "x-miniprofiler-ids") {
945
- var ids = pair[1].split(",");
946
- fetchResults(ids);
947
- }
948
- }
949
- } catch (err) {
950
- _didIteratorError = true;
951
- _iteratorError = err;
952
- } finally {
946
+ // look for x-mini-profile-ids
947
+ var entries = response.headers.entries();
948
+ var _iteratorNormalCompletion = true;
949
+ var _didIteratorError = false;
950
+ var _iteratorError = undefined;
951
+
953
952
  try {
954
- if (!_iteratorNormalCompletion && _iterator.return != null) {
955
- _iterator.return();
953
+ for (
954
+ var _iterator = entries[Symbol.iterator](), _step;
955
+ !(_iteratorNormalCompletion = (_step = _iterator.next())
956
+ .done);
957
+ _iteratorNormalCompletion = true
958
+ ) {
959
+ var pair = _step.value;
960
+
961
+ if (
962
+ pair[0] &&
963
+ pair[0].toLowerCase() == "x-miniprofiler-ids"
964
+ ) {
965
+ var ids = pair[1].split(",");
966
+ fetchResults(ids);
967
+ }
956
968
  }
969
+ } catch (err) {
970
+ _didIteratorError = true;
971
+ _iteratorError = err;
957
972
  } finally {
958
- if (_didIteratorError) {
959
- throw _iteratorError;
973
+ try {
974
+ if (!_iteratorNormalCompletion && _iterator.return != null) {
975
+ _iterator.return();
976
+ }
977
+ } finally {
978
+ if (_didIteratorError) {
979
+ throw _iteratorError;
980
+ }
960
981
  }
961
982
  }
983
+ } catch (e) {
984
+ console.error(e);
962
985
  }
963
- } catch (e) {
964
- console.error(e);
965
- }
966
- });
967
- return originalFetchRun;
968
- };
969
-
970
- window.fetch.__patchedByMiniProfiler = true;
971
- } // some elements want to be hidden on certain doc events
986
+ });
987
+ return originalFetchRun;
988
+ };
989
+ }
990
+ window.MiniProfiler.patchesApplied = true;
991
+ }
972
992
 
973
993
  bindDocumentEvents();
974
994
  };
975
995
 
976
996
  return {
997
+ fetchedIds: fetchedIds,
998
+ fetchingIds: fetchingIds,
977
999
  init: function init() {
978
1000
  var script = document.getElementById("mini-profiler");
979
1001
  if (!script || !script.getAttribute) return;
@@ -1007,7 +1029,10 @@ var MiniProfiler = (function() {
1007
1029
  sessionStorage["rack-mini-profiler-start-hidden"] === "true";
1008
1030
  var htmlContainer = script.getAttribute("data-html-container");
1009
1031
  var cssUrl = script.getAttribute("data-css-url");
1010
- var hiddenCustomFields = script.getAttribute("data-hidden-custom-fields").toLowerCase().split(",");
1032
+ var hiddenCustomFields = script
1033
+ .getAttribute("data-hidden-custom-fields")
1034
+ .toLowerCase()
1035
+ .split(",");
1011
1036
  return {
1012
1037
  ids: ids,
1013
1038
  path: path,
@@ -1188,6 +1213,9 @@ var MiniProfiler = (function() {
1188
1213
  shareUrl: function shareUrl(id) {
1189
1214
  return options.path + "results?id=" + id;
1190
1215
  },
1216
+ flamegraphUrl: function flamegrapgUrl(id) {
1217
+ return options.path + "flamegraph?id=" + id;
1218
+ },
1191
1219
  moreUrl: function moreUrl(requestName) {
1192
1220
  var requestParts = requestName.split(" ");
1193
1221
  var linkSrc =
@@ -1432,7 +1460,7 @@ var MiniProfiler = (function() {
1432
1460
  return options.showTotalSqlCount;
1433
1461
  },
1434
1462
  timestampToRelative: function timestampToRelative(timestamp) {
1435
- var now = Math.round((new Date()).getTime() / 1000);
1463
+ var now = Math.round(new Date().getTime() / 1000);
1436
1464
  timestamp = Math.round(timestamp / 1000);
1437
1465
  var diff = now - timestamp;
1438
1466
  if (diff < 60) {
@@ -1444,7 +1472,7 @@ var MiniProfiler = (function() {
1444
1472
  res += "s";
1445
1473
  }
1446
1474
  return res;
1447
- }
1475
+ };
1448
1476
  diff = Math.round(diff / 60);
1449
1477
  if (diff <= 60) {
1450
1478
  return buildDisplayTime(diff, "minute");
@@ -1459,5 +1487,8 @@ var MiniProfiler = (function() {
1459
1487
  };
1460
1488
  })();
1461
1489
 
1462
- window.MiniProfiler = MiniProfiler;
1463
- MiniProfiler.init();
1490
+ if (window.MiniProfiler) {
1491
+ _MiniProfiler.patchesApplied = window.MiniProfiler.patchesApplied;
1492
+ }
1493
+ window.MiniProfiler = _MiniProfiler;
1494
+ _MiniProfiler.init();