callstacking-rails 0.1.11 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c21978f17a516a2b6939fc4651bc1bd53ecec1ab12cee52f6c1fb20be5cca42
-  data.tar.gz: 92f446f93cd97b89124d02886a0f4816627204231bc4500428b9416829b06f23
+  metadata.gz: 5d44334293141ed52816f662a764b60a880c6a8942ad0803dc365b5eaa7bcec6
+  data.tar.gz: 979b68d010c25055b21ba482165a64b850f6b9eefb1cdb1445192cd6e1afbc70
 SHA512:
-  metadata.gz: 3b22c2b9aa191a601dc324488ae02f89759a048c5289d14438db9e99fd69f81e938eb48a24eeffb6605db4ab7b47e0eb62c061829fedf1cbd59e0ee15e00ecf0
-  data.tar.gz: 1114ce3c87cce5353081f21d14683758a676844d3c1f05a1cea9c53df69e1e471e3ab18778ec5473fcfaeb03a981aed4ba1848b7211707b0a12da35ee6788c7b
+  metadata.gz: 997f19b2eda526ea52667967af3712605a3e7caf6daa1ceb40957e905d68dcad62cdfac50f02094838bd75b5108f1788d166600d997796d4de61cb4dcd0107fb
+  data.tar.gz: 45095a4346af6d99208e0e089f492d29d9d21196a13ef63570ad2d7403c6dd1ea3db2412db99aa8d3d0a0009144f0873cb9312ac092e6969afa49dcf4104d1ea

data/exe/callstacking-rails

@@ -17,7 +17,7 @@ read_settings
 
 case action
   when 'register'
-    `open #{settings.url || Callstacking::Rails::Settings::PRODUCTION_URL}/users/sign_up`
+    `open #{settings[:url] || Callstacking::Rails::Settings::PRODUCTION_URL}/users/sign_up`
 
   when 'setup'
     Callstacking::Rails::Setup.new.start

data/lib/callstacking/rails/engine.rb

@@ -16,7 +16,7 @@ module Callstacking
       include Settings
       isolate_namespace Callstacking::Rails
 
-      read_settings
+      read_settingsx
 
       spans = Spans.new
       trace = Trace.new(spans)

data/lib/callstacking/rails/instrument.rb

@@ -28,25 +28,52 @@ module Callstacking
                     tmp_module.instance_methods.include?(method_name) ||
                     tmp_module.singleton_methods.include?(method_name)
 
-        tmp_module.define_method(method_name) do |*args, **kwargs, &block|
-          method_name = __method__
+        new_method = nil
+        if RUBY_VERSION < "2.7.8"
+          new_method = tmp_module.define_method(method_name) do |*args, &block|
+            method_name = __method__
 
-          path = method(__method__).super_method.source_location.first
-          line_no = method(__method__).super_method.source_location.last
+            path = method(__method__).super_method.source_location.first
+            line_no = method(__method__).super_method.source_location.last
 
-          p, l = caller.find { |c| c.to_s =~ /#{::Rails.root.to_s}/}&.split(':')
+            p, l = caller.find { |c| c.to_s =~ /#{::Rails.root.to_s}/}&.split(':')
 
-          spans = tmp_module.instance_variable_get(:@spans)
-          klass = tmp_module.instance_variable_get(:@klass)
+            spans = tmp_module.instance_variable_get(:@spans)
+            klass = tmp_module.instance_variable_get(:@klass)
 
-          arguments = Callstacking::Rails::Instrument.arguments_for(method(__method__).super_method, args)
+            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, **kwargs, &block)
-          spans.call_return(klass, method_name, p || path, l || line_no, return_val)
+            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)
+
+            return_val
+          end
+          new_method.ruby2_keywords if new_method.respond_to?(:ruby2_keywords)
+        else
+          new_method = tmp_module.define_method(method_name) do |*args, **kwargs, &block|
+            method_name = __method__
+
+            path = method(__method__).super_method.source_location.first
+            line_no = method(__method__).super_method.source_location.last
+
+            p, l = caller.find { |c| c.to_s =~ /#{::Rails.root.to_s}/}&.split(':')
+
+            spans = tmp_module.instance_variable_get(:@spans)
+            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, **kwargs, &block)
+            spans.call_return(klass, method_name, p || path, l || line_no, return_val)
+
+            return_val
+          end
 
-          return_val
         end
+
+        new_method
       end
 
       def find_or_initialize_module

data/lib/callstacking/rails/settings.rb

@@ -32,6 +32,7 @@ module Callstacking
 
       def enabled?
         return false if settings.nil?
