minato_logger 0.1.13.pre.4 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8912274da7dd77fae6f70e2236079b5ed24df2aef0326ef1cd0467aed0cd2dcc
-  data.tar.gz: 9fe88a71c8273fa4945b74d3d640761b6fc8bfb2c2bca0ae63e25cfb3b82fc2d
+  metadata.gz: e7f37f246b04ca0fb8200abd73730c82c7acd74e377a092241a7a9c4b81c432a
+  data.tar.gz: e9900da1f8a50a21c5f52ea1d6313394201256b2c9740d032777e8201da25307
 SHA512:
-  metadata.gz: d7974899c02eee1e4f366b3391fbbb3c386dbbea2870ce4bc2f61396e4baf495c8b8bac7c32d9239e5b588e8646128e9a8b3f495c3897a5ce19592091a922ec7
-  data.tar.gz: 604ff2aabe0ee95c8f7f748026baa9b9abda1ad6bea00ac698550c686a6d4bc73d962902c30b2d77e0000e7f19f6b1e2e664d7535e46183c1712891ccd7107b6
+  metadata.gz: 0ce1237c16d06a91eaee51646d421ead3cc6d7a3055a1b23783de7d6f51b55861006d9c06f0b54f66ae6061301ccd93a607102cdd4c55cc3a30b55e1bf82fc78
+  data.tar.gz: 79b4938554e3cf2cd8f61431016b432d415dfeacfa18650acce93486761b140d2cefc2b8b193c6852910e01fa51c734ee8e6805c0a4103a078a4a40ba64879ff

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,23 +1,42 @@
 # 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)
+        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"
+        sanitized_log = sanitize_hash(log)
+
+        "#{sanitized_log.to_json}\n"
       end
 
       private
 
+      def sanitize_hash(hash)
+        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
+      end
+
+      def sanitize_hash_value(value)
+        case value
+        when String
+          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 }
+        else
+          value
+        end
+      end
+
       def apply_middlewares(log)
         MinatoLogger.config.middleware.middlewares.each do |middleware|
           log = middleware.new.call(log)
@@ -31,6 +50,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/version.rb

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

data/minato_logger.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "activesupport", "~> 7.0.4"
-  spec.add_dependency "rails", ">= 7.0.0"
+  spec.add_dependency "rails", "~> 7.0", ">= 7.0.0"
   spec.add_dependency "stackdriver", "~> 0.21.1"
 
   # Uncomment to register a new dependency of your gem

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minato_logger
 version: !ruby/object:Gem::Version
-  version: 0.1.13.pre.4
+  version: 0.1.13
 platform: ruby
 authors:
 - Ferreri
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-02-20 00:00:00.000000000 Z
+date: 2025-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -28,6 +28,9 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '7.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 7.0.0
@@ -35,6 +38,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '7.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 7.0.0
@@ -99,11 +105,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.5.5
 signing_key:
 specification_version: 4
 summary: Log enhancements for Minato Rails Apps.