builder_apm 0.3.2 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c694ae0d5543f44bb905abf9456e8768e3ae547bd99066fe0012f12e11aa89f
-  data.tar.gz: 1df6c105dbe848d600f1ae5197a64c2fe2816584072d4fb82ee69850dc6f61d6
+  metadata.gz: 15ea10eca92143c789a8dcb4c171d5492993f85685f41c0becd0e666fcc9bc74
+  data.tar.gz: 765ad18f703caadf903d23f610e9b01d10a63d237871a3a6e5203e55970528bc
 SHA512:
-  metadata.gz: 21f191411ce9106d7db006b92dc12ffd72efa414f62730f42bb26cdacc77ac0f841d9cabb2be482128ce3577ea9f67f5eadf8421c7ed6d0a826ab924cb40ef35
-  data.tar.gz: fcc1962c887a01e84cca5b1a7afa1deced47ef7ffcadefe2d26db6126f56c9bc99b7d0b52b9e65296ccf5a4af01bd6c131d043d50c370990364c37d6e0733637
+  metadata.gz: eb733f08909db54b9925e5b3ec4e5c5ff426dceeb65edbf977c049da87cf4f0abca214e67da1015bf9add472b995986bc3e1c8d9633cecfa2fe0ca5a25fdc919
+  data.tar.gz: b38eb27b9e73dc180f75124c0328a360bab162112ad12b48e21a0b676b90e1a03182d85e17e421d0b4a616a3e21e762c93f6e26a750a3a3447fc78e6aa3ec6d7

data/README.md

@@ -1,8 +1,6 @@
 # BuilderApm
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/builder_apm`. To experiment with that code, run `bin/console` for an interactive prompt.
 
-TODO: Delete this and the text above, and describe your gem
 
 ## Installation
 
@@ -23,28 +21,9 @@ Or install it yourself as:
 run
 ```
 rails generate builder_apm:install
-rails db:migrate
 ```
 
 ## Usage
 
 TODO: Write usage instructions here
 
-## Development
-
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
-
-## Contributing
-
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/builder_apm. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/[USERNAME]/builder_apm/blob/master/CODE_OF_CONDUCT.md).
-
-
-## License
-
-The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
-
-## Code of Conduct
-
-Everyone interacting in the BuilderApm project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/builder_apm/blob/master/CODE_OF_CONDUCT.md).

data/app/controllers/builder_apm/request_data_controller.rb

@@ -1,41 +1,30 @@
 module BuilderApm
   class RequestDataController < ApplicationController
       def index
-          cursor = params[:cursor].presence&.to_f || Time.now.to_f
+          cursor = params[:cursor].presence&.to_f || Time.now.to_f * 1000
           limit = params[:limit].presence&.to_i || 50
           type = params[:type].presence || 'timestamps'
 
           purge_old_keys
           @requests = retrieve_data_from_redis_since(cursor, limit, type)
-
+        Rails.logger.info "#{@requests.size} results gathered"
           render json: @requests
       end
 
       private
 
       def purge_old_keys
-        time_limit = (Time.now - 1.hour).to_f * 1000
+        time_limit = (Time.now - 2.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)
+        redis_client.zremrangebyscore('builder_apm:dashboard', '-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
+        data = redis_client.zrevrangebyscore("builder_apm:#{type}", cursor, "-inf", limit: [0, limit])
+        data.map{ |d| JSON.parse(d) }
       end
   end
 end

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

@@ -4,7 +4,7 @@
     <thead>
         <tr>
             <th class="sortable" data-field="start_time">Time</th>
-            <th class="sortable" data-field="controller">Controller#Action</th>
+            <th class="sortable" data-field="controller_action">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>

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

@@ -5,6 +5,7 @@ google.charts.load('current', {packages: ['corechart', 'line']});
 google.charts.setOnLoadCallback(drawCharts);
 
 function drawCharts() {
+  limit = 3000
   prepareChartData(aggregationInterval);
     autoFetchDataAndUpdateStorage(function(updatedData){
       // Render the table with the updated data
@@ -39,14 +40,14 @@ function prepareChartData(aggregationInterval) {
 
       // Add current request data to interval totals
       aggregatedData[timeKey]['count'] += 1;
-      aggregatedData[timeKey]['totalDuration'] += (item['real_duration_time']);
-      aggregatedData[timeKey]['totalDbRuntime'] += item['calc_db_runtime'];
+      aggregatedData[timeKey]['totalDuration'] += (item['duration']);
+      aggregatedData[timeKey]['totalDbRuntime'] += item['db_runtime'];
       aggregatedData[timeKey]['totalViewRuntime'] += item['view_runtime'];
-      aggregatedData[timeKey]['totalOther'] += item['real_duration_time'] - item['calc_db_runtime'] - item['view_runtime'];
+      aggregatedData[timeKey]['totalOther'] += item['duration'] - item['db_runtime'] - item['view_runtime'];
       // aggregatedData[timeKey]['durations'].push(item['duration']);
-      // aggregatedData[timeKey]['totalDbRuntime'] += item['real_duration_time']*0.35;
-      // aggregatedData[timeKey]['totalViewRuntime'] += item['real_duration_time']*0.45;
-      // aggregatedData[timeKey]['totalOther'] += item['real_duration_time']*0.2;
+      // aggregatedData[timeKey]['totalDbRuntime'] += item['duration']*0.35;
+      // aggregatedData[timeKey]['totalViewRuntime'] += item['duration']*0.45;
+      // aggregatedData[timeKey]['totalOther'] += item['duration']*0.2;
     });
 
 

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

@@ -8,6 +8,7 @@ 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 %>;
+var limit = 500;
 
 function fetchDataAndUpdateStorage(onSuccess) {
   start_time = Date.now();
@@ -20,7 +21,6 @@ function fetchDataAndUpdateStorage(onSuccess) {
   
 }
 function fetchAndProcessData(cursor, onSuccess) {
-    var limit = 1000;
     var type = typeof fetch_type !== 'undefined' ? fetch_type : 'timestamps';
 
     // Make an AJAX request to fetch latest data
@@ -29,26 +29,6 @@ function fetchAndProcessData(cursor, onSuccess) {
       newData = newData.map(request => calcDurations(request));
 
       processData(allData, 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);
       
     });
   }
@@ -78,7 +58,7 @@ function processData(storedData, error, newData, onSuccess) {
       // Update the cursor
       if (newData.length > 0) {
         var lastRequest = newData[newData.length - 1];
-        time_cursor = lastRequest.real_end_time-0.001;
+        time_cursor = lastRequest.end_time-0.001;
       }
     } catch(e) {
         console.error("Error storing data to local storage. Might be out of storage space.", e);
@@ -220,7 +200,7 @@ function getNPlusOneRequests(requestArray) {
 function aggregateRequests(requestArray) {
     let aggregates = {};
     requestArray.forEach(request => {
-        let key = `${request.controller}#${request.action}`;
+        let key = `${request.controller_action}`;
         if (!aggregates[key]) {
             aggregates[key] = {
                 count: 0,

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

@@ -40,7 +40,7 @@ $(document).ready(function() {
       var row = $('<tr>');
   
       $('<td>').text(new Date(item['start_time']).toLocaleString()).appendTo(row);
-      $('<td>').addClass('long_text').text(item['controller'] + '#' + item['action']).appendTo(row);
+      $('<td>').addClass('long_text').text(item['controller_action']).appendTo(row);
       $('<td>').text(item['method']).appendTo(row);
       $('<td>').text(item['status']).appendTo(row);
       $('<td>').append(item['exception_class']).appendTo(row);
@@ -57,13 +57,10 @@ $(document).ready(function() {
 
       // Action column
       var actionTd = $('<td>');
-      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);
 
       // Append the row to the table body

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

@@ -39,22 +39,19 @@ $(document).ready(function() {
       var row = $('<tr>');
   
       $('<td>').text(new Date(item['start_time']).toLocaleString()).appendTo(row);
-      $('<td>').addClass('long_text').text(item['controller'] + '#' + item['action']).appendTo(row);
+      $('<td>').addClass('long_text').text(item['controller_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);
       $('<td>').append(renderDuration(item['view_runtime'])).appendTo(row);
       // Action column
+      
       var actionTd = $('<td>');
-
-      if(item.stack && item.stack.length > 0) {
-
-        var actionLink = $('<a>').text('Details');
-        actionLink.attr('href', '<%= request_details_path %>?request_id=' + item['request_id']);
-        actionLink.attr('target', '_blank');
-        actionLink.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);
 
       // Append the row to the table body

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

@@ -42,22 +42,18 @@ $(document).ready(function() {
       var row = $('<tr>');
   
       $('<td>').text(new Date(item['start_time']).toLocaleString()).appendTo(row);
-      $('<td>').addClass('long_text').text(item['controller'] + '#' + item['action']).appendTo(row);
+      $('<td>').addClass('long_text').text(item['controller_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);
+      $('<td>').append(renderDuration(item['duration'])).appendTo(row);
+      $('<td>').append(renderDuration(item['db_runtime'])).appendTo(row);
       $('<td>').append(renderDuration(item['view_runtime'])).appendTo(row);
       // Action column
       var actionTd = $('<td>');
-
-      if(item.stack && item.stack.length > 0) {
-
-        var actionLink = $('<a>').text('Details');
-        actionLink.attr('href', '<%= request_details_path %>?request_id=' + item['request_id']);
-        actionLink.attr('target', '_blank');
-        actionLink.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);
 
       // Append the row to the table body

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

@@ -1,5 +1,6 @@
 <script>
 $(document).ready(function() {
+  limit = 1000
   var storedData = localStorage.getItem('builder_apm_requests');
   if (storedData) {
     var dataCompressed = decompress(storedData, function(result, error) {

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

@@ -40,7 +40,7 @@ $(document).ready(function() {
       var row = $('<tr>');
   
       $('<td>').text(new Date(item['start_time']).toLocaleString()).appendTo(row);
-      $('<td>').addClass('long_text').text(item['controller'] + '#' + item['action']).appendTo(row);
+      $('<td>').addClass('long_text').text(item['controller_action']).appendTo(row);
       $('<td>').text(item['method']).appendTo(row);
       $('<td>').text(item['status']).appendTo(row);
       $('<td>').append(renderDuration(item['duration'])).appendTo(row);
@@ -49,13 +49,12 @@ $(document).ready(function() {
       // Action column
       var actionTd = $('<td>');
 
-      if(item.stack && item.stack.length > 0) {
-
-        var actionLink = $('<a>').text('Details');
-        actionLink.attr('href', '<%= request_details_path %>?request_id=' + item['request_id']);
-        actionLink.attr('target', '_blank');
-        actionLink.appendTo(actionTd);
-      }
+      
+      var actionTd = $('<td>');
+      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);
 
       // Append the row to the table body

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

@@ -4,11 +4,11 @@
     <thead>
         <tr>
             <th class="sortable" data-field="start_time">Time</th>
-            <th class="sortable" data-field="controller">Controller#Action</th>
+            <th class="sortable" data-field="controller_action">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>
+            <th class="sortable" data-field="duration">Duration (ms)</th>
+            <th class="sortable" data-field="db_runtime">DB Runtime (ms)</th>
             <th class="sortable" data-field="view_runtime">View Runtime (ms)</th>
         </tr>
     </thead>

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

@@ -4,11 +4,11 @@
     <thead>
         <tr>
         <th class="sortable" data-field="start_time">Time</th>
-        <th class="sortable" data-field="controller">Controller#Action</th>
+        <th class="sortable" data-field="controller_action">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>
+        <th class="sortable" data-field="duration">Duration (ms)</th>
+        <th class="sortable" data-field="db_runtime">DB Runtime (ms)</th>
         <th class="sortable" data-field="view_runtime">View Runtime (ms)</th>
         </tr>
     </thead>

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

@@ -4,11 +4,11 @@
     <thead>
         <tr>
         <th class="sortable" data-field="start_time">Time</th>
-        <th class="sortable" data-field="controller">Controller#Action</th>
+        <th class="sortable" data-field="controller_action">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>
+        <th class="sortable" data-field="duration">Duration (ms)</th>
+        <th class="sortable" data-field="db_runtime">DB Runtime (ms)</th>
         <th class="sortable" data-field="view_runtime">View Runtime (ms)</th>
         </tr>
     </thead>

data/lib/builder_apm/middleware/timing.rb

@@ -8,9 +8,10 @@ module BuilderApm
 
       def call(env)
         request_id = env["action_dispatch.request_id"]
-        Thread.current["request_id"] = request_id
+        Thread.current[:request_id] = request_id
         Thread.current[:n_plus_one_duration] = 0
         Thread.current[:has_n_plus_one] = false
+        Thread.current[:db_runtime] = 0
         start_time = Time.now.to_f * 1000
 
         @status, @headers, @response = @app.call(env)
@@ -20,47 +21,99 @@ 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
+        clean_up_thread_values
 
         [@status, @headers, @response]
       end
 
       private
 
+      def clean_up_thread_values
+        Thread.current['request_data'] = nil
+        Thread.current[:request_id] = nil
+        Thread.current[:has_n_plus_one] = nil
+        Thread.current[:n_plus_one_duration] = nil
+        Thread.current[:db_runtime] = nil
+        Thread.current[:stack] = nil
+        Thread.current[:sql_event_id] = nil
+      end
+
       def handle_timing(start_time, end_time, request_id)
         duration = end_time - start_time;
         data = Thread.current['request_data']
 
         if data
+          data[:controller] = data[:controller].gsub("::", ":") if data[:controller]
           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[:calc_db_runtime] = Thread.current[:db_runtime]
           data[:real_duration_time] = end_time - start_time
           data[:stack][0][:start_time] = start_time
           data[:stack][0][:end_time] = end_time
           data[:stack][0][:duration] = end_time - start_time
           
-          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"
+          save_to_redis(data)
+        end
+      end
+
+      def save_to_redis(data)
+        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)
+            end_time = data[:real_end_time]
+            simplfied_data = table_data(data)
+            pipeline.zadd("builder_apm:dashboard", end_time, dashboard_data(data))
+            pipeline.zadd("builder_apm:timestamps", end_time, simplfied_data)
+            pipeline.zadd("builder_apm:errors", end_time, table_data_with_errors(data)) if data[:status] == 500
+            pipeline.zadd("builder_apm:n_plus_one", end_time, simplfied_data) if data[:has_n_plus_one]
+            pipeline.zadd("builder_apm:slow", end_time, simplfied_data) if data[:real_duration_time] > 1500
+            ttl = (2.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?"
+          Rails.logger.error e.message
+          Rails.logger.error e.backtrace
         end
       end
+
+      def dashboard_data(data)
+        JSON.dump({
+          start_time: data[:real_start_time],
+          duration: data[:real_duration_time],
+          db_runtime: data[:calc_db_runtime],
+          view_runtime: data[:view_runtime]
+        })
+      end
+
+      def table_data_with_errors(data)
+        tbl_data = table_data(data, false)
+
+        tbl_data[:exception_class] = data[:exception_class] || ""
+        tbl_data[:exception_message] = data[:exception_message] || ""
+        tbl_data[:exception_backtrace] = data[:exception_backtrace] || []
+        
+        JSON.dump(tbl_data)
+      end
+
+      def table_data(data, jsonify = true)
+        tbl_data = {
+          start_time: data[:real_start_time],
+          end_time: data[:real_end_time],
+          controller_action: "#{data[:controller]}##{data[:action]}",
+          method: data[:method],
+          status: data[:status],
+          duration: data[:real_duration_time],
+          db_runtime: data[:calc_db_runtime] > 0 ? data[:calc_db_runtime] : data[:db_runtime],
+          view_runtime: data[:view_runtime],
+          request_id: data[:request_id]
+        }
+        jsonify ? JSON.dump(tbl_data) : tbl_data
+      end
     end
   end
 end

data/lib/builder_apm/models/instrumenter.rb

@@ -19,7 +19,7 @@ module BuilderApm
         return if name == "SCHEMA" || Thread.current[:request_id].nil?
 
         triggering_line = determine_triggering_line(caller)
-
+        Thread.current[:db_runtime] += event.duration
         sql_query_data = build_sql_query_data(event, triggering_line)
         store_sql_query_data(sql_query_data)
       end

data/lib/builder_apm/version.rb

@@ -1,3 +1,3 @@
 module BuilderApm
-  VERSION = "0.3.2"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: builder_apm
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.1
 platform: ruby
 authors:
 - Paul Ketelle
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-07-26 00:00:00.000000000 Z
+date: 2023-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -53,11 +53,8 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
-- CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
-- LICENSE.txt
 - README.md
 - Rakefile
 - app/controllers/builder_apm/application_controller.rb
@@ -94,9 +91,6 @@ files:
 - app/views/builder_apm/wip/index.html.erb
 - bin/console
 - bin/setup
-- builder_apm-0.2.5.gem
-- builder_apm-0.3.0.gem
-- builder_apm-0.3.1.gem
 - builder_apm.gemspec
 - config/routes.rb
 - lib/builder_apm.rb

data/.travis.yml

@@ -1,6 +0,0 @@
----
-language: ruby
-cache: bundler
-rvm:
-  - 2.7.2
-before_install: gem install bundler -v 2.1.4

data/CODE_OF_CONDUCT.md

@@ -1,74 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, gender identity and expression, level of experience,
-nationality, personal appearance, race, religion, or sexual identity and
-orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
-advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at TODO: Write your email address. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at [https://contributor-covenant.org/version/1/4][version]
-
-[homepage]: https://contributor-covenant.org
-[version]: https://contributor-covenant.org/version/1/4/

data/LICENSE.txt

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2023 TODO: Write your name
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.