callstacking-rails 0.1.9 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f67350370703c3ea1b201b22a4c2b15a5c5aaaedd4eab966a1889a0304385be
-  data.tar.gz: 6a52911f3d66c1304b12ea7c64431cd0d30130467e037012a03af5969148a923
+  metadata.gz: 0c21978f17a516a2b6939fc4651bc1bd53ecec1ab12cee52f6c1fb20be5cca42
+  data.tar.gz: 92f446f93cd97b89124d02886a0f4816627204231bc4500428b9416829b06f23
 SHA512:
-  metadata.gz: 1ad22901a06353e8e2ec5bbb9640dca50b64b0f6076836f2adac28a72b12ab7c94d972d02d1b88a503d8e9b258ffa70c5df6566f8ecdc4e81631f34160432095
-  data.tar.gz: bf99ed23d5f2bed6228c7f39bc80db8201f5abb2990ef3f1b0c32774a25c072ef1b3a9baaa32406d771afcb6888b0bb15d778af4be4cee0ae279419452c31322
+  metadata.gz: 3b22c2b9aa191a601dc324488ae02f89759a048c5289d14438db9e99fd69f81e938eb48a24eeffb6605db4ab7b47e0eb62c061829fedf1cbd59e0ee15e00ecf0
+  data.tar.gz: 1114ce3c87cce5353081f21d14683758a676844d3c1f05a1cea9c53df69e1e471e3ab18778ec5473fcfaeb03a981aed4ba1848b7211707b0a12da35ee6788c7b

data/lib/callstacking/rails/instrument.rb

@@ -20,6 +20,8 @@ module Callstacking
         # Application level method definitions
         return unless method_path =~ root if application_level
 
+        return if method_path =~ /initializer/i
+
         tmp_module = find_or_initialize_module
 
         return if tmp_module.nil? ||

data/lib/callstacking/rails/trace.rb

@@ -29,8 +29,9 @@ module Callstacking
 
         ActiveSupport::Notifications.subscribe("start_processing.action_controller") do |name, start, finish, id, payload|
           trace_id, max_trace_entries = start_request(payload[:request]&.request_id, payload[:method], payload[:controller],
-                                                       payload[:action], payload[:format], ::Rails.root,
-                                                       payload[:original_url], payload[:headers], payload[:params])
+                                                      payload[:action], payload[:format], ::Rails.root,
+                                                      payload[:request]&.original_url,
+                                                      payload[:headers], payload[:params])
         end
 
         @spans.on_call_entry do |nesting_level, order_num, klass, method_name, arguments, path, line_no|
@@ -44,6 +45,7 @@ module Callstacking
         ActiveSupport::Notifications.subscribe("process_action.action_controller") do |name, start, finish, id, payload|
           complete_request(payload[:method], payload[:controller],
                            payload[:action], payload[:format],
+                           payload[:request]&.original_url,
                            trace_id, max_trace_entries)
         end
       end
@@ -60,44 +62,55 @@ module Callstacking
 
       def create_call_return(coupled_callee, nesting_level, order_num, klass, method_name, path, line_no, return_val, traces)
         lock.synchronize do
-          traces << { trace_entry: { trace_entryable_type: 'TraceCallReturn',
-                                     order_num: order_num,
-                                     nesting_level: nesting_level,
-                                     trace_entryable_attributes: {
-                                       local_variables: {},
-                                       klass: klass_name(klass),
-                                       line_number: line_no,
-                                       path: path,
-                                       method_name: method_name,
-                                       return_value: return_value(return_val),
-                                       coupled_callee: coupled_callee,
-                                     } } }
+          traces << { type: 'TraceCallReturn',
+                      order_num: order_num,
+                      nesting_level: nesting_level,
+                      local_variables: {},
+                      args: {},
+                      klass: klass_name(klass),
+                      line_number: line_no,
+                      path: path,
+                      method_name: method_name,
+                      return_value: return_value(return_val),
+                      coupled_callee: coupled_callee,
+                      message: nil,
+          }
         end
       end
 
       def create_call_entry(nesting_level, order_num, klass, method_name, arguments, path, line_no, traces)
         lock.synchronize do
-          traces << { trace_entry: { trace_entryable_type: 'TraceCallEntry',
-                                     order_num: order_num,
-                                     nesting_level: nesting_level,
-                                     trace_entryable_attributes: {
-                                       args: arguments,
-                                       klass: klass_name(klass),
-                                       line_number: line_no,
-                                       path: path,
-                                       method_name: method_name,
-                                     } } }
+          traces << { type: 'TraceCallEntry',
+                      order_num: order_num,
+                      nesting_level: nesting_level,
+                      args: arguments,
+                      klass: klass_name(klass),
+                      line_number: line_no,
+                      path: path,
+                      method_name: method_name,
+                      return_value: nil,
+                      coupled_callee: nil,
+                      local_variables: {},
+                      message: nil,
+          }
         end
       end
 
       def create_message(message, order_num, traces)
         lock.synchronize do
-          traces << { trace_entry: { trace_entryable_type: 'TraceMessage',
-                                     order_num: order_num,
-                                     nesting_level: 0,
-                                     trace_entryable_attributes: {
-                                       message: message
-                                     } } }
+          traces << { type: 'TraceMessage',
+                      order_num: order_num,
+                      nesting_level: 0,
+                      message: message,
+                      args: {},
+                      klass: nil,
+                      line_number: nil,
+                      path: nil,
+                      method_name: nil,
+                      return_value: nil,
+                      coupled_callee: false,
+                      local_variables: {},
+          }
         end
       end
 
@@ -105,11 +118,13 @@ module Callstacking
         lock.synchronize do
           return if traces.empty?
 
-          client.upsert(trace_id, { traces: traces })
+          client.upsert(trace_id, { trace_entries: traces })
           traces.clear
         end
       end
       def start_request(request_id, method, controller, action, format, path, original_url, headers, params)
+        return if do_not_track_request?(original_url)
+        
         request_id = request_id || SecureRandom.uuid
         Callstacking::Rails::Trace.current_request_id = request_id
 
@@ -125,12 +140,26 @@ module Callstacking
         return trace_id, max_trace_entries
       end
 
-      def complete_request(method, controller, action, format, trace_id, max_trace_entries)
+      def complete_request(method, controller, action, format, original_url, trace_id, max_trace_entries)
+        if do_not_track_request?(original_url)
+          traces.clear
+          return
+        end
+
         create_message(completed_request_message(method, controller, action, format),
                        spans.increment_order_num, @traces)
+
         send_traces!(trace_id, @traces[0..max_trace_entries])
       end
 
+      def track_request?(url)
+        !(track_request?(url))
+      end
+
+      def do_not_track_request?(url)
+        url =~ /(\/stylesheets\/|\/javascripts\/|\/css\/|\/js\/|\.js|\.css)/i
+      end
+
       def return_value(return_val)
         return_val.inspect
       rescue ThreadError

data/lib/callstacking/rails/version.rb

@@ -1,5 +1,5 @@
 module Callstacking
   module Rails
-    VERSION = "0.1.9"
+    VERSION = "0.1.11"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: callstacking-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.11
 platform: ruby
 authors:
 - Jim Jones
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-01-19 00:00:00.000000000 Z
+date: 2023-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails