minato_logger 0.1.13.pre.3 → 0.1.13.pre.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c9c3f95a5063eec9edc3da85724cbb7fb9193cea2ed72d53c5d9eeecdfaaef2
-  data.tar.gz: 45af5306aab0c00c9718ddf01fe3b697435cba213e2a4afd5eecf53395976b55
+  metadata.gz: 7673fcdba540e6485a39fccf31e2bd4ede8239b07ba7d0555c972f8dcb56f77e
+  data.tar.gz: a338ab6a4d99d3ba5efdbf706d2c68f2641adaca413d0517cfab57864c84578e
 SHA512:
-  metadata.gz: b51adbfc534b440e3c9e1a6c2e46b688c95fb3d8121bfc73c693551c04652018aa5e9b3e68a767fa2150bedd1bfc6975d62eac51815f2aea4af9480bd5db723b
-  data.tar.gz: 83655a46dbe89b6cb9260e9f892d9c29ba9d3b2e05cc02abe34de72d401def53ff6ff1832fbc44b5b7e293ce1cedf83763a96400aa58a3ed561f0285d3b8e4d8
+  metadata.gz: 45f4a901a5be41467bc4a94138a743fbd2775dcc518ef1bdfc72b171b8ee9d6b7663e11f5b3615247e016361487d54f4555df7077c413d372953ae84ed666ea1
+  data.tar.gz: 6d4537ff78aaeba4aab55a963a5ddf5860dfe9870a60c935c244513a70ec2b3c006ec52342aef4d762840b60d5c74a582ba3a42448745588c580365ec034a1be

data/lib/minato_logger/configuration.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module MinatoLogger
+  class Configuration
+    attr_reader :middleware
+
+    def initialize
+      @middleware = MinatoLogger::Middleware.new
+
+      yield(self) if block_given?
+    end
+
+    def self.default
+      @default ||= Configuration.new
+    end
+
+    def configure
+      yield(self) if block_given?
+    end
+  end
+end

data/lib/minato_logger/formatters/base_formatter.rb

@@ -5,6 +5,7 @@ require "active_support"
 module MinatoLogger
   module Formatters
     class BaseFormatter < Logger::Formatter
+      include ActiveSupport::TaggedLogging::Formatter
     end
   end
 end

data/lib/minato_logger/formatters/fluent_bit.rb

@@ -1,27 +1,26 @@
 # frozen_string_literal: true
 
-require "active_support/tagged_logging"
-require "google/cloud/trace"
 require "json"
 
 module MinatoLogger
   module Formatters
     class FluentBit < BaseFormatter
-      include ActiveSupport::TaggedLogging::Formatter
-
       def call(severity, timestamp, _progname, message)
-        log = add_message_to_logs({ severity: severity, time: timestamp }, message)
-        log = add_trace_to_logs(log)
+        tagged_message = add_tags_to_message(message)
+        log = add_message_to_logs({ severity: severity, time: timestamp }, tagged_message)
+        log = apply_middlewares(log)
 
         "#{log.to_json}\n"
       end
 
       private
 
-      def add_trace_to_logs(log)
-        return log if MinatoLogger.config.trace_logs.nil?
+      def apply_middlewares(log)
+        MinatoLogger.config.middleware.middlewares.each do |middleware|
+          log = middleware.new.call(log)
+        end
 
-        MinatoLogger.config.trace_logs.send(:call, log)
+        log
       end
 
       def add_message_to_logs(log, message)
@@ -29,6 +28,18 @@ module MinatoLogger
 
         log.merge({ message: message, ruby_version: RUBY_VERSION })
       end
+
+      def add_tags_to_message(msg)
+        return msg unless tags_text.present?
+
+        if msg.is_a?(Hash)
+          msg["message"] = "#{tags_text} #{msg["message"]}"
+        else
+          msg = "#{tags_text} #{msg}"
+        end
+
+        msg
+      end
     end
   end
 end

data/lib/minato_logger/middleware.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module MinatoLogger
+  class Middleware
+    attr_reader :middlewares
+
+    def initialize
+      @middlewares = []
+    end
+
+    def use(middleware)
+      @middlewares << middleware unless middleware.nil?
+    end
+  end
+end

data/lib/minato_logger/rails.rb

@@ -2,14 +2,10 @@
 
 module MinatoLogger
   class Railtie < ::Rails::Railtie
-    config.minato_logger = ActiveSupport::OrderedOptions.new
+    config.minato_logger = MinatoLogger::Configuration.default
 
     config.after_initialize do |app|
-      app.config.colorize_logging = false
-
-      MinatoLogger.configure do |config|
-        config.trace_logs = app.config.minato_logger.trace_logs
-      end
+      app.config.colorize_logging = false if Rails.env.production?
     end
   end
 end

data/lib/minato_logger/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MinatoLogger
-  VERSION = "0.1.13-3"
+  VERSION = "0.1.13-5"
 end

data/lib/minato_logger.rb

@@ -1,20 +1,24 @@
 # frozen_string_literal: true
 
-require_relative "minato_logger/version"
-require_relative "minato_logger/formatters"
-require_relative "minato_logger/logger"
-require_relative "minato_logger/rails" if defined? Rails::Railtie
+require "minato_logger/version"
+require "minato_logger/middleware"
+require "minato_logger/configuration"
+require "minato_logger/formatters"
+require "minato_logger/logger"
+require "minato_logger/rails" if defined? Rails::Railtie
 
 module MinatoLogger
-  class Config
-    attr_accessor :trace_logs
-  end
-
-  def self.config
-    @config ||= Config.new
-  end
+  class << self
+    def configure
+      if block_given?
+        yield(Configuration.default)
+      else
+        Configuration.default
+      end
+    end
 
-  def self.configure
-    yield config if block_given?
+    def config
+      @config ||= Configuration.default
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minato_logger
 version: !ruby/object:Gem::Version
-  version: 0.1.13.pre.3
+  version: 0.1.13.pre.5
 platform: ruby
 authors:
 - Ferreri
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-02-14 00:00:00.000000000 Z
+date: 2024-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -70,10 +70,12 @@ files:
 - Rakefile
 - compose.yml
 - lib/minato_logger.rb
+- lib/minato_logger/configuration.rb
 - lib/minato_logger/formatters.rb
 - lib/minato_logger/formatters/base_formatter.rb
 - lib/minato_logger/formatters/fluent_bit.rb
 - lib/minato_logger/logger.rb
+- lib/minato_logger/middleware.rb
 - lib/minato_logger/rails.rb
 - lib/minato_logger/version.rb
 - minato_logger.gemspec