callstacking-rails 0.1.31 → 0.1.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26c64da0b1b2bb170e40ee319c04d9d8b090e4801d4aa61ecdb1728e4edb0a10
-  data.tar.gz: 619d6983c3aa94affb3d31c7c0e4a8532565c219bd9d14832a50b9fb46f813b7
+  metadata.gz: 002a4d9f1b5077534ba5ea5dfc3b418fa77325a4028cd4ed9322803cb0200fb5
+  data.tar.gz: e9eb4f9d680d978e66f38f754b8c8e251e243628b8317dfa004df95545661048
 SHA512:
-  metadata.gz: fa3fc9c4d8e079df650a5efefe6704d6682f770ebd35516ff501ddd3c896f3df69e871f7d7908855d6074c0536cff05346d31a7c74024884633c685ad3bc6909
-  data.tar.gz: 0c253b57e8ff3044e17df80fc9bab0b3cc6cb49efc5aeba2d6900b8b27857fde19cb06fbdce5fae05da70371f6922ce7c6d4fc7419cc824c099f10df75aad7aa
+  metadata.gz: 70c5b03becd0e1e054a5d7142130dfce3ae8e7310a9a249ea6742a95f45b5f3f52a8f59832820c1cd981fbd556ede7f2b672de1ad56cc61e16a978a216fd0b55
+  data.tar.gz: 54719e4784c2c945e05eafdbc202de21c4bf425a5d0a4ce1c9403e9154851ba18a63883e2bf32712d23342cb5f9c0257d65bfd02630b9cb6bd4b58f878479baf

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

@@ -21,8 +21,6 @@ module Callstacking
           # https://github.com/lostisland/awesome-faraday
           @connection ||= Faraday.new(url) do |c|
             c.response :json
-            c.use Faraday::Response::Logger
-            # c.use Faraday::Response::Logger, nil, { headers: false, bodies: false }
             c.response :follow_redirects
             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

data/lib/callstacking/rails/engine.rb

@@ -41,11 +41,9 @@ module Callstacking
         spans[Thread.current.object_id]||=Spans.new
         instrumenter.add_span(spans[Thread.current.object_id])
 
-        @@loader = Callstacking::Rails::Loader.new(instrumenter, excluded: settings.excluded + EXCLUDED_TEST_CLASSES)
-        @@loader.instrument_existing
-
+        @@loader = Callstacking::Rails::Loader.new(instrumenter,
+                                                   excluded: settings.excluded + EXCLUDED_TEST_CLASSES)
         loader.on_load
-        # loader.reset!
       end
 
       # Serialize all tracing requests for now.

data/lib/callstacking/rails/loader.rb

@@ -4,14 +4,17 @@ require "callstacking/rails/logger"
 module Callstacking
   module Rails
     class Loader
-      attr_accessor :instrumenter, :klasses, :excluded
+      attr_accessor :instrumenter, :klasses, :excluded, :settings
       def initialize(instrumenter, excluded: [])
         @excluded = excluded
         @instrumenter = instrumenter
         @klasses = Set.new
+        @settings = Callstacking::Rails::Settings.new
+
+        preloaded_klasses
       end
 
-      def instrument_existing
+      def preloaded_klasses
         ObjectSpace.each_object(Module){|ob| filter_klass(ob, (Object.const_source_location(ob.to_s)&.first rescue nil))}
       end
 
@@ -41,7 +44,7 @@ module Callstacking
         if path =~ /#{::Rails.root.to_s}/ &&
           !klasses.include?(klass) &&
           !excluded_klass
-          instrumenter.instrument_klass(klass)
+          instrumenter.instrument_klass(klass) if settings.enabled?
           klasses << klass
         end
       end

data/lib/callstacking/rails/settings.rb

@@ -23,9 +23,7 @@ module Callstacking
       end
 
       def auth_token
-        x = ENV['CALLSTACKING_API_TOKEN'] || settings[:auth_token]
-        raise "No auth token found. #{ENV['CALLSTACKING_API_TOKEN']} Please run `callstacking login` to get one." if x.nil?
-        x
+        ENV['CALLSTACKING_API_TOKEN'] || settings[:auth_token]
       end
 
       def auth_token?
@@ -52,8 +50,8 @@ module Callstacking
       end
 
       def enabled?
-        return Thread.current[CACHE_KEY] if Thread.current[CACHE_KEY].present?
         return ActiveRecord::Type::Boolean.new.cast(ENV[ENV_KEY]) if ENV[ENV_KEY].present?
+        return Thread.current[CACHE_KEY] if Thread.current[CACHE_KEY].present?
         false
       end
 

data/lib/callstacking/rails/trace.rb

@@ -148,8 +148,6 @@ module Callstacking
         lock.synchronize do
           return if traces.empty?
 
-          STDERR.puts "Sending #{traces.size} traces to Callstacking.io -- enabled? - #{settings.enabled?} -- #{traces.inspect}"
-
           client.upsert(trace_id,
                         { trace_entries: traces.deep_dup })
           traces.clear

data/lib/callstacking/rails/version.rb

@@ -1,5 +1,5 @@
 module Callstacking
   module Rails
-    VERSION = "0.1.31"
+    VERSION = "0.1.32"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: callstacking-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.31
+  version: 0.1.32
 platform: ruby
 authors:
 - Jim Jones