minato_logger 0.2.4 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4bf9363a716cafb4c233b79f41991509e480e5df286f14323e8a5ec3bdced45
-  data.tar.gz: b6c5285531e4d9c43917980078969c47e22d9ec04fb0948f6bbfc91d86913b57
+  metadata.gz: e5cca6802e6043f3267c2edc5bf7ebaec032e34f8acdbbea932ef1d00109b182
+  data.tar.gz: 210343998fbd313238c6cc518b1c17f87ae0c2dc6292f575a96ad72dbed7dced
 SHA512:
-  metadata.gz: 04e79715819ada2f4b6f0e6a1d0358ee1eed1c723bb07d67938abe0e15bc77db6698c5feb57157e5b09600dd93b403ec3e2cf1c664e557bd2a927cbe8df0fe6a
-  data.tar.gz: b2df064e6378209586aeea42c4c6d09c9bb6d63b609fe11521642b2c30c95329d1c25e70fa5ade6e36a69e01d815715fb9b8ddd9c4d76c8de088b77ed10ca62a
+  metadata.gz: ec33233c8e3ede2fe790217c88e6871a24c1524db0dd027261692b9e2133a6edf8160d65da1076d0da41ae04564ff2d3ca9805c343d35cb647d81d1dac514113
+  data.tar.gz: 3504f55036084964dd9f1f445c15658e1279fe5d8204556bb9fe3e62980b06d174d6de9231f12a4ec33bb54679f933616ca802fdb7a836683c0235f39b9936cf

data/.rubocop.yml

@@ -8,7 +8,7 @@ AllCops:
 
 Style/StringLiterals:
   Enabled: true
-  EnforcedStyle: double_quotes
+  EnforcedStyle: single_quotes
 
 Style/StringLiteralsInInterpolation:
   Enabled: true

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/engine.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'rails'
+require_relative 'middlewares/request_response_logger'
+
+module MinatoLogger
+  class Engine < ::Rails::Engine
+    isolate_namespace MinatoLogger
+
+    initializer 'minato_logger.add_middleware' do |app|
+      app.config.colorize_logging = false if Rails.env.production?
+      if defined? Minato::Trace::Middleware::IntegrateWithCloudLogging
+        app.config.middleware.use Minato::Trace::Middleware::IntegrateWithCloudLogging
+      end
+      app.config.middleware.insert_after ActionDispatch::RequestId, MinatoLogger::Middlewares::RequestResponseLogger
+    end
+  end
+end

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
@@ -55,9 +55,10 @@ module MinatoLogger
         return msg unless tags_text.present?
 
         if msg.is_a?(Hash)
-          msg["message"] = "#{tags_text} #{msg["message"]}"
+          msg = msg.transform_keys(&:to_s)
+          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/middlewares/request_response_logger.rb

@@ -0,0 +1,100 @@
+# frozen_string_literal: true
+
+require 'json'
+
+module MinatoLogger
+  module Middlewares
+    class RequestResponseLogger
+      def initialize(app)
+        @app = app
+      end
+
+      def call(env)
+        request = ActionDispatch::Request.new(env)
+
+        log_request(request, env)
+
+        execute_with_logging(request, env)
+      end
+
+      private
+
+      def execute_with_logging(request, env)
+        data = { body: '', status: 500, start_time: current_time }
+
+        begin
+          data[:status], headers, response = @app.call(env)
+          data[:body] = extract_body_safely(response || [])
+
+          [data[:status], headers, [data[:body]]]
+        ensure
+          log_response(request, env, data.merge({ duration: calculate_duration(data[:start_time]) }))
+        end
+      end
+
+      def log_request(request, env)
+        log(default_log_data(request, env).merge({
+                                                   type: '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_pattern = 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_pattern: route_pattern, 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]),
+                                               message: "RESPONSE: #{request.method} #{request.fullpath} - " \
+                                                        "#{data[:status]} (#{data[:duration]}ms)"
+                                             })
+      end
+
+      def log(payload, level = :info)
+        Rails.logger.public_send(level, payload.to_json)
+      rescue StandardError => e
+        Rails.logger.error({ message: "Logger Error: #{e.message}", payload: payload }.to_json)
+      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 current_time
+        Process.clock_gettime(Process::CLOCK_MONOTONIC)
+      end
+
+      def calculate_duration(start_time)
+        ((current_time - start_time) * 1000).round(2)
+      end
+    end
+  end
+end

data/lib/minato_logger/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MinatoLogger
-  VERSION = "0.2.4"
+  VERSION = '0.2.6'
 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/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/engine'
 
 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,11 +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 "lograge", ">= 0.14.0"
-  spec.add_dependency "rails", ">= 7.0.0"
+  spec.add_dependency 'activesupport', '>= 7.0.0'
+  spec.add_dependency 'rails', '>= 7.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minato_logger
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.6
 platform: ruby
 authors:
 - Ferreri
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-12-04 00:00:00.000000000 Z
+date: 2026-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 7.0.0
-- !ruby/object:Gem::Dependency
-  name: lograge
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.14.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -71,12 +57,13 @@ 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/rails.rb
+- lib/minato_logger/middlewares/request_response_logger.rb
 - lib/minato_logger/version.rb
 - minato_logger.gemspec
 - sig/minato_logger.rbs

data/lib/minato_logger/rails.rb

@@ -1,47 +0,0 @@
-# frozen_string_literal: true
-
-require "lograge"
-
-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
-
-    config.lograge.enabled = true
-
-    config.lograge.formatter = Lograge::Formatters::Raw.new
-
-    config.lograge.base_controller_class = "ActionController::API"
-
-    config.lograge.custom_options = lambda do |event|
-      payload = event.payload
-      response = payload[:response]
-      response_body = begin
-        JSON.parse(response.body)
-      rescue StandardError
-        response.body
-      end
-      duration = event.duration.round(2)
-      {
-        time: Time.zone.now.iso8601,
-        params: payload[:params],
-        response: response_body,
-        exception: payload[:exception],
-        exception_object: payload[:exception_object],
-        request_id: payload[:request].request_id,
-        remote_ip: payload[:request].remote_ip,
-        ip: payload[:request].ip,
-        ruby_version: RUBY_VERSION,
-        rails_version: Rails.version,
-        message: "#{payload[:method]} #{payload[:path]} - #{payload[:status]} #{response.message} (#{duration}ms)"
-      }
-    end
-  end
-end