dry-logger 1.0.0.rc2 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5c096685f8199a216c865178cc4a5633975fa45e9b158e0a25254ec8edaa6b5
-  data.tar.gz: 48e24dcd35809d47677964fe48df6d9e6c32bc0bda00cbfe3ee0e0dd76681660
+  metadata.gz: e066ca44b228d611e0170f99488de6fa110d6ad2bdfea5de5e5f9e7513143019
+  data.tar.gz: d563a0fa78660c91e0757a66194269cfc565075d5a6f69356ebd1aec2cb18d6e
 SHA512:
-  metadata.gz: f298b5262eb94c6312122519bfcc17ced78512dfe53fe1db097c95aa68aa6cf717e7da0bde929e74c6d5df9f58938ce22e4e66167d96031e9d1530baded90311
-  data.tar.gz: e8413dddf934581b0fadaca47c108f53145ba8a5ad4603d9b02cfa0a6fbe89c1b29c933c51205a5e171619e69502a3e1f9658e6b19b763306e52f04768b4c0ce
+  metadata.gz: f856780a1ef1fd89828a835c27f7c33b1fd4c5e518c5be8d9251c503d60e75f73b0a8b30e9dbeffdfea90dcc05bf9848fd31fb7ce972eba4b96c63bef6320165
+  data.tar.gz: 835f8a12cb10da5a459d4a8cc0b32f8e0c29afff000db89a1014c3686709bf6cd074e344ebcf6a4378c285f024c481df483527a8ec7e92b8fe79aad360628d4a

data/CHANGELOG.md

@@ -1,13 +1,38 @@
 <!--- DO NOT EDIT THIS FILE - IT'S AUTOMATICALLY GENERATED VIA DEVTOOLS --->
 
