callstacking-rails 0.1.23 → 0.1.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14947016af46faef4737e8800c6ea1617d81abf78076e4a072380159251c8348
-  data.tar.gz: 0ff0f0eae09415b28d483ca95cb5f958e106b26472020318c7a8225897203f27
+  metadata.gz: fafc57fcb944f390ece43b46e6417ea090df73c38aee4f6b7362d3bb2492dfc7
+  data.tar.gz: 24344416d9261f55438b4c3848a534cfd329a1ac348ad388ee87144e78a565f2
 SHA512:
-  metadata.gz: 1e33a35232719a2e04a38ae4847ac9ad09831ca41ae134568075044b040fed4e458a4de86301a5ba97fc77bea5213f02a97e78a137d33023004dfe06b48cfca5
-  data.tar.gz: 51f3877adb56b49a595c6ee478b89f66048aa4aa2b4e8f10c2920a4e2ead2dc16c29079cf639b62f667f2e774d6f541892cbe88c1c2c581f98262e6d19dd82ed
+  metadata.gz: 86f2ccc8cc035fe6d955793fa420ad577fcf3613e3f5e847fbb73e4c6a81e144678f5c4b6b8df64074440fa2382ce88c92926da95d0f5d50433fbd9a788e7420
+  data.tar.gz: 7693b49d937092edd0c91ba8865949cf1f29404634aa530e9523a86a84dfb5f17db3582cd84e691045eae0de6ddd0287900c674c47e1e8a21e72f34c48ca187c

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

@@ -7,11 +7,15 @@ module Callstacking
       class Error < StandardError; end
 
       class Base
+        attr_accessor :async, :threads
         attr_reader :url, :auth_token
 
         def initialize(url, auth_token)
           @url = url
           @auth_token = auth_token
+
+          @threads = []
+          @async   = false
         end
         def connection
           # https://github.com/lostisland/awesome-faraday
@@ -23,6 +27,7 @@ module Callstacking
             c.use Faraday::Response::RaiseError # raise exceptions on 40x, 50x responses
             c.request :json # This will set the "Content-Type" header to application/json and call .to_json on the body
             c.adapter Faraday.default_adapter
+            c.options.timeout = 5
 
             if auth_token.present?
               c.request :authorization, :Bearer, auth_token
@@ -31,7 +36,15 @@ module Callstacking
         end
 
         def get(url, params = {})
-          connection.get(url, params, headers)
+          if async
+            threads << Thread.new do
+              connection.get(url, params, headers)
+            end
+          else
+            connection.get(url, params, headers)
+          end
+        ensure
+          Faraday.default_connection.close if async
         end
 
         def post(url, params = {}, body = {}, headers_ext = {})
@@ -43,12 +56,22 @@ module Callstacking
         end
 
         def r(action, url, params = {}, body = {}, _headers_ext = {})
-          connection.send(action, url) do |req|
-            req.params.merge!(params)
-            req.body = body
+          if async
+            threads << Thread.new do
+              connection.send(action, url) do |req|
+                req.params.merge!(params)
+                req.body = body
+              end
+            end
+          else
+            connection.send(action, url) do |req|
+              req.params.merge!(params)
+              req.body = body
+            end
           end
+        ensure
+          Faraday.default_connection.close if async
         end
-
       end
     end
   end

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

@@ -7,33 +7,35 @@ module Callstacking
         CREATE_URL = "/api/v1/traces.json"
         UPDATE_URL = "/api/v1/traces/:id.json"
 
-        def create(request_id, tuid, method_name, klass, action_name, format_name, root_path, url, headers, params)
-          resp = post(CREATE_URL,
-                      {},
-                      {
-                        request_id: request_id,
-                        tuid: tuid,
-                        method_name: method_name,
-                        klass: klass,
-                        action_name: action_name,
-                        format_name: format_name,
-                        root_path: root_path,
-                        url: url,
-                        h: headers.to_h,
-                        p: params.to_h,
-                      })
+        def initialize(url, auth_token)
+          super
 
-          if resp.status == 200
-            return resp.body["trace_id"], resp.body["pulse_interval"], resp.body["max_trace_entries"]
-          end
+          # All requests for trace and trace entry creation are async
+          #   join by the client side generated tuid
+          @async = true
+        end
+
+        def create(request_id, tuid, method_name, klass, action_name, format_name, root_path, url, headers, params)
+          post(CREATE_URL,
+               {},
+               {
+                 request_id: request_id,
+                 tuid: tuid,
+                 method_name: method_name,
+                 klass: klass,
+                 action_name: action_name,
+                 format_name: format_name,
+                 root_path: root_path,
+                 url: url,
+                 h: headers.to_h,
+                 p: params.to_h,
+               })
 
           nil
         end
 
         def upsert(trace_id, traces)
-          resp = patch(UPDATE_URL.gsub(':id', trace_id), {}, traces)
-
-          resp.status
+          patch(UPDATE_URL.gsub(':id', trace_id), {}, traces)
         end
       end
     end

data/lib/callstacking/rails/instrument.rb

@@ -17,6 +17,9 @@ module Callstacking
         method_path = (klass.instance_method(method_name).source_location.first rescue nil) ||
           (klass.method(method_name).source_location.first rescue nil)
 
+        # method was not defined in Ruby (i.e. native)
+        return if method_path.nil?
+
         # Application level method definitions
         return if application_level && !(method_path =~ /#{::Rails.root.to_s}/)
 

data/lib/callstacking/rails/trace.rb

@@ -1,5 +1,5 @@
 require "rails"
-require "active_support/concern"
+require 'active_support/core_ext/object/deep_dup'
 
 module Callstacking
   module Rails
@@ -137,7 +137,7 @@ module Callstacking
           return if traces.empty?
 
           client.upsert(trace_id,
-                        { trace_entries: traces })
+                        { trace_entries: traces.deep_dup })
           traces.clear
         end
       end

data/lib/callstacking/rails/traces_helper.rb

@@ -32,6 +32,7 @@ module Callstacking
             if (e.ctrlKey && e.which == 68) {
               if (document.getElementById("callstacking-debugger").style.display === "none") {
                 document.getElementById("callstacking-debugger").style.display = "block";
+                document.getElementById("callstacking-debugger").contentDocument.location.reload(true);
                 document.getElementById("callstacking-debugger").focus();
               } else {
                 document.getElementById("callstacking-debugger").style.display = "none";

data/lib/callstacking/rails/version.rb

@@ -1,5 +1,5 @@
 module Callstacking
   module Rails
-    VERSION = "0.1.23"
+    VERSION = "0.1.25"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: callstacking-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.23
+  version: 0.1.25
 platform: ruby
 authors:
 - Jim Jones
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-04-02 00:00:00.000000000 Z
+date: 2023-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails