rack-mini-profiler 2.0.1 → 2.2.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +27 -0
- data/README.md +75 -30
- data/lib/html/includes.css +42 -9
- data/lib/html/includes.js +105 -29
- data/lib/html/includes.scss +35 -4
- data/lib/html/includes.tmpl +94 -4
- data/lib/html/profile_handler.js +1 -1
- data/lib/html/rack-mini-profiler.css +3 -0
- data/lib/html/rack-mini-profiler.js +2 -0
- data/lib/html/vendor.js +11 -3
- data/lib/mini_profiler/asset_version.rb +1 -1
- data/lib/mini_profiler/client_settings.rb +1 -0
- data/lib/mini_profiler/config.rb +22 -2
- data/lib/mini_profiler/profiler.rb +183 -23
- data/lib/mini_profiler/profiling_methods.rb +8 -1
- data/lib/mini_profiler/snapshots_transporter.rb +84 -0
- data/lib/mini_profiler/storage/abstract_store.rb +78 -0
- data/lib/mini_profiler/storage/memory_store.rb +54 -5
- data/lib/mini_profiler/storage/redis_store.rb +136 -2
- data/lib/mini_profiler/timer_struct/page.rb +52 -2
- data/lib/mini_profiler/timer_struct/sql.rb +2 -2
- data/lib/mini_profiler/version.rb +1 -1
- data/lib/mini_profiler_rails/railtie.rb +13 -0
- data/lib/mini_profiler_rails/railtie_methods.rb +6 -0
- data/lib/patches/net_patches.rb +18 -8
- data/lib/prepend_net_http_patch.rb +5 -0
- data/lib/rack-mini-profiler.rb +1 -0
- data/rack-mini-profiler.gemspec +5 -2
- metadata +66 -20
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 42690a86bcd4e4cfd8bf17289dc7b2f583bdd4ec286b4bbcdd50454f0f73551b
|
4
|
+
data.tar.gz: 723291f0ae196b09f585a331fc4e33b54bfd4be7fba527b623d851dc77524cce
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: ca4bd7e3f35d42171bf2e39775a4a8fb565b907ba1eab40002886f7933bb4e9d30bfb8d9a87a7cb408e68b3f7e1a5dbbd360fa633f8e5c94793218abb40b32d5
|
7
|
+
data.tar.gz: 877164b6caf03efc6fa4183bed8f6dfce09c691e98c9ac3588fae8307d6b1632be8e666140c4a581280b6f0bfb69c2f5d4cb100ecca0f4afe1d3a9cd770b8e7f
|
data/CHANGELOG.md
CHANGED
@@ -1,5 +1,32 @@
|
|
1
1
|
# CHANGELOG
|
2
2
|
|
3
|
+
## 2.2.0 - 2020-10-19
|
4
|
+
|
5
|
+
- [UX] Enhancements to snapshots UI
|
6
|
+
- [FEATURE] Mini Profiler cookie is now sameSite=lax
|
7
|
+
- [FEATURE] Snapshots transporter
|
8
|
+
- [FEATURE] Redact SQL queries in snapshots by default
|
9
|
+
|
10
|
+
## 2.1.0 - 2020-09-17
|
11
|
+
|
12
|
+
- [FEATURE] Allow assets to be precompiled with Sprockets
|
13
|
+
- [FEATURE] Snapshots sampling (see README in repo)
|
14
|
+
- [FEATURE] Allow `skip_paths` config to contain regular expressions
|
15
|
+
|
16
|
+
## 2.0.4 - 2020-08-04
|
17
|
+
|
18
|
+
- [FIX] webpacker may exist with no config, allow for that
|
19
|
+
|
20
|
+
## 2.0.3 - 2020-07-29
|
21
|
+
|
22
|
+
- [FIX] support for deprecation free Redis 4.2
|
23
|
+
- [FEATURE] skip /packs when serving static assets
|
24
|
+
- [FEATURE] allow Net::HTTP patch to be applied with either prerpend or alias
|
25
|
+
|
26
|
+
## 2.0.2 - 2020-05-25
|
27
|
+
|
28
|
+
- [FIX] client timings were not showing up when you clicked show trivial
|
29
|
+
|
3
30
|
## 2.0.1 - 2020-03-17
|
4
31
|
|
5
32
|
- [REVERT] Prepend Net::HTTP patch instead of class_eval and aliasing (#429) (technique clashes with New Relic and Skylight agents)
|
data/README.md
CHANGED
@@ -29,7 +29,7 @@ If you feel like taking on any of this start an issue and update us on your prog
|
|
29
29
|
|
30
30
|
## Installation
|
31
31
|
|
32
|
-
Install/add to Gemfile in Ruby 2.
|
32
|
+
Install/add to Gemfile in Ruby 2.4+
|
33
33
|
|
34
34
|
```ruby
|
35
35
|
gem 'rack-mini-profiler'
|
@@ -65,6 +65,22 @@ If you don't want to manually require Mini Profiler:
|
|
65
65
|
gem 'rack-mini-profiler', require: ['enable_rails_patches', 'rack-mini-profiler']
|
66
66
|
```
|
67
67
|
|
68
|
+
#### `Net::HTTP` stack level too deep errors
|
69
|
+
|
70
|
+
If you start seeing `SystemStackError: stack level too deep` errors from `Net::HTTP` after installing Mini Profiler, this means there is another patch for `Net::HTTP#request` that conflicts with Mini Profiler's patch in your application. To fix this, change `rack-mini-profiler` gem line in your `Gemfile` to the following:
|
71
|
+
|
72
|
+
```ruby
|
73
|
+
gem 'rack-mini-profiler', require: ['prepend_net_http_patch', 'rack-mini-profiler']
|
74
|
+
```
|
75
|
+
|
76
|
+
If you currently have `require: false`, remove the `'rack-mini-profiler'` string from the `require` array above so the gem line becomes like this:
|
77
|
+
|
78
|
+
```ruby
|
79
|
+
gem 'rack-mini-profiler', require: ['prepend_net_http_patch']
|
80
|
+
```
|
81
|
+
|
82
|
+
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
|
+
|
68
84
|
#### Rails and manual initialization
|
69
85
|
|
70
86
|
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:
|
@@ -170,6 +186,28 @@ There are two additional `pp` options that can be used to analyze memory which d
|
|
170
186
|
* Use `?pp=profile-gc` to report on Garbage Collection statistics
|
171
187
|
* Use `?pp=analyze-memory` to report on ObjectSpace statistics
|
172
188
|
|
189
|
+
### Snapshots Sampling
|
190
|
+
|
191
|
+
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
|
+
|
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).
|
194
|
+
|
195
|
+
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
|
+
|
197
|
+
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.
|
198
|
+
|
199
|
+
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).
|
200
|
+
|
201
|
+
#### Snapshots Transporter
|
202
|
+
|
203
|
+
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
|
+
|
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.
|
206
|
+
|
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).
|
208
|
+
|
209
|
+
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
|
+
|
173
211
|
## Access control in non-development environments
|
174
212
|
|
175
213
|
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.
|
@@ -313,6 +351,15 @@ _Note:_ The GUID (`data-version` and the `?v=` parameter on the `src`) will chan
|
|
313
351
|
#### Using MiniProfiler's built in route for apps without HTML responses
|
314
352
|
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.
|
315
353
|
|
354
|
+
#### Register MiniProfiler's assets in the Rails assets pipeline
|
355
|
+
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:
|
356
|
+
|
357
|
+
```ruby
|
358
|
+
Rack::MiniProfiler.config.assets_url = ->(name, version, env) {
|
359
|
+
ActionController::Base.helpers.asset_path(name)
|
360
|
+
}
|
361
|
+
```
|
362
|
+
|
316
363
|
### Configuration Options
|
317
364
|
|
318
365
|
You can set configuration options using the configuration accessor on `Rack::MiniProfiler`.
|
@@ -328,8 +375,8 @@ Option|Default|Description
|
|
328
375
|
-------|---|--------
|
329
376
|
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.
|
330
377
|
position|`'top-left'`|Display mini_profiler on `'top-right'`, `'top-left'`, `'bottom-right'` or `'bottom-left'`.
|
331
|
-
skip_paths|`[]`|
|
332
|
-
skip_schema_queries|Rails dev: `
|
378
|
+
skip_paths|`[]`|An array of paths that skip profiling. Both `String` and `Regexp` are acceptable in the array.
|
379
|
+
skip_schema_queries|Rails dev: `true`<br>Othwerwise: `false`|`true` to skip schema queries.
|
333
380
|
auto_inject|`true`|`true` to inject the miniprofiler script in the page.
|
334
381
|
backtrace_ignores|`[]`|Regexes of lines to be removed from backtraces.
|
335
382
|
backtrace_includes|Rails: `[/^\/?(app\|config\|lib\|test)/]`<br>Rack: `[]`|Regexes of lines to keep in backtraces.
|
@@ -344,33 +391,21 @@ max_traces_to_show|20|Maximum number of mini profiler timing blocks to show on o
|
|
344
391
|
html_container|`body`|The HTML container (as a jQuery selector) to inject the mini_profiler UI into
|
345
392
|
show_total_sql_count|`false`|Displays the total number of SQL executions.
|
346
393
|
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.
|
347
|
-
|
348
|
-
|
349
|
-
|
350
|
-
|
351
|
-
`
|
352
|
-
|
353
|
-
the
|
354
|
-
|
355
|
-
|
356
|
-
|
357
|
-
in
|
358
|
-
|
359
|
-
|
360
|
-
|
361
|
-
|
362
|
-
Rack::MiniProfilerRails.initialize!(Rails.application)
|
363
|
-
|
364
|
-
Rails.application.middleware.delete(Rack::MiniProfiler)
|
365
|
-
Rails.application.middleware.insert_after(Rack::Deflater, Rack::MiniProfiler)
|
366
|
-
```
|
367
|
-
|
368
|
-
Deleting the middleware and then reinserting it is a bit inelegant, but
|
369
|
-
a sufficient and costless solution. It is possible that rack-mini-profiler might
|
370
|
-
support this scenario more directly if it is found that
|
371
|
-
there is significant need for this confriguration or that
|
372
|
-
the above recipe causes problems.
|
373
|
-
|
394
|
+
assets_url|`nil`|See the "Register MiniProfiler's assets in the Rails assets pipeline" section above.
|
395
|
+
snapshot_every_n_requests|`-1`|Determines how frequently snapshots are taken. See the "Snapshots Sampling" above for more details.
|
396
|
+
snapshots_limit|`1000`|Determines how many snapshots Mini Profiler is allowed to keep.
|
397
|
+
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.
|
398
|
+
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
|
+
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
|
+
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.
|
401
|
+
|
402
|
+
### Using MiniProfiler with `Rack::Deflate` middleware
|
403
|
+
|
404
|
+
If you are using `Rack::Deflate` with Rails and `rack-mini-profiler` in its default configuration,
|
405
|
+
`Rack::MiniProfiler` will be injected (as always) at position 0 in the middleware stack,
|
406
|
+
which means it will run after `Rack::Deflate` on response processing. To prevent attempting to inject
|
407
|
+
HTML in already compressed response body MiniProfiler will suppress compression by setting
|
408
|
+
`identity` encoding in `Accept-Encoding` request header.
|
374
409
|
|
375
410
|
## Special query strings
|
376
411
|
|
@@ -407,6 +442,16 @@ if JSON.const_defined?(:Pure)
|
|
407
442
|
end
|
408
443
|
```
|
409
444
|
|
445
|
+
## Development
|
446
|
+
|
447
|
+
If you want to contribute to this project, that's great, thank you! You can run the following rake task:
|
448
|
+
|
449
|
+
```
|
450
|
+
$ bundle exec rake client_dev
|
451
|
+
```
|
452
|
+
|
453
|
+
which will start a local Sinatra server at `http://localhost:9292` where you'll be able to preview your changes. Refreshing the page should be enough to see any changes you make to files in the `lib/html` directory.
|
454
|
+
|
410
455
|
## Running the Specs
|
411
456
|
|
412
457
|
```
|
data/lib/html/includes.css
CHANGED
@@ -1,9 +1,20 @@
|
|
1
1
|
@charset "UTF-8";
|
2
|
+
.mp-snapshots,
|
2
3
|
.profiler-result,
|
3
4
|
.profiler-queries {
|
4
5
|
color: #555;
|
5
6
|
line-height: 1;
|
6
7
|
font-size: 12px; }
|
8
|
+
.mp-snapshots pre,
|
9
|
+
.mp-snapshots code,
|
10
|
+
.mp-snapshots label,
|
11
|
+
.mp-snapshots table,
|
12
|
+
.mp-snapshots tbody,
|
13
|
+
.mp-snapshots thead,
|
14
|
+
.mp-snapshots tfoot,
|
15
|
+
.mp-snapshots tr,
|
16
|
+
.mp-snapshots th,
|
17
|
+
.mp-snapshots td,
|
7
18
|
.profiler-result pre,
|
8
19
|
.profiler-result code,
|
9
20
|
.profiler-result label,
|
@@ -33,27 +44,40 @@
|
|
33
44
|
background-color: transparent;
|
34
45
|
overflow: visible;
|
35
46
|
max-height: none; }
|
47
|
+
.mp-snapshots table,
|
36
48
|
.profiler-result table,
|
37
49
|
.profiler-queries table {
|
38
50
|
border-collapse: collapse;
|
39
51
|
border-spacing: 0; }
|
52
|
+
.mp-snapshots a,
|
53
|
+
.mp-snapshots a:hover,
|
40
54
|
.profiler-result a,
|
41
55
|
.profiler-result a:hover,
|
42
56
|
.profiler-queries a,
|
43
57
|
.profiler-queries a:hover {
|
44
58
|
cursor: pointer;
|
45
59
|
color: #0077cc; }
|
60
|
+
.mp-snapshots a,
|
46
61
|
.profiler-result a,
|
47
62
|
.profiler-queries a {
|
48
63
|
text-decoration: none; }
|
64
|
+
.mp-snapshots a:hover,
|
49
65
|
.profiler-result a:hover,
|
50
66
|
.profiler-queries a:hover {
|
51
67
|
text-decoration: underline; }
|
68
|
+
.mp-snapshots .custom-fields-title,
|
69
|
+
.profiler-result .custom-fields-title,
|
70
|
+
.profiler-queries .custom-fields-title {
|
71
|
+
color: #555;
|
72
|
+
font: Helvetica, Arial, sans-serif;
|
73
|
+
font-size: 14px; }
|
52
74
|
|
53
75
|
.profiler-result {
|
54
76
|
font-family: Helvetica, Arial, sans-serif; }
|
55
77
|
.profiler-result .profiler-toggle-duration-with-children {
|
56
78
|
float: right; }
|
79
|
+
.profiler-result .profiler-snapshots-page-link {
|
80
|
+
float: left; }
|
57
81
|
.profiler-result table.profiler-client-timings {
|
58
82
|
margin-top: 10px; }
|
59
83
|
.profiler-result .profiler-label {
|
@@ -207,8 +231,7 @@
|
|
207
231
|
top: 0px; }
|
208
232
|
.profiler-results.profiler-top.profiler-left {
|
209
233
|
left: 0px; }
|
210
|
-
.profiler-results.profiler-top.profiler-left.profiler-no-controls .profiler-totals,
|
211
|
-
.profiler-results.profiler-top.profiler-left.profiler-no-controls .profiler-result:last-child .profiler-button,
|
234
|
+
.profiler-results.profiler-top.profiler-left.profiler-no-controls .profiler-totals, .profiler-results.profiler-top.profiler-left.profiler-no-controls .profiler-result:last-child .profiler-button,
|
212
235
|
.profiler-results.profiler-top.profiler-left .profiler-controls {
|
213
236
|
-webkit-border-bottom-right-radius: 10px;
|
214
237
|
-moz-border-radius-bottomright: 10px;
|
@@ -218,8 +241,7 @@
|
|
218
241
|
border-right: 1px solid #888; }
|
219
242
|
.profiler-results.profiler-top.profiler-right {
|
220
243
|
right: 0px; }
|
221
|
-
.profiler-results.profiler-top.profiler-right.profiler-no-controls .profiler-totals,
|
222
|
-
.profiler-results.profiler-top.profiler-right.profiler-no-controls .profiler-result:last-child .profiler-button,
|
244
|
+
.profiler-results.profiler-top.profiler-right.profiler-no-controls .profiler-totals, .profiler-results.profiler-top.profiler-right.profiler-no-controls .profiler-result:last-child .profiler-button,
|
223
245
|
.profiler-results.profiler-top.profiler-right .profiler-controls {
|
224
246
|
-webkit-border-bottom-left-radius: 10px;
|
225
247
|
-moz-border-radius-bottomleft: 10px;
|
@@ -231,8 +253,7 @@
|
|
231
253
|
bottom: 0px; }
|
232
254
|
.profiler-results.profiler-bottom.profiler-left {
|
233
255
|
left: 0px; }
|
234
|
-
.profiler-results.profiler-bottom.profiler-left.profiler-no-controls .profiler-totals,
|
235
|
-
.profiler-results.profiler-bottom.profiler-left.profiler-no-controls .profiler-result:first-child .profiler-button,
|
256
|
+
.profiler-results.profiler-bottom.profiler-left.profiler-no-controls .profiler-totals, .profiler-results.profiler-bottom.profiler-left.profiler-no-controls .profiler-result:first-child .profiler-button,
|
236
257
|
.profiler-results.profiler-bottom.profiler-left .profiler-controls {
|
237
258
|
-webkit-border-top-right-radius: 10px;
|
238
259
|
-moz-border-radius-topright: 10px;
|
@@ -242,8 +263,7 @@
|
|
242
263
|
border-right: 1px solid #888; }
|
243
264
|
.profiler-results.profiler-bottom.profiler-right {
|
244
265
|
right: 0px; }
|
245
|
-
.profiler-results.profiler-bottom.profiler-right.profiler-no-controls .profiler-totals,
|
246
|
-
.profiler-results.profiler-bottom.profiler-right.profiler-no-controls .profiler-result:first-child .profiler-button,
|
266
|
+
.profiler-results.profiler-bottom.profiler-right.profiler-no-controls .profiler-totals, .profiler-results.profiler-bottom.profiler-right.profiler-no-controls .profiler-result:first-child .profiler-button,
|
247
267
|
.profiler-results.profiler-bottom.profiler-right .profiler-controls {
|
248
268
|
-webkit-border-bottom-top-radius: 10px;
|
249
269
|
-moz-border-radius-topleft: 10px;
|
@@ -349,7 +369,6 @@
|
|
349
369
|
@media print {
|
350
370
|
.profiler-results {
|
351
371
|
display: none; } }
|
352
|
-
|
353
372
|
.profiler-queries-bg {
|
354
373
|
z-index: 2147483642;
|
355
374
|
display: none;
|
@@ -407,3 +426,17 @@
|
|
407
426
|
background: #ffffbb; }
|
408
427
|
100% {
|
409
428
|
background: #fff; } }
|
429
|
+
|
430
|
+
.mp-snapshots {
|
431
|
+
font-family: Helvetica, Arial, sans-serif;
|
432
|
+
font-size: 16px; }
|
433
|
+
.mp-snapshots .snapshots-table thead {
|
434
|
+
background: #6a737c;
|
435
|
+
color: #ffffff; }
|
436
|
+
.mp-snapshots .snapshots-table th, .mp-snapshots .snapshots-table td {
|
437
|
+
padding: 5px 10px;
|
438
|
+
box-sizing: border-box; }
|
439
|
+
.mp-snapshots .snapshots-table th:not(.request-group), .mp-snapshots .snapshots-table td:not(.request-group) {
|
440
|
+
text-align: center; }
|
441
|
+
.mp-snapshots .snapshots-table th {
|
442
|
+
border-right: 1px solid #ffffff; }
|
data/lib/html/includes.js
CHANGED
@@ -108,18 +108,8 @@ var MiniProfiler = (function() {
|
|
108
108
|
// ie is buggy strip out functions
|
109
109
|
var copy = {
|
110
110
|
navigation: {},
|
111
|
-
timing:
|
111
|
+
timing: clientPerformance.timing.toJSON()
|
112
112
|
};
|
113
|
-
var timing = extend({}, clientPerformance.timing);
|
114
|
-
|
115
|
-
for (p in timing) {
|
116
|
-
if (
|
117
|
-
timing.hasOwnProperty(p) &&
|
118
|
-
!(typeof timing[p] === "function")
|
119
|
-
) {
|
120
|
-
copy.timing[p] = timing[p];
|
121
|
-
}
|
122
|
-
}
|
123
113
|
|
124
114
|
if (clientPerformance.navigation) {
|
125
115
|
copy.navigation.redirectCount =
|
@@ -147,10 +137,13 @@ var MiniProfiler = (function() {
|
|
147
137
|
(function() {
|
148
138
|
var request = new XMLHttpRequest();
|
149
139
|
var url = options.path + "results";
|
150
|
-
var params =
|
151
|
-
|
152
|
-
|
153
|
-
|
140
|
+
var params = {
|
141
|
+
id: id,
|
142
|
+
clientPerformance: clientPerformance,
|
143
|
+
clientProbes: clientProbes,
|
144
|
+
popup: 1
|
145
|
+
};
|
146
|
+
var queryParam = toQueryString(params);
|
154
147
|
request.open("POST", url, true);
|
155
148
|
|
156
149
|
request.onload = function() {
|
@@ -172,24 +165,45 @@ var MiniProfiler = (function() {
|
|
172
165
|
"Content-Type",
|
173
166
|
"application/x-www-form-urlencoded"
|
174
167
|
);
|
175
|
-
request.send(
|
168
|
+
request.send(queryParam);
|
176
169
|
})();
|
177
170
|
}
|
178
171
|
}
|
179
172
|
};
|
180
173
|
|
181
|
-
var
|
182
|
-
|
183
|
-
|
184
|
-
|
185
|
-
|
186
|
-
|
187
|
-
|
188
|
-
|
174
|
+
var toQueryString = function toQueryString(data, parentKey) {
|
175
|
+
var result = [];
|
176
|
+
for (var key in data) {
|
177
|
+
var val = data[key];
|
178
|
+
var newKey = !parentKey ? key : parentKey + "[" + key + "]";
|
179
|
+
if (
|
180
|
+
typeof val === "object" &&
|
181
|
+
!Array.isArray(val) &&
|
182
|
+
val !== null &&
|
183
|
+
val !== undefined
|
184
|
+
) {
|
185
|
+
result[result.length] = toQueryString(val, newKey);
|
186
|
+
} else {
|
187
|
+
if (Array.isArray(val)) {
|
188
|
+
val.forEach(function(v) {
|
189
|
+
result[result.length] =
|
190
|
+
encodeURIComponent(newKey + "[]") + "=" + encodeURIComponent(v);
|
191
|
+
});
|
192
|
+
} else if (val === null || val === undefined) {
|
193
|
+
result[result.length] = encodeURIComponent(newKey) + "=";
|
194
|
+
} else {
|
195
|
+
result[result.length] =
|
196
|
+
encodeURIComponent(newKey) +
|
197
|
+
"=" +
|
198
|
+
encodeURIComponent(val.toString());
|
199
|
+
}
|
189
200
|
}
|
190
201
|
}
|
191
|
-
|
192
|
-
|
202
|
+
return result
|
203
|
+
.filter(function(element) {
|
204
|
+
return element && element.length > 0;
|
205
|
+
})
|
206
|
+
.join("&");
|
193
207
|
};
|
194
208
|
|
195
209
|
var renderTemplate = function renderTemplate(json) {
|
@@ -659,6 +673,32 @@ var MiniProfiler = (function() {
|
|
659
673
|
});
|
660
674
|
};
|
661
675
|
|
676
|
+
var initSnapshots = function initSnapshots(dataElement) {
|
677
|
+
var data = JSON.parse(dataElement.textContent);
|
678
|
+
var temp = document.createElement("DIV");
|
679
|
+
if (data.page === "overview") {
|
680
|
+
temp.innerHTML = MiniProfiler.templates.snapshotsGroupsList(data);
|
681
|
+
} else if (data.group_name) {
|
682
|
+
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) {
|
687
|
+
allCustomFieldsNames.push(k);
|
688
|
+
}
|
689
|
+
});
|
690
|
+
});
|
691
|
+
allCustomFieldsNames.sort();
|
692
|
+
temp.innerHTML = MiniProfiler.templates.snapshotsList({
|
693
|
+
data: data,
|
694
|
+
allCustomFieldsNames: allCustomFieldsNames
|
695
|
+
});
|
696
|
+
}
|
697
|
+
Array.from(temp.children).forEach(function (child) {
|
698
|
+
document.body.appendChild(child);
|
699
|
+
});
|
700
|
+
};
|
701
|
+
|
662
702
|
var initControls = function initControls(container) {
|
663
703
|
if (options.showControls) {
|
664
704
|
var _controls = document.createElement("div");
|
@@ -938,7 +978,7 @@ var MiniProfiler = (function() {
|
|
938
978
|
var script = document.getElementById("mini-profiler");
|
939
979
|
if (!script || !script.getAttribute) return;
|
940
980
|
|
941
|
-
options = (function() {
|
981
|
+
this.options = options = (function() {
|
942
982
|
var version = script.getAttribute("data-version");
|
943
983
|
var path = script.getAttribute("data-path");
|
944
984
|
var currentId = script.getAttribute("data-current-id");
|
@@ -966,6 +1006,8 @@ var MiniProfiler = (function() {
|
|
966
1006
|
script.getAttribute("data-start-hidden") === "true" ||
|
967
1007
|
sessionStorage["rack-mini-profiler-start-hidden"] === "true";
|
968
1008
|
var htmlContainer = script.getAttribute("data-html-container");
|
1009
|
+
var cssUrl = script.getAttribute("data-css-url");
|
1010
|
+
var hiddenCustomFields = script.getAttribute("data-hidden-custom-fields").toLowerCase().split(",");
|
969
1011
|
return {
|
970
1012
|
ids: ids,
|
971
1013
|
path: path,
|
@@ -982,11 +1024,19 @@ var MiniProfiler = (function() {
|
|
982
1024
|
toggleShortcut: toggleShortcut,
|
983
1025
|
startHidden: startHidden,
|
984
1026
|
collapseResults: collapseResults,
|
985
|
-
htmlContainer: htmlContainer
|
1027
|
+
htmlContainer: htmlContainer,
|
1028
|
+
cssUrl: cssUrl,
|
1029
|
+
hiddenCustomFields: hiddenCustomFields
|
986
1030
|
};
|
987
1031
|
})();
|
988
1032
|
|
989
1033
|
var doInit = function doInit() {
|
1034
|
+
var snapshotsElement = document.getElementById("snapshots-data");
|
1035
|
+
if (snapshotsElement != null) {
|
1036
|
+
initSnapshots(snapshotsElement);
|
1037
|
+
return;
|
1038
|
+
}
|
1039
|
+
|
990
1040
|
// when rendering a shared, full page, this div will exist
|
991
1041
|
container = document.querySelectorAll(".profiler-result-full");
|
992
1042
|
|
@@ -1042,7 +1092,7 @@ var MiniProfiler = (function() {
|
|
1042
1092
|
|
1043
1093
|
var init = function init() {
|
1044
1094
|
if (options.authorized) {
|
1045
|
-
var url = options.
|
1095
|
+
var url = options.cssUrl;
|
1046
1096
|
|
1047
1097
|
if (document.createStyleSheet) {
|
1048
1098
|
document.createStyleSheet(url);
|
@@ -1380,8 +1430,34 @@ var MiniProfiler = (function() {
|
|
1380
1430
|
},
|
1381
1431
|
showTotalSqlCount: function showTotalSqlCount() {
|
1382
1432
|
return options.showTotalSqlCount;
|
1433
|
+
},
|
1434
|
+
timestampToRelative: function timestampToRelative(timestamp) {
|
1435
|
+
var now = Math.round((new Date()).getTime() / 1000);
|
1436
|
+
timestamp = Math.round(timestamp / 1000);
|
1437
|
+
var diff = now - timestamp;
|
1438
|
+
if (diff < 60) {
|
1439
|
+
return "< 1 minute";
|
1440
|
+
}
|
1441
|
+
var buildDisplayTime = function buildDisplayTime(num, unit) {
|
1442
|
+
var res = num + " " + unit;
|
1443
|
+
if (num !== 1) {
|
1444
|
+
res += "s";
|
1445
|
+
}
|
1446
|
+
return res;
|
1447
|
+
}
|
1448
|
+
diff = Math.round(diff / 60);
|
1449
|
+
if (diff <= 60) {
|
1450
|
+
return buildDisplayTime(diff, "minute");
|
1451
|
+
}
|
1452
|
+
diff = Math.round(diff / 60);
|
1453
|
+
if (diff <= 24) {
|
1454
|
+
return buildDisplayTime(diff, "hour");
|
1455
|
+
}
|
1456
|
+
diff = Math.round(diff / 24);
|
1457
|
+
return buildDisplayTime(diff, "day");
|
1383
1458
|
}
|
1384
1459
|
};
|
1385
1460
|
})();
|
1386
1461
|
|
1462
|
+
window.MiniProfiler = MiniProfiler;
|
1387
1463
|
MiniProfiler.init();
|