minato_logger 0.2.13 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30d7463ea874ebb8c5c225639287ef19ad5298f0194a8a40f58780cde4b21079
-  data.tar.gz: 4626828e63f5fe5cca9d0ea669094d3e95331c3fe6f9d006a0971160276f9615
+  metadata.gz: 06f80153de91decba9f1d6a522d0b1e4d9b960ad25e73c233a0bc72631d86a18
+  data.tar.gz: 68ea47ede5ecb8d9c2dafa98730113433a8a8bde2195d1549b08e7411f8d9c08
 SHA512:
-  metadata.gz: b4439e60fce5ed2f4db05ddeb07ed1244aab12fb91eacca38f480de434e52b9c9b4aea810872c5f0a1ca613b45451357735dc3b15687a470313af25a51318242
-  data.tar.gz: 1c4a700119bacd6cbbc877fbab3da93e2e0b8e86c50153acaeb616596dd84d38334fd5b72d11f6558deb345fe973e0fa043f4628c27b9e91cfb02f8fa8a86d2b
+  metadata.gz: 9310c36ead85d039a937756560785b2aee184e4b92e8171f486d0bca3d93c5425caede4c535aec8cf59f601b907de9eef97c9af8b67b4e4b4b1effc2fc168744
+  data.tar.gz: f658c941750803befda71f8e1455ccdb0292f4ffe1d75d37d84cb37bcf47b99acea4e9c692090614f85d8f04004778765a872db5bab2c47885ef49ffc0a30091

data/.rubocop.yml

@@ -8,7 +8,7 @@ AllCops:
 
 Style/StringLiterals:
   Enabled: true
-  EnforcedStyle: single_quotes
+  EnforcedStyle: double_quotes
 
 Style/StringLiteralsInInterpolation:
   Enabled: true
@@ -19,6 +19,3 @@ Style/Documentation:
 
 Layout/LineLength:
   Max: 120
-
-Metrics/ClassLength:
-  Max: 120

data/Rakefile

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
 
-require 'rubocop/rake_task'
+require "rubocop/rake_task"
 
 RuboCop::RakeTask.new
 

data/lib/minato_logger/formatters/base_formatter.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'active_support'
+require "active_support"
 
 module MinatoLogger
   module Formatters

data/lib/minato_logger/formatters/fluent_bit.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'json'
+require "json"
 
 module MinatoLogger
   module Formatters
@@ -18,7 +18,7 @@ module MinatoLogger
       private
 
       def sanitize_hash(hash)
-        hash.transform_keys! { |key| key.to_s.encode('UTF-8', invalid: :replace, undef: :replace, replace: '?') }
+        hash.transform_keys! { |key| key.to_s.encode("UTF-8", invalid: :replace, undef: :replace, replace: "?") }
         hash.transform_values! do |value|
           sanitize_hash_value(value)
         end
@@ -27,11 +27,11 @@ module MinatoLogger
       def sanitize_hash_value(value)
         case value
         when String
-          value.encode('UTF-8', invalid: :replace, undef: :replace, replace: '?')
+          value.encode("UTF-8", invalid: :replace, undef: :replace, replace: "?")
         when Hash
           sanitize_hash(value)
         when Array
-          value.map { |v| v.is_a?(String) ? v.encode('UTF-8', invalid: :replace, undef: :replace, replace: '?') : v }
+          value.map { |v| v.is_a?(String) ? v.encode("UTF-8", invalid: :replace, undef: :replace, replace: "?") : v }
         else
           value
         end
@@ -46,20 +46,18 @@ module MinatoLogger
       end
 
       def add_message_to_logs(log, message)
-        ruby_version = { ruby_version: RUBY_VERSION }
-        return log.merge(message, ruby_version) unless message.is_a? String
+        return log.merge(message) unless message.is_a? String
 
-        log.merge({ message: message }, ruby_version)
+        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 = msg.transform_keys(&:to_s)
-          msg['message'] = "#{tags_text}#{msg["message"]}"
+          msg["message"] = "#{tags_text} #{msg["message"]}"
         else
-          msg = "#{tags_text}#{msg}"
+          msg = "#{tags_text} #{msg}"
         end
 
         msg

data/lib/minato_logger/formatters.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'minato_logger/formatters/base_formatter'
-require 'minato_logger/formatters/fluent_bit'
+require "minato_logger/formatters/base_formatter"
+require "minato_logger/formatters/fluent_bit"
 
 module MinatoLogger
   module Formatters

data/lib/minato_logger/logger.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require 'active_support/logger'
-require 'active_support/tagged_logging'
+require "active_support/logger"
+require "active_support/tagged_logging"
 
-require_relative 'formatters/fluent_bit'
+require_relative "formatters/fluent_bit"
 
 module MinatoLogger
   class Logger < ActiveSupport::Logger

