rack-mini-profiler 3.3.1 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc0d1c8641a30fc59950236e1761ac6a0f1c07cdbc73c5192e256c7bfd84a6af
-  data.tar.gz: 20d8e78c618c96da12676078fff49bb2bf71014e6c8ace339d1fcdc4cd73e8a4
+  metadata.gz: fb35c9ff911dd9dcc3fc5cccf15d62f21f0c04ed79ff5dec3e88746fcb90a43f
+  data.tar.gz: a8cd39cdb11b4bb2ed154e9c3269de66b6f9c351c8cdcdb775e73e0c25e5d5a2
 SHA512:
-  metadata.gz: 534f1a6ea263d6e9aaea85e14d0aa09ac893081ad350530c8122c241f1cb0f3397cd7fdf1ca5a65e96bca92384e0b38a6ebbcec8b9e94a4cafb4565198cbd743
-  data.tar.gz: 9114e796825cbaa2b88b71c5bfb0a2b5aa0ea6453a4bf4364d6666d37b42fbcdf12991b0df95ceffaefca47907b9d5c36932ada2c77b4d4120889b4f093b2c23
+  metadata.gz: 1c1123a2fc22b5f20ea63fa089b4914f214a6da3d88dbba2fe1b3f597c92c653a166dc1c97d8a68e51a71893b9787ca11b99db1a68aa19da04cad494d8f33af9
+  data.tar.gz: b21baa7055d5252cf3f57031be17e67810d898e4b40428d12409027454bfa15b414e2346f07e49d09b139945eb177f8951a34f41c765773ac543c49c2f0efd81

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # CHANGELOG
 
