callstacking-rails 0.1.7 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed3689618ba8c79a4e68ef71d183808203dbcd54ebb4d98cd4f74f07fe2e9c7f
-  data.tar.gz: a9b8a058145e28eec5dbaf4522e43f45fc2ef3d0f1d60dd06539b41c13095062
+  metadata.gz: 4f67350370703c3ea1b201b22a4c2b15a5c5aaaedd4eab966a1889a0304385be
+  data.tar.gz: 6a52911f3d66c1304b12ea7c64431cd0d30130467e037012a03af5969148a923
 SHA512:
-  metadata.gz: 0a9ea07390a3f8bd9405d00816374441ae4f18beaf0bd11e722a798c165f14e3b30dedfbf03417ba4fcf4ab68797fdee37131a91408aa0091756da11d807577c
-  data.tar.gz: f814601902c3ce54a5a9d4b5eeebe0c24ad5569511a61c4e0ea39bd897825584d3a4569149e7aaf429302dec03dd185bba197a1dc75221d33e0992e5919bf276
+  metadata.gz: 1ad22901a06353e8e2ec5bbb9640dca50b64b0f6076836f2adac28a72b12ab7c94d972d02d1b88a503d8e9b258ffa70c5df6566f8ecdc4e81631f34160432095
+  data.tar.gz: bf99ed23d5f2bed6228c7f39bc80db8201f5abb2990ef3f1b0c32774a25c072ef1b3a9baaa32406d771afcb6888b0bb15d778af4be4cee0ae279419452c31322

data/lib/callstacking/rails/client/trace.rb

@@ -21,7 +21,11 @@ module Callstacking
                         p: params.to_h,
                       })
 
-          return resp.body["trace_id"], resp.body["pulse_interval"]
+          if resp.status == 200
+            return resp.body["trace_id"], resp.body["pulse_interval"], resp.body["max_trace_entries"]
+          end
+
+          nil
         end
 
         def upsert(trace_id, traces)

data/lib/callstacking/rails/env.rb

@@ -3,7 +3,7 @@ require "active_support/inflector"
 module Callstacking
   module Rails
     class Env
-      DEFAULT_ENVIRONMENT = "development"
+      DEFAULT_ENVIRONMENT = 'development'.freeze
 
       cattr_accessor :environment
 

data/lib/callstacking/rails/instrument.rb

@@ -48,7 +48,8 @@ module Callstacking
       end
 
       def find_or_initialize_module
-        return if klass&.name == nil
+        name = klass&.name rescue nil
+        return if name.nil?
 
         module_name = "#{klass.name.gsub('::', '')}Span"
         module_index = klass.ancestors.map(&:to_s).index(module_name)

data/lib/callstacking/rails/setup.rb

@@ -20,6 +20,9 @@ module Callstacking
       end
 
       def start
+        puts "Login to callstacking.com"
+        puts
+        
         email      = prompt("Enter email:")
         password   = prompt("Enter password:")
 

data/lib/callstacking/rails/trace.rb

@@ -25,20 +25,12 @@ module Callstacking
         read_settings
 
         trace_id = nil
+        max_trace_entries = nil
 
         ActiveSupport::Notifications.subscribe("start_processing.action_controller") do |name, start, finish, id, payload|
-          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,
-                                              request_id, payload[:headers],
-                                              payload[:params])
-
-          puts "#{settings[:url] || Callstacking::Rails::Settings::PRODUCTION_URL}/traces/#{trace_id}"
-          
-          create_message(start_request_message(payload), spans.increment_order_num, @traces)
+          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])
         end
 
         @spans.on_call_entry do |nesting_level, order_num, klass, method_name, arguments, path, line_no|
@@ -50,19 +42,20 @@ module Callstacking
         end
 
         ActiveSupport::Notifications.subscribe("process_action.action_controller") do |name, start, finish, id, payload|
-          create_message(completed_request_message(payload), spans.increment_order_num, @traces)
-          send_traces!(trace_id, @traces)
+          complete_request(payload[:method], payload[:controller],
+                           payload[:action], payload[:format],
+                           trace_id, max_trace_entries)
         end
       end
 
       private
 
-      def completed_request_message(payload)
-        "Completed request: #{payload[:method]} #{payload[:controller]}##{payload[:action]} as #{payload[:format]}"
+      def completed_request_message(method, controller, action, format)
+        "Completed request: #{method} #{controller}##{action} as #{format}"
       end
 
-      def start_request_message(payload)
-        "Started request: #{payload[:method]} #{payload[:controller]}##{payload[:action]} as #{payload[:format]}"
+      def start_request_message(method, controller, action, format)
+        "Started request: #{method} #{controller}##{action} as #{format}"
       end
 
       def create_call_return(coupled_callee, nesting_level, order_num, klass, method_name, path, line_no, return_val, traces)
@@ -76,7 +69,7 @@ module Callstacking
                                        line_number: line_no,
                                        path: path,
                                        method_name: method_name,
-                                       return_value: return_val.inspect,
+                                       return_value: return_value(return_val),
                                        coupled_callee: coupled_callee,
                                      } } }
         end
@@ -116,8 +109,40 @@ module Callstacking
           traces.clear
         end
       end
+      def start_request(request_id, method, controller, action, format, path, original_url, headers, params)
+        request_id = request_id || SecureRandom.uuid
+        Callstacking::Rails::Trace.current_request_id = request_id
+
+        trace_id, _interval, max_trace_entries = client.create(method, controller, action, format,
+                                                               path, original_url, request_id, headers,
+                                                               params)
+
+        puts "#{settings[:url] || Callstacking::Rails::Settings::PRODUCTION_URL}/traces/#{trace_id}"
+
+        create_message(start_request_message(method, controller, action, format),
+                       spans.increment_order_num, @traces)
+
+        return trace_id, max_trace_entries
+      end
+
+      def complete_request(method, controller, action, format, trace_id, max_trace_entries)
+        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 return_value(return_val)
+        return_val.inspect
+      rescue ThreadError
+        # deadlock; recursive locking (ThreadError)
+        # Discourse overrides ActiveSupport::Inflector methods via lib/freedom_patches/inflector_backport.rb
+        # when return_value.inspect is called, it triggers a subsequent call
+        # to the instrumented inflector method, causing another call to mutex#synchronize
+        # from the block of the first synchronize call
+
+        return_val.to_s rescue "****"  # Can't evaluate
+      end
 
-      private
       def klass_name(klass)
         (klass.is_a?(Class) ? klass.name : klass.class.name)
       end

data/lib/callstacking/rails/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: callstacking-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.9
 platform: ruby
 authors:
 - Jim Jones
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-01-11 00:00:00.000000000 Z
+date: 2023-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -28,22 +28,16 @@ dependencies:
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: faraday-follow_redirects
   requirement: !ruby/object:Gem::Requirement