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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f684163e7a5fa25682ee75132b4fed0f45893f6c30c9d0676562841e0046af5
-  data.tar.gz: 01b19897590f665373abbc108c35f002f45bf91a8a4c08407c742176881face1
+  metadata.gz: 617a746f57e557883faa90fc72e8c3a078483585df6f97f4cebb64130daf68f4
+  data.tar.gz: 396d2536e8209f0481bf305431a8b2f8a06952e863e7fd8a9a95df41c4855719
 SHA512:
-  metadata.gz: 7f8b0515d2442eb9c44a8d06f46e6f5cf728f41a3a682cb760d537275a4ffeb2a776167cffe6cf1417fee713a726f2b6f9bfb6a8ab9460a1fc61ba4668a401cb
-  data.tar.gz: 4c6baec516cfdf7a7e44d03f8d58b22cf0d9689962c42a525fcc9025813bba34408e722813e092a17f798c35b0d1d664197dca3c08eccc7e6a54f3d61c83808a
+  metadata.gz: e06b1e3043379e75f268dc69f35a70acf07f66f7160bf241a0959c6bd8ce11cb400581d7f1b274f3f85acba02ad91e1194ec37fa552e6389166a4995a46d8e84
+  data.tar.gz: 614be0218c0805fcb7e01ff2097fa54f30d83317fe7dc5f9afc81dd95cc9bcea5eaf5dc912a52d6a5d46c75f7719765981a6d315cceec30cc10758854f7b83cb

data/README.md

@@ -33,6 +33,8 @@ config/initializers/{service_name}.rb
   config.use Minato::Trace::Middleware::DistributedTraceContext
 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.
 
 ## 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?
+          return unless Rails.env.production? && Minato::Trace.enabled?
 
           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

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Minato
+  module Trace
+    module Middleware
+      class IntegrateWithCloudLogging
+        def call(log)
+          return log unless ::Rails.env.production? && Minato::Trace.enabled?
+
+          add_trace_to_logs(log)
+        end
+
+        private
+
+        def add_trace_to_logs(log)
+          trace_log = "projects/#{current_cloud_trace.trace.project_id}/traces/#{current_cloud_trace.trace.trace_id}"
+
+          log.merge({ "logging.googleapis.com/trace": trace_log,
+                      "logging.googleapis.com/spanId": current_cloud_trace.span_id.to_s })
+        end
+
+        def current_cloud_trace
+          @current_cloud_trace ||= current_trace_from_google_cloud
+        end
+
+        def current_trace_from_google_cloud
+          _trace_client = Google::Cloud::Trace.new
+          Google::Cloud::Trace.get
+        end
+      end
+    end
+  end
+end

data/lib/minato/trace/middleware.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "minato/trace/middleware/distributed_trace_context"
+require "minato/trace/middleware/integrate_with_cloud_logging"
 
 module Minato
   module Trace

data/lib/minato/trace/railtie.rb

@@ -4,8 +4,8 @@ module Minato
   module Trace
     class Railtie < ::Rails::Railtie
       initializer "minato_trace_setup",
-                  before: "load_environment_config" do
-        Minato::Trace.init
+                  before: "load_environment_config" do |app|
+        Minato::Trace.init(app)
       end
     end
   end

data/lib/minato/trace/version.rb

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

data/lib/minato/trace.rb

@@ -9,11 +9,30 @@ module Minato
   module Trace
     BLACKLIST_PATHS = ["/health/alive", "/health/ready"].freeze
 
-    def self.init
-      Google::Cloud.configure do |config|
-        config.use_logging = false
-        config.use_trace = true
-        config.trace.sampler = Google::Cloud::Trace::TimeSampler.new(path_blacklist: BLACKLIST_PATHS.dup)
+    def self.init(app)
+      if Minato::Trace.enabled?
+        Minato::Trace.configure_loggging(app)
+        Minato::Trace.configure_trace(app)
+      end
+
+      app
+    end
+
+    def self.enabled?
+      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
+      end
+    end
+
+    def self.configure_loggging(app)
+      app.configure do
+        config.google_cloud.use_logging = false
       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.2
+  version: 0.1.6.pre.4
 platform: ruby
 authors:
 - Ferreri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-06 00:00:00.000000000 Z
+date: 2024-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-cloud-trace
@@ -51,6 +51,7 @@ files:
 - lib/minato/trace.rb
 - lib/minato/trace/middleware.rb
 - lib/minato/trace/middleware/distributed_trace_context.rb
+- lib/minato/trace/middleware/integrate_with_cloud_logging.rb
 - lib/minato/trace/railtie.rb
 - lib/minato/trace/version.rb
 - lib/tasks/minato/trace_tasks.rake