rack-mini-profiler 2.3.2 → 2.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2984e9dec3cda4d5b86a4ed3b8300725207ba826b6a064402b23dcf04b0d5a51
-  data.tar.gz: 4a05074c124ac23085c08f4ae5389b71ef7b85687c40c5e5594dee4884d87632
+  metadata.gz: 6ff9200889e574b3f90f901b90b88fe05f0c48993c945fc5dac37c2f1d86e693
+  data.tar.gz: bdca4fb3ada1b7c56525753b9eaa6430389f309a76152e3f8a7e0c9297463bea
 SHA512:
-  metadata.gz: b29d4a47e99d03489251752bfe57a2b64235400b5ffb9f867738bfb9d165f63ddeeb559fc4edf9a60c91fe2d579b04ee473db1b2c7846ab823580d8b9b5e88c1
-  data.tar.gz: 3a0768401c048801bf4adb22792fbdb2643d5b5e0174f92149df96c8ae2ab79d0c504e9e2146d72cc45068df6b88ebc675ef11431d47c17a5b929f375a1e6d74
+  metadata.gz: 43b8c69b37ba90c80c31d8d410b05dda421322d5c6d1f45654807b526f7d990bec54eaa711aa34bbf43141831453a75543b3a27189103ea3f3bcbac7f3f4101a
+  data.tar.gz: bed607b319c32d85838767f7de608031411d7513fcbd8866d2d67feb44253b997e389671a903b192be07e04d1c018069ab835536de47ada14ad3af8bf89739d9

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 2.3.3 - 2021-08-30
+
+- [FEATURE] Introduce `pp=flamegraph_mode`
+- [FEATURE] Richer CSP configuration options
+- [FEATURE] Add support for Hotwire Turbo Drive
+
 ## 2.3.2 - 2021-04-30
 
 - [FEATURE] Introduce `pp=async-flamegraph` for asynchronous flamegraphs

data/README.md

@@ -175,6 +175,9 @@ To store flamegraph data for later viewing, append the `?pp=async-flamegraph` pa
 Flamegraph data for this request, and all subsequent requests made by this page (based on the `REFERER` header) will be stored.
 'flamegraph' links will appear for these requests in the MiniProfiler UI.
 
