builder_apm 0.5.3 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d4bce6745bf405a2373b99d571aed8e87ece7c99fd6041bfc2ce8965d3583e4
-  data.tar.gz: '0812e1ac70543838da93f3c586a1eae82801387cf9fb1735f0636b919a92690b'
+  metadata.gz: d92ead706d6d43ec760d3aa3013f130be9a6cf096282b194324c3563cd945a65
+  data.tar.gz: 05ba3ed9fbe3bf2dc505511087627b81ed5d4b6d3f441f103d84ef76ae8305f2
 SHA512:
-  metadata.gz: ac4ea9b284511b3e4e0e6639099b178d47b30839bbdfa3b686d8a09fd551338540a76940013665ec53c0b3e7f694c06f64cf48b78696085a903e1527cdd6cd9b
-  data.tar.gz: '0608598b9404aea84e2d6ed6fa63bce8cf4d4b1f8454b4c77ceb69765947af7b2064742b2f95bf37179f291da3e69ab88d57bd86c11dc712fbb7aea349258d45'
+  metadata.gz: d27c722cc27f63d497157fff8cdec589136b68f8ab18bbbd8fa0e7d9e13e4e9dc96b39656c6e717ab87158b700ada76beda0b192e6c2f5dfa224654c833cd4c3
+  data.tar.gz: bee94e64a77c9a7fb9a2d7ea08d8d711eac7d9d73fb08f8a66a798e8669ce8594d753292468e22139716b0718e53d2ded6b13831fff203efe75fa2b0e20135bd

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

@@ -346,6 +346,7 @@
 
                 // Check if results are more than 50
                 if (item.record_count > 50) {
+                    resultsSpan.append('🚨');
                     resultsSpan.addClass('highlight-results').attr('title', "This is a large number of results. Review if this can be paginated or limited.");
                 }
 

data/lib/builder_apm/controllers/instrumenter.rb

@@ -20,6 +20,8 @@ module BuilderApm
         uuid = event.payload[:headers].env['action_dispatch.request_id']
         Thread.current[:request_id] = uuid
         Thread.current[:stack] = [setup_controller_stack_data(event)]
+        Thread.current[:method_tracing] = 0
+        Thread.current[:db_tracing] = 0
       end
 
       def process_action(event)

data/lib/builder_apm/methods/instrumenter.rb

@@ -28,74 +28,51 @@ module BuilderApm
       end
 
       def valid_trace_point?(tp)
-        Thread.current[:request_id] && not_controller_endpoint(tp) && valid_gem_path(tp)
-      end
-
-      def not_controller_endpoint(tp)
-        start_controller = Thread.current[:stack]&.first || nil
-
-        return false unless start_controller
-
-        "#{tp.defined_class}##{tp.method_id}" != start_controller[:method]
-      end
-
-      def valid_gem_path(tp)
-        return true if tp.path.start_with?(@root_path)
-        return false if tp.path.start_with?(@this_gem_path)
-        return false if gems_to_track.empty?
-
-        gems_to_track.any? { |gem| tp.path.include?(File::SEPARATOR + gem) }
+        return false unless Thread.current[:request_id]
+        return false unless tp.path.start_with?(@root_path)
+
+        start_controller = Thread.current[:stack]&.first
+        start_controller && "#{tp.defined_class}##{tp.method_id}" == start_controller[:method]
+      
+        # gems_to_track = BuilderApm.configuration.gems_to_track
+        # gems_to_track.any? { |gem| tp.path.include?(File::SEPARATOR + gem) }
       end
 
       def process_trace_point(tp)
         if tp.event == :call || tp.event == :b_call || tp.event == :c_call
-          process_call_event(tp)
+          method_id = "#{tp.defined_class}##{tp.method_id}"
+          (@call_times[method_id]||= []) << Process.clock_gettime(Process::CLOCK_MONOTONIC)
+          caller_info = caller_locations(4,1).first
+          calling_file_path = caller_info.absolute_path
+          calling_line_number = caller_info.lineno
+  
+          method_call = { 
+            method: method_id, 
+            method_line: "#{tp.path.gsub(@root_path, '')}:#{tp.lineno}",
+            triggering_line: "#{calling_file_path.gsub(@root_path, '')}:#{calling_line_number}", 
+            children: [], 
+            start_time: Time.now.to_f * 1000, 
+            sql_events: [] 
+          }
+  
+          (Thread.current[:stack] ||= []).push(method_call)
         else
-          process_return_event(tp)
-        end
-      end
-
-      private
-
-      def gems_to_track
-        @gems_to_track = BuilderApm.configuration.gems_to_track
-      end
-
-      def process_call_event(tp)
-        method_id = "#{tp.defined_class}##{tp.method_id}"
-        (@call_times[method_id]||= []) << Process.clock_gettime(Process::CLOCK_MONOTONIC)
-        caller_info = caller_locations(4,1).first
-        calling_file_path = caller_info.absolute_path
-        calling_line_number = caller_info.lineno
-
-        method_call = { 
-          method: method_id, 
-          method_line: "#{tp.path.gsub(@root_path, '')}:#{tp.lineno}",
-          triggering_line: "#{calling_file_path.gsub(@root_path, '')}:#{calling_line_number}", 
-          children: [], 
-          start_time: Time.now.to_f * 1000, 
-          sql_events: [] 
-        }
-
-        (Thread.current[:stack] ||= []).push(method_call)
-      end
-
-      def process_return_event(tp)
-        method_id = "#{tp.defined_class}##{tp.method_id}"
-        
-        if @call_times.key?(method_id)
-          elapsed_time = Process.clock_gettime(Process::CLOCK_MONOTONIC) - @call_times[method_id].pop
-          elapsed_time_in_ms = (elapsed_time * 1000).round(3)
-          @call_times.delete(method_id)
-
-          method_call = (Thread.current[:stack] ||= []).pop
-          method_call[:end_time] = Time.now.to_f * 1000
-          method_call[:duration] = elapsed_time_in_ms
-
-          if Thread.current[:stack]&.any?
-            Thread.current[:stack].last[:children].push(method_call) 
-          else 
-            Thread.current[:stack].push(method_call) 
+          method_id = "#{tp.defined_class}##{tp.method_id}"
+          
+          if @call_times.key?(method_id)
+            elapsed_time = Process.clock_gettime(Process::CLOCK_MONOTONIC) - @call_times[method_id].pop
+            elapsed_time_in_ms = (elapsed_time * 1000).round(3)
+            @call_times.delete(method_id)
+  
+            method_call = (Thread.current[:stack] ||= []).pop
+            method_call[:end_time] = Time.now.to_f * 1000
+            method_call[:duration] = elapsed_time_in_ms
+  
+            if Thread.current[:stack]&.any?
+              Thread.current[:stack].last[:children].push(method_call) 
+            else 
+              Thread.current[:stack].push(method_call) 
+            end
           end
         end
       end

data/lib/builder_apm/middleware/timing.rb

@@ -7,6 +7,7 @@ module BuilderApm
       end
 
       def call(env)
+        start_time = Time.now.to_f * 1000
         request_id = env["action_dispatch.request_id"]
         Thread.current[:request_id] = request_id
         Thread.current[:n_plus_one_duration] = 0
@@ -14,7 +15,6 @@ module BuilderApm
         Thread.current[:db_runtime] = 0
         Thread.current[:method_tracing] = 0
         Thread.current[:db_tracing] = 0
-        start_time = Time.now.to_f * 1000
 
         @status, @headers, @response = @app.call(env)
 

data/lib/builder_apm/version.rb

@@ -1,3 +1,3 @@
 module BuilderApm
-  VERSION = "0.5.3"
+  VERSION = "0.5.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: builder_apm
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.6
 platform: ruby
 authors:
 - Paul Ketelle
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-09-20 00:00:00.000000000 Z
+date: 2023-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails