lorekeeper 2.3.1 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92b989dbf8ed93f0ef8a14a4c38c96942e34fdfb11c09048bbbe4077c4c0e493
-  data.tar.gz: 994f2c997387e2bf60e991b858a7683de6e0e53f21a7868b42844606e2d93a30
+  metadata.gz: 53332589726c07831fc34d3d63b7517de62fd1a75c11d1cbf772b6088d125eed
+  data.tar.gz: 797d799f0268b110fe584ead9bdb9f9c3f779bca7d1e8d0fb75c796409a340c5
 SHA512:
-  metadata.gz: 2626986445dd5884ed83d2853e8654be86eced615ab9b82aab90bae74c3e9e6a2e081acb5c8a3afe27143213cc588f331cd35fb5356c0bab5c196c15d2d19052
-  data.tar.gz: 28e4416df69d092dffe46ed3317c33ef0e4d893c3484425d45cf7a4ae8bcfa0768f540dbee6969bc92836008ce71c51d029a3f8ee6fab297228d9fa16a74ffdf
+  metadata.gz: c773417845d13a54058bd01b1541a64fa9564bce845fec21efcd69fa23916a323da0c679d86e8950c7c7dea1fa7c4a18e02429f21b4d896c670d4bb952ade48e
+  data.tar.gz: f95030ee5fe64f4cecd0cd9b15217897324bf2ac6aca1daed1a20a8daea233c029412a6a021dddd8bcd7d75d94aee673aa531f35bc8a214b6c07a0e666fca377

data/.github/workflows/build.yml

@@ -23,6 +23,8 @@ jobs:
       with:
         ruby-version: ${{ matrix.ruby-version }}
         bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Run rubocop
+      run: bundle exec rubocop
     - name: Run tests
       run: bundle exec rspec
     - name: Run benchmark

data/.rubocop.yml

@@ -1,6 +1,42 @@
-Metrics/LineLength:
-  Max: 120
-# https://github.com/rubocop/rubocop/blob/20990ed3831589c0d9f202107b1b580ead8ef2c5/lib/rubocop/cop/style/single_line_methods.rb#L11
+require:
+  - rubocop-performance
+
+inherit_gem:
+  rubocop-mdsol: rubocop.yml
+
+AllCops:
+  Exclude:
+    - '*gemspec'
+  # NOTE: Excludes vendor from linting. Needed by GitHub Actions.
+  # - https://github.com/rubocop/rubocop/issues/9832#issuecomment-873398952
+  #
+    - 'vendor/bundle/**/*'
+
+Lint/ConstantDefinitionInBlock:
+  Exclude:
+    - 'spec/**/*'
+
+Layout/ArgumentAlignment:
+  EnforcedStyle: with_fixed_indentation
+
+Layout/FirstHashElementIndentation:
+  EnforcedStyle: consistent
+
+Metrics/ParameterLists:
+  CountKeywordArgs: false
+
 # TODO: add "EnforcedStyle: allow_single_line" once all rubys are > 3.0 to autocorrect all single-line methods to endless
+# https://github.com/rubocop/rubocop/blob/20990ed3831589c0d9f202107b1b580ead8ef2c5/lib/rubocop/cop/style/single_line_methods.rb#L11
+#
 Style/SingleLineMethods:
   Enabled: false
+
+Style/MissingRespondToMissing:
+  Enabled: false
+
+Style/FrozenStringLiteralComment:
+  Enabled: true
+
+Style/StringLiterals:
+  Enabled: true
+  EnforcedStyle: single_quotes

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 2.3.2
+* Ensure additional fields are reset after logging
+* Let Oj fallback to :object mode for non-representable data
+* Fix SimpleLogger to handle non-String log messages
+* Run RuboCop checks on build and fix RuboCop offenses
+
 # 2.3.1
 * Fix MultiLogger to not raise ArgumentError
 

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in lorekeeper.gemspec

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'benchmark'
 require 'tempfile'
 require 'securerandom'
@@ -5,7 +7,7 @@ require 'benchmark/ips'
 require 'byebug'
 require 'rbtrace'
 
-$LOAD_PATH.unshift(File.expand_path('../lib', __FILE__))
+$LOAD_PATH.unshift(File.expand_path('lib', __dir__))
 $LOAD_PATH.uniq!
 
 require 'lorekeeper'

