minato-trace 0.1.6.pre.5 → 0.1.6.pre.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93e2a38f5087c2f9a9e7e6435a6bf06236675afa12f488c0da1cacc7e07d681d
-  data.tar.gz: ae6a13cf5ea68a77adf7d761a70f07075c1d088b7e3e5f4d6cb409394c243a0d
+  metadata.gz: 4967547c4c025a758bab7ccf46a595d117ea1b2a089960cbd5807b2622452e6d
+  data.tar.gz: 0a6c050b09590ce43dded6e12cd3929188e21eb3ee7063644662ae49aebc21bf
 SHA512:
-  metadata.gz: ee83971d6cccd57a2fea6bf9b9ce958860149878342c3b269fd071bd147ae564dcc45514cd0bbe6f969076a1366d655a9bff0aa96e73f5ef262f84c4620b28aa
-  data.tar.gz: 210ce765091b1fc71168fb4b40de1a76c8ddd2bf0400a25c0f40375d557a739250aa8cab8501a5e21208eb89dd3d59ab862c2a4c7159aa8257c51806a6d89161
+  metadata.gz: b90af4d09657878148ee11b7f4a1f80636e35354e60c2d09027386f7dae771dcee7b4e52996d72b6a681549524c887490be0ef99f2654b76f98b006a751a27bb
+  data.tar.gz: ecda535566853b1b7f2293688c0baf70a9a4861b8c0ff255fb7f7f6b0c7c55f9410487d97db396675af0423e0e34494289b3ffe6f5863b9137900aa33081945a

data/README.md

@@ -5,7 +5,7 @@ Add support to [Google Cloud Trace](https://cloud.google.com/trace) to your Mina
 Install this gem and your application will be abble to send trace information to Google Cloud Trace for any request. To configure distributed trace with other microservices see [Configuring distributed trace](#configuring-distributed-trace)
 
 ## Integration with Google Cloud Logging
-For integration with [Google Cloud Logging](https://cloud.google.com/logging?hl=en) you have to install [minato-logger-rails](https://gitlab.com/ferreri/minato/minato-logger-rails) v0.1.12+.
+For integration with [Google Cloud Logging](https://cloud.google.com/logging?hl=en) you have to install [minato-logger-rails](https://gitlab.com/ferreri/minato/minato-logger-rails) v0.1.13+.
 
 ## Installation
 Add this line to your application's Gemfile:
@@ -34,7 +34,9 @@ config/initializers/{service_name}.rb
 end
 ```
 ## Disable trace
-Trace is enabled by default. If you want to disable trace, set an environment variable `MINATO_TRACE_DISABLE=true` in your app.
+Trace is enabled by default in remote environments. If you want to disable trace, set an environment variable `MINATO_TRACE_DISABLE=true` in your app.
+
+`In local environment like angeplus-infra-local, the trace is disabled by default.`
 
 ## Changelog
 Changelog information could be found [here](CHANGELOG.md).

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

@@ -19,7 +19,7 @@ module Minato
         private
 
         def add_trace_context_header(env)
-          return unless Rails.env.production? && Minato::Trace.enabled?
+          return unless (Rails.env.production? && Minato::Trace.enabled?) || current_cloud_trace.nil?
 
           env.request_headers.merge!({ "#{TRACE_HEADER_KEY}": "#{current_cloud_trace.trace.trace_id};o=1" })
         end

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

@@ -22,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-5"
+    VERSION = "0.1.6-7"
   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.5
+  version: 0.1.6.pre.7
 platform: ruby
 authors:
 - Ferreri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-14 00:00:00.000000000 Z
+date: 2024-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-cloud-trace