builder_apm 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e345a9d0a4268df1fd70c2dd2311eba4ce9fe9172907a74ec03b6922b6623fd
-  data.tar.gz: e657d3f16327b2c8aa0a79f90a5a80f57350205fccb516ac6d58d7d1e3e0bcc9
+  metadata.gz: 0cbbeca0fe7a6139175c8b354026859775e2f5db9666bc3ac74d2d19a411e46b
+  data.tar.gz: a571a27eb27d78926e237109863c07277e7cf90e8fe4b902f8545ac36a01c788
 SHA512:
-  metadata.gz: 3b644056f083a38a59fdb5f94c26f5108e72474cc5d7c01e76ef3f7d56802b0b87c96602f723e260f9b29894de749852b3c198f80dcf0c3a28960143e28cd029
-  data.tar.gz: c09bfba63427594bc9a7b51cc70122902d6407b8e65415994a934c48654a756c65a3ab4e5119aa811e491f1639107fbc2b2b27c9bb36a566d0b12a2926153da5
+  metadata.gz: '049b33f6202dbd35201bcd9cf39fe26abc199fac70864ea0707956f03d2a532135793cdd8980cbcebf8faff2c8ed62fdaf41a97d5f31f898780214314a7e4edb'
+  data.tar.gz: a04010fe3649dd05172dc2a4bfc4036f1bb1b886a1e2c91d4b0bd6f6563d4a1fec8174a07f0f4e75b1eb7ea688eb10c0ff4c87ec181899e9a657fbe530d40c82

data/app/controllers/builder_apm/request_data_controller.rb

@@ -22,7 +22,6 @@ module BuilderApm
             begin
               data.map { |d| JSON.parse(d) }
             rescue => e
-              debugger
               raise e
             end
           end

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/_data_fetcher.html.erb

@@ -5,32 +5,56 @@
 var allData = null;
 var isAsc = false;
 var current_sort_field = 'real_start_time';
+var start_time = Date.now();
 
 function fetchDataAndUpdateStorage(onSuccess) {
-  // Get the last request time
-  var cursor = localStorage.getItem('builder_apm_cursor') || "-inf";
-  var limit = 50;
-  
-  // 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));
-
-    if(allData != null){
+  start_time = Date.now();
+  var initialCursor = localStorage.getItem('builder_apm_cursor') || "-inf";
+  var storedData = localStorage.getItem('builder_apm_requests');
+  if (storedData) {
+    var dataCompressed = decompress(storedData, function(result, error) {
+      allData = JSON.parse(result) || [];
+      fetchAndProcessData(initialCursor, onSuccess);
+    });
+  } else {
+      allData = [];
+    // Start fetching data
+    fetchAndProcessData(initialCursor, onSuccess);
+  }
+}
+function fetchAndProcessData(cursor, onSuccess) {
+    // Get the last request time
+    var limit = 100;
+
+    // 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));
+
       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);
-        });
+
+      // 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 (latestRequest && latestRequest.real_end_time < start_time && newData.length === limit) {
+        fetchAndProcessData(localStorage.getItem('builder_apm_cursor'), onSuccess);
       } else {
-        processData([], null, newData, onSuccess);
+        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 +66,7 @@ function loadLocalData(onSuccess) {
           processData(JSON.parse(result), error, [], onSuccess);
       });
     } else {
+      allData = [];
       fetchDataAndUpdateStorage(onSuccess);
     }
   }
@@ -52,12 +77,6 @@ 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) {
@@ -183,7 +202,7 @@ 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}|${request.method}|${request.path}`;
         if (!aggregates[key]) {
             aggregates[key] = {
                 count: 0,
@@ -206,9 +225,10 @@ function aggregateRequests(requestArray) {
 
     let results = [];
     for (let key in aggregates) {
-        let [controller, path] = key.split('|');
+        let [controller, method, path] = key.split('|');
         results.push({
             controller,
+            method,
             path,
             count: aggregates[key].count,
             averageDuration: aggregates[key].totalDuration / aggregates[key].count,

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

@@ -33,6 +33,7 @@ $(document).ready(function() {
   
       $('<td>').text(new Date(item['start_time']).toLocaleString()).appendTo(row);
       $('<td>').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

@@ -32,6 +32,7 @@ $(document).ready(function() {
   
       $('<td>').text(new Date(item['start_time']).toLocaleString()).appendTo(row);
       $('<td>').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

@@ -36,6 +36,7 @@ $(document).ready(function() {
   
       $('<td>').text(new Date(item['start_time']).toLocaleString()).appendTo(row);
       $('<td>').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);

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

@@ -31,6 +31,7 @@ $(document).ready(function() {
       var row = $('<tr>');
 
       $('<td>').text(item['controller']).appendTo(row);
+      $('<td>').text(item['method']).appendTo(row);
       $('<td>').text(item['path']).appendTo(row);
       $('<td>').text(item['count']).appendTo(row);
       $('<td>').append(renderDuration(item['averageDuration'])).appendTo(row);

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

@@ -32,6 +32,7 @@ $(document).ready(function() {
   
       $('<td>').text(new Date(item['start_time']).toLocaleString()).appendTo(row);
       $('<td>').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/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/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

@@ -33,8 +33,12 @@ module BuilderApm
           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.zadd("builder_apm:timestamps", end_time, request_id)
+            @redis_client.set("builder_apm:Request:#{data[:request_id]}", data.to_json)
+          rescue => e
+            Rails.logger.error "Redis Missing"
+          end
         end
       end
     end

data/lib/builder_apm/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: builder_apm
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 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