minato-trace 0.1.6.pre.4 → 0.1.6.pre.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 617a746f57e557883faa90fc72e8c3a078483585df6f97f4cebb64130daf68f4
-  data.tar.gz: 396d2536e8209f0481bf305431a8b2f8a06952e863e7fd8a9a95df41c4855719
+  metadata.gz: 39b8bb1197b7ed2ff178447704bcd7874622a271607515f9a88f09c16238b5fb
+  data.tar.gz: d9c9d19e94f4ba106dd967912be6da96cf55f568ff4afbb9f9a8cf037501a6ce
 SHA512:
-  metadata.gz: e06b1e3043379e75f268dc69f35a70acf07f66f7160bf241a0959c6bd8ce11cb400581d7f1b274f3f85acba02ad91e1194ec37fa552e6389166a4995a46d8e84
-  data.tar.gz: 614be0218c0805fcb7e01ff2097fa54f30d83317fe7dc5f9afc81dd95cc9bcea5eaf5dc912a52d6a5d46c75f7719765981a6d315cceec30cc10758854f7b83cb
+  metadata.gz: acedef97441ea61b9318c9bcfab7e4a967f5d23996a1cf61c31859a40d3ba8154fd98dd63f48c845920f86cf914b6cbbeee412620c72b87f6345ba45e052a4d8
+  data.tar.gz: 0a96cd5a060a194eaba77350928b3d46b52afe67e0853e2f8c6a329a2351557ddd22c426a19b7a9ab99778c9a31e4fe2da69142b3608460b96bae3479712537d

data/lib/minato/trace/middleware/integrate_with_cloud_logging.rb

@@ -13,6 +13,8 @@ module Minato
         private
 
         def add_trace_to_logs(log)
+          return log if current_cloud_trace.nil?
+
           trace_log = "projects/#{current_cloud_trace.trace.project_id}/traces/#{current_cloud_trace.trace.trace_id}"
 
           log.merge({ "logging.googleapis.com/trace": trace_log,
@@ -20,10 +22,10 @@ module Minato
         end
 
         def current_cloud_trace
-          @current_cloud_trace ||= current_trace_from_google_cloud
+          @current_cloud_trace ||= current_cloud_trace_from_google_cloud
         end
 
-        def current_trace_from_google_cloud
+        def current_cloud_trace_from_google_cloud
           _trace_client = Google::Cloud::Trace.new
           Google::Cloud::Trace.get
         end

data/lib/minato/trace/version.rb

@@ -2,6 +2,6 @@
 
 module Minato
   module Trace
-    VERSION = "0.1.6-4"
+    VERSION = "0.1.6-6"
   end
 end

data/lib/minato/trace.rb

@@ -1,9 +1,12 @@
 # frozen_string_literal: true
 
 require "minato/trace/version"
-require "minato/trace/railtie"
 require "minato/trace/middleware"
-require "google/cloud/trace/rails"
+
+if defined? Rails::Railtie
+  require "google/cloud/trace/rails"
+  require "minato/trace/railtie"
+end
 
 module Minato
   module Trace
@@ -12,7 +15,7 @@ module Minato
     def self.init(app)
       if Minato::Trace.enabled?
         Minato::Trace.configure_loggging(app)
-        Minato::Trace.configure_trace(app)
+        Minato::Trace.configure_trace
       end
 
       app
@@ -22,18 +25,25 @@ module Minato
       ENV["MINATO_TRACE_DISABLED"] != "true"
     end
 
-    def self.configure_trace(app)
-      app.configure do
-        config.google_cloud.use_trace = true
-        config.google_cloud.trace.sampler = Google::Cloud::Trace::TimeSampler.new(path_blacklist: BLACKLIST_PATHS.dup)
-        config.minato_logger.trace_logs = Minato::Trace::Middleware::IntegrateWithCloudLogging.new
+    def self.configure_trace
+      Google::Cloud.configure do |config|
+        config.use_trace = true
+        config.trace.sampler = Google::Cloud::Trace::TimeSampler.new(path_blacklist: BLACKLIST_PATHS.dup)
       end
     end
 
     def self.configure_loggging(app)
+      Google::Cloud.configure do |config|
+        config.use_logging = false
+      end
+
       app.configure do
-        config.google_cloud.use_logging = false
+        config.minato_logger.middleware.use Minato::Trace::Middleware::IntegrateWithCloudLogging
       end
     end
+
+    def self.skip_trace?(trace)
+      BLACKLIST_PATHS.any? { |path| trace.name.start_with?(path) }
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minato-trace
 version: !ruby/object:Gem::Version
-  version: 0.1.6.pre.4
+  version: 0.1.6.pre.6
 platform: ruby
 authors:
 - Ferreri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-14 00:00:00.000000000 Z
+date: 2024-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-cloud-trace