builder_apm 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e345a9d0a4268df1fd70c2dd2311eba4ce9fe9172907a74ec03b6922b6623fd
-  data.tar.gz: e657d3f16327b2c8aa0a79f90a5a80f57350205fccb516ac6d58d7d1e3e0bcc9
+  metadata.gz: 31a9a4393e090f4980960c61d6f5cb2cf307a352534b9f8f264c2238dcd281f4
+  data.tar.gz: a01935162ea2b1fa2701a080536aadc6259c3a9c102148ef1df4475ddd7a89de
 SHA512:
-  metadata.gz: 3b644056f083a38a59fdb5f94c26f5108e72474cc5d7c01e76ef3f7d56802b0b87c96602f723e260f9b29894de749852b3c198f80dcf0c3a28960143e28cd029
-  data.tar.gz: c09bfba63427594bc9a7b51cc70122902d6407b8e65415994a934c48654a756c65a3ab4e5119aa811e491f1639107fbc2b2b27c9bb36a566d0b12a2926153da5
+  metadata.gz: 61269a7ae1127eebfbdec316e015e64e6e0a76b23d81433c1a2569f4ccfabbebccc289d4f5588dfa46ac100d33dd5269fdc6e37208167598cdee7e6066ec35d5
+  data.tar.gz: 3736371f1c53590cf7e811c19fa7262e70470f50207d414087a08967bd3cdc7375f93a9256906df7ce44bb10aa14b887045da11144791169ca6a861cf19e02c3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    builder_apm (0.2.2)
+    builder_apm (0.2.5)
       rails (>= 4.0, < 8)
       redis (~> 4.5)
 

data/app/controllers/builder_apm/application_controller.rb

@@ -0,0 +1,7 @@
+module BuilderApm
+    class ApplicationController < ActionController::Base
+        def redis_client
+            @redis_client ||= BuilderApm::RedisClient.client
+        end
+    end 
+end

data/app/controllers/builder_apm/dashboard_controller.rb

@@ -1,8 +1,24 @@
 module BuilderApm
-    class DashboardController < ActionController::Base
-        def index
+    class DashboardController < ApplicationController
+      def index
+        if params[:clear] == 'true'
+          keys = redis_client.zrange("builder_apm:timestamps", 0, -1)
+  
+          keys = keys.map { |key| "builder_apm:Request:#{key}" }
+          # Delete base keys
+          redis_client.pipelined do |pipeline|
+            pipeline.del("builder_apm:timestamps")
+            pipeline.del("builder_apm:errors")
+            pipeline.del("builder_apm:n_plus_one")
+            pipeline.del("builder_apm:slow")
+          end
+          debugger
+          # Delete keys in chunks
+          keys.each_slice(1000) do |key_chunk|
+            redis_client.del(*key_chunk) unless key_chunk.empty?
+          end
         end
+      end
     end
-end
-
+  end
   

data/app/controllers/builder_apm/error_requests_controller.rb

@@ -1,5 +1,5 @@
 module BuilderApm
-    class ErrorRequestsController < ActionController::Base
+    class ErrorRequestsController < ApplicationController
         def index
         end
     end

data/app/controllers/builder_apm/n_plus_one_controller.rb

@@ -1,5 +1,5 @@
 module BuilderApm
-    class NPlusOneController < ActionController::Base
+    class NPlusOneController < ApplicationController
         def index
         end
     end

data/app/controllers/builder_apm/recent_requests_controller.rb

@@ -1,5 +1,5 @@
 module BuilderApm
-    class RecentRequestsController < ActionController::Base
+    class RecentRequestsController < ApplicationController
         def index
         end
     end

data/app/controllers/builder_apm/request_analysis_controller.rb

@@ -1,5 +1,5 @@
 module BuilderApm
-    class RequestAnalysisController < ActionController::Base
+    class RequestAnalysisController < ApplicationController
         def index
         end
     end

data/app/controllers/builder_apm/request_data_controller.rb

@@ -1,41 +1,41 @@
 module BuilderApm
-    class RequestDataController < ActionController::Base
-        def index
-            cursor = (params[:cursor].presence&.to_f) || "-inf"
-            limit = params[:limit].presence&.to_i || 50
-          
-            if cursor == "-inf"
-              @requests = retrieve_all_data_from_redis(limit)
-            else
-              @requests = retrieve_data_from_redis_since(cursor, limit)
-            end
-          
-            render json: @requests
-          end
+  class RequestDataController < ApplicationController
+      def index
+          cursor = params[:cursor].presence&.to_f || Time.now.to_f
+          limit = params[:limit].presence&.to_i || 50
+          type = params[:type].presence || 'timestamps'
 
-        private
+          purge_old_keys
+          @requests = retrieve_data_from_redis_since(cursor, limit, type)
 