+Note: Mini Profiler will not record SQL timings for a request if it asks for a flamegraph. The rationale behind this is to keep
+Mini Profiler's methods that are responsible for generating the timings data out of the flamegraph.
+
 ### Memory Profiling
 
 Memory allocations can be measured (using the [memory_profiler](https://github.com/SamSaffron/memory_profiler) gem)
@@ -398,6 +401,7 @@ toggle_shortcut|Alt+P|Keyboard shortcut to toggle the mini_profiler's visibility
 start_hidden|`false`|`false` to make mini_profiler visible on page load.
 backtrace_threshold_ms|`0`|Minimum SQL query elapsed time before a backtrace is recorded.
 flamegraph_sample_rate|`0.5`|How often to capture stack traces for flamegraphs in milliseconds.
+flamegraph_mode|`:wall`|The [StackProf mode](https://github.com/tmm1/stackprof#all-options) to pass to `StackProf.run`.
 base_url_path|`'/mini-profiler-resources/'`|Path for assets; added as a prefix when naming assets and sought when responding to requests.
 collapse_results|`true`|If multiple timing results exist in a single page, collapse them till clicked.
 max_traces_to_show|20|Maximum number of mini profiler timing blocks to show on one page
@@ -412,13 +416,15 @@ snapshots_transport_destination_url|`nil`|Set this config to a valid URL to enab
 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`.
+content_security_policy_nonce|Rails: Current nonce<br>Rack: nil|Set the content security policy nonce to use when inserting MiniProfiler's script block.
+enable_hotwire_turbo_drive_support| `false` | Enable support for Hotwire TurboDrive page transitions.
 
 ### Using MiniProfiler with `Rack::Deflate` middleware
 
 If you are using `Rack::Deflate` with Rails and `rack-mini-profiler` in its default configuration,
 `Rack::MiniProfiler` will be injected (as always) at position 0 in the middleware stack,
 which means it will run after `Rack::Deflate` on response processing. To prevent attempting to inject
-HTML in already compressed response body MiniProfiler will suppress compression by setting 
+HTML in already compressed response body MiniProfiler will suppress compression by setting
 `identity` encoding in `Accept-Encoding` request header.
 
 ## Special query strings
@@ -461,20 +467,23 @@ end
 If you want to contribute to this project, that's great, thank you! You can run the following rake task:
 
 ```
+$ BUNDLE_GEMFILE=website/Gemfile bundle install
 $ bundle exec rake client_dev
 ```
 
-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.
+This 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.
+
+Make sure to prepend `bundle exec` before any Rake tasks you run.
 
 ## Running the Specs
 
+You need Memcached and Redis services running for the specs.
+
 ```
 $ rake build
 $ rake spec
 ```
 
-Additionally you can also run `autotest` if you like.
-
 ## Licence
 
 The MIT License (MIT)

data/lib/html/includes.css

@@ -69,8 +69,16 @@
   .profiler-result .custom-fields-title,
   .profiler-queries .custom-fields-title {
     color: #555;
-    font: Helvetica, Arial, sans-serif;
+    font-family: Helvetica, Arial, sans-serif;
     font-size: 14px; }
+  .mp-snapshots .ta-left,
+  .profiler-result .ta-left,
+  .profiler-queries .ta-left {
+    text-align: left; }
+  .mp-snapshots .ta-right,
+  .profiler-result .ta-right,
+  .profiler-queries .ta-right {
+    text-align: right; }
 
 .profiler-result {
   font-family: Helvetica, Arial, sans-serif; }
@@ -233,8 +241,6 @@
       left: 0px; }
       .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,
       .profiler-results.profiler-top.profiler-left .profiler-controls {
-        -webkit-border-bottom-right-radius: 10px;
-        -moz-border-radius-bottomright: 10px;
         border-bottom-right-radius: 10px; }
       .profiler-results.profiler-top.profiler-left .profiler-button,
       .profiler-results.profiler-top.profiler-left .profiler-controls {
@@ -243,8 +249,6 @@
       right: 0px; }
       .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,
       .profiler-results.profiler-top.profiler-right .profiler-controls {
-        -webkit-border-bottom-left-radius: 10px;
-        -moz-border-radius-bottomleft: 10px;
         border-bottom-left-radius: 10px; }
       .profiler-results.profiler-top.profiler-right .profiler-button,
       .profiler-results.profiler-top.profiler-right .profiler-controls {
@@ -255,8 +259,6 @@
       left: 0px; }
       .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,
       .profiler-results.profiler-bottom.profiler-left .profiler-controls {
-        -webkit-border-top-right-radius: 10px;
-        -moz-border-radius-topright: 10px;
         border-top-right-radius: 10px; }
       .profiler-results.profiler-bottom.profiler-left .profiler-button,
       .profiler-results.profiler-bottom.profiler-left .profiler-controls {
@@ -265,8 +267,6 @@
       right: 0px; }
       .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,
       .profiler-results.profiler-bottom.profiler-right .profiler-controls {
-        -webkit-border-bottom-top-radius: 10px;
-        -moz-border-radius-topleft: 10px;
         border-top-left-radius: 10px; }
       .profiler-results.profiler-bottom.profiler-right .profiler-button,
       .profiler-results.profiler-bottom.profiler-right .profiler-controls {
@@ -324,8 +324,6 @@
     text-align: left;
     line-height: 18px;
     overflow: auto;
-    -moz-box-shadow: 0px 1px 15px #555;
-    -webkit-box-shadow: 0px 1px 15px #555;
     box-shadow: 0px 1px 15px #555; }
     .profiler-results .profiler-popup .profiler-info {
       margin-bottom: 3px;

data/lib/html/includes.js

@@ -495,6 +495,19 @@ var _MiniProfiler = (function() {
     }, 3000);
   };
 
+  var onTurboBeforeVisit = function onTurboBeforeVisit(e) {
+    if(!e.defaultPrevented) {
+      window.MiniProfilerContainer = document.querySelector('body > .profiler-results')
+      window.MiniProfiler.pageTransition()
+    }
+  }
+
+  var onTurboLoad = function onTurboLoad(e) {
+    if(window.MiniProfilerContainer) {
+      document.body.appendChild(window.MiniProfilerContainer)
+    }
+  }
+
   var onClickEvents = function onClickEvents(e) {
     // this happens on every keystroke, and :visible is crazy expensive in IE <9
     // and in this case, the display:none check is sufficient.
@@ -652,6 +665,11 @@ var _MiniProfiler = (function() {
         turbolinksSkipResultsFetch
       );
     }
+
+    if (options.hotwireTurboDriveSupport) {
+      document.addEventListener("turbo:before-visit", onTurboBeforeVisit)
+      document.addEventListener("turbo:load", onTurboLoad)
+    }
   };
 
   var unbindDocumentEvents = function unbindDocumentEvents() {
@@ -664,6 +682,8 @@ var _MiniProfiler = (function() {
       "turbolinks:request-start",
       turbolinksSkipResultsFetch
     );
+    document.removeEventListener("turbo:before-visit", onTurboBeforeVisit);
+    document.removeEventListener("turbo:load", onTurboLoad);
   };
 
   var initFullView = function initFullView() {
@@ -1033,6 +1053,8 @@ var _MiniProfiler = (function() {
           .getAttribute("data-hidden-custom-fields")
           .toLowerCase()
           .split(",");
+        var hotwireTurboDriveSupport = script
+          .getAttribute('data-turbo-permanent') === "true";
         return {
           ids: ids,
           path: path,
@@ -1051,7 +1073,8 @@ var _MiniProfiler = (function() {
           collapseResults: collapseResults,
           htmlContainer: htmlContainer,
           cssUrl: cssUrl,
-          hiddenCustomFields: hiddenCustomFields
+          hiddenCustomFields: hiddenCustomFields,
+          hotwireTurboDriveSupport: hotwireTurboDriveSupport
         };
       })();
 

data/lib/html/includes.scss

@@ -1,6 +1,4 @@
 @mixin box-shadow($dx, $dy, $radius, $color) {
-  -moz-box-shadow: $dx $dy $radius $color;
-  -webkit-box-shadow: $dx $dy $radius $color;
   box-shadow: $dx $dy $radius $color;
 }
 
@@ -58,9 +56,11 @@ $zindex: 2147483640; // near 32bit max 2147483647
   }
   .custom-fields-title {
     color: $textColor;
-    font: $normalFonts;
+    font-family: $normalFonts;
     font-size: 14px;
   }
+  .ta-left  { text-align: left;  }
+  .ta-right { text-align: right; }
 }
 
 // styles shared between popup view and full view
@@ -326,8 +326,6 @@ $zindex: 2147483640; // near 32bit max 2147483647
       &.profiler-no-controls .profiler-totals,
       &.profiler-no-controls .profiler-result:last-child .profiler-button,
       .profiler-controls {
-        -webkit-border-bottom-right-radius: $radius;
-        -moz-border-radius-bottomright: $radius;
         border-bottom-right-radius: $radius;
       }
 
@@ -343,8 +341,6 @@ $zindex: 2147483640; // near 32bit max 2147483647
       &.profiler-no-controls .profiler-totals,
       &.profiler-no-controls .profiler-result:last-child .profiler-button,
       .profiler-controls {
-        -webkit-border-bottom-left-radius: $radius;
-        -moz-border-radius-bottomleft: $radius;
         border-bottom-left-radius: $radius;
       }
 
@@ -364,8 +360,6 @@ $zindex: 2147483640; // near 32bit max 2147483647
       &.profiler-no-controls .profiler-totals,
       &.profiler-no-controls .profiler-result:first-child .profiler-button,
       .profiler-controls {
-        -webkit-border-top-right-radius: $radius;
-        -moz-border-radius-topright: $radius;
         border-top-right-radius: $radius;
       }
 
@@ -381,8 +375,6 @@ $zindex: 2147483640; // near 32bit max 2147483647
       &.profiler-no-controls .profiler-totals,
       &.profiler-no-controls .profiler-result:first-child .profiler-button,
       .profiler-controls {
-        -webkit-border-bottom-top-radius: $radius;
-        -moz-border-radius-topleft: $radius;
         border-top-left-radius: $radius;
       }
 

data/lib/html/includes.tmpl

@@ -117,8 +117,8 @@
         <table>
         <thead>
           <tr>
-            <th style="text-align:right">step<br />time from start<br />query type<br />duration</th>
-            <th style="text-align:left">call stack<br />query</th>
+            <th class="ta-right">step<br />time from start<br />query type<br />duration</th>
+            <th class="ta-left">call stack<br />query</th>
           </tr>
         </thead>
         <tbody>

data/lib/html/profile_handler.js

@@ -1 +1 @@
-<script async type="text/javascript" id="mini-profiler" src="{url}" data-css-url="{cssUrl}" data-version="{version}" data-path="{path}" data-current-id="{currentId}" data-ids="{ids}" data-horizontal-position="{horizontalPosition}" data-vertical-position="{verticalPosition}" data-trivial="{showTrivial}" data-children="{showChildren}" data-max-traces="{maxTracesToShow}" data-controls="{showControls}" data-total-sql-count="{showTotalSqlCount}" data-authorized="{authorized}" data-toggle-shortcut="{toggleShortcut}" data-start-hidden="{startHidden}" data-collapse-results="{collapseResults}" data-html-container="{htmlContainer}" data-hidden-custom-fields="{hiddenCustomFields}"></script>
+<script async nonce="{cspNonce}" type="text/javascript" id="mini-profiler" src="{url}" data-css-url="{cssUrl}" data-version="{version}" data-path="{path}" data-current-id="{currentId}" data-ids="{ids}" data-horizontal-position="{horizontalPosition}" data-vertical-position="{verticalPosition}" data-trivial="{showTrivial}" data-children="{showChildren}" data-max-traces="{maxTracesToShow}" data-controls="{showControls}" data-total-sql-count="{showTotalSqlCount}" data-authorized="{authorized}" data-toggle-shortcut="{toggleShortcut}" data-start-hidden="{startHidden}" data-collapse-results="{collapseResults}" data-html-container="{htmlContainer}" data-hidden-custom-fields="{hiddenCustomFields}" data-turbo-permanent="{hotwireTurboDriveSupport}"></script>

data/lib/html/vendor.js

@@ -7,7 +7,7 @@
 MiniProfiler.templates = {};
 MiniProfiler.templates["profilerTemplate"] = function anonymous(it
 ) {
-var out=' <div class="profiler-result"> <div class="profiler-button ';if(it.has_duplicate_sql_timings){out+='profiler-warning';}out+='"> ';if(it.has_duplicate_sql_timings){out+='<span class="profiler-nuclear">!</span>';}out+=' <span class="profiler-number"> '+( MiniProfiler.formatDuration(it.duration_milliseconds))+' <span class="profiler-unit">ms</span> </span> ';if(MiniProfiler.showTotalSqlCount()){out+=' <span class="profiler-number"> '+( it.sql_count)+' <span class="profiler-unit">sql</span> </span> ';}out+=' </div> <div class="profiler-popup"> <div class="profiler-info"> <span class="profiler-name"> '+( it.name)+' <span class="profiler-overall-duration">('+( MiniProfiler.formatDuration(it.duration_milliseconds))+' ms)</span> </span> <span class="profiler-server-time">'+( it.machine_name)+' on '+( MiniProfiler.renderDate(it.started_formatted))+'</span> </div> <div class="profiler-output"> <table class="profiler-timings"> <thead> <tr> <th>event</th> <th>duration (ms)</th> <th class="profiler-duration-with-children">with children (ms)</th> <th class="time-from-start">from start (ms)</th> ';if(it.has_sql_timings){out+=' <th colspan="2">query time (ms)</th> ';}out+=' ';var arr1=it.custom_timing_names;if(arr1){var value,i1=-1,l1=arr1.length-1;while(i1<l1){value=arr1[i1+=1];out+=' <th colspan="2">'+( value.toLowerCase() )+' (ms)</th> ';} } out+=' </tr> </thead> <tbody> '+( MiniProfiler.templates.timingTemplate({timing: it.root, page: it}) )+' </tbody> <tfoot> <tr> <td colspan="3"> ';if(!it.client_timings){out+=' '+( MiniProfiler.templates.linksTemplate({timing: it.root, page: it}) )+' ';}out+=' <a class="profiler-toggle-duration-with-children" title="toggles column with aggregate child durations">show time with children</a> <a class="profiler-snapshots-page-link" title="Go to snapshots page" href="'+( MiniProfiler.options.path )+'snapshots">snapshots</a> </td> ';if(it.has_sql_timings){out+=' <td colspan="2" class="profiler-number profiler-percent-in-sql" title="'+( MiniProfiler.getSqlTimingsCount(it.root) )+' queries spent '+( MiniProfiler.formatDuration(it.duration_milliseconds_in_sql) )+' ms of total request time"> '+( MiniProfiler.formatDuration(it.duration_milliseconds_in_sql / it.duration_milliseconds * 100) )+' <span class="profiler-unit">% in sql</span> </td> ';}out+=' ';var arr2=it.custom_timing_names;if(arr2){var value,i2=-1,l2=arr2.length-1;while(i2<l2){value=arr2[i2+=1];out+=' <td colspan="2" class="profiler-number profiler-percentage-in-sql" title="'+( it.custom_timing_stats[value].count )+' '+( value.toLowerCase() )+' invocations spent '+( MiniProfiler.formatDuration(it.custom_timing_stats[value].duration) )+' ms of total request time"> '+( MiniProfiler.formatDuration(it.custom_timing_stats[value].duration / it.duration_milliseconds * 100) )+' <span class="profiler-unit">% in '+( value.toLowerCase() )+'</span> </td> ';} } out+=' </tr> </tfoot> </table> ';if(it.client_timings){out+=' <table class="profiler-timings profiler-client-timings"> <thead> <tr> <th>client event</th> <th>duration (ms)</th> <th>from start (ms)</th> </tr> </thead> <tbody> ';var arr3=MiniProfiler.getClientTimings(it.client_timings);if(arr3){var value,i3=-1,l3=arr3.length-1;while(i3<l3){value=arr3[i3+=1];out+=' <tr class="';if(value.isTrivial){out+='profiler-trivial';}out+='"> <td class="profiler-label">'+( value.name )+'</td> <td class="profiler-duration"> ';if(value.duration >= 0){out+=' <span class="profiler-unit"></span>'+( MiniProfiler.formatDuration(value.duration) )+' ';}out+=' </td> <td class="profiler-duration time-from-start"> <span class="profiler-unit">+</span>'+( MiniProfiler.formatDuration(value.start) )+' </td> </tr> ';} } out+=' </tbody> <tfoot> <td colspan="3"> '+( MiniProfiler.templates.linksTemplate({timing: it.root, page: it}) )+' </td> </tfoot> </table> ';}out+=' ';if(it.custom_fields && Object.keys(it.custom_fields).length > 0){out+=' <p class="custom-fields-title">Snapshot custom fields</p> <table class="profiler-timings"> <tbody> ';var arr4=Object.keys(it.custom_fields);if(arr4){var key,i4=-1,l4=arr4.length-1;while(i4<l4){key=arr4[i4+=1];out+=' <tr> <td class="profiler-label">'+( key )+'</td> <td class="profiler-label">'+( it.custom_fields[key] )+'</td> </tr> ';} } out+=' </tbody> </table> ';}out+=' </div> </div> ';if(it.has_sql_timings){out+=' <div class="profiler-queries"> <table> <thead> <tr> <th style="text-align:right">step<br />time from start<br />query type<br />duration</th> <th style="text-align:left">call stack<br />query</th> </tr> </thead> <tbody> ';var arr5=MiniProfiler.getSqlTimings(it.root);if(arr5){var value,index=-1,l5=arr5.length-1;while(index<l5){value=arr5[index+=1];out+=' '+( MiniProfiler.templates.sqlGapTemplate({g: value.prevGap}) )+' '+( MiniProfiler.templates.sqlTimingTemplate({i: index, s: value}) )+' ';if(value.nextGap){out+=' '+( MiniProfiler.templates.sqlGapTemplate({g: value.nextGap}) )+' ';}out+=' ';} } out+=' </tbody> </table> <p class="profiler-trivial-gap-container"> <a class="profiler-toggle-trivial-gaps">show trivial gaps</a> </p> </div> ';}out+=' </div>';return out;
+var out=' <div class="profiler-result"> <div class="profiler-button ';if(it.has_duplicate_sql_timings){out+='profiler-warning';}out+='"> ';if(it.has_duplicate_sql_timings){out+='<span class="profiler-nuclear">!</span>';}out+=' <span class="profiler-number"> '+( MiniProfiler.formatDuration(it.duration_milliseconds))+' <span class="profiler-unit">ms</span> </span> ';if(MiniProfiler.showTotalSqlCount()){out+=' <span class="profiler-number"> '+( it.sql_count)+' <span class="profiler-unit">sql</span> </span> ';}out+=' </div> <div class="profiler-popup"> <div class="profiler-info"> <span class="profiler-name"> '+( it.name)+' <span class="profiler-overall-duration">('+( MiniProfiler.formatDuration(it.duration_milliseconds))+' ms)</span> </span> <span class="profiler-server-time">'+( it.machine_name)+' on '+( MiniProfiler.renderDate(it.started_formatted))+'</span> </div> <div class="profiler-output"> <table class="profiler-timings"> <thead> <tr> <th>event</th> <th>duration (ms)</th> <th class="profiler-duration-with-children">with children (ms)</th> <th class="time-from-start">from start (ms)</th> ';if(it.has_sql_timings){out+=' <th colspan="2">query time (ms)</th> ';}out+=' ';var arr1=it.custom_timing_names;if(arr1){var value,i1=-1,l1=arr1.length-1;while(i1<l1){value=arr1[i1+=1];out+=' <th colspan="2">'+( value.toLowerCase() )+' (ms)</th> ';} } out+=' </tr> </thead> <tbody> '+( MiniProfiler.templates.timingTemplate({timing: it.root, page: it}) )+' </tbody> <tfoot> <tr> <td colspan="3"> ';if(!it.client_timings){out+=' '+( MiniProfiler.templates.linksTemplate({timing: it.root, page: it}) )+' ';}out+=' <a class="profiler-toggle-duration-with-children" title="toggles column with aggregate child durations">show time with children</a> <a class="profiler-snapshots-page-link" title="Go to snapshots page" href="'+( MiniProfiler.options.path )+'snapshots">snapshots</a> </td> ';if(it.has_sql_timings){out+=' <td colspan="2" class="profiler-number profiler-percent-in-sql" title="'+( MiniProfiler.getSqlTimingsCount(it.root) )+' queries spent '+( MiniProfiler.formatDuration(it.duration_milliseconds_in_sql) )+' ms of total request time"> '+( MiniProfiler.formatDuration(it.duration_milliseconds_in_sql / it.duration_milliseconds * 100) )+' <span class="profiler-unit">% in sql</span> </td> ';}out+=' ';var arr2=it.custom_timing_names;if(arr2){var value,i2=-1,l2=arr2.length-1;while(i2<l2){value=arr2[i2+=1];out+=' <td colspan="2" class="profiler-number profiler-percentage-in-sql" title="'+( it.custom_timing_stats[value].count )+' '+( value.toLowerCase() )+' invocations spent '+( MiniProfiler.formatDuration(it.custom_timing_stats[value].duration) )+' ms of total request time"> '+( MiniProfiler.formatDuration(it.custom_timing_stats[value].duration / it.duration_milliseconds * 100) )+' <span class="profiler-unit">% in '+( value.toLowerCase() )+'</span> </td> ';} } out+=' </tr> </tfoot> </table> ';if(it.client_timings){out+=' <table class="profiler-timings profiler-client-timings"> <thead> <tr> <th>client event</th> <th>duration (ms)</th> <th>from start (ms)</th> </tr> </thead> <tbody> ';var arr3=MiniProfiler.getClientTimings(it.client_timings);if(arr3){var value,i3=-1,l3=arr3.length-1;while(i3<l3){value=arr3[i3+=1];out+=' <tr class="';if(value.isTrivial){out+='profiler-trivial';}out+='"> <td class="profiler-label">'+( value.name )+'</td> <td class="profiler-duration"> ';if(value.duration >= 0){out+=' <span class="profiler-unit"></span>'+( MiniProfiler.formatDuration(value.duration) )+' ';}out+=' </td> <td class="profiler-duration time-from-start"> <span class="profiler-unit">+</span>'+( MiniProfiler.formatDuration(value.start) )+' </td> </tr> ';} } out+=' </tbody> <tfoot> <td colspan="3"> '+( MiniProfiler.templates.linksTemplate({timing: it.root, page: it}) )+' </td> </tfoot> </table> ';}out+=' ';if(it.custom_fields && Object.keys(it.custom_fields).length > 0){out+=' <p class="custom-fields-title">Snapshot custom fields</p> <table class="profiler-timings"> <tbody> ';var arr4=Object.keys(it.custom_fields);if(arr4){var key,i4=-1,l4=arr4.length-1;while(i4<l4){key=arr4[i4+=1];out+=' <tr> <td class="profiler-label">'+( key )+'</td> <td class="profiler-label">'+( it.custom_fields[key] )+'</td> </tr> ';} } out+=' </tbody> </table> ';}out+=' </div> </div> ';if(it.has_sql_timings){out+=' <div class="profiler-queries"> <table> <thead> <tr> <th class="ta-right">step<br />time from start<br />query type<br />duration</th> <th class="ta-left">call stack<br />query</th> </tr> </thead> <tbody> ';var arr5=MiniProfiler.getSqlTimings(it.root);if(arr5){var value,index=-1,l5=arr5.length-1;while(index<l5){value=arr5[index+=1];out+=' '+( MiniProfiler.templates.sqlGapTemplate({g: value.prevGap}) )+' '+( MiniProfiler.templates.sqlTimingTemplate({i: index, s: value}) )+' ';if(value.nextGap){out+=' '+( MiniProfiler.templates.sqlGapTemplate({g: value.nextGap}) )+' ';}out+=' ';} } out+=' </tbody> </table> <p class="profiler-trivial-gap-container"> <a class="profiler-toggle-trivial-gaps">show trivial gaps</a> </p> </div> ';}out+=' </div>';return out;
 }
 MiniProfiler.templates["linksTemplate"] = function anonymous(it
 ) {

data/lib/mini_profiler/asset_version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module Rack
   class MiniProfiler
-    ASSET_VERSION = '8cccf9fed3d62814b1d70f252554501b'
+    ASSET_VERSION = '35a79b300ab5afa978cb59af0b05e059'
   end
 end

data/lib/mini_profiler/config.rb

@@ -28,6 +28,7 @@ module Rack
           @authorization_mode     = :allow_all
           @backtrace_threshold_ms = 0
           @flamegraph_sample_rate = 0.5
+          @flamegraph_mode = :wall
           @storage_failure = Proc.new do |exception|
             if @logger
               @logger.warn("MiniProfiler storage failure: #{exception.message}")
@@ -57,6 +58,7 @@ module Rack
           @snapshots_transport_auth_key = nil
           @snapshots_redact_sql_queries = true
           @snapshots_transport_gzip_requests = false
+          @enable_hotwire_turbo_drive_support = false
 
           self
         }
@@ -68,7 +70,9 @@ module Rack
         :flamegraph_sample_rate, :logger, :pre_authorize_cb, :skip_paths,
         :skip_schema_queries, :storage, :storage_failure, :storage_instance,
         :storage_options, :user_provider, :enable_advanced_debugging_tools,
-        :skip_sql_param_names, :suppress_encoding, :max_sql_param_length
+        :skip_sql_param_names, :suppress_encoding, :max_sql_param_length,
+        :content_security_policy_nonce, :enable_hotwire_turbo_drive_support,
+        :flamegraph_mode
 
       # ui accessors
       attr_accessor :collapse_results, :max_traces_to_show, :position,

data/lib/mini_profiler/profiler.rb

@@ -362,8 +362,17 @@ module Rack
             else
               sample_rate = config.flamegraph_sample_rate
             end
+
+            mode_match_data = query_string.match(/flamegraph_mode=([a-zA-Z]+)/)
+
+            if mode_match_data && [:cpu, :wall, :object, :custom].include?(mode_match_data[1].to_sym)
+              mode = mode_match_data[1].to_sym
+            else
+              mode = config.flamegraph_mode
+            end
+
             flamegraph = StackProf.run(
-              mode: :wall,
+              mode: mode,
               raw: true,
               aggregate: false,
               interval: (sample_rate * 1000).to_i
@@ -630,7 +639,7 @@ module Rack
     end
 
     def text_result(body)
-      headers = { 'Content-Type' => 'text/plain' }
+      headers = { 'Content-Type' => 'text/plain; charset=utf-8' }
       [200, headers, [body]]
     end
 
@@ -643,7 +652,7 @@ module Rack
       headers = { 'Content-Type' => 'text/html' }
       body = "<html><body>
 <pre style='line-height: 30px; font-size: 16px;'>
-Append the following to your query string:
+This is the help menu of the <a href='#{Rack::MiniProfiler::SOURCE_CODE_URI}'>rack-mini-profiler</a> gem, append the following to your query string for more options:
 
   #{make_link "help", env} : display this screen
   #{make_link "env", env} : display the rack environment
@@ -658,6 +667,7 @@ Append the following to your query string:
   #{make_link "flamegraph", env} : a graph representing sampled activity (requires the stackprof gem).
   #{make_link "async-flamegraph", env} : store flamegraph data for this page and all its AJAX requests. Flamegraph links will be available in the mini-profiler UI (requires the stackprof gem).
   #{make_link "flamegraph&flamegraph_sample_rate=1", env}: creates a flamegraph with the specified sample rate (in ms). Overrides value set in config
+  #{make_link "flamegraph&flamegraph_mode=cpu", env}: creates a flamegraph with the specified mode (one of cpu, wall, object, or custom). Overrides value set in config
   #{make_link "flamegraph_embed", env} : a graph representing sampled activity (requires the stackprof gem), embedded resources for use on an intranet.
   #{make_link "trace-exceptions", env} : will return all the spots where your application raises exceptions
   #{make_link "analyze-memory", env} : will perform basic memory analysis of heap
@@ -728,6 +738,10 @@ Append the following to your query string:
       url = "#{path}includes.js?v=#{version}" if !url
       css_url = "#{path}includes.css?v=#{version}" if !css_url
 
+      content_security_policy_nonce = @config.content_security_policy_nonce ||
+                                      env["action_dispatch.content_security_policy_nonce"] ||
+                                      env["secure_headers_content_security_policy_nonce"]
+
       settings = {
        path: path,
        url: url,
@@ -745,7 +759,9 @@ Append the following to your query string:
        startHidden: @config.start_hidden,
        collapseResults: @config.collapse_results,
        htmlContainer: @config.html_container,
-       hiddenCustomFields: @config.snapshot_hidden_custom_fields.join(',')
+       hiddenCustomFields: @config.snapshot_hidden_custom_fields.join(','),
+       cspNonce: content_security_policy_nonce,
+       hotwireTurboDriveSupport: @config.enable_hotwire_turbo_drive_support,
       }
 
       if current && current.page_struct

data/lib/mini_profiler/version.rb

@@ -2,6 +2,7 @@
 
 module Rack
   class MiniProfiler
-    VERSION = '2.3.2'
+    VERSION = '2.3.3'
+    SOURCE_CODE_URI = 'https://github.com/MiniProfiler/rack-mini-profiler'
   end
 end

data/lib/patches/db/riak.rb

@@ -2,7 +2,7 @@
 
 # riak-client 2.2.2 patches
 class Riak::Multiget
-  class <<self
+  class << self
     alias_method :get_all_without_profiling, :get_all
     def get_all(client, fetch_list)
       return get_all_without_profiling(client, fetch_list) unless SqlPatches.should_measure?

data/rack-mini-profiler.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 2.4.0'
 
   s.metadata = {
-    'source_code_uri' => 'https://github.com/MiniProfiler/rack-mini-profiler',
+    'source_code_uri' => Rack::MiniProfiler::SOURCE_CODE_URI,
     'changelog_uri' => 'https://github.com/MiniProfiler/rack-mini-profiler/blob/master/CHANGELOG.md'
   }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-mini-profiler
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.3.3
 platform: ruby
 authors:
 - Sam Saffron
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-29 00:00:00.000000000 Z
+date: 2021-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -354,7 +354,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.2
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Profiles loading speed for rack applications.