data/lib/minato_logger/rails.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module MinatoLogger
+  class Railtie < ::Rails::Railtie
+    config.minato_logger = MinatoLogger::Configuration.default
+
+    config.after_initialize do |app|
+      app.config.colorize_logging = false if Rails.env.production?
+
+      if defined? Minato::Trace::Middleware::IntegrateWithCloudLogging
+        app.config.minato_logger.middleware.use = Minato::Trace::Middleware::IntegrateWithCloudLogging
+      end
+    end
+  end
+end

data/lib/minato_logger/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MinatoLogger
-  VERSION = '0.2.13'
+  VERSION = "0.3.0"
 end

data/lib/minato_logger.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require 'minato_logger/version'
-require 'minato_logger/middleware'
-require 'minato_logger/configuration'
-require 'minato_logger/formatters'
-require 'minato_logger/logger'
-require 'minato_logger/engine'
+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 << self

data/minato_logger.gemspec

@@ -1,22 +1,22 @@
 # frozen_string_literal: true
 
-require_relative 'lib/minato_logger/version'
+require_relative "lib/minato_logger/version"
 
 Gem::Specification.new do |spec|
-  spec.name = 'minato_logger'
+  spec.name = "minato_logger"
   spec.version = MinatoLogger::VERSION
-  spec.authors = ['Ferreri']
-  spec.email = ['contato@ferreri.co']
+  spec.authors = ["Ferreri"]
+  spec.email = ["contato@ferreri.co"]
 
-  spec.summary = 'Log enhancements for Minato Rails Apps.'
-  spec.homepage = 'https://gitlab.com/ferreri/minato/minato-logger-rails'
-  spec.license = 'MIT'
-  spec.required_ruby_version = '>= 2.6.0'
+  spec.summary = "Log enhancements for Minato Rails Apps."
+  spec.homepage = "https://gitlab.com/ferreri/minato/minato-logger-rails"
+  spec.license = "MIT"
+  spec.required_ruby_version = ">= 2.6.0"
 
-  spec.metadata['homepage_uri'] = spec.homepage
-  spec.metadata['source_code_uri'] = 'https://gitlab.com/ferreri/minato/minato-logger-rails'
-  spec.metadata['changelog_uri'] = 'https://gitlab.com/ferreri/minato/minato-logger-rails/-/blob/main/CHANGELOG.md?ref_type=heads'
-  spec.metadata['rubygems_mfa_required'] = 'true'
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = "https://gitlab.com/ferreri/minato/minato-logger-rails"
+  spec.metadata["changelog_uri"] = "https://gitlab.com/ferreri/minato/minato-logger-rails/-/blob/main/CHANGELOG.md?ref_type=heads"
+  spec.metadata["rubygems_mfa_required"] = "true"
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
@@ -26,10 +26,10 @@ Gem::Specification.new do |spec|
         f.start_with?(*%w[bin/ test/ spec/ features/ .git .circleci appveyor Gemfile])
     end
   end
-  spec.bindir = 'exe'
+  spec.bindir = "exe"
   spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
-  spec.require_paths = ['lib']
+  spec.require_paths = ["lib"]
 
-  spec.add_dependency 'activesupport', '>= 7.0.0'
-  spec.add_dependency 'rails', '>= 7.0.0'
+  spec.add_dependency "activesupport", "~> 8.0.2"
+  spec.add_dependency "rails", ">= 8.0.0"
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: minato_logger
 version: !ruby/object:Gem::Version
-  version: 0.2.13
+  version: 0.3.0
 platform: ruby
 authors:
 - Ferreri
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-02-12 00:00:00.000000000 Z
+date: 2025-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 8.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 8.0.2
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 8.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 8.0.0
 description:
 email:
 - contato@ferreri.co
@@ -57,13 +57,12 @@ files:
 - compose.yml
 - lib/minato_logger.rb
 - lib/minato_logger/configuration.rb
-- lib/minato_logger/engine.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/middlewares/request_response_logger.rb
+- lib/minato_logger/rails.rb
 - lib/minato_logger/version.rb
 - minato_logger.gemspec
 - sig/minato_logger.rbs

data/lib/minato_logger/engine.rb

@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails'
-require_relative 'middlewares/request_response_logger'
-require_relative 'configuration'
-require 'rails/rack/logger'
-
-module MinatoLogger
-  class Engine < ::Rails::Engine
-    isolate_namespace MinatoLogger
-
-    initializer 'minato_logger.add_middleware' do |app|
-      app.config.minato_logger = MinatoLogger::Configuration.default
-      app.config.log_formatter = MinatoLogger::Formatters::FluentBit.new
-      app.config.colorize_logging = false if Rails.env.production?
-      if defined? Minato::Trace::Middleware::IntegrateWithCloudLogging
-        app.config.minato_logger.middleware.use Minato::Trace::Middleware::IntegrateWithCloudLogging
-      end
-      Rails.application.config.middleware.swap(
-        Rails::Rack::Logger,
-        MinatoLogger::Middlewares::RequestResponseLogger,
-        []
-      )
-    end
-  end
-end

data/lib/minato_logger/middlewares/request_response_logger.rb