-        def retrieve_data_from_redis_since(cursor, limit)
-            # Use ZRANGEBYSCORE to get a range of keys, then get the corresponding data
-            keys = redis_client.zrangebyscore("builder_apm:timestamps", cursor, "+inf", limit: [0, limit])
-            data = keys.map { |key| redis_client.get("builder_apm:Request:#{key}") }
-            begin
-              data.map { |d| JSON.parse(d) }
-            rescue => e
-              debugger
-              raise e
-            end
-          end
-          
-          def retrieve_all_data_from_redis(limit)
-            # Similar to the above, but we get all records
-            keys = redis_client.zrange("builder_apm:timestamps", -limit, -1)
-            data = keys.map { |key| redis_client.get("builder_apm:Request:#{key}") }
+          render json: @requests
+      end
+
+      private
+
+      def purge_old_keys
+        time_limit = (Time.now - 1.hour).to_f * 1000
+        redis_client.zremrangebyscore('builder_apm:timestamps', '-inf', time_limit)
+        redis_client.zremrangebyscore('builder_apm:errors', '-inf', time_limit)
+        redis_client.zremrangebyscore('builder_apm:n_plus_one', '-inf', time_limit)
+        redis_client.zremrangebyscore('builder_apm:slow', '-inf', time_limit)
+      end
+
+      def retrieve_data_from_redis_since(cursor, limit, type)
+          # Use ZREVRANGEBYSCORE to get a range of keys, then get the corresponding data
+          # if(type == 'timestamps')
+            keys = redis_client.zrevrangebyscore("builder_apm:#{type}", cursor, "-inf", limit: [0, limit])
+          # else
+          #   keys = redis_client.lrange("builder_apm:#{type}", 0, -1)
+          # end
+
+          keys = keys.map { |key| "builder_apm:Request:#{key}" }
+          data = keys.empty? ? [] : redis_client.mget(*keys)
+          begin
             data.map { |d| JSON.parse(d) }
+          rescue => e
+            raise e
           end
-
-        def redis_client
-            @redis_client ||= BuilderApm::RedisClient.client
-        end
-    end
-end
+      end
+  end
+end

data/app/controllers/builder_apm/request_details_controller.rb

@@ -1,8 +1,11 @@
 module BuilderApm
-    class RequestDetailsController < ActionController::Base
+    class RequestDetailsController < ApplicationController
         def index
             @request_id = params[:request_id]
+            @data = redis_client.get("builder_apm:Request:#{@request_id}") || {}
+            
         end
+
     end
 end
 

data/app/controllers/builder_apm/slow_requests_controller.rb

@@ -1,5 +1,5 @@
 module BuilderApm
-    class SlowRequestsController < ActionController::Base
+    class SlowRequestsController < ApplicationController
         def index
         end
     end

data/app/controllers/builder_apm/wip_controller.rb

@@ -1,5 +1,5 @@
 module BuilderApm
-    class WipController < ActionController::Base
+    class WipController < ApplicationController
         def index
         end
     end

data/app/views/builder_apm/css/_main.html.erb

@@ -64,7 +64,10 @@ body {
     font-size: 1em; /* Adjust to match your anchors */
     transition: background-color 0.3s ease, color 0.3s ease; /* Smooth transition */
 }
-
+td.long_text{
+  max-width:400px;
+  overflow-wrap:break-word;
+}
 th.sortable {
     cursor: pointer; /* Makes the button cursor appear as a hand */
 }

data/app/views/builder_apm/error_requests/index.html.erb

@@ -5,6 +5,7 @@
         <tr>
             <th class="sortable" data-field="start_time">Time</th>
             <th class="sortable" data-field="controller">Controller#Action</th>
+            <th class="sortable" data-field="method">Method</th>
             <th class="sortable" data-field="status">Status</th>
             <th class="sortable" data-field="exception_class">Error Class</th>
             <th class="sortable" data-field="exception_message">Error Message</th>

data/app/views/builder_apm/js/_dashboard.html.erb

@@ -6,12 +6,10 @@ google.charts.setOnLoadCallback(drawCharts);
 
 function drawCharts() {
   prepareChartData(aggregationInterval);
-  setInterval(function() {
-    var autoUpdate = $("#autoUpdate").prop('checked');
-    if (autoUpdate) {
-      prepareChartData(aggregationInterval);
-    }
-  }, 5000);
+    autoFetchDataAndUpdateStorage(function(updatedData){
+      // Render the table with the updated data
+      prepareChartData(aggregationInterval)
+  });
 }
 function prepareChartData(aggregationInterval) {
   fetchDataAndUpdateStorage(function(updatedData) {

data/app/views/builder_apm/js/_data_fetcher.html.erb

@@ -5,32 +5,53 @@
 var allData = null;
 var isAsc = false;
 var current_sort_field = 'real_start_time';
+var start_time = Date.now();
+var data_gathered_counter = 0;
+var time_cursor = <%= Time.now.to_f * 1000 %>;
 
 function fetchDataAndUpdateStorage(onSuccess) {
-  // Get the last request time
-  var cursor = localStorage.getItem('builder_apm_cursor') || "-inf";
-  var limit = 50;
+  start_time = Date.now();
+  var initialCursor = time_cursor || start_time;
+  if(allData == null) {
+      allData = [];
+  }
+    // Start fetching data
+    fetchAndProcessData(initialCursor, onSuccess);
   
-  // Make an AJAX request to fetch latest data
-  $.get('/builder_apm/request_data?cursor=' + cursor + '&limit=' + limit, function(newData) {
-    
-    newData = newData.map(request => calcDurations(request));
+}
+function fetchAndProcessData(cursor, onSuccess) {
+    var limit = 1000;
+    var type = typeof fetch_type !== 'undefined' ? fetch_type : 'timestamps';
+
+    // Make an AJAX request to fetch latest data
+    $.get('/builder_apm/request_data?cursor=' + cursor + '&limit=' + limit + '&type=' +type, function(newData) {
+      data_gathered_counter++;
+      newData = newData.map(request => calcDurations(request));
 
-    if(allData != null){
       processData(allData, null, newData, onSuccess);
-    } else {
-      // Retrieve the stored data from local storage
-      var storedData = localStorage.getItem('builder_apm_requests');
-      if (storedData) {
-        var dataCompressed = decompress(storedData, function(result, error) {
-            processData(JSON.parse(result), error, newData, onSuccess);
-        });
-      } else {
-        processData([], null, newData, onSuccess);
-      }
-    }
-  });
-}
+
+      // Find the latest request in the newly fetched data
+      // var latestRequest = newData.reduce((latest, current) => current.real_end_time > latest.real_end_time ? current : latest, newData[0]);
+
+      // If latest request's end_time is less than start_time, and there's more data (received data is equal to limit), fetch next batch
+      // if (data_gathered_counter < 5 && latestRequest && latestRequest.real_end_time < start_time && newData.length === limit) {
+      //   fetchAndProcessData(var time_cursor = <%= Time.now.to_f * 1000 %>;, onSuccess);
+      // } else {
+      //   try {
+      //     // Store the updated data back to local storage
+      //     compress(JSON.stringify(allData), function(result, error) {
+      //       if(result != null) {
+      //         localStorage.setItem('builder_apm_requests', result);
+      //       }
+      //     });
+      //   } catch(e) {
+      //       console.error("Error storing data to local storage. Might be out of storage space.", e);
+      //       alert('not enough local storage')
+      //   }
+        // onSuccess(allData);
+      
+    });
+  }
 
 function loadLocalData(onSuccess) {
   if(allData) {
@@ -42,6 +63,7 @@ function loadLocalData(onSuccess) {
           processData(JSON.parse(result), error, [], onSuccess);
       });
     } else {
+      allData = [];
       fetchDataAndUpdateStorage(onSuccess);
     }
   }
@@ -52,18 +74,11 @@ function processData(storedData, error, newData, onSuccess) {
     // Append the new data to the stored data
     allData = storedData.concat(newData);
     try {
-      // Store the updated data back to local storage
-      compress(JSON.stringify(allData), function(result, error) {
-        if(result != null) {
-          localStorage.setItem('builder_apm_requests', result);
-        }
-      });
 
       // Update the cursor
       if (newData.length > 0) {
         var lastRequest = newData[newData.length - 1];
-        cursor = lastRequest.real_end_time+0.001;
-        localStorage.setItem('builder_apm_cursor', cursor.toString());
+        time_cursor = lastRequest.real_end_time-0.001;
       }
     } catch(e) {
         console.error("Error storing data to local storage. Might be out of storage space.", e);
@@ -82,6 +97,24 @@ function loadRequest(request_id) {
     return requestData;
 }
 
+function autoFetchDataAndUpdateStorage(onSuccess) {
+    var autoUpdate = $('#autoUpdate').is(':checked');
+    if (autoUpdate) {
+        fetchDataAndUpdateStorage(function(updatedData) {
+            onSuccess(updatedData);
+            // Schedule the next run
+            setTimeout(function() { 
+                autoFetchDataAndUpdateStorage(onSuccess); 
+            }, 5000);
+        });
+    } else {
+        // If auto update is not checked, schedule the next check
+        setTimeout(function() { 
+            autoFetchDataAndUpdateStorage(onSuccess); 
+        }, 5000);
+    }
+}
+
 function processStack(stack, processSqlEvent) {
     if(stack == null) {
       stack = {}
@@ -140,8 +173,12 @@ function tagQueriesWithNPlusOne(requestInput) {
 function addSortingClick() {
   // Assuming your table headers have a class name "sortable"
   $('.sortable').click(function() {
+    if (current_sort_field == $(this).data('field')) {
+      isAsc = !isAsc;
+    } else {
+      isAsc = false;
+    }
     current_sort_field = $(this).data('field');  // Assuming data-field attribute contains the name of the field to sort
-    isAsc = !isAsc;
 
     renderTable(allData);
     });
@@ -183,10 +220,12 @@ function getNPlusOneRequests(requestArray) {
 function aggregateRequests(requestArray) {
     let aggregates = {};
     requestArray.forEach(request => {
-        let key = `${request.controller}#${request.method}|${request.path}`;
+        let key = `${request.controller}#${request.action}`;
         if (!aggregates[key]) {
             aggregates[key] = {
                 count: 0,
+                method: request.method,
+                path: request.path,
                 totalDuration: 0,
                 totalDbRuntime: 0,
                 totalViewRuntime: 0,
@@ -195,6 +234,7 @@ function aggregateRequests(requestArray) {
                 slowestViewRuntime: 0
             };
         }
+        
         aggregates[key].count++;
         aggregates[key].totalDuration += request.duration;
         aggregates[key].totalDbRuntime += request.db_runtime || 0;
@@ -206,10 +246,11 @@ function aggregateRequests(requestArray) {
 
     let results = [];
     for (let key in aggregates) {
-        let [controller, path] = key.split('|');
+        let controller = key;
         results.push({
             controller,
-            path,
+            method: aggregates[key].method,
+            path: aggregates[key].path,
             count: aggregates[key].count,
             averageDuration: aggregates[key].totalDuration / aggregates[key].count,
             averageDbRuntime: aggregates[key].totalDbRuntime / aggregates[key].count,

data/app/views/builder_apm/js/_error_requests.html.erb

@@ -1,24 +1,27 @@
 <script>
+var fetch_type = 'errors';
 $(document).ready(function() {
-
-    fetchDataAndUpdateStorage(function(updatedData) {
-      renderTable(updatedData);
+  var storedData = localStorage.getItem('builder_apm_requests');
+  if (storedData) {
+    var dataCompressed = decompress(storedData, function(result, error) {
+      allData = JSON.parse(result) || [];
+      renderTable(allData);
     });
+  }
 
-    setInterval(function() {
-      var autoUpdate = $('#autoUpdate').is(':checked');
-      if (autoUpdate) {
-        fetchDataAndUpdateStorage(function(updatedData) {
-          renderTable(updatedData);
-        });
-      }
-    }, 5000);
+  fetchDataAndUpdateStorage(function(updatedData) {
+    renderTable(updatedData);
+  });
+
+  autoFetchDataAndUpdateStorage(function(updatedData){
+      // Render the table with the updated data
+      renderTable(updatedData);
+  });
     
     addSortingClick();
   });
   
   function renderTable(data, target = null) {
-    data = data.filter(item => item.status === 500);
     data = sortDataBy(current_sort_field, data);
 
     // Get a reference to the table body
@@ -27,12 +30,18 @@ $(document).ready(function() {
     // Clear the table body
     tableBody.empty();
   
+   if(data.length == 0) {
+      var messageElement = $('<p>').text('No 500 Requests found');
+      tableBody.after(messageElement);
+      return;
+    }
     // Create new table rows for each data item
     data.forEach(function(item) {
       var row = $('<tr>');
   
       $('<td>').text(new Date(item['start_time']).toLocaleString()).appendTo(row);
-      $('<td>').text(item['controller'] + '#' + item['action']).appendTo(row);
+      $('<td>').addClass('long_text').text(item['controller'] + '#' + item['action']).appendTo(row);
+      $('<td>').text(item['method']).appendTo(row);
       $('<td>').text(item['status']).appendTo(row);
       $('<td>').append(item['exception_class']).appendTo(row);
       $('<td>').append(item['exception_message']).appendTo(row);

data/app/views/builder_apm/js/_n_plus_one.html.erb

@@ -1,23 +1,26 @@
 <script>
+var fetch_type = 'n_plus_one';
 $(document).ready(function() {
+  var storedData = localStorage.getItem('builder_apm_requests');
+  if (storedData) {
+    var dataCompressed = decompress(storedData, function(result, error) {
+      allData = JSON.parse(result) || [];
+      renderTable(allData);
+    });
+  }
     fetchDataAndUpdateStorage(function(updatedData) {
       renderTable(updatedData);
     });
 
-    setInterval(function() {
-      var autoUpdate = $('#autoUpdate').is(':checked');
-      if (autoUpdate) {
-        fetchDataAndUpdateStorage(function(updatedData) {
-            renderTable(updatedData);
-        });
-      }
-    }, 5000);
+  autoFetchDataAndUpdateStorage(function(updatedData){
+      // Render the table with the updated data
+      renderTable(updatedData);
+  });
     
     addSortingClick();
   });
   
   function renderTable(data, target = null) {
-    data = detectNPlusOne(data);
     data = sortDataBy(current_sort_field, data);
   
     // Get a reference to the table body
@@ -26,12 +29,18 @@ $(document).ready(function() {
     // Clear the table body
     tableBody.empty();
   
+   if(data.length == 0) {
+      var messageElement = $('<p>').text('No N+1 Requests found');
+      tableBody.after(messageElement);
+      return;
+    }
     // Create new table rows for each data item
     data.forEach(function(item) {
       var row = $('<tr>');
   
       $('<td>').text(new Date(item['start_time']).toLocaleString()).appendTo(row);
-      $('<td>').text(item['controller'] + '#' + item['action']).appendTo(row);
+      $('<td>').addClass('long_text').text(item['controller'] + '#' + item['action']).appendTo(row);
+      $('<td>').text(item['method']).appendTo(row);
       $('<td>').text(item['status']).appendTo(row);
       $('<td>').append(renderDuration(item['duration'])).appendTo(row);
       $('<td>').append(renderDuration(item['db_runtime'])).appendTo(row);

data/app/views/builder_apm/js/_recent_requests.html.erb

@@ -1,26 +1,27 @@
 <script>
 
 $(document).ready(function() {
+  var storedData = localStorage.getItem('builder_apm_requests');
+  if (storedData) {
+    var dataCompressed = decompress(storedData, function(result, error) {
+      allData = JSON.parse(result) || [];
+      renderTable(allData);
+    });
+  }
     fetchDataAndUpdateStorage(function(updatedData) {
       // Render the table with the updated data
       renderTable(updatedData);
     });
 
 
-    setInterval(function() {
-      var autoUpdate = $('#autoUpdate').is(':checked');
-      if (autoUpdate) {
-        fetchDataAndUpdateStorage(function(updatedData) {
-          // Render the table with the updated data
-          renderTable(updatedData);
-        });
-      }
-    }, 5000);
+  autoFetchDataAndUpdateStorage(function(updatedData){
+      // Render the table with the updated data
+      renderTable(updatedData);
+  });
     
     addSortingClick();
   });
   
-  
   function renderTable(data, target = null) {
     data = sortDataBy(current_sort_field, data);
   
@@ -30,12 +31,19 @@ $(document).ready(function() {
     // Clear the table body
     tableBody.empty();
   
+  
+   if(data.length == 0) {
+      var messageElement = $('<p>').text('No Requests found');
+      tableBody.after(messageElement);
+      return;
+    }
     // Create new table rows for each data item
     data.forEach(function(item) {
       var row = $('<tr>');
   
       $('<td>').text(new Date(item['start_time']).toLocaleString()).appendTo(row);
-      $('<td>').text(item['controller'] + '#' + item['action']).appendTo(row);
+      $('<td>').addClass('long_text').text(item['controller'] + '#' + item['action']).appendTo(row);
+      $('<td>').text(item['method']).appendTo(row);
       $('<td>').text(item['status']).appendTo(row);
       $('<td>').append(renderDuration(item['real_duration_time'])).appendTo(row);
       $('<td>').append(renderDuration(item['calc_db_runtime'])).appendTo(row);
@@ -45,13 +53,10 @@ $(document).ready(function() {
 
       if(item.stack && item.stack.length > 0) {
 
-        var actionButton = $('<button>').text('Details');
-        actionButton.on('click', function() {
-          // Replace 'your-details-url' with the actual URL where the details are to be fetched.
-          // It's assumed the ID is required as a URL parameter, modify as per your requirements.
-          window.location.href = '<%= request_details_path %>?request_id=' + item['request_id'];
-        });
-        actionButton.appendTo(actionTd);
+        var actionLink = $('<a>').text('Details');
+        actionLink.attr('href', '<%= request_details_path %>?request_id=' + item['request_id']);
+        actionLink.attr('target', '_blank');
+        actionLink.appendTo(actionTd);
       }
       actionTd.appendTo(row);
 

data/app/views/builder_apm/js/_request_analysis.html.erb

@@ -1,17 +1,21 @@
 <script>
 $(document).ready(function() {
+  var storedData = localStorage.getItem('builder_apm_requests');
+  if (storedData) {
+    var dataCompressed = decompress(storedData, function(result, error) {
+      allData = JSON.parse(result) || [];
+      renderTable(allData);
+    });
+  }
+
     fetchDataAndUpdateStorage(function(updatedData) {
       renderTable(updatedData);
     });
 
-    setInterval(function() {
-      var autoUpdate = $('#autoUpdate').is(':checked');
-      if (autoUpdate) {
-        fetchDataAndUpdateStorage(function(updatedData) {
-            renderTable(updatedData);
-        });
-      }
-    }, 5000);
+  autoFetchDataAndUpdateStorage(function(updatedData){
+      // Render the table with the updated data
+      renderTable(updatedData);
+  });
     
     addSortingClick();
   });
@@ -26,12 +30,18 @@ $(document).ready(function() {
     // Clear the table body
     tableBody.empty();
   
+   if(data.length == 0) {
+      var messageElement = $('<p>').text('No Requests found');
+      tableBody.after(messageElement);
+      return;
+    }
     // Create new table rows for each data item
     data.forEach(function(item) {
       var row = $('<tr>');
 
-      $('<td>').text(item['controller']).appendTo(row);
-      $('<td>').text(item['path']).appendTo(row);
+      $('<td>').addClass('long_text').text(item['controller']).appendTo(row);
+      $('<td>').text(item['method']).appendTo(row);
+      $('<td>').addClass('long_text').text(item['path']).appendTo(row);
       $('<td>').text(item['count']).appendTo(row);
       $('<td>').append(renderDuration(item['averageDuration'])).appendTo(row);
       $('<td>').append(renderDuration(item['averageDbRuntime'])).appendTo(row);

data/app/views/builder_apm/js/_request_details.html.erb

@@ -1,31 +1,19 @@
 <script>
 var request_id = '<%= @request_id %>';
+var request_data = <%= @data.to_json.html_safe %>;
 var current_index = 0;
 
 $(document).ready(function() {
     prepPage();
-    loadLocalData(function(){
-        var request = loadRequest(request_id);
-        tagQueriesWithNPlusOne(request);
-        const preparedData = flattenData(request.stack);
-
-        $("#details_div").empty()
-        if(request.exception_message) {
-            $("#details_div").append(errorDetails(request));
-        }
-        $("#details_div").append(renderDetails(preparedData));
-
-        // if(request.has_n_plus_one){
-        //     // Find all div elements with 'possible_n_plus_one' class
-        //     $('div.possible_n_plus_one').each(function() {
-        //         // Traverse up the parent hierarchy
-        //         $(this).parents().each(function() {
-        //             // If the parent has the 'has_children' class, trigger a click event
-        //                 $(this).show();
-        //         });
-        //     });
-        // }
-    });
+    var request = JSON.parse(request_data);
+    tagQueriesWithNPlusOne(request);
+    const preparedData = flattenData(request.stack);
+
+    $("#details_div").empty()
+    if(request.exception_message) {
+        $("#details_div").append(errorDetails(request));
+    }
+    $("#details_div").append(renderDetails(preparedData));
 });
 
 function prepPage(){

data/app/views/builder_apm/js/_slow_requests.html.erb

@@ -1,23 +1,27 @@
 <script>
+var fetch_type = 'slow';
 $(document).ready(function() {
+  var storedData = localStorage.getItem('builder_apm_requests');
+  if (storedData) {
+    var dataCompressed = decompress(storedData, function(result, error) {
+      allData = JSON.parse(result) || [];
+      renderTable(allData);
+    });
+  }
+
     fetchDataAndUpdateStorage(function(updatedData) {
       renderTable(updatedData);
     });
 
-    setInterval(function() {
-      var autoUpdate = $('#autoUpdate').is(':checked');
-      if (autoUpdate) {
-        fetchDataAndUpdateStorage(function(updatedData) {
-        renderTable(updatedData);
-        });
-      }
-    }, 5000);
+  autoFetchDataAndUpdateStorage(function(updatedData){
+      // Render the table with the updated data
+      renderTable(updatedData);
+  });
     
     addSortingClick();
   });
   
   function renderTable(data, target = null) {
-    data = data.filter(item => item.duration > 1500);
     data = sortDataBy(current_sort_field, data);
   
     // Get a reference to the table body
@@ -26,12 +30,18 @@ $(document).ready(function() {
     // Clear the table body
     tableBody.empty();
   
+   if(data.length == 0) {
+      var messageElement = $('<p>').text('No Slow Requests found');
+      tableBody.after(messageElement);
+      return;
+    }
     // Create new table rows for each data item
     data.forEach(function(item) {
       var row = $('<tr>');
   
       $('<td>').text(new Date(item['start_time']).toLocaleString()).appendTo(row);
-      $('<td>').text(item['controller'] + '#' + item['action']).appendTo(row);
+      $('<td>').addClass('long_text').text(item['controller'] + '#' + item['action']).appendTo(row);
+      $('<td>').text(item['method']).appendTo(row);
       $('<td>').text(item['status']).appendTo(row);
       $('<td>').append(renderDuration(item['duration'])).appendTo(row);
       $('<td>').append(renderDuration(item['db_runtime'])).appendTo(row);

data/app/views/builder_apm/n_plus_one/index.html.erb

@@ -5,6 +5,7 @@
         <tr>
             <th class="sortable" data-field="start_time">Time</th>
             <th class="sortable" data-field="controller">Controller#Action</th>
+            <th class="sortable" data-field="method">Method</th>
             <th class="sortable" data-field="status">Status</th>
             <th class="sortable" data-field="real_duration_time">Duration (ms)</th>
             <th class="sortable" data-field="calc_db_runtime">DB Runtime (ms)</th>

data/app/views/builder_apm/recent_requests/index.html.erb

@@ -5,6 +5,7 @@
         <tr>
         <th class="sortable" data-field="start_time">Time</th>
         <th class="sortable" data-field="controller">Controller#Action</th>
+        <th class="sortable" data-field="method">Method</th>
         <th class="sortable" data-field="status">Status</th>
         <th class="sortable" data-field="real_duration_time">Duration (ms)</th>
         <th class="sortable" data-field="calc_db_runtime">DB Runtime (ms)</th>

data/app/views/builder_apm/request_analysis/index.html.erb

@@ -4,6 +4,7 @@
     <thead>
         <tr>
         <th class="sortable" data-field="controller">Controller#Action</th>
+        <th class="sortable" data-field="method">Method</th>
         <th class="sortable" data-field="path">Url</th>
         <th class="sortable" data-field="count">Requests</th>
         <th class="sortable" data-field="averageDuration">Avg Duration (ms)</th>

data/app/views/builder_apm/shared/_header.html.erb

@@ -46,7 +46,6 @@ $(document).ready(function() {
       <li><%= link_to 'Slow Requests', slow_requests_path, class: ("active" if current_page?(slow_requests_path)) %></li>
       <li><%= link_to 'N+1', n_plus_one_path, class: ("active" if current_page?(n_plus_one_path)) %></li>
       <li id="dark-mode-toggle"><button id="darkModeToggle" class="nav-button">Toggle Dark Mode</button></li>
-      <li id="dark-mode-toggle"><button id="clearData" class="nav-button">Clear Data</button></li>
     </ul>
   </nav>
   <div id="options">

data/app/views/builder_apm/slow_requests/index.html.erb

@@ -5,6 +5,7 @@
         <tr>
         <th class="sortable" data-field="start_time">Time</th>
         <th class="sortable" data-field="controller">Controller#Action</th>
+        <th class="sortable" data-field="method">Method</th>
         <th class="sortable" data-field="status">Status</th>
         <th class="sortable" data-field="real_duration_time">Duration (ms)</th>
         <th class="sortable" data-field="calc_db_runtime">DB Runtime (ms)</th>

data/lib/builder_apm/configuration.rb

@@ -4,12 +4,14 @@ module BuilderApm
     attr_accessor :enable_controller_profiler
     attr_accessor :enable_active_record_profiler
     attr_accessor :enable_methods_profiler
+    attr_accessor :enable_n_plus_one_profiler
 
     def initialize
       @redis_url = 'redis://localhost:6379/0'
       @enable_controller_profiler = true
       @enable_active_record_profiler = true
       @enable_methods_profiler = true
+      @enable_n_plus_one_profiler = true
     end
   end
 end

data/lib/builder_apm/controllers/instrumenter.rb

@@ -55,14 +55,12 @@ module BuilderApm
           view_runtime: event.payload[:view_runtime],
           stack: Thread.current[:stack]
         }
-        
-        if event.payload[:exception_object]
+        if event.payload[:exception_object]          
           exception = event.payload[:exception_object]
-          status = ActionDispatch::ExceptionWrapper.new(Rails.backtrace_cleaner, exception).status_code
-          data[:status] = status
+          data[:status] = ActionDispatch::ExceptionWrapper.new(Rails.application.routes, exception).status_code
           data[:exception_class] = exception.class
           data[:exception_message] = exception.message
-          data[:exception_backtrace] = exception.backtrace #.select { |line| line.start_with?(Rails.root.to_s) }
+          data[:exception_backtrace] = exception.backtrace
         end
 
         data

data/lib/builder_apm/middleware/timing.rb

@@ -9,6 +9,8 @@ module BuilderApm
       def call(env)
         request_id = env["action_dispatch.request_id"]
         Thread.current["request_id"] = request_id
+        Thread.current[:n_plus_one_duration] = 0
+        Thread.current[:has_n_plus_one] = false
         start_time = Time.now.to_f * 1000
 
         @status, @headers, @response = @app.call(env)
@@ -18,6 +20,10 @@ module BuilderApm
         end_time = Time.now.to_f * 1000
         handle_timing(start_time, end_time, request_id)
 
+        Thread.current['request_data'] = nil
+        Thread.current[:has_n_plus_one] = nil
+        Thread.current[:n_plus_one_duration] = nil
+
         [@status, @headers, @response]
       end
 
@@ -28,13 +34,28 @@ module BuilderApm
         data = Thread.current['request_data']
 
         if data
+          data[:has_n_plus_one] = Thread.current[:has_n_plus_one]
+          data[:n_plus_one_duration] = Thread.current[:n_plus_one_duration]
           data[:real_start_time] = start_time 
           data[:real_end_time] = end_time
           data[:real_duration_time] = end_time - start_time
-          Thread.current['request_data'] = nil
-          
-          @redis_client.zadd("builder_apm:timestamps", end_time, request_id)
-          @redis_client.set("builder_apm:Request:#{data[:request_id]}", data.to_json)
+
+          begin
+            @redis_client.pipelined do |pipeline|
+              pipeline.rpush("builder_apm:Analysis:#{data[:controller]}##{data[:action]}:duration", data[:real_duration_time]||0)
+              pipeline.rpush("builder_apm:Analysis:#{data[:controller]}##{data[:action]}:db_runtime", data[:db_runtime]||0)
+              pipeline.rpush("builder_apm:Analysis:#{data[:controller]}##{data[:action]}:view_runtime", data[:view_runtime]||0)
+            
+              pipeline.zadd("builder_apm:timestamps", end_time, request_id)
+              pipeline.zadd("builder_apm:errors", end_time, request_id) if data[:status] == 500
+              pipeline.zadd("builder_apm:n_plus_one", end_time, request_id) if data[:has_n_plus_one]
+              pipeline.zadd("builder_apm:slow", end_time, request_id) if data[:real_duration_time] > 1500
+              ttl = (1.hour + 1.minute).to_i
+              pipeline.set("builder_apm:Request:#{data[:request_id]}", data.to_json, ex: ttl)
+            end
+          rescue => e
+            Rails.logger.error "Redis Missing"
+          end
         end
       end
     end

data/lib/builder_apm/models/instrumenter.rb

@@ -54,14 +54,25 @@ module BuilderApm
       end
 
       def store_sql_query_data(sql_query_data)
-        Thread.current[:sql_event_id] = sql_query_data[:sql_id]
-
-        if Thread.current[:stack]&.any?
-          Thread.current[:stack].last[:sql_events].push(sql_query_data)
-        else
-          (Thread.current[:stack] ||= []).push({sql_events: [sql_query_data], children: []})
-        end
+      Thread.current[:sql_event_id] = sql_query_data[:sql_id]
+      
+      # Create the stack if it doesn't exist yet
+      stack = (Thread.current[:stack] ||= [])
+      
+      if stack&.any?
+        stack.last[:sql_events].push(sql_query_data)
+      else
+        stack.push({sql_events: [sql_query_data], children: []})
       end
+      # Do the N+1 check if it wasn't done yet
+      if BuilderApm.configuration.enable_n_plus_one_profiler && Thread.current[:has_n_plus_one] == false
+        start_time = Time.now.to_f * 1000
+        perform_n_plus_one_check(stack)
+        duration = (Time.now.to_f * 1000) - start_time
+        Thread.current[:n_plus_one_duration] ||= 0
+        Thread.current[:n_plus_one_duration] += duration
+      end
+    end
 
       def update_last_sql_query_data_with_instantiation_info(event)
         stack = Thread.current[:stack]
@@ -81,7 +92,31 @@ module BuilderApm
         ensure
           Thread.current[:sql_event_id] = nil
         end
-      end      
+      end 
+      
+      # Add this method to perform the N+1 check
+      def perform_n_plus_one_check(stack)
+        sql_queries = stack.map { |frame| frame[:sql_events] }.flatten
+
+        # Group queries count by table and triggering_line
+        queries_count = Hash.new { |h, k| h[k] = {count: 0, indices: []} }
+        sql_queries.each_with_index do |query, index|
+          match = query[:sql].match(/FROM ['`"]*([^ '`"]+)['`"]*/i)
+          if match
+            table_and_line = "#{match[1]}|#{query[:triggering_line]}"
+            queries_count[table_and_line][:count] += 1
+            queries_count[table_and_line][:indices].push(index)
+          end
+        end
+
+        # If any N+1 issue is found, set 'has_n_plus_one' to true and return
+        queries_count.each do |_, value|
+          if value[:count] > 1
+            Thread.current[:has_n_plus_one] = true
+            return
+          end
+        end
+      end
     end
   end
 end

data/lib/builder_apm/version.rb

@@ -1,3 +1,3 @@
 module BuilderApm
-  VERSION = "0.2.4"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: builder_apm
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - Paul Ketelle
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-07-24 00:00:00.000000000 Z
+date: 2023-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -60,6 +60,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- app/controllers/builder_apm/application_controller.rb
 - app/controllers/builder_apm/dashboard_controller.rb
 - app/controllers/builder_apm/error_requests_controller.rb
 - app/controllers/builder_apm/n_plus_one_controller.rb