callstacking-rails 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae9342c9f37c47dde2042523854b08bbc9c7f94ce3f4fec32b3ecde123b62603
-  data.tar.gz: 500efff1f6650199ebea44d1964248758244caf8a0e1c0b40da98194d5797c22
+  metadata.gz: ba4839162aee95292d54812c4c9f86be937f9ff13a5765197c34a371c21940a7
+  data.tar.gz: 56518b971c4fac333b0c2c5e645bdc92c580ff426fb62f4f72460bc2e3a95cd7
 SHA512:
-  metadata.gz: 330b4e4dbe4eb13c09708e661963e130d9f164389b1ab0911b90cd89b5c2d37de9e41dd8bfcae60f5cccfa64eb9f013ed34fc1ffd0248778df4f334cf4eea8ef
-  data.tar.gz: 2e5219f83a3fdf775daf72d79708a49f7b76707b596508a424837b688a450d4d52c140456af6ec524ffbf6968e0e1db3d7a8b86b2619adc3a2450d0f3ce57ced
+  metadata.gz: 276072fc8c408926760d2cae1949ec24ce0ebcd0b4afda094a0132761db1b127dfae00900e9c50de1a0a1af697068effe1b84b922336a2de9f25a15db5753785
+  data.tar.gz: 53ab41b4aae0ce86466561a3381746b8853697f7927398e938604e95e4e17297ebbce6958e3e7f4be965a79c9ad488a89c7f18e21482511d2350d399a0394a9a

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

@@ -26,7 +26,7 @@ module Callstacking
                     tmp_module.instance_methods.include?(method_name) ||
                     tmp_module.singleton_methods.include?(method_name)
 
-        tmp_module.define_method(method_name) do |*args, &block|
+        tmp_module.define_method(method_name) do |*args, **kwargs, &block|
           method_name = __method__
 
           path = method(__method__).super_method.source_location.first
@@ -40,7 +40,7 @@ module Callstacking
           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)
+          return_val = super(*args, **kwargs, &block)
           spans.call_return(klass, method_name, p || path, l || line_no, return_val)
 
           return_val

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

@@ -27,18 +27,9 @@ module Callstacking
         trace_id = 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 = 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 +41,18 @@ 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)
         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)
@@ -81,7 +71,6 @@ module Callstacking
                                      } } }
         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',
@@ -116,8 +105,28 @@ 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 = 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)
+
+        trace_id
+      end
+
+      def complete_request(method, controller, action, format, trace_id)
+        create_message(completed_request_message(method, controller, action, format),
+                       spans.increment_order_num, @traces)
+        send_traces!(trace_id, @traces)
+      end
 
-      private
       def klass_name(klass)
         (klass.is_a?(Class) ? klass.name : klass.class.name)
       end

data/lib/callstacking/rails/traces_helper.rb

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

data/lib/callstacking/rails/version.rb

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

metadata

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