callstacking-rails 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3397c14c7a14f028756a51f652b3c910974fe7f73f26669f309f7ace8d10a0b1
-  data.tar.gz: be23e85bec36e314527a3bef6908812f4d5245ef1100ed6ddaa33d2cd80d6d6b
+  metadata.gz: ae9342c9f37c47dde2042523854b08bbc9c7f94ce3f4fec32b3ecde123b62603
+  data.tar.gz: 500efff1f6650199ebea44d1964248758244caf8a0e1c0b40da98194d5797c22
 SHA512:
-  metadata.gz: 102bf82f29d0bcbc02440d9511a07673e26a6af5aa574135e2d393878422d76509648ef32a2abf029ec0c2627714f184baf95b82c21a6731c9278910e3a60a03
-  data.tar.gz: '0588d83e51ecaac9a2e3b2c5cfb4d390609a02365adbda31d77882ee8ded2e1552b9d3c26dac4870b89da7202b0502cbb7fe1deb1f79ee52450f7f0159952f08'
+  metadata.gz: 330b4e4dbe4eb13c09708e661963e130d9f164389b1ab0911b90cd89b5c2d37de9e41dd8bfcae60f5cccfa64eb9f013ed34fc1ffd0248778df4f334cf4eea8ef
+  data.tar.gz: 2e5219f83a3fdf775daf72d79708a49f7b76707b596508a424837b688a450d4d52c140456af6ec524ffbf6968e0e1db3d7a8b86b2619adc3a2450d0f3ce57ced

data/lib/callstacking/rails/engine.rb

@@ -27,7 +27,6 @@ module Callstacking
 
       initializer 'local_helper.action_controller' do
         ActiveSupport.on_load :action_controller do
-          helper Callstacking::Rails::TracesHelper
           include Callstacking::Rails::TracesHelper
         end
 

data/lib/callstacking/rails/instrument.rb

@@ -22,7 +22,8 @@ module Callstacking
 
         tmp_module = find_or_initialize_module
 
-        return if tmp_module.instance_methods.include?(method_name) ||
+        return if tmp_module.nil? ||
+                    tmp_module.instance_methods.include?(method_name) ||
                     tmp_module.singleton_methods.include?(method_name)
 
         tmp_module.define_method(method_name) do |*args, &block|
@@ -37,7 +38,7 @@ module Callstacking
           klass = tmp_module.instance_variable_get(:@klass)
 
           arguments = Callstacking::Rails::Instrument.arguments_for(method(__method__).super_method, args)
-          
+
           spans.call_entry(klass, method_name, arguments, p || path, l || line_no)
           return_val = super(*args, &block)
           spans.call_return(klass, method_name, p || path, l || line_no, return_val)
@@ -47,6 +48,8 @@ module Callstacking
       end
 
       def find_or_initialize_module
+        return if klass&.name == nil
+
         module_name = "#{klass.name.gsub('::', '')}Span"
         module_index = klass.ancestors.map(&:to_s).index(module_name)
 
@@ -74,10 +77,14 @@ module Callstacking
         param_names = m.parameters&.map(&:last)
         return {} if param_names.nil?
 
-        param_names.map.with_index do |param, index|
+        h = param_names.map.with_index do |param, index|
           next if [:&, :*, :**].include?(param)
           [param, args[index]]
         end.compact.to_h
+
+        filter = ::Rails.application.config.filter_parameters
+        f = ActiveSupport::ParameterFilter.new filter
+        f.filter h
       end
 
       private

data/lib/callstacking/rails/settings.rb

@@ -23,7 +23,7 @@ module Callstacking
       end
 
       def auth_token?
-        auth_token.present?
+        !auth_token.nil?
       end
 
       def write_settings(new_settings)
@@ -31,6 +31,7 @@ module Callstacking
       end
 
       def enabled?
+        return false if settings.nil?
         settings[:enabled]
       end
 

data/lib/callstacking/rails/trace.rb

@@ -27,12 +27,12 @@ module Callstacking
         trace_id = nil
 
         ActiveSupport::Notifications.subscribe("start_processing.action_controller") do |name, start, finish, id, payload|
-          request_id = payload[:request].request_id
+          request_id = payload[:request]&.request_id || SecureRandom.uuid
           Callstacking::Rails::Trace.current_request_id = request_id
 
           trace_id, _interval = client.create(payload[:method], payload[:controller],
                                               payload[:action], payload[:format],
-                                              ::Rails.root, payload[:request].original_url,
+                                              ::Rails.root, payload[:request]&.original_url,
                                               request_id, payload[:headers],
                                               payload[:params])
 

data/lib/callstacking/rails/traces_helper.rb

@@ -46,6 +46,8 @@ module Callstacking
       end
 
       def inject_hud
+        return unless enabled?
+        
         response.body = response.body.sub(/<\/body>/i, "#{hud}</body>")
       end
     end

data/lib/callstacking/rails/version.rb

@@ -1,5 +1,5 @@
 module Callstacking
   module Rails
-    VERSION = "0.1.5"
+    VERSION = "0.1.6"
   end
 end

metadata

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