builder_apm 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31a9a4393e090f4980960c61d6f5cb2cf307a352534b9f8f264c2238dcd281f4
-  data.tar.gz: a01935162ea2b1fa2701a080536aadc6259c3a9c102148ef1df4475ddd7a89de
+  metadata.gz: 8c694ae0d5543f44bb905abf9456e8768e3ae547bd99066fe0012f12e11aa89f
+  data.tar.gz: 1df6c105dbe848d600f1ae5197a64c2fe2816584072d4fb82ee69850dc6f61d6
 SHA512:
-  metadata.gz: 61269a7ae1127eebfbdec316e015e64e6e0a76b23d81433c1a2569f4ccfabbebccc289d4f5588dfa46ac100d33dd5269fdc6e37208167598cdee7e6066ec35d5
-  data.tar.gz: 3736371f1c53590cf7e811c19fa7262e70470f50207d414087a08967bd3cdc7375f93a9256906df7ce44bb10aa14b887045da11144791169ca6a861cf19e02c3
+  metadata.gz: 21f191411ce9106d7db006b92dc12ffd72efa414f62730f42bb26cdacc77ac0f841d9cabb2be482128ce3577ea9f67f5eadf8421c7ed6d0a826ab924cb40ef35
+  data.tar.gz: fcc1962c887a01e84cca5b1a7afa1deced47ef7ffcadefe2d26db6126f56c9bc99b7d0b52b9e65296ccf5a4af01bd6c131d043d50c370990364c37d6e0733637

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

@@ -47,13 +47,14 @@ $(document).ready(function() {
       $('<td>').append(renderDuration(item['view_runtime'])).appendTo(row);
       // 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);
+
+      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);
+      }
       actionTd.appendTo(row);
 
       // Append the row to the table body

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

@@ -48,13 +48,14 @@ $(document).ready(function() {
       $('<td>').append(renderDuration(item['view_runtime'])).appendTo(row);
       // 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);
+
+      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);
+      }
       actionTd.appendTo(row);
 
       // Append the row to the table body

data/lib/builder_apm/controllers/instrumenter.rb

@@ -15,10 +15,11 @@ module BuilderApm
       end
 
       def process_start(event)
-        return if event.payload[:controller].nil? || event.payload[:controller].start_with?("BuilderApm::")
+        return if event.payload[:controller].nil? # || event.payload[:controller].start_with?("BuilderApm::")
 
         uuid = event.payload[:headers].env['action_dispatch.request_id']
         Thread.current[:request_id] = uuid
+        Thread.current[:stack] = [setup_controller_stack_data(event)]
       end
 
       def process_action(event)
@@ -32,6 +33,21 @@ module BuilderApm
 
       private
 
+      def setup_controller_stack_data(event)
+        controller = event.payload[:controller]
+        method_id = "#{controller.constantize}##{event.payload[:action]}"
+        method_line = file_and_line_number(event.payload[:controller], event.payload[:action])
+
+        { 
+          method: method_id, 
+          method_line: "#{method_line}",
+          triggering_line: "", 
+          children: [], 
+          start_time: Time.now.to_f * 1000,
+          sql_events: [] 
+        }
+      end
+
       def event_from_args(*args)
         data = args.extract_options!
         ActiveSupport::Notifications::Event.new(*args, data)

data/lib/builder_apm/methods/instrumenter.rb

@@ -23,7 +23,7 @@ module BuilderApm
       end
 
       def valid_trace_point?(tp)
-        !Thread.current[:request_id].nil? && tp.path.start_with?(@root_path)
+        !Thread.current[:request_id].nil? && tp.path.start_with?(@root_path) && !tp.path.include?('controller.rb')
       end
 
       def process_trace_point(tp)

data/lib/builder_apm/middleware/timing.rb

@@ -39,7 +39,10 @@ module BuilderApm
           data[:real_start_time] = start_time 
           data[:real_end_time] = end_time
           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)

data/lib/builder_apm/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: builder_apm
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - Paul Ketelle
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-07-25 00:00:00.000000000 Z
+date: 2023-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -94,6 +94,9 @@ 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