data/bin/console

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'bundler/setup'
 require 'lorekeeper'

data/lib/lorekeeper/fast_logger.rb

@@ -5,9 +5,9 @@ require 'logger'
 module Lorekeeper
   # Very simple, very fast logger
   class FastLogger
-    include ::Logger::Severity  # contains the levels constants: DEBUG, ERROR, etc.
-    attr_accessor :level        # Current level, default: DEBUG
-    attr_accessor :formatter    # Just for compatibility with Logger, not used
+    include ::Logger::Severity # contains the levels constants: DEBUG, ERROR, etc.
+    attr_accessor :level,      # Current level, default: DEBUG
+      :formatter   # Just for compatibility with Logger, not used
 
     def debug?; level <= DEBUG; end
     def info?; level <= INFO; end
@@ -21,12 +21,12 @@ module Lorekeeper
       @file = file # We only keep this so we can inspect where we are sending the logs
     end
 
-    LOGGING_METHODS = [
-      :debug,
-      :info,
-      :warn,
-      :error,
-      :fatal
+    LOGGING_METHODS = %i[
+      debug
+      info
+      warn
+      error
+      fatal
     ].freeze
 
     METHOD_SEVERITY_MAP = {
@@ -56,7 +56,8 @@ module Lorekeeper
     # This is part of the standard Logger API, we need this to be compatible
     def add(severity, message_param = nil, progname = nil, &block)
       return true if severity < @level
-      message = (block && block.call) || message_param || progname
+
+      message = block&.call || message_param || progname
       log_data(severity, message.freeze)
     end
 
@@ -65,12 +66,12 @@ module Lorekeeper
     # To avoid needing to monkey-patch Lorekeeper just to get this method, we are adding a simple
     # non-functional version here.
     def silence_logger(&block)
-      yield if block_given?
+      yield if block
     end
 
     # activerecord-session_store v2 is now simply calling silence instead of silence_logger
     def silence(&block)
-      yield if block_given?
+      yield if block
     end
 
     # inherited classes probably want to reimplement this
@@ -82,8 +83,6 @@ module Lorekeeper
       @iodevice.write(message)
     end
 
-    private
-
     require 'monitor'
     # Mutex to avoid broken lines when multiple threads access the log file
     class LogDeviceMutex
@@ -110,11 +109,12 @@ module Lorekeeper
       def to_iodevice(file)
         return nil unless file
 
-        iodevice = if file.respond_to?(:write) && file.respond_to?(:close)
-          file
-        else
-          open_logfile(file)
-        end
+        iodevice =
+          if file.respond_to?(:write) && file.respond_to?(:close)
+            file
+          else
+            open_logfile(file)
+          end
 
         iodevice.sync = true if iodevice.respond_to?(:sync=)
         iodevice
@@ -132,5 +132,7 @@ module Lorekeeper
         open_logfile(filename)
       end
     end
+
+    private_constant :LogDeviceMutex, :LogDevice
   end
 end

data/lib/lorekeeper/json_logger.rb

@@ -28,13 +28,14 @@ module Lorekeeper
     # Delegates methods to the existing Logger instance
     # We are extending the logger API with methods error_with_data, etc
     LOGGING_METHODS.each do |method_name|
-      define_method "#{method_name}_with_data", ->(message_param = nil, data = {}, &block) do
+      define_method "#{method_name}_with_data", ->(message_param = nil, data = {}, &block) {
         return true if METHOD_SEVERITY_MAP[method_name] < @level
+
         extra_fields = { DATA => (data || {}) }
-        with_extra_fields(extra_fields) { # Using do/end here only valid on Ruby>= 2.3
+        with_extra_fields(extra_fields) do
           add(METHOD_SEVERITY_MAP[method_name], message_param, nil, &block)
-        }
-      end
+        end
+      }
     end
 
     def add_thread_unsafe_fields(fields)
@@ -65,7 +66,7 @@ module Lorekeeper
     # By default message comes from exception.message
     # Optional and named parameters to overwrite message, level and add data
     def exception(exception, custom_message = nil, custom_data = nil, custom_level = :error,
-                             message: nil, data: nil, level: nil) # Backwards compatible named params
+      message: nil, data: nil, level: nil) # Backwards compatible named params
 
       param_level = level || custom_level
       param_data = data || custom_data
@@ -95,11 +96,21 @@ module Lorekeeper
     end
 
     def write(message)
-      super(Oj.dump(message, mode: :compat, cache_keys: true, cache_str: 5) << "\n")
+      super(json_message(message) << "\n")
     end
 
     private
 
+    def json_message(message)
+      Oj.dump(message, mode: :compat, cache_keys: true, cache_str: 5)
+    rescue JSON::GeneratorError
+      begin
+        Oj.dump(message)
+      rescue => e
+        Oj.dump(MESSAGE => e.message)
+      end
+    end
+
     # Some instrumentation libraries pollute the stacktrace and create a large output which may
     # cause problems with certain logging backends.
     # Hardcording newrelic, active_support/callbacks and zipkin-tracer now here.
@@ -130,12 +141,13 @@ module Lorekeeper
     def with_extra_fields(fields)
       state[:extra_fields] = fields
       yield
+    ensure
       state[:extra_fields] = {}
     end
 
     def remove_invalid_fields(fields)
       fields.delete_if do |_, v|
-        v.nil? || v.respond_to?(:empty?) && v.empty?
+        v.nil? || (v.respond_to?(:empty?) && v.empty?)
       end
     end
 
@@ -143,10 +155,10 @@ module Lorekeeper
       current_state = state # Accessing state is slow. Do it only once per call.
       # merging is slow, we do not want to merge with empty hash if possible
       fields_to_log = if current_state[:extra_fields].empty?
-        current_state[:base_fields]
-      else
-        current_state[:base_fields].merge(current_state[:extra_fields])
-      end
+                        current_state[:base_fields]
+                      else
+                        current_state[:base_fields].merge(current_state[:extra_fields])
+                      end
 
       fields_to_log[MESSAGE] = message
       fields_to_log[TIMESTAMP] = Time.now.utc.strftime(DATE_FORMAT)

data/lib/lorekeeper/simple_logger.rb

@@ -28,6 +28,7 @@ module Lorekeeper
     # \e[colorm sets a color \e[0m resets all properties
     def log_data(severity, message)
       color = SEVERITY_TO_COLOR_MAP[severity]
+      message = message.to_s
       write("\e[#{color}m#{message.gsub('\n', "\n").gsub('\t', "\t")}\e[0m\n")
     end
 
@@ -37,22 +38,28 @@ module Lorekeeper
 
     # Extending the logger API with methods error_with_data, etc
     LOGGING_METHODS.each do |method_name|
-      define_method "#{method_name}_with_data", ->(message_param = nil, data = {}, &block) do
+      define_method "#{method_name}_with_data", ->(message_param = nil, data = {}) {
         return true if METHOD_SEVERITY_MAP[method_name] < @level
+
         log_data(METHOD_SEVERITY_MAP[method_name], "#{message_param}, data: #{data}")
-      end
+      }
     end
 
     # To not raise NoMethodError for the methods defined in JSONLogger
     def current_fields(*); end
+
     def state(*); end
+
     def add_thread_unsafe_fields(*); end
+
     def remove_thread_unsafe_fields(*); end
+
     def add_fields(*); end
+
     def remove_fields(*); end
 
     def exception(exception, custom_message = nil, custom_data = nil, custom_level = :error,
-                             message: nil, data: nil, level: nil)
+      message: nil, data: nil, level: nil)
 
       param_level = level || custom_level
       param_data = data || custom_data

data/lib/lorekeeper/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Lorekeeper
-  VERSION = '2.3.1'
+  VERSION = '2.3.2'
 end

data/lorekeeper.gemspec

@@ -34,4 +34,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rbtrace', '~> 0.4'
   spec.add_development_dependency 'simplecov', '~> 0.16'
   spec.add_development_dependency 'mutant-rspec', '~> 0.8'
+  spec.add_development_dependency 'rubocop-mdsol', '~> 0.3'
+  spec.add_development_dependency 'rubocop-performance', '~> 1.14'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lorekeeper
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.2
 platform: ruby
 authors:
 - Jordi Polo
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-18 00:00:00.000000000 Z
+date: 2022-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -176,6 +176,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: rubocop-mdsol
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.14'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.14'
 description: Opinionated logger which outputs messages in JSON format
 email:
 - mumismo@gmail.com