-## 1.0.0.rc1 2022-11-07
+## 1.0.1 2022-11-23
+
+
+### Fixed
+
+- Support for `log_if` in proxied loggers (via 81115320b490034ddf9dfe4f3775322b9271e0cd) (@solnic)
+- Support exceptions and payloads in proxied loggers (via 93b3fd59ebbdc7e63620eb064694d58455df831f) (@solnic)
+
+
+[Compare v1.0.0...v1.0.1](https://github.com/dry-rb/dry-logger/compare/v1.0.0...v1.0.1)
+
+## 1.0.0 2022-11-17
 
 This is a port of the original Hanami logger from hanami-utils extended with support for logging
-dispatchers that can log to different destinations.
+dispatchers that can log to different destinations and plenty more.
 
 
 ### Added
 
+- Support arbitrary logging backends through proxy (via #12) (@solnic)
+- Support for conditional logging when using arbitrary logging backends (via #13) (@solnic)
+- Support for registering templates via `Dry::Logger.register_template` (via #14) (@solnic)
+- Support for payload keys as template tokens (via #14) (@solnic)
+- Support for payload value formatter methods, ie if there's `:verb` token your formatter can implement `format_verb(value)` (via #14) (@solnic)
+- Support block-based setup (via #16) (@solnic)
+- Support for defining cherry-picked keys from the payload in string templates (via #17) (@solnic)
+- Support for `%<payload>s` template token. It will be replaced by a formatted payload, excluding any key that you specified explicitly in the template (via #17) (@solnic)
+- Support for colorized output using color tags in templates (via #18) (@solnic)
+- Support for `colorize: true` logger option which enables severity coloring in string formatter (via #18) (@solnic)
+- `:details` template: `"[%<progname>s] [%<severity>s] [%<time>s] %<message>s %<payload>s"` (@solnic)
+- A new option `on_crash` for setting up a logger-crash handling proc (via #21) (@solnic)
+- Handle logger crashes by default using a simple `$stdout` logger (via #21) (@solnic)
+- Support for regular logger backends that don't support `log?` predicate (@solnic)
 - Support for providing a string template for log entries via `template` option (via #7) (@solnic)
 - `:rack` string log formatter which inlines request info and displays params at the end (@solnic)
 - Conditional log dispatch via `#log_if` backend's predicate (via #9) (@solnic)

data/lib/dry/logger/backends/core.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require "dry/logger/constants"
+
+module Dry
+  module Logger
+    module Backends
+      module Core
+        # Return a proc used by the log? predicate
+        #
+        # @since 1.0.0
+        # @api private
+        attr_reader :log_if
+
+        # Set a predicate proc that checks if an entry should be logged by a given backend
+        #
+        # The predicate will receive {Entry} as its argument and should return true/false
+        #
+        # @param [Proc, #to_proc] spec A proc-like object
+        # @since 1.0.0
+        # @api public
+        def log_if=(spec)
+          @log_if = spec&.to_proc
+        end
+
+        # @since 1.0.0
+        # @api private
+        def log?(entry)
+          if log_if
+            log_if.call(entry)
+          else
+            true
+          end
+        end
+      end
+    end
+  end
+end

data/lib/dry/logger/backends/proxy.rb

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+require "delegate"
+
+require "dry/logger/constants"
+require "dry/logger/backends/core"
+
+module Dry
+  module Logger
+    module Backends
+      # Logger proxy is used for regular loggers that don't work with log entries
+      #
+      # @since 1.0.0
+      # @api private
+      class Proxy < SimpleDelegator
+        include Core
+
+        LOG_METHODS.each do |method|
+          define_method(method) do |entry|
+            if entry.exception?
+              if __supports_payload__?(method)
+                __getobj__.public_send(method, entry.exception, **entry.payload.except(:exception))
+              else
+                __getobj__.public_send(method, entry.exception)
+              end
+            elsif __supports_payload__?(method)
+              if entry.message
+                __getobj__.public_send(method, entry.message, **entry.payload)
+              else
+                __getobj__.public_send(method, **entry.payload)
+              end
+            else
+              __getobj__.public_send(method, entry.message)
+            end
+          end
+        end
+
+        # @since 1.0.0
+        # @api private
+        def log?(entry)
+          if log_if
+            log_if.call(entry)
+          else
+            true
+          end
+        end
+
+        private
+
+        # @since 1.0.0
+        # @api private
+        def __supports_payload__?(method)
+          __supported_methods__[method] ||= __getobj__.method(method)
+            .parameters.last&.first.equal?(:keyrest)
+        end
+
+        # @since 1.0.0
+        # @api private
+        def __supported_methods__
+          @__supported_methods__ ||= {}
+        end
+      end
+    end
+  end
+end

data/lib/dry/logger/backends/stream.rb

@@ -3,11 +3,14 @@
 require "logger"
 
 require "dry/logger/constants"
+require "dry/logger/backends/core"
 
 module Dry
   module Logger
     module Backends
       class Stream < ::Logger
+        include Core
+
         # @since 0.1.0
         # @api private
         attr_reader :stream
@@ -16,10 +19,6 @@ module Dry
         # @api private
         attr_reader :level
 
-        # @since 0.1.0
-        # @api public
-        attr_accessor :log_if
-
         # @since 0.1.0
         # @api private
         def initialize(stream:, formatter:, level: DEFAULT_LEVEL, progname: nil, log_if: nil)
@@ -33,13 +32,9 @@ module Dry
         end
 
         # @since 1.0.0
-        # @api private
-        def log?(entry)
-          if log_if
-            log_if.call(entry)
-          else
-            true
-          end
+        # @api public
+        def inspect
+          %(#<#{self.class} stream=#{stream} level=#{level} log_if=#{log_if}>)
         end
       end
     end

data/lib/dry/logger/clock.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module Dry
+  module Logger
+    # @since 1.0.0
+    # @api private
+    class Clock
+      # @since 1.0.0
+      # @api private
+      attr_reader :unit
+
+      # @since 1.0.0
+      # @api private
+      def initialize(unit: :nanosecond)
+        @unit = unit
+      end
+
+      # @since 1.0.0
+      # @api private
+      def now
+        Time.now
+      end
+
+      # @since 1.0.0
+      # @api private
+      def now_utc
+        now.getutc
+      end
+
+      # @since 1.0.0
+      # @api private
+      def measure
+        start = current
+        result = yield
+        [result, current - start]
+      end
+
+      private
+
+      # @since 1.0.0
+      # @api private
+      def current
+        Process.clock_gettime(Process::CLOCK_MONOTONIC, unit)
+      end
+    end
+  end
+end

data/lib/dry/logger/constants.rb

@@ -4,22 +4,67 @@ require "logger"
 
 module Dry
   module Logger
-    LOG_METHODS = %i[debug error fatal info warn].freeze
+    # @since 1.0.0
+    # @api private
+    NEW_LINE = $/ # rubocop:disable Style/SpecialGlobalVars
+
+    # @since 1.0.0
+    # @api private
+    SEPARATOR = " "
+
+    # @since 1.0.0
+    # @api private
+    TAB = SEPARATOR * 2
+
+    # @since 1.0.0
+    # @api private
+    EMPTY_ARRAY = [].freeze
 
+    # @since 1.0.0
+    # @api private
+    EMPTY_HASH = {}.freeze
+
+    # @since 1.0.0
+    # @api private
+    LOG_METHODS = %i[debug info warn error fatal unknown].freeze
+
+    # @since 1.0.0
+    # @api private
     BACKEND_METHODS = %i[close].freeze
 
+    # @since 1.0.0
+    # @api private
     DEBUG = ::Logger::DEBUG
+
+    # @since 1.0.0
+    # @api private
     INFO = ::Logger::INFO
+
+    # @since 1.0.0
+    # @api private
     WARN = ::Logger::WARN
+
+    # @since 1.0.0
+    # @api private
     ERROR = ::Logger::ERROR
+
+    # @since 1.0.0
+    # @api private
     FATAL = ::Logger::FATAL
+
+    # @since 1.0.0
+    # @api private
     UNKNOWN = ::Logger::UNKNOWN
 
+    # @since 1.0.0
+    # @api private
     LEVEL_RANGE = (DEBUG..UNKNOWN).freeze
 
+    # @since 1.0.0
+    # @api private
     DEFAULT_LEVEL = INFO
 
-    # @since 0.1.0
+    # @since 1.0.0
     # @api private
     LEVELS = Hash
       .new { |levels, key|
@@ -35,9 +80,16 @@ module Dry
       )
       .freeze
 
-    DEFAULT_OPTS = {level: DEFAULT_LEVEL, formatter: nil, progname: nil}.freeze
+    # @since 1.0.0
+    # @api private
+    DEFAULT_OPTS = {level: DEFAULT_LEVEL, formatter: nil, progname: nil, log_if: nil}.freeze
 
+    # @since 1.0.0
+    # @api private
     BACKEND_OPT_KEYS = DEFAULT_OPTS.keys.freeze
+
+    # @since 1.0.0
+    # @api private
     FORMATTER_OPT_KEYS = %i[filter].freeze
   end
 end

data/lib/dry/logger/dispatcher.rb

@@ -4,6 +4,7 @@ require "logger"
 require "pathname"
 
 require "dry/logger/constants"
+require "dry/logger/backends/proxy"
 require "dry/logger/entry"
 
 module Dry
@@ -37,21 +38,48 @@ module Dry
       # @api private
       attr_reader :options
 
+      # @since 1.0.0
+      # @api private
+      attr_reader :clock
+
+      # @since 1.0.0
+      # @api private
+      attr_reader :on_crash
+
       # @since 1.0.0
       # @api private
       attr_reader :mutex
 
+      # @since 1.0.0
+      # @api private
+      CRASH_LOGGER = ::Logger.new($stdout).tap { |logger|
+        logger.formatter = -> (_, _, _, message) { "#{message}#{NEW_LINE}" }
+        logger.level = FATAL
+      }.freeze
+
+      # @since 1.0.0
+      # @api private
+      ON_CRASH = -> (progname:, exception:, message:, payload:) {
+        CRASH_LOGGER.fatal(Logger.templates[:crash] % {
+          severity: "FATAL",
+          progname: progname,
+          time: Time.now,
+          log_entry: [message, payload].map(&:to_s).reject(&:empty?).join(SEPARATOR),
+          exception: exception.class,
+          message: exception.message,
+          backtrace: TAB + exception.backtrace.join(NEW_LINE + TAB)
+        })
+      }
+
       # Set up a dispatcher
       #
       # @since 1.0.0
-      #
-      # @param [String, Symbol] id The dispatcher id, can be used as progname in log entries
-      # @param [Hash] options Options that can be used for both the backend and formatter
+      # @api private
       #
       # @return [Dispatcher]
-      # @api public
       def self.setup(id, **options)
         dispatcher = new(id, **DEFAULT_OPTS, **options)
+        yield(dispatcher) if block_given?
         dispatcher.add_backend if dispatcher.backends.empty?
         dispatcher
       end
@@ -64,12 +92,17 @@ module Dry
 
       # @since 1.0.0
       # @api private
-      def initialize(id, backends: [], context: self.class.default_context, **options)
+      def initialize(
+        id, backends: [], tags: [], context: self.class.default_context, **options
+      )
         @id = id
         @backends = backends
         @options = {**options, progname: id}
         @mutex = Mutex.new
         @context = context
+        @tags = tags
+        @clock = Clock.new(**(options[:clock] || EMPTY_HASH))
+        @on_crash = options[:on_crash] || ON_CRASH
       end
 
       # Log an entry with UNKNOWN severity
@@ -143,8 +176,25 @@ module Dry
 
       # Pass logging to all configured backends
       #
+      # @example logging a message
+      #   logger.log(:info, "Hello World")
+      #
+      # @example logging payload
+      #   logger.log(:info, verb: "GET", path: "/users")
+      #
+      # @example logging message and payload
+      #   logger.log(:info, "User index request", verb: "GET", path: "/users")
+      #
+      # @example logging exception
+      #   begin
+      #     # things that may raise
+      #   rescue => e
+      #     logger.log(:error, e)
+      #     raise e
+      #   end
+      #
       # @param [Symbol] severity The log severity name
-      # @param [String,Symbol,Array] message Optional message object
+      # @param [String] message Optional message
       # @param [Hash] payload Optional log entry payload
       #
       # @since 1.0.0
@@ -155,17 +205,24 @@ module Dry
         when Hash then log(severity, nil, **message)
         else
           entry = Entry.new(
+            clock: clock,
             progname: id,
             severity: severity,
+            tags: @tags,
             message: message,
             payload: {**context, **payload}
           )
 
           each_backend do |backend|
-            backend.__send__(severity, entry) if !backend.respond_to?(:log?) || backend.log?(entry)
+            backend.__send__(severity, entry) if backend.log?(entry)
+          rescue StandardError => e
+            on_crash.(progname: id, exception: e, message: message, payload: payload)
           end
         end
 
+        true
+      rescue StandardError => e
+        on_crash.(progname: id, exception: e, message: message, payload: payload)
         true
       end
 
@@ -182,11 +239,11 @@ module Dry
       #
       # @since 1.0.0
       # @api public
-      def tagged(tag)
-        context[:tag] = tag
+      def tagged(*tags)
+        @tags.concat(tags)
         yield
       ensure
-        context.delete(:tag)
+        @tags = []
       end
 
       # Add a new backend to an existing dispatcher
@@ -200,15 +257,27 @@ module Dry
       # @return [Dispatcher]
       # @api public
       def add_backend(instance = nil, **backend_options)
-        backend = instance || Dry::Logger.new(**options, **backend_options)
+        backend =
+          case (instance ||= Dry::Logger.new(**options, **backend_options))
+          when Backends::Stream then instance
+          else Backends::Proxy.new(instance)
+          end
+
         yield(backend) if block_given?
+
         backends << backend
         self
       end
 
+      # @since 1.0.0
+      # @api public
+      def inspect
+        %(#<#{self.class} id=#{id} options=#{options} backends=#{backends}>)
+      end
+
       # @since 1.0.0
       # @api private
-      def each_backend(*_args, &block)
+      def each_backend(&block)
         mutex.synchronize do
           backends.each(&block)
         end

data/lib/dry/logger/entry.rb

@@ -10,14 +10,6 @@ module Dry
     class Entry
       include Enumerable
 
-      # @since 1.0.0
-      # @api private
-      EMPTY_PAYLOAD = {}.freeze
-
-      # @since 1.0.0
-      # @api private
-      EMPTY_BACKTRACE = [].freeze
-
       # @since 1.0.0
       # @api public
       attr_reader :progname
@@ -28,16 +20,19 @@ module Dry
 
       # @since 1.0.0
       # @api public
-      attr_reader :level
+      attr_reader :tags
 
       # @since 1.0.0
       # @api public
-      attr_reader :time
+      attr_reader :level
 
       # @since 1.0.0
       # @api public
       attr_reader :message
-      alias_method :exception, :message
+
+      # @since 1.0.0
+      # @api public
+      attr_reader :exception
 
       # @since 1.0.0
       # @api public
@@ -45,14 +40,23 @@ module Dry
 
       # @since 1.0.0
       # @api private
-      def initialize(progname:, severity:, time: Time.now, message: nil, payload: EMPTY_PAYLOAD)
+      attr_reader :clock
+
+      # @since 1.0.0
+      # @api private
+      # rubocop:disable Metrics/ParameterLists
+      def initialize(clock:, progname:, severity:, tags: EMPTY_ARRAY, message: nil,
+                     payload: EMPTY_HASH)
+        @clock = clock
         @progname = progname
-        @severity = severity.to_s.upcase # TODO: this doesn't feel right
+        @severity = severity.to_s
+        @tags = tags
         @level = LEVELS.fetch(severity.to_s)
-        @time = time
-        @message = message
+        @message = message unless message.is_a?(Exception)
+        @exception = message if message.is_a?(Exception)
         @payload = build_payload(payload)
       end
+      # rubocop:enable Metrics/ParameterLists
 
       # @since 1.0.0
       # @api public
@@ -99,7 +103,7 @@ module Dry
       # @since 1.0.0
       # @api public
       def exception?
-        message.is_a?(Exception)
+        !exception.nil?
       end
 
       # @since 1.0.0
@@ -109,28 +113,21 @@ module Dry
       end
 
       # @since 1.0.0
-      # @api private
-      def to_h
-        @to_h ||= meta.merge(payload)
+      # @api public
+      def tag?(value)
+        tags.include?(value)
       end
 
       # @since 1.0.0
       # @api private
       def meta
-        @meta ||= {progname: progname, severity: severity, time: time}
+        @meta ||= {progname: progname, severity: severity, time: clock.now}
       end
 
       # @since 1.0.0
       # @api private
-      def utc_time
-        @utc_time ||= time.utc.iso8601
-      end
-
-      # @since 1.0.0
-      # @api private
-      def as_json
-        # TODO: why are we enforcing UTC in JSON but not in String?
-        @as_json ||= to_h.merge(message: message, time: utc_time).compact
+      def to_h
+        @to_h ||= meta.merge(message: message, **payload)
       end
 
       # @since 1.0.0
@@ -146,10 +143,7 @@ module Dry
       # @api private
       def build_payload(payload)
         if exception?
-          {message: exception.message,
-           backtrace: exception.backtrace || EMPTY_BACKTRACE,
-           error: exception.class,
-           **payload}
+          {exception: exception, **payload}
         else
           payload
         end