+        return false if ENV['CALLSTACKING_ENABLED'] == 'false'
         settings[:enabled]
       end
 

data/lib/callstacking/rails/setup.rb

@@ -2,6 +2,7 @@ require 'yaml'
 require "callstacking/rails/settings"
 require "callstacking/rails/client/authenticate"
 require "callstacking/rails/env"
+require 'io/console'
 
 module Callstacking
   module Rails
@@ -24,7 +25,7 @@ module Callstacking
         puts
         
         email      = prompt("Enter email:")
-        password   = prompt("Enter password:")
+        password   = prompt("Enter password:", echo: false)
 
         url = if Callstacking::Rails::Env.production? && ENV['CHECKPOINT_RAILS_LOCAL_TEST'].nil?
                 PRODUCTION_URL
@@ -50,9 +51,14 @@ module Callstacking
         write_settings(complete_settings.merge(props))
       end
 
-      def prompt(label)
+      def prompt(label, echo: true)
         puts label
-        value = STDIN.gets.chomp
+
+        value = if echo
+                  STDIN.gets.chomp
+                else
+                  STDIN.noecho(&:gets).chomp
+                end
         puts
 
         return nil if value == ''
@@ -88,14 +94,6 @@ module Callstacking
         puts
         puts "Usage: "
         puts
-        puts "  > callstacking-rails enable"
-        puts
-        puts "    Enables the callstacking tracing."
-        puts
-        puts "  > callstacking-rails disable"
-        puts
-        puts "    Disables the callstacking tracing."
-        puts
         puts "  > callstacking-rails register"
         puts
         puts "    Opens a browser window to register as a callstacking.com user."
@@ -105,6 +103,14 @@ module Callstacking
         puts "    Interactively prompts you for your callstacking.com username/password."
         puts "    Stores auth details in #{SETTINGS_FILE}"
         puts
+        puts "  > callstacking-rails enable"
+        puts
+        puts "    Enables the callstacking tracing."
+        puts
+        puts "  > callstacking-rails disable"
+        puts
+        puts "    Disables the callstacking tracing."
+        puts
         puts " You can have multiple environments."
         puts " The default is #{Callstacking::Rails::Env::DEFAULT_ENVIRONMENT}."
         puts

data/lib/callstacking/rails/trace.rb

@@ -30,7 +30,7 @@ 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[:request]&.original_url,
+                                                      payload[:request]&.original_url || payload[:path],
                                                       payload[:headers], payload[:params])
         end
 
@@ -45,8 +45,8 @@ 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)
+                           payload[:request]&.original_url || payload[:path],
+                           trace_id, @traces, max_trace_entries)
         end
       end
 
@@ -123,7 +123,7 @@ module Callstacking
         end
       end
       def start_request(request_id, method, controller, action, format, path, original_url, headers, params)
-        return if do_not_track_request?(original_url)
+        return if do_not_track_request?(original_url, format)
         
         request_id = request_id || SecureRandom.uuid
         Callstacking::Rails::Trace.current_request_id = request_id
@@ -140,23 +140,25 @@ module Callstacking
         return trace_id, max_trace_entries
       end
 
-      def complete_request(method, controller, action, format, original_url, trace_id, max_trace_entries)
-        if do_not_track_request?(original_url)
+      def complete_request(method, controller, action, format, original_url, trace_id, traces, max_trace_entries)
+        if do_not_track_request?(original_url, format)
           traces.clear
           return
         end
 
         create_message(completed_request_message(method, controller, action, format),
-                       spans.increment_order_num, @traces)
+                       spans.increment_order_num, traces)
 
-        send_traces!(trace_id, @traces[0..max_trace_entries])
+        send_traces!(trace_id, traces[0..max_trace_entries])
       end
 
       def track_request?(url)
         !(track_request?(url))
       end
 
-      def do_not_track_request?(url)
+      def do_not_track_request?(url, format)
+        return false if format =~ /(html|json)/i
+        
         url =~ /(\/stylesheets\/|\/javascripts\/|\/css\/|\/js\/|\.js|\.css)/i
       end
 

data/lib/callstacking/rails/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: callstacking-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.14
 platform: ruby
 authors:
 - Jim Jones
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-01-25 00:00:00.000000000 Z
+date: 2023-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -28,16 +28,16 @@ dependencies:
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: 1.10.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: 1.10.3
 - !ruby/object:Gem::Dependency
   name: faraday-follow_redirects
   requirement: !ruby/object:Gem::Requirement