+## 4.0 - 2025-06-11
+
+- [BREAKING CHANGE] Ruby version 3.1.0 or later is required. [#632](https://github.com/MiniProfiler/rack-mini-profiler/pull/632)
+- [FEATURE] Implement prepend patch for postgres [#625](https://github.com/MiniProfiler/rack-mini-profiler/pull/625)
+- [FEATURE] Show Active Record QueryCache hits in UI. [#640](https://github.com/MiniProfiler/rack-mini-profiler/pull/640)
+- [FEATURE] Show record type and count in SQL query UI. [#638](https://github.com/MiniProfiler/rack-mini-profiler/pull/638)
+- [FIX] Requests page fails due to trying to modify a frozen string. [#630](https://github.com/MiniProfiler/rack-mini-profiler/pull/630)
+- [FIX] alignment of SQL query start times. [#627](https://github.com/MiniProfiler/rack-mini-profiler/pull/627)
+- [FIX] Lower case HTTP response headers to be compatible with Rack 3 [#628](https://github.com/MiniProfiler/rack-mini-profiler/pull/628)
+- [FIX] Truncate long profiler name in profiler popup. [#634](https://github.com/MiniProfiler/rack-mini-profiler/pull/634)
+- [FIX] `flamegraph_mode` query param having no effect. [#635](https://github.com/MiniProfiler/rack-mini-profiler/pull/635)
+- [FIX] max_traces_to_show had chance to break the profiler frontend [#297](https://github.com/MiniProfiler/rack-mini-profiler/issues/297)
+
 ## 3.3.1 - 2024-02-15
 - [FEATURE] Support dynamic `config.content_security_policy_nonce` [#609](https://github.com/MiniProfiler/rack-mini-profiler/pull/609)
 - [FEATURE] Add flamgraph path to response header: [#601](https://github.com/MiniProfiler/rack-mini-profiler/pull/601)

data/README.md

@@ -90,6 +90,20 @@ gem 'rack-mini-profiler', require: ['prepend_mysql2_patch', 'rack-mini-profiler'
 
 This should not be necessary with Rails < 5 because peek-mysql2 hooks into mysql2 gem in different ways depending on your Rails version.
 
+#### `pg` stack level too deep errors
+
+If you encounter `SystemStackError (stack level too deep)` from PG, you'll need to use this gem spec in your Gemfile:
+
+```ruby
+gem 'rack-mini-profiler', require: ['prepend_pg_patch', 'rack-mini-profiler']
+```
+
+Or if you initially have `require: false`, then use
+
+```ruby
+gem 'rack-mini-profiler', require: ['prepend_pg_patch']
+```
+
 #### Rails and manual initialization
 
 In case you need to make sure rack_mini_profiler is initialized after all other gems, or you want to execute some code before rack_mini_profiler required:
@@ -245,6 +259,7 @@ rack-mini-profiler is designed with production profiling in mind. To enable that
   end
 ```
 
+> [!WARNING]
 > If your production application is running on more than one server (or more than one dyno) you will need to configure rack mini profiler's storage to use Redis or Memcache. See [storage](#storage) for information on changing the storage backend.
 
 Note:

data/lib/html/includes.css

@@ -113,6 +113,8 @@
       float: left; }
     .profiler-result .profiler-info .profiler-server-time {
       white-space: nowrap; }
+    .profiler-result .profiler-info .profiler-number {
+      display: block; }
   .profiler-result .profiler-timings th {
     background-color: #fff;
     color: #767676;
@@ -133,19 +135,21 @@
   .profiler-result .profiler-timings .profiler-queries-duration {
     padding-left: 6px; }
   .profiler-result .profiler-timings .profiler-percent-in-sql {
-    white-space: nowrap;
-    text-align: right; }
-  .profiler-result .profiler-timings tfoot td {
-    padding-top: 10px;
+    white-space: nowrap; }
+  .profiler-result .profiler-timings tfoot tr td:last-child {
     text-align: right; }
-    .profiler-result .profiler-timings tfoot td a {
+  .profiler-result .profiler-timings-summary {
+    display: flex;
+    justify-content: space-between;
+    padding-top: 10px; }
+    .profiler-result .profiler-timings-summary a {
       font-size: 95%;
       display: inline-block;
       margin-left: 12px; }
-      .profiler-result .profiler-timings tfoot td a:first-child {
+      .profiler-result .profiler-timings-summary a:first-child {
         float: left;
         margin-left: 0px; }
-      .profiler-result .profiler-timings tfoot td a.profiler-custom-link {
+      .profiler-result .profiler-timings-summary a.profiler-custom-link {
         float: left; }
   .profiler-result .profiler-queries {
     font-family: Helvetica, Arial, sans-serif; }
@@ -163,6 +167,12 @@
       background-color: #fdd; }
     .profiler-result .profiler-queries tr.very-very-slow {
       background-color: #fcc; }
+    .profiler-result .profiler-queries tr.cached {
+      background-color: #f2f0ef; }
+    .profiler-result .profiler-queries span.cached {
+      color: #818589; }
+    .profiler-result .profiler-queries span.cached + pre {
+      display: inline; }
     .profiler-result .profiler-queries pre {
       font-family: Consolas, monospace, serif;
       white-space: pre-wrap; }
@@ -340,14 +350,22 @@
     text-align: left;
     line-height: 18px;
     overflow: auto;
+    max-width: 800px;
     box-shadow: 0px 1px 15px #555; }
     .profiler-results .profiler-popup .profiler-info {
       margin-bottom: 3px;
       padding-bottom: 2px;
-      border-bottom: 1px solid #ddd; }
+      border-bottom: 1px solid #ddd;
+      display: flex;
+      width: inherit; }
       .profiler-results .profiler-popup .profiler-info .profiler-name {
+        overflow: hidden;
+        text-overflow: ellipsis;
+        text-align: left;
+        white-space: nowrap;
         font-size: 110%;
-        font-weight: bold; }
+        font-weight: bold;
+        padding-right: 10px; }
         .profiler-results .profiler-popup .profiler-info .profiler-name .profiler-overall-duration {
           display: none; }
       .profiler-results .profiler-popup .profiler-info .profiler-server-time {

data/lib/html/includes.js

@@ -285,10 +285,10 @@ var _MiniProfiler = (function() {
     }); // limit count
 
     if (
-      container.querySelectorAll(".profiler-result").length >
+      container.querySelectorAll(".profiler-result:not(:has(.profiler-totals))").length >
       options.maxTracesToShow
     ) {
-      var elem = container.querySelector(".profiler-result");
+      var elem = container.querySelector('.profiler-result:not(:has(.profiler-totals))');
 
       if (elem) {
         elem.parentElement.removeChild(elem);
@@ -1179,6 +1179,7 @@ var _MiniProfiler = (function() {
 
       reqs = 0;
       totalTime = 0;
+      totalSqlCount = 0;
       expandedResults = false;
       toArray(
         document.querySelectorAll(".profiler-results .profiler-result")
@@ -1288,6 +1289,10 @@ var _MiniProfiler = (function() {
 
               sqlTiming.parent_timing_name = timing.name;
 
+              if (sqlTiming.cached) {
+                sqlTiming.row_class = "cached";
+              }
+
               if (sqlTiming.duration_milliseconds > 50) {
                 sqlTiming.row_class = "slow";
               }

data/lib/html/includes.scss

@@ -114,6 +114,9 @@ $zindex: 2147483640; // near 32bit max 2147483647
     .profiler-server-time {
       white-space: nowrap;
     }
+    .profiler-number {
+      display: block;
+    }
   }
 
   .profiler-timings {
@@ -147,27 +150,28 @@ $zindex: 2147483640; // near 32bit max 2147483647
     }
     .profiler-percent-in-sql {
       white-space: nowrap;
+    }
+    tfoot tr td:last-child {
       text-align: right;
     }
+  }
 
-    tfoot {
-      td {
-        padding-top: 10px;
-        text-align: right;
+  .profiler-timings-summary {
+    display: flex;
+    justify-content: space-between;
+    padding-top: 10px;
 
-        a {
-          font-size: 95%;
-          display: inline-block;
-          margin-left: 12px;
+    a {
+      font-size: 95%;
+      display: inline-block;
+      margin-left: 12px;
 
-          &:first-child {
-            float: left;
-            margin-left: 0px;
-          }
-          &.profiler-custom-link {
-            float: left;
-          }
-        }
+      &:first-child {
+        float: left;
+        margin-left: 0px;
+      }
+      &.profiler-custom-link {
+        float: left;
       }
     }
   }
@@ -202,6 +206,18 @@ $zindex: 2147483640; // near 32bit max 2147483647
       background-color: #fcc;
     }
 
+    tr.cached {
+      background-color: #f2f0ef;
+    }
+
+    span.cached {
+      color: #818589;
+    }
+
+    span.cached + pre {
+      display: inline;
+    }
+
     pre {
       font-family: $codeFonts;
       white-space: pre-wrap;
@@ -482,6 +498,7 @@ $zindex: 2147483640; // near 32bit max 2147483647
     text-align: left;
     line-height: 18px;
     overflow: auto;
+    max-width: 800px;
 
     @include box-shadow(0px, 1px, 15px, $textColor);
 
@@ -489,14 +506,23 @@ $zindex: 2147483640; // near 32bit max 2147483647
       margin-bottom: 3px;
       padding-bottom: 2px;
       border-bottom: 1px solid #ddd;
+      display: flex;
+      width: inherit;
 
       .profiler-name {
+        overflow: hidden;
+        text-overflow: ellipsis;
+        text-align: left;
+        white-space: nowrap;
         font-size: 110%;
         font-weight: bold;
+        padding-right: 10px;
+
         .profiler-overall-duration {
           display: none;
         }
       }
+
       .profiler-server-time {
         font-size: 95%;
       }

data/lib/html/includes.tmpl

@@ -21,8 +21,8 @@
 
     <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 class="profiler-name" title="{{= it.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>
@@ -45,33 +45,42 @@
           <tbody>
             {{= MiniProfiler.templates.timingTemplate({timing: it.root, page: it}) }}
           </tbody>
-          <tfoot>
-            <tr>
-              <td colspan="3">
-                {{? !it.client_timings}}
-                   {{= MiniProfiler.templates.linksTemplate({timing: it.root, page: it}) }}
-                {{?}}
-                <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>
-              {{? it.has_sql_timings}}
-                <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>
+          {{? it.has_sql_timings}}
+            <tfoot>
+              <tr>
+                <td colspan="1">
+                  SQL Summary:
                 </td>
-              {{?}}
-              {{~ it.custom_timing_names :value}}
-                <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 colspan="5" title="percent of total request time spent in SQL">
+                  {{=it.sql_count}} {{? it.cached_sql_count > 0 }} ({{=it.cached_sql_count}} cached) {{?}}
+                  <span class="profiler-unit" title="percent of total request time spent in SQL"> -
+                  {{= MiniProfiler.formatDuration(it.duration_milliseconds_in_sql / it.duration_milliseconds * 100) }}% in sql
+                  </span>
                 </td>
-              {{~}}
-            </tr>
-          </tfoot>
+              </tr>
+            </tfoot>
+          {{?}}
         </table>
+
+        <div class="profiler-timings-summary">
+          <div>
+            {{? !it.client_timings}}
+                {{= MiniProfiler.templates.linksTemplate({timing: it.root, page: it}) }}
+            {{?}}
+            <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>
+          </div>
+          {{~ it.custom_timing_names :value}}
+            <div 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>
+            </div>
+          {{~}}
+        </div>
+
         {{? it.client_timings}}
           <table class="profiler-timings profiler-client-timings">
             <thead>
@@ -124,7 +133,7 @@
         <table>
         <thead>
           <tr>
-            <th class="ta-right">step<br />time from start<br />query type<br />duration</th>
+            <th class="ta-right">step<br />time from start<br />query type<br />duration<br />records</th>
             <th class="ta-left">call stack<br />query</th>
           </tr>
         </thead>
@@ -223,10 +232,16 @@
         {{= MiniProfiler.renderExecuteType(it.s.execute_type) }}
       </div>
       <div title="{{? it.s.execute_type == 3}}first result fetched: {{= it.s.first_fetch_duration_milliseconds }}ms{{?}}">{{= MiniProfiler.formatDuration(it.s.duration_milliseconds) }} <span class="profiler-unit">ms</span></div>
+      {{? it.s.row_count > 0  }}
+        <div title="number and type of records instantiated by query">{{= it.s.class_name }}: {{= it.s.row_count }}</div>
+      {{?}}
     </td>
     <td>
       <div class="query">
         <pre class="profiler-stack-trace">{{= it.s.stack_trace_snippet }}</pre>
+        {{? it.s.cached }}
+          <span class="cached"> [CACHE] </span>
+        {{?}}
         {{? it.s.formatted_command_string}}
           <pre class="prettyprint lang-sql"><code>{{= it.s.formatted_command_string }}; {{= MiniProfiler.formatParameters(it.s.parameters) }}</code></pre>
         {{??}}

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 profiler-duration-milliseconds"> '+( MiniProfiler.formatDuration(it.duration_milliseconds))+' <span class="profiler-unit">ms</span> </span> ';if(MiniProfiler.showTotalSqlCount()){out+=' <span class="profiler-number profiler-sql-count"> '+( it.sql_count)+' <span class="profiler-unit">sql</span> </span> ';}out+=' <span class="profiler-name"> ';if(it.name.length >= 30){out+=' '+( it.name.substring(0,15) + "..." + it.name.slice(-15) )+' ';}else{out+=' '+( it.name)+' ';}out+=' </span> </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;
+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 profiler-duration-milliseconds"> '+( MiniProfiler.formatDuration(it.duration_milliseconds))+' <span class="profiler-unit">ms</span> </span> ';if(MiniProfiler.showTotalSqlCount()){out+=' <span class="profiler-number profiler-sql-count"> '+( it.sql_count)+' <span class="profiler-unit">sql</span> </span> ';}out+=' <span class="profiler-name"> ';if(it.name.length >= 30){out+=' '+( it.name.substring(0,15) + "..." + it.name.slice(-15) )+' ';}else{out+=' '+( it.name)+' ';}out+=' </span> </div> <div class="profiler-popup"> <div class="profiler-info"> <span class="profiler-name" title="'+( it.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> ';if(it.has_sql_timings){out+=' <tfoot> <tr> <td colspan="1"> SQL Summary: </td> <td colspan="5" title="percent of total request time spent in SQL"> '+(it.sql_count)+' ';if(it.cached_sql_count > 0){out+=' ('+(it.cached_sql_count)+' cached) ';}out+=' <span class="profiler-unit" title="percent of total request time spent in SQL"> - '+( MiniProfiler.formatDuration(it.duration_milliseconds_in_sql / it.duration_milliseconds * 100) )+'% in sql </span> </td> </tr> </tfoot> ';}out+=' </table> <div class="profiler-timings-summary"> <div> ';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> </div> ';var arr2=it.custom_timing_names;if(arr2){var value,i2=-1,l2=arr2.length-1;while(i2<l2){value=arr2[i2+=1];out+=' <div 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> </div> ';} } out+=' </div> ';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<br />records</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
 ) {
@@ -19,7 +19,7 @@ var out=' <tr class="';if(it.timing.is_trivial){out+='profiler-trivial';}out+='"
 }
 MiniProfiler.templates["sqlTimingTemplate"] = function anonymous(it
 ) {
-var out=' <tr class="'+( it.s.row_class || '' )+'" data-timing-id="'+( it.s.parent_timing_id )+'"> <td class="profiler-info"> <div>'+( it.s.parent_timing_name )+'</div> <div class="profiler-number"><span class="profiler-unit">T+</span>'+( MiniProfiler.formatDuration(it.s.start_milliseconds) )+' <span class="profiler-unit">ms</span></div> <div> ';if(it.s.is_duplicate){out+='<span class="profiler-warning">DUPLICATE</span>';}out+=' '+( MiniProfiler.renderExecuteType(it.s.execute_type) )+' </div> <div title="';if(it.s.execute_type == 3){out+='first result fetched: '+( it.s.first_fetch_duration_milliseconds )+'ms';}out+='">'+( MiniProfiler.formatDuration(it.s.duration_milliseconds) )+' <span class="profiler-unit">ms</span></div> </td> <td> <div class="query"> <pre class="profiler-stack-trace">'+( it.s.stack_trace_snippet )+'</pre> ';if(it.s.formatted_command_string){out+=' <pre class="prettyprint lang-sql"><code>'+( it.s.formatted_command_string )+'; '+( MiniProfiler.formatParameters(it.s.parameters) )+'</code></pre> ';}else{out+=' <i>Query redacted</i> ';}out+=' </div> </td> </tr>';return out;
+var out=' <tr class="'+( it.s.row_class || '' )+'" data-timing-id="'+( it.s.parent_timing_id )+'"> <td class="profiler-info"> <div>'+( it.s.parent_timing_name )+'</div> <div class="profiler-number"><span class="profiler-unit">T+</span>'+( MiniProfiler.formatDuration(it.s.start_milliseconds) )+' <span class="profiler-unit">ms</span></div> <div> ';if(it.s.is_duplicate){out+='<span class="profiler-warning">DUPLICATE</span>';}out+=' '+( MiniProfiler.renderExecuteType(it.s.execute_type) )+' </div> <div title="';if(it.s.execute_type == 3){out+='first result fetched: '+( it.s.first_fetch_duration_milliseconds )+'ms';}out+='">'+( MiniProfiler.formatDuration(it.s.duration_milliseconds) )+' <span class="profiler-unit">ms</span></div> ';if(it.s.row_count > 0){out+=' <div title="number and type of records instantiated by query">'+( it.s.class_name )+': '+( it.s.row_count )+'</div> ';}out+=' </td> <td> <div class="query"> <pre class="profiler-stack-trace">'+( it.s.stack_trace_snippet )+'</pre> ';if(it.s.cached){out+=' <span class="cached"> [CACHE] </span> ';}out+=' ';if(it.s.formatted_command_string){out+=' <pre class="prettyprint lang-sql"><code>'+( it.s.formatted_command_string )+'; '+( MiniProfiler.formatParameters(it.s.parameters) )+'</code></pre> ';}else{out+=' <i>Query redacted</i> ';}out+=' </div> </td> </tr>';return out;
 }
 MiniProfiler.templates["sqlGapTemplate"] = function anonymous(it
 ) {

data/lib/mini_profiler/actions.rb

@@ -5,7 +5,7 @@ module Rack
       def serve_snapshot(env)
         MiniProfiler.authorize_request
         status = 200
-        headers = { 'Content-Type' => 'text/html' }
+        headers = { 'content-type' => 'text/html' }
         qp = Rack::Utils.parse_nested_query(env['QUERY_STRING'])
         if group_name = qp["group_name"]
           list = @storage.snapshots_group(group_name)
@@ -56,9 +56,9 @@ module Rack
         resources_env['PATH_INFO'] = file_name
 
         if Gem::Version.new(Rack.release) >= Gem::Version.new("2.1.0")
-          rack_file = Rack::Files.new(resources_root, 'Cache-Control' => "max-age=#{cache_control_value}")
+          rack_file = Rack::Files.new(resources_root, 'cache-control' => "max-age=#{cache_control_value}")
         else
-          rack_file = Rack::File.new(resources_root, 'Cache-Control' => "max-age=#{cache_control_value}")
+          rack_file = Rack::File.new(resources_root, 'cache-control' => "max-age=#{cache_control_value}")
         end
 
         rack_file.call(resources_env)
@@ -93,11 +93,11 @@ module Rack
         # If we're an XMLHttpRequest, serve up the contents as JSON
         if request.xhr?
           result_json = page_struct.to_json
-          [200, { 'Content-Type' => 'application/json' }, [result_json]]
+          [200, { 'content-type' => 'application/json' }, [result_json]]
         else
           # Otherwise give the HTML back
           html = generate_html(page_struct, env)
-          [200, { 'Content-Type' => 'text/html' }, [html]]
+          [200, { 'content-type' => 'text/html' }, [html]]
         end
       end
 
@@ -130,7 +130,7 @@ module Rack
 
         unless defined?(MemoryProfiler) && MemoryProfiler.respond_to?(:report)
           message = "Please install the memory_profiler gem and require it: add gem 'memory_profiler' to your Gemfile"
-          status, headers, body = @app.call(env)
+          _status, headers, body = @app.call(env)
           body.close if body.respond_to? :close
 
           return client_settings.handle_cookie(

data/lib/mini_profiler/asset_version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module Rack
   class MiniProfiler
-    ASSET_VERSION = '116e2a6fd81c286e004e2a0afb03baa1'
+    ASSET_VERSION = 'e0bcc9ce0ae3bb5d6b736b6f282f601f'
   end
 end

data/lib/mini_profiler/profiling_methods.rb

@@ -4,7 +4,7 @@ module Rack
   class MiniProfiler
     module ProfilingMethods
 
-      def record_sql(query, elapsed_ms, params = nil)
+      def record_sql(query, elapsed_ms, params = nil, cached = nil)
         return unless current && current.current_timer
         c = current
         c.current_timer.add_sql(
@@ -13,7 +13,8 @@ module Rack
           c.page_struct,
           redact_sql_queries? ? nil : params,
           c.skip_backtrace,
-          c.full_backtrace
+          c.full_backtrace,
+          cached
         )
       end
 

data/lib/mini_profiler/storage/memcache_store.rb

@@ -42,7 +42,7 @@ module Rack
         @client.add("#{@prefix}-#{user}-v", [], @expires_in_seconds)
         MAX_RETRIES.times do
           break if @client.cas("#{@prefix}-#{user}-v", @expires_in_seconds) do |ids|
-            ids << id unless ids.include?(id)
+            ids << id if !ids.include?(id)
             ids
           end
         end

data/lib/mini_profiler/timer_struct/page.rb

@@ -78,6 +78,7 @@ module Rack
             trivial_duration_threshold_milliseconds: 2,
             head: nil,
             sql_count: 0,
+            cached_sql_count: 0,
             duration_milliseconds_in_sql: 0,
             has_sql_timings: true,
             has_duplicate_sql_timings: false,

data/lib/mini_profiler/timer_struct/request.rb

@@ -101,14 +101,15 @@ module Rack
           end
         end
 
-        def add_sql(query, elapsed_ms, page, params = nil, skip_backtrace = false, full_backtrace = false)
-          TimerStruct::Sql.new(query, elapsed_ms, page, self, params, skip_backtrace, full_backtrace).tap do |timer|
+        def add_sql(query, elapsed_ms, page, params = nil, skip_backtrace = false, full_backtrace = false, cached = false)
+          TimerStruct::Sql.new(query, elapsed_ms, page, self, params, skip_backtrace, full_backtrace, cached).tap do |timer|
             self[:sql_timings].push(timer)
             timer[:parent_timing_id] = self[:id]
             self[:has_sql_timings]   = true
             self[:sql_timings_duration_milliseconds] += elapsed_ms
             page[:duration_milliseconds_in_sql]      += elapsed_ms
             page[:sql_count] += 1
+            page[:cached_sql_count] += 1 if cached
           end
         end
 

data/lib/mini_profiler/timer_struct/sql.rb

@@ -10,7 +10,7 @@ module Rack
       class Sql < TimerStruct::Base
         attr_accessor :parent
 
-        def initialize(query, duration_ms, page, parent, params = nil, skip_backtrace = false, full_backtrace = false)
+        def initialize(query, duration_ms, page, parent, params = nil, skip_backtrace = false, full_backtrace = false, cached = false)
 
           stack_trace = nil
           unless skip_backtrace || duration_ms < Rack::MiniProfiler.config.backtrace_threshold_ms
@@ -46,7 +46,10 @@ module Rack
             duration_milliseconds: duration_ms,
             first_fetch_duration_milliseconds: duration_ms,
             parameters: query ? trim_binds(params) : nil,
+            row_count: 0,
+            class_name: nil,
             parent_timing_id: nil,
+            cached: cached,
             is_duplicate: false
           )
         end

data/lib/mini_profiler/version.rb

@@ -2,7 +2,7 @@
 
 module Rack
   class MiniProfiler
-    VERSION = "3.3.1"
+    VERSION = "4.0.0"
     SOURCE_CODE_URI = "https://github.com/MiniProfiler/rack-mini-profiler"
   end
 end

data/lib/mini_profiler/views.rb

@@ -110,7 +110,7 @@ module Rack
       end
 
       def flamegraph(graph, path, env)
-        headers = { 'Content-Type' => 'text/html' }
+        headers = { 'content-type' => 'text/html' }
         iframe_src = "#{public_base_path(env)}speedscope/index.html"
         html = <<~HTML
           <!DOCTYPE html>
@@ -141,7 +141,7 @@ module Rack
       end
 
       def help(client_settings, env)
-        headers = { 'Content-Type' => 'text/html' }
+        headers = { 'content-type' => 'text/html' }
         html = <<~HTML
           <!DOCTYPE html>
           <html>

data/lib/mini_profiler.rb

@@ -296,8 +296,8 @@ module Rack
 
             mode_match_data = action_parameters(env)['flamegraph_mode']
 
-            if mode_match_data && [:cpu, :wall, :object, :custom].include?(mode_match_data[1].to_sym)
-              mode = mode_match_data[1].to_sym
+            if mode_match_data && [:cpu, :wall, :object, :custom].include?(mode_match_data.to_sym)
+              mode = mode_match_data.to_sym
             else
               mode = config.flamegraph_mode
             end
@@ -329,7 +329,7 @@ module Rack
             )
           end
         elsif path == '/rack-mini-profiler/requests'
-          status, headers, body = [200, { 'Content-Type' => 'text/html' }, [blank_page_html]]
+          status, headers, body = [200, { 'Content-Type' => 'text/html' }, [blank_page_html.dup]] # important to dup here!
         else
           status, headers, body = @app.call(env)
         end
@@ -417,7 +417,7 @@ module Rack
     end
 
     def action_parameters(env)
-      query_params = Rack::Utils.parse_nested_query(env['QUERY_STRING'])
+      Rack::Utils.parse_nested_query(env['QUERY_STRING'])
     end
 
     def inject_profiler(env, status, headers, body)

data/lib/mini_profiler_rails/railtie.rb

@@ -111,7 +111,8 @@ module Rack::MiniProfilerRails
           Rack::MiniProfiler.record_sql(
             payload[:sql],
             (finish - start) * 1000,
-            Rack::MiniProfiler.binds_to_params(payload[:binds])
+            Rack::MiniProfiler.binds_to_params(payload[:binds]),
+            payload[:cached]
           )
         end
 

data/lib/patches/db/pg/alias_method.rb

@@ -0,0 +1,121 @@
+# frozen_string_literal: true
+
+class PG::Result
+  alias_method :each_without_profiling, :each
+  alias_method :values_without_profiling, :values
+
+  def values(*args, &blk)
+    return values_without_profiling(*args, &blk) unless defined?(@miniprofiler_sql_id)
+    mp_report_sql do
+      values_without_profiling(*args , &blk)
+    end
+  end
+
+  def each(*args, &blk)
+    return each_without_profiling(*args, &blk) unless defined?(@miniprofiler_sql_id)
+    mp_report_sql do
+      each_without_profiling(*args, &blk)
+    end
+  end
+
+  def mp_report_sql(&block)
+    start        = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+    result       = yield
+    elapsed_time = SqlPatches.elapsed_time(start)
+    @miniprofiler_sql_id.report_reader_duration(elapsed_time)
+    result
+  end
+end
+
+class PG::Connection
+  alias_method :exec_without_profiling, :exec
+  alias_method :async_exec_without_profiling, :async_exec
+  alias_method :exec_prepared_without_profiling, :exec_prepared
+  alias_method :send_query_prepared_without_profiling, :send_query_prepared
+  alias_method :prepare_without_profiling, :prepare
+
+  if Gem::Version.new(PG::VERSION) >= Gem::Version.new("1.1.0")
+    alias_method :exec_params_without_profiling, :exec_params
+  end
+
+  def prepare(*args, &blk)
+    # we have no choice but to do this here,
+    # if we do the check for profiling first, our cache may miss critical stuff
+
+    @prepare_map ||= {}
+    @prepare_map[args[0]] = args[1]
+    # dont leak more than 10k ever
+    @prepare_map = {} if @prepare_map.length > 1000
+
+    return prepare_without_profiling(*args, &blk) unless SqlPatches.should_measure?
+    prepare_without_profiling(*args, &blk)
+  end
+
+  def exec(*args, &blk)
+    return exec_without_profiling(*args, &blk) unless SqlPatches.should_measure?
+
+    start        = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+    result       = exec_without_profiling(*args, &blk)
+    elapsed_time = SqlPatches.elapsed_time(start)
+    record       = ::Rack::MiniProfiler.record_sql(args[0], elapsed_time)
+    result.instance_variable_set("@miniprofiler_sql_id", record) if result
+
+    result
+  end
+
+  if Gem::Version.new(PG::VERSION) >= Gem::Version.new("1.1.0")
+    def exec_params(*args, &blk)
+      return exec_params_without_profiling(*args, &blk) unless SqlPatches.should_measure?
+
+      start        = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+      result       = exec_params_without_profiling(*args, &blk)
+      elapsed_time = SqlPatches.elapsed_time(start)
+      record       = ::Rack::MiniProfiler.record_sql(args[0], elapsed_time)
+      result.instance_variable_set("@miniprofiler_sql_id", record) if result
+
+      result
+    end
+  end
+
+  def exec_prepared(*args, &blk)
+    return exec_prepared_without_profiling(*args, &blk) unless SqlPatches.should_measure?
+
+    start        = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+    result       = exec_prepared_without_profiling(*args, &blk)
+    elapsed_time = SqlPatches.elapsed_time(start)
+    mapped       = args[0]
+    mapped       = @prepare_map[mapped] || args[0] if @prepare_map
+    record       = ::Rack::MiniProfiler.record_sql(mapped, elapsed_time)
+    result.instance_variable_set("@miniprofiler_sql_id", record) if result
+
+    result
+  end
+
+  def send_query_prepared(*args, &blk)
+    return send_query_prepared_without_profiling(*args, &blk) unless SqlPatches.should_measure?
+
+    start        = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+    result       = send_query_prepared_without_profiling(*args, &blk)
+    elapsed_time = SqlPatches.elapsed_time(start)
+    mapped       = args[0]
+    mapped       = @prepare_map[mapped] || args[0] if @prepare_map
+    record       = ::Rack::MiniProfiler.record_sql(mapped, elapsed_time)
+    result.instance_variable_set("@miniprofiler_sql_id", record) if result
+
+    result
+  end
+
+  def async_exec(*args, &blk)
+    return async_exec_without_profiling(*args, &blk) unless SqlPatches.should_measure?
+
+    start        = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+    result       = exec_without_profiling(*args, &blk)
+    elapsed_time = SqlPatches.elapsed_time(start)
+    record       = ::Rack::MiniProfiler.record_sql(args[0], elapsed_time)
+    result.instance_variable_set("@miniprofiler_sql_id", record) if result
+
+    result
+  end
+
+  alias_method :query, :exec
+end

data/lib/patches/db/pg/prepend.rb

@@ -0,0 +1,115 @@
+# frozen_string_literal: true
+
+class PG::Result
+  module MiniProfiler
+    def values(*args, &blk)
+      return super unless defined?(@miniprofiler_sql_id)
+      mp_report_sql do
+        super
+      end
+    end
+
+    def each(*args, &blk)
+      return super unless defined?(@miniprofiler_sql_id)
+      mp_report_sql do
+        super
+      end
+    end
+
+    def mp_report_sql(&block)
+      start        = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+      result       = yield
+      elapsed_time = SqlPatches.elapsed_time(start)
+      @miniprofiler_sql_id.report_reader_duration(elapsed_time)
+      result
+    end
+  end
+
+  prepend MiniProfiler
+end
+
+class PG::Connection
+  module MiniProfiler
+    def prepare(*args, &blk)
+      # we have no choice but to do this here,
+      # if we do the check for profiling first, our cache may miss critical stuff
+
+      @prepare_map ||= {}
+      @prepare_map[args[0]] = args[1]
+      # dont leak more than 10k ever
+      @prepare_map = {} if @prepare_map.length > 1000
+
+      return super unless SqlPatches.should_measure?
+      super
+    end
+
+    def exec(*args, &blk)
+      return super unless SqlPatches.should_measure?
+
+      start        = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+      result       = super
+      elapsed_time = SqlPatches.elapsed_time(start)
+      record       = ::Rack::MiniProfiler.record_sql(args[0], elapsed_time)
+      result.instance_variable_set("@miniprofiler_sql_id", record) if result
+
+      result
+    end
+
+    if Gem::Version.new(PG::VERSION) >= Gem::Version.new("1.1.0")
+      def exec_params(*args, &blk)
+        return super unless SqlPatches.should_measure?
+
+        start        = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+        result       = super
+        elapsed_time = SqlPatches.elapsed_time(start)
+        record       = ::Rack::MiniProfiler.record_sql(args[0], elapsed_time)
+        result.instance_variable_set("@miniprofiler_sql_id", record) if result
+
+        result
+      end
+    end
+
+    def exec_prepared(*args, &blk)
+      return super unless SqlPatches.should_measure?
+
+      start        = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+      result       = super
+      elapsed_time = SqlPatches.elapsed_time(start)
+      mapped       = args[0]
+      mapped       = @prepare_map[mapped] || args[0] if @prepare_map
+      record       = ::Rack::MiniProfiler.record_sql(mapped, elapsed_time)
+      result.instance_variable_set("@miniprofiler_sql_id", record) if result
+
+      result
+    end
+
+    def send_query_prepared(*args, &blk)
+      return super unless SqlPatches.should_measure?
+
+      start        = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+      result       = super
+      elapsed_time = SqlPatches.elapsed_time(start)
+      mapped       = args[0]
+      mapped       = @prepare_map[mapped] || args[0] if @prepare_map
+      record       = ::Rack::MiniProfiler.record_sql(mapped, elapsed_time)
+      result.instance_variable_set("@miniprofiler_sql_id", record) if result
+
+      result
+    end
+
+    def async_exec(*args, &blk)
+      return super unless SqlPatches.should_measure?
+
+      start        = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+      result       = super
+      elapsed_time = SqlPatches.elapsed_time(start)
+      record       = ::Rack::MiniProfiler.record_sql(args[0], elapsed_time)
+      result.instance_variable_set("@miniprofiler_sql_id", record) if result
+
+      result
+    end
+  end
+
+  prepend MiniProfiler
+  alias_method :query, :exec
+end

data/lib/patches/db/pg.rb

@@ -1,122 +1,7 @@
 # frozen_string_literal: true
 
-# PG patches, keep in mind exec and async_exec have a exec{|r| } semantics that is yet to be implemented
-class PG::Result
-  alias_method :each_without_profiling, :each
-  alias_method :values_without_profiling, :values
-
-  def values(*args, &blk)
-    return values_without_profiling(*args, &blk) unless defined?(@miniprofiler_sql_id)
-    mp_report_sql do
-      values_without_profiling(*args , &blk)
-    end
-  end
-
-  def each(*args, &blk)
-    return each_without_profiling(*args, &blk) unless defined?(@miniprofiler_sql_id)
-    mp_report_sql do
-      each_without_profiling(*args, &blk)
-    end
-  end
-
-  def mp_report_sql(&block)
-    start        = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-    result       = yield
-    elapsed_time = SqlPatches.elapsed_time(start)
-    @miniprofiler_sql_id.report_reader_duration(elapsed_time)
-    result
-  end
-end
-
-class PG::Connection
-  alias_method :exec_without_profiling, :exec
-  alias_method :async_exec_without_profiling, :async_exec
-  alias_method :exec_prepared_without_profiling, :exec_prepared
-  alias_method :send_query_prepared_without_profiling, :send_query_prepared
-  alias_method :prepare_without_profiling, :prepare
-
-  if Gem::Version.new(PG::VERSION) >= Gem::Version.new("1.1.0")
-    alias_method :exec_params_without_profiling, :exec_params
-  end
-
-  def prepare(*args, &blk)
-    # we have no choice but to do this here,
-    # if we do the check for profiling first, our cache may miss critical stuff
-
-    @prepare_map ||= {}
-    @prepare_map[args[0]] = args[1]
-    # dont leak more than 10k ever
-    @prepare_map = {} if @prepare_map.length > 1000
-
-    return prepare_without_profiling(*args, &blk) unless SqlPatches.should_measure?
-    prepare_without_profiling(*args, &blk)
-  end
-
-  def exec(*args, &blk)
-    return exec_without_profiling(*args, &blk) unless SqlPatches.should_measure?
-
-    start        = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-    result       = exec_without_profiling(*args, &blk)
-    elapsed_time = SqlPatches.elapsed_time(start)
-    record       = ::Rack::MiniProfiler.record_sql(args[0], elapsed_time)
-    result.instance_variable_set("@miniprofiler_sql_id", record) if result
-
-    result
-  end
-
-  if Gem::Version.new(PG::VERSION) >= Gem::Version.new("1.1.0")
-    def exec_params(*args, &blk)
-      return exec_params_without_profiling(*args, &blk) unless SqlPatches.should_measure?
-
-      start        = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-      result       = exec_params_without_profiling(*args, &blk)
-      elapsed_time = SqlPatches.elapsed_time(start)
-      record       = ::Rack::MiniProfiler.record_sql(args[0], elapsed_time)
-      result.instance_variable_set("@miniprofiler_sql_id", record) if result
-
-      result
-    end
-  end
-
-  def exec_prepared(*args, &blk)
-    return exec_prepared_without_profiling(*args, &blk) unless SqlPatches.should_measure?
-
-    start        = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-    result       = exec_prepared_without_profiling(*args, &blk)
-    elapsed_time = SqlPatches.elapsed_time(start)
-    mapped       = args[0]
-    mapped       = @prepare_map[mapped] || args[0] if @prepare_map
-    record       = ::Rack::MiniProfiler.record_sql(mapped, elapsed_time)
-    result.instance_variable_set("@miniprofiler_sql_id", record) if result
-
-    result
-  end
-
-  def send_query_prepared(*args, &blk)
-    return send_query_prepared_without_profiling(*args, &blk) unless SqlPatches.should_measure?
-
-    start        = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-    result       = send_query_prepared_without_profiling(*args, &blk)
-    elapsed_time = SqlPatches.elapsed_time(start)
-    mapped       = args[0]
-    mapped       = @prepare_map[mapped] || args[0] if @prepare_map
-    record       = ::Rack::MiniProfiler.record_sql(mapped, elapsed_time)
-    result.instance_variable_set("@miniprofiler_sql_id", record) if result
-
-    result
-  end
-
-  def async_exec(*args, &blk)
-    return async_exec_without_profiling(*args, &blk) unless SqlPatches.should_measure?
-
-    start        = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-    result       = exec_without_profiling(*args, &blk)
-    elapsed_time = SqlPatches.elapsed_time(start)
-    record       = ::Rack::MiniProfiler.record_sql(args[0], elapsed_time)
-    result.instance_variable_set("@miniprofiler_sql_id", record) if result
-
-    result
-  end
-
-  alias_method :query, :exec
+if defined?(Rack::MINI_PROFILER_PREPEND_PG_PATCH)
+  require "patches/db/pg/prepend"
+else
+  require "patches/db/pg/alias_method"
 end

data/lib/prepend_pg_patch.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module Rack
+  MINI_PROFILER_PREPEND_PG_PATCH = true
+end

data/rack-mini-profiler.gemspec

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+$LOAD_PATH.unshift(lib) if !$LOAD_PATH.include?(lib)
 require 'mini_profiler/version'
 
 Gem::Specification.new do |s|
@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
     "CHANGELOG.md"
   ]
   s.add_runtime_dependency 'rack', '>= 1.2.0'
-  s.required_ruby_version = '>= 2.7.0'
+  s.required_ruby_version = '>= 3.1.0'
 
   s.metadata = {
     'source_code_uri' => Rack::MiniProfiler::SOURCE_CODE_URI,
@@ -41,7 +41,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rubocop-discourse'
   s.add_development_dependency 'listen'
   s.add_development_dependency 'webpacker'
-  s.add_development_dependency 'rails', '~> 6.0'
+  s.add_development_dependency 'rails', '>= 7.1'
   s.add_development_dependency 'webmock', '3.9.1'
   s.add_development_dependency 'rubyzip'
 

metadata

@@ -1,16 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: rack-mini-profiler
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 4.0.0
 platform: ruby
 authors:
 - Sam Saffron
 - Robin Ward
 - Aleks Totic
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-14 00:00:00.000000000 Z
+date: 2025-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -212,16 +211,16 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -329,6 +328,8 @@ files:
 - lib/patches/db/nobrainer.rb
 - lib/patches/db/oracle_enhanced.rb
 - lib/patches/db/pg.rb
+- lib/patches/db/pg/alias_method.rb
+- lib/patches/db/pg/prepend.rb
 - lib/patches/db/plucky.rb
 - lib/patches/db/riak.rb
 - lib/patches/db/rsolr.rb
@@ -337,6 +338,7 @@ files:
 - lib/patches/sql_patches.rb
 - lib/prepend_mysql2_patch.rb
 - lib/prepend_net_http_patch.rb
+- lib/prepend_pg_patch.rb
 - lib/rack-mini-profiler.rb
 - rack-mini-profiler.gemspec
 homepage: https://miniprofiler.com
@@ -345,7 +347,6 @@ licenses:
 metadata:
   source_code_uri: https://github.com/MiniProfiler/rack-mini-profiler
   changelog_uri: https://github.com/MiniProfiler/rack-mini-profiler/blob/master/CHANGELOG.md
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -353,15 +354,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.4
-signing_key:
+rubygems_version: 3.6.3
 specification_version: 4
 summary: Profiles loading speed for rack applications.
 test_files: []