hubrise_initializer 0.2.4 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21970b76b0d656c2d55aa0e726d632969fca7fc13b54a0a392a829e2a9bf4977
-  data.tar.gz: 54af5ecc25ea00e2d39ddc5bbe6aa91eef4214d29e163647686bfdf9c115df3c
+  metadata.gz: 25c4a354ff1c3b71277dafac2f5ce52449d606b93034bf120f5a28c947680a12
+  data.tar.gz: b4bfe1015b87bf1dc5bb588fc40ca12f1b233e2ee01a6ececb57eac6f7539897
 SHA512:
-  metadata.gz: 97d34be192f6c063b77985f7b9081ec910dc04ec5a949fee42aa1c6a9caa8e30de7fa5633d19af76b012af323749ae82a1a99167b97aebee41000c4eec12703d
-  data.tar.gz: 1a442befd7fb169bdffa60beb1895b29e98dd34690ce6d4d9f396d677f4f2743d477c1f8f1d38e3723e51bbb023d82b34736bc2fdd9c10856dd7b6b83411304d
+  metadata.gz: a5b179bd126deeeb13a1af6c29d1d355abc8e392a081a39c7bff341aaac6ffa0bcb18291400aaa18f6b198535e87d6c9336ae31f1fde0ed93d8defc822b45a2c
+  data.tar.gz: e554b1dc24257354b6216dcbb136311bd6c594deaa5ea4f270b28833a30762ece717b7b7ce041ad944f11a0ff77aead1d534dd96a03b41101713d144a8c32c19

data/hubrise_initializer.gemspec

@@ -18,6 +18,6 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'lograge', '~> 0.11'
   spec.add_runtime_dependency 'lograge-sql', '~>1.1'
-  spec.add_runtime_dependency 'hubrise-act-fluent-logger-rails', '~> 0.5'
+  spec.add_runtime_dependency 'act-fluent-logger-rails', '~> 0.6'
   spec.add_runtime_dependency 'logstash-event', '~> 1.2'
 end

data/lib/hubrise_initializer.rb

@@ -23,6 +23,8 @@ class HubriseInitializer
 
     def configure_logger
       Rails.application.configure do
+        config.lograge.base_controller_class = %w[ActionController::API ActionController::Base]
+
         if log_level = ENV['RAILS_LOG_LEVEL']
           config.log_level = log_level
         end
@@ -30,7 +32,7 @@ class HubriseInitializer
         case ENV['RAILS_LOGGER']
         when 'stdout'
           # Log to STDOUT (docker-compose)
-          config.logger = Logger.new(STDOUT)
+          config.logger = ActiveSupport::Logger.new(STDOUT)
 
         when 'fluentd'
           # Log to fluentd (kubernetes)
@@ -38,7 +40,6 @@ class HubriseInitializer
           config.logger = ActFluentLoggerRails::Logger.new
 
           config.lograge.enabled = true
-          config.lograge.formatter = ::Lograge::Formatters::Logstash.new
           config.lograge.formatter = ::Lograge::Formatters::Json.new
 
           config.lograge.ignore_actions = ["HealthCheck::HealthCheckController#index"]
@@ -61,7 +62,7 @@ class HubriseInitializer
         case ENV['RAILS_LOGGER']
         when 'stdout'
           # Log to STDOUT (docker-compose)
-          Delayed::Worker.logger = Logger.new(STDOUT)
+          Delayed::Worker.logger = ActiveSupport::Logger.new(STDOUT)
 
         when 'fluentd'
           # Log to fluentd (kubernetes)
@@ -70,7 +71,7 @@ class HubriseInitializer
 
         else
           # Log to a file
-          Delayed::Worker.logger = Logger.new(File.join(Rails.root, 'log', 'delayed_job.log'))
+          Delayed::Worker.logger = ActiveSupport::Logger.new(File.join(Rails.root, 'log', 'delayed_job.log'))
         end
       end
     end

data/lib/hubrise_initializer/lograge.rb

@@ -17,9 +17,9 @@ class HubriseInitializer
             if ENV['RAILS_LOGRAGE_QUERY'] == 'true'
               {
                   request_headers: process_request_headers(request).to_s,
-                  request_body: truncate_body(request.raw_post.dup.force_encoding(Encoding::UTF_8)),
+                  request_body: truncate_body(switch_to_utf8(request.raw_post)),
                   response_headers: response.headers.to_h.to_s,
-                  response_body: truncate_body(response.body),
+                  response_body: truncate_body(switch_to_utf8(response.body))
               }
             else
               {}
@@ -31,6 +31,19 @@ class HubriseInitializer
 
       TRUNCATED_BODY_MAX_LENGTH = 1000
 
+      # Attempt to switch string encoding to utf-8. Return fallback if not a valid utf-8 sequence.
+      def switch_to_utf8(s)
+        return if !s
+
+        return s if s.encoding == Encoding::UTF_8
+
+        s_utf_8 = s.dup.force_encoding(Encoding::UTF_8)
+        return s_utf_8 if s_utf_8.valid_encoding?
+
+        # Fallback for binary data
+        return "Binary (#{s.size} bytes)"
+      end
+
       def truncate_body(s)
         s.present? ? s.squish.truncate(TRUNCATED_BODY_MAX_LENGTH, omission: '...') : nil
       end

data/lib/hubrise_initializer/version.rb

@@ -1,3 +1,3 @@
 class HubriseInitializer
-  VERSION = '0.2.4'.freeze
+  VERSION = '0.2.9'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hubrise_initializer
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.9
 platform: ruby
 authors:
 - Antoine Monnier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-17 00:00:00.000000000 Z
+date: 2021-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lograge
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: hubrise-act-fluent-logger-rails
+  name: act-fluent-logger-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: logstash-event
   requirement: !ruby/object:Gem::Requirement
@@ -97,8 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Rails app initializers optimized for HubRise