@@ -1,149 +0,0 @@
-# frozen_string_literal: true
-
-require 'json'
-require 'rails/rack/logger'
-
-module MinatoLogger
-  module Middlewares
-    class RequestResponseLogger < Rails::Rack::Logger
-      SENSITIVE_HEADERS = %w[
-        AUTHORIZATION PROXY_AUTHORIZATION X_CSRF_TOKEN
-        HTTP_AUTHORIZATION HTTP_PROXY_AUTHORIZATION
-        HTTP_X_CSRF_TOKEN COOKIE HTTP_COOKIE
-      ].freeze
-
-      private
-
-      def call_app(request, env)
-        log_request(request, env)
-        handle = dispatch_request_event(request)
-        data = process_request(env)
-        [data[:status], data[:headers], [data[:body]]]
-      ensure
-        duration = ((current_time - data[:start_time]) * 1000).round(2)
-        log_response(request, env, data.merge({ duration: duration }))
-        finish_request_instrumentation(handle, env['rails.rack_logger_tag_count'])
-      end
-
-      def compute_tags(request)
-        tags_to_use = @taggers.presence || Rails.application.config.log_tags || []
-        tags_to_use.collect do |tag|
-          next tag.call(request) if tag.is_a?(Proc)
-          next request.send(tag) if tag.is_a?(Symbol)
-
-          tag
-        end
-      end
-
-      def process_request(env)
-        data = { body: '', status: 500, start_time: current_time, headers: {} }
-
-        data[:status], data[:headers], response = @app.call(env)
-        data[:body] = extract_body_safely(response || [])
-        data
-      end
-
-      def dispatch_request_event(request)
-        instrumenter = ActiveSupport::Notifications.instrumenter
-        handle = instrumenter.build_handle('request.action_dispatch', { request: request })
-        handle.start
-        handle
-      end
-
-      def log_request(request, env)
-        log(default_log_data(request, env).merge({
-                                                   type: 'REQUEST',
-                                                   headers: extract_request_headers(request),
-                                                   body: extract_request_body(request),
-                                                   message: "REQUEST: #{request.method} #{request.fullpath}"
-                                                 }))
-      end
-
-      def log_response(request, env, data)
-        payload = build_response_payload(request, env, data)
-        log_level = data[:status] >= 500 ? :error : :info
-        log(payload, log_level)
-      end
-
-      def default_log_data(request, env)
-        route = env['action_dispatch.route_uri_pattern'] || request.path
-        { rails_version: Rails.version, request_id: request.request_id, method: request.method,
-          time: Time.zone.now.iso8601, remote_ip: request.remote_ip, route: route, ip: request.ip,
-          path: request.fullpath, params: filter_params(request) }
-      end
-
-      def build_response_payload(request, env, data)
-        default_log_data(request, env).merge({
-                                               type: 'RESPONSE', duration: data[:duration], status: data[:status],
-                                               response: safe_parse_json(data[:body]),
-                                               headers: filter_sensitive_headers(data[:headers]),
-                                               message: "RESPONSE: #{request.method} #{request.fullpath} - " \
-                                                        "#{data[:status]} (#{data[:duration]}ms)"
-                                             })
-      end
-
-      def log(payload, level = :info)
-        Rails.logger.public_send(level, payload)
-      rescue StandardError => e
-        Rails.logger.error({ message: "Logger Error: #{e.message}", payload: payload })
-      end
-
-      def extract_body_safely(response)
-        body = []
-        response.each { |part| body << part.to_s } if response.respond_to?(:each)
-        response.close if response.respond_to?(:close)
-        body.join
-      end
-
-      def filter_params(request)
-        request.filtered_parameters.except(:controller, :action, :format)
-      rescue StandardError
-        {}
-      end
-
-      def safe_parse_json(body)
-        return nil if body.blank?
-
-        JSON.parse(body)
-      rescue JSON::ParserError
-        body.to_s
-      end
-
-      def extract_request_body(request)
-        return nil unless request.body
-
-        body = request.body.read
-        request.body.rewind
-        safe_parse_json(body)
-      rescue StandardError => e
-        "Error reading request body: #{e}"
-      end
-
-      def extract_request_headers(request)
-        headers = {}
-        request.headers.each do |k, v|
-          next unless k.start_with?('HTTP_') || %w[CONTENT_TYPE CONTENT_LENGTH].include?(k)
-
-          normalized_key = k.start_with?('HTTP_') ? k[5..] : k
-
-          headers[normalized_key] = v
-        end
-
-        filter_sensitive_headers(headers)
-      end
-
-      def current_time
-        Process.clock_gettime(Process::CLOCK_MONOTONIC)
-      end
-
-      def filter_sensitive_headers(headers)
-        return {} unless headers.is_a?(Hash)
-
-        headers.reject do |k, _|
-          key = k.to_s.upcase.tr('-', '_')
-          SENSITIVE_HEADERS.any? { |sensitive| key.include?(sensitive) }
-        end
-      end
-    end
-  end
-end