minato_logger 0.4.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: beb2a53745858a930802bf198ac1214e6015772f5b0d93b3448d4a85d7ad351f
-  data.tar.gz: 74c17c9525de490e4d2ce3dfeab74a82fa9dc26cf90216ef22c7eefaf12eb34f
+  metadata.gz: c9bf719d37bf79a26579772b2753989b316b3f78866f3533298df2f3aa3088dd
+  data.tar.gz: 6339f31ad25bed2e5518e7a73a63e213fc2d3712043c075cfcd3759b0cacdf9a
 SHA512:
-  metadata.gz: 246404fe6ed3d1e2fa3e312e70a07287606b187e568fd177db702038705f7271cfab4c20cab4b7aa99fa23067141f672791682125e600bc7179b53d24ca0b689
-  data.tar.gz: f9fe0c1a5e827c150a1b8223c52bc399f094375c7d533d9bc25d5f13f47063ae3aec98e9db85b93015f17eb4eccaa20e7bf4129dd8683fbbff89b7662a6f134f
+  metadata.gz: 647f83adf955ffb6f147759a0cd6ef3fc4be7bd523c79fdc63587eb507f6da4c3dabaf5f7624f0b636d0f2be867ea2cab2ccd353a43a75cbb7fdae8ee8ff4b0d
+  data.tar.gz: 8831bb2737316ed30688f3fbdd08c585cbc0d51618ce19a95d76c1fc928cbb1fe64f573269c18f8102f170c411ed5d7e9cca45dc085e41fb465b3deeef1f3676

data/.rubocop.yml

@@ -21,4 +21,4 @@ Layout/LineLength:
   Max: 125
 
 Metrics/ClassLength:
-  Max: 150
+  Max: 165

data/lib/minato_logger/middlewares/request_context_enricher.rb

@@ -3,7 +3,7 @@
 module MinatoLogger
   module Middlewares
     class RequestContextEnricher
-      CONTEXT_FIELDS = %i[session_id page_url user_id calling_service].freeze
+      CONTEXT_FIELDS = %i[session_id page_url identity_id user_agent calling_service].freeze
 
       def call(log)
         return log unless log.is_a?(Hash)

data/lib/minato_logger/middlewares/request_response_logger.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'base64'
 require 'json'
 require 'rails/rack/logger'
 
@@ -10,8 +11,13 @@ module MinatoLogger
 
       def call_app(request, env)
         hdrs = extract_request_headers(request)
-        attrs = { session_id: hdrs['X_SESSION_ID'], page_url: hdrs['X_PAGE_URL'],
-                  calling_service: hdrs['X_SERVICE_NAME'] }.compact
+        attrs = {
+          session_id: hdrs['X_SESSION_ID'],
+          page_url: hdrs['X_PAGE_URL'],
+          calling_service: hdrs['X_SERVICE_NAME'],
+          identity_id: extract_identity_id(request.headers['Authorization']),
+          user_agent: request.user_agent
+        }.compact
         MinatoLogger.with_context(attrs) { process_with_logging(request, env) }
       end
 
@@ -29,8 +35,7 @@ module MinatoLogger
       end
 
       def compute_tags(request)
-        tags_to_use = @taggers.presence || Rails.application.config.log_tags || []
-        tags_to_use.collect do |tag|
+        (@taggers.presence || Rails.application.config.log_tags || []).collect do |tag|
           next tag.call(request) if tag.is_a?(Proc)
           next request.send(tag) if tag.is_a?(Symbol)
 
@@ -44,8 +49,7 @@ module MinatoLogger
       end
 
       def should_log?(request)
-        blacklist = Rails.application.config.minato_logger.route_blacklist || []
-        blacklist.none? do |item|
+        (Rails.application.config.minato_logger.route_blacklist || []).none? do |item|
           next item.call(request) if item.is_a?(Proc)
 
           request.path == item
@@ -66,9 +70,15 @@ module MinatoLogger
 
       def dispatch_request_event(request)
         instrumenter = ActiveSupport::Notifications.instrumenter
-        handle = instrumenter.build_handle('request.action_dispatch', { request: request })
-        handle.start
-        handle
+        payload = { request: request }
+        if instrumenter.respond_to?(:build_handle)
+          handle = instrumenter.build_handle('request.action_dispatch', payload)
+          handle.start
+          handle
+        else
+          instrumenter.start('request.action_dispatch', payload)
+          nil
+        end
       end
 
       def log_request(request, env, ctx)
@@ -80,14 +90,13 @@ module MinatoLogger
       def log_response(request, env, ctx)
         ctx[:response][:duration] = ((current_time - ctx.dig(:request, :start_time)) * 1000).round(2)
         payload = build_response_payload(request, env, ctx)
-        log_level = ctx.dig(:response, :status) >= 500 ? :error : :info
-        log(payload, log_level)
+        log(payload, ctx.dig(:response, :status) >= 500 ? :error : :info)
       end
 
       def default_log_data(request, env, ctx)
-        route = env['action_dispatch.route_uri_pattern'] || request.path
         request = { id: request.request_id, method: request.method,
-                    time: Time.zone.now.iso8601, remote_ip: request.remote_ip, route: route, ip: request.ip,
+                    time: Time.zone.now.iso8601, remote_ip: request.remote_ip,
+                    route: env['action_dispatch.route_uri_pattern'] || request.path, ip: request.ip,
                     path: request.fullpath, params: filter_params(request), headers: ctx.dig(:request, :headers),
                     body: ctx.dig(:request, :body) }
         { rails_version: Rails.version, request: request }
@@ -163,10 +172,21 @@ module MinatoLogger
       def filter_sensitive_headers(headers)
         return {} unless headers.is_a?(Hash)
 
-        headers.reject do |k, _|
-          key = k.to_s.upcase.tr('-', '_')
-          Rails.application.config.minato_logger.sensitive_headers.any? { |sensitive| key.include?(sensitive) }
-        end
+        sensitive = Rails.application.config.minato_logger.sensitive_headers
+        headers.reject { |k, _| sensitive.any? { |s| k.to_s.upcase.tr('-', '_').include?(s) } }
+      end
+
+      def extract_identity_id(auth_header)
+        return unless auth_header&.match?(/\ABearer /i)
+
+        payload_b64 = auth_header.split.last.split('.')[1]
+        return unless payload_b64
+
+        padded = payload_b64 + ('=' * (((4 - (payload_b64.length % 4)) % 4)))
+        payload = JSON.parse(Base64.urlsafe_decode64(padded))
+        payload.dig('session', 'identity', 'id')
+      rescue StandardError
+        nil
       end
 
       def finish_request_instrumentation(handle, payload)
@@ -174,6 +194,8 @@ module MinatoLogger
           super
         elsif handle
           handle.finish
+        else
+          ActiveSupport::Notifications.instrumenter.finish('request.action_dispatch', {})
         end
       end
     end

data/lib/minato_logger/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MinatoLogger
-  VERSION = '0.4.0'
+  VERSION = '0.5.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minato_logger
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Ferreri
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-04-15 00:00:00.000000000 Z
+date: 2026-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport